keep history after reset to ub-mail-master-release
diff --git a/Android.mk b/Android.mk
index 3d25744..8b05a35 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,8 +25,9 @@
 photo_dir := ../../../frameworks/opt/photoviewer/res ../../../frameworks/opt/photoviewer/activity/res
 emailcommon_dir := emailcommon
 gridlayout_dir := ../../../frameworks/support/v7/gridlayout/res
+bitmap_dir := ../../../frameworks/opt/bitmap/res
 datetimepicker_dir := ../../../frameworks/opt/datetimepicker/res
-res_dir := res $(unified_email_dir)/res $(chips_dir) $(photo_dir) $(emailcommon_dir)/res $(gridlayout_dir) $(datetimepicker_dir)
+res_dir := res $(unified_email_dir)/res $(chips_dir) $(photo_dir) $(emailcommon_dir)/res $(gridlayout_dir) $(bitmap_dir) $(datetimepicker_dir)
 
 LOCAL_MODULE_TAGS := optional
 
@@ -41,12 +42,13 @@
 LOCAL_ASSET_DIR := $(LOCAL_PATH)/$(unified_email_dir)/assets
 
 LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.mail:com.android.email:com.android.emailcommon:com.android.ex.photo:android.support.v7.gridlayout:com.android.datetimepicker
+LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.mail:com.android.email:com.android.emailcommon:com.android.ex.photo:android.support.v7.gridlayout:com.android.bitmap:com.android.datetimepicker
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon com.android.emailsync guava libchips libphotoviewer
+LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon guava libchips libphotoviewer
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout
 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES += android-opt-bitmap
 LOCAL_STATIC_JAVA_LIBRARIES += android-opt-datetimepicker
 LOCAL_STATIC_JAVA_LIBRARIES += owasp-html-sanitizer
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index caac4d4..e98c12d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,7 +23,7 @@
           on the same date. This should start at zero. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.email"
-    android:versionCode="6306090" >
+    android:versionCode="6407020" >
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -272,30 +272,40 @@
                     android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <!-- Must be exported in order for the AccountManager to launch it -->
         <activity
-            android:name=".activity.setup.AccountSettings"
+            android:name=".activity.setup.EmailPreferenceActivity"
             android:label="@string/settings_activity_title"
-            android:exported="true"
-            >
+            android:exported="false" >
+            <intent-filter>
+                <action android:name="android.intent.action.EDIT" />
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data
+                        android:scheme="content"
+                        android:host="ui.email.android.com"
+                        android:pathPrefix="/settings"
+                        />
+            </intent-filter>
+        </activity>
+        <activity
+                android:name="com.android.mail.ui.settings.PublicPreferenceActivity"
+                android:label="@string/settings_activity_title"
+                android:exported="true"
+                android:theme="@android:style/Theme.NoDisplay" >
+            <!-- Must be exported in order for the AccountManager to launch it -->
             <intent-filter>
                 <action android:name="com.android.email.activity.setup.ACCOUNT_MANAGER_ENTRY" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.EDIT" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data
-                    android:scheme="content"
-                    android:host="ui.email.android.com"
-                    android:pathPrefix="/settings"
-                    />
-            </intent-filter>
-            <intent-filter>
                 <action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
+        <activity android:name=".activity.setup.AccountServerSettingsActivity"
+                  android:label="@string/mailbox_settings_activity_title"
+                  android:exported="false">
+        </activity>
         <!-- a Headless Activity to load the account from the account id before navigating to the
         Incoming Account Settings fragment -->
         <activity
@@ -305,7 +315,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <data android:host="com.android.email.INCOMING_SETTINGS" />
+                <data android:host="com.android.email.ACCOUNT_SETTINGS" />
                 <data android:scheme="auth"/>
             </intent-filter>
         </activity>
@@ -424,7 +434,7 @@
         <!-- From Email application -->
 
         <receiver
-            android:name=".service.AttachmentDownloadService$Watchdog"
+            android:name=".service.AttachmentService$AttachmentWatchdog"
             android:enabled="true"/>
 
         <!-- Handles app upgrade. This disables itself after running once. -->
@@ -482,7 +492,7 @@
         </receiver>
 
         <service
-            android:name=".service.AttachmentDownloadService"
+            android:name=".service.AttachmentService"
             android:enabled="false"
             >
         </service>
diff --git a/emailcommon/src/com/android/emailcommon/provider/Account.java b/emailcommon/src/com/android/emailcommon/provider/Account.java
index 54e12e8..513390b 100755
--- a/emailcommon/src/com/android/emailcommon/provider/Account.java
+++ b/emailcommon/src/com/android/emailcommon/provider/Account.java
@@ -215,6 +215,23 @@
                 Account.CONTENT_URI, Account.CONTENT_PROJECTION, id, observer);
     }
 
+    public static Account restoreAccountWithAddress(Context context, String emailAddress) {
+        return restoreAccountWithAddress(context, emailAddress, null);
+    }
+
+    public static Account restoreAccountWithAddress(Context context, String emailAddress,
+            ContentObserver observer) {
+        final Cursor c = context.getContentResolver().query(CONTENT_URI,
+                new String[] {AccountColumns._ID},
+                AccountColumns.EMAIL_ADDRESS + "=?", new String[] {emailAddress},
+                null);
+        if (c == null || !c.moveToFirst()) {
+            return null;
+        }
+        final long id = c.getLong(c.getColumnIndex(AccountColumns._ID));
+        return restoreAccountWithId(context, id, observer);
+    }
+
     @Override
     protected Uri getContentNotificationUri() {
         return Account.CONTENT_URI;
@@ -275,7 +292,9 @@
     }
 
     /**
-     * @return the user-visible name for the account
+     * Returns the user-visible name for the account, eg. "My work address"
+     * or "foo@exemple.com".
+     * @return the user-visible name for the account.
      */
     public String getDisplayName() {
         return mDisplayName;
@@ -323,6 +342,7 @@
         return mSignature;
     }
 
+    @VisibleForTesting
     public void setSignature(String signature) {
         mSignature = signature;
     }
diff --git a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
index a10e91d..4d3fffc 100755
--- a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
+++ b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
@@ -144,6 +144,11 @@
     public static String NOTIFIER_AUTHORITY;
     public static Uri CONTENT_URI;
     public static final String PARAMETER_LIMIT = "limit";
+
+    /**
+     * Query parameter for the UI accounts query to enable suppression of the combined account.
+     */
+    public static final String SUPPRESS_COMBINED_ACCOUNT_PARAM = "suppress_combined";
     public static Uri CONTENT_NOTIFIER_URI;
     public static Uri PICK_TRASH_FOLDER_URI;
     public static Uri PICK_SENT_FOLDER_URI;
@@ -1402,7 +1407,7 @@
             +     ")";
 
         // Bits used in mFlags
-        // WARNING: AttachmentDownloadService relies on the fact that ALL of the flags below
+        // WARNING: AttachmentService relies on the fact that ALL of the flags below
         // disqualify attachments for precaching.  If you add a flag that does NOT disqualify an
         // attachment for precaching, you MUST change the PRECACHE_SELECTION definition above
 
diff --git a/emailcommon/src/com/android/emailcommon/service/AccountServiceProxy.java b/emailcommon/src/com/android/emailcommon/service/AccountServiceProxy.java
index 8f41ff0..4c764d0 100644
--- a/emailcommon/src/com/android/emailcommon/service/AccountServiceProxy.java
+++ b/emailcommon/src/com/android/emailcommon/service/AccountServiceProxy.java
@@ -42,38 +42,6 @@
         return null;
     }
 
-    @Override
-    public void notifyLoginFailed(final long accountId, final String reason) {
-        setTask(new ProxyTask() {
-            @Override
-            public void run() throws RemoteException {
-                mService.notifyLoginFailed(accountId, reason);
-            }
-        }, "notifyLoginFailed");
-    }
-
-    @Override
-    public void notifyLoginSucceeded(final long accountId) {
-        setTask(new ProxyTask() {
-            @Override
-            public void run() throws RemoteException {
-                mService.notifyLoginSucceeded(accountId);
-            }
-        }, "notifyLoginSucceeded");
-    }
-
-    // The following call is synchronous, and should not be made from the UI thread
-    @Override
-    public void reconcileAccounts(final String protocol, final String accountManagerType) {
-        setTask(new ProxyTask() {
-            @Override
-            public void run() throws RemoteException {
-                mService.reconcileAccounts(protocol, accountManagerType);
-            }
-        }, "reconcileAccounts");
-        waitForCompletion();
-    }
-
     // The following call is synchronous, and should not be made from the UI thread
     @Override
     public int getAccountColor(final long accountId) {
diff --git a/emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java b/emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java
index a6ecb81..1c1f0eb 100644
--- a/emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java
+++ b/emailcommon/src/com/android/emailcommon/service/EmailServiceProxy.java
@@ -25,9 +25,7 @@
 import com.android.emailcommon.Device;
 import com.android.emailcommon.TempDirectory;
 import com.android.emailcommon.mail.MessagingException;
-import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.HostAuth;
-import com.android.emailcommon.provider.Mailbox;
 import com.android.emailcommon.provider.Policy;
 import com.android.mail.utils.LogUtils;
 
@@ -35,7 +33,7 @@
 
 /**
  * The EmailServiceProxy class provides a simple interface for the UI to call into the various
- * EmailService classes (e.g. ExchangeService for EAS).  It wraps the service connect/disconnect
+ * EmailService classes (e.g. EasService for EAS).  It wraps the service connect/disconnect
  * process so that the caller need not be concerned with it.
  *
  * Use the class like this:
@@ -145,15 +143,15 @@
      * address that serves the specified protocol and credentials sufficient to be authorized
      * by the server to do so.
      *
-     * @param hostAuth the hostauth object to validate
+     * @param hostAuthCom the hostAuthCom object to validate
      * @return a Bundle as described above
      */
     @Override
-    public Bundle validate(final HostAuth hostAuth) throws RemoteException {
+    public Bundle validate(final HostAuthCompat hostAuthCom) throws RemoteException {
         setTask(new ProxyTask() {
             @Override
             public void run() throws RemoteException{
-                mReturn = mService.validate(hostAuth);
+                mReturn = mService.validate(hostAuthCom);
             }
         }, "validate");
         waitForCompletion();
@@ -258,11 +256,11 @@
      * @param emailAddress the email address for the account whose data should be deleted
      */
     @Override
-    public void deleteAccountPIMData(final String emailAddress) throws RemoteException {
+    public void deleteExternalAccountPIMData(final String emailAddress) throws RemoteException {
         setTask(new ProxyTask() {
             @Override
             public void run() throws RemoteException {
-                mService.deleteAccountPIMData(emailAddress);
+                mService.deleteExternalAccountPIMData(emailAddress);
             }
         }, "deleteAccountPIMData");
         // This can be called when deleting accounts. After making this call, the caller will
@@ -354,4 +352,21 @@
     public IBinder asBinder() {
         return null;
     }
+
+    public int getApiVersion() {
+        setTask(new ProxyTask() {
+            @Override
+            public void run() throws RemoteException{
+                mReturn = mService.getApiVersion();
+            }
+        }, "getApiVersion");
+        waitForCompletion();
+        if (mReturn == null) {
+            // This occurs if there is a timeout or remote exception. Is not expected to happen.
+            LogUtils.wtf(TAG, "failed to get api version");
+            return -1;
+        } else {
+            return (Integer) mReturn;
+        }
+    }
 }
diff --git a/emailcommon/src/com/android/emailcommon/service/EmailServiceVersion.java b/emailcommon/src/com/android/emailcommon/service/EmailServiceVersion.java
new file mode 100644
index 0000000..44689de
--- /dev/null
+++ b/emailcommon/src/com/android/emailcommon/service/EmailServiceVersion.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2014 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.emailcommon.service;
+
+public class EmailServiceVersion {
+    // Initial version
+    public static final int L_PLATFORM = 1;
+
+    public static final int CURRENT = L_PLATFORM;
+
+    // For each following version, add a comment explaining what apis where added or removed.
+}
diff --git a/emailcommon/src/com/android/emailcommon/service/HostAuthCompat.aidl b/emailcommon/src/com/android/emailcommon/service/HostAuthCompat.aidl
new file mode 100644
index 0000000..2e8e46e
--- /dev/null
+++ b/emailcommon/src/com/android/emailcommon/service/HostAuthCompat.aidl
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2014 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.emailcommon.service;
+
+parcelable HostAuthCompat;
diff --git a/emailcommon/src/com/android/emailcommon/service/HostAuthCompat.java b/emailcommon/src/com/android/emailcommon/service/HostAuthCompat.java
new file mode 100644
index 0000000..4c6b4da
--- /dev/null
+++ b/emailcommon/src/com/android/emailcommon/service/HostAuthCompat.java
@@ -0,0 +1,132 @@
+package com.android.emailcommon.service;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+
+import com.android.emailcommon.provider.Credential;
+import com.android.emailcommon.provider.HostAuth;
+import com.google.common.base.Objects;
+
+/*
+ * This class is explicitly for communicating HostAuth information to different implementations of
+ * IEmailService. We do not want to use the regular HostAuth class because it's used in many ways
+ * and could need to change at some point, which could break Exchange.
+ */
+public class HostAuthCompat implements Parcelable {
+    private String mProtocol;
+    private String mAddress;
+    private int mPort;
+    private int mFlags;
+    private String mLogin;
+    private String mPassword;
+    private String mDomain;
+    private String mClientCertAlias;
+    private byte[] mServerCert;
+    private String mProviderId;
+    private String mAccessToken;
+    private String mRefreshToken;
+    private long mExpiration;
+
+    public HostAuthCompat(HostAuth hostAuth) {
+        mProtocol = hostAuth.mProtocol;
+        mAddress = hostAuth.mAddress;
+        mPort = hostAuth.mPort;
+        mFlags = hostAuth.mFlags;
+        mLogin = hostAuth.mLogin;
+        mPassword = hostAuth.mPassword;
+        mDomain = hostAuth.mDomain;
+        mClientCertAlias = hostAuth.mClientCertAlias;
+        mServerCert = hostAuth.mServerCert;
+        if (hostAuth.mCredential != null) {
+            mProviderId = hostAuth.mCredential.mProviderId;
+            mAccessToken = hostAuth.mCredential.mAccessToken;
+            mRefreshToken = hostAuth.mCredential.mRefreshToken;
+            mExpiration = hostAuth.mCredential.mExpiration;
+        }
+    }
+
+    public HostAuth toHostAuth() {
+        HostAuth hostAuth = new HostAuth();
+        hostAuth.mProtocol = mProtocol;
+        hostAuth.mAddress = mAddress;
+        hostAuth.mPort = mPort;
+        hostAuth.mFlags = mFlags;
+        hostAuth.mLogin = mLogin;
+        hostAuth.mPassword = mPassword;
+        hostAuth.mDomain = mDomain;
+        hostAuth.mClientCertAlias = mClientCertAlias;
+        hostAuth.mServerCert = mServerCert;
+        if (!TextUtils.isEmpty(mProviderId)) {
+            hostAuth.mCredential = new Credential();
+            hostAuth.mCredential.mProviderId = mProviderId;
+            hostAuth.mCredential.mAccessToken = mAccessToken;
+            hostAuth.mCredential.mRefreshToken = mRefreshToken;
+            hostAuth.mCredential.mExpiration = mExpiration;
+        }
+        return hostAuth;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public String toString() {
+        return "[protocol " + mProtocol + "]";
+    }
+
+    @Override
+    public void writeToParcel(Parcel parcel, int i) {
+        parcel.writeString(mProtocol);
+        parcel.writeString(mAddress);
+        parcel.writeInt(mPort);
+        parcel.writeInt(mFlags);
+        parcel.writeString(mLogin);
+        parcel.writeString(mPassword);
+        parcel.writeString(mDomain);
+        parcel.writeString(mClientCertAlias);
+        parcel.writeByteArray(mServerCert);
+        parcel.writeString(mProviderId);
+        parcel.writeString(mAccessToken);
+        parcel.writeString(mRefreshToken);
+        parcel.writeLong(mExpiration);
+    }
+
+    /**
+     * Supports Parcelable
+     */
+    public HostAuthCompat(Parcel in) {
+        mProtocol = in.readString();
+        mAddress = in.readString();
+        mPort = in.readInt();
+        mFlags = in.readInt();
+        mLogin = in.readString();
+        mPassword = in.readString();
+        mDomain = in.readString();
+        mClientCertAlias = in.readString();
+        mServerCert = in.createByteArray();
+        mProviderId = in.readString();
+        mAccessToken = in.readString();
+        mRefreshToken = in.readString();
+        mExpiration = in.readLong();
+    }
+
+    /**
+     * Supports Parcelable
+     */
+    public static final Parcelable.Creator<HostAuthCompat> CREATOR
+            = new Parcelable.Creator<HostAuthCompat>() {
+        @Override
+        public HostAuthCompat createFromParcel(Parcel in) {
+            return new HostAuthCompat(in);
+        }
+
+        @Override
+        public HostAuthCompat[] newArray(int size) {
+            return new HostAuthCompat[size];
+        }
+    };
+
+}
diff --git a/emailcommon/src/com/android/emailcommon/service/IAccountService.aidl b/emailcommon/src/com/android/emailcommon/service/IAccountService.aidl
index d456862..b377380 100644
--- a/emailcommon/src/com/android/emailcommon/service/IAccountService.aidl
+++ b/emailcommon/src/com/android/emailcommon/service/IAccountService.aidl
@@ -19,11 +19,6 @@
 import android.os.Bundle;
 
 interface IAccountService {
-    oneway void notifyLoginFailed(long accountId, String reason);
-    oneway void notifyLoginSucceeded(long accountId);
-
-    void reconcileAccounts(String protocol, String accountManagerType);
-
     int getAccountColor(long accountId);
 
     Bundle getConfigurationData(String accountType);
diff --git a/emailcommon/src/com/android/emailcommon/service/IEmailService.aidl b/emailcommon/src/com/android/emailcommon/service/IEmailService.aidl
index 4f15a05..a6f49dc 100644
--- a/emailcommon/src/com/android/emailcommon/service/IEmailService.aidl
+++ b/emailcommon/src/com/android/emailcommon/service/IEmailService.aidl
@@ -17,8 +17,7 @@
 
 package com.android.emailcommon.service;
 
-import com.android.emailcommon.provider.HostAuth;
-import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.service.HostAuthCompat;
 import com.android.emailcommon.service.IEmailServiceCallback;
 import com.android.emailcommon.service.SearchParams;
 
@@ -45,9 +44,7 @@
     void pushModify(long accountId);
 
     // Other email operations.
-    // TODO: Decouple this call from HostAuth (i.e. use a dedicated data structure, or just pass
-    // the necessary strings directly).
-    Bundle validate(in HostAuth hostauth);
+    Bundle validate(in HostAuthCompat hostauth);
 
     int searchMessages(long accountId, in SearchParams params, long destMailboxId);
 
@@ -55,6 +52,7 @@
     oneway void sendMeetingResponse(long messageId, int response);
 
     // Specific to EAS protocol.
+    // TODO: this passes a HostAuth back in the bundle. We should be using a HostAuthCom for that.
     Bundle autoDiscover(String userName, String password);
 
     // Service control operations (i.e. does not generate a client-server message).
@@ -62,6 +60,7 @@
     // trigger the service to reload the flags.
     oneway void setLogging(int flags);
 
-    // Needs to get moved into Email since this is NOT a client-server command.
-    void deleteAccountPIMData(String emailAddress);
+    void deleteExternalAccountPIMData(String emailAddress);
+
+    int getApiVersion();
 }
diff --git a/emailsync/Android.mk b/emailsync/Android.mk
deleted file mode 100644
index 5f18d17..0000000
--- a/emailsync/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2012, 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.
-
-LOCAL_PATH := $(call my-dir)
-
-# Build the com.android.emailcommon static library. At the moment, this includes
-# the emailcommon files themselves plus everything under src/org (apache code).  All of our
-# AIDL files are also compiled into the static library
-
-include $(CLEAR_VARS)
-
-
-LOCAL_MODULE := com.android.emailsync
-LOCAL_SRC_FILES := $(call all-java-files-under, src/com/android/emailsync)
-LOCAL_STATIC_JAVA_LIBRARIES := com.android.emailcommon
-
-LOCAL_SDK_VERSION := 14
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/emailsync/AndroidManifest.xml b/emailsync/AndroidManifest.xml
deleted file mode 100644
index 4659bbb..0000000
--- a/emailsync/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.emailcommon"
-          android:versionCode="1">
-    <uses-sdk android:targetSdkVersion="19" android:minSdkVersion="14" />
-</manifest>
diff --git a/emailsync/src/com/android/emailsync/AbstractSyncService.java b/emailsync/src/com/android/emailsync/AbstractSyncService.java
deleted file mode 100644
index 6c8f2e5..0000000
--- a/emailsync/src/com/android/emailsync/AbstractSyncService.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Copyright (C) 2008-2009 Marc Blank
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.emailsync;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.Bundle;
-import android.text.format.DateUtils;
-
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.HostAuth;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.mail.utils.LogUtils;
-
-import java.util.concurrent.LinkedBlockingQueue;
-
-/**
- * Base class for all protocol services SyncManager (extends Service, implements
- * Runnable) instantiates subclasses to run a sync (either timed, or push, or
- * mail placed in outbox, etc.) EasSyncService is currently implemented; my goal
- * would be to move IMAP to this structure when it comes time to introduce push
- * functionality.
- */
-public abstract class AbstractSyncService implements Runnable {
-
-    public String TAG = "AbstractSyncService";
-
-    public static final int EXIT_DONE = 0;
-    public static final int EXIT_IO_ERROR = 1;
-    public static final int EXIT_LOGIN_FAILURE = 2;
-    public static final int EXIT_EXCEPTION = 3;
-    public static final int EXIT_SECURITY_FAILURE = 4;
-    public static final int EXIT_ACCESS_DENIED = 5;
-
-    public Mailbox mMailbox;
-    protected long mMailboxId;
-    protected int mExitStatus = EXIT_EXCEPTION;
-    protected String mExitReason;
-    protected String mMailboxName;
-    public Account mAccount;
-    public Context mContext;
-    public int mChangeCount = 0;
-    public volatile int mSyncReason = 0;
-    protected volatile boolean mStop = false;
-    public volatile Thread mThread;
-    protected final Object mSynchronizer = new Object();
-    // Whether or not the sync service is valid (usable)
-    public boolean mIsValid = true;
-
-    public boolean mUserLog = false;
-    public boolean mFileLog = false;
-
-    protected volatile long mRequestTime = 0;
-    protected LinkedBlockingQueue<Request> mRequestQueue = new LinkedBlockingQueue<Request>();
-
-    /**
-     * Sent by SyncManager to request that the service stop itself cleanly
-     */
-    public abstract void stop();
-
-    /**
-     * Sent by SyncManager to indicate that an alarm has fired for this service, and that its
-     * pending (network) operation has timed out. The service is NOT automatically stopped,
-     * although the behavior is service dependent.
-     *
-     * @return true if the operation was stopped normally; false if the thread needed to be
-     * interrupted.
-     */
-    public abstract boolean alarm();
-
-    /**
-     * Sent by SyncManager to request that the service reset itself cleanly; the meaning of this
-     * operation is service dependent.
-     */
-    public abstract void reset();
-
-    /**
-     * Called to validate an account; abstract to allow each protocol to do what
-     * is necessary. For consistency with the Email app's original
-     * functionality, success is indicated by a failure to throw an Exception
-     * (ugh). Parameters are self-explanatory
-     *
-     * @param hostAuth
-     * @return a Bundle containing a result code and, depending on the result, a PolicySet or an
-     * error message
-     */
-    public abstract Bundle validateAccount(HostAuth hostAuth, Context context);
-
-    /**
-     * Called to clear the syncKey for the calendar associated with this service; this is necessary
-     * because changes to calendar sync state cause a reset of data.
-     */
-    public abstract void resetCalendarSyncKey();
-
-    public AbstractSyncService(Context _context, Mailbox _mailbox) {
-        mContext = _context;
-        mMailbox = _mailbox;
-        mMailboxId = _mailbox.mId;
-        mMailboxName = _mailbox.mServerId;
-        mAccount = Account.restoreAccountWithId(_context, _mailbox.mAccountKey);
-    }
-
-    // Will be required when subclasses are instantiated by name
-    public AbstractSyncService(String prefix) {
-    }
-
-    /**
-     * The UI can call this static method to perform account validation.  This method wraps each
-     * protocol's validateAccount method.   Arguments are self-explanatory, except where noted.
-     *
-     * @param klass the protocol class (EasSyncService.class for example)
-     * @param hostAuth
-     * @param context
-     * @return a Bundle containing a result code and, depending on the result, a PolicySet or an
-     * error message
-     */
-    public static Bundle validate(Class<? extends AbstractSyncService> klass,
-            HostAuth hostAuth, Context context) {
-        AbstractSyncService svc;
-        try {
-            svc = klass.newInstance();
-            return svc.validateAccount(hostAuth, context);
-        } catch (IllegalAccessException e) {
-        } catch (InstantiationException e) {
-        }
-        return null;
-    }
-
-    public static class ValidationResult {
-        static final int NO_FAILURE = 0;
-        static final int CONNECTION_FAILURE = 1;
-        static final int VALIDATION_FAILURE = 2;
-        static final int EXCEPTION = 3;
-
-        static final ValidationResult succeeded = new ValidationResult(true, NO_FAILURE, null);
-        boolean success;
-        int failure = NO_FAILURE;
-        String reason = null;
-        Exception exception = null;
-
-        ValidationResult(boolean _success, int _failure, String _reason) {
-            success = _success;
-            failure = _failure;
-            reason = _reason;
-        }
-
-        ValidationResult(boolean _success) {
-            success = _success;
-        }
-
-        ValidationResult(Exception e) {
-            success = false;
-            failure = EXCEPTION;
-            exception = e;
-        }
-
-        public boolean isSuccess() {
-            return success;
-        }
-
-        public String getReason() {
-            return reason;
-        }
-    }
-
-    public boolean isStopped() {
-        return mStop;
-    }
-
-    public Object getSynchronizer() {
-        return mSynchronizer;
-    }
-
-    /**
-     * Convenience methods to do user logging (i.e. connection activity).  Saves a bunch of
-     * repetitive code.
-     */
-    public void userLog(String string, int code, String string2) {
-        if (mUserLog) {
-            userLog(string + code + string2);
-        }
-    }
-
-    public void userLog(String string, int code) {
-        if (mUserLog) {
-            userLog(string + code);
-        }
-    }
-
-    public void userLog(String str, Exception e) {
-        if (mUserLog) {
-            LogUtils.e(TAG, str, e);
-        } else {
-            LogUtils.e(TAG, str + e);
-        }
-        if (mFileLog) {
-            FileLogger.log(e);
-        }
-    }
-
-    /**
-     * Standard logging for EAS.
-     * If user logging is active, we concatenate any arguments and log them using LogUtils.d
-     * We also check for file logging, and log appropriately
-     * @param strings strings to concatenate and log
-     */
-    public void userLog(String ...strings) {
-        if (mUserLog) {
-            String logText;
-            if (strings.length == 1) {
-                logText = strings[0];
-            } else {
-                StringBuilder sb = new StringBuilder(64);
-                for (String string: strings) {
-                    sb.append(string);
-                }
-                logText = sb.toString();
-            }
-            LogUtils.d(TAG, logText);
-            if (mFileLog) {
-                FileLogger.log(TAG, logText);
-            }
-        }
-    }
-
-    /**
-     * Error log is used for serious issues that should always be logged
-     * @param str the string to log
-     */
-    public void errorLog(String str) {
-        LogUtils.e(TAG, str);
-        if (mFileLog) {
-            FileLogger.log(TAG, str);
-        }
-    }
-
-    /**
-     * Waits for up to 10 seconds for network connectivity; returns whether or not there is
-     * network connectivity.
-     *
-     * @return whether there is network connectivity
-     */
-    public boolean hasConnectivity() {
-        ConnectivityManager cm =
-                (ConnectivityManager)mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
-        int tries = 0;
-        while (tries++ < 1) {
-            // Use the same test as in ExchangeService#waitForConnectivity
-            // TODO: Create common code for this test in emailcommon
-            NetworkInfo info = cm.getActiveNetworkInfo();
-            if (info != null) {
-                return true;
-            }
-            try {
-                Thread.sleep(10 * DateUtils.SECOND_IN_MILLIS);
-            } catch (InterruptedException e) {
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Request handling (common functionality)
-     * Can be overridden if desired
-     */
-
-    public void addRequest(Request req) {
-        if (!mRequestQueue.contains(req)) {
-            mRequestQueue.offer(req);
-        }
-    }
-
-    public void removeRequest(Request req) {
-        mRequestQueue.remove(req);
-    }
-
-    public boolean hasPendingRequests() {
-        return !mRequestQueue.isEmpty();
-    }
-
-    public void clearRequests() {
-        mRequestQueue.clear();
-    }
-}
diff --git a/emailsync/src/com/android/emailsync/EmailSyncAlarmReceiver.java b/emailsync/src/com/android/emailsync/EmailSyncAlarmReceiver.java
deleted file mode 100644
index a52c7e5..0000000
--- a/emailsync/src/com/android/emailsync/EmailSyncAlarmReceiver.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *  Copyright (C) 2008-2009 Marc Blank
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.emailsync;
-
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.provider.EmailContent.MessageColumns;
-import com.android.emailcommon.provider.ProviderUnavailableException;
-import com.android.mail.utils.LogUtils;
-
-import java.util.ArrayList;
-
-/**
- * EmailSyncAlarmReceiver (USAR) is used by the SyncManager to start up-syncs of user-modified data
- * back to the Exchange server.
- *
- * Here's how this works for Email, for example:
- *
- * 1) User modifies or deletes an email from the UI.
- * 2) SyncManager, which has a ContentObserver watching the Message class, is alerted to a change
- * 3) SyncManager sets an alarm (to be received by USAR) for a few seconds in the
- * future (currently 15), the delay preventing excess syncing (think of it as a debounce mechanism).
- * 4) ESAR Receiver's onReceive method is called
- * 5) ESAR goes through all change and deletion records and compiles a list of mailboxes which have
- * changes to be uploaded.
- * 6) ESAR calls SyncManager to start syncs of those mailboxes
- *
- * If EmailProvider isn't available, the upsyncs will happen the next time ExchangeService starts
- *
- */
-public class EmailSyncAlarmReceiver extends BroadcastReceiver {
-    final String[] MAILBOX_DATA_PROJECTION = {MessageColumns.MAILBOX_KEY};
-
-    @Override
-    public void onReceive(final Context context, Intent intent) {
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                handleReceive(context);
-            }
-        }).start();
-    }
-
-    private void handleReceive(Context context) {
-        ArrayList<Long> mailboxesToNotify = new ArrayList<Long>();
-        ContentResolver cr = context.getContentResolver();
-
-        // Get a selector for EAS accounts (we don't want to sync on changes to POP/IMAP messages)
-        String selector = SyncManager.getAccountSelector();
-
-        try {
-            // Find all of the deletions
-            Cursor c = cr.query(Message.DELETED_CONTENT_URI, MAILBOX_DATA_PROJECTION, selector,
-                   null, null);
-            if (c == null) throw new ProviderUnavailableException();
-            try {
-                // Keep track of which mailboxes to notify; we'll only notify each one once
-                while (c.moveToNext()) {
-                    long mailboxId = c.getLong(0);
-                    if (!mailboxesToNotify.contains(mailboxId)) {
-                        mailboxesToNotify.add(mailboxId);
-                    }
-                }
-            } finally {
-                c.close();
-            }
-
-            // Now, find changed messages
-            c = cr.query(Message.UPDATED_CONTENT_URI, MAILBOX_DATA_PROJECTION, selector,
-                    null, null);
-            if (c == null) throw new ProviderUnavailableException();
-            try {
-                // Keep track of which mailboxes to notify; we'll only notify each one once
-                while (c.moveToNext()) {
-                    long mailboxId = c.getLong(0);
-                    if (!mailboxesToNotify.contains(mailboxId)) {
-                        mailboxesToNotify.add(mailboxId);
-                    }
-                }
-            } finally {
-                c.close();
-            }
-
-            // Request service from the mailbox
-            for (Long mailboxId: mailboxesToNotify) {
-                SyncManager.serviceRequest(mailboxId, SyncManager.SYNC_UPSYNC);
-            }
-        } catch (ProviderUnavailableException e) {
-            LogUtils.e("EmailSyncAlarmReceiver",
-                    "EmailProvider unavailable; aborting alarm receiver");
-        }
-    }
-}
diff --git a/emailsync/src/com/android/emailsync/FileLogger.java b/emailsync/src/com/android/emailsync/FileLogger.java
deleted file mode 100644
index db8b626..0000000
--- a/emailsync/src/com/android/emailsync/FileLogger.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2009 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.emailsync;
-
-import android.content.Context;
-import android.os.Environment;
-
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Date;
-
-public class FileLogger {
-    private static FileLogger LOGGER = null;
-    private static FileWriter sLogWriter = null;
-    public static String LOG_FILE_NAME =
-        Environment.getExternalStorageDirectory() + "/emaillog.txt";
-
-    public synchronized static FileLogger getLogger (Context c) {
-        LOGGER = new FileLogger();
-        return LOGGER;
-    }
-
-    private FileLogger() {
-        try {
-            sLogWriter = new FileWriter(LOG_FILE_NAME, true);
-        } catch (IOException e) {
-            // Doesn't matter
-        }
-    }
-
-    static public synchronized void close() {
-        if (sLogWriter != null) {
-            try {
-                sLogWriter.close();
-            } catch (IOException e) {
-                // Doesn't matter
-            }
-            sLogWriter = null;
-        }
-    }
-
-    static public synchronized void log(Exception e) {
-        if (sLogWriter != null) {
-            log("Exception", "Stack trace follows...");
-            PrintWriter pw = new PrintWriter(sLogWriter);
-            e.printStackTrace(pw);
-            pw.flush();
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    static public synchronized void log(String prefix, String str) {
-        if (LOGGER == null) {
-            LOGGER = new FileLogger();
-            log("Logger", "\r\n\r\n --- New Log ---");
-        }
-        Date d = new Date();
-        int hr = d.getHours();
-        int min = d.getMinutes();
-        int sec = d.getSeconds();
-
-        // I don't use DateFormat here because (in my experience), it's much slower
-        StringBuffer sb = new StringBuffer(256);
-        sb.append('[');
-        sb.append(hr);
-        sb.append(':');
-        if (min < 10)
-            sb.append('0');
-        sb.append(min);
-        sb.append(':');
-        if (sec < 10) {
-            sb.append('0');
-        }
-        sb.append(sec);
-        sb.append("] ");
-        if (prefix != null) {
-            sb.append(prefix);
-            sb.append("| ");
-        }
-        sb.append(str);
-        sb.append("\r\n");
-        String s = sb.toString();
-
-        if (sLogWriter != null) {
-            try {
-                sLogWriter.write(s);
-                sLogWriter.flush();
-            } catch (IOException e) {
-                // Something might have happened to the sdcard
-                if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
-                    // If the card is mounted and we can create the writer, retry
-                    LOGGER = new FileLogger();
-                    if (sLogWriter != null) {
-                        try {
-                            log("FileLogger", "Exception writing log; recreating...");
-                            log(prefix, str);
-                        } catch (Exception e1) {
-                            // Nothing to do at this point
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/emailsync/src/com/android/emailsync/MailboxAlarmReceiver.java b/emailsync/src/com/android/emailsync/MailboxAlarmReceiver.java
deleted file mode 100644
index 8105799..0000000
--- a/emailsync/src/com/android/emailsync/MailboxAlarmReceiver.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Copyright (C) 2008-2009 Marc Blank
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.emailsync;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-
-/**
- * MailboxAlarmReceiver is used to "wake up" the ExchangeService at the appropriate time(s).  It may
- * also be used for individual sync adapters, but this isn't implemented at the present time.
- *
- */
-public class MailboxAlarmReceiver extends BroadcastReceiver {
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        long mailboxId = intent.getLongExtra("mailbox", SyncManager.EXTRA_MAILBOX_ID);
-        // EXCHANGE_SERVICE_MAILBOX_ID tells us that the service is asking to be started
-        if (mailboxId == SyncManager.SYNC_SERVICE_MAILBOX_ID) {
-            context.startService(new Intent(context, SyncManager.class));
-        } else {
-            SyncManager.alert(context, mailboxId);
-        }
-    }
-}
-
diff --git a/emailsync/src/com/android/emailsync/MessageMoveRequest.java b/emailsync/src/com/android/emailsync/MessageMoveRequest.java
deleted file mode 100644
index a741a98..0000000
--- a/emailsync/src/com/android/emailsync/MessageMoveRequest.java
+++ /dev/null
@@ -1,44 +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.emailsync;
-
-import com.android.emailsync.Request;
-
-/**
- * MessageMoveRequest is the EAS wrapper for requesting a "move to folder"
- */
-public class MessageMoveRequest extends Request {
-    public final long mMailboxId;
-
-    public MessageMoveRequest(long messageId, long mailboxId) {
-        super(messageId);
-        mMailboxId = mailboxId;
-    }
-
-    // MessageMoveRequests are unique by their message id (i.e. it's meaningless to have two
-    // separate message moves queued at the same time)
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof MessageMoveRequest)) return false;
-        return ((MessageMoveRequest)o).mMessageId == mMessageId;
-    }
-
-    @Override
-    public int hashCode() {
-        return (int)mMessageId;
-    }
-}
diff --git a/emailsync/src/com/android/emailsync/Request.java b/emailsync/src/com/android/emailsync/Request.java
deleted file mode 100644
index 655b301..0000000
--- a/emailsync/src/com/android/emailsync/Request.java
+++ /dev/null
@@ -1,38 +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.emailsync;
-
-/**
- * Requests for mailbox actions are handled by subclasses of this abstract class.
- * Three subclasses are now defined: PartRequest (attachment load), MeetingResponseRequest
- * (respond to a meeting invitation), and MessageMoveRequest (move a message to another folder)
- */
-public abstract class Request {
-    public final long mTimeStamp = System.currentTimeMillis();
-    public final long mMessageId;
-
-    public Request(long messageId) {
-        mMessageId = messageId;
-    }
-
-    // Subclasses of Request may have different semantics regarding equality; therefore,
-    // we force them to implement the equals method
-    @Override
-    public abstract boolean equals(Object o);
-    @Override
-    public abstract int hashCode();
-}
diff --git a/emailsync/src/com/android/emailsync/SyncManager.java b/emailsync/src/com/android/emailsync/SyncManager.java
deleted file mode 100644
index 195a0ec..0000000
--- a/emailsync/src/com/android/emailsync/SyncManager.java
+++ /dev/null
@@ -1,2288 +0,0 @@
-/*
- * Copyright (C) 2008-2009 Marc Blank
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.emailsync;
-
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.State;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
-import android.os.Process;
-import android.provider.CalendarContract;
-import android.provider.CalendarContract.Calendars;
-import android.provider.CalendarContract.Events;
-import android.provider.ContactsContract;
-
-import com.android.emailcommon.TempDirectory;
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.Body;
-import com.android.emailcommon.provider.EmailContent.BodyColumns;
-import com.android.emailcommon.provider.EmailContent.MailboxColumns;
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.provider.EmailContent.MessageColumns;
-import com.android.emailcommon.provider.EmailContent.SyncColumns;
-import com.android.emailcommon.provider.HostAuth;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.emailcommon.provider.Policy;
-import com.android.emailcommon.provider.ProviderUnavailableException;
-import com.android.emailcommon.service.AccountServiceProxy;
-import com.android.emailcommon.service.EmailServiceProxy;
-import com.android.emailcommon.service.IEmailServiceCallback.Stub;
-import com.android.emailcommon.service.PolicyServiceProxy;
-import com.android.emailcommon.utility.EmailClientConnectionManager;
-import com.android.emailcommon.utility.Utility;
-import com.android.mail.utils.LogUtils;
-
-import org.apache.http.conn.params.ConnManagerPNames;
-import org.apache.http.conn.params.ConnPerRoute;
-import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.params.BasicHttpParams;
-import org.apache.http.params.HttpParams;
-
-import java.io.FileDescriptor;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.WeakHashMap;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * The SyncServiceManager handles the lifecycle of various sync adapters used by services that
- * cannot rely on the system SyncManager
- *
- * SyncServiceManager uses ContentObservers to detect changes to accounts, mailboxes, & messages in
- * order to maintain proper 2-way syncing of data.  (More documentation to follow)
- *
- */
-public abstract class SyncManager extends Service implements Runnable {
-
-    private static String TAG = "SyncManager";
-
-    // The SyncServiceManager's mailbox "id"
-    public static final int EXTRA_MAILBOX_ID = -1;
-    public static final int SYNC_SERVICE_MAILBOX_ID = 0;
-
-    private static final int SECONDS = 1000;
-    private static final int MINUTES = 60*SECONDS;
-    private static final int ONE_DAY_MINUTES = 1440;
-
-    private static final int SYNC_SERVICE_HEARTBEAT_TIME = 15*MINUTES;
-    private static final int CONNECTIVITY_WAIT_TIME = 10*MINUTES;
-
-    // Sync hold constants for services with transient errors
-    private static final int HOLD_DELAY_MAXIMUM = 4*MINUTES;
-
-    // Reason codes when SyncServiceManager.kick is called (mainly for debugging)
-    // UI has changed data, requiring an upsync of changes
-    public static final int SYNC_UPSYNC = 0;
-    // A scheduled sync (when not using push)
-    public static final int SYNC_SCHEDULED = 1;
-    // Mailbox was marked push
-    public static final int SYNC_PUSH = 2;
-    // A ping (EAS push signal) was received
-    public static final int SYNC_PING = 3;
-    // Misc.
-    public static final int SYNC_KICK = 4;
-    // A part request (attachment load, for now) was sent to SyncServiceManager
-    public static final int SYNC_SERVICE_PART_REQUEST = 5;
-
-    // Requests >= SYNC_CALLBACK_START generate callbacks to the UI
-    public static final int SYNC_CALLBACK_START = 6;
-    // startSync was requested of SyncServiceManager (other than due to user request)
-    public static final int SYNC_SERVICE_START_SYNC = SYNC_CALLBACK_START + 0;
-    // startSync was requested of SyncServiceManager (due to user request)
-    public static final int SYNC_UI_REQUEST = SYNC_CALLBACK_START + 1;
-
-    protected static final String WHERE_IN_ACCOUNT_AND_PUSHABLE =
-        MailboxColumns.ACCOUNT_KEY + "=? and type in (" + Mailbox.TYPE_INBOX + ','
-        + Mailbox.TYPE_EAS_ACCOUNT_MAILBOX + ',' + Mailbox.TYPE_CONTACTS + ','
-        + Mailbox.TYPE_CALENDAR + ')';
-    protected static final String WHERE_IN_ACCOUNT_AND_TYPE_INBOX =
-        MailboxColumns.ACCOUNT_KEY + "=? and type = " + Mailbox.TYPE_INBOX ;
-    private static final String WHERE_MAILBOX_KEY = MessageColumns.MAILBOX_KEY + "=?";
-    private static final String WHERE_NOT_INTERVAL_NEVER_AND_ACCOUNT_KEY_IN =
-        "(" + MailboxColumns.TYPE + '=' + Mailbox.TYPE_OUTBOX
-        + " or " + MailboxColumns.SYNC_INTERVAL + "<" + Mailbox.CHECK_INTERVAL_NEVER + ')'
-        + " and " + MailboxColumns.ACCOUNT_KEY + " in (";
-
-    public static final int SEND_FAILED = 1;
-    public static final String MAILBOX_KEY_AND_NOT_SEND_FAILED =
-            MessageColumns.MAILBOX_KEY + "=? and (" + SyncColumns.SERVER_ID + " is null or " +
-            SyncColumns.SERVER_ID + "!=" + SEND_FAILED + ')';
-
-    public static final String CALENDAR_SELECTION =
-            Calendars.ACCOUNT_NAME + "=? AND " + Calendars.ACCOUNT_TYPE + "=?";
-    private static final String WHERE_CALENDAR_ID = Events.CALENDAR_ID + "=?";
-
-    // Offsets into the syncStatus data for EAS that indicate type, exit status, and change count
-    // The format is S<type_char>:<exit_char>:<change_count>
-    public static final int STATUS_TYPE_CHAR = 1;
-    public static final int STATUS_EXIT_CHAR = 3;
-    public static final int STATUS_CHANGE_COUNT_OFFSET = 5;
-
-    // Ready for ping
-    public static final int PING_STATUS_OK = 0;
-    // Service already running (can't ping)
-    public static final int PING_STATUS_RUNNING = 1;
-    // Service waiting after I/O error (can't ping)
-    public static final int PING_STATUS_WAITING = 2;
-    // Service had a fatal error; can't run
-    public static final int PING_STATUS_UNABLE = 3;
-    // Service is disabled by user (checkbox)
-    public static final int PING_STATUS_DISABLED = 4;
-
-    private static final int MAX_CLIENT_CONNECTION_MANAGER_SHUTDOWNS = 1;
-
-    // We synchronize on this for all actions affecting the service and error maps
-    private static final Object sSyncLock = new Object();
-    // All threads can use this lock to wait for connectivity
-    public static final Object sConnectivityLock = new Object();
-    public static boolean sConnectivityHold = false;
-
-    // Keeps track of running services (by mailbox id)
-    public final HashMap<Long, AbstractSyncService> mServiceMap =
-        new HashMap<Long, AbstractSyncService>();
-    // Keeps track of services whose last sync ended with an error (by mailbox id)
-    /*package*/ public ConcurrentHashMap<Long, SyncError> mSyncErrorMap =
-        new ConcurrentHashMap<Long, SyncError>();
-    // Keeps track of which services require a wake lock (by mailbox id)
-    private final HashMap<Long, Long> mWakeLocks = new HashMap<Long, Long>();
-    // Keeps track of which services have held a wake lock (by mailbox id)
-    private final HashMap<Long, Long> mWakeLocksHistory = new HashMap<Long, Long>();
-    // Keeps track of PendingIntents for mailbox alarms (by mailbox id)
-    private final HashMap<Long, PendingIntent> mPendingIntents = new HashMap<Long, PendingIntent>();
-    // The actual WakeLock obtained by SyncServiceManager
-    private WakeLock mWakeLock = null;
-    // Keep our cached list of active Accounts here
-    public final AccountList mAccountList = new AccountList();
-    // Keep track of when we started up
-    private long mServiceStartTime;
-
-    // Observers that we use to look for changed mail-related data
-    private final Handler mHandler = new Handler();
-    private AccountObserver mAccountObserver;
-    private MailboxObserver mMailboxObserver;
-    private SyncedMessageObserver mSyncedMessageObserver;
-
-    // Concurrent because CalendarSyncAdapter can modify the map during a wipe
-    private final ConcurrentHashMap<Long, CalendarObserver> mCalendarObservers =
-        new ConcurrentHashMap<Long, CalendarObserver>();
-
-    public ContentResolver mResolver;
-
-    // The singleton SyncServiceManager object, with its thread and stop flag
-    protected static SyncManager INSTANCE;
-    protected static Thread sServiceThread = null;
-    // Cached unique device id
-    protected static String sDeviceId = null;
-    // HashMap of ConnectionManagers that all EAS threads can use (by HostAuth id)
-    private static HashMap<Long, EmailClientConnectionManager> sClientConnectionManagers =
-            new HashMap<Long, EmailClientConnectionManager>();
-    // Count of ClientConnectionManager shutdowns
-    private static volatile int sClientConnectionManagerShutdownCount = 0;
-
-    private static volatile boolean sStartingUp = false;
-    private static volatile boolean sStop = false;
-
-    // The reason for SyncServiceManager's next wakeup call
-    private String mNextWaitReason;
-    // Whether we have an unsatisfied "kick" pending
-    private boolean mKicked = false;
-
-    // Receiver of connectivity broadcasts
-    private ConnectivityReceiver mConnectivityReceiver = null;
-    // The most current NetworkInfo (from ConnectivityManager)
-    private NetworkInfo mNetworkInfo;
-
-    // For sync logging
-    protected static boolean sUserLog = false;
-    protected static boolean sFileLog = false;
-
-    /**
-     * Return an AccountObserver for this manager; the subclass must implement the newAccount()
-     * method, which is called whenever the observer discovers that a new account has been created.
-     * The subclass should do any housekeeping necessary
-     * @param handler a Handler
-     * @return the AccountObserver
-     */
-    public abstract AccountObserver getAccountObserver(Handler handler);
-
-    /**
-     * Perform any housekeeping necessary upon startup of the manager
-     */
-    public abstract void onStartup();
-
-    /**
-     * Returns a String that can be used as a WHERE clause in SQLite that selects accounts whose
-     * syncs are managed by this manager
-     * @return the account selector String
-     */
-    public abstract String getAccountsSelector();
-
-    /**
-     * Returns an appropriate sync service for the passed in mailbox
-     * @param context the caller's context
-     * @param mailbox the Mailbox to be synced
-     * @return a service that will sync the Mailbox
-     */
-    public abstract AbstractSyncService getServiceForMailbox(Context context, Mailbox mailbox);
-
-    /**
-     * Return a list of all Accounts in EmailProvider.  Because the result of this call may be used
-     * in account reconciliation, an exception is thrown if the result cannot be guaranteed accurate
-     * @param context the caller's context
-     * @param accounts a list that Accounts will be added into
-     * @return the list of Accounts
-     * @throws ProviderUnavailableException if the list of Accounts cannot be guaranteed valid
-     */
-    public abstract AccountList collectAccounts(Context context, AccountList accounts);
-
-    /**
-     * Returns the AccountManager type (e.g. com.android.exchange) for this sync service
-     */
-    public abstract String getAccountManagerType();
-
-    /**
-     * Returns the intent used for this sync service
-     */
-    public abstract Intent getServiceIntent();
-
-    /**
-     * Returns the callback proxy used for communicating back with the Email app
-     */
-    public abstract Stub getCallbackProxy();
-
-    /**
-     * Called when a sync service has started (in case any action is needed). This method must
-     * not perform any long-lived actions (db access, network access, etc)
-     */
-    public abstract void onStartService(Mailbox mailbox);
-
-    public class AccountList extends ArrayList<Account> {
-        private static final long serialVersionUID = 1L;
-
-        private final WeakHashMap<Account, android.accounts.Account> mAmMap =
-                new WeakHashMap<Account, android.accounts.Account>();
-
-        @Override
-        public boolean add(Account account) {
-            // Cache the account manager account
-            mAmMap.put(account, account.getAccountManagerAccount(getAccountManagerType()));
-            super.add(account);
-            return true;
-        }
-
-        public android.accounts.Account getAmAccount(Account account) {
-            return mAmMap.get(account);
-        }
-
-        public boolean contains(long id) {
-            for (Account account : this) {
-                if (account.mId == id) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public Account getById(long id) {
-            for (Account account : this) {
-                if (account.mId == id) {
-                    return account;
-                }
-            }
-            return null;
-        }
-
-        public Account getByName(String accountName) {
-            for (Account account : this) {
-                if (account.mEmailAddress.equalsIgnoreCase(accountName)) {
-                    return account;
-                }
-            }
-            return null;
-        }
-    }
-
-    public static void setUserDebug(int state) {
-        sUserLog = (state & EmailServiceProxy.DEBUG_BIT) != 0;
-        sFileLog = (state & EmailServiceProxy.DEBUG_FILE_BIT) != 0;
-        if (sFileLog) {
-            sUserLog = true;
-        }
-        LogUtils.d("Sync Debug", "Logging: " + (sUserLog ? "User " : "")
-                + (sFileLog ? "File" : ""));
-    }
-
-    private static boolean onSecurityHold(Account account) {
-        return (account.mFlags & Account.FLAGS_SECURITY_HOLD) != 0;
-    }
-
-    public static String getAccountSelector() {
-        SyncManager ssm = INSTANCE;
-        if (ssm == null) return "";
-        return ssm.getAccountsSelector();
-    }
-
-    public abstract class AccountObserver extends ContentObserver {
-        String mSyncableMailboxSelector = null;
-        String mAccountSelector = null;
-
-        // Runs when SyncServiceManager first starts
-        @SuppressWarnings("deprecation")
-        public AccountObserver(Handler handler) {
-            super(handler);
-            // At startup, we want to see what EAS accounts exist and cache them
-            // TODO: Move database work out of UI thread
-            Context context = getContext();
-            synchronized (mAccountList) {
-                try {
-                    collectAccounts(context, mAccountList);
-                } catch (ProviderUnavailableException e) {
-                    // Just leave if EmailProvider is unavailable
-                    return;
-                }
-                // Create an account mailbox for any account without one
-                for (Account account : mAccountList) {
-                    int cnt = Mailbox.count(context, Mailbox.CONTENT_URI, "accountKey="
-                            + account.mId, null);
-                    if (cnt == 0) {
-                        // This case handles a newly created account
-                        newAccount(account.mId);
-                    }
-                }
-            }
-            // Run through accounts and update account hold information
-            Utility.runAsync(new Runnable() {
-                @Override
-                public void run() {
-                    synchronized (mAccountList) {
-                        for (Account account : mAccountList) {
-                            if (onSecurityHold(account)) {
-                                // If we're in a security hold, and our policies are active, release
-                                // the hold
-                                if (PolicyServiceProxy.isActive(SyncManager.this, null)) {
-                                    PolicyServiceProxy.setAccountHoldFlag(SyncManager.this,
-                                            account, false);
-                                    log("isActive true; release hold for " + account.mDisplayName);
-                                }
-                            }
-                        }
-                    }
-                }});
-        }
-
-        /**
-         * Returns a String suitable for appending to a where clause that selects for all syncable
-         * mailboxes in all eas accounts
-         * @return a complex selection string that is not to be cached
-         */
-        public String getSyncableMailboxWhere() {
-            if (mSyncableMailboxSelector == null) {
-                StringBuilder sb = new StringBuilder(WHERE_NOT_INTERVAL_NEVER_AND_ACCOUNT_KEY_IN);
-                boolean first = true;
-                synchronized (mAccountList) {
-                    for (Account account : mAccountList) {
-                        if (!first) {
-                            sb.append(',');
-                        } else {
-                            first = false;
-                        }
-                        sb.append(account.mId);
-                    }
-                }
-                sb.append(')');
-                mSyncableMailboxSelector = sb.toString();
-            }
-            return mSyncableMailboxSelector;
-        }
-
-        private void onAccountChanged() {
-            try {
-                maybeStartSyncServiceManagerThread();
-                Context context = getContext();
-
-                // A change to the list requires us to scan for deletions (stop running syncs)
-                // At startup, we want to see what accounts exist and cache them
-                AccountList currentAccounts = new AccountList();
-                try {
-                    collectAccounts(context, currentAccounts);
-                } catch (ProviderUnavailableException e) {
-                    // Just leave if EmailProvider is unavailable
-                    return;
-                }
-                synchronized (mAccountList) {
-                    for (Account account : mAccountList) {
-                        boolean accountIncomplete =
-                            (account.mFlags & Account.FLAGS_INCOMPLETE) != 0;
-                        // If the current list doesn't include this account and the account wasn't
-                        // incomplete, then this is a deletion
-                        if (!currentAccounts.contains(account.mId) && !accountIncomplete) {
-                            // The implication is that the account has been deleted; let's find out
-                            alwaysLog("Observer found deleted account: " + account.mDisplayName);
-                            // Run the reconciler (the reconciliation itself runs in the Email app)
-                            runAccountReconcilerSync(SyncManager.this);
-                            // See if the account is still around
-                            Account deletedAccount =
-                                Account.restoreAccountWithId(context, account.mId);
-                            if (deletedAccount != null) {
-                                // It is; add it to our account list
-                                alwaysLog("Account still in provider: " + account.mDisplayName);
-                                currentAccounts.add(account);
-                            } else {
-                                // It isn't; stop syncs and clear our selectors
-                                alwaysLog("Account deletion confirmed: " + account.mDisplayName);
-                                stopAccountSyncs(account.mId, true);
-                                mSyncableMailboxSelector = null;
-                                mAccountSelector = null;
-                            }
-                        } else {
-                            // Get the newest version of this account
-                            Account updatedAccount =
-                                Account.restoreAccountWithId(context, account.mId);
-                            if (updatedAccount == null) continue;
-                            if (account.mSyncInterval != updatedAccount.mSyncInterval
-                                    || account.mSyncLookback != updatedAccount.mSyncLookback) {
-                                // Set the inbox interval to the interval of the Account
-                                // This setting should NOT affect other boxes
-                                ContentValues cv = new ContentValues();
-                                cv.put(MailboxColumns.SYNC_INTERVAL, updatedAccount.mSyncInterval);
-                                getContentResolver().update(Mailbox.CONTENT_URI, cv,
-                                        WHERE_IN_ACCOUNT_AND_TYPE_INBOX, new String[] {
-                                        Long.toString(account.mId)
-                                });
-                                // Stop all current syncs; the appropriate ones will restart
-                                log("Account " + account.mDisplayName + " changed; stop syncs");
-                                stopAccountSyncs(account.mId, true);
-                            }
-
-                            // See if this account is no longer on security hold
-                            if (onSecurityHold(account) && !onSecurityHold(updatedAccount)) {
-                                releaseSyncHolds(SyncManager.this,
-                                        AbstractSyncService.EXIT_SECURITY_FAILURE, account);
-                            }
-
-                            // Put current values into our cached account
-                            account.mSyncInterval = updatedAccount.mSyncInterval;
-                            account.mSyncLookback = updatedAccount.mSyncLookback;
-                            account.mFlags = updatedAccount.mFlags;
-                        }
-                    }
-                    // Look for new accounts
-                    for (Account account : currentAccounts) {
-                        if (!mAccountList.contains(account.mId)) {
-                            // Don't forget to cache the HostAuth
-                            HostAuth ha = HostAuth.restoreHostAuthWithId(getContext(),
-                                    account.mHostAuthKeyRecv);
-                            if (ha == null) continue;
-                            account.mHostAuthRecv = ha;
-                            // This is an addition; create our magic hidden mailbox...
-                            log("Account observer found new account: " + account.mDisplayName);
-                            newAccount(account.mId);
-                            mAccountList.add(account);
-                            mSyncableMailboxSelector = null;
-                            mAccountSelector = null;
-                        }
-                    }
-                    // Finally, make sure our account list is up to date
-                    mAccountList.clear();
-                    mAccountList.addAll(currentAccounts);
-                }
-
-                // See if there's anything to do...
-                kick("account changed");
-            } catch (ProviderUnavailableException e) {
-                alwaysLog("Observer failed; provider unavailable");
-            }
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            new Thread(new Runnable() {
-               @Override
-            public void run() {
-                   onAccountChanged();
-                }}, "Account Observer").start();
-        }
-
-        public abstract void newAccount(long acctId);
-    }
-
-    /**
-     * Register a specific Calendar's data observer; we need to recognize when the SYNC_EVENTS
-     * column has changed (when sync has turned off or on)
-     * @param account the Account whose Calendar we're observing
-     */
-    private void registerCalendarObserver(Account account) {
-        // Get a new observer
-        CalendarObserver observer = new CalendarObserver(mHandler, account);
-        if (observer.mCalendarId != 0) {
-            // If we find the Calendar (and we'd better) register it and store it in the map
-            mCalendarObservers.put(account.mId, observer);
-            mResolver.registerContentObserver(
-                    ContentUris.withAppendedId(Calendars.CONTENT_URI, observer.mCalendarId), false,
-                    observer);
-        }
-    }
-
-    /**
-     * Unregister all CalendarObserver's
-     */
-    static public void unregisterCalendarObservers() {
-        SyncManager ssm = INSTANCE;
-        if (ssm == null) return;
-        ContentResolver resolver = ssm.mResolver;
-        for (CalendarObserver observer: ssm.mCalendarObservers.values()) {
-            resolver.unregisterContentObserver(observer);
-        }
-        ssm.mCalendarObservers.clear();
-    }
-
-    public static Uri asSyncAdapter(Uri uri, String account, String accountType) {
-        return uri.buildUpon().appendQueryParameter(CalendarContract.CALLER_IS_SYNCADAPTER, "true")
-                .appendQueryParameter(Calendars.ACCOUNT_NAME, account)
-                .appendQueryParameter(Calendars.ACCOUNT_TYPE, accountType).build();
-    }
-
-    /**
-     * Return the syncable state of an account's calendar, as determined by the sync_events column
-     * of our Calendar (from CalendarProvider2)
-     * Note that the current state of sync_events is cached in our CalendarObserver
-     * @param accountId the id of the account whose calendar we are checking
-     * @return whether or not syncing of events is enabled
-     */
-    private boolean isCalendarEnabled(long accountId) {
-        CalendarObserver observer = mCalendarObservers.get(accountId);
-        if (observer != null) {
-            return (observer.mSyncEvents == 1);
-        }
-        // If there's no observer, there's no Calendar in CalendarProvider2, so we return true
-        // to allow Calendar creation
-        return true;
-    }
-
-    private class CalendarObserver extends ContentObserver {
-        final long mAccountId;
-        final String mAccountName;
-        long mCalendarId;
-        long mSyncEvents;
-
-        public CalendarObserver(Handler handler, Account account) {
-            super(handler);
-            mAccountId = account.mId;
-            mAccountName = account.mEmailAddress;
-            // Find the Calendar for this account
-            Cursor c = mResolver.query(Calendars.CONTENT_URI,
-                    new String[] {Calendars._ID, Calendars.SYNC_EVENTS},
-                    CALENDAR_SELECTION,
-                    new String[] {account.mEmailAddress, getAccountManagerType()},
-                    null);
-            if (c != null) {
-                // Save its id and its sync events status
-                try {
-                    if (c.moveToFirst()) {
-                        mCalendarId = c.getLong(0);
-                        mSyncEvents = c.getLong(1);
-                    }
-                } finally {
-                    c.close();
-                }
-            }
-        }
-
-        @Override
-        public synchronized void onChange(boolean selfChange) {
-            // See if the user has changed syncing of our calendar
-            if (!selfChange) {
-                new Thread(new Runnable() {
-                    @Override
-                    public void run() {
-                        try {
-                            Cursor c = mResolver.query(Calendars.CONTENT_URI,
-                                    new String[] {Calendars.SYNC_EVENTS}, Calendars._ID + "=?",
-                                    new String[] {Long.toString(mCalendarId)}, null);
-                            if (c == null) return;
-                            // Get its sync events; if it's changed, we've got work to do
-                            try {
-                                if (c.moveToFirst()) {
-                                    long newSyncEvents = c.getLong(0);
-                                    if (newSyncEvents != mSyncEvents) {
-                                        log("_sync_events changed for calendar in " + mAccountName);
-                                        Mailbox mailbox = Mailbox.restoreMailboxOfType(INSTANCE,
-                                                mAccountId, Mailbox.TYPE_CALENDAR);
-                                        // Sanity check for mailbox deletion
-                                        if (mailbox == null) return;
-                                        ContentValues cv = new ContentValues();
-                                        if (newSyncEvents == 0) {
-                                            // When sync is disabled, we're supposed to delete
-                                            // all events in the calendar
-                                            log("Deleting events and setting syncKey to 0 for " +
-                                                    mAccountName);
-                                            // First, stop any sync that's ongoing
-                                            stopManualSync(mailbox.mId);
-                                            // Set the syncKey to 0 (reset)
-                                            AbstractSyncService service = getServiceForMailbox(
-                                                    INSTANCE, mailbox);
-                                            service.resetCalendarSyncKey();
-                                            // Reset the sync key locally and stop syncing
-                                            cv.put(Mailbox.SYNC_KEY, "0");
-                                            cv.put(Mailbox.SYNC_INTERVAL,
-                                                    Mailbox.CHECK_INTERVAL_NEVER);
-                                            mResolver.update(ContentUris.withAppendedId(
-                                                    Mailbox.CONTENT_URI, mailbox.mId), cv, null,
-                                                    null);
-                                            // Delete all events using the sync adapter
-                                            // parameter so that the deletion is only local
-                                            Uri eventsAsSyncAdapter =
-                                                asSyncAdapter(
-                                                    Events.CONTENT_URI,
-                                                    mAccountName,
-                                                    getAccountManagerType());
-                                            mResolver.delete(eventsAsSyncAdapter, WHERE_CALENDAR_ID,
-                                                    new String[] {Long.toString(mCalendarId)});
-                                        } else {
-                                            // Make this a push mailbox and kick; this will start
-                                            // a resync of the Calendar; the account mailbox will
-                                            // ping on this during the next cycle of the ping loop
-                                            cv.put(Mailbox.SYNC_INTERVAL,
-                                                    Mailbox.CHECK_INTERVAL_PUSH);
-                                            mResolver.update(ContentUris.withAppendedId(
-                                                    Mailbox.CONTENT_URI, mailbox.mId), cv, null,
-                                                    null);
-                                            kick("calendar sync changed");
-                                        }
-
-                                        // Save away the new value
-                                        mSyncEvents = newSyncEvents;
-                                    }
-                                }
-                            } finally {
-                                c.close();
-                            }
-                        } catch (ProviderUnavailableException e) {
-                            LogUtils.w(TAG, "Observer failed; provider unavailable");
-                        }
-                    }}, "Calendar Observer").start();
-            }
-        }
-    }
-
-    private class MailboxObserver extends ContentObserver {
-        public MailboxObserver(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            // See if there's anything to do...
-            if (!selfChange) {
-                kick("mailbox changed");
-            }
-        }
-    }
-
-    private class SyncedMessageObserver extends ContentObserver {
-        Intent syncAlarmIntent = new Intent(INSTANCE, EmailSyncAlarmReceiver.class);
-        PendingIntent syncAlarmPendingIntent =
-            PendingIntent.getBroadcast(INSTANCE, 0, syncAlarmIntent, 0);
-        AlarmManager alarmManager = (AlarmManager)INSTANCE.getSystemService(Context.ALARM_SERVICE);
-
-        public SyncedMessageObserver(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            alarmManager.set(AlarmManager.RTC_WAKEUP,
-                    System.currentTimeMillis() + 10*SECONDS, syncAlarmPendingIntent);
-        }
-    }
-
-    static public Account getAccountById(long accountId) {
-        SyncManager ssm = INSTANCE;
-        if (ssm != null) {
-            AccountList accountList = ssm.mAccountList;
-            synchronized (accountList) {
-                return accountList.getById(accountId);
-            }
-        }
-        return null;
-    }
-
-    static public Account getAccountByName(String accountName) {
-        SyncManager ssm = INSTANCE;
-        if (ssm != null) {
-            AccountList accountList = ssm.mAccountList;
-            synchronized (accountList) {
-                return accountList.getByName(accountName);
-            }
-        }
-        return null;
-    }
-
-    public class SyncStatus {
-        static public final int NOT_RUNNING = 0;
-        static public final int DIED = 1;
-        static public final int SYNC = 2;
-        static public final int IDLE = 3;
-    }
-
-    /*package*/ public class SyncError {
-        int reason;
-        public boolean fatal = false;
-        long holdDelay = 15*SECONDS;
-        public long holdEndTime = System.currentTimeMillis() + holdDelay;
-
-        public SyncError(int _reason, boolean _fatal) {
-            reason = _reason;
-            fatal = _fatal;
-        }
-
-        /**
-         * We double the holdDelay from 15 seconds through 8 mins
-         */
-        void escalate() {
-            if (holdDelay <= HOLD_DELAY_MAXIMUM) {
-                holdDelay *= 2;
-            }
-            holdEndTime = System.currentTimeMillis() + holdDelay;
-        }
-    }
-
-    private void logSyncHolds() {
-        if (sUserLog) {
-            log("Sync holds:");
-            long time = System.currentTimeMillis();
-            for (long mailboxId : mSyncErrorMap.keySet()) {
-                Mailbox m = Mailbox.restoreMailboxWithId(this, mailboxId);
-                if (m == null) {
-                    log("Mailbox " + mailboxId + " no longer exists");
-                } else {
-                    SyncError error = mSyncErrorMap.get(mailboxId);
-                    if (error != null) {
-                        log("Mailbox " + m.mDisplayName + ", error = " + error.reason
-                                + ", fatal = " + error.fatal);
-                        if (error.holdEndTime > 0) {
-                            log("Hold ends in " + ((error.holdEndTime - time) / 1000) + "s");
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Release security holds for the specified account
-     * @param account the account whose Mailboxes should be released from security hold
-     */
-    static public void releaseSecurityHold(Account account) {
-        SyncManager ssm = INSTANCE;
-        if (ssm != null) {
-            ssm.releaseSyncHolds(INSTANCE, AbstractSyncService.EXIT_SECURITY_FAILURE,
-                    account);
-        }
-    }
-
-    /**
-     * Release a specific type of hold (the reason) for the specified Account; if the account
-     * is null, mailboxes from all accounts with the specified hold will be released
-     * @param reason the reason for the SyncError (AbstractSyncService.EXIT_XXX)
-     * @param account an Account whose mailboxes should be released (or all if null)
-     * @return whether or not any mailboxes were released
-     */
-    public /*package*/ boolean releaseSyncHolds(Context context, int reason, Account account) {
-        boolean holdWasReleased = releaseSyncHoldsImpl(context, reason, account);
-        kick("security release");
-        return holdWasReleased;
-    }
-
-    private boolean releaseSyncHoldsImpl(Context context, int reason, Account account) {
-        boolean holdWasReleased = false;
-        for (long mailboxId: mSyncErrorMap.keySet()) {
-            if (account != null) {
-                Mailbox m = Mailbox.restoreMailboxWithId(context, mailboxId);
-                if (m == null) {
-                    mSyncErrorMap.remove(mailboxId);
-                } else if (m.mAccountKey != account.mId) {
-                    continue;
-                }
-            }
-            SyncError error = mSyncErrorMap.get(mailboxId);
-            if (error != null && error.reason == reason) {
-                mSyncErrorMap.remove(mailboxId);
-                holdWasReleased = true;
-            }
-        }
-        return holdWasReleased;
-    }
-
-    public static void log(String str) {
-        log(TAG, str);
-    }
-
-    public static void log(String tag, String str) {
-        if (sUserLog) {
-            LogUtils.d(tag, str);
-            if (sFileLog) {
-                FileLogger.log(tag, str);
-            }
-        }
-    }
-
-    public static void alwaysLog(String str) {
-        if (!sUserLog) {
-            LogUtils.d(TAG, str);
-        } else {
-            log(str);
-        }
-    }
-
-    /**
-     * EAS requires a unique device id, so that sync is possible from a variety of different
-     * devices (e.g. the syncKey is specific to a device)  If we're on an emulator or some other
-     * device that doesn't provide one, we can create it as "device".
-     * This would work on a real device as well, but it would be better to use the "real" id if
-     * it's available
-     */
-    static public String getDeviceId(Context context) {
-        if (sDeviceId == null) {
-            sDeviceId = new AccountServiceProxy(context).getDeviceId();
-            alwaysLog("Received deviceId from Email app: " + sDeviceId);
-        }
-        return sDeviceId;
-    }
-
-    static public ConnPerRoute sConnPerRoute = new ConnPerRoute() {
-        @Override
-        public int getMaxForRoute(HttpRoute route) {
-            return 8;
-        }
-    };
-
-    static public synchronized EmailClientConnectionManager getClientConnectionManager(
-            Context context, HostAuth hostAuth) {
-        // We'll use a different connection manager for each HostAuth
-        EmailClientConnectionManager mgr = null;
-        // We don't save managers for validation/autodiscover
-        if (hostAuth.mId != HostAuth.NOT_SAVED) {
-            mgr = sClientConnectionManagers.get(hostAuth.mId);
-        }
-        if (mgr == null) {
-            // After two tries, kill the process.  Most likely, this will happen in the background
-            // The service will restart itself after about 5 seconds
-            if (sClientConnectionManagerShutdownCount > MAX_CLIENT_CONNECTION_MANAGER_SHUTDOWNS) {
-                alwaysLog("Shutting down process to unblock threads");
-                Process.killProcess(Process.myPid());
-            }
-            HttpParams params = new BasicHttpParams();
-            params.setIntParameter(ConnManagerPNames.MAX_TOTAL_CONNECTIONS, 25);
-            params.setParameter(ConnManagerPNames.MAX_CONNECTIONS_PER_ROUTE, sConnPerRoute);
-            boolean ssl = hostAuth.shouldUseSsl();
-            int port = hostAuth.mPort;
-            mgr = EmailClientConnectionManager.newInstance(context, params, hostAuth);
-            log("Creating connection manager for port " + port + ", ssl: " + ssl);
-            sClientConnectionManagers.put(hostAuth.mId, mgr);
-        }
-        // Null is a valid return result if we get an exception
-        return mgr;
-    }
-
-    static private synchronized void shutdownConnectionManager() {
-        log("Shutting down ClientConnectionManagers");
-        for (EmailClientConnectionManager mgr: sClientConnectionManagers.values()) {
-            mgr.shutdown();
-        }
-        sClientConnectionManagers.clear();
-    }
-
-    public static void stopAccountSyncs(long acctId) {
-        SyncManager ssm = INSTANCE;
-        if (ssm != null) {
-            ssm.stopAccountSyncs(acctId, true);
-        }
-    }
-
-    public void stopAccountSyncs(long acctId, boolean includeAccountMailbox) {
-        synchronized (sSyncLock) {
-            List<Long> deletedBoxes = new ArrayList<Long>();
-            for (Long mid : mServiceMap.keySet()) {
-                Mailbox box = Mailbox.restoreMailboxWithId(this, mid);
-                if (box != null) {
-                    if (box.mAccountKey == acctId) {
-                        if (!includeAccountMailbox &&
-                                box.mType == Mailbox.TYPE_EAS_ACCOUNT_MAILBOX) {
-                            AbstractSyncService svc = mServiceMap.get(mid);
-                            if (svc != null) {
-                                svc.stop();
-                            }
-                            continue;
-                        }
-                        AbstractSyncService svc = mServiceMap.get(mid);
-                        if (svc != null) {
-                            svc.stop();
-                            Thread t = svc.mThread;
-                            if (t != null) {
-                                t.interrupt();
-                            }
-                        }
-                        deletedBoxes.add(mid);
-                    }
-                }
-            }
-            for (Long mid : deletedBoxes) {
-                releaseMailbox(mid);
-            }
-        }
-    }
-
-    /**
-     * Informs SyncServiceManager that an account has a new folder list; as a result, any existing
-     * folder might have become invalid.  Therefore, we act as if the account has been deleted, and
-     * then we reinitialize it.
-     *
-     * @param acctId
-     */
-    static public void stopNonAccountMailboxSyncsForAccount(long acctId) {
-        SyncManager ssm = INSTANCE;
-        if (ssm != null) {
-            ssm.stopAccountSyncs(acctId, false);
-            kick("reload folder list");
-        }
-    }
-
-    private boolean hasWakeLock(long id) {
-        synchronized (mWakeLocks) {
-            return mWakeLocks.get(id) != null;
-        }
-    }
-
-    private void acquireWakeLock(long id) {
-        synchronized (mWakeLocks) {
-            Long lock = mWakeLocks.get(id);
-            if (lock == null) {
-                if (mWakeLock == null) {
-                    PowerManager pm = (PowerManager)getSystemService(Context.POWER_SERVICE);
-                    mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "MAIL_SERVICE");
-                    mWakeLock.acquire();
-                }
-                mWakeLocks.put(id, System.currentTimeMillis());
-             }
-        }
-    }
-
-    private void releaseWakeLock(long id) {
-        synchronized (mWakeLocks) {
-            Long lock = mWakeLocks.get(id);
-            if (lock != null) {
-                Long startTime = mWakeLocks.remove(id);
-                Long historicalTime = mWakeLocksHistory.get(id);
-                if (historicalTime == null) {
-                    historicalTime = 0L;
-                }
-                mWakeLocksHistory.put(id,
-                        historicalTime + (System.currentTimeMillis() - startTime));
-                if (mWakeLocks.isEmpty()) {
-                    if (mWakeLock != null) {
-                        mWakeLock.release();
-                    }
-                    mWakeLock = null;
-                } else {
-                    log("Release request for lock not held: " + id);
-                }
-            }
-        }
-    }
-
-    static public String alarmOwner(long id) {
-        if (id == EXTRA_MAILBOX_ID) {
-            return TAG;
-        } else {
-            String name = Long.toString(id);
-            if (sUserLog && INSTANCE != null) {
-                Mailbox m = Mailbox.restoreMailboxWithId(INSTANCE, id);
-                if (m != null) {
-                    name = m.mDisplayName + '(' + m.mAccountKey + ')';
-                }
-            }
-            return "Mailbox " + name;
-        }
-    }
-
-    private void clearAlarm(long id) {
-        synchronized (mPendingIntents) {
-            PendingIntent pi = mPendingIntents.get(id);
-            if (pi != null) {
-                AlarmManager alarmManager = (AlarmManager)getSystemService(Context.ALARM_SERVICE);
-                alarmManager.cancel(pi);
-                //log("+Alarm cleared for " + alarmOwner(id));
-                mPendingIntents.remove(id);
-            }
-        }
-    }
-
-    private void setAlarm(long id, long millis) {
-        synchronized (mPendingIntents) {
-            PendingIntent pi = mPendingIntents.get(id);
-            if (pi == null) {
-                Intent i = new Intent(this, MailboxAlarmReceiver.class);
-                i.putExtra("mailbox", id);
-                i.setData(Uri.parse("Box" + id));
-                pi = PendingIntent.getBroadcast(this, 0, i, 0);
-                mPendingIntents.put(id, pi);
-
-                AlarmManager alarmManager = (AlarmManager)getSystemService(Context.ALARM_SERVICE);
-                alarmManager.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + millis, pi);
-                //log("+Alarm set for " + alarmOwner(id) + ", " + millis/1000 + "s");
-            }
-        }
-    }
-
-    private void clearAlarms() {
-        AlarmManager alarmManager = (AlarmManager)getSystemService(Context.ALARM_SERVICE);
-        synchronized (mPendingIntents) {
-            for (PendingIntent pi : mPendingIntents.values()) {
-                alarmManager.cancel(pi);
-            }
-            mPendingIntents.clear();
-        }
-    }
-
-    static public boolean isHoldingWakeLock(long id) {
-        SyncManager ssm = INSTANCE;
-        if (ssm != null) {
-            return ssm.hasWakeLock(id);
-        }
-        return false;
-    }
-
-    static public void runAwake(long id) {
-        SyncManager ssm = INSTANCE;
-        if (ssm != null) {
-            ssm.acquireWakeLock(id);
-            ssm.clearAlarm(id);
-        }
-    }
-
-    static public void runAsleep(long id, long millis) {
-        SyncManager ssm = INSTANCE;
-        if (ssm != null) {
-            ssm.setAlarm(id, millis);
-            ssm.releaseWakeLock(id);
-        }
-    }
-
-    static public void clearWatchdogAlarm(long id) {
-        SyncManager ssm = INSTANCE;
-        if (ssm != null) {
-            ssm.clearAlarm(id);
-        }
-    }
-
-    static public void setWatchdogAlarm(long id, long millis) {
-        SyncManager ssm = INSTANCE;
-        if (ssm != null) {
-            ssm.setAlarm(id, millis);
-        }
-    }
-
-    static public void alert(Context context, final long id) {
-        final SyncManager ssm = INSTANCE;
-        checkSyncManagerRunning();
-        if (id < 0) {
-            log("SyncServiceManager alert");
-            kick("ping SyncServiceManager");
-        } else if (ssm == null) {
-            context.startService(new Intent(context, SyncManager.class));
-        } else {
-            final AbstractSyncService service = ssm.getRunningService(id);
-            if (service != null) {
-                // Handle alerts in a background thread, as we are typically called from a
-                // broadcast receiver, and are therefore running in the UI thread
-                String threadName = "SyncServiceManager Alert: ";
-                if (service.mMailbox != null) {
-                    threadName += service.mMailbox.mDisplayName;
-                }
-                new Thread(new Runnable() {
-                   @Override
-                public void run() {
-                       Mailbox m = Mailbox.restoreMailboxWithId(ssm, id);
-                       if (m != null) {
-                           // We ignore drafts completely (doesn't sync).  Changes in Outbox are
-                           // handled in the checkMailboxes loop, so we can ignore these pings.
-                           if (sUserLog) {
-                               LogUtils.d(TAG, "Alert for mailbox " + id + " ("
-                                       + m.mDisplayName + ")");
-                           }
-                           if (m.mType == Mailbox.TYPE_DRAFTS || m.mType == Mailbox.TYPE_OUTBOX) {
-                               String[] args = new String[] {Long.toString(m.mId)};
-                               ContentResolver resolver = INSTANCE.mResolver;
-                               resolver.delete(Message.DELETED_CONTENT_URI, WHERE_MAILBOX_KEY,
-                                       args);
-                               resolver.delete(Message.UPDATED_CONTENT_URI, WHERE_MAILBOX_KEY,
-                                       args);
-                               return;
-                           }
-                           service.mAccount = Account.restoreAccountWithId(INSTANCE, m.mAccountKey);
-                           service.mMailbox = m;
-                           // Send the alarm to the sync service
-                           if (!service.alarm()) {
-                               // A false return means that we were forced to interrupt the thread
-                               // In this case, we release the mailbox so that we can start another
-                               // thread to do the work
-                               log("Alarm failed; releasing mailbox");
-                               synchronized(sSyncLock) {
-                                   ssm.releaseMailbox(id);
-                               }
-                               // Shutdown the connection manager; this should close all of our
-                               // sockets and generate IOExceptions all around.
-                               SyncManager.shutdownConnectionManager();
-                           }
-                       }
-                    }}, threadName).start();
-            }
-        }
-    }
-
-    public class ConnectivityReceiver extends BroadcastReceiver {
-        @SuppressWarnings("deprecation")
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            Bundle b = intent.getExtras();
-            if (b != null) {
-                NetworkInfo a = (NetworkInfo)b.get(ConnectivityManager.EXTRA_NETWORK_INFO);
-                String info = "Connectivity alert for " + a.getTypeName();
-                State state = a.getState();
-                if (state == State.CONNECTED) {
-                    info += " CONNECTED";
-                    log(info);
-                    synchronized (sConnectivityLock) {
-                        sConnectivityLock.notifyAll();
-                    }
-                    kick("connected");
-                } else if (state == State.DISCONNECTED) {
-                    info += " DISCONNECTED";
-                    log(info);
-                    kick("disconnected");
-                }
-            }
-        }
-    }
-
-    /**
-     * Starts a service thread and enters it into the service map
-     * This is the point of instantiation of all sync threads
-     * @param service the service to start
-     */
-    private void startServiceThread(AbstractSyncService service) {
-        final Mailbox mailbox = service.mMailbox;
-        synchronized (sSyncLock) {
-            String mailboxName = mailbox.mDisplayName;
-            String accountName = service.mAccount.mDisplayName;
-            Thread thread = new Thread(service, mailboxName + "[" + accountName + "]");
-            log("Starting thread for " + mailboxName + " in account " + accountName);
-            thread.start();
-            mServiceMap.put(mailbox.mId, service);
-            runAwake(mailbox.mId);
-        }
-        onStartService(mailbox);
-    }
-
-    private void requestSync(Mailbox m, int reason, Request req) {
-        int syncStatus = EmailContent.SYNC_STATUS_BACKGROUND;
-        // Don't sync if there's no connectivity
-        if (sConnectivityHold || (m == null) || sStop) {
-            return;
-        }
-        synchronized (sSyncLock) {
-            Account acct = Account.restoreAccountWithId(this, m.mAccountKey);
-            if (acct != null) {
-                // Always make sure there's not a running instance of this service
-                AbstractSyncService service = mServiceMap.get(m.mId);
-                if (service == null) {
-                    service = getServiceForMailbox(this, m);
-                    if (!service.mIsValid) return;
-                    service.mSyncReason = reason;
-                    if (req != null) {
-                        service.addRequest(req);
-                    }
-                    startServiceThread(service);
-                    if (reason >= SYNC_CALLBACK_START) {
-                        syncStatus = EmailContent.SYNC_STATUS_USER;
-                    }
-                    setMailboxSyncStatus(m.mId, syncStatus);
-                }
-            }
-        }
-    }
-
-    public void setMailboxSyncStatus(long id, int status) {
-        ContentValues values = new ContentValues();
-        values.put(Mailbox.UI_SYNC_STATUS, status);
-        mResolver.update(ContentUris.withAppendedId(Mailbox.CONTENT_URI, id), values, null, null);
-    }
-
-    public void setMailboxLastSyncResult(long id, int result) {
-        if (result != EmailContent.LAST_SYNC_RESULT_SUCCESS) {
-            LogUtils.w(TAG, new Throwable(), "setMailboxLastSyncResult %d", result);
-        }
-        ContentValues values = new ContentValues();
-        values.put(Mailbox.UI_LAST_SYNC_RESULT, result);
-        mResolver.update(ContentUris.withAppendedId(Mailbox.CONTENT_URI, id), values, null, null);
-    }
-
-    private void stopServiceThreads() {
-        synchronized (sSyncLock) {
-            ArrayList<Long> toStop = new ArrayList<Long>();
-
-            // Keep track of which services to stop
-            for (Long mailboxId : mServiceMap.keySet()) {
-                toStop.add(mailboxId);
-            }
-
-            // Shut down all of those running services
-            for (Long mailboxId : toStop) {
-                AbstractSyncService svc = mServiceMap.get(mailboxId);
-                if (svc != null) {
-                    log("Stopping " + svc.mAccount.mDisplayName + '/' + svc.mMailbox.mDisplayName);
-                    svc.stop();
-                    if (svc.mThread != null) {
-                        svc.mThread.interrupt();
-                    }
-                }
-                releaseWakeLock(mailboxId);
-            }
-        }
-    }
-
-    private void waitForConnectivity() {
-        boolean waiting = false;
-        ConnectivityManager cm =
-            (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
-        while (!sStop) {
-            NetworkInfo info = cm.getActiveNetworkInfo();
-            if (info != null) {
-                mNetworkInfo = info;
-                // We're done if there's an active network
-                if (waiting) {
-                    // If we've been waiting, release any I/O error holds
-                    releaseSyncHolds(this, AbstractSyncService.EXIT_IO_ERROR, null);
-                    // And log what's still being held
-                    logSyncHolds();
-                }
-                return;
-            } else {
-                // If this is our first time through the loop, shut down running service threads
-                if (!waiting) {
-                    waiting = true;
-                    stopServiceThreads();
-                }
-                // Wait until a network is connected (or 10 mins), but let the device sleep
-                // We'll set an alarm just in case we don't get notified (bugs happen)
-                synchronized (sConnectivityLock) {
-                    runAsleep(EXTRA_MAILBOX_ID, CONNECTIVITY_WAIT_TIME+5*SECONDS);
-                    try {
-                        log("Connectivity lock...");
-                        sConnectivityHold = true;
-                        sConnectivityLock.wait(CONNECTIVITY_WAIT_TIME);
-                        log("Connectivity lock released...");
-                    } catch (InterruptedException e) {
-                        // This is fine; we just go around the loop again
-                    } finally {
-                        sConnectivityHold = false;
-                    }
-                    runAwake(EXTRA_MAILBOX_ID);
-                }
-            }
-        }
-    }
-
-    /**
-     * Note that there are two ways the EAS SyncServiceManager service can be created:
-     *
-     * 1) as a background service instantiated via startService (which happens on boot, when the
-     * first EAS account is created, etc), in which case the service thread is spun up, mailboxes
-     * sync, etc. and
-     * 2) to execute an RPC call from the UI, in which case the background service will already be
-     * running most of the time (unless we're creating a first EAS account)
-     *
-     * If the running background service detects that there are no EAS accounts (on boot, if none
-     * were created, or afterward if the last remaining EAS account is deleted), it will call
-     * stopSelf() to terminate operation.
-     *
-     * The goal is to ensure that the background service is running at all times when there is at
-     * least one EAS account in existence
-     *
-     * Because there are edge cases in which our process can crash (typically, this has been seen
-     * in UI crashes, ANR's, etc.), it's possible for the UI to start up again without the
-     * background service having been started.  We explicitly try to start the service in Welcome
-     * (to handle the case of the app having been reloaded).  We also start the service on any
-     * startSync call (if it isn't already running)
-     */
-    @SuppressWarnings("deprecation")
-    @Override
-    public void onCreate() {
-        TAG = getClass().getSimpleName();
-        EmailContent.init(this);
-        Utility.runAsync(new Runnable() {
-            @Override
-            public void run() {
-                // Quick checks first, before getting the lock
-                if (sStartingUp) return;
-                synchronized (sSyncLock) {
-                    alwaysLog("!!! onCreate");
-                    // Try to start up properly; we might be coming back from a crash that the Email
-                    // application isn't aware of.
-                    startService(getServiceIntent());
-                    if (sStop) {
-                        return;
-                    }
-                }
-            }});
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        alwaysLog("!!! onStartCommand, startingUp = " + sStartingUp + ", running = " +
-                (INSTANCE != null));
-        if (!sStartingUp && INSTANCE == null) {
-            sStartingUp = true;
-            Utility.runAsync(new Runnable() {
-                @Override
-                public void run() {
-                    try {
-                        synchronized (sSyncLock) {
-                            // SyncServiceManager cannot start unless we connect to AccountService
-                            if (!new AccountServiceProxy(SyncManager.this).test()) {
-                                alwaysLog("!!! Email application not found; stopping self");
-                                stopSelf();
-                            }
-                            String deviceId = getDeviceId(SyncManager.this);
-                            if (deviceId == null) {
-                                alwaysLog("!!! deviceId unknown; stopping self and retrying");
-                                stopSelf();
-                                // Try to restart ourselves in a few seconds
-                                Utility.runAsync(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        try {
-                                            Thread.sleep(5000);
-                                        } catch (InterruptedException e) {
-                                        }
-                                        startService(getServiceIntent());
-                                    }});
-                                return;
-                            }
-                            // Run the reconciler and clean up mismatched accounts - if we weren't
-                            // running when accounts were deleted, it won't have been called.
-                            runAccountReconcilerSync(SyncManager.this);
-                            // Update other services depending on final account configuration
-                            maybeStartSyncServiceManagerThread();
-                            if (sServiceThread == null) {
-                                log("!!! EAS SyncServiceManager, stopping self");
-                                stopSelf();
-                            } else if (sStop) {
-                                // If we were trying to stop, attempt a restart in 5 secs
-                                setAlarm(SYNC_SERVICE_MAILBOX_ID, 5*SECONDS);
-                            } else {
-                                mServiceStartTime = System.currentTimeMillis();
-                            }
-                        }
-                    } finally {
-                        sStartingUp = false;
-                    }
-                }});
-        }
-        return Service.START_STICKY;
-    }
-
-    public static void reconcileAccounts(Context context) {
-        SyncManager ssm = INSTANCE;
-        if (ssm != null) {
-            ssm.runAccountReconcilerSync(context);
-        }
-    }
-
-    protected abstract void runAccountReconcilerSync(Context context);
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void onDestroy() {
-        log("!!! onDestroy");
-        // Handle shutting down off the UI thread
-        Utility.runAsync(new Runnable() {
-            @Override
-            public void run() {
-                // Quick checks first, before getting the lock
-                if (INSTANCE == null || sServiceThread == null) return;
-                synchronized(sSyncLock) {
-                    // Stop the sync manager thread and return
-                    if (sServiceThread != null) {
-                        sStop = true;
-                        sServiceThread.interrupt();
-                    }
-                }
-            }});
-    }
-
-    void maybeStartSyncServiceManagerThread() {
-        // Start our thread...
-        // See if there are any EAS accounts; otherwise, just go away
-        if (sServiceThread == null || !sServiceThread.isAlive()) {
-            AccountList currentAccounts = new AccountList();
-            try {
-                collectAccounts(this, currentAccounts);
-            } catch (ProviderUnavailableException e) {
-                // Just leave if EmailProvider is unavailable
-                return;
-            }
-            if (!currentAccounts.isEmpty()) {
-                log(sServiceThread == null ? "Starting thread..." : "Restarting thread...");
-                sServiceThread = new Thread(this, TAG);
-                INSTANCE = this;
-                sServiceThread.start();
-            }
-        }
-    }
-
-    /**
-     * Start up the SyncManager service if it's not already running
-     * This is a stopgap for cases in which SyncServiceManager died (due to a crash somewhere in
-     * com.android.email) and hasn't been restarted. See the comment for onCreate for details
-     */
-    static void checkSyncManagerRunning() {
-        SyncManager ssm = INSTANCE;
-        if (ssm == null) return;
-        if (sServiceThread == null) {
-            log("!!! checkSyncServiceManagerServiceRunning; starting service...");
-            ssm.startService(new Intent(ssm, SyncManager.class));
-        }
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void run() {
-        sStop = false;
-        alwaysLog("Service thread running");
-
-        TempDirectory.setTempDirectory(this);
-
-        // Synchronize here to prevent a shutdown from happening while we initialize our observers
-        // and receivers
-        synchronized (sSyncLock) {
-            if (INSTANCE != null) {
-                mResolver = getContentResolver();
-
-                // Set up our observers; we need them to know when to start/stop various syncs based
-                // on the insert/delete/update of mailboxes and accounts
-                // We also observe synced messages to trigger upsyncs at the appropriate time
-                mAccountObserver = getAccountObserver(mHandler);
-                mResolver.registerContentObserver(Account.NOTIFIER_URI, true, mAccountObserver);
-                mMailboxObserver = new MailboxObserver(mHandler);
-                mResolver.registerContentObserver(Mailbox.CONTENT_URI, false, mMailboxObserver);
-                mSyncedMessageObserver = new SyncedMessageObserver(mHandler);
-                mResolver.registerContentObserver(Message.SYNCED_CONTENT_URI, true,
-                        mSyncedMessageObserver);
-
-                mConnectivityReceiver = new ConnectivityReceiver();
-                registerReceiver(mConnectivityReceiver, new IntentFilter(
-                        ConnectivityManager.CONNECTIVITY_ACTION));
-
-                onStartup();
-            }
-        }
-
-        try {
-            // Loop indefinitely until we're shut down
-            while (!sStop) {
-                runAwake(EXTRA_MAILBOX_ID);
-                waitForConnectivity();
-                mNextWaitReason = null;
-                long nextWait = checkMailboxes();
-                try {
-                    synchronized (this) {
-                        if (!mKicked) {
-                            if (nextWait < 0) {
-                                log("Negative wait? Setting to 1s");
-                                nextWait = 1*SECONDS;
-                            }
-                            if (nextWait > 10*SECONDS) {
-                                if (mNextWaitReason != null) {
-                                    log("Next awake " + nextWait / 1000 + "s: " + mNextWaitReason);
-                                }
-                                runAsleep(EXTRA_MAILBOX_ID, nextWait + (3*SECONDS));
-                            }
-                            wait(nextWait);
-                        }
-                    }
-                } catch (InterruptedException e) {
-                    // Needs to be caught, but causes no problem
-                    log("SyncServiceManager interrupted");
-                } finally {
-                    synchronized (this) {
-                        if (mKicked) {
-                            //log("Wait deferred due to kick");
-                            mKicked = false;
-                        }
-                    }
-                }
-            }
-            log("Shutdown requested");
-        } catch (ProviderUnavailableException pue) {
-            // Shutdown cleanly in this case
-            // NOTE: Sync adapters will also crash with this error, but that is already handled
-            // in the adapters themselves, i.e. they return cleanly via done().  When the Email
-            // process starts running again, remote processes will be started again in due course
-            LogUtils.e(TAG, "EmailProvider unavailable; shutting down");
-            // Ask for our service to be restarted; this should kick-start the Email process as well
-            startService(new Intent(this, SyncManager.class));
-        } catch (RuntimeException e) {
-            // Crash; this is a completely unexpected runtime error
-            LogUtils.e(TAG, "RuntimeException", e);
-            throw e;
-        } finally {
-            shutdown();
-        }
-    }
-
-    private void shutdown() {
-        synchronized (sSyncLock) {
-            // If INSTANCE is null, we've already been shut down
-            if (INSTANCE != null) {
-                log("Shutting down...");
-
-                // Stop our running syncs
-                stopServiceThreads();
-
-                // Stop receivers
-                if (mConnectivityReceiver != null) {
-                    unregisterReceiver(mConnectivityReceiver);
-                }
-
-                // Unregister observers
-                ContentResolver resolver = getContentResolver();
-                if (mSyncedMessageObserver != null) {
-                    resolver.unregisterContentObserver(mSyncedMessageObserver);
-                    mSyncedMessageObserver = null;
-                }
-                if (mAccountObserver != null) {
-                    resolver.unregisterContentObserver(mAccountObserver);
-                    mAccountObserver = null;
-                }
-                if (mMailboxObserver != null) {
-                    resolver.unregisterContentObserver(mMailboxObserver);
-                    mMailboxObserver = null;
-                }
-                unregisterCalendarObservers();
-
-                // Clear pending alarms and associated Intents
-                clearAlarms();
-
-                // Release our wake lock, if we have one
-                synchronized (mWakeLocks) {
-                    if (mWakeLock != null) {
-                        mWakeLock.release();
-                        mWakeLock = null;
-                    }
-                }
-
-                INSTANCE = null;
-                sServiceThread = null;
-                sStop = false;
-                log("Goodbye");
-            }
-        }
-    }
-
-    /**
-     * Release a mailbox from the service map and release its wake lock.
-     * NOTE: This method MUST be called while holding sSyncLock!
-     *
-     * @param mailboxId the id of the mailbox to be released
-     */
-    public void releaseMailbox(long mailboxId) {
-        mServiceMap.remove(mailboxId);
-        releaseWakeLock(mailboxId);
-    }
-
-    /**
-     * Retrieve a running sync service for the passed-in mailbox id in a threadsafe manner
-     *
-     * @param mailboxId the id of the mailbox whose service is to be found
-     * @return the running service (a subclass of AbstractSyncService) or null if none
-     */
-    public AbstractSyncService getRunningService(long mailboxId) {
-        synchronized(sSyncLock) {
-            return mServiceMap.get(mailboxId);
-        }
-    }
-
-    /**
-     * Check whether an Outbox (referenced by a Cursor) has any messages that can be sent
-     * @param outboxCursor the cursor to an Outbox
-     * @return true if there is mail to be sent
-     */
-    private boolean hasSendableMessages(Cursor outboxCursor) {
-        Cursor c = mResolver.query(Message.CONTENT_URI, Message.ID_COLUMN_PROJECTION,
-                MAILBOX_KEY_AND_NOT_SEND_FAILED,
-                new String[] {Long.toString(outboxCursor.getLong(Mailbox.CONTENT_ID_COLUMN))},
-                null);
-        try {
-            while (c.moveToNext()) {
-                if (!Utility.hasUnloadedAttachments(this, c.getLong(Message.CONTENT_ID_COLUMN))) {
-                    return true;
-                }
-            }
-        } finally {
-            if (c != null) {
-                c.close();
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Taken from ConnectivityManager using public constants
-     */
-    public static boolean isNetworkTypeMobile(int networkType) {
-        switch (networkType) {
-            case ConnectivityManager.TYPE_MOBILE:
-            case ConnectivityManager.TYPE_MOBILE_MMS:
-            case ConnectivityManager.TYPE_MOBILE_SUPL:
-            case ConnectivityManager.TYPE_MOBILE_DUN:
-            case ConnectivityManager.TYPE_MOBILE_HIPRI:
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Determine whether the account is allowed to sync automatically, as opposed to manually, based
-     * on whether the "require manual sync when roaming" policy is in force and applicable
-     * @param account the account
-     * @return whether or not the account can sync automatically
-     */
-    /*package*/ public static boolean canAutoSync(Account account) {
-        SyncManager ssm = INSTANCE;
-        if (ssm == null) {
-            return false;
-        }
-        NetworkInfo networkInfo = ssm.mNetworkInfo;
-
-        // Enforce manual sync only while roaming here
-        long policyKey = account.mPolicyKey;
-        // Quick exit from this check
-        if ((policyKey != 0) && (networkInfo != null) &&
-                isNetworkTypeMobile(networkInfo.getType())) {
-            // We'll cache the Policy data here
-            Policy policy = account.mPolicy;
-            if (policy == null) {
-                policy = Policy.restorePolicyWithId(INSTANCE, policyKey);
-                account.mPolicy = policy;
-                if (!PolicyServiceProxy.isActive(ssm, policy)) {
-                    PolicyServiceProxy.setAccountHoldFlag(ssm, account, true);
-                    log("canAutoSync; policies not active, set hold flag");
-                    return false;
-                }
-            }
-            if (policy != null && policy.mRequireManualSyncWhenRoaming && networkInfo.isRoaming()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Convenience method to determine whether Email sync is enabled for a given account
-     * @param account the Account in question
-     * @return whether Email sync is enabled
-     */
-    private static boolean canSyncEmail(android.accounts.Account account) {
-        return ContentResolver.getSyncAutomatically(account, EmailContent.AUTHORITY);
-    }
-
-    /**
-     * Determine whether a mailbox of a given type in a given account can be synced automatically
-     * by SyncServiceManager.  This is an increasingly complex determination, taking into account
-     * security policies and user settings (both within the Email application and in the Settings
-     * application)
-     *
-     * @param account the Account that the mailbox is in
-     * @param type the type of the Mailbox
-     * @return whether or not to start a sync
-     */
-    private boolean isMailboxSyncable(Account account, int type) {
-        // This 'if' statement performs checks to see whether or not a mailbox is a
-        // candidate for syncing based on policies, user settings, & other restrictions
-        if (type == Mailbox.TYPE_OUTBOX) {
-            // Outbox is always syncable
-            return true;
-        } else if (type == Mailbox.TYPE_EAS_ACCOUNT_MAILBOX) {
-            // Always sync EAS mailbox unless master sync is off
-            return ContentResolver.getMasterSyncAutomatically();
-        } else if (type == Mailbox.TYPE_CONTACTS || type == Mailbox.TYPE_CALENDAR) {
-            // Contacts/Calendar obey this setting from ContentResolver
-            if (!ContentResolver.getMasterSyncAutomatically()) {
-                return false;
-            }
-            // Get the right authority for the mailbox
-            String authority;
-            if (type == Mailbox.TYPE_CONTACTS) {
-                authority = ContactsContract.AUTHORITY;
-            } else {
-                authority = CalendarContract.AUTHORITY;
-                if (!mCalendarObservers.containsKey(account.mId)){
-                    // Make sure we have an observer for this Calendar, as
-                    // we need to be able to detect sync state changes, sigh
-                    registerCalendarObserver(account);
-                }
-            }
-            // See if "sync automatically" is set; if not, punt
-            if (!ContentResolver.getSyncAutomatically(mAccountList.getAmAccount(account),
-                    authority)) {
-                return false;
-            // See if the calendar is enabled from the Calendar app UI; if not, punt
-            } else if ((type == Mailbox.TYPE_CALENDAR) && !isCalendarEnabled(account.mId)) {
-                return false;
-            }
-        // Never automatically sync trash
-        } else if (type == Mailbox.TYPE_TRASH) {
-            return false;
-        // For non-outbox, non-account mail, we do two checks:
-        // 1) are we restricted by policy (i.e. manual sync only),
-        // 2) has the user checked the "Sync Email" box in Account Settings, and
-        } else if (!canAutoSync(account) || !canSyncEmail(mAccountList.getAmAccount(account))) {
-            return false;
-        }
-        return true;
-    }
-
-    private long checkMailboxes () {
-        // First, see if any running mailboxes have been deleted
-        ArrayList<Long> deletedMailboxes = new ArrayList<Long>();
-        synchronized (sSyncLock) {
-            for (long mailboxId: mServiceMap.keySet()) {
-                Mailbox m = Mailbox.restoreMailboxWithId(this, mailboxId);
-                if (m == null) {
-                    deletedMailboxes.add(mailboxId);
-                }
-            }
-            // If so, stop them or remove them from the map
-            for (Long mailboxId: deletedMailboxes) {
-                AbstractSyncService svc = mServiceMap.get(mailboxId);
-                if (svc == null || svc.mThread == null) {
-                    releaseMailbox(mailboxId);
-                    continue;
-                } else {
-                    boolean alive = svc.mThread.isAlive();
-                    log("Deleted mailbox: " + svc.mMailboxName);
-                    if (alive) {
-                        stopManualSync(mailboxId);
-                    } else {
-                        log("Removing from serviceMap");
-                        releaseMailbox(mailboxId);
-                    }
-                }
-            }
-        }
-
-        long nextWait = SYNC_SERVICE_HEARTBEAT_TIME;
-        long now = System.currentTimeMillis();
-
-        // Start up threads that need it; use a query which finds eas mailboxes where the
-        // the sync interval is not "never".  This is the set of mailboxes that we control
-        if (mAccountObserver == null) {
-            log("mAccountObserver null; service died??");
-            return nextWait;
-        }
-
-        Cursor c = getContentResolver().query(Mailbox.CONTENT_URI, Mailbox.CONTENT_PROJECTION,
-                mAccountObserver.getSyncableMailboxWhere(), null, null);
-        if (c == null) throw new ProviderUnavailableException();
-        try {
-            while (c.moveToNext()) {
-                long mailboxId = c.getLong(Mailbox.CONTENT_ID_COLUMN);
-                AbstractSyncService service = getRunningService(mailboxId);
-                if (service == null) {
-                    // Get the cached account
-                    Account account = getAccountById(c.getInt(Mailbox.CONTENT_ACCOUNT_KEY_COLUMN));
-                    if (account == null) continue;
-
-                    // We handle a few types of mailboxes specially
-                    int mailboxType = c.getInt(Mailbox.CONTENT_TYPE_COLUMN);
-                    if (!isMailboxSyncable(account, mailboxType)) {
-                        continue;
-                    }
-
-                    // Check whether we're in a hold (temporary or permanent)
-                    SyncError syncError = mSyncErrorMap.get(mailboxId);
-                    if (syncError != null) {
-                        // Nothing we can do about fatal errors
-                        if (syncError.fatal) continue;
-                        if (now < syncError.holdEndTime) {
-                            // If release time is earlier than next wait time,
-                            // move next wait time up to the release time
-                            if (syncError.holdEndTime < now + nextWait) {
-                                nextWait = syncError.holdEndTime - now;
-                                mNextWaitReason = "Release hold";
-                            }
-                            continue;
-                        } else {
-                            // Keep the error around, but clear the end time
-                            syncError.holdEndTime = 0;
-                        }
-                    }
-
-                    // Otherwise, we use the sync interval
-                    long syncInterval = c.getInt(Mailbox.CONTENT_SYNC_INTERVAL_COLUMN);
-                    if (syncInterval == Mailbox.CHECK_INTERVAL_PUSH) {
-                        Mailbox m = EmailContent.getContent(this, c, Mailbox.class);
-                        requestSync(m, SYNC_PUSH, null);
-                    } else if (mailboxType == Mailbox.TYPE_OUTBOX) {
-                        if (hasSendableMessages(c)) {
-                            Mailbox m = EmailContent.getContent(this, c, Mailbox.class);
-                            startServiceThread(getServiceForMailbox(this, m));
-                        }
-                    } else if (syncInterval > 0 && syncInterval <= ONE_DAY_MINUTES) {
-                        // TODO: Migrating to use system SyncManager, so this should be dead code.
-                        long lastSync = c.getLong(Mailbox.CONTENT_SYNC_TIME_COLUMN);
-                        long sinceLastSync = now - lastSync;
-                        long toNextSync = syncInterval*MINUTES - sinceLastSync;
-                        String name = c.getString(Mailbox.CONTENT_DISPLAY_NAME_COLUMN);
-                        if (toNextSync <= 0) {
-                            Mailbox m = EmailContent.getContent(this, c, Mailbox.class);
-                            requestSync(m, SYNC_SCHEDULED, null);
-                        } else if (toNextSync < nextWait) {
-                            nextWait = toNextSync;
-                            if (sUserLog) {
-                                log("Next sync for " + name + " in " + nextWait/1000 + "s");
-                            }
-                            mNextWaitReason = "Scheduled sync, " + name;
-                        } else if (sUserLog) {
-                            log("Next sync for " + name + " in " + toNextSync/1000 + "s");
-                        }
-                    }
-                } else {
-                    Thread thread = service.mThread;
-                    // Look for threads that have died and remove them from the map
-                    if (thread != null && !thread.isAlive()) {
-                        if (sUserLog) {
-                            log("Dead thread, mailbox released: " +
-                                    c.getString(Mailbox.CONTENT_DISPLAY_NAME_COLUMN));
-                        }
-                        synchronized (sSyncLock) {
-                            releaseMailbox(mailboxId);
-                        }
-                        // Restart this if necessary
-                        if (nextWait > 3*SECONDS) {
-                            nextWait = 3*SECONDS;
-                            mNextWaitReason = "Clean up dead thread(s)";
-                        }
-                    } else {
-                        long requestTime = service.mRequestTime;
-                        if (requestTime > 0) {
-                            long timeToRequest = requestTime - now;
-                            if (timeToRequest <= 0) {
-                                service.mRequestTime = 0;
-                                service.alarm();
-                            } else if (requestTime > 0 && timeToRequest < nextWait) {
-                                if (timeToRequest < 11*MINUTES) {
-                                    nextWait = timeToRequest < 250 ? 250 : timeToRequest;
-                                    mNextWaitReason = "Sync data change";
-                                } else {
-                                    log("Illegal timeToRequest: " + timeToRequest);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        } finally {
-            c.close();
-        }
-        return nextWait;
-    }
-
-    static public void serviceRequest(long mailboxId, int reason) {
-        serviceRequest(mailboxId, 5*SECONDS, reason);
-    }
-
-    /**
-     * Return a boolean indicating whether the mailbox can be synced
-     * @param m the mailbox
-     * @return whether or not the mailbox can be synced
-     */
-    public static boolean isSyncable(Mailbox m) {
-        return m.mType != Mailbox.TYPE_DRAFTS
-                && m.mType != Mailbox.TYPE_OUTBOX
-                && m.mType != Mailbox.TYPE_SEARCH
-                && m.mType < Mailbox.TYPE_NOT_SYNCABLE;
-    }
-
-    static public void serviceRequest(long mailboxId, long ms, int reason) {
-        SyncManager ssm = INSTANCE;
-        if (ssm == null) return;
-        Mailbox m = Mailbox.restoreMailboxWithId(ssm, mailboxId);
-        if (m == null || !isSyncable(m)) return;
-        try {
-            AbstractSyncService service = ssm.getRunningService(mailboxId);
-            if (service != null) {
-                service.mRequestTime = System.currentTimeMillis() + ms;
-                kick("service request");
-            } else {
-                startManualSync(mailboxId, reason, null);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    static public void serviceRequestImmediate(long mailboxId) {
-        SyncManager ssm = INSTANCE;
-        if (ssm == null) return;
-        AbstractSyncService service = ssm.getRunningService(mailboxId);
-        if (service != null) {
-            service.mRequestTime = System.currentTimeMillis();
-            Mailbox m = Mailbox.restoreMailboxWithId(ssm, mailboxId);
-            if (m != null) {
-                service.mAccount = Account.restoreAccountWithId(ssm, m.mAccountKey);
-                service.mMailbox = m;
-                kick("service request immediate");
-            }
-        }
-    }
-
-    static public void sendMessageRequest(Request req) {
-        SyncManager ssm = INSTANCE;
-        if (ssm == null) return;
-        Message msg = Message.restoreMessageWithId(ssm, req.mMessageId);
-        if (msg == null) return;
-        long mailboxId = msg.mMailboxKey;
-        Mailbox mailbox = Mailbox.restoreMailboxWithId(ssm, mailboxId);
-        if (mailbox == null) return;
-
-        // If we're loading an attachment for Outbox, we want to look at the source message
-        // to find the loading mailbox
-        if (mailbox.mType == Mailbox.TYPE_OUTBOX) {
-            long sourceId = Utility.getFirstRowLong(ssm, Body.CONTENT_URI,
-                    new String[] {BodyColumns.SOURCE_MESSAGE_KEY},
-                    BodyColumns.MESSAGE_KEY + "=?",
-                    new String[] {Long.toString(msg.mId)}, null, 0, -1L);
-            if (sourceId != -1L) {
-                EmailContent.Message sourceMsg =
-                        EmailContent.Message.restoreMessageWithId(ssm, sourceId);
-                if (sourceMsg != null) {
-                    mailboxId = sourceMsg.mMailboxKey;
-                }
-            }
-        }
-        sendRequest(mailboxId, req);
-    }
-
-    static public void sendRequest(long mailboxId, Request req) {
-        SyncManager ssm = INSTANCE;
-        if (ssm == null) return;
-        AbstractSyncService service = ssm.getRunningService(mailboxId);
-        if (service == null) {
-            startManualSync(mailboxId, SYNC_SERVICE_PART_REQUEST, req);
-            kick("part request");
-        } else {
-            service.addRequest(req);
-        }
-    }
-
-    /**
-     * Determine whether a given Mailbox can be synced, i.e. is not already syncing and is not in
-     * an error state
-     *
-     * @param mailboxId
-     * @return whether or not the Mailbox is available for syncing (i.e. is a valid push target)
-     */
-    static public int pingStatus(long mailboxId) {
-        SyncManager ssm = INSTANCE;
-        if (ssm == null) return PING_STATUS_OK;
-        // Already syncing...
-        if (ssm.getRunningService(mailboxId) != null) {
-            return PING_STATUS_RUNNING;
-        }
-        // No errors or a transient error, don't ping...
-        SyncError error = ssm.mSyncErrorMap.get(mailboxId);
-        if (error != null) {
-            if (error.fatal) {
-                return PING_STATUS_UNABLE;
-            } else if (error.holdEndTime > 0) {
-                return PING_STATUS_WAITING;
-            }
-        }
-        return PING_STATUS_OK;
-    }
-
-    static public void startManualSync(long mailboxId, int reason, Request req) {
-        SyncManager ssm = INSTANCE;
-        if (ssm == null) return;
-        synchronized (sSyncLock) {
-            AbstractSyncService svc = ssm.mServiceMap.get(mailboxId);
-            if (svc == null) {
-                if (ssm.mSyncErrorMap.containsKey(mailboxId) && reason == SyncManager.SYNC_UPSYNC) {
-                    return;
-                } else if (reason != SyncManager.SYNC_UPSYNC) {
-                    ssm.mSyncErrorMap.remove(mailboxId);
-                }
-                Mailbox m = Mailbox.restoreMailboxWithId(ssm, mailboxId);
-                if (m != null) {
-                    log("Starting sync for " + m.mDisplayName);
-                    ssm.requestSync(m, reason, req);
-                }
-            } else {
-                // If this is a ui request, set the sync reason for the service
-                if (reason >= SYNC_CALLBACK_START) {
-                    svc.mSyncReason = reason;
-                }
-            }
-        }
-    }
-
-    // DO NOT CALL THIS IN A LOOP ON THE SERVICEMAP
-    static public void stopManualSync(long mailboxId) {
-        SyncManager ssm = INSTANCE;
-        if (ssm == null) return;
-        synchronized (sSyncLock) {
-            AbstractSyncService svc = ssm.mServiceMap.get(mailboxId);
-            if (svc != null) {
-                log("Stopping sync for " + svc.mMailboxName);
-                svc.stop();
-                svc.mThread.interrupt();
-                ssm.releaseWakeLock(mailboxId);
-            }
-        }
-    }
-
-    /**
-     * Wake up SyncServiceManager to check for mailboxes needing service
-     */
-    static public void kick(String reason) {
-       SyncManager ssm = INSTANCE;
-       if (ssm != null) {
-            synchronized (ssm) {
-                //INSTANCE.log("Kick: " + reason);
-                ssm.mKicked = true;
-                ssm.notify();
-            }
-        }
-        if (sConnectivityLock != null) {
-            synchronized (sConnectivityLock) {
-                sConnectivityLock.notify();
-            }
-        }
-    }
-
-    /**
-     * Tell SyncServiceManager to remove the mailbox from the map of mailboxes with sync errors
-     * @param mailboxId the id of the mailbox
-     */
-    static public void removeFromSyncErrorMap(long mailboxId) {
-        SyncManager ssm = INSTANCE;
-        if (ssm != null) {
-            ssm.mSyncErrorMap.remove(mailboxId);
-        }
-    }
-
-    private boolean isRunningInServiceThread(long mailboxId) {
-        AbstractSyncService syncService = getRunningService(mailboxId);
-        Thread thisThread = Thread.currentThread();
-        return syncService != null && syncService.mThread != null &&
-            thisThread == syncService.mThread;
-    }
-
-    /**
-     * Sent by services indicating that their thread is finished; action depends on the exitStatus
-     * of the service.
-     *
-     * @param svc the service that is finished
-     */
-    static public void done(AbstractSyncService svc) {
-        SyncManager ssm = INSTANCE;
-        if (ssm == null) return;
-        synchronized(sSyncLock) {
-            long mailboxId = svc.mMailboxId;
-            // If we're no longer the syncing thread for the mailbox, just return
-            if (!ssm.isRunningInServiceThread(mailboxId)) {
-                return;
-            }
-            ssm.releaseMailbox(mailboxId);
-            ssm.setMailboxSyncStatus(mailboxId, EmailContent.SYNC_STATUS_NONE);
-
-            ConcurrentHashMap<Long, SyncError> errorMap = ssm.mSyncErrorMap;
-            SyncError syncError = errorMap.get(mailboxId);
-
-            int exitStatus = svc.mExitStatus;
-            Mailbox m = Mailbox.restoreMailboxWithId(ssm, mailboxId);
-            if (m == null) return;
-
-            if (exitStatus != AbstractSyncService.EXIT_LOGIN_FAILURE) {
-                long accountId = m.mAccountKey;
-                Account account = Account.restoreAccountWithId(ssm, accountId);
-                if (account == null) return;
-                if (ssm.releaseSyncHolds(ssm,
-                        AbstractSyncService.EXIT_LOGIN_FAILURE, account)) {
-                    new AccountServiceProxy(ssm).notifyLoginSucceeded(accountId);
-                }
-            }
-
-            int lastResult = EmailContent.LAST_SYNC_RESULT_SUCCESS;
-            // For error states, whether the error is fatal (won't automatically be retried)
-            boolean errorIsFatal = true;
-            try {
-                switch (exitStatus) {
-                    case AbstractSyncService.EXIT_DONE:
-                        if (svc.hasPendingRequests()) {
-                            // TODO Handle this case
-                        }
-                        errorMap.remove(mailboxId);
-                        // If we've had a successful sync, clear the shutdown count
-                        synchronized (SyncManager.class) {
-                            sClientConnectionManagerShutdownCount = 0;
-                        }
-                        // Leave now; other statuses are errors
-                        return;
-                    // I/O errors get retried at increasing intervals
-                    case AbstractSyncService.EXIT_IO_ERROR:
-                        if (syncError != null) {
-                            syncError.escalate();
-                            log(m.mDisplayName + " held for " + (syncError.holdDelay/ 1000) + "s");
-                            return;
-                        } else {
-                            log(m.mDisplayName + " added to syncErrorMap, hold for 15s");
-                        }
-                        lastResult = EmailContent.LAST_SYNC_RESULT_CONNECTION_ERROR;
-                        errorIsFatal = false;
-                        break;
-                    // These errors are not retried automatically
-                    case AbstractSyncService.EXIT_LOGIN_FAILURE:
-                        new AccountServiceProxy(ssm).notifyLoginFailed(m.mAccountKey, svc.mExitReason);
-                        lastResult = EmailContent.LAST_SYNC_RESULT_AUTH_ERROR;
-                        break;
-                    case AbstractSyncService.EXIT_SECURITY_FAILURE:
-                    case AbstractSyncService.EXIT_ACCESS_DENIED:
-                        lastResult = EmailContent.LAST_SYNC_RESULT_SECURITY_ERROR;
-                        break;
-                    case AbstractSyncService.EXIT_EXCEPTION:
-                        lastResult = EmailContent.LAST_SYNC_RESULT_INTERNAL_ERROR;
-                        break;
-                }
-                // Add this box to the error map
-                errorMap.put(mailboxId, ssm.new SyncError(exitStatus, errorIsFatal));
-            } finally {
-                // Always set the last result
-                ssm.setMailboxLastSyncResult(mailboxId, lastResult);
-                kick("sync completed");
-            }
-        }
-    }
-
-    /**
-     * Given the status string from a Mailbox, return the type code for the last sync
-     * @param status the syncStatus column of a Mailbox
-     * @return
-     */
-    static public int getStatusType(String status) {
-        if (status == null) {
-            return -1;
-        } else {
-            return status.charAt(STATUS_TYPE_CHAR) - '0';
-        }
-    }
-
-    /**
-     * Given the status string from a Mailbox, return the change count for the last sync
-     * The change count is the number of adds + deletes + changes in the last sync
-     * @param status the syncStatus column of a Mailbox
-     * @return
-     */
-    static public int getStatusChangeCount(String status) {
-        try {
-            String s = status.substring(STATUS_CHANGE_COUNT_OFFSET);
-            return Integer.parseInt(s);
-        } catch (RuntimeException e) {
-            return -1;
-        }
-    }
-
-    static public Context getContext() {
-        return INSTANCE;
-    }
-
-    private void writeWakeLockTimes(PrintWriter pw, HashMap<Long, Long> map, boolean historical) {
-        long now = System.currentTimeMillis();
-        for (long mailboxId: map.keySet()) {
-            Long time = map.get(mailboxId);
-            if (time == null) {
-                // Just in case...
-                continue;
-            }
-            Mailbox mailbox = Mailbox.restoreMailboxWithId(this, mailboxId);
-            StringBuilder sb = new StringBuilder();
-            if (mailboxId == EXTRA_MAILBOX_ID) {
-                sb.append("    SyncManager");
-            } else if (mailbox == null) {
-                sb.append("    Mailbox " + mailboxId + " (deleted?)");
-            } else {
-                String protocol = Account.getProtocol(this, mailbox.mAccountKey);
-                sb.append("    Mailbox " + mailboxId + " (" + protocol + ", type " +
-                        mailbox.mType + ")");
-            }
-            long logTime = historical ? time : (now - time);
-            sb.append(" held for " + (logTime / 1000) + "s");
-            pw.println(sb.toString());
-        }
-    }
-
-    @Override
-    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
-        long uptime = System.currentTimeMillis() - mServiceStartTime;
-        pw.println("SyncManager: " + TAG + " up for " + (uptime / 1000 / 60) + " m");
-        if (mWakeLock != null) {
-            pw.println("  Holding WakeLock");
-            writeWakeLockTimes(pw, mWakeLocks, false);
-        } else {
-            pw.println("  Not holding WakeLock");
-        }
-        if (!mWakeLocksHistory.isEmpty()) {
-            pw.println("  Historical times");
-            writeWakeLockTimes(pw, mWakeLocksHistory, true);
-        }
-    }
-}
diff --git a/proguard.flags b/proguard.flags
index a0feee6..6b0a844 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -22,11 +22,6 @@
   *** apply();
 }
 
--keepclasseswithmembers class com.android.emailcommon.utility.Utility$CloseTraceCursorWrapper {
-  *** getTraceIfAvailable(android.database.Cursor);
-  *** log(android.database.Cursor);
-}
-
 -keep class * extends org.apache.james.mime4j.util.TempStorage
 
 # Keep names that are used only by unit tests or by animators
@@ -56,10 +51,6 @@
   *** isFirstUtf8Byte(byte);
   *** replaceBareLfWithCrlf(java.lang.String);
 }
--keepclasseswithmembers class com.android.emailcommon.utility.Utility$CloseTraceCursorWrapper {
-  *** getTraceIfAvailable(android.database.Cursor);
-  *** log(android.database.Cursor);
-}
 
 -keepclasseswithmembers class com.android.email.provider.EmailProvider {
   *** getReadableDatabase(android.content.Context);
@@ -69,14 +60,6 @@
   *** createUniqueFile(java.lang.String);
 }
 
--keepclasseswithmembers class com.android.email.service.AttachmentDownloadService {
-  *** addServiceClass(long, java.lang.Class);
-}
-
--keepclasseswithmembers class com.android.email.service.AttachmentDownloadService$AccountManagerStub {
-  *** setNumberOfAccounts(int);
-}
-
 -keepclasseswithmembers class com.android.email.Preferences {
   *** getAccountByContentUri(android.net.Uri);
 }
@@ -139,21 +122,6 @@
 
 -keep class com.android.emailcommon.mail.Flag
 
--keepclasseswithmembers class com.android.email.service.AttachmentService$DownloadQueue {
-  *** addRequest(com.android.email.service.AttachmentService$DownloadRequest);
-  *** removeRequest(com.android.email.service.AttachmentService$DownloadRequest);
-  *** getNextRequest();
-  *** findRequestById(long);
-  *** getSize();
-  *** isEmpty();
-}
-
--keepclasseswithmembers class com.android.email.service.AttachmentService$DownloadRequest {
-  <init>(int, long);
-  *** hashCode();
-  *** equals(java.lang.Object);
-}
-
 -keepclasseswithmembers class com.android.emailcommon.mail.Folder {
   *** getUnreadMessageCount();
   *** delete(boolean);
diff --git a/res/drawable-hdpi/ic_folder_drafts_holo_dark.png b/res/drawable-hdpi/ic_folder_drafts_holo_dark.png
deleted file mode 100644
index 0e1d693..0000000
--- a/res/drawable-hdpi/ic_folder_drafts_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_drafts_holo_gray.png b/res/drawable-hdpi/ic_folder_drafts_holo_gray.png
deleted file mode 100644
index 897c89e..0000000
--- a/res/drawable-hdpi/ic_folder_drafts_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_drafts_holo_light.png b/res/drawable-hdpi/ic_folder_drafts_holo_light.png
deleted file mode 100644
index bf2e747..0000000
--- a/res/drawable-hdpi/ic_folder_drafts_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_inbox_holo_dark.png b/res/drawable-hdpi/ic_folder_inbox_holo_dark.png
deleted file mode 100644
index 12b094b..0000000
--- a/res/drawable-hdpi/ic_folder_inbox_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_inbox_holo_gray.png b/res/drawable-hdpi/ic_folder_inbox_holo_gray.png
deleted file mode 100644
index 1105be8..0000000
--- a/res/drawable-hdpi/ic_folder_inbox_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_inbox_holo_light.png b/res/drawable-hdpi/ic_folder_inbox_holo_light.png
deleted file mode 100644
index df0ac0d..0000000
--- a/res/drawable-hdpi/ic_folder_inbox_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_outbox_holo_dark.png b/res/drawable-hdpi/ic_folder_outbox_holo_dark.png
deleted file mode 100644
index 3a02a07..0000000
--- a/res/drawable-hdpi/ic_folder_outbox_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_outbox_holo_gray.png b/res/drawable-hdpi/ic_folder_outbox_holo_gray.png
deleted file mode 100644
index 57543cf..0000000
--- a/res/drawable-hdpi/ic_folder_outbox_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_outbox_holo_light.png b/res/drawable-hdpi/ic_folder_outbox_holo_light.png
deleted file mode 100644
index c8ba6a2..0000000
--- a/res/drawable-hdpi/ic_folder_outbox_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_sent_holo_dark.png b/res/drawable-hdpi/ic_folder_sent_holo_dark.png
deleted file mode 100644
index 4aaaa2b..0000000
--- a/res/drawable-hdpi/ic_folder_sent_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_sent_holo_gray.png b/res/drawable-hdpi/ic_folder_sent_holo_gray.png
deleted file mode 100644
index 5c6469f..0000000
--- a/res/drawable-hdpi/ic_folder_sent_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_sent_holo_light.png b/res/drawable-hdpi/ic_folder_sent_holo_light.png
deleted file mode 100644
index 72d5639..0000000
--- a/res/drawable-hdpi/ic_folder_sent_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_star_holo_dark.png b/res/drawable-hdpi/ic_folder_star_holo_dark.png
deleted file mode 100644
index 69ffc8c..0000000
--- a/res/drawable-hdpi/ic_folder_star_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_star_holo_gray.png b/res/drawable-hdpi/ic_folder_star_holo_gray.png
deleted file mode 100644
index ae08ec0..0000000
--- a/res/drawable-hdpi/ic_folder_star_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_star_holo_light.png b/res/drawable-hdpi/ic_folder_star_holo_light.png
deleted file mode 100644
index 3051ead..0000000
--- a/res/drawable-hdpi/ic_folder_star_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_trash_holo_dark.png b/res/drawable-hdpi/ic_folder_trash_holo_dark.png
deleted file mode 100644
index 1e40bd1..0000000
--- a/res/drawable-hdpi/ic_folder_trash_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_trash_holo_gray.png b/res/drawable-hdpi/ic_folder_trash_holo_gray.png
deleted file mode 100644
index 5161be6..0000000
--- a/res/drawable-hdpi/ic_folder_trash_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_trash_holo_light.png b/res/drawable-hdpi/ic_folder_trash_holo_light.png
deleted file mode 100644
index 47676f0..0000000
--- a/res/drawable-hdpi/ic_folder_trash_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_unread_holo_dark.png b/res/drawable-hdpi/ic_folder_unread_holo_dark.png
deleted file mode 100644
index 4fdfe04..0000000
--- a/res/drawable-hdpi/ic_folder_unread_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_unread_holo_gray.png b/res/drawable-hdpi/ic_folder_unread_holo_gray.png
deleted file mode 100644
index f3d57ff..0000000
--- a/res/drawable-hdpi/ic_folder_unread_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_folder_unread_holo_light.png b/res/drawable-hdpi/ic_folder_unread_holo_light.png
deleted file mode 100644
index d8d8f28..0000000
--- a/res/drawable-hdpi/ic_folder_unread_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_setup_delete.png b/res/drawable-hdpi/ic_setup_delete.png
deleted file mode 100644
index 62156d7..0000000
--- a/res/drawable-hdpi/ic_setup_delete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_drafts_holo_dark.png b/res/drawable-mdpi/ic_folder_drafts_holo_dark.png
deleted file mode 100644
index 15ddf1a..0000000
--- a/res/drawable-mdpi/ic_folder_drafts_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_drafts_holo_gray.png b/res/drawable-mdpi/ic_folder_drafts_holo_gray.png
deleted file mode 100644
index c6c4b4a..0000000
--- a/res/drawable-mdpi/ic_folder_drafts_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_drafts_holo_light.png b/res/drawable-mdpi/ic_folder_drafts_holo_light.png
deleted file mode 100644
index 6db6c81..0000000
--- a/res/drawable-mdpi/ic_folder_drafts_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_inbox_holo_dark.png b/res/drawable-mdpi/ic_folder_inbox_holo_dark.png
deleted file mode 100644
index 91f696d..0000000
--- a/res/drawable-mdpi/ic_folder_inbox_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_inbox_holo_gray.png b/res/drawable-mdpi/ic_folder_inbox_holo_gray.png
deleted file mode 100644
index 3458d96..0000000
--- a/res/drawable-mdpi/ic_folder_inbox_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_inbox_holo_light.png b/res/drawable-mdpi/ic_folder_inbox_holo_light.png
deleted file mode 100644
index 62f67d2..0000000
--- a/res/drawable-mdpi/ic_folder_inbox_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_outbox_holo_dark.png b/res/drawable-mdpi/ic_folder_outbox_holo_dark.png
deleted file mode 100644
index 0e2ee23..0000000
--- a/res/drawable-mdpi/ic_folder_outbox_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_outbox_holo_gray.png b/res/drawable-mdpi/ic_folder_outbox_holo_gray.png
deleted file mode 100644
index bb02e41..0000000
--- a/res/drawable-mdpi/ic_folder_outbox_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_outbox_holo_light.png b/res/drawable-mdpi/ic_folder_outbox_holo_light.png
deleted file mode 100644
index a7039e1..0000000
--- a/res/drawable-mdpi/ic_folder_outbox_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_sent_holo_dark.png b/res/drawable-mdpi/ic_folder_sent_holo_dark.png
deleted file mode 100644
index 7ae9950..0000000
--- a/res/drawable-mdpi/ic_folder_sent_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_sent_holo_gray.png b/res/drawable-mdpi/ic_folder_sent_holo_gray.png
deleted file mode 100644
index e53c507..0000000
--- a/res/drawable-mdpi/ic_folder_sent_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_sent_holo_light.png b/res/drawable-mdpi/ic_folder_sent_holo_light.png
deleted file mode 100644
index ca93d58..0000000
--- a/res/drawable-mdpi/ic_folder_sent_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_star_holo_dark.png b/res/drawable-mdpi/ic_folder_star_holo_dark.png
deleted file mode 100644
index b0707e8..0000000
--- a/res/drawable-mdpi/ic_folder_star_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_star_holo_gray.png b/res/drawable-mdpi/ic_folder_star_holo_gray.png
deleted file mode 100644
index f78cade..0000000
--- a/res/drawable-mdpi/ic_folder_star_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_star_holo_light.png b/res/drawable-mdpi/ic_folder_star_holo_light.png
deleted file mode 100644
index e9ab7ef..0000000
--- a/res/drawable-mdpi/ic_folder_star_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_trash_holo_dark.png b/res/drawable-mdpi/ic_folder_trash_holo_dark.png
deleted file mode 100644
index 76165ff..0000000
--- a/res/drawable-mdpi/ic_folder_trash_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_trash_holo_gray.png b/res/drawable-mdpi/ic_folder_trash_holo_gray.png
deleted file mode 100644
index 6bada67..0000000
--- a/res/drawable-mdpi/ic_folder_trash_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_trash_holo_light.png b/res/drawable-mdpi/ic_folder_trash_holo_light.png
deleted file mode 100644
index 7e7c3fe..0000000
--- a/res/drawable-mdpi/ic_folder_trash_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_unread_holo_dark.png b/res/drawable-mdpi/ic_folder_unread_holo_dark.png
deleted file mode 100644
index b5d28cb..0000000
--- a/res/drawable-mdpi/ic_folder_unread_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_unread_holo_gray.png b/res/drawable-mdpi/ic_folder_unread_holo_gray.png
deleted file mode 100644
index 6be4b20..0000000
--- a/res/drawable-mdpi/ic_folder_unread_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_folder_unread_holo_light.png b/res/drawable-mdpi/ic_folder_unread_holo_light.png
deleted file mode 100644
index 21adb5e..0000000
--- a/res/drawable-mdpi/ic_folder_unread_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_setup_delete.png b/res/drawable-mdpi/ic_setup_delete.png
deleted file mode 100644
index 01b66d4..0000000
--- a/res/drawable-mdpi/ic_setup_delete.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_drafts_holo_dark.png b/res/drawable-xhdpi/ic_folder_drafts_holo_dark.png
deleted file mode 100644
index 46db128..0000000
--- a/res/drawable-xhdpi/ic_folder_drafts_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_drafts_holo_gray.png b/res/drawable-xhdpi/ic_folder_drafts_holo_gray.png
deleted file mode 100644
index 14f3126..0000000
--- a/res/drawable-xhdpi/ic_folder_drafts_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_drafts_holo_light.png b/res/drawable-xhdpi/ic_folder_drafts_holo_light.png
deleted file mode 100644
index 52c8036..0000000
--- a/res/drawable-xhdpi/ic_folder_drafts_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_inbox_holo_dark.png b/res/drawable-xhdpi/ic_folder_inbox_holo_dark.png
deleted file mode 100644
index f168d66..0000000
--- a/res/drawable-xhdpi/ic_folder_inbox_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_inbox_holo_gray.png b/res/drawable-xhdpi/ic_folder_inbox_holo_gray.png
deleted file mode 100644
index a732a58..0000000
--- a/res/drawable-xhdpi/ic_folder_inbox_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_inbox_holo_light.png b/res/drawable-xhdpi/ic_folder_inbox_holo_light.png
deleted file mode 100644
index 11a61b8..0000000
--- a/res/drawable-xhdpi/ic_folder_inbox_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_outbox_holo_dark.png b/res/drawable-xhdpi/ic_folder_outbox_holo_dark.png
deleted file mode 100644
index 629a3cc..0000000
--- a/res/drawable-xhdpi/ic_folder_outbox_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_outbox_holo_gray.png b/res/drawable-xhdpi/ic_folder_outbox_holo_gray.png
deleted file mode 100644
index 9652c35..0000000
--- a/res/drawable-xhdpi/ic_folder_outbox_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_outbox_holo_light.png b/res/drawable-xhdpi/ic_folder_outbox_holo_light.png
deleted file mode 100644
index dcd3448..0000000
--- a/res/drawable-xhdpi/ic_folder_outbox_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_sent_holo_dark.png b/res/drawable-xhdpi/ic_folder_sent_holo_dark.png
deleted file mode 100644
index e237694..0000000
--- a/res/drawable-xhdpi/ic_folder_sent_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_sent_holo_gray.png b/res/drawable-xhdpi/ic_folder_sent_holo_gray.png
deleted file mode 100644
index 8b75930..0000000
--- a/res/drawable-xhdpi/ic_folder_sent_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_sent_holo_light.png b/res/drawable-xhdpi/ic_folder_sent_holo_light.png
deleted file mode 100644
index 0baa77c..0000000
--- a/res/drawable-xhdpi/ic_folder_sent_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_star_holo_dark.png b/res/drawable-xhdpi/ic_folder_star_holo_dark.png
deleted file mode 100644
index e0473be..0000000
--- a/res/drawable-xhdpi/ic_folder_star_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_star_holo_gray.png b/res/drawable-xhdpi/ic_folder_star_holo_gray.png
deleted file mode 100644
index 0bf2720..0000000
--- a/res/drawable-xhdpi/ic_folder_star_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_star_holo_light.png b/res/drawable-xhdpi/ic_folder_star_holo_light.png
deleted file mode 100644
index b69c034..0000000
--- a/res/drawable-xhdpi/ic_folder_star_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_trash_holo_dark.png b/res/drawable-xhdpi/ic_folder_trash_holo_dark.png
deleted file mode 100644
index 7f06d58..0000000
--- a/res/drawable-xhdpi/ic_folder_trash_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_trash_holo_gray.png b/res/drawable-xhdpi/ic_folder_trash_holo_gray.png
deleted file mode 100644
index 19329fd..0000000
--- a/res/drawable-xhdpi/ic_folder_trash_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_trash_holo_light.png b/res/drawable-xhdpi/ic_folder_trash_holo_light.png
deleted file mode 100644
index 56d68fa..0000000
--- a/res/drawable-xhdpi/ic_folder_trash_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_unread_holo_dark.png b/res/drawable-xhdpi/ic_folder_unread_holo_dark.png
deleted file mode 100644
index 0430c1d..0000000
--- a/res/drawable-xhdpi/ic_folder_unread_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_unread_holo_gray.png b/res/drawable-xhdpi/ic_folder_unread_holo_gray.png
deleted file mode 100644
index 88e6564..0000000
--- a/res/drawable-xhdpi/ic_folder_unread_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_folder_unread_holo_light.png b/res/drawable-xhdpi/ic_folder_unread_holo_light.png
deleted file mode 100644
index f023cb0..0000000
--- a/res/drawable-xhdpi/ic_folder_unread_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_drafts_holo_dark.png b/res/drawable-xxhdpi/ic_folder_drafts_holo_dark.png
deleted file mode 100644
index 4541235..0000000
--- a/res/drawable-xxhdpi/ic_folder_drafts_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_drafts_holo_gray.png b/res/drawable-xxhdpi/ic_folder_drafts_holo_gray.png
deleted file mode 100644
index fb0225b..0000000
--- a/res/drawable-xxhdpi/ic_folder_drafts_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_drafts_holo_light.png b/res/drawable-xxhdpi/ic_folder_drafts_holo_light.png
deleted file mode 100644
index 5ee0b74..0000000
--- a/res/drawable-xxhdpi/ic_folder_drafts_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_inbox_holo_dark.png b/res/drawable-xxhdpi/ic_folder_inbox_holo_dark.png
deleted file mode 100644
index 12b0361..0000000
--- a/res/drawable-xxhdpi/ic_folder_inbox_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_inbox_holo_gray.png b/res/drawable-xxhdpi/ic_folder_inbox_holo_gray.png
deleted file mode 100644
index 67e5111..0000000
--- a/res/drawable-xxhdpi/ic_folder_inbox_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_inbox_holo_light.png b/res/drawable-xxhdpi/ic_folder_inbox_holo_light.png
deleted file mode 100644
index 1ee01c8..0000000
--- a/res/drawable-xxhdpi/ic_folder_inbox_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_outbox_holo_dark.png b/res/drawable-xxhdpi/ic_folder_outbox_holo_dark.png
deleted file mode 100644
index dccf340..0000000
--- a/res/drawable-xxhdpi/ic_folder_outbox_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_outbox_holo_gray.png b/res/drawable-xxhdpi/ic_folder_outbox_holo_gray.png
deleted file mode 100644
index cc74ae2..0000000
--- a/res/drawable-xxhdpi/ic_folder_outbox_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_outbox_holo_light.png b/res/drawable-xxhdpi/ic_folder_outbox_holo_light.png
deleted file mode 100644
index 5ec078a..0000000
--- a/res/drawable-xxhdpi/ic_folder_outbox_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_sent_holo_dark.png b/res/drawable-xxhdpi/ic_folder_sent_holo_dark.png
deleted file mode 100644
index c28e9ac..0000000
--- a/res/drawable-xxhdpi/ic_folder_sent_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_sent_holo_gray.png b/res/drawable-xxhdpi/ic_folder_sent_holo_gray.png
deleted file mode 100644
index 029c1a5..0000000
--- a/res/drawable-xxhdpi/ic_folder_sent_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_sent_holo_light.png b/res/drawable-xxhdpi/ic_folder_sent_holo_light.png
deleted file mode 100644
index 86ea7e2..0000000
--- a/res/drawable-xxhdpi/ic_folder_sent_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_star_holo_dark.png b/res/drawable-xxhdpi/ic_folder_star_holo_dark.png
deleted file mode 100644
index 0b7c036..0000000
--- a/res/drawable-xxhdpi/ic_folder_star_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_star_holo_gray.png b/res/drawable-xxhdpi/ic_folder_star_holo_gray.png
deleted file mode 100644
index 068b7aa..0000000
--- a/res/drawable-xxhdpi/ic_folder_star_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_star_holo_light.png b/res/drawable-xxhdpi/ic_folder_star_holo_light.png
deleted file mode 100644
index dea03ae..0000000
--- a/res/drawable-xxhdpi/ic_folder_star_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_trash_holo_dark.png b/res/drawable-xxhdpi/ic_folder_trash_holo_dark.png
deleted file mode 100644
index 192ebfa..0000000
--- a/res/drawable-xxhdpi/ic_folder_trash_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_trash_holo_gray.png b/res/drawable-xxhdpi/ic_folder_trash_holo_gray.png
deleted file mode 100644
index 407f605..0000000
--- a/res/drawable-xxhdpi/ic_folder_trash_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_trash_holo_light.png b/res/drawable-xxhdpi/ic_folder_trash_holo_light.png
deleted file mode 100644
index 5972625..0000000
--- a/res/drawable-xxhdpi/ic_folder_trash_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_unread_holo_dark.png b/res/drawable-xxhdpi/ic_folder_unread_holo_dark.png
deleted file mode 100644
index f5a5872..0000000
--- a/res/drawable-xxhdpi/ic_folder_unread_holo_dark.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_unread_holo_gray.png b/res/drawable-xxhdpi/ic_folder_unread_holo_gray.png
deleted file mode 100644
index 273cb0b..0000000
--- a/res/drawable-xxhdpi/ic_folder_unread_holo_gray.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_folder_unread_holo_light.png b/res/drawable-xxhdpi/ic_folder_unread_holo_light.png
deleted file mode 100644
index 01b0326..0000000
--- a/res/drawable-xxhdpi/ic_folder_unread_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/ic_folder_drafts.xml b/res/drawable/ic_folder_drafts.xml
deleted file mode 100644
index ff4526d..0000000
--- a/res/drawable/ic_folder_drafts.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_drafts_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_drafts_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_drafts_holo_light" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_folder_inbox.xml b/res/drawable/ic_folder_inbox.xml
deleted file mode 100644
index 116124a..0000000
--- a/res/drawable/ic_folder_inbox.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_inbox_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_inbox_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_inbox_holo_light" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_folder_outbox.xml b/res/drawable/ic_folder_outbox.xml
deleted file mode 100644
index f41423f..0000000
--- a/res/drawable/ic_folder_outbox.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_outbox_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_outbox_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_outbox_holo_light" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_folder_sent.xml b/res/drawable/ic_folder_sent.xml
deleted file mode 100644
index d1f267f..0000000
--- a/res/drawable/ic_folder_sent.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_sent_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_sent_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_sent_holo_light" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_folder_star.xml b/res/drawable/ic_folder_star.xml
deleted file mode 100644
index ebca3e5..0000000
--- a/res/drawable/ic_folder_star.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_star_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_star_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_star_holo_light" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_folder_trash.xml b/res/drawable/ic_folder_trash.xml
deleted file mode 100644
index 374ecd5..0000000
--- a/res/drawable/ic_folder_trash.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_trash_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_trash_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_trash_holo_light" />
-</selector>
\ No newline at end of file
diff --git a/res/drawable/ic_folder_unread.xml b/res/drawable/ic_folder_unread.xml
deleted file mode 100644
index 9ac1a77..0000000
--- a/res/drawable/ic_folder_unread.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item app:state_drag_mode="true" android:state_drag_can_accept="false"
-          android:drawable="@drawable/ic_folder_unread_holo_gray" />
-    <item android:state_activated="true" android:drawable="@drawable/ic_folder_unread_holo_dark" />
-    <item android:drawable="@drawable/ic_folder_unread_holo_light" />
-</selector>
\ No newline at end of file
diff --git a/res/layout/account_server_settings.xml b/res/layout/account_server_settings.xml
new file mode 100644
index 0000000..bc7fb86
--- /dev/null
+++ b/res/layout/account_server_settings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/account_server_settings_container">
+
+</ScrollView>
diff --git a/res/layout/account_settings_buttons.xml b/res/layout/account_settings_buttons.xml
index 5f51094..81e9522 100644
--- a/res/layout/account_settings_buttons.xml
+++ b/res/layout/account_settings_buttons.xml
@@ -32,5 +32,5 @@
         style="@style/account_settings_button"
         android:layout_width="0dip"
         android:layout_weight="1"
-        android:text="@string/done_action" />
+        android:text="@string/done" />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/account_setup_template.xml b/res/layout/account_setup_template.xml
index 540356d..fc44c88 100644
--- a/res/layout/account_setup_template.xml
+++ b/res/layout/account_setup_template.xml
@@ -57,12 +57,12 @@
             android:orientation="horizontal">
             <ImageButton
                 style="@style/account_setup_nav_button"
-                android:contentDescription="@string/previous_action"
+                android:contentDescription="@string/previous"
                 android:id="@+id/previous"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:src="@drawable/ic_nav_arrow_previous_button"
-                android:text="@string/next_action" />
+                android:text="@string/next" />
             <Button
                 android:id="@+id/manual_setup"
                 android:layout_height="wrap_content"
@@ -77,12 +77,12 @@
                 android:layout_weight="1" />
             <ImageButton
                 style="@style/account_setup_nav_button"
-                android:contentDescription="@string/next_action"
+                android:contentDescription="@string/next"
                 android:id="@+id/next"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:src="@drawable/ic_nav_arrow_next_button"
-                android:text="@string/next_action" />
+                android:text="@string/next" />
         </LinearLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/res/menu-sw720dp/general_prefs_fragment_menu.xml b/res/menu-sw720dp/general_prefs_fragment_menu.xml
deleted file mode 100644
index d2317c3..0000000
--- a/res/menu-sw720dp/general_prefs_fragment_menu.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 Google Inc.
-     Licensed to The Android Open Source Project.
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/add_new_account"
-        android:title="@string/add_account"
-        android:showAsAction="always" />
-
-    <item
-        android:id="@+id/clear_picture_approvals_menu_item"
-        android:showAsAction="never"
-        android:title="@string/clear_display_images_whitelist_title"/>
-    <item
-        android:id="@+id/feedback_menu_item"
-        android:icon="@android:drawable/ic_menu_send"
-        android:title="@string/feedback"/>
-
-    <!-- TODO add help menu item, once help support has been moved to UnifiedEmail -->
-</menu>
diff --git a/res/menu-sw720dp/settings_fragment_menu.xml b/res/menu-sw720dp/settings_fragment_menu.xml
deleted file mode 100644
index 37cb1fa..0000000
--- a/res/menu-sw720dp/settings_fragment_menu.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 Google Inc.
-     Licensed to The Android Open Source Project.
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/add_new_account"
-        android:title="@string/add_account"
-        android:showAsAction="always" />
-
-    <item
-        android:id="@+id/feedback_menu_item"
-        android:icon="@android:drawable/ic_menu_send"
-        android:title="@string/feedback" />
-
-    <!-- TODO add help menu item, once help support has been moved to UnifiedEmail -->
-</menu>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
deleted file mode 100644
index e9dc2d1..0000000
--- a/res/values-bn-rBD/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"ইমেল সংযুক্তিগুলি পড়ুন"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"অ্যাপ্লিকেশানটিকে আপনার ইমেল সংযুক্তিগুলি পড়ার অনুমতি দেয়।"</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"ইমেল প্রদানকারীর ডেটা অ্যাক্সেস করুন"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"অ্যাপ্লিকেশানটিকে প্রাপ্ত বার্তা, পাঠানো বার্তা, ব্যবহারকারীর নাম, এবং পাসওয়ার্ডগুলি সহ আপনার ইমেল ডেটাবেস অ্যাক্সেস করার অনুমতি দেয়।"</string>
-    <string name="app_name" msgid="5815426892327290362">"ইমেল"</string>
-    <string name="debug_title" msgid="5175710493691536719">"ডিবাগ"</string>
-    <string name="next_action" msgid="3931301986364184415">"পরবর্তী"</string>
-    <string name="previous_action" msgid="5181616311579820981">"পূর্ববর্তী"</string>
-    <string name="done_action" msgid="7497990549515580249">"সম্পন্ন"</string>
-    <string name="create_action" msgid="3062715563215392251">"নতুন তৈরি করুন"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"কোনো দ্রুত প্রতিক্রিয়া নেই।"</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"অ্যাকাউন্ট সেটিংস"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"সিঙ্কের বিকল্পগুলি"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"সংযোগ সমস্যা৷"</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"বার্তা সরান"</item>
-    <item quantity="other" msgid="371256717624461324">"বার্তাগুলি সরান"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 অ্যাকাউন্টগুলিতে সরানো সমর্থিত নয়।"</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"নির্বাচনে একাধিক অ্যাকাউন্ট থাকার কারণে সরানো যাবে না।"</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"খসড়াগুলিতে, আউটবক্সে, এবং প্রেরিততে থাকা বার্তাগুলি সরানো যাবে না।"</string>
-    <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="mailbox_name_display_starred" msgid="7788694947644186069">"তারকা চিহ্নিত"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"অপঠিত"</string>
-    <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="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"সম্মিলিত দৃশ্য"</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>\nCC: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"দ্রুত প্রতিক্রিয়া ঢোকান"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"দ্রুত প্রতিক্রিয়া ঢোকান"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"আপনার ফরোয়ার্ড করা বার্তাতে থাকা এক বা একাধিক সংযুক্তি পাঠানোর আগে ডাউনলোড হবে।"</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"সংযুক্তিটি ডাউনলোড করা যায়নি।"</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"বার্তাটি ডিকোড করার সময় একটি ত্রুটি হয়েছে।"</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"এক বা একাধিক সংযুক্তি ফরোয়ার্ড করা যায়নি।"</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"সংযুক্তি ফরোয়ার্ড করা হয়নি"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> সাইন ইন অসফল।"</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"সাইন ইন করা যায়নি"</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>
-  </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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"অ্যাকাউন্ট সেটআপ"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"অনুমোদনের অনুরোধ জানানো হচ্ছে"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"সাইন ইন করুন"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"প্রমাণীকরণ করা যাবে না"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"ইমেল ঠিকানা বা পাসওয়ার্ড ভুল"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"ইমেল ঠিকানা:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"ইমেল অ্যাকাউন্ট"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"আপনি মাত্র কয়েকটি ধাপে আপনার অ্যাকাউন্ট সেট আপ করতে পারবেন।"</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ইমেল ঠিকানা"</string>
-    <string name="or_label" msgid="2207403489755254427">"অথবা"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Google এর মাধ্যমে সাইন ইন করুন"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"পাসওয়ার্ড"</string>
-    <string name="password_hint" msgid="8835390747504721561">"পাসওয়ার্ড"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s দিয়ে সাইন ইন করা হয়েছে"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"প্রমাণীকরণ"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"প্রমাণীকরণ জুড়ুন"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"প্রমাণীকরণ সাফ করুন"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"ম্যানুয়াল সেটআপ"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"একটি বৈধ ইমেল ঠিকানা ও পাসওয়ার্ড লিখুন।"</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"অনুরূপ অ্যাকাউন্ট"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"আপনি \"<xliff:g id="DUPLICATE">%s</xliff:g>\" অ্যাকাউন্টের জন্য এই ব্যবহারকারী নামটি ইতিমধ্যেই ব্যবহার করছেন।"</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"এই পাসওয়ার্ডটির শুরুতে বা শেষে এক বা একাধিক স্পেস রয়েছে। অনেক সার্ভার পাসওয়ার্ড স্পেস থাকলে তা সমর্থন করে না।"</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"অ্যাকাউন্ট তথ্য পুনরুদ্ধার হচ্ছে…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"সার্ভার সেটিংস যাচাই হচ্ছে…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"smtp সেটিংস যাচাই করা হচ্ছে..."</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"অ্যাকাউন্ট তৈরি হচ্ছে..."</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"অ্যাকাউন্টের ধরন নিশ্চিত করুন"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"আপনি ইঙ্গিত করেছেন যে <xliff:g id="EMAIL">%1$s</xliff:g> <xliff:g id="USERPROTOCOL">%2$s</xliff:g> ব্যবহার করে, কিন্তু হয়তো অ্যাকাউন্টটি <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> ব্যবহার করছে"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"অ্যাকাউন্ট সেটআপ"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"আপনার অ্যাকাউন্ট সেট আপ হয়েছে এবং ইমেল আসছে!"</string>
-    <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_names_user_name_empty_error" msgid="6791427018325367364">"এই ক্ষেত্রটি ফাঁকা রাখা যাবে না।"</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"অ্যাকাউন্ট সেটআপ"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"অ্যাকাউন্টের প্রকার"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"এটি কেমন ধরণের অ্যাকাউন্ট?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"অ্যাকাউন্ট সেটআপ"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"ইনকামিং সার্ভার সেটিংস"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"ব্যবহারকারীর নাম"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"পাসওয়ার্ড"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"পাসওয়ার্ড"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"সার্ভার"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"পোর্ট"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"নিরাপত্তার ধরন"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"কোনো কিছুই নয়"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (সবকটি শংসাপত্র স্বীকৃত)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (সবকটি শংসাপত্র স্বীকার করুন)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</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>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"অ্যাকাউন্ট সেটআপ"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"আউটগোয়িং সার্ভার সেটিংস"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP সার্ভার"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"পোর্ট"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"নিরাপত্তার ধরন"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"সাইন ইন করতে হবে"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"ব্যবহারকারীর নাম"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"পাসওয়ার্ড"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"ক্লায়েন্ট শংসাপত্র"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"নির্বাচন করুন"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"ক্লায়েন্ট শংসাপত্র ব্যবহার করুন"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"সরান"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"কোনো কিছুই নয়"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"মোবাইল ডিভাইস আইডি"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"অ্যাকাউন্ট সেটিংস"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"অ্যাকাউন্ট বিকল্পগুলি"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"সিঙ্ক ফ্রিকোয়েন্সি:"</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">"প্রতি ৫ মিনিটে"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"প্রতি ১০ মিনিটে"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"প্রতি ১৫ মিনিটে"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"প্রতি ৩০ মিনিটে"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"প্রত্যেক ঘন্টায়"</string>
-    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"ইমেল এলে আমাকে বিজ্ঞপ্তি পাঠান"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"এই অ্যাকাউন্ট থেকে পরিচিতিগুলি সিঙ্ক করুন"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"এই অ্যাকাউন্ট থেকে ক্যালেন্ডার সিঙ্ক করুন"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"এই অ্যাকাউন্ট থেকে ইমেল সিঙ্ক করুন"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"যখন Wi-Fi এ সংযুক্ত থাকে তখন সংযুক্তিগুলি স্বয়ংক্রিয়ভাবে ডাউনলোড করুন"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"সম্পন্ন করা যায়নি"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"এখান থেকে ইমেলগুলি সিঙ্ক করুন:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"স্বয়ংক্রিয়"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"গত দিন"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"গত তিন দিনের"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"গত সপ্তাহের"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"গত দুই সপ্তাহের"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"গত মাসের"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"সমস্ত"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"অ্যাকাউন্ট ডিফল্ট ব্যবহার করুন"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"ব্যবহারকারী নাম বা পাসওয়ার্ডটি ভুল।"</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"লগইন ব্যর্থ হয়েছে।\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"অ্যাকাউন্ট সেটআপে সমস্যা"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"ব্যবহারকারী নাম, পাসওয়ার্ড, এবং অ্যাকাউন্ট সেটিংস সঠিক কিনা নিশ্চিত করুন।"</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"সার্ভারে নিরাপদে সংযোগ করা যাচ্ছে না।"</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"সার্ভারে নিরাপদে সংযোগ করা যাচ্ছে না।\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"একটি ক্লায়েন্ট শংসাপত্রের প্রয়োজন। আপনি কি একটি ক্লায়েন্ট শংসাপত্র দিয়ে সার্ভারে সংযোগ করতে চান?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"শংসাপত্রটি অবৈধ অথবা অ্যাক্সেসযোগ্য নয়।"</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"সার্ভারটি প্রতিক্রিয়ায় একটি ত্রুটির কথা জানিয়েছে। আপনার ব্যবহারকারী নাম ও পাসওয়ার্ড পরীক্ষা করে নিয়ে আবার চেষ্টা করুন।"</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"সার্ভারে সংযোগ করা যাচ্ছে না।"</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"সার্ভারে সংযোগ করা যায়নি।\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="6799839150250217566">"সার্ভার প্রমাণীকরণ পদ্ধতিগুলিকে সমর্থন করে না।"</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"নিরাপত্তাগত ত্রুটির কারণে সার্ভারে সংযোগ করা যায়নি।"</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"সার্ভারে সংযোগ করা যায়নি।"</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"আপনি সার্ভার ঠিকানাটি ভুল লিখেছেন অথবা সার্ভারটির একটি এমন প্রোটোকল সংস্করণ প্রয়োজন যা ইমেল সমর্থন করে না।"</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"আপনার কাছে এই সার্ভারের সাথে সিঙ্ক করার অনুমতি নেই। আরো তথ্যের জন্য আপনার সার্ভারের প্রশাসকের সাথে যোগাযোগ করুন।"</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"দূরবর্তী নিরাপত্তা প্রশাসন"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"আপনাকে <xliff:g id="SERVER">%s</xliff:g> সার্ভারটিকে আপনার Android ডিভাইসের কিছু নিরাপত্তা বৈশিষ্ট্যকে দূরবর্তীভাবে নিয়ন্ত্রণ করার অনুমতি দিতে হবে। আপনি কি এই অ্যাকাউন্টের সেট আপ প্রক্রিয়া সমাপ্ত করতে চান?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"এই সার্ভারের এমন নিরাপত্তা বৈশিষ্টবলী প্রয়োজন যা আপনার Android ডিভাইস সমর্থন করে না, তৎসহ: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"আপনি কোনো অ্যাকাউন্টের ব্যবহারকারী নাম পরিবর্তন করতে পারবেন না। একটি ভিন্ন ব্যবহারকারী নামের কোনো অ্যাকাউন্ট জোড়ার জন্য, অ্যাকাউন্ট জুড়ুন স্পর্শ করুন।"</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"সতর্কতা: আপনার ডিভাইস পরিচালনার জন্য ইমেল অ্যাপ্লিকেশনের কর্তৃত্ব নিষ্ক্রিয় করা হলে যেসব ইমেল অ্যাকাউন্টের এটি প্রয়োজন সেগুলি, এবং তার পাশাপাশি সেগুলির ইমেল, পরিচিতি, ক্যালেন্ডার ইভেন্ট, এবং অন্যান্য ডেটা মুছে যাবে।"</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"নিরাপত্তা আপডেট"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> এর জন্য আপনার নিরাপত্তা সেটিংস আপডেট করা প্রয়োজন।"</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"নিরাপত্তাগত প্রয়োজনীয়তার কারণে \"<xliff:g id="ACCOUNT">%s</xliff:g>\" অ্যাকাউন্ট সিঙ্ক করা যাবে না।"</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" অ্যাকাউন্টের নিরাপত্তা সেটিংস আপডেট করা প্রয়োজন।"</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" অ্যাকাউন্টের নিরাপত্তা সেটিংস পরিবর্তন হয়েছে; কোনো ব্যবহারকারী পদক্ষেপের প্রয়োজন নেই।"</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"নিরাপত্তা আপডেট প্রয়োজন"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"নিরাপত্তা নীতিগুলি পরিবর্তিত হয়েছে"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"নিরাপত্তা নীতিগুলি পূরণ করা যাবে না"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"ডিভাইস নিরাপত্তা"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"আপনাকে <xliff:g id="SERVER">%s</xliff:g> সার্ভারটিকে আপনার Android ডিভাইসের কিছু নিরাপত্তা বৈশিষ্ট্যকে দূরবর্তীভাবে নিয়ন্ত্রণ করার অনুমতি দিতে হবে।"</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"বিশদ বিবরণ সম্পাদন করুন"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" এর জন্য আপনার লক স্ক্রিনের PIN বা পাসওয়ার্ড পরিবর্তন করা প্রয়োজন।"</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"লক স্ক্রিন পাসওয়ার্ডের মেয়াদ শেষ হচ্ছে"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"আপনার লক স্ক্রিন PIN অথবা পাসওয়ার্ডের মেয়াদ শেষ হয়েছে।"</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"লকস্ক্রিন পাসওয়ার্ড মেয়াদশেষ"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"লক স্ক্রিন পাসওয়ার্ডের মেয়াদ শেষ হচ্ছে"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"খুব শীঘ্রই আপনার লক স্ক্রিনের PIN বা পাসওয়ার্ড পরিবর্তন করা আবশ্যক, অথবা <xliff:g id="ACCOUNT">%s</xliff:g> এর ডেটা মুছে যাবে। আপনি কি এখনই এটি পরিবর্তন করতে চান?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"লক স্ক্রিন পাসওয়ার্ডের মেয়াদ শেষ হয়েছে"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"আপনার ডিভাইস থেকে <xliff:g id="ACCOUNT">%s</xliff:g> এর ডেটা মুছে ফেলা হচ্ছে। আপনি আপনার লক স্ক্রিন PIN অথবা পাসওয়ার্ড পরিবর্তন করে এটিকে পুনরুদ্ধার করতে পারেন। এটি এখনই পরিবর্তন করবেন?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"অসংরক্ষিত পরিবর্তনগুলি পরিত্যাগ করবেন?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"সাইন ইন করা যায়নি"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> এর জন্য ব্যবহারকারী নাম বা পাসওয়ার্ডটি ভুল। আপনি কি এখন সেগুলিকে আপডেট করতে চান?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"<xliff:g id="ACCOUNT">%s</xliff:g> এ আপনার লগইন ব্যর্থ হয়েছে; সার্ভার জানিয়েছে: <xliff:g id="REASON">%s</xliff:g> আপনি কি আপনার ব্যবহারকারী নাম এবং/অথবা পাসওয়ার্ড আপডেট করতে চান?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"সংযুক্তিগুলি ডাউনলোড করুন"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Wi-Fi দ্বারা সাম্প্রতিক বার্তাগুলির সংযুক্তিগুলি স্বয়ং-ডাউনলোড করুন"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"ইমেল বিজ্ঞপ্তিগুলি"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"সিঙ্ক হওয়ার হার, বিজ্ঞপ্তিগুলি, ইত্যাদি।"</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"ইমেল এলে বিজ্ঞপ্তি পাঠান"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"সিঙ্ক করার হার"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"ইনকামিং সেটিংস"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"ব্যবহারকারী নাম, পাসওয়ার্ড, ও অন্যান্য ইনকামিং সার্ভার সেটিংস"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"আউটগোয়িং সেটিংস"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"ব্যবহারকারী নাম, পাসওয়ার্ড, ও অন্যান্য আউটগোয়িং সার্ভার সেটিংস"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"প্রয়োগ করা নীতিগুলি"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"কোনো কিছুই নয়"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"অসমর্থিত নীতিগুলি"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"কোনো কিছুই নয়"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"সিঙ্কের প্রয়াস করুন"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"এই অ্যাকাউন্টটি সিঙ্ক করতে এখানে স্পর্শ করুন"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"অ্যাকাউন্টের নাম"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"আপনার নাম"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"দ্রুত প্রতিক্রিয়াগুলি"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"ইমেল লেখার সময় আপনি ঘন ঘন যে পাঠ্য সন্নিবেশ করেন সেটিকে সম্পাদনা করুন"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"বিজ্ঞপ্তি সেটিংস"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"ডেটার ব্যবহার"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"নিরাপত্তা নীতিগুলি"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"সিস্টেম ফোল্ডারগুলি"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"ট্র্যাশ ফোল্ডার"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"আপনার সার্ভারের ট্র্যাশ ফোল্ডার নির্বাচন করুন"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"আপনার সার্ভারের ট্র্যাশ ফোল্ডার নির্বাচন করুন"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"পাঠানো আইটেমগুলির ফোল্ডার"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"আপনার সার্ভারের প্রেরিত আইটেম ফোল্ডার নির্বাচন করুন"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"আপনার সার্ভারের পাঠানো আইটেমগুলির ফোল্ডার নির্বাচন করুন"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"দ্রুত প্রতিক্রিয়া"</string>
-    <string name="save_action" msgid="1988862706623227093">"সংরক্ষণ করুন"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"পরিচিতিগুলি সিঙ্ক"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"এই অ্যাকাউন্টের জন্য পরিচিতি সিঙ্ক"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"ক্যালেন্ডার সিঙ্ক"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"এই অ্যাকাউন্টের জন্য ক্যালেন্ডার ইভেন্ট সিঙ্ক"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ইমেল সিঙ্ক করুন"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"এই অ্যাকাউন্টের জন্য ইমেল সিঙ্ক"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"কম্পন"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"রিংটোন চয়ন করুন"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"সার্ভার সেটিংস"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"সিঙ্কের বিকল্পগুলি"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"সিঙ্কের বিকল্পগুলি (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"এই ফোল্ডারটি সিঙ্ক করুন"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"সংযুক্ত হলে বার্তাগুলি ডাউনলোড হবে"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"এত দিনের মেল সিঙ্ক করা হবে"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"প্রেরকের চিত্র"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"শুধুমাত্র POP অ্যাক্সেস সহ কিছু \"Plus\" অ্যাকাউন্ট এই প্রোগ্রামের সাথে সংযোগ করার অনুমতি দিচ্ছে। আপনি যদি আপনার সঠিক ইমেল ঠিকানা এবং পাসওয়ার্ড দিয়ে সাইন ইন করতে সক্ষম না হন তাহলে আপনার কাছে সম্ভবত কোনো অর্থ প্রদান করে পাওয়া \"Plus\" অ্যাকাউন্ট নেই। এই ইমেল অ্যাকাউন্টগুলিতে অ্যাক্সেস পেতে ওয়েব ব্রাউজার চালু করুন।"</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"এই ইমেল অ্যাকাউন্টটি সেট আপ করার আগে, T-Online ওয়েবসাইটে যান এবং POP3 ইমেল অ্যাক্সেসের জন্য একটি পাসওয়ার্ড তৈরি করুন।"</string>
-    <string name="exchange_name" msgid="1190783774800310346">"কর্পোরেট"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"অ্যাকাউন্ট তৈরি করা যায়নি। আবার চেষ্টা করুন।"</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"ইমেল"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"সার্ভার-নির্দিষ্ট নিরাপত্তা নীতিগুলি সক্ষম করে"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"সেটিংস"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"সাধারণ সেটিংস"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"মোছার আগে নিশ্চিত করুন"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"পাঠানোর আগে নিশ্চিত করুন"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"ইমেল অনুসন্ধান করুন"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"ডিভাইসের ক্যামেরা ব্যবহারের অনুমতি দেবেন না"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"ডিভাইস পাসওয়ার্ড প্রয়োজন"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"সাম্প্রতিক পাসওয়ার্ডগুলির পুনঃব্যবহার সীমাবদ্ধ করুন"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"পাসওয়ার্ডের মেয়াদ ফুরানো প্রয়োজন"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"স্ক্রিন লক হওয়ার পূর্বে ডিভাইস নিষ্ক্রিয় হতে হবে"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"সিঙ্ক হওয়া ক্যালেন্ডার ইভেন্টগুলির সংখ্যা সীমিত করুন"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"ইমেল সিঙ্ক হওয়ার সংখ্যা সীমিত করুন"</string>
-    <string name="quick_1" msgid="3426057697353380951">"ধন্যবাদ!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"আমার কাছে অর্থপূর্ণ বলেই মনে হচ্ছে!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"আমি এটি পরে পড়ব এবং আপনার সাথে যোগাযোগ করব।"</string>
-    <string name="quick_4" msgid="3988974084396883051">"এটি নিয়ে আলোচনা করার জন্য একটি মিটিঙের আয়োজন করা যাক।"</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"রোমিংয়ে থাকার সময় এই অ্যাকাউন্টের জন্য পটভূমি সিঙ্ক অক্ষম করা থাকে।"</string>
-    <string name="confirm_response" msgid="9151965975158906286">"প্রতিক্রিয়া পাঠানো হচ্ছে..."</string>
-    <string name="no_conversations" msgid="5559527390337162819">"কোনো বার্তা নেই৷"</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"ফোল্ডার চয়নকারী"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> এর সার্ভারের ট্র্যাশ ফোল্ডার নির্বাচন করুন"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g> এর জন্য সার্ভারের প্রেরিত আইটেম ফোল্ডার নির্বাচন করুন"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"ফোল্ডার তালিকা লোড হচ্ছে..."</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"কিছুই উপলব্ধ নয়"</string>
-</resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
deleted file mode 100644
index b6c2e91..0000000
--- a/res/values-eu-rES/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"Irakurri mezuetako eranskinak"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Mezuetako eranskinak irakurtzea baimentzen die aplikazioei."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"Atzitu posta-hornitzailearen datuak"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Posta elektronikoaren datu-basea atzitzea baimentzen die aplikazioei, besteak beste, jasotako eta bidalitako mezuak, erabiltzaile-izenak eta pasahitzak."</string>
-    <string name="app_name" msgid="5815426892327290362">"Helbide elektronikoa"</string>
-    <string name="debug_title" msgid="5175710493691536719">"Araztu"</string>
-    <string name="next_action" msgid="3931301986364184415">"Hurrengoa"</string>
-    <string name="previous_action" msgid="5181616311579820981">"Aurrekoa"</string>
-    <string name="done_action" msgid="7497990549515580249">"Eginda"</string>
-    <string name="create_action" msgid="3062715563215392251">"Sortu"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Erantzun bizkorrik gabe."</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"Kontuaren ezarpenak"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"Sinkronizazio-aukerak"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"Konexio-arazoa."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"Eraman mezua"</item>
-    <item quantity="other" msgid="371256717624461324">"Eraman mezuak"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 kontuek ez dute mezuak mugitzerik onartzen."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Ezin dira mezuak mugitu hautapenean kontu bat baino gehiagoko mezuak daudelako."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Zirriborroak, Irteera-ontzia eta Bidalitakoak karpetetako mezuak ezin dira mugitu."</string>
-    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Sarrera-ontzia"</string>
-    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Irteera-ontzia"</string>
-    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Zirriborroak"</string>
-    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Zaborrontzia"</string>
-    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Bidalitako mezuak"</string>
-    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Mezu baztergarriak"</string>
-    <string name="mailbox_name_display_starred" msgid="7788694947644186069">"Izardunak"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"Irakurri gabe"</string>
-    <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Sarrera-ontzia"</string>
-    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Izardunak"</string>
-    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Zirriborroak"</string>
-    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Irteera-ontzia"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Ikuspegi bateratua"</string>
-    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Jatorrizko mezua --------\nGaia: <xliff:g id="SUBJECT">%1$s</xliff:g>\nIgorlea: <xliff:g id="SENDER">%2$s</xliff:g>\nHartzailea: <xliff:g id="TO">%3$s</xliff:g>\nCC: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Sartu erantzun bizkorra"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"Sartu erantzun bizkorra"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Birbidalitako mezuko eranskin bat edo gehiago bidali aurretik deskargatuko dira."</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"Ezin izan da eranskina deskargatu."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"Errore bat gertatu mezua deskodetzean."</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Ezin izan dira eranskin bat edo gehiago birbidali."</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"Ez da eranskina birbidali"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"Ezin izan da <xliff:g id="ACCOUNT_NAME">%s</xliff:g> kontuan saioa hasi."</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"Ezin izan da saioa hasi"</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>
-  </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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"Kontuaren konfigurazioa"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"Eskatu baimena"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"Hasi saioa"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"Ezin da autentifikatu"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"Helbide elektronikoa edo pasahitza okerra da"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"Helbide elektronikoa:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Posta-kontua"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"Kontua urrats gutxitan konfigura dezakezu."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Helbide elektronikoa"</string>
-    <string name="or_label" msgid="2207403489755254427">"EDO"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Hasi saioa Google-n"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"PASAHITZA"</string>
-    <string name="password_hint" msgid="8835390747504721561">"Pasahitza"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s zerbitzuarekin hasi duzu saioa"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"AUTENTIFIKAZIOA"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"Gehitu autentifikazioa"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"Garbitu autentifikazioa"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Eskuzko konfigurazioa"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Idatzi baliozko helbide elektronikoa eta pasahitza."</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Bikoiztu kontua"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Dagoeneko erabiltzen duzu erabiltzaile-izen hori \"<xliff:g id="DUPLICATE">%s</xliff:g>\" kontuan."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"Pasahitzak zuriune-karaktere batekin edo gehiagorekin hasten da. Zerbitzari askok ez dituzte zuriuneak dituzten pasahitzak onartzen."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Kontuaren informazioa eskuratzen…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Zerbitzariaren ezarpenak balidatzen…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"SMTP ezarpenak balidatzen…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Kontua sortzen…"</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"Berretsi kontu mota"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"<xliff:g id="EMAIL">%1$s</xliff:g> kontuak <xliff:g id="USERPROTOCOL">%2$s</xliff:g> erabiltzen duela adierazi duzu, baina baliteke kontuak <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> erabiltzea"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"Kontuaren konfigurazioa"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"Kontua konfiguratu da eta posta jasoko duzu laster!"</string>
-    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Eman izena kontu honi (aukerakoa)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Zure izena (irteerako mezuetan bistaratzen da)"</string>
-    <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Eremuak ezin du hutsik egon."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Kontuaren konfigurazioa"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Kontu mota"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Zer motatako kontua da hau?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Kontuaren konfigurazioa"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Sarrerako zerbitzariaren ezarpenak"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"ERABILTZAILE-IZENA"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"PASAHITZA"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"Pasahitza"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"ZERBITZARIA"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"ATAKA"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"SEGURTASUN MOTA"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Bat ere ez"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (onartu ziurtagiri guztiak)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (onartu ziurtagiri guztiak)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Ezabatu mezu elektronikoak zerbitzaritik"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Inoiz ez"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Sarrera-ontzitik ezabatzean"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP bide-izenaren aurrizkia"</string>
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Aukerakoa"</string>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Kontuaren konfigurazioa"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Irteerako zerbitzariaren ezarpenak"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP ZERBITZARIA"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"ATAKA"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"SEGURTASUN MOTA"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Eskatu saioa hasteko"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"ERABILTZAILE-IZENA"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"PASAHITZA"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"BEZERO-ZIURTAGIRIA"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Hautatu"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Erabili bezeroaren ziurtagiria"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Kendu"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Bat ere ez"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"GAILU MUGIKORRAREN IDa"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"Kontuaren ezarpenak"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"Kontuaren aukerak"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Sinkronizazio-maiztasuna:"</string>
-    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Inoiz ez"</string>
-    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatikoa (push)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"5 minuturo"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"10 minuturo"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"15 minuturo"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"30 minuturo"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Orduro"</string>
-    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Jakinarazi mezu berriak iristen direnean"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sinkronizatu kontu honen kontaktuak"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sinkronizatu kontu honen egutegia"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sinkronizatu kontu honen posta"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Deskargatu eranskinak automatikoki Wi-Fi sarera konektatuta nagoenean"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Ezin izan da amaitu"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Sinkronizatu igorle honen mezu elektronikoak:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatikoa"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Azken eguna"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Azken hiru egunak"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"Azken astea"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Azken bi asteak"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Azken hilabetea"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Guztiak"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Erabili kontuaren balio lehenetsia"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Erabiltzaile-izena edo pasahitza okerra da."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Ezin izan da saioa hasi.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Arazo bat dago kontuaren konfigurazioan"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"Berretsi erabiltzaile-izena, pasahitza eta kontuaren ezarpenak zuzenak direla."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Ezin da zerbitzarira segurtasunez konektatu."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Ezin da zerbitzarira segurtasunez konektatu.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Bezero-ziurtagiria behar da. Zerbitzarira bezero-ziurtagiri batekin konektatu nahi duzu?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Ziurtagiria baliogabea da edo ezin da atzitu."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Zerbitzariak errore batekin erantzun du. Egiaztatu zure erabiltzaile-izena eta pasahitza, eta saiatu berriro."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Ezin da zerbitzarira konektatu."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Ezin izan da zerbitzarira konektatu.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS segurtasuna behar da baina zerbitzariak ez du onartzen."</string>
-    <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Zerbitzariak ez ditu gure autentifikazio-metodoak onartzen."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"Ezin izan da zerbitzarirako konexioa ireki segurtasun-errore bat gertatu delako."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Ezin izan da zerbitzarirako konexioa ireki."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Zerbitzari-helbide okerra idatzi duzu edo Postak onartzen ez duen protokolo-bertsioa eskatzen du zerbitzariak."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Ez duzu zerbitzari honekin sinkronizatzeko baimenik. Informazio gehiago lortzeko, jarri zerbitzariaren administratzailearekin harremanetan."</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Urruneko segurtasun-administrazioa"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"<xliff:g id="SERVER">%s</xliff:g> zerbitzariak Android gailuaren segurtasun-eginbide batzuk urrunetik kontrolatzea eskatzen du. Kontua konfiguratzen amaitu nahi duzu?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Android gailuak onartzen ez dituen segurtasun-eginbide batzuk eskatzen ditu zerbitzariak, besteak beste: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Ezin duzu kontu baten erabiltzaile-izena aldatu. Beste izen bat duen kontu bat gehitzeko, ukitu Gehitu kontua."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"ABISUA: Posta aplikazioari gailua administratzeko baimena desaktibatzen badiozu, hori eskatzen duten posta-kontu guztiak ezabatuko dira, bertako mezuak, kontaktuak, egutegiko gertaerak eta bestelako datuak barne."</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"Segurtasun-eguneratzea"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> kontuak segurtasun-ezarpenak eguneratzea eskatzen du."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Ezin da \"<xliff:g id="ACCOUNT">%s</xliff:g>\" kontua sinkronizatu segurtasun-eskakizunak direla-eta."</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" kontuak segurtasun-ezarpenak eguneratzea eskatzen du."</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" kontuak bere segurtasun-ezarpenak aldatu ditu. Erabiltzaileak ez du ezer egin beharrik."</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Segurtasuna eguneratu behar da"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"Segurtasun-gidalerroak aldatu egin dira"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Ezin dira gidalerroak gorde"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"Gailuaren segurtasuna"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g> zerbitzariak Android gailuaren segurtasun-eginbide batzuk urrunetik kontrolatzea eskatzen du."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Editatu xehetasunak"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" kontuak blokeatutako pantailaren PINa edo pasahitza aldatzea eskatzen du."</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Gailuko pasahitza iraungitzear"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"Pantaila blokeatuaren PINa edo pasahitza iraungi da."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"Pantaila blokeatuaren pasahitza iraungi da"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Gailuko pasahitza iraungitzear dago"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Pantaila desblokeatzeko PINa edo pasahitza laster aldatu behar dituzu. Bestela, <xliff:g id="ACCOUNT">%s</xliff:g> kontuko datuak ezabatu egingo dira. Orain aldatu nahi duzu?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"Pantaila blokeatuaren pasahitza iraungi da"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g> kontuko datuak gailutik ezabatu egingo dira. Datuak leheneratzeko, pantaila blokeatuaren PINa edo pasahitza aldatu behar duzu. Orain aldatu nahi duzu?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Gorde gabeko aldaketak baztertu nahi dituzu?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Ezin izan da saioa hasi"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> kontuaren erabiltzaile-izena edo pasahitza ez da zuzena. Aldatu egin nahi dituzu?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Ezin izan da <xliff:g id="ACCOUNT">%s</xliff:g> kontuan saioa hasi. Zerbitzariak emandako arrazoia: <xliff:g id="REASON">%s</xliff:g>. Erabiltzaile-izena edota pasahitza aldatu nahi dituzu?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Deskargatu eranskinak"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Deskargatu automatikoki azken mezuen eranskinak Wi-Fi bidez"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Posta elektroniko bidezko jakinarazpenak"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"Sinkronizazio-maiztasuna, jakinarazpenak eta abar."</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Bidali jakinarazpena mezu elektronikoak iristean"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Sinkronizazio-maiztasuna"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Sarrerako postaren ezarpenak"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Erabiltzaile-izena, pasahitza eta sarrerako zerbitzariaren gainerako ezarpenak"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Irteerako postaren ezarpenak"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Erabiltzaile-izena, pasahitza eta irteerako zerbitzariaren bestelako ezarpenak"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Gidalerroak aplikatzen dira"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Bat ere ez"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Onartu gabeko gidalerroak"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Bat ere ez"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"Saiatu sinkronizatzen"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Kontu hau sinkronizatzeko, ukitu hau"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"Kontuaren izena"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"Zure izena"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Erantzun bizkorrak"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Editatu mezu elektronikoak idaztean maiz idatzi ohi duzun testua"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"Jakinarazpenen ezarpenak"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"Datu-erabilera"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"Segurtasun-gidalerroak"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"Sistemaren karpetak"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"Zaborrontzia karpeta"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Hautatu zerbitzariaren zaborrontzi-karpeta"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Hautatu zerbitzariaren Zaborrontzia karpeta"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"Bidalitako elementuen karpeta"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Hautatu zerbitzariaren bidalitako elementuen karpeta"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Hautatu zerbitzariaren bidalitako elementuen karpeta"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"Erantzun bizkorra"</string>
-    <string name="save_action" msgid="1988862706623227093">"Gorde"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sinkronizatu kontaktuak"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sinkronizatu kontu honen kontaktuak"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sinkronizatu egutegia"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sinkronizatu kontu honen egutegiko gertaerak"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinkronizatu posta"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinkronizatu kontu honen posta"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Egin dar-dar"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"Aukeratu tonua"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"Zerbitzariaren ezarpenak"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Sinkronizazio-aukerak"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Sinkronizazio-aukerak (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Sinkronizatu karpeta hau"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Mezuak deskargatuko dira konexioa dagoenean"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Sinkronizatu beharreko postaren egun kopurua"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Igorlearen irudia"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"\"Plus\" kontu batzuek soilik dute programa honi konektatzeko aukera ematen dion POP sarbidea. Ezin baduzu helbide elektroniko eta pasahitz zuzenekin saioa hasi, baliteke ordainpeko \"Plus\" konturik ez izatea. Abiarazi web-arakatzailea posta-kontu horietarako sarbidea lortzeko."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"Posta-kontu hori konfiguratu aurretik, joan T-Online webgunera eta sortu POP3 postarako sarbiderako pasahitza."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"Enpresakoa"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"Ezin izan da kontua sortu. Saiatu berriro."</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"Posta"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"Zerbitzariak zehaztutako segurtasun-gidalerroak gaitzen ditu"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"Ezarpenak"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"Ezarpen orokorrak"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Berretsi ezabatu aurretik"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Berretsi bidali aurretik"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"Bilatu postan"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Ez baimendu gailuaren kamera erabiltzea"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"Eskatu gailuaren pasahitza"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"Debekatu azken pasahitzak berriro erabiltzea"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"Eskatu pasahitzak iraungitzea"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"Eskatu gailu inaktiboen pantaila blokeatzea"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"Mugatu sinkronizatu beharreko egutegiko gertaerak"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"Mugatu sinkronizatutako mezu elektroniko kopurua"</string>
-    <string name="quick_1" msgid="3426057697353380951">"Eskerrik asko!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"Ongi iruditzen zait!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"Geroxeago irakurriko dut eta erantzungo dizut."</string>
-    <string name="quick_4" msgid="3988974084396883051">"Egin dezagun bilera bat hori eztabaidatzeko."</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"Kontuan atzeko planoan sinkronizatzeko aukera desgaituta dago ibiltaritzan."</string>
-    <string name="confirm_response" msgid="9151965975158906286">"Erantzuna bidaltzen..."</string>
-    <string name="no_conversations" msgid="5559527390337162819">"Ez dago mezurik."</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"Karpeta-hautatzailea"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Hautatu <xliff:g id="ACCOUNT">%s</xliff:g> kontuaren zerbitzariaren Zaborrontzia karpeta"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Hautatu zerbitzariaren <xliff:g id="ACCOUNT">%s</xliff:g> kontuaren bidalitako mezuen karpeta"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Karpeta-zerrenda kargatzen…"</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"Ez dago bat ere erabilgarri"</string>
-</resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
deleted file mode 100644
index 5623457..0000000
--- a/res/values-gl-rES/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"Ler anexos de correo electrónico"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Permite á aplicación ler os teus anexos de correo electrónico."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"Acceso aos datos do fornecedor de correo electrónico"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Permite á aplicación acceder á base de datos do correo electrónico, incluídas as mensaxes recibidas, as mensaxes enviadas, os nomes de usuario e os contrasinais."</string>
-    <string name="app_name" msgid="5815426892327290362">"Correo electrónico"</string>
-    <string name="debug_title" msgid="5175710493691536719">"Depuración"</string>
-    <string name="next_action" msgid="3931301986364184415">"Seguinte"</string>
-    <string name="previous_action" msgid="5181616311579820981">"Anterior"</string>
-    <string name="done_action" msgid="7497990549515580249">"Feito"</string>
-    <string name="create_action" msgid="3062715563215392251">"Crear nova"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Non hai respostas rápidas."</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"Configuración da conta"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"Opcións de sincronización"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"Problema de conexión"</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"Mover mensaxe"</item>
-    <item quantity="other" msgid="371256717624461324">"Mover mensaxes"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"A operación de mover non é compatible con contas POP3."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Non se pode mover porque a selección contén varias contas."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"As mensaxes que están en Borradores, Caixa de saída e Enviados non se poden mover."</string>
-    <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">"Borradores"</string>
-    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Papeleira"</string>
-    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Enviadas"</string>
-    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Spam"</string>
-    <string name="mailbox_name_display_starred" msgid="7788694947644186069">"Marcados con estrela"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"Non lido"</string>
-    <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Caixa de entrada"</string>
-    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Marcados con estrela"</string>
-    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Borradores"</string>
-    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Caixa de saída"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Vista combinada"</string>
-    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mensaxe orixinal --------\nAsunto: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDe: <xliff:g id="SENDER">%2$s</xliff:g>\nPara: <xliff:g id="TO">%3$s</xliff:g>\nCc: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Inserir resposta rápida"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"Inserir resposta rápida"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Un ou máis anexos da mensaxe reenviada descargaranse antes de realizar o envío."</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"Non se puido descargar o anexo."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"Produciuse un erro durante a descodificación da mensaxe."</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Non se puideron reenviar un ou máis anexos."</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"Anexo non reenviado"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"Inicio de sesión en <xliff:g id="ACCOUNT_NAME">%s</xliff:g> incorrecto."</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"Non se puido iniciar sesión"</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>
-  </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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"Configuración da conta"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"Solicitando autorización"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"Iniciar sesión"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"Non se pode autenticar"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"O enderezo de correo electrónico ou o contrasinal non son correctos"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"Enderezo de correo electrónico:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Conta de correo electrónico"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"Podes configurar a túa conta en poucos pasos."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Enderezo de correo electrónico"</string>
-    <string name="or_label" msgid="2207403489755254427">"OU"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Iniciar sesión con Google"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"CONTRASINAL"</string>
-    <string name="password_hint" msgid="8835390747504721561">"Contrasinal"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"Iniciaches sesión con %s"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"AUTENTICACIÓN"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"Engadir autenticación"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"Borrar autenticación"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuración manual"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Escribe un enderezo de correo electrónico e un contrasinal válidos."</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Duplicar conta"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Xa estás usando este nome de usuario para a conta \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"Este contrasinal comeza ou remata por un ou máis caracteres de espazo. Moitos servidores non admiten contrasinais con espazos."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperando información da conta..."</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Validando a configuración do servidor..."</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Validando configuración de smtp..."</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Creando conta..."</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"Confirmar tipo de conta"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"Indicaches que <xliff:g id="EMAIL">%1$s</xliff:g> utiliza <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, pero é posible que a conta utilice <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"Configuración da conta"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"A túa conta está configurada e en breve recibirás o correo."</string>
-    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Asigna un nome a esta conta (opcional)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"O teu nome (mostrado nas mensaxes saíntes)"</string>
-    <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Este campo non pode quedar baleiro."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Configuración da conta"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Tipo de conta"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"De que tipo de conta se trata?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Configuración da conta"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Configuración do servidor entrante"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"NOME DE USUARIO"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"CONTRASINAL"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"Contrasinal"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVIDOR"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORTO"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TIPO DE SEGURANZA"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ningún"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (acéptanse todos os certificados)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (acepta todos os certificados)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Eliminar correo electrónico do servidor"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Nunca"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Cando elimino correo electrónico da caixa de entrada"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Prefixo de ruta IMAP"</string>
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Opcional"</string>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Configuración da conta"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Configuración do servidor saínte"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SERVIDOR SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORTO"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TIPO DE SEGURANZA"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Solicitar inicio de sesión"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"NOME DE USUARIO"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"CONTRASINAL"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"CERTIFICADO DE CLIENTE"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Seleccionar"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Usar certificado de cliente"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Eliminar"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ningún"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ID DE DISPOSITIVO MÓBIL"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"Configuración da conta"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"Opcións de conta"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Frecuencia da sincronización:"</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ática (push)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Cada 5 minutos"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Cada 10 minutos"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Cada 15 minutos"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Cada 30 minutos"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Cada hora"</string>
-    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Enviarme unha notificación cando chegue un correo electrónico"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Sincronizar os contactos desde esta conta"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Sincronizar o calendario desde esta conta"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Sincronizar o correo electrónico desde esta conta"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Descargar anexos automaticamente cando te conectes á wifi"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Non se puido completar a configuración"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Sincronizar correos electrónicos de:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automática"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Último día"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Últimos tres días"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"A semana pasada"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Últimas dúas semanas"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"O mes pasado"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Todo"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Usar valores predeterminados da conta"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"O nome de usuario ou o contrasinal son incorrectos."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Erro de inicio de sesión.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Problema coa configuración da conta"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"Confirma que o nome de usuario, o contrasinal e a configuración da conta sexan correctos."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Non se pode conectar de forma segura ao servidor."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Non se pode conectar de forma segura ao servidor.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"É necesario un certificado de cliente. Queres conectarte ao servidor cun certificado de cliente?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"O certificado non é válido ou non se pode acceder a el."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"O servidor respondeu cun erro. Comproba o teu nome de usuario e contrasinal e, a continuación, téntao de novo."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Non se pode conectar ao servidor."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Non se pode conectar co servidor.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS é necesario, pero non é compatible co servidor."</string>
-    <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Os métodos de autenticación non son compatibles co servidor."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"Non se puido abrir a conexión co servidor debido a un erro de seguranza."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Non se puido abrir a conexión co servidor."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Escribiches un enderezo de servidor incorrecto ou o servidor require unha versión de protocolo que o correo electrónico non admite."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Non tes permiso para sincronizar con este servidor. Ponte en contacto co administrador do servidor para obter máis información."</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administración de seguranza remota"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"É necesario que permitas que o servidor <xliff:g id="SERVER">%s</xliff:g> controle de forma remota certas funcións de seguranza do dispositivo Android. Queres acabar de configurar esta conta?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Este servidor require funcións de seguranza que o teu dispositivo Android non admite, incluídas: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Non se pode cambiar o nome de usuario dunha conta. Para engadir unha conta cun nome de usuario diferente, toca Engadir conta."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"ADVERTENCIA: A desactivación do permiso da aplicación de correo electrónico para administrar o teu dispositivo eliminará todas as contas de correo electrónico que o requiren, xunto co seu correo electrónico, os contactos, os eventos do calendario e outros datos."</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"Actualización de seguranza"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> require actualizar a configuración de seguranza."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" non se pode sincronizar debido aos requisitos de seguranza."</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" require unha actualización da configuración de seguranza."</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"A conta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" cambiou a súa configuración de seguranza; non se require ningunha acción por parte do usuario."</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Actual. seguranza obrigatoria"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"Variaron as políticas de seguranza"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Non se cumpren polít. segur."</string>
-    <string name="account_security_title" msgid="3511543138560418587">"Seguranza do dispositivo"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"É necesario que permitas que o servidor <xliff:g id="SERVER">%s</xliff:g> controle de forma remota certas funcións de seguranza do dispositivo Android."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Editar detalles"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" require que cambies o contrasinal ou o PIN da pantalla de bloqueo."</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Contrasinal bloqueo caduca"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"O contrasinal ou o PIN da pantalla de bloqueo caducou."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"Contrasinal bloqueo caducado"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Contrasinal pantalla bloqueo vai caducar"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Tes que cambiar o contrasinal ou PIN da pantalla de bloqueo en breve, do contrario borraranse os datos de <xliff:g id="ACCOUNT">%s</xliff:g>. Queres cambialo agora?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"Contrasinal da pantalla bloqueo caducado"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Os datos de <xliff:g id="ACCOUNT">%s</xliff:g> estanse borrando do teu dispositivo. Podes restauralos cambiando o contrasinal ou o PIN ou da pantalla de bloqueo. Queres cambialo agora?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Descartar os cambios non gardados?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Non se puido iniciar sesión"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"O nome de usuario ou o contrasinal de <xliff:g id="ACCOUNT">%s</xliff:g> non son correctos. Queres actualizalos agora?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Erro no inicio de sesión de <xliff:g id="ACCOUNT">%s</xliff:g>; o servidor indicou: <xliff:g id="REASON">%s</xliff:g> Queres actualizar o teu nome de usuario e/ou contrasinal?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descargar anexos"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descarga automaticamente anexos de mensaxes recentes por wifi"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificacións por correo electrónico"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"Frecuencia da sincronización, notificacións, etc."</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Envía unha notificación cando se recibe un correo electrónico"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Frecuencia de sincronización"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Configuración de entrada"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Nome usuario, contrasinal e axustes do servidor de entrada"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Configuración de saída"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Nome usuario, contrasinal e outros axustes do servidor de saída"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Políticas aplicadas"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Ningún"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Políticas non compatibles"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Ningún"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"Intentar a sincronización"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Toca aquí para sincronizar esta conta"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"Nome da conta"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"O teu nome"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Respostas rápidas"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Edita texto que acostumas utilizar nos teus correos"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"Configuración das notificacións"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"Uso de datos"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"Políticas de seguranza"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"Cartafoles do sistema"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"Cartafol da papeleira"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Selecciona o cartafol da papeleira do servidor"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Selecciona o cartafol da papeleira do servidor"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"Cartafol de elementos enviados"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Selecciona o cartafol de elementos enviados do servidor"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Selecciona o cartafol de elementos enviados do servidor"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"Resposta rápida"</string>
-    <string name="save_action" msgid="1988862706623227093">"Gardar"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincron. contactos"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Sincroniza contactos para a conta"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Sincron. calendario"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Sincroniza o evento do calendario para esta conta"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar correo"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincroniza correo para esta conta"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"Seleccionar ton de chamada"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"Configuración do servidor"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Opcións de sincronización"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Opcións de sincronización (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Sincronizar este cartafol"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"As mensaxes descargaranse cando esteas conectado"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Días para sincronizar correo"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Imaxe do remitente"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"Unicamente algunhas contas \"Plus\" inclúen o acceso POP que permite a conexión deste programa. Se non es capaz de iniciar sesión co enderezo de correo electrónico e o contrasinal correctos, é posible que non dispoñas dunha conta \"Plus\" de pago. Inicia o navegador web para obter acceso a estas contas de correo electrónico."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"Antes de configurar esta conta de correo electrónico, visita o sitio web de T-Online e crea un contrasinal para acceder ao correo electrónico POP3."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"Corporativa"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"Non se puido crear a conta. Téntao de novo."</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"Correo electrónico"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"Permite políticas de seguranza especificadas polo servidor"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"Configuración"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"Configuración xeral"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Confirmar antes de eliminar"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Confirmar antes de enviar"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"Busca correo electrónico"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Non permitir o uso da cámara do dispositivo"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"Requirir contrasinal do dispositivo"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"Restrinxir reutilización de contrasinais recentes"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"Requirir que os contrasinais caduquen"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"Dispositivo inactivo necesario para bloqueo"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"Limita os eventos do calendario sincronizados"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"Limitar número correos electrónicos sincronizados"</string>
-    <string name="quick_1" msgid="3426057697353380951">"Grazas!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"A min paréceme ben."</string>
-    <string name="quick_3" msgid="8061819976353395585">"Lereino máis tarde e responderei."</string>
-    <string name="quick_4" msgid="3988974084396883051">"Organicemos unha reunión para tratar este tema."</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"A sincronización en segundo plano para esta conta está desactivada durante a itinerancia."</string>
-    <string name="confirm_response" msgid="9151965975158906286">"Enviando resposta..."</string>
-    <string name="no_conversations" msgid="5559527390337162819">"Non hai mensaxes."</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"Selector de cartafol"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Selecciona o cartafol da papeleira do servidor para <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Seleccionar cartafol para <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Cargando lista de cartafoles..."</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"Ningunha dispoñible"</string>
-</resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
deleted file mode 100644
index 0989b20..0000000
--- a/res/values-is-rIS/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"Lesa viðhengi í tölvupósti"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Leyfir forritinu að lesa tölvupóstviðhengin þín."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"Aðgangur að gögnum tölvupóstveitu"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Veitir forritinu aðgang að tölvupóstsgagnagrunninum þínum, þ. á m. mótteknum og sendum skeytum, notandanöfnum og aðgangsorðum."</string>
-    <string name="app_name" msgid="5815426892327290362">"Tölvupóstur"</string>
-    <string name="debug_title" msgid="5175710493691536719">"Villuleit"</string>
-    <string name="next_action" msgid="3931301986364184415">"Áfram"</string>
-    <string name="previous_action" msgid="5181616311579820981">"Til baka"</string>
-    <string name="done_action" msgid="7497990549515580249">"Lokið"</string>
-    <string name="create_action" msgid="3062715563215392251">"Búa til nýtt"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Engin snarsvör."</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"Reikningsstillingar"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"Samstillingarkostir"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"Vandamál við tengingu."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"Færa skeyti"</item>
-    <item quantity="other" msgid="371256717624461324">"Færa skeyti"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3-reikningar styðja ekki að skeyti séu færð."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Ekki er hægt að færa skeyti vegna þess að margir reikningar eru valdir."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Ekki er hægt að færa skeyti sem eru í drögum, úthólfi eða sendum pósti."</string>
-    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Pósthólf"</string>
-    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Úthólf"</string>
-    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Drög"</string>
-    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Rusl"</string>
-    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Sent"</string>
-    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Ruslpóstur"</string>
-    <string name="mailbox_name_display_starred" msgid="7788694947644186069">"Stjörnumerkt"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"Ólesin"</string>
-    <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Pósthólf"</string>
-    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Stjörnumerkt"</string>
-    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Drög"</string>
-    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Úthólf"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Sameinað yfirlit"</string>
-    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Upprunalegt skeyti --------\nEfni: <xliff:g id="SUBJECT">%1$s</xliff:g>\nFrá: <xliff:g id="SENDER">%2$s</xliff:g>\nTil: <xliff:g id="TO">%3$s</xliff:g>\nAfrit: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Setja inn snarsvar"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"Setja inn snarsvar"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Eitt eða fleiri viðhengi í áframsenda skeytinu verða sótt fyrir sendingu."</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"Ekki var hægt að sækja viðhengið."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"Villa kom upp við að afkóða skeytið."</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Ekki var hægt að áframsenda eitt eða fleiri viðhengi."</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"Viðhengi ekki áframsent"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"Innskráning á <xliff:g id="ACCOUNT_NAME">%s</xliff:g> tókst ekki."</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"Innskráning tókst ekki"</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>
-  </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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"Uppsetning reiknings"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"Fer fram á auðkenningu"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"Innskráning"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"Auðkenning tókst ekki"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"Netfang eða aðgangsorð er rangt"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"Netfang:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Tölvupóstreikningur"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"Þú getur sett upp reikninginn þinn í örfáum skrefum."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Netfang"</string>
-    <string name="or_label" msgid="2207403489755254427">"EÐA"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Skrá inn með Google"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"AÐGANGSORÐ"</string>
-    <string name="password_hint" msgid="8835390747504721561">"Aðgangsorð"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"Skráð(ur) inn með %s"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"AUÐKENNING"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"Bæta auðkenningu við"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"Hreinsa auðkenningu"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Handvirk uppsetning"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Sláðu inn gilt netfang og aðgangsorð."</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Tvítekinn reikningur"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Þú ert nú þegar að nota þetta notandanafn fyrir reikninginn „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"Þetta aðgangsorð hefst eða lýkur á einu eða fleiri bilum. Margir þjónar styðja ekki aðgangsorð sem innihalda bil."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Sækir reikningsupplýsingar…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Fer yfir þjónsstillingar…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Sannprófar SMTP-stillingar…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Stofnar reikning…"</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"Staðfestu tegund reiknings"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"Þú gafst til kynna að <xliff:g id="EMAIL">%1$s</xliff:g> notist við <xliff:g id="USERPROTOCOL">%2$s</xliff:g> en reikningurinn kann að notast við <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"Uppsetning reiknings"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"Reikningurinn hefur verið settur upp og tölvupósturinn er á leiðinni!"</string>
-    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Gefðu þessum reikningi heiti (valfrjálst)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Nafnið þitt (birtist í sendum skeytum)"</string>
-    <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Þessi reitur má ekki vera auður."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Uppsetning reiknings"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Tegund reiknings"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hvernig reikningur er þetta?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Uppsetning reiknings"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Stillingar móttökuþjóns"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"NOTANDANAFN"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"AÐGANGSORÐ"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"Aðgangsorð"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"NETÞJÓNN"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"GÁTT"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"TEGUND ÖRYGGIS"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ekkert"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (samþykkja öll vottorð)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"SSL/TLS (samþykkja öll vottorð)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Eyða tölvupósti af þjóni"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Aldrei"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Þegar ég eyði úr pósthólfinu"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Forskeyti IMAP-slóðar"</string>
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valfrjálst"</string>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Uppsetning reiknings"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Stillingar sendingarþjóns"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP-ÞJÓNN"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"GÁTT"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"TEGUND ÖRYGGIS"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Krefjast innskráningar"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"NOTANDANAFN"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"AÐGANGSORÐ"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"BIÐLARAVOTTORÐ"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Velja"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Nota biðlaravottorð"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Fjarlægja"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ekkert"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"AUÐKENNI FARTÆKIS"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"Reikningsstillingar"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"Reikningsvalkostir"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Samstillingartíðni:"</string>
-    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Aldrei"</string>
-    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Sjálfvirkt (vöktun)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Á 5 mínútna fresti"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Á 10 mínútna fresti"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Á 15 mínútna fresti"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Á 30 mínútna fresti"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Á klukkustundarfresti"</string>
-    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Láta mig vita þegar tölvupóstur berst"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Samstilla tengiliði þessa reiknings"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Samstilla dagatal þessa reiknings"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Samstilla tölvupóst þessa reiknings"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Sækja viðhengi sjálfkrafa þegar Wi-Fi tenging er til staðar"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Ekki tókst að ljúka uppsetningu"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Samstilla tölvupóst frá:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Sjálfvirkt"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Lokadagur"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Síðustu þrír dagar"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"Síðasta vika"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Síðustu tvær vikur"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Síðasti mánuður"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Allt"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Nota sjálfgildi reiknings"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Rangt notandanafn eða aðgangsorð."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Innskráning tókst ekki.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Vandamál með uppsetningu reiknings"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"Staðfestu að notandanafn, aðgangsorð og reikningsstillingar séu réttar."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Ekki náðist örugg tenging við þjóninn."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Ekki náðist örugg tenging við þjóninn.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Krafist er vottorðs frá biðlara. Viltu tengjast þjóninum með vottorði biðlara?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Vottorðið er ógilt eða óaðgengilegt."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Þjónninn svaraði með villu. Athugaðu notandanafn og aðgangsorð og reyndu aftur."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Ekki tókst að tengjast við þjóninn."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Ekki náðist tenging við þjóninn.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS er krafist en þjónninn styður það ekki."</string>
-    <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Þjónninn styður ekki auðkenningaraðferðir."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"Ekki tókst að opna tengingu við þjóninn vegna öryggisvillu."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Ekki tókst að koma á tengingu við þjóninn."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Þú slóst inn rangt vistfang þjóns eða þjónninn krefst útgáfu af samskiptareglu sem tölvupóstforritið styður ekki."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Þú hefur ekki heimild til að samstilla við þennan þjón. Hafðu samband við kerfisstjóra þjónsins til að fá frekari upplýsingar."</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Fjarstýrt öryggi"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Þjónninn <xliff:g id="SERVER">%s</xliff:g> krefst þess að þú leyfir honum að fjarstýra einhverjum öryggiseiginleikum Android tækisins þíns. Viltu ljúka við að setja upp þennan reikning?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Þessi þjónn krefst öryggiseiginleika sem Android tækið þitt styður ekki, þar á meðal: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Þú getur ekki breytt notandanafni reiknings. Ýttu á Bæta reikningi við til að bæta við reikningi með öðru notandanafni."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"VIÐVÖRUN: Ef heimild tölvupóstsforritsins til að stýra tækinu er afturkölluð verður öllum tölvupóstreikningum sem krefjast hennar eytt ásamt tölvupósti, tengiliðum, dagatalsviðburðum og öðrum gögnum."</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"Öryggisuppfærsla"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> krefst þess að þú uppfærir öryggisstillingarnar þínar."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Öryggiskröfur valda því að ekki er hægt að samstilla reikninginn „<xliff:g id="ACCOUNT">%s</xliff:g>“."</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Reikningurinn „<xliff:g id="ACCOUNT">%s</xliff:g>“ krefst uppfærslu á öryggisstillingum."</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Öryggisstillingum reikningsins „<xliff:g id="ACCOUNT">%s</xliff:g>“ var breytt. Þú þarft ekkert að aðhafast."</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Öryggisuppfærslu er krafist"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"Öryggisstefnur hafa breyst"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Ekki hægt að uppfylla stefnur"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"Öryggi tækis"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Þjónninn <xliff:g id="SERVER">%s</xliff:g> krefst þess að þú veitir honum heimild til að fjarstýra einhverjum öryggiseiginleikum Android tækisins."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Breyta upplýsingum"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"„<xliff:g id="ACCOUNT">%s</xliff:g>“ krefst þess að þú breytir PIN-númeri eða aðgangsorði lásskjásins."</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Aðgangsorð lásskjás rennur út"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"PIN-númer eða aðgangsorð lásskjásins er útrunnið."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"Aðgangsorð lásskjás útrunnið"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Aðgangsorð lásskjásins er að renna út"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Þú verður að breyta PIN-númeri eða aðgangsorði lásskjásins bráðlega; að öðrum kosti verður gögnum <xliff:g id="ACCOUNT">%s</xliff:g> eytt. Viltu breyta núna?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"Aðgangsorð lásskjásins er útrunnið"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Verið er að eyða gögnum <xliff:g id="ACCOUNT">%s</xliff:g> úr tækinu. Þú getur endurheimt þau með því að breyta PIN-númeri eða aðgangsorði lásskjásins. Viltu breyta núna?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Fleygja óvistuðum breytingum?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Innskráning tókst ekki"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Notandanafn eða aðgangsorð fyrir <xliff:g id="ACCOUNT">%s</xliff:g> er rangt. Viltu uppfæra þessar upplýsingar núna?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Innskráningin á <xliff:g id="ACCOUNT">%s</xliff:g> mistókst. Þjónninn sagði: <xliff:g id="REASON">%s</xliff:g> Viltu uppfæra notandanafnið þitt og/eða aðgangsorð?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Sækja viðhengi"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Sækja viðhengi nýlegra skeyta sjálfkrafa í gegnum Wi-Fi"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Tilkynningar um tölvupóst"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"Samstillingartíðni, tilkynningar o.s.frv."</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Senda tilkynningu þegar tölvupóstur berst"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Samstillingartíðni"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Móttökustillingar"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Notandanafn, aðgangsorð og aðrar stillingar móttökuþjóns"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Sendingarstillingar"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Notandanafn, aðgangsorð og aðrar stillingar sendingarþjóns"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Stefnum framfylgt"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Ekkert"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Óstuddar stefnur"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Ekkert"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"Reyna samstillingu"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Snertu hér til að samstilla þennan reikning"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"Heiti reiknings"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"Nafnið þitt"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Snarsvör"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Breyta texta sem þú setur oft inn þegar þú skrifar tölvupóst"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"Tilkynningastillingar"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"Gagnanotkun"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"Öryggisstefnur"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"Kerfismöppur"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"Ruslmappa"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Veldu möppu fyrir rusl á þjóninum"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Veldu möppu fyrir rusl á þjóninum"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"Mappa fyrir send atriði"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Veldu möppu fyrir send atriði á þjóninum"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Veldu möppu fyrir send atriði á þjóninum"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"Snarsvar"</string>
-    <string name="save_action" msgid="1988862706623227093">"Vista"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Samstilla tengiliði"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Samstilla tengiliði þessa reiknings"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Samstilla dagatal"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Samstilla dagatalsviðburði þessa reiknings"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Samstilla tölvupóst"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Samstilla tölvupóst þessa reiknings"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Titringur"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"Velja hringitón"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"Stillingar þjóns"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Samstillingarkostir"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Samstillingarkostir (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Samstilla þessa möppu"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Skeyti verða sótt þegar tenging er til staðar"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Dagar af pósti til að samstilla"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Mynd sendanda"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"Aðeins sumir „Plus“-reikningar bjóða upp á POP-aðgang til að gera þessu forriti kleift að tengjast. Ef þú getur ekki skráð þig inn með réttu netfangi og aðgangsorði er ekki víst að þú sért með „Plus“-reikning sem greitt hefur verið fyrir. Opnaðu vafra til að fá aðgang að þessum tölvupóstreikningum."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"Áður en þessi tölvupóstreikningur er settur upp skaltu fara á vefsvæði T-Online og stofna aðgangsorð fyrir POP3-aðgang að tölvupósti."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"Fyrirtæki"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"Ekki var hægt að stofna reikninginn. Reyndu aftur."</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"Tölvupóstur"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"Gerir öryggisstefnur frá þjóni virkar"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"Stillingar"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"Almennar stillingar"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Staðfesta áður en eytt er"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Staðfesta áður en þú sendir"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"Leita í tölvupósti"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Banna notkun myndavélar tækisins"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"Krefjast aðgangsorðs fyrir tæki"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"Takmarka endurnýtingu nýlegra aðgangsorða"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"Krefjast þess að aðgangsorð renni út"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"Krefjast að skjá sé læst ef tækið er ekki í notkun"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"Takmarka fjölda samstilltra dagatalsviðburða"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"Takmarka fjölda samstilltra skeyta"</string>
-    <string name="quick_1" msgid="3426057697353380951">"Takk!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"Hljómar vel fyrir mitt leyti!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"Ég les þetta seinna og verð í sambandi."</string>
-    <string name="quick_4" msgid="3988974084396883051">"Höldum fund til að ræða þetta."</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"Í reiki er slökkt á samstillingu í bakgrunni fyrir þennan reikning."</string>
-    <string name="confirm_response" msgid="9151965975158906286">"Sendir svar…"</string>
-    <string name="no_conversations" msgid="5559527390337162819">"Engin skeyti."</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"Möppuval"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Veldu möppu fyrir rusl fyrir <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Veldu möppu fyrir send atriði fyrir <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Hleður möppulista…"</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"Ekkert í boði"</string>
-</resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
deleted file mode 100644
index 66cf53e..0000000
--- a/res/values-kk-rKZ/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"Электрондық пошта тіркемелерін оқу"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Қолданбаға сіздің электрондық пошта тіркемелеріңізді оқуға мүмкіндік береді"</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"Электрондық пошта провайдері деректеріне қатынас"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Қолданбаға сіздің электрондық поштаңыздың дерекқорына, соның ішінде алынған хабарларға, жіберілген хабарларға, пайдаланушы аттарына және құпия сөздерге қатынасуға рұқсат береді."</string>
-    <string name="app_name" msgid="5815426892327290362">"Электрондық пошта"</string>
-    <string name="debug_title" msgid="5175710493691536719">"Күйін келтіру"</string>
-    <string name="next_action" msgid="3931301986364184415">"Келесі"</string>
-    <string name="previous_action" msgid="5181616311579820981">"Алдыңғы"</string>
-    <string name="done_action" msgid="7497990549515580249">"Орындалды"</string>
-    <string name="create_action" msgid="3062715563215392251">"Жаңасын жасау"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Жылдам жауаптар жоқ."</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"Есептік жазба параметрлері"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"Синхрондау опциялары"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"Қосылым мәселесі."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"Хабарды жылжыту"</item>
-    <item quantity="other" msgid="371256717624461324">"Хабарларды жылжыту"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 есептік жазбаларында жылжытуға қолдау көрсетілмейді."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Жылжыту мүмкін емес, өйткені таңдауда бірнеше есептік жазба бар."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"«Жоба жазбалар», «Шығыс» және «Жіберілгендер» қалталарындағы хабарларды жылжыту мүмкін емес."</string>
-    <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="mailbox_name_display_starred" msgid="7788694947644186069">"Жұлдызшалы"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"Оқылмаған"</string>
-    <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="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Біріктірілген көрініс"</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_insert_quick_response_list_title" msgid="5314107302508728189">"Жылдам жауап кірістіру"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"Жылдам жауап кірістіру"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Сіздің қайта жіберілген хабарыңыздағы тіркемелердің бірі немесе бірнешеуі жіберместен бұрын жүктеледі."</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"Тіркемені жүктеу мүмкін болмады."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"Хабарды кодтан шығару кезінде қате пайда болды."</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Бір немесе бірнеше тіркемені қайта жіберу мүмкін болмады."</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"Тіркеме қайта жіберілмеді"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> жүйеге кіруі сәтсіз болды."</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"Жүйеге кіру мүмкін болмады"</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>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>КБ"</item>
-    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>КБ"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>МБ"</item>
-    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>МБ"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"Есептік жазбаны реттеу"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"Авторизация сұралуда"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"Кіру"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"Аутентификациялау мүмкін болмады"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"Электрондық пошта мекенжайы немесе құпия сөз дұрыс емес"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"Электрондық пошта мекенжайы:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Электрондық пошта есептік жазбасы"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"Есептік жазбаны бар болғаны бірнеше қадаммен реттей аласыз."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Электрондық пошта мекенжайы"</string>
-    <string name="or_label" msgid="2207403489755254427">"НЕМЕСЕ"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Google арқылы кіру"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"ҚҰПИЯ СӨЗ"</string>
-    <string name="password_hint" msgid="8835390747504721561">"Құпия сөз"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s арқылы кірді"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"АУТЕНТИФИКАЦИЯ"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"Аутентификацияны қосу"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"Аутентификацияны тазалау"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Қолмен реттеу"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Жарамды электрондық пошта мекенжайын немесе құпия сөзді теріңіз."</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Есептік жазбаны көшірмелеу"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Сіз бұл пайдаланушы атын «<xliff:g id="DUPLICATE">%s</xliff:g>» есептік жазбасы үшін әлдеқашан пайдаландыңыз."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"Бұл құпия сөз бір немесе бірнеше бос орынмен басталады немесе аяқталады. Серверлердің көбі бос орындары бар құпия сөздерді қолдамайды."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Есептік жазба ақпараты шығарып алынуда…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Сервер параметрлері тексерілуде…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"SMTP параметрлері тексерілуде…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Есептік жазба жасалуда…"</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"Есептік жазба түрін растау"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"Сіз <xliff:g id="EMAIL">%1$s</xliff:g> <xliff:g id="USERPROTOCOL">%2$s</xliff:g> пайдаланатынын көрсеттіңіз, бірақ есептік жазба <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> пайдалана алады"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"Есептік жазбаны реттеу"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"Сіздің есептік жазбаңыз реттелді және электрондық пошта келе жатыр!"</string>
-    <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_names_user_name_empty_error" msgid="6791427018325367364">"Бұл өріс толтырылуы қажет."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Есептік жазбаны реттеу"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Есептік жазба түрі"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Бұл есептік жазбаның түрі қандай?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Есептік жазбаны реттеу"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Кіріс сервер параметрлері"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"ПАЙДАЛАНУШЫ АТЫ"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"ҚҰПИЯ СӨЗ"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"Құпия сөз"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"СЕРВЕР"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"ПОРТ"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"ҚАУІПСІЗДІК ТҮРІ"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ешқандай"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Барлық сертификаттарды қабылдау)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (барлық сертификаттарды қабылдау)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</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>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Есептік жазбаны реттеу"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Шығыс сервер параметрлері"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP СЕРВЕРІ"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"ПОРТ"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"ҚАУІПСІЗДІК ТҮРІ"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Жүйеге кіруді талап ету"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"ПАЙДАЛАНУШЫ АТЫ"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"ҚҰПИЯ СӨЗ"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"КЛИЕНТ СЕРТИФИКАТЫ"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Таңдау"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Клиент сертификатын пайдалану"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Жою"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Ешқандай"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"МОБИЛЬДІ ҚҰРЫЛҒЫНЫҢ ИДЕНТИФИКАТОРЫ"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"Есептік жазба параметрлері"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"Есептік жазба опциялары"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Синхрондау жиілігі"</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_notify_label" msgid="7046146571560728829">"Электрондық пошта келген кезде хабарлау"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Контактілерді осы есептік жазбадан синхрондау"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Күнтізбені осы есептік жазбадан синхрондау"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Электрондық поштаны осы есептік жазбадан синхрондау"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fi желісіне қосылған кезде тіркемелерді автоматты түрде жүктеу"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Аяқтау мүмкін болмады"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Келесіден электрондық хабарларды синхрондау:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Aвтоматты"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Соңғы күн"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Соңғы үш күн"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"Соңғы апта"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Соңғы екі апта"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Соңғы ай"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Барлығы"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Ес. жазбаның әдепкі параметрл. пайдалану"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Пайдаланушы аты немесе құпия сөз дұрыс емес."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Жүйеге кіру сәтсіз аяқталды.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Есептік жазбаны реттеуде мәселе туындады"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"Пайдаланушы аты, құпия сөз және есептік жазба параметрлерінің дұрыстығын растаңыз."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Серверге қауіпсіз қосылу мүмкін болмады."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Серверге қауіпсіз қосылу мүмкін болмады.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Клиент сертификаты қажет. Клиент сертификаты бар серверге қосылғыңыз келе ме?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Сертификат жарамсыз немесе қол жетімсіз."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Сервер қатемен жауап берді. Пайдаланушы аты мен құпия сөзді тексеріп, қайталап көріңіз"</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Серверге қосылу мүмкін емес."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Серверге қосылу мүмкін емес.\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="6799839150250217566">"Аутентификация әдістеріне серверде қолдау көрсетілмейді."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"Қауіпсіздік қатесіне байланысты сервер қосылымын ашу мүмкін болмады."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Сервер қосылымын ашу мүмкін болмады."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Сервер мекенжайын дұрыс жазбадыңыз немесе сервер электрондық пошта қолдау көрсетпейтін протокол нұсқасын талап етеді."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Бұл сервермен синхрондалуға рұқсат жоқ. Қосымша ақпарат алу үшін сервер әкімшісіне хабарласыңыз."</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Қашықтан қауіпсіздікті басқару"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"<xliff:g id="SERVER">%s</xliff:g> сервері Android құрылғыңыздың кейбір қауіпсіздік функцияларын қашықтан басқаруға рұқсат беруіңізді қажет етеді. Бұл есептік жазба параметрлерін реттеуді аяқтағыңыз келе ме?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Бұл сервер сіздің Android құрылғыңыз қолдау көрсетпейтін қауіпсіздік функцияларын талап етеді, соның ішінде: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Есептік жазбаның пайдаланушы атын өзгерте алмайсыз. Басқа пайдаланушы аты бар есептік жазбаны қосу үшін «Есептік жазба қосу» түймесін түртіңіз."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"ЕСКЕРТУ: «Электрондық пошта» қолданбасының құрылғыңызды басқару мүмкіндігін өшіру оны талап ететін барлық электрондық пошта есептік жазбаларын, соның ішінде, электрондық поштаны, контактілерді, күнтізбе оқиғаларын және басқа деректерді жояды."</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"Қауіпсіздік жаңартуы"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> қауіпсіздік параметрлеріңіздің жаңартылуын талап етеді."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Қауіпсіздік талаптары себебінен «<xliff:g id="ACCOUNT">%s</xliff:g>» есептік жазбасын синхрондау мүмкін емес."</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"«<xliff:g id="ACCOUNT">%s</xliff:g>» есептік жазбасы қауіпсіздік параметрлерінің жаңартылуын талап етеді."</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"«<xliff:g id="ACCOUNT">%s</xliff:g>» есептік жазбасы өзінің қауіпсіздік параметрлерін өзгертті; пайдаланушы әрекеті қажет емес."</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Қауіпсіздікті жаңарту қажет"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"Қауіпсіздік саясаттары өзгертілді"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Қауіпсіздік саясаттарын сақтау мүмкін емес"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"Құрылғы қауіпсіздігі"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g> сервері Android құрылғыңыздың кейбір қауіпсіздік функцияларын қашықтан басқаруына рұқсат беруіңізді талап етеді."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Мәліметтерді өңдеу"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"«<xliff:g id="ACCOUNT">%s</xliff:g>» бекіту экраныңыздың PIN кодын немесе құпия сөзін өзгертуді талап етеді."</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Бекіту экранының құпия сөз мерзімі аяқталуда"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"Бекіту экраныңыздың PIN кодының немесе құпия сөзінің мерзімі аяқталды."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"Бекіту экраны құпия сөзінің мерзімі аяқталды"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Бекіту экранының құпия сөз мерзімі аяқталуда"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Бекіту экраныңыздың PIN кодын немесе құпия сөзін жақында өзгертуіңіз қажет, болмаса <xliff:g id="ACCOUNT">%s</xliff:g> деректері өшіріледі. Қазір өзгерткіңіз келе ме?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"Бекіту экраны құпия сөзінің мерзімі аяқталды"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g> деректері құрылғыңыздан өшірілуде. Оны бекіту экранының PIN кодын немесе құпия сөзін өзгерту арқылы қалпына келтіре аласыз. Оны қазір өзгерткіңіз келе ме?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Сақталмаған өзгерістерді жою қажет пе?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Жүйеге кіру мүмкін болмады"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> үшін пайдаланушы аты немесе құпия сөз дұрыс емес. Оларды қазір жаңартқыңыз келе ме?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Сіздің <xliff:g id="ACCOUNT">%s</xliff:g> жүйесіне кіруіңіз сәтсіз болды; сервер келесіні хабарлады: <xliff:g id="REASON">%s</xliff:g> Пайдаланушы атын және/немесе құпия сөзді жаңартқыңыз келе ме?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Тіркемелерді жүктеу"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Тіркемелерді Wi-Fi арқылы соңғы хабарлар ішіне автоматты жүктеу"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Электрондық пошта хабарландырулары"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"Синхрондау жиілігі, хабарландырулар, т.б."</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Электрондық пошта келгенде хабарландыру жіберу"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Синхрондау жиілігі"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Кіріс параметрлері"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Пайдаланушы аты, құпия сөз және басқа кіріс сервер параметрлері"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Шығыс параметрлері"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Түпнұсқалықты растау мүмкін болмады. Құпия сөзді қайта теріп, әрекетті қайталаңыз."</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Қолданылған саясаттар"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Ешқандай"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Қолдау көрсетілмейтін саясаттар"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Ешқандай"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"Синхрондау әрекеті"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Бұл есептік жазбаны синхрондау үшін мына жерді түртіңіз"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"Есептік жазба аты"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"Сіздің атыңыз"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Жылдам жауаптар"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Эл. пошта хабарын құрған кезде жиі кірістіретін мәтінді өңдеу"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"Хабарландыру параметрлері"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"Дерекқорды пайдалану"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"Қауіпсіздік саясаттары"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"Жүйелік қалталар"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"Қоқыс қалтасы"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Серверіңіздің қоқыс қалтасын таңдау"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Серверіңіздің қоқыс қалтасын таңдау"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"Жіберілген элементтер қалтасы"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Сервердің жіберілген элементтер қалтасын таңдау"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Сервердің жіберілген элементтер қалтасын таңдау"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"Жылдам жауап"</string>
-    <string name="save_action" msgid="1988862706623227093">"Сақтау"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Контактілерді синхрондау"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Осы есептік жазба үшін контактілерді синхрондау"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Күнтізбені синхрондау"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Осы есептік жазба үшін күнтізбе оқиғасын синхрондау"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Эл.поштаны синх-у"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Осы ес. жазба үшін эл. поштаны синх-у"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Дірілдеу"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"Рингтон таңдау"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"Сервер параметрлері"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Синхрондау опциялары"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Синхрондау опциялары (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Осы қалтаны синхрондау"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Хабарлар қосылған кезде жүктеледі"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Пошта синхрондалуына қалған күндер"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Жіберуші суреті"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"Бұл бағдарламаның қосылуына рұқсат беретін POP қатынасын кейбір «Plus» есептік жазбалары ғана қамтиды. Егер сіз дұрыс электрондық пошта мекенжайыңызбен және құпия сөзіңізбен жүйеге кіре алмасаңыз, «Plus» есептік жазбасына төлемеген болуыңыз мүмкін. Осы электрондық пошта мекенжайларына қатынасқа ие болу үшін веб-браузерді іске қосыңыз."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"Осы электрондық пошта есептік жазбасын реттеместен бұрын, T-Online веб-торабына кіріп, POP3 электрондық пошта қатынасуға арналған құпия сөз жасаңыз."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"Корпоративтік"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"Есептік жазба жасау мүмкін болмады. Әрекетті қайталаңыз."</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"Электрондық пошта"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"Сервер анықтаған қауіпсіздік саясаттарын қосады"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"Параметрлер"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"Жалпы параметрлер"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Жоюдың алдында растау"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Жіберудің алдында растау"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"Электрондық поштадан іздеу"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Құрылғының камерасын пайдалануға рұқсат бермеу"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"Құрылғының құпия сөзін талап ету"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"Соңғы құпия сөздердің қайта пайдаланылуын шектеу"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"Құпия сөздердің мерзімін талап ету"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"Жұмыссыз тұрған құр-ң экранды бекітуін талап ету"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"Синхрондалған күнтізбе оқиғаларының санын шектеу"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"Синхрондалған электрондық хабарлар санын шектеу"</string>
-    <string name="quick_1" msgid="3426057697353380951">"Рақмет!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"Бұл маған ұнайды!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"Мен бұны кейірінек оқып, жауап беремін."</string>
-    <string name="quick_4" msgid="3988974084396883051">"Бұны талқылау үшін кездесу ұйымдастырайық."</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"Роуминг кезінде бұл есептік жазбаның фондық режимде синхрондалуы өшіріледі."</string>
-    <string name="confirm_response" msgid="9151965975158906286">"Жауап жіберілуде…"</string>
-    <string name="no_conversations" msgid="5559527390337162819">"Хабарлар жоқ."</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"Қалтаны таңдау құралы"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> үшін сервердің қоқыс қалтасын таңдаңыз"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g> үшін сер. жіб. эл-р қал. таң."</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Қалталар тізімі жүктелуде…"</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"Ешбірі қол жетімді емес"</string>
-</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
deleted file mode 100644
index 78a8210..0000000
--- a/res/values-kn-rIN/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"ಇಮೇಲ್ ಲಗತ್ತುಗಳನ್ನು ಓದಿ"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"ನಿಮ್ಮ Gmail ಲಗತ್ತುಗಳು ಅನ್ನು ಓದಲು ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಅನುಮತಿಸುತ್ತದೆ."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"ಇಮೇಲ್ ಪೂರೈಕೆದಾರರ ಡೇಟಾ ಪ್ರವೇಶಿಸಿ"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"ಒಳಬರುವ ಸಂದೇಶಗಳು, ಕಳುಹಿಸಿದ ಸಂದೇಶಗಳು, ಬಳಕೆದಾರಹೆಸರುಗಳು, ಮತ್ತು ಪಾಸ್‍‍ವರ್ಡ್‍ಗಳನ್ನು ಒಳಗೊಂಡಿರುವಂತೆ, ನಿಮ್ಮ ಇಮೇಲ್ ಡೇಟಾಬೇಸ್ ಅನ್ನು ಪ್ರವೇಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್‍‍ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡುತ್ತದೆ."</string>
-    <string name="app_name" msgid="5815426892327290362">"ಇಮೇಲ್"</string>
-    <string name="debug_title" msgid="5175710493691536719">"ಡೀಬಗ್ ಮಾಡಿ"</string>
-    <string name="next_action" msgid="3931301986364184415">"ಮುಂದೆ"</string>
-    <string name="previous_action" msgid="5181616311579820981">"ಹಿಂದಿನದು"</string>
-    <string name="done_action" msgid="7497990549515580249">"ಪೂರ್ಣಗೊಂಡಿದೆ"</string>
-    <string name="create_action" msgid="3062715563215392251">"ಹೊಸತನ್ನು ರಚಿಸು"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆ ಇಲ್ಲ."</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"ಖಾತೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"ಸಿಂಕ ಆಯ್ಕೆಗಳು"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"ಸಂಪರ್ಕದ ತೊಂದರೆ."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"ಸಂದೇಶ ಸರಿಸು"</item>
-    <item quantity="other" msgid="371256717624461324">"ಸಂದೇಶಗಳನ್ನು ಸರಿಸು"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 ಖಾತೆಗಳಲ್ಲಿ ಸರಿಸು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"ಆಯ್ಕೆಯು ಬಹು ಖಾತೆಗಳನ್ನು ಒಳಗೊಂಡಿರುವ ಕಾರಣ ಸರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"ಡ್ರಾಫ್ಟ್‌ಗಳು, ಔಟ್‌ಬಾಕ್ಸ್‌ನಲ್ಲಿರುವ ಮತ್ತು ಕಳುಹಿಸಿದ ಸಂದೇಶಗಳನ್ನು ಸರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <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="mailbox_name_display_starred" msgid="7788694947644186069">"ನಕ್ಷತ್ರ ಹಾಕಿರುವುದು"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"ಓದದಿರುವುದು"</string>
-    <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="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"ಸಂಯೋಜನೆಗೊಂಡ ವೀಕ್ಷಣೆ"</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>\nCC: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆ ಒಳಪಡಿಸು"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆ ಒಳಪಡಿಸು"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"ನಿಮ್ಮ ಫಾರ್ವರ್ಡ್ ಮಾಡಲಾದ ಸಂದೇಶದಲ್ಲಿ ಒಂದು ಅಥವಾ ಹೆಚ್ಚಿನ ಲಗತ್ತುಗಳನ್ನು ಕಳುಹಿಸುವ ಮೊದಲು ಡೌನ್‍‍ಲೋಡ್ ಮಾಡಲಾಗುತ್ತದೆ."</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"ಲಗತ್ತನ್ನು ಡೌನಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"ಸಂದೇಶವನ್ನು ಡೀಕೋಡ್ ಮಾಡುವಾಗ ದೋಷವುಂಟಾಗಿದೆ."</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"ಒಂದು ಅಥವಾ ಹೆಚ್ಚಿನ ಲಗತ್ತುಗಳನ್ನು ಫಾರ್ವರ್ಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ."</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"ಲಗತ್ತನ್ನು ಫಾರ್ವರ್ಡ್ ಮಾಡಲಾಗಿಲ್ಲ"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ಸೈನ್‍ಇನ್ ಯಶಸ್ವಿಯಾಗಿಲ್ಲ."</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"ಸೈನ್ ಇನ್ ಮಾಡಲಾಗಲಿಲ್ಲ"</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>
-  </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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"ಖಾತೆ ಹೊಂದಿಸುವಿಕೆ"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"ಪ್ರಮಾಣೀಕರಣ ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"ಸೈನ್ ಇನ್ ಮಾಡು"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"ದೃಢೀಕರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"ಇಮೇಲ್ ವಿಳಾಸ ಅಥವಾ ಪಾಸ್‍ವರ್ಡ್ ತಪ್ಪಾಗಿದೆ"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"ಇಮೇಲ್ ವಿಳಾಸ:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"ಇಮೇಲ್ ಖಾತೆ"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"ನೀವು ಕೆಲವೇ ಕೆಲವು ಹಂತಗಳಲ್ಲಿ ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಹೊಂದಿಸಬಹುದು."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ಇಮೇಲ್ ವಿಳಾಸ"</string>
-    <string name="or_label" msgid="2207403489755254427">"OR"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Google ಜೊತೆ ಸೈನ್ ಇನ್ ಮಾಡಿ"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"ಪಾಸ್‌ವರ್ಡ್"</string>
-    <string name="password_hint" msgid="8835390747504721561">"ಪಾಸ್‌ವರ್ಡ್"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s ಜೊತೆ ಸೈನ್‍ಇನ್ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"ದೃಢೀಕರಣ"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"ದೃಢೀಕರಣವನ್ನು ಸೇರಿಸಿ"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"ದೃಢೀಕರಣವನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"ಹಸ್ತಚಾಲಿತ ಹೊಂದಿಸುವಿಕೆ"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"ಮಾನ್ಯವಾಗಿರುವ ಇಮೇಲ್ ವಿಳಾಸ ಮತ್ತು ಪಾಸ್‍ವರ್ಡ್ ಟೈಪ್ ಮಾಡಿ."</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"ನಕಲಿ ಖಾತೆ"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"ನೀವು ಈಗಾಗಲೇ \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ಖಾತೆಗಾಗಿ ಈ ಬಳಕೆದಾರನ ಹೆಸರನ್ನು ಬಳಸುತ್ತಿರುವಿರಿ."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"ಈ ಪಾಸ್‍‍ವರ್ಡ್ ಒಂದು ಅಥವಾ ಹೆಚ್ಚಿನ ಸ್ಪೇಸ್ ಅಕ್ಷರಗಳೊಂದಿಗೆ ಆರಂಭವಾಗುತ್ತದೆ ಅಥವಾ ಕೊನೆಗೊಳ್ಳುತ್ತದೆ. ಅನೇಕ ಸರ್ವರ್‍‍ಗಳು ಸ್ಪೇಸ್‍‍ಗಳನ್ನು ಹೊಂದಿರುವ ಪಾಸ್‍‍ವರ್ಡ್‌ಗಳನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"ಖಾತೆಯ ಮಾಹಿತಿಯನ್ನು ಹಿಂಪಡೆಯಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"ಸರ್ವರ್ ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ಪ್ರಮಾಣೀಕರಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"smtp ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ಪ್ರಮಾಣೀಕರಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"ಖಾತೆಯನ್ನು ರಚಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"ಖಾತೆ ಪ್ರಕಾರವನ್ನು ಖಚಿತಪಡಿಸಿ"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"<xliff:g id="EMAIL">%1$s</xliff:g> ಅವರು <xliff:g id="USERPROTOCOL">%2$s</xliff:g> ಅನ್ನು ಬಳಸುತ್ತಾರೆಂದು ನೀವು ಸೂಚಿಸಿರುವಿರಿ. ಆದರೆ ಖಾತೆಯು <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> ಅನ್ನು ಬಳಸಬಹುದು"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"ಖಾತೆ ಹೊಂದಿಸುವಿಕೆ"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"ನಿಮ್ಮ ಖಾತೆಯನ್ನು ಹೊಂದಿಸಲಾಗಿದೆ ಮತ್ತು ಇಮೇಲ್ ತನ್ನ ಮಾರ್ಗದಲ್ಲಿದೆ!"</string>
-    <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_names_user_name_empty_error" msgid="6791427018325367364">"ಈ ಕ್ಷೇತ್ರವನ್ನು ಖಾಲಿ ಬಿಡಬಾರದು."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"ಖಾತೆ ಹೊಂದಿಸುವಿಕೆ"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"ಖಾತೆ ವಿಧಾನ"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"ಇದು ಯಾವ ವಿಧದ ಖಾತೆಯಾಗಿದೆ?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"ಖಾತೆ ಹೊಂದಿಸುವಿಕೆ"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"ಒಳಬರುವ ಸರ್ವರ್ ಸೆಟ್ಟಿಂಗ್‍ಗಳು"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"ಬಳಕೆದಾರಹೆಸರು"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"ಪಾಸ್‌ವರ್ಡ್"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"ಪಾಸ್‌ವರ್ಡ್"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"ಸರ್ವರ್"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"ಪೋರ್ಟ್"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"ಭದ್ರತೆ ಪ್ರಕಾರ"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (ಎಲ್ಲಾ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ವೀಕರಿಸಿ)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (ಎಲ್ಲಾ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ವೀಕರಿಸಿ)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</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>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"ಖಾತೆ ಹೊಂದಿಸುವಿಕೆ"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"ಹೊರಹೋಗುವ ಸರ್ವರ್ ಸೆಟ್ಟಿಂಗ್‍ಗಳು"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP ಸರ್ವರ್"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"ಪೋರ್ಟ್"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"ಭದ್ರತೆ ಪ್ರಕಾರ"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"ಸೈನ್ ಇನ್ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"ಬಳಕೆದಾರಹೆಸರು"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"ಪಾಸ್‌ವರ್ಡ್"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"ಗ್ರಾಹಕ ಪ್ರಮಾಣಪತ್ರ"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"ಗ್ರಾಹಕ ಪ್ರಮಾಣಪತ್ರವನ್ನು ಬಳಸಿ"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"ತೆಗೆದುಹಾಕಿ"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ಮೊಬೈಲ್ ಸಾಧನ ID"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"ಖಾತೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"ಖಾತೆ ಆಯ್ಕೆಗಳು"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"ಸಿಂಕ್ ಆವರ್ತನೆ:"</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_notify_label" msgid="7046146571560728829">"ಇಮೇಲ್ ಬಂದಾಗ ನನಗೆ ಸೂಚಿನೆ ನೀಡು"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"ಈ ಖಾತೆಯಿಂದ ಸಂಪರ್ಕಗಳನ್ನು ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"ಈ ಖಾತೆಯಿಂದ ಕ್ಯಾಲೆಂಡರ್‍ಗೆ ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"ಈ ಖಾತೆಯಿಂದ ಇಮೇಲ್ ಅನ್ನು ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fi ಗೆ ಸಂಪರ್ಕಗೊಂಡಾಗ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಲಗತ್ತುಗಳನ್ನು ಡೌನ್‍‍ಲೋಡ್ ಮಾಡು"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"ಪೂರ್ಣಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"ಇದರಿಂದ ಇಮೇಲ್ ಸಿಂಕ್ ಮಾಡಿ:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"ಸ್ವಯಂಚಾಲಿತ"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"ಕೊನೆಯ ದಿನ"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"ಕೊನೆಯ ಮೂರು ದಿನಗಳು"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"ಕೊನೆಯ ವಾರ"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"ಕಳೆದ ಎರಡು ವಾರಗಳು"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"ಕಳೆದ ತಿಂಗಳು"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"ಎಲ್ಲ"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"ಖಾತೆಗಳನ್ನು ಡೀಫಾಲ್ಟ್ ಆಗಿ ಬಳಸಿ"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"ಬಳಕೆದಾರಹೆಸರು ಮತ್ತು ಪಾಸ್‍‍ವರ್ಡ್ ತಪ್ಪಾಗಿದೆ."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"ಲಾಗಿನ್ ವಿಫಲವಾಗಿದೆ.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"ಖಾತೆ ಹೊಂದಿಸುವಿಕೆಯಲ್ಲಿ ಸಮಸ್ಯೆ"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"ಬಳಕೆದಾರಹೆಸರು, ಪಾಸ್‍‍ವರ್ಡ್, ಮತ್ತು ಖಾತೆ ಸೆಟ್ಟಿಂಗ್‍‍ಗಳು ಸರಿಯಾಗಿವೆ ಎಂಬುದನ್ನು ಧೃಢೀಕರಿಸಿ."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"ಸುರಕ್ಷಿತವಾಗಿ ಸರ್ವರ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುವುದಿಲ್ಲ."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"ಸುರಕ್ಷಿತವಾಗಿ ಸರ್ವರ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುವುದಿಲ್ಲ.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"ಗ್ರಾಹಕ ಪ್ರಮಾಣಪತ್ರದ ಅಗತ್ಯವಿದೆ. ನೀವು ಗ್ರಾಹಕ ಪ್ರಮಾಣಪತ್ರದೊಂದಿಗೆ ಸರ್ವರ್‍‍ಗೆ ಸಂಪರ್ಕಿಸಲು ಬಯಸುವಿರಾ?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"ಪ್ರಮಾಣಪತ್ರವು ಅಮಾನ್ಯವಾಗಿದೆ ಅಥವಾ ಪ್ರವೇಶಿಸಲಾಗುವುದಿಲ್ಲ."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"ಸರ್ವರ್ ದೋಷ ಎದುರಿಸಿದೆ. ನಿಮ್ಮ ಬಳಕೆದಾರಹೆಸರು ಮತ್ತು ಪಾಸ್‍‍ವರ್ಡ್ ಅನ್ನು ಪರೀಕ್ಷಿಸಿ, ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"ಸರ್ವರ್‌ಗೆ ಸಂಪರ್ಕಿಸಲಾಗುವುದಿಲ್ಲ."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\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="6799839150250217566">"ಸರ್ವರ್ ಮೂಲಕ ದೃಢೀಕರಣ ವಿಧಾನಗಳು ಬೆಂಬಲಿಸುತ್ತಿಲ್ಲ."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"ಭದ್ರತಾ ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಸರ್ವರ್‍‍ಗೆ ಸಂಪರ್ಕವನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"ಸರ್ವರ್‍ಗೆ ಸಂಪರ್ಕವನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"ನೀವು ತಪ್ಪಾಗಿರುವ ಸರ್ವರ್ ವಿಳಾಸವನ್ನು ಟೈಪ್ ಮಾಡಿರುವಿರಿ ಅಥವಾ ಇಮೇಲ್ ಬೆಂಬಲಿಸದ ಪ್ರೋಟೋಕಾಲ್ ಆವೃತ್ತಿಯು ಸರ್ವರ್‌ಗೆ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"ನಿವು ಈ ಸರ್ವರ್‍‍ನೊಂದಿಗೆ ಸಿಂಕ್ ಮಾಡುವ ಅನುಮತಿಯನ್ನು ಹೊಂದಿಲ್ಲ. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ ನಿಮ್ಮ ಸರ್ವರ್‍‍ನ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"ಭದ್ರತಾ ನಿರ್ವಹಣೆಯನ್ನು ರಿಮೋಟ್ ಮಾಡಿ"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"ಸರ್ವರ್ <xliff:g id="SERVER">%s</xliff:g> ನಿಮ್ಮ Android ಸಾಧನದ ಕೆಲವು ಭದ್ರತಾ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ನೀವು ದೂರದಿಂದಲೇ ಅದನ್ನು ನಿಯಂತ್ರಿಸುವಂತಹ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ. ನೀವು ಈ ಖಾತೆಯ ಸೆಟ್ಟಿಂಗ್‍ ಹೊಂದಿಸುವಿಕೆಯನ್ನು ಮುಕ್ತಾಯಗೊಳಿಸಲು ಬಯಸುವಿರಾ?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"ಈ ಸರ್ವರ್‍‍ಗೆ ನಿಮ್ಮ Android ಸಾಧನ ಬೆಂಬಲಿಸದಂತಹ ಭದ್ರತಾ ವೈಶಿಷ್ಟ್ಯಗಳ ಅಗತ್ಯವಿದೆ. ಇದನ್ನು ಒಳಗೊಂಡಿರುವಂತೆ: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"ನೀವು ಖಾತೆಯ ಬಳಕೆದಾರಹೆಸರನ್ನು ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಬೇರೆ ಬಳಕೆದಾರಹೆಸರಿನ ಖಾತೆಯನ್ನು ಸೇರಿಸಲು, ಖಾತೆ ಸೇರಿಸು ಅನ್ನು ಸ್ಪರ್ಶಿಸಿ."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"ಎಚ್ಚರಿಕೆ: ನಿಮ್ಮ ಸಾಧನವನ್ನು ನಿರ್ವಹಿಸಲು ಇಮೇಲ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಅಧಿಕಾರವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಅವುಗಳ ಇಮೇಲ್, ಸಂಪರ್ಕಗಳು, ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್‌ಗಳು, ಮತ್ತು ಇತರೆ ಡೇಟಾ ಸೇರಿದಂತೆ ಎಲ್ಲಾ ಅಗತ್ಯವಿರುವ ಇಮೇಲ್ ಖಾತೆಗಳನ್ನು ಅಳಿಸುತ್ತದೆ."</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"ಭದ್ರತಾ ನವೀಕರಣ"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> ನಿಮ್ಮ ಭದ್ರತಾ ಸೆಟ್ಟಿಂಗ್‍‍ಗಳನ್ನು ನೀವು ನವೀಕರಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ಖಾತೆಯು ಭದ್ರತಾ ಅಗತ್ಯತೆಗಳಿಂದಾಗಿ ಸಿಂಕ್ ಮಾಡಲಾಗುವುದಿಲ್ಲ."</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ಖಾತೆಯು ಭದ್ರತಾ ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ನವೀಕರಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ಖಾತೆಯು ಅದರ ಭದ್ರತಾ ಸೆಟ್ಟಿಂಗ್‍‍ಗಳನ್ನು ಬದಲಿಸಿದೆ; ಯಾವುದೇ ಬಳಕೆದಾರನ ಕ್ರಿಯೆಯ ಅಗತ್ಯವಿಲ್ಲ."</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"ಭದ್ರತಾ ನವೀಕರಣ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"ಭದ್ರತಾ ನೀತಿಗಳನ್ನು ಬದಲಿಸಲಾಗಿದೆ"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"ಭದ್ರತಾ ನೀತಿಗಳನ್ನು ಪೂರೈಸಲಾಗಲಿಲ್ಲ"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"ಸಾಧನ ಭದ್ರತೆ"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"ನಿಮ್ಮ Android ಸಾಧನದ ಕೆಲವು ಭದ್ರತಾ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ದೂರದಿಂದಲೇ ನಿಯಂತ್ರಿಸಲು <xliff:g id="SERVER">%s</xliff:g> ಸರ್ವರ್ ಗೆ ನೀವು ಅನುಮತಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"ವಿವರಗಳನ್ನು ಸಂಪಾದಿಸಿ"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ನಿಮ್ಮ ಪರದೆ ಲಾಕ್ PIN ಅಥವಾ ಪಾಸ್‍‍ವರ್ಡ್ ಅನ್ನು ನೀವು ಬದಲಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"ಪರದೆಲಾಕ್ ಪಾಸ್‍ವರ್ಡ್ ಅವಧಿಮೀರಿದೆ"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"ನಿಮ್ಮ ಪರದೆ ಲಾಕ್ PIN ಅಥವಾ ಪಾಸ್‍ವರ್ಡ್ ಮುಕ್ತಾಯಗೊಂಡಿದೆ."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"ಪರದೆ ಲಾಕ್ ಪಾಸ್‍ವರ್ಡ್ ಮುಕ್ತಾಯಗೊಂಡಿದೆ"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"ಪರದೆಲಾಕ್ ಪಾಸ್‍ವರ್ಡ್ ಅವಧಿಮೀರಿದೆ"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"ನಿಮ್ಮ ಪರದೆ ಲಾಕ್ PIN ಅಥವಾ ಪಾಸ್‍‍ವರ್ಡ್ ಅನ್ನು ನೀವು ಶೀಘ್ರದಲ್ಲೇ ಬದಲಿಸಬೇಕು. ಇಲ್ಲವಾದರೆ <xliff:g id="ACCOUNT">%s</xliff:g> ಗಾಗಿ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ. ಇದೀಗ ನೀವು ಅದನ್ನು ಬದಲಿಸಲು ಬಯಸುವಿರಾ?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"ಪರದೆ ಲಾಕ್ ಪಾಸ್‍ವರ್ಡ್ ಮುಕ್ತಾಯಗೊಂಡಿದೆ"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"ನಿಮ್ಮ ಸಾಧನದಿಂದ <xliff:g id="ACCOUNT">%s</xliff:g> ಗಾಗಿ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ. ನಿಮ್ಮ ಪರದೆ ಲಾಕ್ PIN ಅಥವಾ ಪಾಸ್‍‍ವರ್ಡ್ ಅನ್ನು ಬದಲಿಸುವ ಮೂಲಕ ಅದನ್ನು ನೀವು ಮರುಸ್ಥಾಪಿಸಬಹುದು. ಇದೀಗ ನೀವು ಅದನ್ನು ಬದಲಿಸಲು ಬಯಸುವಿರಾ?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"ಉಳಿಸಲಾಗದ ಬದಲಾವಣೆಗಳನ್ನು ತಿರಸ್ಕರಿಸುವುದೇ?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"ಸೈನ್ ಇನ್ ಮಾಡಲಾಗಲಿಲ್ಲ"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> ಖಾತೆಗಾಗಿ ಬಳಕೆದಾರಹೆಸರು ಅಥವಾ ಪಾಸ್‍‍ವರ್ಡ್ ತಪ್ಪಾಗಿದೆ. ಇದೀಗ ನೀವು ಅವುಗಳನ್ನು ನವೀಕರಿಸಲು ಬಯಸುವಿರಾ?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"ನಿಮ್ಮ <xliff:g id="ACCOUNT">%s</xliff:g> ಲಾಗಿನ್ ವಿಫಲವಾಗಿದೆ; ಸರ್ವರ್ ಹೇಳುತ್ತಿದೆ: <xliff:g id="REASON">%s</xliff:g> ನಿಮ್ಮ ಬಳಕೆದಾರಹೆಸರು ಮತ್ತು/ಅಥವಾ ಪಾಸ್‍‍ವರ್ಡ್ ಅನ್ನು ನವೀಕರಿಸಲು ನೀವು ಬಯಸುವಿರಾ?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"ಲಗತ್ತುಗಳನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡು"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Wi-Fi ಮುಖಾಂತರ ಇತ್ತೀಚಿನ ಸಂದೇಶಗಳಿಗೆ ಸ್ವಯಂ-ಡೌನ್‍‍ಲೋಡ್ ಲಗತ್ತುಗಳು"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"ಇಮೇಲ್ ಸೂಚನೆಗಳು"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"ಆವರ್ತನ, ಅಧಿಸೂಚನೆಗಳು ಇತ್ಯಾದಿಯನ್ನು ಸಿಂಕ್ ಮಾಡಿ."</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"ಇಮೇಲ್ ಬಂದಾಗ ಅಧಿಸೂಚನೆಯನ್ನು ಕಳುಹಿಸು"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"ಆವರ್ತನವನ್ನು ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"ಒಳಬರುವ ಸೆಟ್ಟಿಂಗ್‍ಗಳು"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"ಬಳಕೆದಾರನಹೆಸರು, ಪಾಸ್‍‍ವರ್ಡ್, ಮತ್ತು ಇತರೆ ಒಳಬರುವ ಸರ್ವರ್ ಸೆಟ್ಟಿಂಗ್‍‍ಗಳು"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"ಹೊರಹೋಗುವ ಸೆಟ್ಟಿಂಗ್‍ಗಳು"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"ಬಳಕೆದಾರನಹೆಸರು, ಪಾಸ್‍‍ವರ್ಡ್ ಮತ್ತು ಇತರೆ ಹೊರಹೋಗುವ ಸರ್ವರ್ ಸೆಟ್ಟಿಂಗ್‍‍ಗಳು"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"ಜಾರಿಗೊಳಿಸಿರುವ ನೀತಿಗಳು"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"ಬೆಂಬಲಿತವಲ್ಲದ ನೀತಿಗಳು"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"ಸಿಂಕ್ ಪ್ರಯತ್ನಿಸಿ"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"ಈ ಖಾತೆಯನ್ನು ಸಿಂಕ್ ಮಾಡಲು ಇಲ್ಲಿ ಸ್ಪರ್ಶಿಸಿ"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"ಖಾತೆ ಹೆಸರು"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"ನಿಮ್ಮ ಹೆಸರು"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆಗಳು"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"ಇಮೇಲ್ ಅನ್ನು ಸಂಯೋಜಿಸುತ್ತಿರುವಾಗ ನೀವು ಪದೇ ಪದೇ ಸೇರಿಸುವಂತಹ ಪಠ್ಯವನ್ನು ಸಂಪಾದಿಸಿ"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"ಡೇಟಾ ಬಳಕೆ"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"ಭದ್ರತಾ ನೀತಿಗಳು"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"ಸಿಸ್ಟಮ್ ಫೋಲ್ಡರ್‌ಗಳು"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"ಅನುಪಯುಕ್ತ ಫೋಲ್ಡರ್"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"ನಿಮ್ಮ ಸರ್ವರ್‍ನ ಅನುಪಯುಕ್ತ ಫೋಲ್ಡರ್ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"ನಿಮ್ಮ ಸರ್ವರ್‍ನ ಅನುಪಯುಕ್ತ ಫೋಲ್ಡರ್ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"ಕಳುಹಿಸಿದ ಐಟಮ್‌ಗಳ ಫೋಲ್ಡರ್"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"ನಿಮ್ಮ ಸರ್ವರ್ ನ ಕಳುಹಿಸಿದ ಐಟಮ್ ಫೋಲ್ಡರ್‍ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"ನಿಮ್ಮ ಸರ್ವರ್‌ನ ಕಳುಹಿಸಿದ ಐಟಮ್ ಫೋಲ್ಡರ್‍ ಅನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"ತ್ವರಿತ ಪ್ರತಿಕ್ರಿಯೆ"</string>
-    <string name="save_action" msgid="1988862706623227093">"ಉಳಿಸು"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"ಸಂಪರ್ಕ ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"ಈ ಖಾತೆಗಾಗಿ ಸಂಪರ್ಕಗಳನ್ನು ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"ಕ್ಯಾಲೆಂಡರ್ ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"ಈ ಖಾತೆಗಾಗಿ ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್ ಅನ್ನು ಸಿಂಕ್ ಮಾಡು"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ಇಮೇಲ್ ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"ಈ ಖಾತೆಗಾಗಿ ಇಮೇಲ್ ಅನ್ನು ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"ವೈಬ್ರೇಟ್‌"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"ರಿಂಗ್‍ಟೋನ್ ಆಯ್ಕೆ ಮಾಡಿ"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"ಸರ್ವರ್ ಸೆಟ್ಟಿಂಗ್‍ಗಳು"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"ಸಿಂಕ್‌ ಆಯ್ಕೆಗಳು"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"ಸಿಂಕ್ ಆಯ್ಕೆಗಳು (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"ಈ ಫೋಲ್ಡರ್ ಸಿಂಕ್ ಮಾಡಿ"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"ಸಂಪರ್ಕಗೊಂಡಾಗ ಸಂದೇಶಗಳು ಡೌನ್‍ಲೋಡ್ ಆಗುತ್ತವೆ"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"ಸಿಂಕ್ ಮಾಡಲು ಮೇಲ್ ದಿನಗಳು"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"ಕಳುಹಿಸುವವರ ಚಿತ್ರ"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"ಕೆಲವು \"Plus\" ಖಾತೆಗಳು ಮಾತ್ರ ಈ ಕಾರ್ಯಕ್ರಮಕ್ಕೆ ಸಂಪರ್ಕಿಸಲು ಅನುಮತಿಸುವ POP ಪ್ರವೇಶವನ್ನು ಒಳಗೊಂಡಿವೆ. ನಿಮ್ಮ ಸರಿಯಾದ ಇಮೇಲ್ ವಿಳಾಸ ಮತ್ತು ಪಾಸ್‍‍ವರ್ಡ್‌ನೊಂದಿಗೆ ಸೈನ್‍‍ಇನ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗದಿದ್ದರೇ, ನೀವು ಪಾವತಿಸಿದ \"Plus\" ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲದಿರಬಹುದು. ಈ ಇಮೇಲ್ ಖಾತೆಗಳಿಗೆ ಪ್ರವೇಶವನ್ನು ಪಡೆಯಲು ವೆಬ್ ಬ್ರೌಸರ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸಿ."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"ಈ ಇಮೇಲ್ ಖಾತೆಯನ್ನು ಹೊಂದಿಸುವ ಮೊದಲು, T-Online ವೆಬ್‍‍ಸೈಟ್‍‍ಗೆ ಬೇಟಿ ನೀಡಿ ಮತ್ತು POP3 ಇಮೇಲ್ ಪ್ರವೇಶಕ್ಕಾಗಿ ಪಾಸ್‍‍ವರ್ಡ್ ರಚಿಸಿ."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"ಸಂಸ್ಥೆ"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"ಖಾತೆಯನ್ನು ರಚಿಸಲಾಗಲಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"ಇಮೇಲ್"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"ಸರ್ವರ್-ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಭದ್ರತಾ ನೀತಿಗಳನ್ನು ಸಕ್ರಿಗೊಳಿಸುತ್ತದೆ"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"ಸಾಮಾನ್ಯ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"ಅಳಿಸುವ ಮೊದಲು ದೃಢೀಕರಿಸಿ"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"ಕಳುಹಿಸುವ ಮೊದಲು ದೃಢೀಕರಿಸಿ"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"ಇಮೇಲ್ ಹುಡುಕಿರಿ"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"ಸಾಧನಗಳ ಕ್ಯಾಮೆರಾದ ಬಳಕೆಯನ್ನು ಅನುಮತಿಸಬೇಡ"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"ಸಾಧನ ಪಾಸ್‍ವರ್ಡ್ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"ಇತ್ತೀಚಿನ ಪಾಸ್‍ವರ್ಡ್‌ಗಳ ಮರುಬಳಕೆಯನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"ಮುಕ್ತಾಯವಾಗಲು ಪಾಸ್‍ವರ್ಡ್ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"ಇದರ ಪರದೆಯನ್ನು ಲಾಕ್ ಮಾಡಲು ತಟಸ್ಥ ಸಾಧನದ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"ಸಿಂಕ್ ಮಾಡಲಾದ ಕ್ಯಾಲೆಂಡರ್ ಈವೆಂಟ್‍ಗಳ ಸಂಖ್ಯೆಯನ್ನು ಮಿತಿಗೊಳಿಸಿ"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"ಸಿಂಕ್ ಮಾಡಲಾದ ಇಮೇಲ್‍ಗಳ ಸಂಖ್ಯೆಯನ್ನು ಮಿತಿಗೊಳಿಸಿ"</string>
-    <string name="quick_1" msgid="3426057697353380951">"ಧನ್ಯವಾದ!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"ಶಬ್ದ ಮಾಡುವುದು ನನಗೆ ಇಷ್ಟವಾಗುತ್ತದೆ!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"ನಾನು ಇದನ್ನು ನಂತರ ಓದುತ್ತೇನೆ ಮತ್ತು ನಿಮಗೆ ಪ್ರತ್ಯುತ್ತರಿಸುತ್ತೇನೆ."</string>
-    <string name="quick_4" msgid="3988974084396883051">"ಇದನ್ನು ಚರ್ಚಿಸಲು ಒಂದು ಸಭೆಯನ್ನು ಹೊಂದಿಸೋಣ."</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"ರೋಮ್ ಮಾಡುವಾಗ ಈ ಖಾತೆಗಾಗಿ ಹಿನ್ನೆಲೆ ಸಿಂಕ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ."</string>
-    <string name="confirm_response" msgid="9151965975158906286">"ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="no_conversations" msgid="5559527390337162819">"ಸಂದೇಶಗಳಿಲ್ಲ."</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"ಫೋಲ್ಡರ್ ಪಿಕ್ಕರ್"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> ಖಾತೆಗಾಗಿ ಸರ್ವರ್ ನ ಅನುಪಯುಕ್ತ ಫೋಲ್ಡರ್ ಅನ್ನು ಆರಿಸಿ"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g> ಖಾತೆಗಾಗಿ ಸರ್ವರ್ ನ ಕಳುಹಿಸಿದ ಐಟಂಗಳ ಫೋಲ್ಡರ್ ಅನ್ನು ಆರಿಸಿ"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"ಫೋಲ್ಡರ್ ಪಟ್ಟಿ ಲೋಡ್ ಆಗುತ್ತಿದೆ..."</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"ಯಾವುದೂ ಲಭ್ಯವಿಲ್ಲ"</string>
-</resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
deleted file mode 100644
index 4dd714e..0000000
--- a/res/values-ky-rKG/strings.xml
+++ /dev/null
@@ -1,380 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"Электрондук билдирүүнүн тиркемелерин окуу"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Колдонмого электрондук билдирүүнүн тиркемелерин окуу мүмкүнчүлүгүн берет."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"Электрондук почтанын жабдуучусунун дайындарына кирүү"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Колдонмого алынган билдирүүлөр, жөнөтүлгөн билдирүүлөр, колдонуучу аттары жана сырсөздөр сыяктуу электрондук почтаңыздын дайындар базасына кирүү мүмкүнчүлүгүн берет."</string>
-    <!-- no translation found for app_name (5815426892327290362) -->
-    <skip />
-    <!-- no translation found for debug_title (5175710493691536719) -->
-    <skip />
-    <!-- no translation found for next_action (3931301986364184415) -->
-    <skip />
-    <!-- no translation found for previous_action (5181616311579820981) -->
-    <skip />
-    <!-- no translation found for done_action (7497990549515580249) -->
-    <skip />
-    <!-- no translation found for create_action (3062715563215392251) -->
-    <skip />
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Тез жооп жок."</string>
-    <!-- no translation found for account_settings_action (4494079183315085171) -->
-    <skip />
-    <string name="menu_folder_options" msgid="2871906096248843471">"Шайкештештирүү параметрлери"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"Туташуу көйгөйү."</string>
-    <!-- no translation found for move_messages:one (320885379869442589) -->
-    <!-- no translation found for move_messages:other (371256717624461324) -->
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 каттоо эсептеринде жылдырууга болбойт."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Тандалган нерседе бир нече каттоо эсеби камтылгандыктан, жылдыруу мүмкүн эмес."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Сомолордогу, Чыгуучу кутусундагы жана Жөнөтүлгөндөрдөгү билдирүүлөрдү жылдыруу мүмкүн эмес."</string>
-    <!-- no translation found for mailbox_name_display_inbox (3542327124749861736) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_outbox (2826214174661417662) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_drafts (4868718300700514319) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_trash (9139069064580630647) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_sent (3426058998191869523) -->
-    <skip />
-    <!-- no translation found for mailbox_name_display_junk (9046762505977999288) -->
-    <skip />
-    <string name="mailbox_name_display_starred" msgid="7788694947644186069">"Жылдызчаланган"</string>
-    <!-- no translation found for mailbox_name_display_unread (1015674989793998695) -->
-    <skip />
-    <!-- no translation found for account_folder_list_summary_inbox (7518263761297423255) -->
-    <skip />
-    <!-- no translation found for account_folder_list_summary_starred (3134312269246375723) -->
-    <skip />
-    <!-- no translation found for account_folder_list_summary_drafts (5514845993247300437) -->
-    <skip />
-    <!-- no translation found for account_folder_list_summary_outbox (3059836696049399377) -->
-    <skip />
-    <!-- no translation found for mailbox_list_account_selector_combined_view (1556327299894225044) -->
-    <skip />
-    <!-- no translation found for message_compose_fwd_header_fmt (5181300290654579434) -->
-    <skip />
-    <!-- no translation found for message_compose_insert_quick_response_list_title (5314107302508728189) -->
-    <skip />
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"Тез жоопту кыстаруу"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Багытталган билдирүүңүздөгү бир же бир нече тиркеме жөнөтүлүүдөн мурун жүктөлүп алынат."</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"Тиркеме жүктөлүп алынган жок."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"Билдирүү дешифрленип жатканда ката кеткен."</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Бир же бир нече тиркеме багытталган жок."</string>
-    <!-- no translation found for forward_download_failed_title (6139701848515572511) -->
-    <skip />
-    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> кирүү аракети ийгиликсиз аяктады."</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"Кирген жок."</string>
-    <!-- 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 account_setup_basics_title (3578333196594678422) -->
-    <skip />
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"Уруксат суроодо"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"Кирүү"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"Аныктыгын текшерүү мүмкүн болбой жатат"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"Электрондук почта дареги же сырсөз туура эмес"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"Электрондук почта дареги:"</string>
-    <!-- no translation found for account_setup_basics_headline (6726590205905464015) -->
-    <skip />
-    <string name="accounts_welcome" msgid="8337750045270269649">"Болгону бир нече кадам жасап, каттоо эсебиңизди түзө аласыз."</string>
-    <!-- no translation found for account_setup_basics_email_label (3454164053624112047) -->
-    <skip />
-    <string name="or_label" msgid="2207403489755254427">"ЖЕ"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Google менен кирүү"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"СЫРСӨЗ"</string>
-    <string name="password_hint" msgid="8835390747504721561">"Сырсөз"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s менен кирди"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"АНЫКТЫГЫН ТЕКШЕРҮҮ"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"Аныктыгын текшерүүнү кошуу"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"Аныктыгын текшерүүнү тазалоо"</string>
-    <!-- no translation found for account_setup_basics_manual_setup_action (8053852205391155912) -->
-    <skip />
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Жарактуу электрондук почта дарегин жана сырсөздү териңиз."</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Кош каттоо эсеби"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Бул колдонуучунун аты мурунтан эле \"<xliff:g id="DUPLICATE">%s</xliff:g>\" каттоо эсеби  үчүн колдонулууда."</string>
-    <!-- no translation found for account_password_spaces_error (8928309156658903257) -->
-    <skip />
-    <!-- no translation found for account_setup_check_settings_retr_info_msg (4121970450267725664) -->
-    <skip />
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Сервер жөндөөлөрү текшерилүүдө…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"smtp жөндөөлөрү текшерилүүдө…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Каттоо эсеби түзүлүүдө…"</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"Каттоо эсебинин түрүн ырастоо"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"<xliff:g id="EMAIL">%1$s</xliff:g> <xliff:g id="USERPROTOCOL">%2$s</xliff:g> колдонот деп көрсөткөнсүз, бирок каттоо эсеби <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> колдонушу мүмкүн"</string>
-    <!-- no translation found for account_setup_names_title (8483517350241119291) -->
-    <skip />
-    <string name="account_setup_names_headline" msgid="914858472109729140">"Каттоо эсебиңиз түзүлдү, эми электрондук почтаңызга кол сунсаңыз эле жетесиз!"</string>
-    <!-- no translation found for account_setup_names_account_name_label (8033895024273259196) -->
-    <skip />
-    <!-- no translation found for account_setup_names_user_name_label (8967410178488604770) -->
-    <skip />
-    <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Бул талаа бош болбошу керек."</string>
-    <!-- no translation found for account_setup_account_type_title (7156551693961182124) -->
-    <skip />
-    <!-- no translation found for account_setup_account_type_headline (3574102329184831086) -->
-    <skip />
-    <!-- no translation found for account_setup_account_type_instructions (114515540798408760) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_title (6796626791039136005) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_headline (6183711037633407184) -->
-    <skip />
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"КОЛДОНУУЧУНУН ЫСЫМЫ"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"СЫРСӨЗ"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"Сырсөз"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"СЕРВЕР"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"ПОРТ"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"КООПСУЗДУК ТҮРҮ"</string>
-    <!-- no translation found for account_setup_incoming_security_none_label (8300169413118264895) -->
-    <skip />
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Бардык тастыктамаларды кабыл алуу)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"SSL/TLS (бардык тастыктамаларды кабыл алуу)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
-    <!-- no translation found for account_setup_incoming_delete_policy_label (9213590134693857912) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_delete_policy_never_label (3222897501875871041) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_delete_policy_delete_label (222216840911785631) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_imap_path_prefix_label (401167247072926810) -->
-    <skip />
-    <!-- no translation found for account_setup_incoming_imap_path_prefix_hint (9190845919067906033) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_title (7208495965665711539) -->
-    <skip />
-    <!-- no translation found for account_setup_outgoing_headline (2025001060935366394) -->
-    <skip />
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP СЕРВЕРИ"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"ПОРТ"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"КООПСУЗДУК ТҮРҮ"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Кирүү талап кылынат"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"КОЛДОНУУЧУНУН ЫСЫМЫ"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"СЫРСӨЗ"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"КАРДАРДЫН ТАСТЫКТАМАСЫ"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Тандоо"</string>
-    <!-- no translation found for account_setup_exchange_use_certificate (8690682770083161349) -->
-    <skip />
-    <!-- no translation found for account_setup_exchange_remove_certificate (5633249155510301766) -->
-    <skip />
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Эч нерсе жок"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"МОБИЛДИК ТҮЗМӨКТҮН ID"</string>
-    <!-- no translation found for account_setup_options_title (9016600767888846051) -->
-    <skip />
-    <!-- no translation found for account_setup_options_headline (4181274232835368085) -->
-    <skip />
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Шайкештештирүү жыштыгы:"</string>
-    <!-- no translation found for account_setup_options_mail_check_frequency_never (287951859480505416) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_push (5934525907736008673) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_5min (6388939895878539307) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_10min (5344463157247877480) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_15min (5052776740089741793) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_30min (1097088928685931864) -->
-    <skip />
-    <!-- no translation found for account_setup_options_mail_check_frequency_1hour (3767715356039692899) -->
-    <skip />
-    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Электрондук билдирүү келгенде мага эскертип кой"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Байланыштарды бул каттоо эсебинен шайкештештирүү"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Жылнааманы бул каттоо эсебинен шайкештештирүү"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Электрондук почтаны бул каттоо эсебинен шайкештештирүү"</string>
-    <!-- no translation found for account_setup_options_background_attachments_label (5247749298276451846) -->
-    <skip />
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Аягына чыгарылган жок"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Электрондук почталарды төмөнкүдөн шайкештештирүү:"</string>
-    <!-- no translation found for account_setup_options_mail_window_auto (4188895354366183790) -->
-    <skip />
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Акыркы күн"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Акыркы үч күн"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"Өткөн апта"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Акыркы эки апта"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Өткөн ай"</string>
-    <!-- no translation found for account_setup_options_mail_window_all (5372861827683632364) -->
-    <skip />
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Демейки каттоо эсебин колдонуу"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Колдонуучунун аты же сырсөз туура эмес."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Кирген жоксуз.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Каттоо эсебин орнотуу көйгөйү"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"Колдонуучунун аты, сырсөзү жана каттоо эсебинин жөндөөлөрү туура экендигин ырастаңыз."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Серверге коопсуз шартта туташуу мүмкүн болбой жатат."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Серверге коопсуз шартта туташуу мүмкүн болбой жатат.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Кардар тастыктамасы талап кылынууда. Серверге кардар тастыктамасы менен туташкыңыз келеби?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Тастыктама жараксыз же жеткиликтүү эмес."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Сервердин жообунда ката бар. Колдонуучу атыңызды жана сырсөзүңүздү текшерип, дагы бир жолу аракет кылып көрүңүз."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Серверге туташуу мүмкүн болбой жатат."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Серверге туташуу мүмкүн болбой жатат.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <!-- no translation found for account_setup_failed_tls_required (307030406688611327) -->
-    <skip />
-    <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Серверде аныктыкты текшерүү ыкмалары колдоого алынбайт."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"Коопсуздук катасынан улам серверге туташылган жок."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Серверге туташылган жок."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Сервердин дарегин туура эмес тердиңиз же сервер электрондук почтада колдоого алынбай турган протоколдун версиясын талап кылууда."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Бул сервер менен шайкештештирүүгө уруксат жок. Толугураак маалымат алуу үчүн, сервериңиздин администраторуна кайрылыңыз."</string>
-    <!-- no translation found for account_setup_security_required_title (1850321535870447468) -->
-    <skip />
-    <!-- no translation found for account_setup_security_policies_required_fmt (5410714107656671761) -->
-    <skip />
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Бул сервер Android түзмөгүңүздө колдоого алынбай турган төмөнкүдөй коопсуздук каражаттарын талап кылууда: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Каттоо эсебинин колдонуучу атын өзгөртө албайсыз. Колдонуучу аты башкача болгон каттоо эсебин кошуу үчүн, Каттоо эсебин кошуу көрүнүшүнө тийип коюңуз."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"ЭСКЕРТҮҮ: Түзмөгүңүздү башкаруу максатында Электрондук почта колдонмосунун ыйгарым укуктарын өчүргөнүңүздө, электрондук почтанын бардык каттоо эсептери, ошону менен катар алардын электрондук почтасы, байланыштары, жылнаамадагы окуялар жана башка дайындар жок болот."</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"Коопсуздукту жаңыртуу"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> коопсуздук жөндөөлөрүн жаңыртыңыз."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Коопсуздук талаптарынан улам, \"<xliff:g id="ACCOUNT">%s</xliff:g>\" каттоо эсеби жаңыртылбай жатат."</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" каттоо эсеби коопсуздук жөндөөлөрүн жаңыртууну талап кылууда."</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" каттоо эсеби коопсуздук жөндөөлөрүн өзгөрттү; колдонуучудан эч кандай аракет талап кылынбайт."</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Коопсуздукту жаңыртуу керек"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"Коопсуздук саясаттары өзгөрүлдү"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Коопсуздук саясаты сакталбайт"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"Түзмөктүн коопсуздугу"</string>
-    <!-- no translation found for account_security_policy_explanation_fmt (6932627044314460766) -->
-    <skip />
-    <!-- no translation found for account_setup_failed_dlg_edit_details_action (5355993309841479360) -->
-    <skip />
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" кулпу экраныңыздын PIN кодун же сырсөздү өзгөртүүнү талап кылууда."</string>
-    <!-- no translation found for password_expire_warning_content_title (7174669014074849304) -->
-    <skip />
-    <!-- no translation found for password_expired_ticker (4230570412974108968) -->
-    <skip />
-    <!-- no translation found for password_expired_content_title (4349518706602252979) -->
-    <skip />
-    <!-- no translation found for password_expire_warning_dialog_title (1687074175399798189) -->
-    <skip />
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Тез арада кулпу экранынын PIN кодун же сырсөзүн өзгөртүшүңүз керек, болбосо <xliff:g id="ACCOUNT">%s</xliff:g> дайындары тазаланат. Аны азыр өзгөртөсүзбү?"</string>
-    <!-- no translation found for password_expired_dialog_title (2186547998125938084) -->
-    <skip />
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Түзмөгүңүздөн <xliff:g id="ACCOUNT">%s</xliff:g> дайындары тазаланып жатат. Аны кулпу экраныңыздын PIN кодун же сырсөзүн өзгөртүп калыбына келтире аласыз. Азыр өзгөртөсүзбү?"</string>
-    <!-- no translation found for account_settings_exit_server_settings (8006323251094711431) -->
-    <skip />
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Кирген жок."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> колдонуучунун аты же сырсөз туура эмес. Аларды азыр жаңыртасызбы?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"<xliff:g id="ACCOUNT">%s</xliff:g> кире алган жоксуз; сервердин айтымында: <xliff:g id="REASON">%s</xliff:g> Колдонуучу атыңызды жана/же сырсөзүңүздү жаңыртасызбы?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Тиркемелерди жүктөп алуу"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Тиркемелерди акырк. билдир-гө Wi-Fi менен автоматтык жүктөп алуу"</string>
-    <!-- no translation found for account_settings_notify_label (1630001017303007974) -->
-    <skip />
-    <!-- no translation found for account_settings_summary (8403582255413830007) -->
-    <skip />
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Электрондук билдирүү алынганда эскертме жөнөтүү"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Шайкештештирүү жыштыгы"</string>
-    <!-- no translation found for account_settings_incoming_label (7858928031806297542) -->
-    <skip />
-    <!-- no translation found for account_settings_incoming_summary (2923044634831881068) -->
-    <skip />
-    <!-- no translation found for account_settings_outgoing_label (4464829249980026745) -->
-    <skip />
-    <!-- no translation found for account_settings_outgoing_summary (3572093624332724311) -->
-    <skip />
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Күчүнө кирген саясаттар"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Эч нерсе жок"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Колдоого алынбаган саясаттар"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Эч нерсе жок"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"Шайкештештирүү аракети"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Бул каттоо эсебин шайкештештирүү үчүн бул жерге тийип коюңуз"</string>
-    <!-- no translation found for account_settings_description_label (8894815221204511715) -->
-    <skip />
-    <!-- no translation found for account_settings_name_label (8186406122590008449) -->
-    <skip />
-    <!-- no translation found for account_settings_edit_quick_responses_label (3106019627675996480) -->
-    <skip />
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Электрондук билдирүү жазылганда көп кыстарылган текстти түзөтүү"</string>
-    <!-- no translation found for account_settings_notifications (1042620094281375043) -->
-    <skip />
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"Дайындарды колдонуу"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"Коопсуздук саясаттары"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"Тутум папкалары"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"Таштандылар папкасы"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Сервериңиздеги таштандылар папкасын тандаңыз"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Сервериңиздеги таштандылар папкасын тандаңыз"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"Жөнөтүлгөн нерселер папкасы"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Сервериңиздеги жөнөтүлгөн нерселер папкасын тандаңыз"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Сервериңиздеги жөнөтүлгөн нерселер папкасын тандаңыз"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"Тез жооп"</string>
-    <!-- no translation found for save_action (1988862706623227093) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_enable (1369272986009573218) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_contacts_summary (816919452270997919) -->
-    <skip />
-    <!-- no translation found for account_settings_sync_calendar_enable (6855333393468628003) -->
-    <skip />
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Жылнаама окуясын бул каттоо эсебине шайкештештир."</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Э-почтаны шайкештеш."</string>
-    <!-- no translation found for account_settings_sync_email_summary (262964076412310990) -->
-    <skip />
-    <!-- no translation found for account_settings_vibrate_when_label (708477308761702671) -->
-    <skip />
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"Шыңгыр тандоо"</string>
-    <!-- no translation found for account_settings_servers (4925493817981624242) -->
-    <skip />
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Шайкештештирүү параметрлери"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Шайкештештирүү параметрлери (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Бул папканы шайкештештирүү"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Туташканда билдирүүлөр жүктөп алышат"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Почтаны шайкештештирүү күндөрү"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Жөнөтүүчүнүн сүрөтү"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"Бул программага туташуу мүмкүнчүлүгүн берген POP уруксаты айрым гана \"Plus\" каттоо эсептеринде бар. Эгер туура электрондук почта дареги жана сырсөзүңүз менен кире албай жатсаңыз, \"Plus\" каттоо эсебинин акысы төлөнө элек болушу мүмкүн. Ушул электрондук почта каттоо эсептерине кирүү мүмкүнчүлүгүн алуу үчүн желе серепчисин иштетиңиз."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"Бул электрондук почта каттоо эсебин түзүүдөн мурун, T-Online вебсайтына өтүп, POP3 электрондук почтага кирүү мүмкүнчүлүгүн алуу үчүн сырсөз ойлоп табыңыз."</string>
-    <!-- no translation found for exchange_name (1190783774800310346) -->
-    <skip />
-    <!-- no translation found for exchange_name_alternate (5772529644749041052) -->
-    <skip />
-    <string name="system_account_create_failed" msgid="3673792980526246177">"Каттоо эсеби түзүлгөн жок. Дагы бир жолу аракет кылып көрүңүз."</string>
-    <!-- no translation found for device_admin_label (8680224994637869414) -->
-    <skip />
-    <!-- no translation found for device_admin_description (426727923791430306) -->
-    <skip />
-    <string name="settings_activity_title" msgid="5185915603716333904">"Жөндөөлөр"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"Жалпы жөндөөлөр"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Жок кылуудан мурун ырастоо"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Жөнөтүүдөн мурун ырастоо"</string>
-    <!-- no translation found for more_than_999 (8704425397397918798) -->
-    <skip />
-    <!-- no translation found for search_hint (2200412192574686497) -->
-    <skip />
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Түзмөктүн камерасынын колдонулушуна тыюу салуу"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"Түзмөктүн сырсөзүн талап кылуу"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"Мурунку сырсөздөрдүн кайрадан колдонулушун чектөө"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"Мөөнөтү аяктай турган сырсөздөр талап кылынат"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"Иштебеген түзмөктүн экранын кулпулоону талап кылуу"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"Шайкештештирилг. жылнаама окуяларынын санын чектөө"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"Шайкештештрлгн. электрондук почтанын санын чектөө"</string>
-    <string name="quick_1" msgid="3426057697353380951">"Рахмат!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"Жакшы нерсе окшойт!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"Муну бир аздан кийин окуп, анан сени менен байланышам."</string>
-    <string name="quick_4" msgid="3988974084396883051">"Жолугуп ушул нерсени талкуулабайлыбы?"</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"Роуминг учурунда бул каттоо эсебинин фондук шайкештештирүүсү иштебейт."</string>
-    <string name="confirm_response" msgid="9151965975158906286">"Жооп жөнөтүлүүдө…"</string>
-    <string name="no_conversations" msgid="5559527390337162819">"Бир дагы билдирүү жок."</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"Папка кармагыч"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> серврд таштанды папксн тандңз"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g> серврд жөнтлгндр папксн тндоо"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Папкалар тизмеси жүктөлүүдө…"</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"Эч нерсе жок"</string>
-</resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
deleted file mode 100644
index 999d3e7..0000000
--- a/res/values-mk-rMK/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"Читај прилози во е-пошта"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Ѝ дозволува на апликацијата да ги чита прилозите во вашата е-пошта."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"Пристапи до податоците на операторот за е-пошта"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Ѝ дозволува на апликацијата да пристапува до базата податоци на вашата е-пошта, како на пр.: примени пораки, испратени пораки, кориснички имиња и лозинки."</string>
-    <string name="app_name" msgid="5815426892327290362">"E-пошта"</string>
-    <string name="debug_title" msgid="5175710493691536719">"Отстрани грешка"</string>
-    <string name="next_action" msgid="3931301986364184415">"Следно"</string>
-    <string name="previous_action" msgid="5181616311579820981">"Претходно"</string>
-    <string name="done_action" msgid="7497990549515580249">"Готово"</string>
-    <string name="create_action" msgid="3062715563215392251">"Создај нов"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Нема брзи одговори."</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"Поставки на сметка"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"Опции за синхронизација"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"Проблем при поврзување."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"Премести порака"</item>
-    <item quantity="other" msgid="371256717624461324">"Премести пораки"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"Преместувањето не е поддржано за сметки на POP3."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Не може да се премести бидејќи изборот содржи повеќе сметки."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Пораките во „Нацрти“, „Сандаче за појдовна пошта“ и „Испратени“, не може да се преместат."</string>
-    <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="mailbox_name_display_starred" msgid="7788694947644186069">"Со ѕвезда"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"Непрочитани"</string>
-    <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="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Комбиниран приказ"</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_insert_quick_response_list_title" msgid="5314107302508728189">"Вметни брз одговор"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"Вметни брз одговор"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Ќе се преземат еден или повеќе прилози од проследената порака пред таа да се испрати."</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"Прилогот не можеше да се преземе."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"Настана грешка при дешифрирање на пораката."</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Не можеше да се проследат еден или повеќе прилози."</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"Прилогот не е проследен"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"Најавувањето на <xliff:g id="ACCOUNT_NAME">%s</xliff:g> е неуспешно."</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"Не можеше да се пријави."</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>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> КБ"</item>
-    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> КБ"</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> МБ"</item>
-    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> МБ"</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"Поставување сметка"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"Барање авторизација"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"Пријави се"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"Не можеме да извршиме автентикација"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"Адресата на е-пошта или лозинката се неточни"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"Адреса на е-пошта:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"Сметка на е-пошта"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"Може да ја поставите сметката во само неколку чекори."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Адреса на е-пошта"</string>
-    <string name="or_label" msgid="2207403489755254427">"ИЛИ"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Најави се со Google"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"ЛОЗИНКА"</string>
-    <string name="password_hint" msgid="8835390747504721561">"Лозинка"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"Пријавен со %s"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"АВТЕНТИКАЦИЈА"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"Додај автентикација"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"Исчисти автентикација"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Рачно поставување"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Внесете важечки адреса на е-пошта и лозинка."</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Двојна сметка"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Веќе го користите ова корисничко име за сметката „<xliff:g id="DUPLICATE">%s</xliff:g>“."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"Оваа лозинка започнува или завршува со едно или повеќе празни места. Многу сервери не поддржуваат лозинки со празни места."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Добивање информации за сметка..."</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Се потврдуваат поставките на серверот..."</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Се потврдуваат поставките за smtp…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Сметката се создава…"</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"Потврди тип на сметка"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"Назначивте дека <xliff:g id="EMAIL">%1$s</xliff:g> користи <xliff:g id="USERPROTOCOL">%2$s</xliff:g>, но сметката може да користи <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"Поставување сметка"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"Вашата сметка е поставена и наскоро ќе имате е-пошта!"</string>
-    <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_names_user_name_empty_error" msgid="6791427018325367364">"Ова поле не може да биде празно."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Поставување сметка"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Тип сметка"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Каков тип сметка е ова?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Поставување сметка"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Поставки на влезен сервер"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"КОРИСНИЧКО ИМЕ"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"ЛОЗИНКА"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"Лозинка"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"СЕРВЕР"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"ПОРТА"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"ТИП БЕЗБЕДНОСТ"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Нема"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"ССЛ/ТЛС (Прифати ги сите сертификати)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"ССЛ/ТЛС"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"СТАРТТЛС (прифати ги сите сертификати)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"СТАРТТЛС"</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>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Поставување сметка"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Поставки на излезен сервер"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"СЕРВЕР SMTP"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"ПОРТА"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"ТИП БЕЗБЕДНОСТ"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Барај најавување"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"КОРИСНИЧКО ИМЕ"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"ЛОЗИНКА"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"СЕРТИФИКАТ НА КЛИЕНТ"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Избери"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Користи сертификат на клиент"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Отстрани"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Нема"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ИД НА МОБИЛЕН УРЕД"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"Поставки на сметка"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"Опции на сметка"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Зачестеност на синхронизација:"</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_notify_label" msgid="7046146571560728829">"Извести ме кога ќе пристигне е-пошта"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Синхронизирај ги контактите од оваа сметка"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Синхронизирај го календарот од оваа сметка"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Синхронизирај ја е-поштата од оваа сметка"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Автоматски преземајте прилози кога сте поврзани на Wi-Fi"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Не можеше да заврши"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"Синхронизирај е-пошти од:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Автоматски"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"Последен ден"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"Минатите три дена"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"Минатата седмица"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"Минатите две седмици"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"Минатиот месец"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Сѐ"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Користи стандардна вредност на сметка"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Корисничкото име или лозинката се неточни."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Најавувањето не успеа.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Проблем со поставување сметка"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"Потврдете дека корисничкото име, лозинката и поставките на сметката се точни."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Не може безбедно да се поврзете со серверот."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Не може безбедно да се поврзете со серверот.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Потребен е сертификат на клиент. Дали сакате да се поврзете на сервер со сертификат на клиент?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Сертификатот е неважечки или недостапен."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Серверот одговори со грешка. Проверете ги вашето корисничко име и лозинката, потоа обидете се повторно."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Не може да се поврзете со серверот."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Не може да се поврзе со сервер.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"Потребен е ТЛС, но серверот не го поддржува."</string>
-    <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Серверот не поддржува методи на автентикација."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"Не можеше да се отвори врска со сервер поради грешка на безбедност."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Не можеше да се отвори врска со сервер."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Внесовте неточна адреса на сервер или серверот бара верзија на протокол којашто е-поштата не ја поддржува."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Немате дозвола за синхронизирање со овој сервер. Контактирајте со администраторот на серверот за повеќе информации."</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Применување далечинска безбедност"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Серверот <xliff:g id="SERVER">%s</xliff:g> бара да му овозможите далечинска контрола на некои безбедносни функции на вашиот уред со Android. Дали сакате да завршите со поставување на сметката?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Овој сервер бара безбедносни карактеристики кои вашиот уред со Android не ги поддржува, како што се: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Не може да го промените корисничкото име на сметката. За да додадете сметка со различно корисничко име, допрете „Додај сметка“."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"ПРЕДУПРЕДУВАЊЕ: Со деактивирање на овластувањето за апликацијата „Е-пошта“ да го администрира вашиот уред ќе се избришат сите сметки на е-пошта на кои им е потребно, заедно со нивните податоци за е-пошта, контакти, календарски настани и друго."</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"Ажурирање за безбедност"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> бара да ги ажурирате вашите поставки за безбедност."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Сметката „<xliff:g id="ACCOUNT">%s</xliff:g>“ не може да се синхронизира поради барањата за безбедност."</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Сметката „<xliff:g id="ACCOUNT">%s</xliff:g>“ бара ажурирање на поставките за безбедност."</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Сметката „<xliff:g id="ACCOUNT">%s</xliff:g>“ ги промени поставките за безбедност. Не е потребно дејство од корисник."</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Потребно е ажурирање за безбедност"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"Правилата за безбедност се променија"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Политиките за безбедност не може да се исполнат"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"Безбедност на уред"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Серверот <xliff:g id="SERVER">%s</xliff:g> бара да му овозможите далечински да контролира некои безбедносни функции на вашиот уред со Android."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Уреди детали"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"„<xliff:g id="ACCOUNT">%s</xliff:g>“ бара да го промените вашиот ПИН или лозинката за заклучениот екран."</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Лозинката за заклучување на екранот истекува"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"ПИН-бројот или лозинката за заклучениот екран истече."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"Лозинката за заклучениот екран истече"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Лозинката за заклучување на екранот истекува"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Треба да ги промените вашиот ПИН или лозинката за заклучениот екран наскоро, во спротивно податоците за <xliff:g id="ACCOUNT">%s</xliff:g> ќе се избришат. Сакате да ги промените сега?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"Лозинката за заклучениот екран истече"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Податоците за <xliff:g id="ACCOUNT">%s</xliff:g> се бришат од вашиот уред. Може да ги вратите со променување на вашиот ПИН или лозинката за заклучениот екран. Променете ги сега?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Отфрли незачувани промени?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Не можеше да се пријави."</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Корисничкото име или лозинката за <xliff:g id="ACCOUNT">%s</xliff:g> се неточни. Дали сакате сега да ги ажурирате?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Вашето најавување на <xliff:g id="ACCOUNT">%s</xliff:g> не успеа. Серверот ја даде следната причина: <xliff:g id="REASON">%s</xliff:g> Дали сакате да го ажурирате вашето корисничко име и/или лозинката?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Преземи прилози"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Автоматско преземање прилози од неодамнешни пораки преку Wi-Fi"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"Известувања за е-пошта"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"Зачестеност на синхронизирање, известувања, итн."</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"Испрати известување кога ќе пристигне е-пошта"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Зачестеност на синхронизација"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Поставки за дојдовна пошта"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Корисничко име, лозинка и други поставки на влезниот сервер."</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Поставки за појдовна пошта"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Корисничко име, лозинка и други поставки на влезниот сервер."</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Наметнати правила"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Нема"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Неподдржани правила"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Нема"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"Обиди се да синхронизираш"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Допрете тука за да ја синхронизирате сметката"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"Име на сметка"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"Вашето име"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Брзи одговори"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Уредувајте текст што често го вметнувате при составување е-пошта"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"Поставки на известувања"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"Користење податоци"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"Безбедносни правила"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"Системски папки"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"Папка за корпа"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Изберете ја папката за корпа на серверот"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Изберете ја папката за корпа на серверот"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"Папка за испратени ставки"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Изберете ја папката за испратени ставки на серверот"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Изберете ја папката за испратени ставки на серверот"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"Брз одговор"</string>
-    <string name="save_action" msgid="1988862706623227093">"Зачувај"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Синхронизирај контакти"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Синхронизирај контакти за оваа сметка"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Календар на синхронизација"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Синхронизирај календарски настан за оваа сметка"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхронизирај е-пошта"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Синхронизирај е-пошта за оваа сметка"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Вибрации"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"Избери мелодија"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"Поставки на сервер"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Опции за синхронизација"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Опции за синхронизација (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Синхронизирај ја папката"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Пораките ќе се преземат кога ќе има поврзување"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Денови пошта за синхронизација"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Слика на испраќач"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"Само некои сметки „Plus“ опфаќаат пристап на POP што овозможува поврзување на програмата. Ако не може да се пријавите со вашите точни адреса на е-пошта и лозинка, можно е да немате платена сметка „Plus“. Стартувајте го веб-прелистувачот за да добиете пристап до овие сметки на е-пошта."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"Пред да ја поставите сметката на е-пошта, посетете ја веб-локацијата T-Online и создајте лозинка на пристап до е-пошта преку POP3."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"Корпоративна"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"Сметката не можеше да се создаде. Обидете се повторно."</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"E-пошта"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"Овозможува политики на безбедност специфични за серверот"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"Поставки"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"Општи поставки"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Потврди пред бришење"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Потврди пред испраќање"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"Пребарај ја е-поштата"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Оневозможи ја употребата на фотоапаратот на уредот"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"Барај лозинка на уред"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"Ограничи повторна употреба на неодамнешни лозинки"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"Барај лозинките да истекуваат"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"Барај неактивен уред да го заклучува својот екран"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"Ограничете го бројот на синхронизирани календарски настани"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"Ограничете го бројот на синхронизирани пораки на е-пошта"</string>
-    <string name="quick_1" msgid="3426057697353380951">"Фала!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"Добро ми звучи!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"Ќе го прочитам ова подоцна и ќе ти одговорам."</string>
-    <string name="quick_4" msgid="3988974084396883051">"Ајде да закажеме состанок за да разговараме за ова."</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"Синхронизирањето во заднина за оваа сметка е оневозможено во роаминг."</string>
-    <string name="confirm_response" msgid="9151965975158906286">"Се испраќа одговор…"</string>
-    <string name="no_conversations" msgid="5559527390337162819">"Нема пораки."</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"Избирач на папка"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Изберете папка за корпа на серверот за <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Избери папка на испратени ставки на сервер за <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Се вчитува списокот со папки…"</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"Нема достапни"</string>
-</resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
deleted file mode 100644
index a462110..0000000
--- a/res/values-ml-rIN/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"ഇമെയിൽ അറ്റാച്ചുമെന്റുകൾ റീഡുചെയ്യുക"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"നിങ്ങളുടെ ഇമെയിൽ അറ്റാച്ചുമെന്റുകൾ റീഡുചെയ്യാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"ഇമെയിൽ ദാതാവിന്റെ ഡാറ്റ ആക്‌സസ്സുചെയ്യുക"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"ലഭിച്ച സന്ദേശങ്ങളും അയച്ച സന്ദേശങ്ങളും ഉപയോക്തൃനാമങ്ങളും പാസ്‌വേഡുകളും ഉൾപ്പെടെ നിങ്ങളുടെ ഇമെയിൽ ഡാറ്റാബേസ് ആക്സസ്സുചെയ്യാൻ അപ്ലിക്കേഷനെ അനുവദിക്കുന്നു."</string>
-    <string name="app_name" msgid="5815426892327290362">"ഇമെയിൽ"</string>
-    <string name="debug_title" msgid="5175710493691536719">"ഡീബഗ്"</string>
-    <string name="next_action" msgid="3931301986364184415">"അടുത്തത്"</string>
-    <string name="previous_action" msgid="5181616311579820981">"മുമ്പത്തെ"</string>
-    <string name="done_action" msgid="7497990549515580249">"പൂർത്തിയായി"</string>
-    <string name="create_action" msgid="3062715563215392251">"പുതിയത് സൃഷ്‌ടിക്കുക"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"ദ്രുത പ്രതികരണങ്ങളൊന്നുമില്ല."</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"അക്കൗണ്ട് ക്രമീകരണങ്ങൾ"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"സമന്വയ ഓപ്‌ഷനുകൾ"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"കണക്ഷൻ പ്രശ്‌നം."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"സന്ദേശം നീക്കുക"</item>
-    <item quantity="other" msgid="371256717624461324">"സന്ദേശങ്ങൾ നീക്കുക"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 അക്കൗണ്ടുകളിൽ നീക്കുന്നതിനെ പിന്തുണയ്‌ക്കുന്നില്ല."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"തിരഞ്ഞെടുത്തതിൽ ഒന്നിലധികം അക്കൗണ്ടുകൾ ഉള്ളതിനാൽ നീക്കാനാകില്ല."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"ഡ്രാഫ്റ്റുകൾ, ഔട്ട്‌ബോക്‌സ്, അയച്ചവ എന്നിവയിലെ സന്ദേശങ്ങൾ നീക്കാനാകില്ല."</string>
-    <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="mailbox_name_display_starred" msgid="7788694947644186069">"നക്ഷത്രമിട്ടവ"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"വായിക്കാത്തവ"</string>
-    <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="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"സംയോജിത കാഴ്‌ച"</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>\nCC: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"ദ്രുത പ്രതികരണം ചേർക്കുക"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"ദ്രുത പ്രതികരണം ചേർക്കുക"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"നിങ്ങൾ കൈമാറിയ സന്ദേശത്തിലെ ഒന്നോ അതിലധികമോ അറ്റാച്ചുമെന്റുകൾ അയയ്ക്കുന്നതിന് മുമ്പ് ഡൗൺലോഡുചെയ്യപ്പെടും."</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"അറ്റാച്ചുമെന്റ് ഡൗൺലോഡുചെയ്യാനായില്ല."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"സന്ദേശം ഡീകോഡുചെയ്യുമ്പോൾ ഒരു പിശകുണ്ടായി."</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"ഒന്നോ അതിലധികമോ അറ്റാച്ചുമെന്റുകൾ കൈമാറാനായില്ല."</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"അറ്റാച്ചുമെന്റ് കൈമാറിയില്ല"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> സൈൻ ഇൻ ചെയ്‌തു."</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"സൈൻ ഇൻ ചെയ്യാനായില്ല"</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>
-  </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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"അക്കൗണ്ട് സജ്ജീകരണം"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"അംഗീകാരം അഭ്യർത്ഥിക്കുന്നു"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"സൈൻ ഇൻ ചെയ്യുക"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"പ്രമാണീകരിക്കാനാകുന്നില്ല"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"ഇമെയിൽ വിലാസമോ പാസ്‌വേഡോ തെറ്റാണ്"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"ഇമെയില്‍ വിലാസം:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"ഇമെയിൽ അക്കൗണ്ട്"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"കുറച്ചുമാത്രം ഘട്ടങ്ങളിലൂടെ നിങ്ങളുടെ അക്കൗണ്ടിനായി ഇമെയിൽ സജ്ജീകരിക്കാനാകും."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ഇമെയിൽ വിലാസം"</string>
-    <string name="or_label" msgid="2207403489755254427">"അല്ലെങ്കിൽ"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Google ഉപയോഗിച്ച് സൈൻ ഇൻ ചെയ്യുക"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"പാസ്‌വേഡ്"</string>
-    <string name="password_hint" msgid="8835390747504721561">"പാസ്‌വേഡ്"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s ഉപയോഗിച്ച് സൈൻ ഇൻ ചെയ്‌തു"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"പ്രമാണീകരണം"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"പ്രാമാണീകരണം ചേർക്കുക"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"പ്രാമാണീകരണം മായ്‌ക്കുക"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"സ്വമേധയാലുള്ള സജ്ജീകരണം"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"ഒരു സാധുവായ ഇമെയിൽ വിലാസവും പാസ്‌വേഡും ടൈപ്പുചെയ്യുക."</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"തനിപ്പകർപ്പ് അക്കൗണ്ട്"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"\"<xliff:g id="DUPLICATE">%s</xliff:g>\" എന്ന അക്കൗണ്ടിനായി നിങ്ങൾ ഇതിനകം ഈ ഉപയോക്തൃനാമം ഉപയോഗിക്കുന്നു."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"ഈ പാസ്‌വേഡ് ഒന്നോ അതിലധികമോ സ്‌പെയ്‌സ് പ്രതീകങ്ങൾ ഉപയോഗിച്ച് ആരംഭിക്കുകയോ അവസാനിക്കുകയോ ചെയ്യുന്നു. മിക്ക സെർവറുകളും സ്‌പെയ്‌സുകളുള്ള പാസ്‌വേഡുകളെ പിന്തുണയ്‌ക്കില്ല."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"അക്കൗണ്ട് വിവരം വീണ്ടെടുക്കുന്നു…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"സെർവർ ക്രമീകരണങ്ങൾ മൂല്യനിർണ്ണയം ചെയ്യുന്നു…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"smtp ക്രമീകരണങ്ങൾ മൂല്യനിർണ്ണയം ചെയ്യുന്നു…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"അക്കൗണ്ട് സൃഷ്‌ടിക്കുന്നു…"</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"അക്കൗണ്ട് തരം സ്ഥിരീകരിക്കുക"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"<xliff:g id="USERPROTOCOL">%2$s</xliff:g> ആണ് <xliff:g id="EMAIL">%1$s</xliff:g> ഉപയോഗിക്കുന്നതെന്ന് നിങ്ങൾ സൂചിപ്പിച്ചു, എന്നാൽ അക്കൗണ്ട് <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> എന്നത് ഉപയോഗിച്ചേക്കാം"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"അക്കൗണ്ട് സജ്ജീകരണം"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"നിങ്ങളുടെ അക്കൗണ്ട് സജ്ജീകരിച്ചു, ഇമെയിൽ ഉടൻ ലഭിച്ചുതുടങ്ങും!"</string>
-    <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_names_user_name_empty_error" msgid="6791427018325367364">"ഈ ഫീൽഡ് ശൂന്യമായിടരുത്."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"അക്കൗണ്ട് സജ്ജീകരണം"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"അക്കൗണ്ട് തരം"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"ഇത് എന്തുതരം അക്കൗണ്ടാണ്?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"അക്കൗണ്ട് സജ്ജീകരണം"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"ഇൻകമിംഗ് സെർവർ ക്രമീകരണങ്ങൾ"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"ഉപയോക്തൃനാമം"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"പാസ്‌വേഡ്"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"പാസ്‌വേഡ്"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"സെർവർ"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"പോർട്ട്"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"സുരക്ഷ തരം"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"ഒന്നുമില്ല"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (എല്ലാ സർട്ടിഫിക്കറ്റുകളും അംഗീകരിക്കുന്നു)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (എല്ലാ സർട്ടിഫിക്കറ്റുകളും അംഗീകരിക്കുന്നു)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</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>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"അക്കൗണ്ട് സജ്ജീകരണം"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"ഔട്ട്‌ഗോയിംഗ് സെർവർ ക്രമീകരണങ്ങൾ"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP സെർവർ"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"പോർട്ട്"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"സുരക്ഷ തരം"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"സൈൻ ഇൻ ആവശ്യമാണ്"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"ഉപയോക്തൃനാമം"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"പാസ്‌വേഡ്"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"ക്ലയന്റ് സർട്ടിഫിക്കറ്റ്"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"തിരഞ്ഞെടുക്കുക"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"ക്ലയന്റ് സർട്ടിഫിക്കറ്റ് ഉപയോഗിക്കുക"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"നീക്കംചെയ്യുക"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"ഒന്നുമില്ല"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"മൊബൈൽ ഐഡി"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"അക്കൗണ്ട് ക്രമീകരണങ്ങൾ"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"അക്കൗണ്ട് ഓപ്‌ഷനുകൾ"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"സമന്വയ ആവൃത്തി:"</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_notify_label" msgid="7046146571560728829">"ഇമെയിൽ ലഭിക്കുമ്പോൾ എന്നെ അറിയിക്കുക"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"ഈ അക്കൗണ്ടിൽ നിന്നും കോൺടാക്റ്റുകൾ സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"ഈ അക്കൗണ്ടിൽ നിന്നും കലണ്ടർ സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"ഈ അക്കൗണ്ടിൽ നിന്നും ഇമെയിൽ സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fi യിൽ കണക്റ്റുചെയ്‌തിരിക്കുമ്പോൾ അറ്റാച്ചുമെന്റുകൾ യാന്ത്രികമായി ഡൗൺലോഡുചെയ്യുക"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"പൂർത്തിയാക്കാനായില്ല"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"ഇതിൽ നിന്ന് ഇമെയിലുകൾ സമന്വയിപ്പിക്കുക:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"യാന്ത്രികം"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"അവസാന ദിവസം"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"കഴിഞ്ഞ മൂന്നുദിവസം"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"കഴിഞ്ഞ ആഴ്‌ച"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"കഴിഞ്ഞ രണ്ട് ആഴ്‌ച"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"കഴിഞ്ഞ മാസം"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"എല്ലാം"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"അക്കൗണ്ട് സ്ഥിരമായത് ഉപയോഗിക്കുക"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"ഉപയോക്തൃനാമമോ പാസ്‌വേഡോ തെറ്റാണ്."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"ലോഗിൻ പരാജയപ്പെട്ടു.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"അക്കൗണ്ട് സജ്ജീകരണത്തിൽ പ്രശ്‌നമുണ്ട്"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"ഉപയോക്തൃനാമവും പാസ്‌വേഡും അക്കൗണ്ട് ക്രമീകരണങ്ങളും ശരിയാണെന്ന് സ്ഥിരീകരിക്കുക."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"സെർവറിലേക്ക് സുരക്ഷിതമായി കണക്റ്റുചെയ്യാനാകില്ല."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"സെർവറിലേക്ക് സുരക്ഷിതമായി കണക്റ്റുചെയ്യാനാകില്ല.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"ഒരു ക്ലയന്റ് സർട്ടിഫിക്കറ്റ് ആവശ്യമാണ്. ഒരു ക്ലയന്റ് സർട്ടിഫിക്കറ്റ് ഉപയോഗിച്ച് സെർവറിൽ കണക്റ്റുചെയ്യേണ്ടതുണ്ടോ?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"സർട്ടിഫിക്കറ്റ് അസാധുവോ ആക്‌സസ്സുചെയ്യാനാകാത്തതോ ആണ്."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"സെർവർ പ്രതികരണത്തിൽ പിശക്. നിങ്ങളുടെ ഉപയോക്തൃനാമവും പാസ്‌വേഡും പരിശോധിച്ചതിനുശേഷം വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനാകില്ല."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല.\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="6799839150250217566">"പ്രാമാണീകരണ രീതികളെ സെർവർ പിന്തുണയ്‌ക്കുന്നില്ല."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"സുരക്ഷാ പിശകിനാൽ സെർവറിലേക്ക് കണക്ഷൻ തുറക്കാനായില്ല."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"സെർവറിലേക്ക് കണക്ഷൻ തുറക്കാനായില്ല."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"നിങ്ങൾ തെറ്റായ സെർവർ വിലാസം ടൈപ്പുചെയ്‌തു, അല്ലെങ്കിൽ സെർവറിന് ഇമെയിൽ പിന്തുണയ്‌ക്കാത്ത ഒരു പ്രോട്ടോക്കോൾ പതിപ്പ് ആവശ്യമാണ്."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"ഈ സെർവറുമായി സമന്വയിപ്പിക്കാൻ നിങ്ങൾക്ക് അനുമതിയില്ല. കൂടുതൽ വിവരങ്ങൾക്ക് നിങ്ങളുടെ സെർവറിന്റെ അഡ്‌മിനിസ്‌ട്രേറ്ററെ ബന്ധപ്പെടുക."</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"വിദൂര സുരക്ഷാ അഡ്‌മിനിസ്‌ട്രേഷൻ"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"<xliff:g id="SERVER">%s</xliff:g> എന്ന സെർവറിന്, നിങ്ങളുടെ Android ഉപകരണത്തിന്റെ ചില സുരക്ഷാ സവിശേഷതകൾ വിദൂരമായി നിയന്ത്രിക്കാൻ അനുവദിക്കേണ്ടത് ആവശ്യമാണ്. ഈ അക്കൗണ്ട് സജ്ജീകരിക്കുന്നത് പൂർത്തിയാക്കണോ?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"ഈ സെർവറിന്, ഇനിപ്പറയുന്നവയുൾപ്പെടുന്ന Android ഉപകരണം പിന്തുണയ്‌ക്കാത്ത സുരക്ഷാ സവിശേഷതകൾ ആവശ്യമാണ്: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"നിങ്ങൾക്ക് ഒരു അക്കൗണ്ടിന്റെ ഉപയോക്തൃനാമം മാറ്റാനാകില്ല. മറ്റൊരു ഉപയോക്തൃനാമം ഉപയോഗിച്ച് ഒരു അക്കൗണ്ട് ചേർക്കാൻ, അക്കൗണ്ട് ചേർക്കുക സ്പർശിക്കുക."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"മുന്നറിയിപ്പ്: നിങ്ങളുടെ ഉപകരണത്തെ നിയന്ത്രിക്കാനുള്ള ഇമെയിൽ അപ്ലിക്കേഷന്റെ അധികാരം നിർജ്ജീവമാക്കുന്നത്, അത് ആവശ്യമായ എല്ലാ ഇമെയിൽ അക്കൗണ്ടുകളേയും അവയിലെ ഇമെയിലുകൾ, കോൺടാക്റ്റുകൾ, കലണ്ടർ ഇവന്റുകൾ, മറ്റ് ഡാറ്റ എന്നിവയേയും ഇല്ലാതാക്കും."</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"സുരക്ഷാ അപ്ഡേറ്റ്"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> എന്നതിന്, നിങ്ങളുടെ സുരക്ഷാ ക്രമീകരണങ്ങൾ അപ്‌ഡേറ്റുചെയ്യേണ്ടതാവശ്യമാണ്."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"സുരക്ഷാ ആവശ്യകതകളാൽ \"<xliff:g id="ACCOUNT">%s</xliff:g>\" എന്ന അക്കൗണ്ട് സമന്വയിപ്പിക്കാനാകില്ല."</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" എന്ന അക്കൗണ്ടിന് സുരക്ഷാ ക്രമീകരണങ്ങളുടെ അപ്‌ഡേറ്റ് ആവശ്യമാണ്."</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" എന്ന അക്കൗണ്ടിന്റെ സുരക്ഷാ ക്രമീകരണങ്ങൾ മാറ്റി, ഉപയോക്തൃ പ്രവർത്തനങ്ങളൊന്നും ആവശ്യമില്ല."</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"സുരക്ഷാ അപ്‌ഡേറ്റ് ആവശ്യമാണ്"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"സുരക്ഷാ നയങ്ങൾ മാറ്റി"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"സുരക്ഷാ നയങ്ങൾ പാലിക്കാനാകില്ല"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"ഉപകരണ സുരക്ഷ"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g> എന്ന സെർവറിന്, നിങ്ങളുടെ Android ഉപകരണത്തിന്റെ ചില സുരക്ഷാ സവിശേഷതകൾ വിദൂരമായി നിയന്ത്രിക്കാൻ അനുവദിക്കേണ്ടത് ആവശ്യമാണ്."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"എഡിറ്റ് വിശദാംശങ്ങൾ"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"നിങ്ങളുടെ ലോക്ക് സ്‌ക്രീൻ PIN അല്ലെങ്കിൽ പാസ്‌വേഡ് മാറ്റേണ്ടത് \"<xliff:g id="ACCOUNT">%s</xliff:g>\" എന്നതിന് ആവശ്യമാണ്."</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"ലോക്ക് സ്‌ക്രീൻ പാസ്‌വേഡ് കാലഹരണപ്പെടുന്നു"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"നിങ്ങളുടെ ലോക്ക് സ്‌ക്രീൻ PIN അല്ലെങ്കിൽ പാസ്‌വേഡ് കാലഹരണപ്പെട്ടു."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"ലോക്ക് സ്‌ക്രീൻ പാസ്‌വേഡ് കാലഹരണപ്പെട്ടു"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"ലോക്ക് സ്‌ക്രീൻ പാസ്‌വേഡ് കാലഹരണപ്പെടുന്നു"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"നിങ്ങളുടെ ലോക്ക് സ്‌ക്രീൻ PIN അല്ലെങ്കിൽ പാസ്‌വേഡ് ഉടൻ മാറ്റേണ്ടതുണ്ട്, അല്ലെങ്കിൽ <xliff:g id="ACCOUNT">%s</xliff:g> എന്നതിനായുള്ള ഡാറ്റ മായ്‌ക്കപ്പെടും. അത് ഇപ്പോൾ മാറ്റണമെന്നുണ്ടോ?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"ലോക്ക് സ്‌ക്രീൻ പാസ്‌വേഡ് കാലഹരണപ്പെട്ടു"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"നിങ്ങളുടെ ഉപകരണത്തിൽ നിന്നും <xliff:g id="ACCOUNT">%s</xliff:g> എന്നതിനായുള്ള ഡാറ്റ മായ്ച്ചുകൊണ്ടിരിക്കുന്നു.. നിങ്ങളുടെ ലോക്ക് സ്‌ക്രീൻ PIN അല്ലെങ്കിൽ പാസ്‌വേഡ് മാറ്റുന്നതിലൂടെ നിങ്ങൾക്ക് അത് പുനഃസ്ഥാപിക്കാനാകും. നിങ്ങൾക്ക് അത് ഇപ്പോൾ മാറ്റണമെന്നുണ്ടോ?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"സംരക്ഷിക്കാത്ത മാറ്റങ്ങൾ നിരസിക്കണോ?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"സൈൻ ഇൻ ചെയ്യാനായില്ല"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> എന്നതിനുള്ള ഉപയോക്തൃനാമമോ പാസ്‌വേഡോ തെറ്റാണ്. അവ ഇപ്പോൾ അപ്‌ഡേറ്റുചെയ്യണോ?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"<xliff:g id="ACCOUNT">%s</xliff:g> എന്നതിലേക്കുള്ള നിങ്ങളുടെ ലോഗിൻ പരാജയപ്പെട്ടു, സെർവർ പറയുന്നു: <xliff:g id="REASON">%s</xliff:g> നിങ്ങളുടെ ഉപയോക്തൃനാമവും കൂടാതെ/അല്ലെങ്കിൽ പാസ്‌വേഡും അപ്‌ഡേറ്റുചെയ്യണമെന്നുണ്ടോ?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"അറ്റാച്ചുമെന്റുകൾ ഡൗൺലോഡുചെയ്യുക"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Wi-Fi മുഖേന പുതിയ സന്ദേശങ്ങളിലേക്ക് അറ്റാച്ചുമെന്റുകൾ യാന്ത്രികമായി ഡൗൺലോഡുചെയ്യുക"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"ഇമെയിൽ അറിയിപ്പുകൾ"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"സമന്വയ ആവർത്തനം, അറിയിപ്പ് മുതലായവ"</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"ഇമെയിൽ ലഭിക്കുമ്പോൾ അറിയിപ്പ് അയയ്‌ക്കുക"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"സമന്വയ ആവർത്തനം"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"ഇൻകമിംഗ് ക്രമീകരണങ്ങൾ"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"ഉപയോക്തൃനാമവും പാസ്‌വേഡും മറ്റ് ഇൻകമിംഗ് സെർവർ ക്രമീകരണങ്ങളും"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"ഔട്ട്‌ഗോയിംഗ് ക്രമീകരണങ്ങൾ"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"ഉപയോക്തൃനാമവും പാസ്‌വേഡും മറ്റ് ഔട്ട്ഗോയിംഗ് സെർവർ ക്രമീകരണങ്ങളും"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"നയങ്ങൾ നടപ്പിലാക്കിയിരിക്കുന്നു"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"ഒന്നുമില്ല"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"പിന്തുണയ്‌ക്കാത്ത നയങ്ങൾ"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"ഒന്നുമില്ല"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"സമന്വയിപ്പിക്കാൻ ശ്രമിക്കുക"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"ഈ അക്കൗണ്ട് സമന്വയിപ്പിക്കാൻ ഇവിടെ സ്‌പർശിക്കുക"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"അക്കൗണ്ടിന്റെ പേര്"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"നിങ്ങളുടെ പേര്"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"ദ്രുത പ്രതികരണങ്ങൾ"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"ഇമെയിൽ രചിക്കുമ്പോൾ നിങ്ങൾ പതിവായി ചേർക്കുന്ന ടെക്‌സ്റ്റ് എഡിറ്റുചെയ്യുക"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"അറിയിപ്പ് ക്രമീകരണങ്ങൾ"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"ഡാറ്റ ഉപയോഗം"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"സുരക്ഷാ നയങ്ങൾ"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"സിസ്റ്റം ഫോൾഡറുകൾ"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"ട്രാഷ് ഫോൾഡർ"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"നിങ്ങളുടെ സെർവറിന്റെ ട്രാഷ് ഫോൾഡർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"നിങ്ങളുടെ സെർവറിന്റെ ട്രാഷ് ഫോൾഡർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"അയച്ച ഇനങ്ങളുടെ ഫോൾഡർ"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"നിങ്ങളുടെ സെർവറിന്റെ അയച്ച ഇനങ്ങളുടെ ഫോൾഡർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"നിങ്ങളുടെ സെർവറിന്റെ അയച്ച ഇനങ്ങളുടെ ഫോൾഡർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"ദ്രുത പ്രതികരണം"</string>
-    <string name="save_action" msgid="1988862706623227093">"സംരക്ഷിക്കുക"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"കോൺടാക്റ്റുകൾ സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"ഈ അക്കൗണ്ടിനായി കോൺടാക്റ്റുകൾ സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"കലണ്ടർ സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"ഈ അക്കൗണ്ടിനായി കലണ്ടർ ഇവന്റ് സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ഇമെയിൽ സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"ഈ അക്കൗണ്ടിനായി ഇമെയിൽ സമന്വയിപ്പിക്കുക"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"വൈബ്രേറ്റുചെയ്യുക"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"റിംഗ്ടോൺ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"സെർവർ ക്രമീകരണങ്ങൾ"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"സമന്വയ ഓപ്‌ഷനുകൾ"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"സമന്വയ ഓപ്‌ഷനുകൾ (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"ഈ ഫോൾഡർ സമന്വയിപ്പിക്കുക"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"കണക്റ്റുചെയ്‌തിരിക്കുമ്പോൾ സന്ദേശങ്ങൾ ഡൗൺലോഡുചെയ്യും"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"സമന്വയിപ്പിക്കേണ്ട മെയിൽ ദിവസം"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"അയയ്‌ച്ചയാളുടെ ചിത്രം"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"POP ആക്‌സസ്സ് ഉൾപ്പെടുന്ന ചില \"Plus\" അക്കൗണ്ടുകൾ മാത്രമേ ഈ പ്രോഗ്രാമിനെ കണക്റ്റുചെയ്യാൻ അനുവദിക്കുന്നുള്ളൂ. നിങ്ങളുടെ ശരിയായ ഇമെയിൽ വിലാസവും പാസ്‌വേഡും ഉപയോഗിച്ച് സൈൻ ഇൻ ചെയ്യാനാകുന്നില്ലെങ്കിൽ, നിങ്ങൾക്ക് ഒരു പണമടച്ചുള്ള \"Plus\" അക്കൗണ്ട് ഉണ്ടായിരിക്കാനിടയില്ല. ഈ ഇമെയിൽ അക്കൗണ്ടുകളിലേക്ക് ആക്സസ് നേടാൻ വെബ് ബ്രൗസർ സമാരംഭിക്കുക."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"ഈ ഇമെയിൽ അക്കൗണ്ട് സജ്ജീകരിക്കുന്നതിന് മുമ്പാായി, ടി-ഓൺലൈൻ വെബ്‌സൈറ്റ് സന്ദർശിച്ച്  POP3 ഇമെയിൽ ആക്‌സസ്സിനായി ഒരു പാസ്‌വേഡ് സൃഷ്ടിക്കുക."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"കോർപ്പറേറ്റ്"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"അക്കൗണ്ട് സൃഷ്‌ടിക്കാനായില്ല. വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"ഇമെയിൽ"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"സെർവർ നിർദ്ദിഷ്‌ട സുരക്ഷാ നയങ്ങൾ പ്രവർത്തനക്ഷമമാക്കുന്നു"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"ക്രമീകരണങ്ങൾ"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"പൊതുക്രമീകരണങ്ങൾ"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"ഇല്ലാതാക്കുന്നതിന് മുമ്പ് സ്ഥിരീകരിക്കുക"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"അയയ്‌ക്കുന്നതിന് മുമ്പായി സ്ഥിരീകരിക്കുക"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"ഇമെയിൽ തിരയുക"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"ഉപകരണ ക്യാമറ ഉപയോഗിക്കാൻ അനുവദിക്കരുത്"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"ഉപകരണ പാസ്‌വേഡ് ആവശ്യമാണ്"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"പുതിയ പാസ്‌വേഡുകളുടെ പുനരുപയോഗം നിയന്ത്രിക്കുക"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"കാലഹരണപ്പെടാൻ പാസ്‌വേഡുകൾ ആവശ്യമാണ്"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"ഒരു നിഷ്‌ക്രിയ ഉപകരണത്തിന്റെ ലോക്ക് സ്‌ക്രീൻ ആവശ്യമാണ്"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"സമന്വയിപ്പിക്കേണ്ട കലണ്ടർ ഇവന്റുകളുടെ എണ്ണം പരിമിതപ്പെടുത്തുക"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"സമന്വയിപ്പിക്കേണ്ട ഇമെയിലുകളുടെ എണ്ണം പരിമിതപ്പെടുത്തുക"</string>
-    <string name="quick_1" msgid="3426057697353380951">"നന്ദി!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"ഇത് നല്ലതാണെന്ന് തോന്നുന്നു!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"ഞാൻ ഇത് പിന്നീട് വായിച്ച് നിങ്ങളെ ബന്ധപ്പെടാം."</string>
-    <string name="quick_4" msgid="3988974084396883051">"ഇത് ചർച്ചചെയ്യാൻ ഒരു കൂടിക്കാഴ്‌ച സജ്ജമാക്കാൻ അനുവദിക്കുക"</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"റോമിംഗിലായിരിക്കുമ്പോൾ, ഈ അക്കൗണ്ടിനായുള്ള പശ്ചാത്തല സമന്വയം പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നു."</string>
-    <string name="confirm_response" msgid="9151965975158906286">"പ്രതികരണം അയയ്ക്കുന്നു…"</string>
-    <string name="no_conversations" msgid="5559527390337162819">"സന്ദേശങ്ങളൊന്നുമില്ല."</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"ഫോൾഡർ പിക്കർ"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> എന്നതിനായി സെർവർ ട്രാഷ് ഫോൾഡർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g> എന്നതിനായുള്ള സെർവർ അയച്ച ഇനങ്ങളുടെ ഫോൾഡർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"ഫോൾഡർ ലിസ്റ്റ് ലോഡുചെയ്യുന്നു…"</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"ലഭ്യമായതൊന്നുമില്ല"</string>
-</resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
deleted file mode 100644
index 1eb5fbc..0000000
--- a/res/values-mr-rIN/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"ईमेल संलग्नके वाचा"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"आपली ईमेल संलग्नके वाचण्यास अॅप ला अनुमती देते."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"ईमेल प्रदाता डेटावर प्रवेश करा"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"प्राप्त केलेले संदेश, पाठविलेले संदेश, वापरकर्तानावे आणि संकेतशब्द यासह, आपल्या ईमेल डेटाबेसवर प्रवेश करण्यासाठी अॅप ला अनुमती देते."</string>
-    <string name="app_name" msgid="5815426892327290362">"ईमेल"</string>
-    <string name="debug_title" msgid="5175710493691536719">"डीबग करा"</string>
-    <string name="next_action" msgid="3931301986364184415">"पुढील"</string>
-    <string name="previous_action" msgid="5181616311579820981">"मागील"</string>
-    <string name="done_action" msgid="7497990549515580249">"पूर्ण झाले"</string>
-    <string name="create_action" msgid="3062715563215392251">"नवीन तयार करा"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"द्रुत प्रतिसाद नाहीत."</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"खाते सेटिंग्ज"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"संकालन पर्याय"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"कनेक्शन समस्या."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"संदेश हलवा"</item>
-    <item quantity="other" msgid="371256717624461324">"संदेश हलवा"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"हलविणे POP3 खात्यांवर समर्थित नाही."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"निवडीमध्ये एकाधिक खाती असल्यामुळे हलवू शकत नाही."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"मसुदे, आउटबॉक्स आणि प्रेषित मधील संदेश हलविले जाऊ शकत नाहीत."</string>
-    <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="mailbox_name_display_starred" msgid="7788694947644186069">"तारांकित"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"न वाचलेले"</string>
-    <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="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"संयुक्त दृश्य"</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>\nCC: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"द्रुत प्रतिसाद घाला"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"द्रुत प्रतिसाद घाला"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"आपल्या अग्रेषित केलेल्या संदेशांमधील एक किंवा दोन संलग्नके पाठविण्याच्या अगोदर डाउनलोड केले जातील."</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"संलग्नक डाउनलोड करू शकलो नाही."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"संदेश डीकोड करताना एक त्रुटी आली."</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"एक किंवा अधिक संलग्नके अग्रेषित करू शकलो नाही."</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"संलग्नक अग्रेषित केले नाही"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> साइन इन अयशस्वी."</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"साइन इन करू शकलो नाही"</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>
-  </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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"खाते सेटअप"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"प्राधिकृततेसाठी विनंती करत आहे"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"साइन इन करा"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"प्रमाणीकृत करण्यात अक्षम"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"ईमेल पत्ता किंवा संकेतशब्द चुकीचे आहेत"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"ईमेल पत्ता:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"ईमेल खाते"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"आपण फक्त थोड्या चरणांमध्ये आपले खाते सेट करू शकता."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ईमेल पत्ता"</string>
-    <string name="or_label" msgid="2207403489755254427">"किंवा"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Google सह साइन इन करा"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"संकेतशब्द"</string>
-    <string name="password_hint" msgid="8835390747504721561">"संकेतशब्द"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s सह साइन इन केले"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"प्रमाणीकरण"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"प्रमाणीकरण जोडा"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"प्रमाणीकरण साफ करा"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"व्यक्तिचलित सेटअप"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"एक वैध ईमेल पत्ता आणि संकेतशब्द टाइप करा."</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"डुप्लिकेट खाते"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"आपण \"<xliff:g id="DUPLICATE">%s</xliff:g>\" खात्यासाठी हे वापरकर्तानाव आधीपासूनच वापरत आहात."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"हा संकेतशब्द एक किंवा अधिक अवकाश वर्णांसह प्रारंभ होतो किंवा समाप्त होतो. अनेक सर्व्हर अवकाश असलेल्या संकेतशब्दांना समर्थन देत नाहीत."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"खाते माहिती पुनर्प्राप्त करत आहे…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"सर्व्हर सेटिंग्जचे प्रमाणीकरण करत आहे…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"smtp सेटिंग्ज प्रमाणित करत आहे…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"खाते तयार करत आहे…"</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"खाते प्रकाराची पुष्टी करा"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"आपण <xliff:g id="EMAIL">%1$s</xliff:g> <xliff:g id="USERPROTOCOL">%2$s</xliff:g> वापरत असल्याचे दर्शविले, परंतु खाते <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> वापरू शकते"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"खाते सेटअप"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"आपले खाते सेट झाले आहे आणि ईमेल त्याच्या मार्गावर आहे!"</string>
-    <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_names_user_name_empty_error" msgid="6791427018325367364">"हे फील्ड रिक्त असू शकत नाही."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"खाते सेटअप"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"खाते प्रकार"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"हे खाते कोणत्या प्रकारचे आहे?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"खाते सेटअप"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"येणार्‍या सर्व्हर सेटिंग्ज"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"वापरकर्तानाव"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"संकेतशब्द"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"संकेतशब्द"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"सर्व्हर"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"पोर्ट"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"सुरक्षितता प्रकार"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"काहीही नाही"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (सर्व प्रमाणपत्रे स्वीकारा)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (सर्व प्रमाणपत्रे स्वीकारा)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</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>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"खाते सेटअप"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"जाणार्‍या सर्व्हर सेटिंग्ज"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP सर्व्हर"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"पोर्ट"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"सुरक्षितता प्रकार"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"साइन इन आवश्यक"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"वापरकर्तानाव"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"संकेतशब्द"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"क्लायंट प्रमाणपत्र"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"निवडा"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"क्लायंट प्रमाणपत्र वापरा"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"काढा"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"काहीही नाही"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"मोबाईल डिव्हाइस ID"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"खाते सेटिंग्ज"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"खाते पर्याय"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"वारंवारता संकालित करा:"</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_notify_label" msgid="7046146571560728829">"ईमेल येते तेव्हा मला सूचित करा"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"या खात्यातून संपर्क संकालित करा"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"या खात्यातून कॅलेंडर संकालित करा"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"या खात्यावरून ईमेल संकालित करा"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fi शी कनेक्ट करता तेव्हा संलग्नके स्वयंचलितपणे डाउनलोड करा"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"समाप्त करू शकलो नाही"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"येथील ईमेल संकालित करा:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"स्वयंचलित"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"अंतिम दिवस"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"अंतिम तीन दिवस"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"गेला आठवडा"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"गेले दोन आठवडे"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"अंतिम महिना"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"सर्व"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"खाते डीफॉल्ट वापरा"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"वापरकर्तानाव किंवा संकेतशब्द चुकीचा आहे."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"लॉग इन अयशस्वी. \n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"खाते सेटअप सह समस्या"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"वापरकर्तानाव, संकेतशब्द आणि खाते सेटिंग्ज योग्य असल्याची पुष्टी करा."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"सर्व्हरशी सुरक्षितपणे कनेक्ट करू शकत नाही."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"सर्व्हरशी सुरक्षितपणे कनेक्ट करू शकत नाही. \n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"क्लायंट प्रमाणपत्र आवश्यक आहे. आपण क्लायंट प्रमाणपत्रासह सर्व्हरशी कनेक्ट करू इच्छिता?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"प्रमाणपत्र अवैध किंवा प्रवेश न करण्यायोग्य आहे."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"सर्व्हरने त्रुटीसह प्रतिसाद दिला. आपले वापरकर्तानाव आणि संकेतशब्द तपासा, नंतर पुन्हा प्रयत्न करा."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"सर्व्‍हरशी कनेक्‍ट करू शकत नाही."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"सर्व्हरशी कनेक्ट करू शकत नाही.\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="6799839150250217566">"प्रमाणीकरण पद्धती सर्व्हरद्वारे समर्थित नाहीत."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"सुरक्षितता त्रुटीमुळे सर्व्हरवर कनेक्शन उघडू शकलो नाही."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"सर्व्हरवरील कनेक्शन उघडू शकलो नाही."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"आपण चुकीचा सर्व्हर पत्ता टाईप केला आहे किंवा सर्व्हरला ईमेल समर्थन करत नसलेली प्रोटोकॉल आवृत्ती आवश्यक आहे."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"आपल्याला या सर्व्हरसह संकालन करण्याची परवानगी नाही. अधिक माहितीसाठी आपल्या सर्व्हरच्या प्रशासकाशी संपर्क साधा."</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"दूरस्थ सुरक्षितता प्रशासन"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"<xliff:g id="SERVER">%s</xliff:g> सर्व्हरला आपण त्यास आपल्या Android डिव्हाइसची काही वैशिष्ट्ये दूरस्थपणे नियंत्रित करू देण्याची आवश्यकता आहे. आपण हे खाते सेट करणे समाप्त करू इच्छिता?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"या सर्व्हरला आपला Android डिव्हाइस समर्थन करत नसलेल्या सुरक्षितता वैशिष्ट्यांची आवश्यकता आहे, यासह: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"आपण खात्याचे वापरकर्तानाव बदलू शकत नाही. भिन्न वापरकर्तानावाने खाते जोडण्यासाठी, खाते जोडा स्पर्श करा."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"चेतावणी: आपले डिव्हाइस चालविण्यासाठी ईमेल अॅपचे अधिकार निष्क्रिय केल्याने, ज्या खात्यांना त्याची आवश्यकता आहे ती सर्व खाती त्यांचे ईमेल, संपर्क, कॅलेंडर इव्हेंट आणि अन्य डेटा यासह हटवली जातील."</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"सुरक्षितता अद्यतन"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> ला आपण आपल्या सुरक्षितता सेटिंग्ज अद्यतनित करणे आवश्यक आहे."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"सुरक्षितता आवश्यकतांमुळे \"<xliff:g id="ACCOUNT">%s</xliff:g>\" खाते संकालित केले जाऊ शकत नाही."</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" खात्यास सुरक्षितता सेटिंग्ज अद्यतन आवश्यक असते."</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" खात्याने त्याच्या सुरक्षितता सेटिंग्ज बदलल्या; वापरकर्ता क्रिया आवश्यक नाही."</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"सुरक्षितता अद्यतन आवश्यक"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"सुरक्षितता धोरणे बदलली आहेत"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"सुरक्षितता धोरणांची पूर्तता केली जाऊ शकत नाही"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"डिव्हाइस सुरक्षितता"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g> सर्व्हरला आपण त्यास आपल्या Android डिव्हाइसची काही सुरक्षितता वैशिष्ट्ये दूरस्थपणे नियंत्रित करण्यास अनुमती देण्याची आवश्यकता आहे."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"तपशील संपादित करा"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ला आपण आपला लॉक स्क्रीन पिन किंवा संकेतशब्द बदलण्याची आवश्यकता आहे."</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"लॉक स्क्रीन संकेतशब्द कालबाह्य होत आहे"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"आपला लॉक स्क्रीन पिन किंवा संकेतशब्द कालबाह्य झाला आहे."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"स्क्रीन लॉक संकेतशब्द कालबाह्य"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"लॉक स्क्रीन संकेतशब्द कालबाह्य होत आहे"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"आपल्याला लवकरच आपला लॉक स्क्रीन पिन किंवा संकेतशब्द बदलण्याची आवश्यकता आहे किंवा <xliff:g id="ACCOUNT">%s</xliff:g> साठीचा डेटा हटविला जाईल. आपण आता तो बदलू इच्छिता?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"स्क्रीन लॉक संकेतशब्द कालबाह्य"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g> साठीचा डेटा आपल्या डिव्हाइसवरून हटविला जात आहे. आपण आपला लॉक स्क्रीन पिन किंवा संकेतशब्द बदलून तो पुनर्संचयित करू शकता. आपण आता तो बदलू इच्छिता?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"जतन न केलेले बदल टाकून द्यायचे?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"साइन इन करू शकलो नाही"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> साठीचे वापरकर्तानाव किंवा संकेतशब्द चुकीचे आहे. आपण ते आता अद्यतनित करू इच्छिता?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"आपले <xliff:g id="ACCOUNT">%s</xliff:g> वरील लॉग इन अयशस्वी झाले; सर्व्हर हे म्हणाला: <xliff:g id="REASON">%s</xliff:g> आपण आपले वापरकर्तानाव आणि/किंवा संकेतशब्द अद्यतनित करू इच्छिता?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"संलग्नके डाउनलोड करा"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Wi-Fi द्वारे अलीकडील संदेशांवर संलग्नके स्वयं-डाउनलोड करा"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"ईमेल सूचना"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"संकालन वारंवारता, सूचना इ."</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"ईमेल येते तेव्हा सूचना पाठवा"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"संकालन वारंवारता"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"येणार्‍या सेटिंग्ज"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"वापरकर्तानाव, संकेतशब्द आणि अन्य येणार्‍या सर्व्हर सेटिंग्ज"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"जाणार्‍या सेटिंग्ज"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"वापरकर्तानाव, संकेतशब्द आणि अन्य जाणार्‍या सर्व्हर सेटिंग्ज"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"धोरणांची अंमलबजावणी केली"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"काहीही नाही"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"असमर्थित धोरणे"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"काहीही नाही"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"संकालनाचा प्रयत्न करा"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"हे खाते संकालित करण्यासाठी येथे स्पर्श करा"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"खाते नाव"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"आपले नाव"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"द्रुत प्रतिसाद"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"ईमेल तयार करताना आपण वारंवार घालता तो मजकूर संपादित करा"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"सूचना सेटिंग्ज"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"डेटा वापर"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"सुरक्षितता धोरणे"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"सिस्टीम फोल्डर"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"कचरा फोल्डर"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"आपल्या सर्व्हरचे कचरा फोल्डर निवडा"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"आपल्या सर्व्हरचे कचरा फोल्डर निवडा"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"प्रेषित आयटम फोल्डर"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"आपल्या सर्व्हरचे पाठविलेले आयटम फोल्डर निवडा"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"आपल्या सर्व्हरचे प्रेषित आयटम फोल्डर निवडा"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"द्रुत प्रतिसाद"</string>
-    <string name="save_action" msgid="1988862706623227093">"जतन करा"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"संपर्क संकालित करा"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"या खात्यासाठी संपर्क संकालित करा"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"कॅलेंडर संकालित करा"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"या खात्यासाठी कॅलेंडर इव्हेंट संकालित करा"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"संकालन ईमेल"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"या खात्यासाठी ईमेल संकालित करा"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"कंपन होणे"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"रिंगटोन निवडा"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"सर्व्हर सेटिंग्ज"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"संकालन पर्याय"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"संकालन पर्याय (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"हे फोल्डर संकालित करा"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"कनेक्ट केलेले असते तेव्हा संदेश डाउनलोड होतील"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"संकालन करण्यासाठी मेलचे दिवस"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"प्रेषक प्रतिमा"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"केवळ काही \"प्लस\" खाती या प्रोग्रामला कनेक्ट होण्यास अनुमती देऊन POP प्रवेश समाविष्ट करतात. आपण आपल्या योग्य ईमेल पत्त्यासह आणि संकेतशब्दासह साइन इन करण्यात सक्षम होत नसल्यास, आपल्याकडे सशुल्क \"प्लस\" खाते नसू शकते. ह्या ईमेल खात्यांवर प्रवेश मिळवण्यासाठी वेब ब्राउझर लाँच करा."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"हे ईमेल खाते सेट करण्यापूर्वी, T-ऑनलाइन वेबसाइटला भेट द्या आणि POP3 ईमेल प्रवेशाकरिता एक संकेतशब्द तयार करा."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"कॉर्पोरेट"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"खाते तयार करू शकलो नाही. पुन्हा प्रयत्न करा."</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"ईमेल"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"सर्व्हर-निर्दिष्ट सुरक्षितता धोरणे सक्षम करते"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"सेटिंग्ज"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"सामान्य सेटिंग्ज"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"हटविण्यापूर्वी पुष्टी करा"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"पाठविण्यापूर्वी पुष्टी करा"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"ईमेल शोधा"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"डिव्हाइसचा कॅमेरा वापरण्याची अनुमती रद्द करा"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"डिव्हाइस संकेतशब्द आवश्यक"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"अलीकडील संकेतशब्द पुनर्वापरासाठी प्रतिबंधित करा"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"संकेतशब्द कालबाह्य होणे आवश्यक"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"त्याची स्क्रीन लॉक करण्यासाठी निष्क्रिय डिव्हाइस आवश्यक"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"संकालित केलेल्या कॅलेंडर इव्हेंटची संख्या मर्यादित करा"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"संकालित केलेल्या ईमेलची संख्या मर्यादित करा"</string>
-    <string name="quick_1" msgid="3426057697353380951">"धन्यवाद!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"मला छान वाटतंय!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"मी हे नंतर वाचेन आणि परत आपल्याशी संपर्क साधेन."</string>
-    <string name="quick_4" msgid="3988974084396883051">"याची चर्चा करण्यासाठी एक संमेलन सेट करू या."</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"रोमिंगमध्ये असताना या खात्यासाठीचे पार्श्वभूमी संकालन अक्षम केले आहे."</string>
-    <string name="confirm_response" msgid="9151965975158906286">"प्रतिसाद पाठवित आहे…"</string>
-    <string name="no_conversations" msgid="5559527390337162819">"कोणतेही संदेश नाहीत."</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"फोल्डर निवडक"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> साठी सर्व्हर कचरा फोल्डर निवडा"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g> साठी सर्व्हरने पाठविलेले आयटम फोल्डर निवडा"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"फोल्डर सूची लोड करत आहे..."</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"काहीही उपलब्ध नाही"</string>
-</resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
deleted file mode 100644
index 023c5f9..0000000
--- a/res/values-my-rMM/strings.xml
+++ /dev/null
@@ -1,299 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"အီးမေးလ် ပူးတွဲမှုများကို ဖတ်"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"အက်ပ်ကို သင့် အီးမေးလ် ပူးတွဲမှုများကို ဖတ်ရှုခွင့် ပြုသည်။"</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"အီးမေးလ် စီမံပေးသူ ဒေတာကို ရယူပါ"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"အက်ပ်ကို သင့်အီးမေးလ် ဒေတာဘေ့စ်ကို၊ ရရှိပြီး စာများ၊ ပို့ပြီး စာများ၊ သုံးစွဲသူ အမည်များ နှင့် စကားဝှက်များ အပါအ၀င်ကို အသုံးချခွင့် ပြုသည်။"</string>
-    <string name="app_name" msgid="5815426892327290362">"အီးမေးလ်"</string>
-    <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
-    <string name="next_action" msgid="3931301986364184415">"နောက်တစ်ခု"</string>
-    <string name="previous_action" msgid="5181616311579820981">"ယခင်"</string>
-    <string name="done_action" msgid="7497990549515580249">"လုပ်ပြီး"</string>
-    <string name="create_action" msgid="3062715563215392251">"အသစ် ဖန်တီး"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"အမြန် တုံ့ပြန်မှုများ မရှိ"</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"အကောင့် ဆက်တင်များ"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"စင့်က် အတွက် ရွေးစရာများ"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"ချိတ်ဆက်မှု ပြဿနာ။"</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"စာကို ရွှေ့"</item>
-    <item quantity="other" msgid="371256717624461324">"စာများကို ရွှေ့"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 အကောင့်များ ထဲတွင် ရွှေ့မှုကို ပံ့ပိုးမပေးပါ။"</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"ရွေးထားမှု ထဲတွင် အကောင့် အများ ပါနေ၍ မရွှေ့ပြောင်း နိုင်ပါ။"</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"စာကြမ်းများ၊ ထွက်စာ နှင့် ပို့ပြီးစာ အထဲက စာများကို ရွှေ့ မရနိုင်။"</string>
-    <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="mailbox_name_display_starred" msgid="7788694947644186069">"စတားပါ"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"မဖတ်ရသေး"</string>
-    <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="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"ပေါင်းစပ် မြင်ကွင်း"</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>\nCC: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"အမြန် တုံ့ပြန်ချက်ကို ထည့်သွင်း"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"အမြန် တုံ့ပြန်ချက်ကို ထည့်သွင်း"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"မပို့မီ သင်၏ ထပ်ဆင့်ပို့စာ ထဲက နောက် ပူးတွဲမှု တစ်ခု သို့မဟုတ် ပိုများသည်ကို ဒေါင်းလုဒ် လုပ်မည်။"</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"ပူးတွဲဖိုင်ကို ဒေါင်းလုဒ် မလုပ်နိုင်ခဲ့ပါ။"</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"စာကို ကုဒ်ဖွင့်နေစဉ် အမှားရှိခဲ့သည်။"</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"ပူးတွဲမှု တစ်ခု သို့မဟုတ် ပိုပြီး ထပ်ဆင့် မပို့နိုင်ခဲ့ပါ။"</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"ပူးတွဲမှုကို ထပ်ဆင့် မပို့ခဲ့"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> လက်မှတ်ထိုး၀င်မှု မအောင်မြင်"</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"လက်မှတ်ထိုး မ၀င်နိုင်ခဲ့"</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>
-  </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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"အကောင့် စသတ်မှတ်မှု"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"ခွင့်ပြုချက် တောင်းဆိုနေ"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"လက်မှတ်ထိုး ၀င်ပါ"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"အထောက်အထား မစိစစ်နိုင်"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"အီးမေးလ်လိပ်စာ သို့မဟုတ် စကားဝှက် မမှန်ပါ"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"အီးမေးလ် လိပ်စာ:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"အီးမေးလ် အကောင့်"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"သင်သည် သင်၏ အကောင့်ကို အဆင့်အနည်းငယ်မျှဖြင့် စသတ်မှတ်နိုင်သည်။"</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"အီးမေးလ် လိပ်စာ"</string>
-    <string name="or_label" msgid="2207403489755254427">"သို့မဟုတ်"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Google ဖြင့် လက်မှတ် ထိုးဝင်ပါ"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"စကားဝှက်"</string>
-    <string name="password_hint" msgid="8835390747504721561">"စကားဝှက်"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s ဖြင့် လက်မှတ်ထိုး ၀င်ခဲ့"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"အထောက်အထားစိစစ်မှု"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"အထောက်အထား စိစစ်မှုကို ထည့်ပါ"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"အထောက်အထားစိစစ်မှုကို ရှင်း"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"လက်ဖြင့် စသတ်မှတ်"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"မှန်သော အီးမေးလ် လိပ်စာ နှင့် စကားဝှက်ကို ရိုက်ထည့်ပါ။"</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"အကောင့်ကို ပွားယူပါ။"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"သင်သည် \"<xliff:g id="DUPLICATE">%s</xliff:g>\" အကောင့်အတွက် ဤ သုံးစွဲသူအမည်ကို အသုံးပြုနေပြီ ဖြစ်သည်။"</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"ဤစကားဝှက်ထဲ ကွက်လပ် သင်္ကေတ တစ်ခု သို့မဟုတ် ပိုများပြီး စထား သို့မဟုတ် ဆုံးထားသည်။ ဆာဗာ အများက ကွက်လပ်ပါ စကားဝှက်များကို ပံ့ပိုးမပေးပါ။"</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"အကောင့် အချက်အလက်များကို ထုတ်ယူနေသည်…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"ဆာဗာ ဆက်တင်များ၏ မှန်ကန်မှုကို စိစစ်နေ…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"smtp ဆက်တင်များကို စိစစ်နေ…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"အကောင့် ဖန်တီးနေ…"</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"အကောင့် ပုံစံကို အတည်ပြု"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"သင်သည် <xliff:g id="EMAIL">%1$s</xliff:g> က <xliff:g id="USERPROTOCOL">%2$s</xliff:g> ကို သုံးသည့်ဟု ညွှန်ပြခဲ့သည်၊ သို့သော် အကောင့်သည် <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>ကို သုံးနိုင်သည်"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"အကောင့် စသတ်မှတ်မှု"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"သင့်အကောင့်ကို စသတ်မှတ်မှု ပြီးသွားလို့ အီးမေးလ် လာနေပြီ!"</string>
-    <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_names_user_name_empty_error" msgid="6791427018325367364">"ဤကွင်းမှာ ပလာ မဖြစ်နိုင်ပါ။"</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"အကောင့် စသတ်မှတ်မှု"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"အကောင့် ပုံစံ"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"ဒါက ဘယ်လို အကောင့် အမျိုးအစားလဲ။"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"အကောင့် စသတ်မှတ်မှု"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"အဝင် ဆာဗာ ဆက်တင်များ"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"သုံးစွဲသူအမည်"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"စကားဝှက်"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"စကားဝှက်"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"ဆာဗာ"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"ပို့တ်"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"လုံခြုံမှု ပုံစံ"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"မရှိ"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (လက်မှတ်များ အားလုံး လက်ခံ)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (လက်မှတ်များ အားလုံးကို လက်ခံပါ)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</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>
-    <!-- unknown quoting pattern: original -1, translation 1 -->
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"&amp;lt;စိတ်ကြိုက်&amp;gt;"</string>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"အကောင့် စဖွင့်မှု"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"အထွက် ဆာဗာ ဆက်တင်များ"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP ဆာဗာ"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"ပို့တ်"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"လုံခြုံမှု ပုံစံ"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"လက်မှတ်ထိုး၀င်ရန် လိုအပ်"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"သုံးစွဲသူအမည်"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"စကားဝှက်"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"ဖောက်သည် လက်မှတ်"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"ရွေးပါ"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"ဖောက်သည် လက်မှတ်ကို အသုံးပြုပါ"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"ဖယ်ရှားပါ"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"မရှိ"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"မိုဘိုင်း ကိရိယာ ID"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"အကောင့် ဆက်တင်များ"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"အကောင့်ဆိုင်ရာ ရွေးစရာများ"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"စင့်က် ကြိမ်နှုန်း:"</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">"၅ မိနစ် တိုင်း"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"၁၀ မိနစ်တိုင်း"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"၁၅ မိနစ်တိုင်း"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"၃၀ မိနစ်တိုင်း"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"နာရီ တိုင်း"</string>
-    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"အီးမေးလ် ရောက်လျှင် ကျွန်ုပ်ကို အသိပေးပါ"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"ဤအကောင့်မှ အဆက်အသွယ်များကို စင့်က်လုပ်ပါ။"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"ပြက္ခဒိန်ကို ဤအကောင့်မှ စင့်က် လုပ်ပါ။"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"ဤ အကောင့်မှ အီးမေးလ်ကို စင့်က် လုပ်ပါ"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"ကြိုးမဲ့သို့ ချိတ်ဆက်သောအခါ ပူးတွဲမှုများကို အလိုအလျောက် ဒေါင်းလုဒ် လုပ်"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"မပြီးဆုံးနိုင်ခဲ့ပါ"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"...ထံမှ  အီးမေးလ်ကို စင့်က် လုပ်"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"အလိုအလျောက်"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"နောက်ဆုံးနေ့"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"လွန်ခဲ့သော သုံးရက်"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"ပြီးခဲ့သော အပတ်"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"လွန်ခဲ့သော နှစ်ပတ်"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"ပြီးခဲ့သော လ"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"အားလုံး"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"ပုံသေ အကောင့်ကို သုံး"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"သုံးစွဲသူအမည် သို့မဟုတ် စကားဝှက်က မမှန်ပါ။"</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"လော့ဂင် မအောင်မြင်ပါ။ \n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"အကောင့် စသတ်မှတ်မှုထဲ ပြဿနာရှိနေ"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"သုံးစွဲသူအမည်၊ စကားဝှက် နှင့် အကောင့် ဆက်တင်များ မှန်ကန်ကြောင်း အတည်ပြုပါ။"</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"ဆာဗာသို့ လုံခြုံစွာ မချိတ်ဆက်နိုင်ပါ။"</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"ဆာဗာသို့ လုံခြုံစွာ မချိတ်ဆက်နိုင်ပါ။  \n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"ဖောက်သည် လက်မှတ် တစ်ခု လိုအပ်သည်။ သင်သည် ဖောက်သည် လက်မှတ်ဖြင့် ဆာဗာနှင့် ချိတ်ဆက် လိုပါသလား?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"လက်မှတ် တရားမ၀င် သို့မဟုတ် လက်လှမ်းမမှီပါ။"</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"ဆာဗာက အမှားတစ်ခုဖြင့် တုံ့ပြန်ခဲ့သည်။ သင့် သုံးစွဲသူအမည် နှင့် စကားဝှက်ကို စစ်ဆေးပြီး နောက်မှာ ထပ်ကြိုးစားပါ။"</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"ဆာဗာသို့ မချိတ်ဆက်နိုင်ပါ။"</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"ဆာဗာနှင့် မချိတ်ဆက်နိုင်ပါ။ \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="6799839150250217566">"အထောက်အထား စိစစ်မှုကို ဆာဗာမှ မပံ့ပိုးပါ။"</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"လုံခြုံရေး အမှားကြောင့် ဆာဗာသို့ ချိတ်ဆက်မှုကို မဖွင့်နိုင်ခဲ့ပါ။"</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"ဆာဗာသို့ ချိတ်ဆက်မှုကို မဖွင့်နိုင်ခဲ့ပါ။"</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"သင်က မမှန်သည့် ဆာဗာ လိပ်စာ ရိုက်သွင်းခဲ့သည် သို့မဟုတ် ဆာဗာက လိုအပ်နေသည့်  ပရိုတိုကော ဗားရှင်းကို  အီးမေးလ်မှ ပံ့ပိုးမပေးပါ။"</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"ဤဆာဗာနှင့် စင့်က်လုပ်ရန် ခွင့်ပြုချက် သင့်ထံတွင် မရှိပါ။ ပိုပြီး သိရှိရန် သင့်ဆာဗာ၏ အုပ်ချုပ်ရေးမှူးကို ဆက်သွယ်ပါ။"</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"အဝေးမှ လုံခြုံရေး အုပ်ချုပ်မှု"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"ဆာဗာ<xliff:g id="SERVER">%s</xliff:g> က သင့် အန်ဒရွိုက် ကိရိယာ၏ အချို့သော လုံခြုံရေး အင်္ဂါရပ်များကို ပြင်ပမှ ထိန်းချုပ်မှာကို သင့် အနေနှင့် ခွင့်ပြုရန် လိုအပ်သည်။ ဤအကောင့် ဆက်တင်ကို ပြီးအောင် သင် လုပ်လိုပါသလား?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"ဤ ဆာဗာက သင့် အန်ဒရွိုက်ကိရိယာမှ ပံ့ပိုးမပေးသည့် <xliff:g id="ERROR">%s</xliff:g> အပါအဝင် လုံခြုံရေး အင်္ဂါရပ်များ လိုအပ်သည်။"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"အကောင့်၏ သုံးစွဲသူအမည်ကို သင် မပြောင်းနိုင်ပါ။ မတူသည့် သုံးစွဲသူအမည်ဖြင့် အကောင့်တစ်ခု ထည့်လိုပါက အကောင့်ထည့်ကို ထိပါ။"</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"သတိပေးချက်: အီးမေးလ် အက်ပ်၏ သင့်ကိရိယာကို အုပ်ချုပ်မှု လုပ်ပိုင်ခွင့်ကို ပြန်လည် စဖွင့်ပေးခြင်းဖြင့် ၄င်းအတွက် လိုအပ်သည့် အီးမေးလ် အကောင့်အားလုံးကို၊ ယင်းတိုထဲက အီးမေးလ်၊ အဆက်အသွယ်များ၊ ပြက္ခဒိန် ဖြစ်ရပ်များ နှင့် အခြားဒေတာများကိုပါ ဖျက်ပစ်မည်။"</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"လုံခြုံရေး မွမ်းမံခြင်း"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> က သင်၏လုံခြုံရေး ဆက်တင်များကို မွမ်းမံရန် လိုအပ်သည်။"</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"လုံခြုံရေးလိုအပ်ချက်များကြောင့် အကောင့် \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ကို စင့်က် လုပ် ရနိုင်။"</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"အကောင့် \"<xliff:g id="ACCOUNT">%s</xliff:g>\" အတွက် လုံခြုံရေး ဆက်တင်များကို မွမ်းမံပေးရန် လိုအပ်သည်။"</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"အကောင့် \"<xliff:g id="ACCOUNT">%s</xliff:g>\" သည် ၎င်း၏ လုံခြုံရေး ဆက်တင်များကို ပြောင်းခဲ့သည်၊ သုံးစွဲသူဖက်မှ ဘာမှ လုပ်ရန် မလိုအပ်ပါ။"</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"လုံခြုံရေး မွမ်းမံရန် လိုအပ်ခဲ့"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"လုံခြုံရေး မူဝါဒများ ပြောင်းလဲသွားပြီ။"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"လုံခြုံရေး မူဝါဒများကို မပြည့်မီနိုင်ပါ"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"ကိရိယာ လုံခြုံရေး"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"ဆာဗာ <xliff:g id="SERVER">%s</xliff:g> ကို သင့်အန်ဒရွိုက် ကိရိယာ၏ လုံခြုံရေး အင်္ဂါရပ် အချို့ကို အဝေးမှ ထိန်းချုပ်ခွင့် ပြုရန် လိုအပ်သည်။"</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"အသေးစိတ်များကို တည်းဖြတ်"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" က သင်၏ မျက်နှာပြင် သော့ချမှု PIN သို့မဟုတ် စကားဝှက်ကို ပြောင်းလဲရန် လိုအပ်သည်။"</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"သော့ချ စကားဝှက် ကုန်ဆုံးမည့်"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"သင်၏ မျက်နှာပြင် သော့ချမှု PIN သို့မဟုတ် စကားဝှက် သက်တမ်း ကုန်သွားပြီ။"</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"မျက်နှာပြင် သော့ချမှု စကားဝှက် သက်တမ်း ကုန်သွားပြီ"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"မျက်နှာပြင် သော့ချ စကားဝှက် ကုန်ဆုံးမည့်"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"သင်သည် သင်၏ မျက်နှာပြင် သော့ချမှု PIN သို့မဟုတ် စကားှဝှက်ကို မကြာမီ ပြောင်းရန် လိုသည်၊  သို့မဟုတ်ပါက <xliff:g id="ACCOUNT">%s</xliff:g> အတွက် ဒေတာ ဖျက်ခံရမည်။ ယခု ၎င်းကို ပြောင်းမလား?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"မျက်နှာပြင် သော့ စကားဝှက် သက်တမ်း ကုန်"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g> အတွက် ဒေတာကို သင့်ကိရိယာထဲမှ ဖျက်နေသည်။ သင်သည် သင်၏ မျက်နှာပြင် သော့ချမှု PIN သို့မဟုတ် စကားဝှက်ကို ပြောင်းလဲခြင်းဖြင့် ၎င်းကို ပြန်ဖေါ်ထုတ်နိုင်သည်။ သင်သည် ၎င်းကို ယခု ပြောင်းလဲ လိုပါသလား?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"မသိမ်းဆည်းခဲ့သည့် အပြောင်းအလဲများကို စွန့်ပစ်မလား?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"လက်မှတ်ထိုး မ၀င်နိုင်ခဲ့ပါ"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> အတွက် သုံးစွဲသူအမည် သို့မဟုတ် စကားဝှက်မှာ မမှန်ပါ။ ယင်းတို့ကို သင် ယခု မွမ်းမံ လိုသလား?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"<xliff:g id="ACCOUNT">%s</xliff:g> သို့ သင်၏ လော့ဂင် မအောင်မြင်ပါ၊  ဆာဗာက <xliff:g id="REASON">%s</xliff:g> ကြောင့် ပြောသည်။ သင့် သုံးစွဲသူအမည် နှင့်/သို့မဟုတ် စကားဝှက် ကို သင် မွမ်းမံလိုပါသလား?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"ပူးတွဲမှုများ  ဒေါင်းလုဒ် လုပ်"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"မကြာမီ စာများ၏ ပူးတွဲမှုများကို ကြိုးမဲ့မှ အော်တိုဒေါင်းလုဒ်"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"အီးမေးလ် အကြောင်းကြားချက်များ"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"စင့်က် ကြိမ်နှုန်း၊ အကြောင်းကြားချက်များ၊ စသဖြင့်။"</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"အီးမေးလ် ရောက်ရှိလျှင် အကြောင်းကြားချက် ပို့"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"စင့်က် ကြိမ်နှုန်း"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"ဝင်စာ ဆက်တင်များ"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"သုံးစွဲသူအမည်၊ စကားဝှက်၊ နှင့် အခြား ၀င်စာ ဆာဗာ ဆက်တင်များ"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"ထွက်စာ ဆက်တင်များ"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"သုံးစွဲသူအမည်၊ စကားဝှက်၊ နှင့် အခြား ထွက်စာ ဆာဗာ ဆက်တင်များ"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"မူဝါဒများ ပြဌာန်းထား"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"မရှိပါ"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"ပံ့ပိုးမပေးသည့် မူဝါဒများ"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"မရှိ"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"စင့်က် လုပ်ရန် ကြိုးပမ်းမှု"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"ဤ အကောင့်ကို စင့်က်လုပ်ရန် ဒီမှာ ထိပါ"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"အကောင့် အမည်"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"သင်၏ အမည်"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"အမြန် တုံ့ပြန်ချက်များ"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"အီးမေးလ် ရေးရာမှာ သင် မကြာခဏ ထည့်သွင်းသော စာသားကို တည်းဖြတ်"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"အကြောင်းကြားချက် ဆက်တင်များ"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"ဒေတာ သုံးစွဲမှု"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"လုံခြုံရေး မူဝါဒများ"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"စနစ် ဖိုလ်ဒါများ"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"အမှိုက် ဖိုလ်ဒါ"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"သင့်ဆာဗာ၏ အမှိုက် ဖိုလ်ဒါကို ရွေး"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"သင့် ဆာဗာ၏ အမှိုက် ဖိုလ်ဒါကို ရွေးချယ်"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"ပို့ပြီး အရာများ ဖိုလ်ဒါ"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"သင့်ဆာဗာ၏ ပို့ပြီး အရာများ ဖိုလ်ဒါကို ရွေး"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"သင့်ဆာဗာ၏ ပို့ပြီး အရာများ ဖိုလ်ဒါကို ရွေးချယ်"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"အမြန် တုံ့ပြန်ချက်"</string>
-    <string name="save_action" msgid="1988862706623227093">"သိမ်းဆည်း"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"ဆက်သွယ်များ စင့်က်"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"ဤအကောင့် အဆက်အသွယ်များ စင့်က်လုပ်"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"ပြက္ခဒိန် စင့်က်လုပ်"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"ဤ အကောင့်အတွက် ပြက္ခဒိန် ဖြစ်ရပ်ကို စင့်က်လုပ်"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"အီးမေးလ် စင့်က်လုပ်"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"ဤအကောင့် အီးမေးလ်ကို စင့်က်လုပ်"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"တုန်ခါ"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"ဖုန်းမြည် သံစဉ်ကို ရွေးချယ်ပါ"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"ဆာဗာ ဆက်တင်များ"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"စင့်က် ရွေးစရာများ"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"စင့်က် ရွေးစရာများ (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"ဤ ဖိုလ်ဒါကို စင့်က် လုပ်ပါ"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"ချိတိ်ဆက်ချိန်မှာ စာများကို ဒေါင်းလုဒ် လုပ်မည်။"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"နေ့ကြာ စာကို စင့်က် လုပ်ရန်"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"ပို့သူ ပုံ"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"\"Plus\" အကောင့် အချို့များထဲမှာသာ ဤပရိုဂရမ်ကို ချိတ်ဆက်ခွင့်ပြုသည့် POP ဝင်ပေါက် ပါရှိသည်။ သင်သည် မှန်ကန်သည့် အီးမေးလ် လိပ်စာ နှင့် စကားဝှက်ဖြင့် လက်မှတ်ထိုးဝင် မရဖြစ်နေလျှင်၊ သင့်ဆီမှာ ငွေပေးချေပြီး \"Plus\" မရှိ၍ ဖြစ်နိုင်သည်။ ယင်း အီးမေးလ် အကောင့်များသို့ ဝင်နိုင်ရန် ၀က်ဘ်ဘရောင်ဇာကို ဖွင့်ပေးလိုက်ပါ။"</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"ယခု အီးမေးလ် အကောင့်ကို စမသတ်မှတ်မီ T-အွန်လိုင်း ၀က်ဘ် ဆိုဒ်ကို ဝင်ကာ POP3 အီးမေးလ် ကြည့်ရန် စကားဝှက်ကို ဖန်တီးပါ။"</string>
-    <string name="exchange_name" msgid="1190783774800310346">"ကုမ္ပဏီဆိုင်ရာ"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"အကောင့်ကို မဖန်တီးနိုင်ခဲ့ပါ။ ထပ်စမ်းပါ။"</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"အီးမေးလ်"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"ဆာဗာ ဖက်မှ သတ်မှတ်ခဲ့သည့် လုံခြုံရေး မူဝါဒများကို ဖွင့်ပေးသည်"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"ဆက်တင်များ"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"အထွေထွေ ဆက်တင်များ"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"မဖျက်ခင် အတည်ပြုပါ"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"မပို့မီ အတည်ပြု"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"၉၉၉+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"အီးမေးလ်ကို ရှာဖွေ"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"ကိရိယာ၏ ကင်မရာကို အသုံးပြုမှု ခွင့်မပြု"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"ကိရိယာ၏စကားဝှက် လိုအပ်"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"မကြာခင်က စကားဝှက်များကို ပြန်သုံးမှုကို ကန့်သတ်"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"စကားဝှက် သက်တမ်း ကုန်ဆုံးရက် သတ်မှတ်သည်"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"မျက်နှာပြင်ကို သော့ချရန် ကိရိယာ ကိုနေရန် လိုအပ်"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"စင့်က် လုပ်ထားသည့် ပြက္ခဒိန်ဖြစ်ရပ် အရေအတွက်ကို ကန့်သတ်ပါ"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"စင့်က်လုပ်ပြီး အီးမေးလ် အရေအတွက်ကို ကန်.သတ်"</string>
-    <string name="quick_1" msgid="3426057697353380951">"ကျေးဇူးတင်ပါသည်!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"ကြားရတာ ကျွနု်ပ်အတွက် ကောင်းပါသည်!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"ဤစာကို ကျွနု်ပ် ဖတ်ပြီးနောက် သင့်ထံသို့ ပြန်လာပါမည်။"</string>
-    <string name="quick_4" msgid="3988974084396883051">"ဤစာကို ဆွေးနွေးရန် အစည်းအဝေး တစ်ခု စီစဉ်ကြရအောင်။"</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"ရိုမင်း အတွင်းမှာ ဤအကောင့် အတွက် နောက်ခံ စင့်က် လုပ်မှုကို ပိတ်ထားသည်။"</string>
-    <string name="confirm_response" msgid="9151965975158906286">"တုံ့ပြန်ချက် ပို့နေ…"</string>
-    <string name="no_conversations" msgid="5559527390337162819">"စာများ မရှိ"</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"ဖိုလ်ဒါ ကောက်ယူသူ"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> ဆာဗာ အမှိုက် ဖိုလ်ဒါ ရွေး"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g> အတွက် ဆာဗာ၏ ပို့ပြီး အရာများ ဖိုလ်ဒါကို ရွေး"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"ဖိုလ်ဒါ စာရင်းကို တင်နေ…"</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"မရှိ"</string>
-</resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
deleted file mode 100644
index cd45d89..0000000
--- a/res/values-ne-rNP/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"ईमेल अनुलग्नकहरु पढ्नुहोस्"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"तपाईंको ईमेल अनुलग्नकहरू पढ्न अनुप्रयोगलाई अनुमति दिन्छ।"</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"ईमेल प्रदाता डाटा पहुँच गर्नुहोस्"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"अनुप्रयोगलाई तपाईंको ईमेल डाटाबेस, साथै प्राप्त सन्देशहरू, पठाईएका सन्देशहरू, प्रयोगकर्तानामहरू, र पासवर्डहरू अनुमति दिन्छ।"</string>
-    <string name="app_name" msgid="5815426892327290362">"इमेल गर्नुहोस्"</string>
-    <string name="debug_title" msgid="5175710493691536719">"डिबग"</string>
-    <string name="next_action" msgid="3931301986364184415">"अर्को"</string>
-    <string name="previous_action" msgid="5181616311579820981">"अघिल्लो"</string>
-    <string name="done_action" msgid="7497990549515580249">"भयो"</string>
-    <string name="create_action" msgid="3062715563215392251">"नयाँ बनाउनुहोस्"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"कुनै द्रूत प्रतिक्रिया छैन।"</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"खाता सेटिङहरू"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"सिङ्क विकल्पहरु"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"कनेक्सन समस्या।"</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"सन्देश सार्नुहोस्"</item>
-    <item quantity="other" msgid="371256717624461324">"सन्देशहरू सार्नुहोस्"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 खाताहरु मा सार्न समर्थन गर्दैन।"</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"सार्न सकिएन किनकि छनोट भएका भित्र एक भन्दा बढी खाताहरु छन्।"</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"ड्राफ्ट, आउटबक्स, र पठाइएका मेल सूचीमा रहेका सन्देशहरू सार्न सकिदैन।"</string>
-    <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="mailbox_name_display_starred" msgid="7788694947644186069">"ताराङ्कित"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"नपढिएको"</string>
-    <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="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"संयुक्त दृश्य"</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>\nCC: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"द्रुत प्रतिक्रिया सम्मिलित गर्नुहोस्"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"द्रुत जवाफ सम्मिलित गर्नुहोस्"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"एक वा अधिक अनुलग्नकहरू तपाईंको अग्रेषित सन्देशमा पठाउनु अघि डाउनलोड गरिनेछ।"</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"एट्याच्मेन्ट डाउनलोड गर्न सकिएन।"</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"सन्देश डिकोड गर्दा एउटा समस्या थियो।"</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"एक वा अधिक अनुलग्नक अग्रेषित गर्न सकिएन"</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"अनुलग्नक अग्रेषित गरिएन"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> साइनइन असफल भयो।"</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"साइन इन गर्न सकिँदैन"</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>
-  </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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"खाता सेटअप"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"प्रमाणिकरण अनुरोध गर्दै"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"साइन इन"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"प्रमाणीकरण गर्न असमर्थ"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"इमेल ठेगाना वा पासवर्ड गलत छन्"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"इमेल ठेगाना :"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"ईमेल खाता"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"तपाईं केवल केहि चरणहरूमा आफ्नो खाता सेट अप गर्न सक्नुहुनेछ।"</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"इमेल ठेगाना"</string>
-    <string name="or_label" msgid="2207403489755254427">"अथवा"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Google का साथ साइन इन गर्नुहोस्"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"पासवर्ड"</string>
-    <string name="password_hint" msgid="8835390747504721561">"पासवर्ड"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s सँग साइन इन गरिएको"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"प्रमाणीकरण"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"प्रमाणीकरण जोड्नुहोस्"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"प्रमाणीकरण हटाउनुहोस्"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"म्यानुअल सेटअप"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"एक मान्य ईमेल ठेगाना र पासवर्ड टाइप गर्नुहोस्।"</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"खाता नक्कली"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"तपाइँको \" <xliff:g id="DUPLICATE">%s</xliff:g> \" खाताको लागि तपाइँले पहिल्यै बाट यस  प्रयोगकर्ता नाम प्रयोग गरिरहनुभएको छ।"</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"यो पासवर्ड एक वा एक भन्दा अधिक स्थान पात्रहरूको साथ सुरू वा समाप्त हुन्छ। धेरै सर्वरहरू रिक्त स्थानको साथ पासवर्डको समर्थन गर्दैन।"</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"खाताको जानकारी प्राप्त भइरहेछ..."</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"सर्भर सेटिङ लाई प्रमाणित गरियस ..."</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"एसएमटीपी सेटिङ्स मान्य गरिँदै..."</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"खाता सिर्जना गरिँदै..."</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"खाता प्रकार पुष्टि गर्नुहोस्"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"तपाईँले संकेत गरेको <xliff:g id="EMAIL">%1$s</xliff:g>ले प्रयोग गर्छ <xliff:g id="USERPROTOCOL">%2$s</xliff:g> , तर खाताले <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> प्रयोग गर्न सक्तछ"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"खाता सेटअप"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"तपाईंको खाता सेट अप भयो र ईमेल यसको मार्गमा छ!"</string>
-    <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_names_user_name_empty_error" msgid="6791427018325367364">"यस क्षेत्र खाली हुन सक्दैन"</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"खाता सेटअप"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"खाता प्रकार"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"यस खाता कुन प्रकारको हो?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"खाता सेटअप"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"आवक सर्भर सेटिङ्स"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"प्रयोगकर्ता नाम"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"पासवर्ड"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"पासवर्ड"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"सर्वर"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"पोर्ट:"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"सुरक्षा प्रकार"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"कुनै पनि होइन"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"एसएसएल / टीएलएस (सबै सर्टिफिकेटहरू स्वीकार गर्नुहोस्)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (सबै प्रमाणपत्रहरु स्वीकार गर्नुहोस्)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</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>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"खाता सेटअप"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"बाहिर जाने सर्भर सेटिङ्स"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP सर्भर:"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"पोर्ट:"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"सुरक्षा प्रकार"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"साइन इन आवश्यकता"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"प्रयोगकर्ता नाम"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"पासवर्ड"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"क्लाइन्ट सर्टिफिकेट"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"चयन गर्नुहोस्"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"क्लाइन्ट प्रमाणपत्र प्रयोग गर्नुहोस्"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"हटाउनुहोस्"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"कुनै पनि होइन"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"मोबाइल उपकरण ID"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"खाता सेटिङहरू"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"खाता विकल्पहरू"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"फ्रिक्वेन्सी सिङ्क गर्नुहोस्:"</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">"हरेक ५ मिनेटहरू"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"हरेक १० मिनेटहरू"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"हरेक १५ मिनेटमा"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"हरेक ३० मिनेटहरू"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"हरेक घण्टा"</string>
-    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"इमेल आउँदा मलाई सूचित गर्नुहोस्"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"यस खाताबाट सम्पर्क सिङ्क गर्नुहोस्"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"यस खाताबाट पात्रो सिङ्क गर्नुहोस्"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"यस खाताबाट इमेल सिङ्क गर्नुहोस्"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"वाई-फाईमा कनेक्ट भएपछि स्वचालित रूपमा अनुलग्नकहरू डाउनलोड गर्नुहोस्"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"समाप्त गर्न सकिएन"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"निम्नबाट इमेल सिङ्क गर्नुहोस्:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"स्वतः"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"अन्तिम दिन"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"अन्तिम तीन दिन"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"अन्तिम हप्ता"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"अन्तिम दुई हप्ता"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"अन्तिम महिना"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"सबै"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"पूर्वनिर्धारित खाता प्रयोग गर्नुहोस्"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"प्रयोगकर्ता नाम वा पासवर्ड गलत छ।"</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"लगइन विफल।\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"खाता सेटअपमा समस्या"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"प्रयोगकर्ता नाम, पासवर्ड, र खाता सेटिङहरू ठिक छन् भनेर सुनिश्चित गर्नुहोस्।"</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"सर्वरमा सुरक्षित कनेक्ट गर्न सकिँदैन।"</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"सर्वरमा सुरक्षित कनेक्ट गर्न सकिँदैन।\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"एक क्लाईन्ट सर्टिफिकेट आवश्यक छ। के तपाईं क्लाईन्ट सर्टिफिकेटको साथ सर्वरसँग कनेक्ट गर्न चाहनुहुन्छ?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"सर्टिफिकेट अवैध वा अनुपलब्ध छ।"</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"सर्भरले एक त्रुटिको साथ जवाफ दियो। तपाइँको प्रयोगकर्ता नाम र पासवर्ड परीक्षण गर्नुहोस्, अनि पुनः प्रयास गर्नुहोस्।"</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"भ्वाइसमेल सर्वरमा जडान गर्न सकिएन।"</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"सर्भरसँग जोडिन सकेन।\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"टीएलएस आवश्यक तर सर्भर द्वारा समर्थित छैन।"</string>
-    <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"प्रमाणीकरण तरीकाहरु सर्भर द्वारा समर्थित छैन।"</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"सुरक्षा त्रुटिको कारण सर्वरमा कनेक्शन खोल्न सकिएन।"</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"सर्भरसँग जडान खुल्न सकेन।"</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"तपाईंले गलत सर्भर ठेगाना टाईप गर्नुभयो वा सर्भरलाई एउटा प्रोटोकल संस्करणक आवश्यकता छ जुन ईमेलले समर्थन गर्दैन।"</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"तपाईंलाई यस सर्वरसँग सिंक गर्ने अनुमति छैन। थप जानकारीको लागि आफ्नो सर्वरको ब्यवस्थापकसँग सम्पर्क गर्नुहोला।"</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"टाढा सुरक्षा प्रशासन"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"सर्भर <xliff:g id="SERVER">%s</xliff:g> तपाइँले यस भन्दा टाढा तपाइँको Android उपकरणको सुरक्षा सुविधाहरुलाई नियन्त्रण गर्नको लागि अनुमतिको आवश्यकता पर्छ। तपाइँ यस  खाता सेटअपलाई पुरा गर्न चाहानुहुन्छ?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"यस सर्भर सहित तपाइँको Android उपकरणलाई समर्थन नगर्ने सुरक्षा सुविधाहरुको आवश्यकता छ: <xliff:g id="ERROR">%s</xliff:g> लगायत"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"तपाईं खाताको प्रयोगकर्तानाम परिवर्तन गर्न सक्नुहुन्न। बिभिन्न प्रयोगकर्तानामको साथ खाता थप गर्न, खाता थप गर्नुहोस् भन्ने टच गर्नुहोला।"</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"चेतावनी: तपाईंको उपकरण ईमेल अनुप्रयोगको अधिकार प्रबन्धकमा असक्षम गरिँदा तपाईंको उपकरणले यसलाई आवश्यक पर्ने सबै ईमेल खाताहरू, साथै तिनीहरूको ईमेल, सम्पर्कहरू, क्यालेन्डर कार्यक्रमहरू, र अन्य डाटा मेटाउनेछ।"</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"सुरक्षा अद्यावधिक"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> तपाइँले तपाइँको त्यस सुरक्षा सेटिङ अद्यावधिक गर्न आवश्यकता छ।"</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"खाता \"<xliff:g id="ACCOUNT">%s</xliff:g>\" सुरक्षा आवश्यकताहरूको कारण सिंक गर्न सकिँदैन।"</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"खाता \"<xliff:g id="ACCOUNT">%s</xliff:g>\" लाई सुरक्षा सेटिङ्स अपडेट आवश्यकता छ।"</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"खाता \"<xliff:g id="ACCOUNT">%s</xliff:g>\"यस को सुरक्षा सेटिङ परिवर्तन भयो, कुनै प्रयोगकर्ता कारवाही आवश्यकता छैन।"</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"सुरक्षा अपडेटको आवश्यकता"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"सुरक्षा नीतिहरू परिवर्तित भयो"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"सुरक्षा नीतिहरु पूरा हुन सकेन"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"उपकरण सुरक्षा"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"सर्भर <xliff:g id="SERVER">%s</xliff:g> तपाईं यसलाई आफ्नो एण्ड्रोईड उपकरणको केहि दूर सुरक्षा सुविधाहरूको नियन्त्रण गर्नको लागि अनुमतिको आवश्यकता छ।"</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"विवरणहरु सम्पादन गर्नुहोस्"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" लाई तपाईंले आफ्नो लक स्क्रीन वा पासवर्ड परिवर्तन गर्न आवश्यक छ।"</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"लक स्क्रीन पासवर्डको म्याद सकिदैछ"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"तपइँको लक स्क्रीन PIN वा पासवर्ड समाप्त भएको छ।"</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"लक स्क्रीन पासवर्डको समयावधि सकियो।"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"लक स्क्रीन पासवर्डको म्याद सकिदैछ"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"तपाईंले आफ्नो लक स्क्रीन पीन वा पासवर्ड चाँडै नै परिवर्तन गर्नु पर्दछ, वा <xliff:g id="ACCOUNT">%s</xliff:g>को लागि डाटा मेटिनेछन्। के तपाईं अहिले परिवर्तन गर्नुहुन्छ?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"लक स्क्रीन पासवर्डको समयावधि सकियो"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g>को लागि डाटा तपाईंको उपकरणबाट मेटाईयो। तपाईं यसलाई आफ्नो स्क्रीन पीन वा पासवर्ड परिवर्तन गरेर पुनर्वस्थामा लैजान सक्नुहुनेछ। के तपाईं यसलाई अहिले परिवर्तन गर्न चाहनुहुन्छ?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"सुरक्षित नभएका परिवर्तनहरूलाई छाड्ने हो?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"साइन इन गर्न सकेन"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> को लागि प्रयोगकर्ता नाम वा पासवर्ड गलत छ। के तपाइँ तिनीहरुलाई अद्यावधिक गर्न चाहनुहुन्छ?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"<xliff:g id="ACCOUNT">%s</xliff:g> मा तपाइँको लग इन विफल भयो, सर्भरले भन्यो: <xliff:g id="REASON">%s</xliff:g> के तपाइँ प्रयोगकर्ता नाम र/वा पासवर्डलाई अद्यावधिक गर्न चाहनुहुन्छ?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"संलग्नकहरू डाउनलोड गर्नुहोस्"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Wi-Fi को माध्यम बाट हालका सन्देशहरुको एट्याच्मेन्टहरू स्वत:: डाउनलोड हुन्छ"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"ईमेल अधिसूचनाहरू"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"सिंक फ्रिक्वेन्सी, अधिसूचनाहरू, आदि।"</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"ईमेल आएको बेलामा अधिसूचनाहरू पठाउनुहोस्"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"सिङ्क बाराम्बारता"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"आगमन सेटिङ"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"प्रयोगकर्ता नाम, पासवर्ड, र अन्य आगमन सर्भर सेटिङ"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"बाहिर जाने सेटिङ्स"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"प्रयोगकर्ता नाम, पासवर्ड, र अन्य बहिर्गमन सर्भर सेटिङहरु"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"नीतिहरू लागू गरियो"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"कुनै पनि होइन"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"असमर्थित नीतिहरू"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"कुनै पनि होइन"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"सिङ्क प्रयास गर्नुहोस्"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"यस  खातालाई सिङ्क गर्न को लागि यहाँ छुनुहोस्"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"खाता नाम"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"तपाईंको नाम"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"द्रुत प्रतिक्रिया"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"ईमेल रचना गर्दा तपाईंले प्राय: सम्मिलित गर्ने पाठ सम्पादन गर्नुहोस्"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"सूचना सेटिङहरू"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"डेटा प्रयोग"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"सुरक्षा नीतिहरू"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"प्रणाली फोल्डर"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"रद्दीको फोल्डर"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"तपाईंको सर्वरको रद्दी फोल्डर चयन गर्नुहोस्"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"तपाइँको सर्भरको रद्दी फोल्डर छान्नुहोस्"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"पठाइएको वस्तु फोल्डर"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"तपाईंको सर्वरको पठाईएको आईटमहरू भन्ने फोल्डर चयन गर्नुहोस्"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"तपाइँको सर्भरको पठाइएको वस्तु फोल्डर छान्नुहोस्"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"चाँडो जवाफ"</string>
-    <string name="save_action" msgid="1988862706623227093">"बचत गर्नुहोस्"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"सिंक सम्पर्कहरू"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"यस खाताको लागि सम्पर्कहरू सिंक गर्नुहोस्"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"सिंक क्यालेन्डर"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"यस खाताको लागि क्यालेन्डर कार्यक्रम सिंक गर्नुहोस्"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"सिङ्क इमेल"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"यस खाताको लागि ईमेल सिंक गर्नुहोस्"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"कम्पन"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"रिङटोन छनौट गर्नुहोस्"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"सर्भर सेटिङ्स"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"सिंक विकल्पहरू"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"सिङ्क विकल्पहरु (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"यस फोल्डरलाई सिङ्क गर्नुहोस्"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"जडान हुँदा सन्देशहरू डाउनलोड हुने छन्"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"सिङ्क गर्नु पर्ने मेलका दिन"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"प्रेषक तस्वीर"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"केवल केहि \"प्लस\" खाताहरूले मात्र यस प्रोग्रामलाई जडान गर्न POP पहुँच समावेश गर्दछ। यदि तपाईं आफ्नो सहि ईमेल ठेगाना र पासवर्डबाट साइन इन गर्न असक्षम हुनुभयो भने, तपाईंले \"प्लस\" खातामा भुक्तान नगरेको हुनुपर्दछ। यी ईमेल खाताहरूमा पहुँच पाउनको लागि वेब ब्राउजर सुरूवात गर्नुहोस्।"</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"यो ईमेल खाता सेट अप गर्नु अघि, टि-अनलाइन वेबसाइटको भ्रमण गर्नुहोस् र POP3 ईमेल पहुँचको लागि एउटा पासवर्डको सिर्जना गर्नुहोस्।"</string>
-    <string name="exchange_name" msgid="1190783774800310346">"कर्पोरेट"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"खाता सिर्जना गर्न सकिँदैन। पुन:प्रयास गर्नुहोस्।"</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"इमेल गर्नुहोस्"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"सर्भर-निर्दिष्ट सुरक्षा नीतिहरुलाई सक्षम बनाउँछ"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"सेटिङहरू"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"सामान्य सेटिङहरू"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"मेट्नु भन्दा पहिले पुष्टि गर्नुहोस्"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"पठाउनु अघि पुष्टि गर्नुहोस्"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"९९९+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"ईमेल खोजी गर्नुहोस्"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"उपकरणको क्यामेराको प्रयोग अस्वीकार गर्नुहोस्"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"उपकरण पासवर्डको आवश्यकता छ"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"हालका पासवर्डहरूको पुन: उपयोग प्रतिबन्धित गर्नुहोस्"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"समयावधिमा पासवर्डहरू आवश्यकता"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"यसको स्क्रीन लक गर्नको लागि एउटा निष्क्रिय उपकरणको आवश्यकता"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"सिङ्क भएका पात्रो घटनाहरुको संख्या सीमित गर्नुहोस्"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"सि‌ंक भएका इ-मेलहरुको संख्या सीमित गर्नुहोस्"</string>
-    <string name="quick_1" msgid="3426057697353380951">"धन्यवाद!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"मलाई राम्रो लाग्दछ!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"म यसलाई पछि पढ्ने छु र तपाइँकोमा फर्किनेछु।"</string>
-    <string name="quick_4" msgid="3988974084396883051">"यस बारेमा छलफल गर्न एउटा बैठक सेट अप गरौं।"</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"रोमिङको क्रममा यस  खाताको लागि पृष्ठभूमि सिङ्क असक्षम छ।"</string>
-    <string name="confirm_response" msgid="9151965975158906286">"प्रतिक्रिया पठाउँदै..."</string>
-    <string name="no_conversations" msgid="5559527390337162819">"कुनै सन्देशहरू छैनन्।"</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"फोल्डर पिकर"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g>को लागि सर्भर रद्दी फोल्डर चयन गर्नुहोस्"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g>को लागि सर्भर पठाईएका आईटमहरू चयन गर्नुहोस्"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"फोल्डर सूची लोड हुँदै..."</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"कुनै पनि उपलब्ध छैनन्"</string>
-</resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
deleted file mode 100644
index 9b0c356..0000000
--- a/res/values-si-rLK/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"ඊ-තැපැල් ඇමුණුම් කියවන්න"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"ඔබගේ ඊ-තැපැල් ඇමුණුම් කියවීමට යෙදුමට ඉඩ දෙන්න"</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"ඊ-තැපැල් සැපයුම් දත්ත වෙත පිවිසෙන්න"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"ලැබුණු පණිවිඩ, යැවූ පණිවිඩ, පරිශීලක නාම, සහ මුරපද ඇතුළත් ඔබගේ ඊ-තැපැල් දත්ත සමුදාය වෙත පිවිසීමට යෙදුමට ඉඩ දෙන්න."</string>
-    <string name="app_name" msgid="5815426892327290362">"ඊ-තැපෑල"</string>
-    <string name="debug_title" msgid="5175710493691536719">"නිදොස්කරණය"</string>
-    <string name="next_action" msgid="3931301986364184415">"මීලඟ"</string>
-    <string name="previous_action" msgid="5181616311579820981">"පෙර"</string>
-    <string name="done_action" msgid="7497990549515580249">"හරි"</string>
-    <string name="create_action" msgid="3062715563215392251">"අලුතින් නිර්මාණය කරන්න"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"ක්ෂණික ප්‍රතිචාර නොමැත."</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"ගිණුම් සැකසීම්"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"සමමුහුර්ත කිරීමේ විකල්ප"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"සම්බන්ධතාවයේ ගැටලුවකි."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"පණිවිඩය ගෙන යන්න"</item>
-    <item quantity="other" msgid="371256717624461324">"පණිවිඩ ගෙන යන්න"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"ගෙන යාම POP3 ගිණුම් වලට සහාය නොදක්වයි."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"තෝරාගැනීමට ගිණුම් කිහිපයක් අඩංගු වන නිසා ගෙන යාමට නොහැක."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"කටු සටහන වල, යන ලිපි වල සහ යැවූ ලිපි වල පණිවිඩ ගෙනයාමට නොහැක."</string>
-    <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="mailbox_name_display_starred" msgid="7788694947644186069">"තරුව සලකුණු කළ"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"නොකියැවූ"</string>
-    <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="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"සංයුක්ත දර්ශනය"</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_insert_quick_response_list_title" msgid="5314107302508728189">"ක්ෂණික ප්‍රතිචාරයක් ඇතුළත් කරන්න"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"ක්ෂණික ප්‍රතිචාරය ඇතුළත් කරන්න"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"යැවීමට ප්‍රථමයෙන් ඔබගේ ඉදිරියට යැවූ පණිවිඩයේ ඇමුණුම් එකක් හෝ තව ඇමුණුම් බාගත වෙයි."</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"ඇමුණුම බාගැනීමට නොහැක."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"පණිවිඩය විකේතනය කිරීමේදී දෝෂයකි."</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"ඇමුණුම් එකක් හෝ කිහිපයක් ඉදිරියට යැවීමට නොහැක."</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"ඇමුණුම ඉදිරියට නොයවන ලදි"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> පුරනය වීම අසාර්ථකයි."</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"පුරනය වීමට නොහැකි විය"</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>
-  </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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"ගිණුම සැකසීම"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"අනුමැතිය ඉල්ලමින්"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"පුරනය වන්න"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"සත්‍යාපනය කිරීමට නොහැකිය"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"ඊ-තැපැල් ලිපිනය හෝ මුරපදය වැරදියි"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"ඊ-තැපැල් ලිපිනය:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"ඊ-තැපැල් ගිණුම"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"ඔබට පියවර කිහිපයකින් ඔබගේ ගිණුම සකස් කළ හැක."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ඊ-තැපැල් ලිපිනය"</string>
-    <string name="or_label" msgid="2207403489755254427">"හෝ"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Google සමගින් පුරනය වන්න"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"මුරපදය"</string>
-    <string name="password_hint" msgid="8835390747504721561">"මුරපදය"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s සමගින් පුරනය වන ලදි"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"සත්‍යාපනය"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"සත්‍යාපනය එක් කරන්න"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"සත්‍යාපනය හිස් කරන්න"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"අතින් සැකසීම"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"වලංගු ඊ-තැපැල් ලිපිනයක් සහ මුරපදයක් ටයිප් කරන්න."</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"අනුපිටපත් ගිණුම"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"ඔබ මේවන විටත් මෙම පරිශීලක නාමය \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ගිණුම සඳහා භාවිතා කරමින් සිටියි."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"එකක් හෝ හිස්තැන් අක්ෂර කිහිපයක් සමග මෙම මුරපදය ආරම්භ වෙයි හෝ අවසාන වෙයි. බොහෝ සේවාදායකයෙන් හිස්තැන් සහිත මුරපද සඳහා සහය නොදක්වයි."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"ගිණුම් තොරතුරු සොයා ලබාගනිමින්…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"සේවාදායක සැකසීම් වලංගු කරමින්…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"smtp සැකසීම් සත්‍යාපනය කරමින්…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"ගිණුම සාදමින්…"</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"ගිණුම් වර්ගය සහතික කරන්න"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"<xliff:g id="USERPROTOCOL">%2$s</xliff:g> භාවිත කරන්නේ <xliff:g id="EMAIL">%1$s</xliff:g> බව ඔබ පෙන්වා දෙන ලදි, නමුත් ගිණුම භාවිත කරන්නේ <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> ය"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"ගිණුම සැකසීම"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"ඔබගේ ගිණුම සකසා ඇති අතර ඊ-තැපෑල අතරමගය!"</string>
-    <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_names_user_name_empty_error" msgid="6791427018325367364">"මෙම ක්ෂේත්‍රය හිස්විය නොහැක."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"ගිණුම සැකසීම"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"ගිණුම් වර්ගය"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"මෙය කුමන වර්ගයේ ගිණුමක්ද?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"ගිණුම සැකසීම"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"ඇතුළට එන සේවාදායක සැකසීම්"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"පරිශීලක නාමය"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"මුරපදය"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"මුරපදය"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"සේවාදායකය"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"තොට"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"ආරක්ෂක වර්ගය"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"කිසිවක් නැත"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (සියලු සහතික පිළිගන්න)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (සියලු සහතික පිළිගන්න)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</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>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"ගිණුම සකසනය"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"පිටතට යන සේවාදායක සැකසීම්"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP සේවාදායකය"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"තොට"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"ආරක්ෂක වර්ගය"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"පුරනය වීම අවශ්‍යය"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"පරිශීලක නාමය"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"මුරපදය"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"සේවාලාභී සහතිකය"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"තෝරන්න"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"සේවාදායකගේ සහතික භාවිතා කරන්න"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"ඉවත් කරන්න"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"කිසිවක් නැත"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"ජංගම උපාංගය ID"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"ගිණුම් සැකසීම්"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"ගිණුම් විකල්ප"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"සමමුහුර්ත කිරීමේ සංඛ්‍යාතය:"</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_notify_label" msgid="7046146571560728829">"ඊ-තැපෑල පැමිණිවිට මට දැනුම් දෙන්න"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"මෙම ගිණුමෙන් සම්බන්ධතාවයන් සමමුහුර්ත කරන්න"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"මෙම ගිණුමෙන් දින දර්ශනය සමමුහුර්ත කරන්න"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"මෙම ගිණුමෙන් ඊ-තැපෑල සමමුහුර්ත කරන්න"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fi වෙත සම්බන්ධ වීමේදී ඇමුණුම් ස්වයංක්‍රියව බාගන්න."</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"අවසන් කිරීමට නොහැකි විය"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"වෙතින් ඊ-තැපැල් සමමුහුර්ත කරන්න:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"ස්වයංක්‍රිය"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"අවසාන දිනය"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"අවසාන දින තුන"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"අවසාන සතිය"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"අවසාන සති දෙක"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"අවසාන මාසය"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"සියලු"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"ගිණුම් සුපුරුද්ද භාවිතා කරන්න"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"පරිශීලක නාමය හෝ මුරපදය වැරදිය."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"පුරනය වීම අසාර්ථකය.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"ගිණුම් ස්ථාපනය සමඟ ඇති ගැටලු"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"පරිශීලක නාමය, මුරපදය, සහ ගිණුම් සැකසීම් නිවැරදි දැයි තහවුරු කරන්න."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"සේවාදායකය වෙත ආරක්ෂිතව සම්බන්ධ වීමට නොහැකිය."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"සේවාදායකය වෙත ආරක්ෂිතව සම්බන්ධ වීමට නොහැකිය.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"සේවාලාභී සහතිකයක් අවශ්‍යයි. සේවාලාභී සහතිකයක් සමග සේවාදායකයට සම්බන්ධ වීමට ඔබට අවශ්‍යද?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"සහතිකය අවලංගුයි හෝ ප්‍රවේශ වීමට නොහැක."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"සේවාදායකය දෝෂ සහිතව ප්‍රතිචාර ලබාදුණි. ඔබගේ පරිශීලක නාමය සහ මුරපදය පරීක්ෂා කර නැවත උත්සාහ කරන්න."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"සේවාදායකය වෙත සම්බන්ධ වීමට නොහැකිය."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"සේවාදායකයට සම්බන්ධ විය නොහැක.\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="6799839150250217566">"සත්‍යාපනය ක්‍රම, සේවාදායකය මඟින් සහය නොදැක්වයි."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"ආරක්‍ෂිත දෝෂයක් නිසා සේවාදායකය වෙත සම්බන්ධතාවය විවෘත කිරීමට නොහැක."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"සේවාදායකයට සම්බන්ධතාවයක් වීවෘත කළ නොහැක."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"ඔබ වැරදි සේවාදායකය ලිපිනයක් ටයිප් කර ඇත නැතිනම් ඊ-තැපෑල සහය නොදක්වන ප්‍රොටොකෝල අනුවාදයක් සේවාදායකයට අවශ්‍යය."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"මෙම සේවාදායකය සමග සමමුහුර්ත වීමට ඔබට අවසර නැත. වැඩිපුර තොරතුරු සඳහා ඔබගේ සේවාදායකයේ පරිපාලකයාව අමතන්න."</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"දුරස්ථ ආරක්ෂක පරිපාලනය"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"ඔබගේ Android උපාංගයේ සමහර ආරක්ෂක විශේෂාංග දුරස්ථව පාලනයට ඔබගේ අනුමැතිය <xliff:g id="SERVER">%s</xliff:g> සේවාදායකයට අවශ්‍යව ඇත. මෙම ගිණුම සැකසීම් කිරීම අවසන් කිරීමට ඔබ කැමතිද?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"මෙම සේවාදායකය ඔබගේ Android උපාංගය සහය නොදෙන ආරක්ෂක විශේෂාංග ඉල්ලා සිටියි, එනම්: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"ගිණුමේ පරිශීලක නාමය ඔබට වෙනස් කළ නොහැක. වෙනස් පරිශීලක නාමයකින් ගිණුමක් එකතු කිරීමට, ගිණුම එකතු කිරීම ස්පර්ශ කරන්න."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"අවවාදය: ඔබගේ උපාංගය පාලනය කිරීමේ ඊ-තැපෑල යෙදුමේ අධිකාරත්වය අක්‍රිය කිරීම මගින් ඔවුනගේ ඊ-තැපැල්, සම්බන්ධතා, දින දර්ශන සිදුවීම්, සහ වෙනත් දත්තද සමග එයට අවශ්‍ය සියලු ඊ-තැපැල් ගිණුම් මැකෙයි."</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"ආරක්‍ෂිත යාවත්කාලීන"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"ඔබට ඔබගේ ආරක්‍ෂිත සැකසීම් යාවත්කාලීන කිරීමට <xliff:g id="ACCOUNT">%s</xliff:g>ට අවශ්‍යයි."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"ආරක්ෂක අවශ්‍යතා නිසා \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ගිණුම සමමුහුර්ත කළ නොහැක."</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ගිණුමට ආරක්‍ෂිත සැකසීම් යාවත්කාලීනය අවශ්‍යය."</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ගිණුම එහි ආරක්‍ෂිත සැකසීම් වෙනස් කර ඇත; කිසිම පරිශීලක ක්‍රියාවක් අවශ්‍ය නැත."</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"ආරක්ෂක යාවත්කාලීන අවශ්‍යය"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"ආරක්ෂක ප්‍රතිපත්ති වෙනස්වී ඇත"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"ආරක්‍ෂිත ප්‍රතිපත්ති වෙත ලඟාවීමට නොහැක"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"උපාංග ආරක්ෂාව"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"ඔබගේ Android උපාංගයේ සමහර ආරක්ෂක විශේෂාංග දුරස්ථව පාලනයට ඔබගේ අනුමැතිය <xliff:g id="SERVER">%s</xliff:g> සේවාදායකයට අවශ්‍යව ඇත."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"විස්තර සංස්කරණය කරන්න"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ට ඔබගේ තිරය අගුළු දැමීමේ PIN එක හෝ මුරපදය වෙනස් කිරීම අවශ්‍යය."</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"තිරය අගුල් දැමීමේ මුරපද කල් ඉකුත් වේ"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"ඔබගේ තිර අගුළේ PIN හෝ මුරපදය කල් ඉකුත්වී ඇත."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"ඔබගේ තිරය අගුළු දැමීමේ මුරපදය කල් ඉකුත් වී ඇත."</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"තිරය අගුල් දැමීමේ මුරපද කල් ඉකුත් වේ"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"ඔබගේ තිරය අගුළු දැමීමේ PIN එක හෝ මුරපදය හැකි ඉක්මණින් ඔබ වෙනස් කිරීමට අවශ්‍යය, නැතිනම් <xliff:g id="ACCOUNT">%s</xliff:g> ගිණුම සඳහා දත්ත මැකෙනු ඇත. ඔබට දැන් එය වෙනස් කිරීමට අවශ්‍යද?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"තිරය අගුළු දැමීමේ මුරපදය කල් ඉකුත්වී ඇත"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g> සඳහා දත්ත ඔබගේ උපාංගයෙන් මකා දමනු ලැබේ. ඔබගේ තිරය අගුළු දැමීමේ PIN හෝ මුරපදය වෙනස් කිරීමෙන් ඔබට එය නැවත පිහිටුවීම කළ හැක. ඔබට දැන් එය වෙනස් කිරීමට අවශ්‍යද?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"නොසුරැකුණු වෙනස් කිරීම් ඉවතලන්නද?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"පුරනය වීමට නොහැකි විය"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> සඳහා පරිශීලක නාමය හෝ මුරපදය වැරදියි. ඔබට ඒවා දැන් යාවත්කාල කිරීමට අවශ්‍යද?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"ඔබගේ <xliff:g id="ACCOUNT">%s</xliff:g> පුරනය වීම අසාර්ථකයි; සේවාදායකය පවසයි: <xliff:g id="REASON">%s</xliff:g> ඔබට ඔබගේ පරිශීලක නාමය සහ/හෝ මුරපදය යාවත්කාලීන කිරීමට අවශ්‍යද?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"ඇමුණුම් බාගන්න"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"ස්වයංක්‍රිය-බාගැනීමේ ඇමුණුම් Wi-Fi හරහා මෑත පණිවිඩ වෙත"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"ඊ-තැපෑල දැනුම්දීම්"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"නිතර සිදු වීම්, දැනුම්දීම් අදීය සමමුහුර්ත කරන්න."</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"ඊ-තැපෑලක් පැමිණෙන විට දැනුම්දීමක් යවන්න"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"සමමුහුර්ත කිරීමේ සංඛ්‍යාතය"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"ඇතුළට එන සැකසීම්"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"පරිශීලක නාමය, මුරපදය සහ අනෙකුත් ඇතුළට එන සේවාදායක සැකසීම්"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"පිටතට යන සැකසීම්"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"පරිශීලක නාමය, මුරපදය සහ අනෙකුත් පිටතට යන සේවාදායක සැකසීම්"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"ප්‍රතිපත්ති බලාත්මක කරන ලදි"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"කිසිවක් නැත"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"සහය නොදක්වන ප්‍රතිපත්ති"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"කිසිවක් නැත"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"සමමුහුර්ත කිරීමේ උත්සාහය"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"මෙම ගිණුම සමමුහුර්ත කිරීමට මෙහි ස්පර්ශ කරන්න"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"ගිණුමේ නම"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"ඔබගේ නම"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"ක්ෂණික ප්‍රතිචාර"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"ඊ-තැපෑලක් සාදන විට ඔබ නිතර ඇතුළත් කරන පෙළ සංස්කරණය කරන්න"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"දැනුම්දීම් සැකසීම්"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"දත්ත භාවිතය"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"ආරක්‍ෂක ප්‍රතිපත්ති"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"පද්ධති ෆෝල්ඩර"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"අපද්‍රව්‍ය ෆෝල්ඩරය"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"ඔබගේ සේවාදායකයේ අපද්‍රව්‍ය ෆෝල්ඩරය තෝරන්න"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"ඔබගේ සේවාදායකයේ අපද්‍රව්‍ය ෆෝල්ඩරය තෝරන්න"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"යවන අයිතම ෆෝල්ඩරය"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"ඔබගේ සේවාදායකයේ යැවූ අයිතම ෆෝල්ඩරය තෝරන්න"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"ඔබගේ සේවාදායකයේ යවන අයිතම ෆෝල්ඩරය තෝරන්න"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"ක්ෂණික ප්‍රතිචාරය"</string>
-    <string name="save_action" msgid="1988862706623227093">"සුරකින්න"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"සම්බන්ධතා සමමුහුර්ත කරන්න"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"මෙම ගිණුම සඳහා සම්බන්ධතා සමමුහුර්ත කරන්න"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"දින දර්ශනය සමමුහුර්ත කරන්න"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"මෙම ගිණුම සඳහා දින දර්ශන සිදුවීම සමමුහුර්ත කරන්න"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ඊ-තැපෑල සමමුහුර්ත කරන්න"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"මෙම ගිණුම සඳහා ඊ-තැපෑල සමමුහුර්ත කරන්න"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"කම්පනය වීම"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"රිංග්ටෝනය තෝරන්න"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"සේවාදායක සැකසීම්"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"සමමුහුර්ත කිරීමේ විකල්ප"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"සමමුහුර්ත කිරීමේ විකල්ප (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"මෙම් ෆෝල්ඩරය සමමුහුර්ත කරන්න"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"සම්බන්ධ වූ විටදී පණිවිඩ බාගත වෙයි"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"සමමුහුර්ත කළ යුතු තැපැල් සඳහා දින"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"යවන්නාගේ රුපය"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"POP පිවිසුම ඇතුළත් සමහරක් \"Plus\" ගිණුම් පමණක් මෙම වැඩසටහනට සම්බන්ද වීමට අවසර දෙයි.ඔබගේ නිවැරදි ඊ-තැපැල් ලිපිනය සහ මුරපදය සමග ඔබට පුරණය වීමට ඔබට නොහැකිනම්, ඔබට ගෙවූ \"Plus\" ගිණුමක් නොතිබෙනවා විය හැක. මෙම ඊ-තැපැල් ගිණුම්වලට පිවිසුම ලැබීමට වෙබ් බ්‍රව්සරය අරඹන්න."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"මෙම ඊ-තැපැල් ගිණුම සැකසීමට පෙර, T-Online වෙබ් අඩවිය වෙත ගොස් POP3 ඊ-තැපැල් පිව්සුම සඳහා මුරපදයක් සාදන්න."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"සංස්ථාපිත"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ක්‍රියාකාරී සමමුහුර්තය"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"ගිණුම සෑදිය නොහැක. නැවත උත්සහ කරන්න."</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"ඊ-තැපෑල"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"සේවාදායකය-විශේෂණය කළ ආරක්ෂක ප්‍රතිපත්තීන් සබල කර ඇත"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"සැකසීම්"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"පොදු සැකසීම්"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"තහවුරු කිරීමට පෙර මකන්න"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"යැවීමට පෙර තහවුරු කරන්න"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"ඊ-තැපෑල සොයන්න"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"උපාංගවල කැමරාව භාවිතයට ඉඩ නොදෙන්න"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"උපාංග මුරපදයක් අවශ්‍යය"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"මෑත කාලින මුරපද නැවත භාවිතය සීමා කරන්න"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"කල් ඉකුත් වීමට මුරපද අවශ්‍යය"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"එහි තිරය අගුළු දැමීමට උපාංගය නිකම් තිබීම අවශ්‍යය"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"සමමුහුර්ත කරන ලද දින දර්ශන සිද්ධි ගණන සිමා කරන්න"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"සමමුහුර්ත කරන ලද ඊ-තැපෑල් ගණන සිමා කරන්න"</string>
-    <string name="quick_1" msgid="3426057697353380951">"ස්තුතියි!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"මට හොඳ යැයි දැනෙයි!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"මම මෙය පසුව කියවා ආපසු ඔබට පිළිතුරු දෙන්නම්."</string>
-    <string name="quick_4" msgid="3988974084396883051">"මෙය සාකච්ඡා කිරීමට රැස්වීමක් සුදානම් කරමු."</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"රෝමින් කරද්දී මෙම ගිණුම සඳහා පසුබිම් සමමුහුර්ත කිරීම අබල කර ඇත."</string>
-    <string name="confirm_response" msgid="9151965975158906286">"ප්‍රතිචාරය යවමින්..."</string>
-    <string name="no_conversations" msgid="5559527390337162819">"පණිවිඩ නැත."</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"ෆෝල්ඩරය තෝරනය"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> සඳහා සේවාදායක අපද්‍රව්‍ය ෆෝල්ඩරය තෝරන්න"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g> සඳහා සේවාදායකය යැවුම් අයිතම තෝරන්න"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"ෆෝල්ඩර ලැයිස්තුව පූරණ වෙමින්…"</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"කිසිවක් ලබාගත නොහැක"</string>
-</resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
deleted file mode 100644
index e8e8876..0000000
--- a/res/values-ta-rIN/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"மின்னஞ்சல் இணைப்புகளைப் படி"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"உங்கள் மின்னஞ்சல் இணைப்புகளைப் படிக்க பயன்பாட்டை அனுமதிக்கிறது."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"மின்னஞ்சல் வழங்குநர் தரவை அணுகு"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"பெறப்பட்ட மற்றும் அனுப்பிய செய்திகள், பயனர்பெயர்கள், கடவுச்சொற்கள் ஆகியவை உள்ளடங்கிய உங்கள் மின்னஞ்சல் தரவுத்தளத்தை அணுக பயன்பாட்டை அனுமதிக்கிறது."</string>
-    <string name="app_name" msgid="5815426892327290362">"மின்னஞ்சல்"</string>
-    <string name="debug_title" msgid="5175710493691536719">"பிழைத்திருத்துக"</string>
-    <string name="next_action" msgid="3931301986364184415">"அடுத்து"</string>
-    <string name="previous_action" msgid="5181616311579820981">"முந்தையது"</string>
-    <string name="done_action" msgid="7497990549515580249">"முடிந்தது"</string>
-    <string name="create_action" msgid="3062715563215392251">"புதியதை உருவாக்கு"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"விரைவு பதில்கள் இல்லை."</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"கணக்கு அமைப்புகள்"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"ஒத்திசைவு விருப்பங்கள்"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"இணைப்புப் பிழை."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"செய்தியை நகர்த்து"</item>
-    <item quantity="other" msgid="371256717624461324">"செய்திகளை நகர்த்து"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 கணக்குகளில் நகர்த்துதல் ஆதரிக்கப்படவில்லை."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"பல கணக்குகளைத் தேர்வுசெய்துள்ளதால் செய்திகளை நகர்த்த முடியவில்லை."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"வரைவுகள், அவுட்பாக்ஸ் மற்றும் அனுப்பியவை ஆகிய கோப்புறைகளில் உள்ள செய்திகளை நகர்த்த முடியாது."</string>
-    <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="mailbox_name_display_starred" msgid="7788694947644186069">"நட்சத்திரமிட்டது"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"படிக்காதவை"</string>
-    <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="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"ஒருங்கிணைந்த காட்சி"</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>\nCC: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"விரைவு பதிலைச் செருகவும்"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"விரைவு பதிலைச் செருகவும்"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"நீங்கள் முன்னனுப்பிய செய்தியில் உள்ள ஒன்று அல்லது அதற்கு மேற்பட்ட இணைப்புகள், அனுப்புதலுக்கு முன்பு பதிவிறக்கப்படும்."</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"இணைப்பைப் பதிவிறக்க முடியவில்லை."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"செய்தியைக் குறிவிலக்கும்போது பிழை ஏற்பட்டது."</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"ஒன்று அல்லது அதற்கு மேற்பட்ட இணைப்புகளை முன்னனுப்ப முடியவில்லை."</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"இணைப்பு முன்னனுப்பப்படவில்லை"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> இல் உள்நுழைவதில் தோல்வி."</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"உள்நுழைய முடியவில்லை"</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>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>கி.பை."</item>
-    <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>கி.பை."</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>மெ.பை."</item>
-    <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>மெ.பை."</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"கணக்கு அமைவு"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"அங்கீகரிப்பைக் கோருகிறது"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"உள்நுழைக"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"அங்கீகரிக்க முடியவில்லை"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"மின்னஞ்சல் முகவரி அல்லது கடவுச்சொல் தவறாக உள்ளது"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"மின்னஞ்சல் முகவரி:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"மின்னஞ்சல் கணக்கு"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"சில படிமுறைகளிலேயே உங்கள் கணக்கை அமைக்கலாம்."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"மின்னஞ்சல் முகவரி"</string>
-    <string name="or_label" msgid="2207403489755254427">"அல்லது"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Google மூலம் உள்நுழை"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"கடவுச்சொல்"</string>
-    <string name="password_hint" msgid="8835390747504721561">"கடவுச்சொல்"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s மூலம் உள்நுழைந்தீர்கள்"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"அங்கீகாரம்"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"அங்கீகரிப்பைச் சேர்"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"அங்கீகரிப்பை அழி"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"கைமுறை அமைவு"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"சரியான மின்னஞ்சல் முகவரி மற்றும் கடவுச்சொல்லை உள்ளிடவும்."</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"நகல் கணக்கு"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"நீங்கள் \"<xliff:g id="DUPLICATE">%s</xliff:g>\" கணக்கிற்காக இந்தப் பயனர்பெயரை ஏற்கனவே பயன்படுத்துகிறீர்கள்."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"இந்தக் கடவுச்சொல் ஒன்று அல்லது அதற்கு மேற்பட்ட இடைவெளி எழுத்துக்குறிகளுடன் தொடங்குகிறது அல்லது முடிகிறது. இடைவெளிகளுடன் கூடிய கடவுச்சொல்லைப் பல சேவையகங்கள் ஆதரிப்பதில்லை."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"கணக்குத் தகவலை மீட்டெடுக்கிறது…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"சேவையக அமைப்புகளைச் சரிபார்க்கிறது…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"smtp அமைப்புகளைச் சரிபார்க்கிறது…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"கணக்கை உருவாக்குகிறது..."</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"கணக்கு வகையை உறுதிசெய்யவும்"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"<xliff:g id="USERPROTOCOL">%2$s</xliff:g> ஐப் பயன்படுத்துவதாக <xliff:g id="EMAIL">%1$s</xliff:g> ஐக் குறித்தீர்கள், ஆனால் <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> ஐக் பயன்படுத்தலாம்"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"கணக்கு அமைவு"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"உங்கள் கணக்கு அமைக்கப்பட்டது, மின்னஞ்சலை விரைவில் பெறுவீர்கள்!"</string>
-    <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_names_user_name_empty_error" msgid="6791427018325367364">"இந்தப் புலம் வெறுமையாக இருக்கக் கூடாது."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"கணக்கு அமைவு"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"கணக்கின் வகை"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"இது எவ்வகையான கணக்கு?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"கணக்கு அமைவு"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"உள்வரும் சேவையக அமைப்புகள்"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"பயனர்பெயர்"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"கடவுச்சொல்"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"கடவுச்சொல்"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"சேவையகம்"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"போர்ட்"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"பாதுகாப்பு வகை"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"ஏதுமில்லை"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (எல்லா சான்றிதழ்களையும் ஏற்றுக்கொள்)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (எல்லா சான்றிதழ்களையும் ஏற்றுக்கொள்)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</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>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"கணக்கு அமைவு"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"வெளிச்செல்லும் சேவையக அமைப்புகள்"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP சர்வர்"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"போர்ட்"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"பாதுகாப்பு வகை"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"உள்நுழைவு தேவை"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"பயனர்பெயர்"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"கடவுச்சொல்"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"கிளையன்ட் சான்றிதழ்"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"தேர்ந்தெடு"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"கிளையண்ட் சான்றிதழைப் பயன்படுத்து"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"அகற்று"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"ஏதுமில்லை"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"மொபைல் சாதன ஐடி"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"கணக்கு அமைப்புகள்"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"கணக்கு விருப்பங்கள்"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"ஒத்திசைவு கால இடைவெளி:"</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_notify_label" msgid="7046146571560728829">"மின்னஞ்சல் வரும்போது எனக்குத் தெரிவி"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"இந்தக் கணக்கின் தொடர்புகளை ஒத்திசை"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"இந்தக் கணக்கிலிருந்து கேலெண்டரை ஒத்திசை"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"இந்தக் கணக்கிலிருந்து மின்னஞ்சலை ஒத்திசை"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fi இல் இணைக்கப்பட்டிருக்கும்போது இணைப்புகளைத் தானாகப் பதிவிறக்கு"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"முடிக்க முடியவில்லை"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"இவற்றின் மின்னஞ்சல்களை ஒத்திசைக்கவும்:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"தானியங்கு"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"இறுதி நாள்"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"கடந்த மூன்று நாட்கள்"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"கடந்த வாரம்"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"கடந்த இரண்டு வாரங்கள்"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"கடந்த மாதம்"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"எல்லாம்"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"கணக்கின் இயல்புநிலை அமைப்பைப் பயன்படுத்து"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"பயனர்பெயர் அல்லது கடவுச்சொல் தவறானது."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"உள்நுழைவு தோல்வியடைந்தது.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"கணக்கு அமைவில் பிரச்சனை உள்ளது"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"பயனர்பெயர், கடவுச்சொல் மற்றும் கணக்கு அமைப்புகள் ஆகியவை சரியாக உள்ளதை உறுதிப்படுத்தவும்."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"சேவையகத்துடன் பாதுகாப்பாக இணைக்க முடியவில்லை."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"சேவையகத்துடன் பாதுகாப்பாக இணைக்க முடியவில்லை.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"கிளையண்ட் சான்றிதழ் தேவை. கிளையண்ட் சான்றிதழ் மூலம் சேவையகத்துடன் இணைய விரும்புகிறீர்களா?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"சான்றிதழ் தவறானது அல்லது அணுக முடியாதது."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"சேவையகம் பிழையுடன் பதிலளித்துள்ளது. உங்கள் பயனர்பெயரையும், கடவுச்சொல்லையும் சரிபார்த்து, மீண்டும் முயற்சிக்கவும்."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"சேவையகத்துடன் இணைக்க முடியவில்லை."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"சேவையகத்துடன் இணைக்க முடியவில்லை.\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="6799839150250217566">"அங்கீகரிப்பு முறைகள் சேவையகத்தால் ஆதரிக்கப்படவில்லை."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"பாதுகாப்பு பிழையின் காரணமாகச் சேவையகத்துடனான இணைப்பைத் திறக்க முடியவில்லை."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"சேவையகத்துடனான இணைப்பைத் திறக்க முடியவில்லை."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"நீங்கள் தவறான சேவையக முகவரியை உள்ளிட்டுள்ளீர்கள் அல்லது மின்னஞ்சல் ஆதரிக்காத நெறிமுறைப் பதிப்பைச் சேவையகம் கோருகிறது."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"இந்தச் சேவையகத்துடன் ஒத்திசைக்க உங்களுக்கு அனுமதியில்லை. மேலும் தகவலுக்கு உங்கள் சேவையகத்தின் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"தொலைநிலை பாதுகாப்பு நிர்வாகம்"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"உங்கள் Android சாதனத்தின் சில பாதுகாப்பு அம்சங்களை <xliff:g id="SERVER">%s</xliff:g> சேவையகம் தொலைநிலையில் கட்டுப்படுத்த உங்களை அனுமதிக்கக் கேட்கிறது. இந்தக் கணக்கை அமைத்து முடிக்க விரும்புகிறீர்களா?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"உங்கள் Android சாதனத்தால் ஆதரிக்கப்படாத பாதுகாப்பு அம்சங்கள் இந்தச் சேவையகத்திற்குத் தேவை, இதில் அடங்குபவை: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"கணக்கின் பயனர்பெயரை உங்களால் மாற்ற முடியாது. வேறு பயனர்பெயர் மூலம் கணக்கைச் சேர்க்க, கணக்கைச் சேர் என்பதைத் தொடவும்."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"எச்சரிக்கை: உங்கள் சாதனத்தை நிர்வகிப்பதற்கான மின்னஞ்சல் பயன்பாட்டின் அதிகாரத்தை முடக்குவது, அந்தப் பயன்பாடு தேவைப்படும் எல்லா மின்னஞ்சல் கணக்குகளையும், அவற்றின் மின்னஞ்சல், தொடர்புகள், கேலெண்டர் நிகழ்வுகள் மற்றும் பிற தரவு ஆகிய அனைத்தையும் நீக்கிவிடும்."</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"பாதுகாப்புப் புதுப்பிப்பு"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> கணக்கிற்கு உங்கள் பாதுகாப்பு அமைப்புகளை நீங்கள் புதுப்பிக்க வேண்டும்."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"பாதுகாப்பு தேவைகளினால் \"<xliff:g id="ACCOUNT">%s</xliff:g>\" கணக்கை ஒத்திசைக்க முடியவில்லை."</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" கணக்கு பாதுகாப்பு அமைப்புகளைப் புதுப்பிக்கக் கோருகிறது."</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" கணக்கானது, அதன் பாதுகாப்பு அமைப்புகளை மாற்றியுள்ளது; பயனர் நடவடிக்கை எதுவும் தேவையில்லை."</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"பாதுகாப்புப் புதுப்பிப்பு அவசியமானது"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"பாதுகாப்பு கொள்கைகள் மாற்றப்பட்டன"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"பாதுகாப்பு கொள்கைகளை அடைய முடியவில்லை"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"சாதனப் பாதுகாப்பு"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"உங்கள் Android சாதனத்தின் சில பாதுகாப்பு அம்சங்களை தொலைநிலையில் கட்டுப்படுத்த <xliff:g id="SERVER">%s</xliff:g> சேவையகத்துக்கு உங்கள் அனுமதி தேவைப்படுகிறது."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"விவரங்களைத் திருத்து"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" க்கு உங்கள் பூட்டுத் திரை PIN அல்லது கடவுச்சொல்லை மாற்ற வேண்டும்."</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"பூட்டுத் திரை கடவுச்சொல் காலாவதியாகிறது"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"உங்கள் பூட்டுத் திரை PIN அல்லது கடவுச்சொல் காலாவதியாகிவிட்டது."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"பூட்டுத் திரை கடவுச்சொல் காலாவதியானது"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"பூட்டுத் திரை கடவுச்சொல் காலாவதியாகிறது"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"உங்கள் பூட்டுத் திரை PIN அல்லது கடவுச்சொல்லை விரைவிலேயே கண்டிப்பாக மாற்ற வேண்டும் அல்லது <xliff:g id="ACCOUNT">%s</xliff:g> க்கான தரவு அழிக்கப்படும். அதை இப்போதே மாற்ற விரும்புகிறீர்களா?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"பூட்டுத் திரை கடவுச்சொல் காலாவதியானது"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"உங்கள் சாதனத்திலிருந்து <xliff:g id="ACCOUNT">%s</xliff:g> க்கான தரவு அழிக்கப்படுகிறது. உங்கள் பூட்டுத் திரை PIN அல்லது கடவுச்சொல்லை மாற்றுவதன் மூலம் அதை மீட்டெடுக்கலாம். அதை இப்போது மாற்ற விரும்புகிறீர்களா?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"சேமிக்கப்படாத மாற்றங்களை நிராகரிக்கவா?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"உள்நுழைய முடியவில்லை"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> க்கான பயனர்பெயர் அல்லது கடவுச்சொல் தவறானது. இப்போது அவற்றைப் புதுப்பிக்க விரும்புகிறீர்களா?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"<xliff:g id="ACCOUNT">%s</xliff:g> இல் உங்கள் உள்நுழைவு தோல்வியடைந்தது; சேவையகம் பின்வரும் காரணத்தைக் கூறியது: <xliff:g id="REASON">%s</xliff:g> உங்கள் பயனர்பெயர் மற்றும்/அல்லது கடவுச்சொல்லைப் புதுப்பிக்க விரும்புகிறீர்களா?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"இணைப்புகளைப் பதிவிறக்கு"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Wi-Fi வழியாக சமீபத்திய செய்திகளிலிருந்து இணைப்புகளை தானாக பதிவிறக்கும்"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"மின்னஞ்சல் அறிவிப்புகள்"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"ஒத்திசைவின் கால இடைவெளி, அறிவிப்புகள், முதலியன"</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"மின்னஞ்சல் வரும்போது அறிவிக்கவும்"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"ஒத்திசைவின் கால இடைவெளி"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"உள்வரும் செய்திகளின் அமைப்புகள்"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"பயனர்பெயர், கடவுச்சொல் மற்றும் பிற உள்வரும் சேவையக அமைப்புகள்"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"வெளிச்செல்லும் செய்திகளின் அமைப்புகள்"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"பயனர்பெயர், கடவுச்சொல் மற்றும் பிற வெளிசெல்லும் சேவையக அமைப்புகள்"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"கொள்கைகள் செயல்படுத்தப்பட்டன"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"ஏதுமில்லை"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"ஆதரிக்கப்படாத கொள்கைகள்"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"எதுவுமில்லை"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"ஒத்திசைக்க முயற்சிசெய்"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"இந்தக் கணக்கை ஒத்திசைக்க இங்கே தொடவும்"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"கணக்கின் பெயர்"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"உங்கள் பெயர்"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"விரைவு பதில்கள்"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"மின்னஞ்சலை எழுதும்போது நீங்கள் அடிக்கடி செருகும் உரையைத் திருத்தவும்"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"அறிவிப்பு அமைப்புகள்"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"தரவு பயன்பாடு"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"பாதுகாப்பு கொள்கைகள்"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"முறைமை கோப்புகள்"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"குப்பை கோப்புறை"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"உங்கள் சேவையகத்தின் குப்பை கோப்புறையைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"உங்கள் சேவையகத்தின் குப்பை கோப்புறையைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"அனுப்பிய உருப்படிகள் கோப்புறை"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"உங்கள் சேவையகத்தின் அனுப்பிய உருப்படிகள் கோப்புறையைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"உங்கள் சேவையகத்தின் அனுப்பிய உருப்படிகள் கோப்புறையைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"விரைவு பதில்"</string>
-    <string name="save_action" msgid="1988862706623227093">"சேமி"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"தொடர்புகளை ஒத்திசை"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"இந்தக் கணக்கின் தொடர்புகளை ஒத்திசை"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"கேலெண்டரை ஒத்திசை"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"இந்தக் கணக்கிற்கான கேலெண்டர் நிகழ்வை ஒத்திசை"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"மின்னஞ்சலை ஒத்திசை"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"இந்த கணக்கிற்கான மின்னஞ்சலை ஒத்திசை"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"அதிர்வு"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"ரிங்டோனைத் தேர்வுசெய்"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"சேவையக அமைப்புகள்"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"ஒத்திசைவு விருப்பங்கள்"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"ஒத்திசைவு விருப்பங்கள் (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"இந்தக் கோப்புறையை ஒத்திசை"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"இணைக்கப்படும்போது செய்திகள் பதிவிறக்கப்படும்"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"அஞ்சலை ஒத்திசைப்பதற்கான நாட்கள்"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"அனுப்புநரின் படம்"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"இந்த நிரலை இணைக்க அனுமதிக்கும் POP அணுகல், சில \"Plus\" கணக்குகளில் மட்டுமே இருக்கும். உங்கள் சரியான மின்னஞ்சல் முகவரி மற்றும் கடவுச்சொல் மூலம் உள்நுழைய முடியவில்லையெனில், உங்களிடம் கட்டணம் செலுத்தப்பட்ட \"Plus\" கணக்கு இல்லாமல் இருக்கலாம். இந்த மின்னஞ்சல் கணக்குகளுக்கான அணுகலைப் பெற இணைய உலாவியைத் திறக்கவும்."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"இந்த மின்னஞ்சல் கணக்கை அமைக்கும் முன்பு, T-ஆன்லைன் இணையதளத்தைப் பார்வையிட்டு, POP3 மின்னஞ்சல் அணுகலுக்கான கடவுச்சொல்லை உருவாக்கவும்."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"பெருநிறுவனம்"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"கணக்கை உருவாக்க முடியவில்லை. மீண்டும் முயற்சிக்கவும்."</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"மின்னஞ்சல்"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"சேவையகம் சார்ந்த பாதுகாப்பு கொள்கைகளை இயக்குகிறது"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"அமைப்புகள்"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"பொது அமைப்புகள்"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"நீக்கும் முன்பு உறுதிசெய்"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"அனுப்பும் முன் உறுதிசெய்க"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"மின்னஞ்சலில் தேடு"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"சாதனத்தின் கேமராவைப் பயன்படுத்த அனுமதிக்க வேண்டாம்"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"சாதனக் கடவுச்சொல்லைக் கோரு"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"சமீபத்திய கடவுச்சொற்களின் மறுபயன்பாட்டை கட்டுப்படுத்து"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"கடவுச்சொற்களைக் காலாவதியாக்கக் கோரு"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"திரை பூட்டப்படுவதற்கு முன்பு, சாதனம் செயல்படாமல் இருக்க வேண்டிய நேரத்தைக் கோரு"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"ஒத்திசைக்கப்பட்ட கேலெண்டர் நிகழ்வுகளின் எண்ணிக்கையைக் கட்டுப்படுத்து"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"ஒத்திசைக்கப்பட்ட மின்னஞ்சல்களின் எண்ணிக்கையைக் கட்டுப்படுத்து"</string>
-    <string name="quick_1" msgid="3426057697353380951">"நன்றி!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"எனக்கு ஏற்றது போல் தெரிகிறதே!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"இதைப் பின்னர் படித்து, உங்களைத் தொடர்புகொள்கிறேன்."</string>
-    <string name="quick_4" msgid="3988974084396883051">"இதை விவாதிக்க சந்திப்பை அமைப்பொம்."</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"ரோமிங்கில் இருக்கும்போது இந்தக் கணக்கிற்கான பின்புல ஒத்திசைவு முடக்கப்பட்டுள்ளது."</string>
-    <string name="confirm_response" msgid="9151965975158906286">"பதிலை அனுப்புகிறது..."</string>
-    <string name="no_conversations" msgid="5559527390337162819">"செய்திகள் இல்லை."</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"கோப்புறை தேர்ந்தெடுப்பான்"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> க்கு சேவையக குப்பை கோப்புறையைத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g> க்கு, சேவையக அனுப்பிய உருப்படிகள் கோப்புறையை தேர்ந்தெடுக்கவும்"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"கோப்புறைப் பட்டியலை ஏற்றுகிறது..."</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"ஏதுமில்லை"</string>
-</resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
deleted file mode 100644
index 0a40bc9..0000000
--- a/res/values-te-rIN/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"ఇమెయిల్ జోడింపులను చదవడం"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"మీ ఇమెయిల్ జోడింపులను చదవడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"ఇమెయిల్ ప్రదాత డేటాను ప్రాప్యత చేయడం"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"స్వీకరించిన సందేశాలు, పంపిన సందేశాలు, వినియోగదారు పేర్లు మరియు పాస్‌వర్డ్‌లతో సహా మీ ఇమెయిల్ డేటాబేస్‌ను ప్రాప్యత చేయడానికి అనువర్తనాన్ని అనుమతిస్తుంది."</string>
-    <string name="app_name" msgid="5815426892327290362">"ఇమెయిల్"</string>
-    <string name="debug_title" msgid="5175710493691536719">"డీబగ్"</string>
-    <string name="next_action" msgid="3931301986364184415">"తదుపరి"</string>
-    <string name="previous_action" msgid="5181616311579820981">"మునుపటి"</string>
-    <string name="done_action" msgid="7497990549515580249">"పూర్తయింది"</string>
-    <string name="create_action" msgid="3062715563215392251">"కొత్తదాన్ని సృష్టించు"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"శీఘ్ర ప్రతిస్పందనలు ఏవీ లేవు."</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"ఖాతా సెట్టింగ్‌లు"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"సమకాలీకరణ ఎంపికలు"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"కనెక్షన్ సమస్య."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"సందేశాన్ని తరలించండి"</item>
-    <item quantity="other" msgid="371256717624461324">"సందేశాలను తరలించండి"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 ఖాతాల్లో తరలింపుకి మద్దతు లేదు."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"ఎంపిక బహుళ ఖాతాలను కలిగి ఉన్నందున తరలింపు కుదరదు."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"చిత్తుప్రతులు, అవుట్‌బాక్స్‌ మరియు పంపబడినవిలోని సందేశాలు తరలించబడవు."</string>
-    <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="mailbox_name_display_starred" msgid="7788694947644186069">"నక్షత్రం గుర్తు ఉన్నవి"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"చదవనివి"</string>
-    <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="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"సంయుక్త వీక్షణ"</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>\nCC: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"శీఘ్ర ప్రతిస్పందనను చొప్పించండి"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"శీఘ్ర ప్రతిస్పందనను చొప్పించు"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"మీ ఫార్వార్డ్ చేసిన సందేశంలోని ఒకటి లేదా అంతకంటే ఎక్కువ జోడింపులు పంపడానికి ముందు డౌన్‌లోడ్ చేయబడతాయి."</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"జోడింపును డౌన్‌లోడ్ చేయడం సాధ్యపడలేదు."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"సందేశాన్ని డీకోడ్ చేస్తున్నప్పుడు లోపం ఏర్పడింది."</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"ఒకటి లేదా అంతకంటే ఎక్కువ జోడింపులను ఫార్వార్డ్ చేయడం సాధ్యపడలేదు."</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"జోడింపు ఫార్వార్డ్ చేయబడలేదు"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> సైన్ ఇన్ విఫలమైంది."</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"సైన్ ఇన్ చేయడం సాధ్యపడలేదు"</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>
-  </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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"ఖాతా సెటప్"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"ప్రామాణీకరణను అభ్యర్థిస్తోంది"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"సైన్ ఇన్ చేయండి"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"ప్రామాణీకరించడం సాధ్యపడలేదు"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"ఇమెయిల్ చిరునామా లేదా పాస్‌వర్డ్ చెల్లదు"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"ఇమెయిల్ చిరునామా:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"ఇమెయిల్ ఖాతా"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"మీరు కేవలం కొన్ని దశల్లో మీ ఖాతాను సెటప్ చేయవచ్చు."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ఇమెయిల్ చిరునామా"</string>
-    <string name="or_label" msgid="2207403489755254427">"లేదా"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Googleతో సైన్ ఇన్ చేయండి"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"పాస్‌వర్డ్"</string>
-    <string name="password_hint" msgid="8835390747504721561">"పాస్‌వర్డ్"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"%sతో సైన్ ఇన్ చేసారు"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"ప్రామాణీకరణ"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"ప్రామాణీకరణను జోడించండి"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"ప్రామాణీకరణను క్లియర్ చేయి"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"మాన్యువల్‌ సెటప్"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"చెల్లుబాటు అయ్యే ఇమెయిల్ చిరునామా మరియు పాస్‌వర్డ్‌ను టైప్ చేయండి."</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"నకిలీ ఖాతా"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"మీరు ఇప్పటికే \"<xliff:g id="DUPLICATE">%s</xliff:g>\" ఖాతా కోసం ఈ వినియోగదారు పేరుని ఉపయోగిస్తున్నారు."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"ఈ పాస్‌వర్డ్ ఒకటి లేదా అంతకంటే ఎక్కువ ఖాళీ అక్షరాలతో ప్రారంభమవుతోంది లేదా ముగుస్తోంది. చాలా సర్వర్‌లు ఖాళీలతో ఉండే పాస్‌వర్డ్‌లకు మద్దతు ఇవ్వవు."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"ఖాతా సమాచారాన్ని పునరుద్ధరిస్తోంది…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"సర్వర్ సెట్టింగ్‌లను ప్రామాణీకరిస్తోంది…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"smtp సెట్టింగ్‌లను ప్రామాణీకరిస్తోంది…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"ఖాతాను సృష్టిస్తోంది…"</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"ఖాతా రకాన్ని నిర్ధారించండి"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"మీరు <xliff:g id="EMAIL">%1$s</xliff:g> <xliff:g id="USERPROTOCOL">%2$s</xliff:g>ని ఉపయోగిస్తున్నట్లు సూచించారు, కానీ ఖాతా <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g>ని ఉపయోగించవచ్చు"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"ఖాతా సెటప్"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"మీ ఖాతా సెటప్ చేయబడింది మరియు ఇమెయిల్‌కు మార్గం సుగమమైంది!"</string>
-    <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_names_user_name_empty_error" msgid="6791427018325367364">"ఈ ఫీల్డ్‌ను ఖాళీగా వదిలిపెట్టకూడదు."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"ఖాతా సెటప్"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"ఖాతా రకం"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"ఇది ఏ రకమైన ఖాతా?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"ఖాతా సెటప్"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"ఇన్‌కమింగ్ సర్వర్ సెట్టింగ్‌లు"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"వినియోగదారు పేరు"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"పాస్‌వర్డ్"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"పాస్‌వర్డ్"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"సర్వర్"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"పోర్ట్"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"భద్రత రకం"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"ఏదీ వద్దు"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (అన్ని ప్రమాణపత్రాలను ఆమోదించు)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (అన్ని ప్రమాణపత్రాలను ఆమోదించు)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"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>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"ఖాతా సెటప్"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"అవుట్‌గోయింగ్ సర్వర్ సెట్టింగ్‌లు"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP సర్వర్"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"పోర్ట్"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"భద్రత రకం"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"సైన్ ఇన్ అవసరం"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"వినియోగదారు పేరు"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"పాస్‌వర్డ్"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"క్లయింట్ ప్రమాణపత్రం"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"ఎంచుకోండి"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"క్లయింట్ ప్రమాణపత్రాన్ని ఉపయోగించు"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"తీసివేయి"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"ఏదీ వద్దు"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"మొబైల్ పరికరం ID"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"ఖాతా సెట్టింగ్‌లు"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"ఖాతా ఎంపికలు"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"సమకాలీకరణ తరచుదనం:"</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_notify_label" msgid="7046146571560728829">"ఇమెయిల్ వచ్చినప్పుడు నాకు తెలియజేయి"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"ఈ ఖాతా నుండి పరిచయాలను సమకాలీకరించు"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"ఈ ఖాతా నుండి క్యాలెండర్‌ను సమకాలీకరించు"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"ఈ ఖాతా నుండి ఇమెయిల్‌ను సమకాలీకరించు"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fiకి కనెక్ట్ చేసినప్పుడు జోడింపులను స్వయంచాలకంగా డౌన్‌లోడ్ చేయి"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"పూర్తి చేయడం సాధ్యపడలేదు"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"దీని నుండి ఇమెయిల్‌లను సమకాలీకరించు:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"స్వయంచాలకం"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"చివరి రోజు"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"గత మూడు రోజులు"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"గత వారం"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"గత రెండు వారాలు"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"గత నెల"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"అన్నీ"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"ఖాతాను డిఫాల్ట్‌గా ఉపయోగించు"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"వినియోగదారు పేరు లేదా పాస్‌వర్డ్ చెల్లదు."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"లాగిన్ విఫలమైంది.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"ఖాతా సెటప్‌తో సమస్య"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"వినియోగదారు పేరు, పాస్‌వర్డ్ మరియు ఖాతా సెట్టింగ్‌లు సరైనవని నిర్ధారించండి."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"సర్వర్‌కు సురక్షితంగా కనెక్ట్ చేయడం కుదరదు."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"సర్వర్‌కు సురక్షితంగా కనెక్ట్ చేయడం కుదరదు.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"క్లయింట్ ప్రమాణపత్రం అవసరం. మీరు క్లయింట్ ప్రమాణపత్రంతో సర్వర్‌కు కనెక్ట్ చేయాలనుకుంటున్నారా?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"ప్రమాణపత్రం చెల్లదు లేదా ప్రాప్యత చేయదగినది కాదు."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"సర్వర్ లోపం ఉన్నట్లు ప్రతిస్పందించింది. మీ వినియోగదారు పేరు మరియు పాస్‌వర్డ్‌ను తనిఖీ చేసి, ఆపై మళ్లీ ప్రయత్నించండి."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"సర్వర్‌కు కనెక్ట్ చేయడం కుదరదు."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"సర్వర్‌కు కనెక్ట్ చేయడం కుదరదు.\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="6799839150250217566">"ప్రామాణీకరణ పద్ధతులకు సర్వర్ మద్దతు ఇవ్వదు."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"భద్రతా లోపం కారణంగా సర్వర్‌కు కనెక్షన్‌ను తెరవడం సాధ్యపడలేదు."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"సర్వర్‌కు కనెక్షన్‌ను తెరవడం సాధ్యపడలేదు."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"మీరు చెల్లని సర్వర్ చిరునామాను నమోదు చేసారు లేదా ఇమెయిల్‌ మద్దతివ్వని ప్రోటోకాల్ సంస్కరణ సర్వర్‌కి అవసరం."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"ఈ సర్వర్‌తో సమకాలీకరించడానికి మీకు అనుమతి లేదు. మరింత సమాచారం కోసం మీ సర్వర్ నిర్వాహకుడిని సంప్రదించండి."</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"రిమోట్ భద్రతా నిర్వహణ"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"<xliff:g id="SERVER">%s</xliff:g> సర్వర్ మీ Android పరికరం యొక్క కొన్ని భద్రతా లక్షణాలను రిమోట్‌గా నియంత్రించడానికి మీరు దాన్ని అనుమతించడం అవసరం. మీరు ఈ ఖాతాను సెట్ చేయడం పూర్తి చేయాలనుకుంటున్నారా?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"ఈ సర్వర్‌కు దీనితో సహా, మీ Android పరికరం మద్దతివ్వని భద్రతా లక్షణాలు అవసరం: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"మీరు ఖాతా యొక్క వినియోగదారు పేరుని మార్చలేరు. వేరే వినియోగదారు పేరుతో ఖాతాను జోడించడానికి, ఖాతాను జోడించు తాకండి."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"హెచ్చరిక: మీ పరికరాన్ని నిర్వహించడానికి ఇమెయిల్ అనువర్తనానికి గల అధికారాన్ని నిష్క్రియం చేయడం వలన అది అవసరమయ్యే అన్ని ఇమెయిల్ ఖాతాలు అలాగే వాటి ఇమెయిల్, పరిచయాలు, క్యాలెండర్ ఈవెంట్‌లు మరియు ఇతర డేటా తొలగించబడతాయి."</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"భద్రతా నవీకరణ"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"మీరు మీ భద్రతా సెట్టింగ్‌లను నవీకరించాలని <xliff:g id="ACCOUNT">%s</xliff:g> కోరుతోంది."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"భద్రతా అవసరాల కారణంగా \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ఖాతా సమకాలీకరించబడదు."</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ఖాతాకు భద్రతా సెట్టింగ్‌ల నవీకరణ అవసరం."</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ఖాతా దాని భద్రతా సెట్టింగ్‌లను మార్చింది; వినియోగదారు చర్య ఏదీ అవసరం లేదు."</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"భద్రతా నవీకరణ అవసరం"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"భద్రతా విధానాలు మార్చబడ్డాయి"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"భద్రతా విధానాలకు అనుకూలంగా లేదు"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"పరికర భద్రత"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g> సర్వర్ మీ Android పరికరం యొక్క కొన్ని భద్రతా లక్షణాలను రిమోట్‌గా నియంత్రించడానికి మీరు దాన్ని అనుమతించడం అవసరం."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"వివరాలను సవరించు"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"మీరు మీ లాక్ స్క్రీన్ PINను లేదా పాస్‌వర్డ్‌ను మార్చాలని \"<xliff:g id="ACCOUNT">%s</xliff:g>\" కోరుతోంది."</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"లాక్ స్క్రీన్ పాస్‌వర్డ్ గడువు ముగుస్తోంది"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"మీ లాక్ స్క్రీన్ PIN లేదా పాస్‌వర్డ్ గడువు ముగిసింది."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"లాక్ స్క్రీన్ పాస్‌వర్డ్ గడువు ముగిసింది"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"లాక్ స్క్రీన్ పాస్‌వర్డ్ గడువు ముగుస్తోంది"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"మీరు మీ లాక్ స్క్రీన్ PINను లేదా పాస్‌వర్డ్‌ను త్వరలో మార్చాలి లేకపోతే <xliff:g id="ACCOUNT">%s</xliff:g>కి సంబంధించిన డేటా తొలగించబడుతుంది. మీరు ఇప్పుడే దీన్ని మార్చాలనుకుంటున్నారా?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"లాక్ స్క్రీన్ పాస్‌వర్డ్ గడువు ముగిసింది"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"మీ పరికరం నుండి <xliff:g id="ACCOUNT">%s</xliff:g>కి సంబంధించిన డేటా తొలగించబడుతోంది. మీరు మీ లాక్ స్క్రీన్ PINను లేదా పాస్‌వర్డ్‌ను మార్చడం ద్వారా దాన్ని పునరుద్ధరించవచ్చు. మీరు ఇప్పుడే దీన్ని మార్చాలనుకుంటున్నారా?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"సేవ్ చేయని మార్పులను విస్మరించాలా?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"సైన్ ఇన్ చేయడం సాధ్యపడలేదు"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g>కి సంబంధించిన వినియోగదారు పేరు లేదా పాస్‌వర్డ్ చెల్లదు. మీరు ఇప్పుడే వాటిని నవీకరించాలనుకుంటున్నారా?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"<xliff:g id="ACCOUNT">%s</xliff:g>కి సంబంధించిన మీ లాగిన్ విఫలమైంది; సర్వర్ ఇలా తెలిపింది: <xliff:g id="REASON">%s</xliff:g> మీరు మీ వినియోగదారు పేరు మరియు/లేదా పాస్‌వర్డ్‌ను నవీకరించాలనుకుంటున్నారా?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"జోడింపులను డౌన్‌లోడ్ చేయి"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Wi-Fi ద్వారా ఇటీవలి సందేశాలకు ఉన్న జోడింపులను స్వయంచాలకంగా డౌన్‌లోడ్ చేయండి"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"ఇమెయిల్ నోటిఫికేషన్‌లు"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"సమకాలీకరణ తరచుదనం, నోటిఫికేషన్‌లు మొదలైనవి"</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"ఇమెయిల్ వచ్చినప్పుడు నోటిఫికేషన్‌ను పంపు"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"సమకాలీకరణ తరచుదనం"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"ఇన్‌కమింగ్ సెట్టింగ్‌లు"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"వినియోగదారు పేరు, పాస్‌వర్డ్ మరియు ఇతర ఇన్‌కమింగ్ సర్వర్ సెట్టింగ్‌లు"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"అవుట్‌గోయింగ్ సెట్టింగ్‌లు"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"వినియోగదారు పేరు, పాస్‌వర్డ్ మరియు ఇతర అవుట్‌గోయింగ్ సర్వర్ సెట్టింగ్‌లు"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"అమలు చేయబడిన విధానాలు"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"ఏదీ వద్దు"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"మద్దతు లేని విధానాలు"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"ఏదీ వద్దు"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"సమకాలీకరించడానికి ప్రయత్నించు"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"ఈ ఖాతాను సమకాలీకరించడానికి ఇక్కడ తాకండి"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"ఖాతా పేరు"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"మీ పేరు"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"శీఘ్ర ప్రతిస్పందనలు"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"మీరు ఇమెయిల్‌ను కంపోజ్ చేస్తున్నప్పుడు తరచుగా చొప్పించే వచనాన్ని సవరించండి"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"నోటిఫికేషన్ సెట్టింగ్‌లు"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"డేటా వినియోగం"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"భద్రతా విధానాలు"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"సిస్టమ్‌‌ ఫోల్డర్‌లు"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"ట్రాష్ ఫోల్డర్"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"మీ సర్వర్ యొక్క ట్రాష్ ఫోల్డర్‌ను ఎంచుకోండి"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"మీ సర్వర్ యొక్క ట్రాష్ ఫోల్డర్‌ను ఎంచుకోండి"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"పంపిన అంశాల ఫోల్డర్"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"మీ సర్వర్ యొక్క పంపిన అంశాల ఫోల్డర్‌ను ఎంచుకోండి"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"మీ సర్వర్ యొక్క పంపిన అంశాల ఫోల్డర్‌ను ఎంచుకోండి"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"శీఘ్ర ప్రతిస్పందన"</string>
-    <string name="save_action" msgid="1988862706623227093">"సేవ్ చేయి"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"పరిచయాలను సమకాలీకరించు"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"ఈ ఖాతా కోసం పరిచయాలను సమకాలీకరించు"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"క్యాలెండర్‌ను సమకాలీకరించు"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"ఈ ఖాతా కోసం క్యాలెండర్ ఈవెంట్‌ను సమకాలీకరించు"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ఇమెయిల్‌ను సమకాలీకరించు"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"ఈ ఖాతా కోసం ఇమెయిల్‌ను సమకాలీకరించు"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"వైబ్రేట్"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"రింగ్‌టోన్‌ను ఎంచుకోండి"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"సర్వర్ సెట్టింగ్‌లు"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"సమకాలీకరణ ఎంపికలు"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"సమకాలీకరణ ఎంపికలు (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"ఈ ఫోల్డర్‌ను సమకాలీకరించు"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"కనెక్ట్ చేసినప్పుడు సందేశాలు డౌన్‌లోడ్ చేయబడతాయి"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"మెయిల్‌ను సమకాలీకరించాల్సిన రోజులు"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"పంపినవారి చిత్రం"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"ఈ ప్రోగ్రామ్‌ను కనెక్ట్ చేయడానికి అనుమతించే POP ప్రాప్యత కొన్ని \"Plus\" ఖాతాలకు మాత్రమే ఉంది. మీరు మీ సరైన ఇమెయిల్ చిరునామా మరియు పాస్‌వర్డ్‌తో సైన్ ఇన్ చేయలేకపోతున్నారంటే, మీకు చెల్లింపు \"Plus\" ఖాతా ఉండి ఉండకపోవచ్చు. ఈ ఇమెయిల్ ఖాతాలకు ప్రాప్యతను పొందడానికి వెబ్ బ్రౌజర్‌ను ప్రారంభించండి."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"ఈ ఇమెయిల్ ఖాతాను సెటప్ చేయడానికి ముందు, T-ఆన్‌లైన్ వెబ్‌సైట్‌ను సందర్శించండి మరియు POP3 ఇమెయిల్ ప్రాప్యత కోసం పాస్‌వర్డ్‌ను సృష్టించండి."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"కార్పొరేట్"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"ఖాతాను సృష్టించడం సాధ్యపడలేదు. మళ్లీ ప్రయత్నించండి."</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"ఇమెయిల్"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"సర్వర్ నిర్దిష్ట భద్రతా విధానాలను ప్రారంభిస్తుంది"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"సెట్టింగ్‌లు"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"సాధారణ సెట్టింగ్‌లు"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"తొలగించడానికి ముందు నిర్ధారించబడాలి"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"పంపడానికి ముందు నిర్ధారించు"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"ఇమెయిల్‌ను శోధించండి"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"పరికర కెమెరా యొక్క ఉపయోగం అనుమతిని రద్దు చేయండి"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"పరికర పాస్‌వర్డ్ అవసరం"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"ఇటీవలి పాస్‌వర్డ్‌ల పునరుపయోగాన్ని పరిమితం చేయండి"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"పాస్‌వర్డ్‌లకు గడువు ముగింపు ఆవశ్యకం"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"స్క్రీన్ లాక్ చేయబడటానికి పరికరం నిష్క్రియంగా ఉండటం అవసరం"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"సమకాలీకరించిన క్యాలెండర్ ఈవెంట్‌ల సంఖ్యను పరిమితం చేయండి"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"సమకాలీకరించే ఇమెయిల్‌ల సంఖ్యను పరిమితం చేయండి"</string>
-    <string name="quick_1" msgid="3426057697353380951">"ధన్యవాదాలు!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"తక్షణం ప్రతిస్పందించడం బాగా ఉంది!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"నేను దీన్ని తర్వాత చదివి, మిమ్మల్ని సంప్రదిస్తాను."</string>
-    <string name="quick_4" msgid="3988974084396883051">"దీని గురించి చర్చించేందుకు సమావేశాన్ని ఏర్పాటు చేద్దాం."</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"ఈ ఖాతా యొక్క నేపథ్య సమకాలీకరణ రోమింగ్‌లో ఉన్నప్పుడు నిలిపివేయబడుతుంది."</string>
-    <string name="confirm_response" msgid="9151965975158906286">"ప్రతిస్పందనను పంపుతోంది…"</string>
-    <string name="no_conversations" msgid="5559527390337162819">"సందేశాలు లేవు."</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"ఫోల్డర్ ఎంపిక"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> కోసం సర్వర్ ట్రాష్ ఫోల్డర్‌ను ఎంచుకోండి"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g> కోసం సర్వర్ పంపిన అంశాల ఫోల్డర్‌ను ఎంచుకోండి"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"ఫోల్డర్ జాబితాను లోడ్ చేస్తోంది…"</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"ఏదీ అందుబాటులో లేదు"</string>
-</resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
deleted file mode 100644
index 3b03fb8..0000000
--- a/res/values-ur-rPK/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"ای میل کے منسلکات پڑھیں"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"ایپ کو آپ کے ای میل کے منسلکات پڑھنے کی اجازت دیتا ہے۔"</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"ای میل فراہم کنندہ کے ڈیٹا تک رسائی حاصل کریں"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"ایپ کو آپ کے ای میل ڈیٹابیس، بشمول موصولہ پیغامات، مرسلہ پیغامات، صارف نام اور پاس ورڈز تک رسائی حاصل کرنے کی اجازت دیتا ہے۔"</string>
-    <string name="app_name" msgid="5815426892327290362">"ای میل"</string>
-    <string name="debug_title" msgid="5175710493691536719">"ڈیبگ کریں"</string>
-    <string name="next_action" msgid="3931301986364184415">"آگے"</string>
-    <string name="previous_action" msgid="5181616311579820981">"گزشتہ"</string>
-    <string name="done_action" msgid="7497990549515580249">"ہوگیا"</string>
-    <string name="create_action" msgid="3062715563215392251">"نیا بنائیں"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"کوئی فوری جوابات نہیں ہیں۔"</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"اکاؤنٹ کی ترتیبات"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"مطابقت پذیری کے اختیارات"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"کنکشن کا مسئلہ۔"</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"پیغام منتقل کریں"</item>
-    <item quantity="other" msgid="371256717624461324">"پیغامات منتقل کریں"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"‏منتقلی POP3 اکاؤنٹس پر تعاون یافتہ نہیں ہے۔"</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"انتخاب متعدد اکاؤنٹس پر مشتمل ہونے کی وجہ سے منتقل نہیں ہوسکتے۔"</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"مسودے، آؤٹ باکس اور مرسلہ میں موجود پیغامات منتقل نہیں کیے جا سکتے ہیں۔"</string>
-    <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="mailbox_name_display_starred" msgid="7788694947644186069">"ستارے کے نشان والا"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"بغیر پڑھے ہوئے"</string>
-    <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="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"مشترکہ منظر"</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>\nCC: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"فوری جواب داخل کریں"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"فوری جواب داخل کریں"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"آپ کے فارورڈ کیے ہوئے پیغام میں ایک یا زیادہ منسلکات بھیجنے سے پہلے ڈاؤن لوڈ ہوں گے۔"</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"منسلکہ کو ڈاؤن لوڈ نہیں کرسکا۔"</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"پیغام کو ڈیکوڈ کرتے وقت ایک خرابی تھی۔"</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"ایک یا مزید منسلکات کو آگے فارورڈ نہیں کر سکے۔"</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"منسلکہ کو فارورڈ نہیں کیا گیا"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> سائن ان ناکام رہا۔"</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"سائن ان نہیں کر سکے"</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>
-  </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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"اکاؤنٹ سیٹ اپ"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"اجازت طلب کر رہا ہے"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"سائن ان کریں"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"توثیق کرنے سے قاصر"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"ای میل پتہ یا پاس ورڈ غلط ہیں"</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"ای میل پتہ:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"ای میل اکاؤنٹ"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"آپ صرف چند مراحل میں اپنا اکاؤنٹ سیٹ اپ کر سکتے ہیں۔"</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"ای میل پتہ"</string>
-    <string name="or_label" msgid="2207403489755254427">"یا"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"‏Google کے ساتھ سائن ان کریں"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"پاس ورڈ"</string>
-    <string name="password_hint" msgid="8835390747504721561">"پاس ورڈ"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"‏‎%s کے ساتھ سائن ان ہیں"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"توثیق"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"توثیق شامل کریں"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"تصدیق صاف کریں"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"دستی سیٹ اپ"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"ایک درست ای میل پتہ اور پاس ورڈ ٹائپ کریں۔"</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"ڈپلیکیٹ اکاؤنٹ"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"آپ اکاؤنٹ \"<xliff:g id="DUPLICATE">%s</xliff:g>\" کیلئے پہلے سے ہی اس صارف نام کا استعمال کر رہے ہیں۔"</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"یہ پاس ورڈ ایک یا زائد خالی جگہ والے حروف کے ساتھ شروع یا ختم ہوتا ہے۔ بہت سارے سرورز خالی جگہوں والے پاس ورڈ کا تعاون نہیں کرتے ہیں۔"</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"اکاؤنٹ کی معلومات بازیافت کر رہا ہے…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"سرور کی ترتیبات کی توثیق کر رہا ہے…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"‏smtp کی ترتیبات کی توثیق کر رہا ہے…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"اکاؤنٹ بنا رہا ہے…"</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"اکاؤنٹ کی قسم کی توثیق کریں"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"آپ نے نشاندہی کی کہ <xliff:g id="EMAIL">%1$s</xliff:g> <xliff:g id="USERPROTOCOL">%2$s</xliff:g> کا استعمال کرتا ہے، لیکن اکاؤنٹ <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> کا استعمال کر سکتا ہے"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"اکاؤنٹ سیٹ اپ"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"آپ کا اکاؤنٹ سیٹ اپ ہوگیا ہے اور ای میل جلد ہی پہنچے گا!"</string>
-    <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_names_user_name_empty_error" msgid="6791427018325367364">"یہ فیلڈ خالی نہیں رہ سکتی۔"</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"اکاؤنٹ سیٹ اپ"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"اکاؤنٹ کی قسم"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"یہ کس قسم کا اکاؤنٹ ہے؟"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"اکاؤنٹ سیٹ اپ"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"اِن کمنگ سرور کی ترتیبات"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"صارف کا نام"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"پاس ورڈ"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"پاس ورڈ"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"سرور"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"پورٹ"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"سیکیورٹی کی قسم"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"کوئی نہیں"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"‏SSL/TLS (تمام سرٹیفکیٹس قبول کریں)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"‏STARTTLS (سبھی سرٹیفکیٹس قبول کریں)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</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>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"اکاؤنٹ سیٹ اپ"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"آؤٹ گوئنگ سرور کی ترتیبات"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"‏SMTP سرور"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"پورٹ"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"سیکیورٹی کی قسم"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"سائن ان طلب کریں"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"صارف کا نام"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"پاس ورڈ"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"کلائنٹ سرٹیفکیٹ"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"منتخب کریں"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"کلائنٹ سرٹیفکیٹ استعمال کریں"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"ہٹائیں"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"کوئی نہیں"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"‏موبائل آلہ ID"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"اکاؤنٹ کی ترتیبات"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"اکاؤنٹ کے اختیارات"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"مطابقت پذیری کی فریکوئنسی:"</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_notify_label" msgid="7046146571560728829">"ای میل پہنچنے پر مجھے اطلاع دیں"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"رابطے اس اکاؤنٹ سے مطابقت پذیر بنائیں"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"کیلنڈر اس اکاؤنٹ سے مطابقت پذیر بنائیں"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"اس اکاؤنٹ سے ای میل کی مطابقت پذیری کریں"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"‏Wi-Fi سے مربوط ہونے پر منسلکات خود بخود ڈاؤن لوڈ کریں"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"پورا نہیں ہو سکا"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"ای میلز کی مطابقت پذیری کریں منجانب:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"خودکار"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"آخری دن"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"گزشتہ تین دن"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"گزشتہ ہفتہ"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"گزشتہ دو ہفتے"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"گزشتہ مہینہ"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"سبھی"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"اکاؤنٹ کا ڈیفالٹ استعمال کریں"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"صارف نام یا پاس ورڈ غلط ہے۔"</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"لاگ ان ناکام ہوگیا۔\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"اکاؤنٹ سیٹ اپ کے ساتھ مسئلہ"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"تصدیق کریں کہ صارف نام، پاس ورڈ اور اکاؤنٹ کی ترتیبات درست ہیں۔"</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"محفوظ طریقے سے سرور سے مربوط نہیں ہوسکتا۔"</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"محفوظ طریقے سے سرور سے مربوط نہیں ہوسکتا۔\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"ایک کلائنٹ سرٹیفکیٹ مطلوب ہے۔ کیا آپ ایک کلائنٹ سرٹیفکیٹ کے ساتھ سرور سے مربوط ہونا چاہتے ہیں؟"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"سرٹیفکیٹ غلط یا ناقابل رسائی ہے۔"</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"سرور نے ایک خرابی کے ساتھ جواب دیا۔ اپنا صارف نام اور پاس ورڈ چیک کریں پھر دوبارہ کوشش کریں۔"</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"سرور سے مربوط نہیں ہوسکتا۔"</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"سرور سے مربوط نہیں ہوسکتا۔\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="6799839150250217566">"توثیق کے طریقے سرور کے ذریعہ تعاون یافتہ نہیں ہیں۔"</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"سیکیورٹی کی خرابی کی وجہ سے سرور سے کنکشن نہیں کھول سکا۔"</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"سرور سے کنکشن نہیں کھول سکا۔"</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"آپ نے ایک غلط سرور کا پتہ ٹائپ کردیا یا سرور کو ایک ایسا پروٹوکول ورژن مطلوب ہے ای میل جس کا تعاون نہیں کرتا ہے۔"</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"آپ کو اس سرور کے ساتھ مطابقت پذیر بنانے کی اجازت نہیں ہے۔ مزید معلومات کیلئے اپنے سرور کے منتظم سے رابطہ کریں۔"</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"ریموٹ سیکیورٹی ایڈمنسٹریشن"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"‏سرور <xliff:g id="SERVER">%s</xliff:g> کا تقاضہ ہے کہ آپ اسے اپنے Android آلہ کی کچھ سیکیورٹی کی خصوصیات کو دور سے کنٹرول کرنے کی اجازت دیں۔ کیا آپ اس اکاؤنٹ کا سیٹ اپ مکمل کرنا چاہتے ہیں؟"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"‏اس سرور کو سیکیورٹی کی ایسی خصوصیات کی ضرورت ہے جس کا تعاون آپ کا Android آلہ نہیں کرتا ہے، بشمول: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"آپ ایک اکاؤنٹ کا صارف نام تبدیل نہیں کر سکتے ہیں۔ ایک مختلف صارف نام کے ساتھ ایک اکاؤنٹ شامل کرنے کیلئے اکاؤنٹ شامل کریں کو چھوئیں۔"</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"وارننگ: آپ کے آلے کا نظم و نسق کرنے کیلئے ای میل ایپس کا اختیار غیرفعال کرنے سے اس کا تقاضہ کرنے والے سبھی ای میل اکاؤنٹس، نیز ان کے ای میل، رابطے، کیلنڈر ایونٹس اور دیگر ڈیٹا حذف ہوجائیں گے۔"</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"سیکیورٹی اپ ڈیٹ"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> کیلئے ضروری ہے کہ آپ اپنی سیکیورٹی کی ترتیبات اپ ڈیٹ کریں۔"</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"اکاؤنٹ \"<xliff:g id="ACCOUNT">%s</xliff:g>\" کو سیکیورٹی کے تقاضوں کی وجہ سے مطابقت پذیر نہیں بنایا جاسکتا۔"</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"اکاؤنٹ \"<xliff:g id="ACCOUNT">%s</xliff:g>\" کو سیکیورٹی کی ترتیبات کا اپ ڈیٹ مطلوب ہے۔"</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"اکاؤنٹ \"<xliff:g id="ACCOUNT">%s</xliff:g>\" نے اپنی سیکیورٹی کی ترتیبات تبدیل کردیں؛ صارف کی کوئی کارروائی مطلوب نہیں ہے۔"</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"سیکیورٹی اپ ڈیٹ مطلوب ہے"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"سیکیورٹی کی پالیسیاں تبدیل ہوگئی ہیں"</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"سیکورٹی کی پالیسیاں پوری نہیں ہوسکتیں"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"آلہ کی سیکیورٹی"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"‏سرور <xliff:g id="SERVER">%s</xliff:g> کا تقاضہ ہے کہ آپ اسے اپنے Android آلہ کی کچھ سیکیورٹی کی خصوصیات کو دور سے کنٹرول کرنے کی اجازت دیں۔"</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"تفصیلات میں ترمیم کریں"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"‏\"<xliff:g id="ACCOUNT">%s</xliff:g>\" کیلئے ضروری ہے کہ آپ اپنے لاک اسکرین کا PIN یا پاس ورڈ تبدیل کریں۔"</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"لاک اسکرین کے پاس ورڈ کی میعاد ختم ہو رہی ہے"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"‏آپ کے لاک اسکرین کے PIN یا پاس ورڈ کی میعاد ختم ہوگئی"</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"لاک اسکرین کے پاس ورڈ کی میعاد ختم ہوگئی"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"لاک اسکرین کے پاس ورڈ کی میعاد ختم ہو رہی ہے"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"‏آپ کو جلد ہی اپنے لاک اسکرین کا PIN یا پاس ورڈ تبدیل کرنے کی ضرورت ہے ورنہ <xliff:g id="ACCOUNT">%s</xliff:g> کا ڈیٹا مٹ جائے گا۔ کیا آپ اسے ابھی تبدیل کرنا چاہتے ہیں؟"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"لاک اسکرین کے پاس ورڈ کی میعاد ختم ہوگئی"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"‏<xliff:g id="ACCOUNT">%s</xliff:g> کیلئے ڈیٹا کو آپ کے آلے سے مٹایا جا رہا ہے۔ آپ اپنے لاک اسکرین کا PIN یا پاس ورڈ تبدیل کرکے اس کو بحال کر سکتے ہیں۔ کیا آپ اسے ابھی تبدیل کرنا چاہتے ہیں؟"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"غیر محفوظ شدہ تبدیلیاں مسترد کریں؟"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"سائن ان نہیں کر سکے"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> کیلئے صارف نام یا پاس ورڈ غلط ہے۔ کیا آپ اسے ابھی اپ ڈیٹ کرنا چاہتے ہیں؟"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"<xliff:g id="ACCOUNT">%s</xliff:g> میں آپ کا لاگ ان ناکام ہوگیا؛ سرور نے کہا: <xliff:g id="REASON">%s</xliff:g> کیا آپ اپنا صارف نام اور/یا پاس ورڈ اپ ڈیٹ کرنا چاہتے ہیں؟"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"منسلکات ڈاؤن لوڈ کریں"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"‏حالیہ پیغامات کے منسلکات Wi-Fi کے ذریعہ خود بخود ڈاؤن لوڈ کریں"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"ای میل اطلاعات"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"مطابقت پذیری، اطلاعات، وغیرہ کی فریکوئنسی"</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"ای میل پہنچنے پر اطلاع بھیجیں"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"مطابقت پذیری کی فریکوئنسی"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"اِن کمنگ ترتیبات"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"صارف نام، پاس ورڈ اور دیگر اِن کمنگ سرور کی ترتیبات"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"آؤٹ گوئنگ ترتیبات"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"صارف نام، پاس ورڈ اور دیگر آؤٹ گوئنگ سرور کی ترتیبات"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"پالیسیاں نافذ ہوگئیں"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"کوئی نہیں"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"غیر تعاون یافتہ پالیسیاں"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"کوئی نہیں"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"مطابقت پذیری کرنے کی کوشش کریں"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"یہ اکاؤنٹ مطابقت پذیر بنانے کیلئے یہاں چھوئیں"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"اکاؤنٹ کا نام"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"آپ کا نام"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"فوری جوابات"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"ای میل تحریر کرتے وقت اکثر داخل کیے جانے والے متن میں ترمیم کریں"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"اطلاع کی ترتیبات"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"ڈیٹا کا استعمال"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"سیکیورٹی کی پالیسیاں"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"سسٹم فولڈرز"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"کوڑے دان والا فولڈر"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"اپنے سرور کے کوڑے دان کا فولڈر منتخب کریں"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"اپنے سرور کے کوڑے دان کا فولڈر منتخب کریں"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"مرسلہ آئٹمز کا فولڈر"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"اپنے سرور کے مرسلہ آئٹمز کا فولڈر منتخب کریں"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"اپنے سرور کے مرسلہ آئٹمز کا فولڈر منتخب کریں"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"فوری جواب"</string>
-    <string name="save_action" msgid="1988862706623227093">"محفوظ کریں"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"رابطے مطابقت پذیر بنائیں"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"اس اکاؤنٹ کیلئے رابطے مطابقت پذیر بنائیں"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"کیلنڈر مطابقت پذیر بنائیں"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"اس اکاؤنٹ کیلئے کیلنڈر ایونٹ مطابقت پذیر بنائیں"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"ای میل کو سنک کریں"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"اس اکاؤنٹ کیلئے ای میل مطابقت پذیر بنائیں"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"وائبریٹ کریں"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"رنگ ٹون منتخب کریں"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"سرور کی ترتیبات"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"مطابقت پذیری کے اختیارات"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"مطابقت پذیری کے اختیارات (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"یہ فولڈر مطابقت پذیر بنائیں"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"مربوط ہونے پر پیغامات ڈاؤن لوڈ ہوں گے"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"مطابقت پذیری کیلئے میل کے دن"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"مرسل کی تصویر"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"‏صرف کچھ \"پلس\" اکاؤنٹس میں POP رسائی شامل ہے جو اس پروگرام کو مربوط ہونے کی اجازت دیتے ہیں۔ اگر آپ اپنے درست ای میل پتہ اور پاس ورڈ کے ساتھ سائن ان کرنے سے قاصر ہیں تو ہوسکتا ہے کہ آپ کے پاس بامعاوضہ \"پلس\" اکاؤنٹ نہ ہو۔ ان ای میل اکاؤنٹس تک رسائی حاصل کرنے کے ویب براؤزر شروع کریں۔"</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"‏یہ ای میل اکاؤنٹ سیٹ اپ کرنے سے پہلے، T-Online ویب سائٹ ملاحظہ کریں اور POP3 ای میل تک رسائی کیلئے ایک پاس ورڈ بنائیں۔"</string>
-    <string name="exchange_name" msgid="1190783774800310346">"کارپوریٹ"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"اکاؤنٹ نہیں بنا سکا۔ دوبارہ کوشش کریں۔"</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"ای میل"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"سرور کیلئے مخصوص سیکیورٹی کی پالیسیاں فعال کرتا ہے"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"ترتیبات"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"عام ترتیبات"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"حذف کرنے سے پہلے توثیق کریں"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"بھیجنے سے پہلے تصدیق کریں"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"+999"</string>
-    <string name="search_hint" msgid="2200412192574686497">"ای میل تلاش کریں"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"آلہ کے کیمرے کے استعمال کی اجازت نہ دیں"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"آلہ کے پاس ورڈ کا تقاضہ کریں"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"حالیہ پاس ورڈز کے دوبارہ استعمال کو محدود کریں"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"پاس ورڈز کی میعاد ختم ہونے کا مطالبہ کریں"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"معطل آلہ کیلئے اپنی سکرین مقفل کرنے کا مطالبہ کریں"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"سنک کیے گئے کیلنڈر ایونٹس کی تعداد محدود کریں"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"مطابقت پذیر ای میلز کی تعداد محدود کریں"</string>
-    <string name="quick_1" msgid="3426057697353380951">"شکریہ!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"مجھے اچھا لگتا ہے!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"میں بعد میں اسے پڑھوں گا اور آپ کو جواب دوں گا۔"</string>
-    <string name="quick_4" msgid="3988974084396883051">"اس پر گفتگو کرنے کیلئے آئیے ہم ایک میٹنگ طے کریں۔"</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"رومنگ کے وقت اس اکاؤنٹ کیلئے پس منظر کی مطابقت پذیری غیر فعال ہے۔"</string>
-    <string name="confirm_response" msgid="9151965975158906286">"جواب بھیج رہا ہے…"</string>
-    <string name="no_conversations" msgid="5559527390337162819">"کوئی پیغامات نہیں ہیں۔"</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"فولڈر کا انتخاب کار"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> کیلئے سرور کے کوڑے دان کا فولڈر منتخب کریں"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g> کیلئے سرور کے مرسلہ آئٹمز کا فولڈر منتخب کریں"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"فولڈر کی فہرست لوڈ ہو رہی ہے…"</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"کوئی دستیاب نہیں ہے"</string>
-</resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
deleted file mode 100644
index 987b165..0000000
--- a/res/values-uz-rUZ/strings.xml
+++ /dev/null
@@ -1,298 +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.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="permission_read_attachment_label" msgid="9208086010625033590">"E-pochta biriktirmalarini o‘qish"</string>
-    <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Ilovaga e-pochtangiz biriktirmalarini o‘qish uchun ruxsat beradi."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"E-pochta xizmati ma’lumotlariga kirish"</string>
-    <string name="permission_access_provider_desc" msgid="6296566558584670348">"Ilovaga e-pochtangiz ma’lumotlar bazasi, jumladan, olingan xabarlar, yuborilgan xabarlar, foydalanuvchi nomlari va parollarga kirish uchun ruxsat beradi."</string>
-    <string name="app_name" msgid="5815426892327290362">"Email"</string>
-    <string name="debug_title" msgid="5175710493691536719">"Tuzatish"</string>
-    <string name="next_action" msgid="3931301986364184415">"Keyingi"</string>
-    <string name="previous_action" msgid="5181616311579820981">"Avvalgi"</string>
-    <string name="done_action" msgid="7497990549515580249">"Tayyor"</string>
-    <string name="create_action" msgid="3062715563215392251">"Yangi yaratish"</string>
-    <string name="quick_responses_empty_view" msgid="3960050972306132367">"Tezkor javob andozalari yo‘q."</string>
-    <string name="account_settings_action" msgid="4494079183315085171">"Hisob sozlamalari"</string>
-    <string name="menu_folder_options" msgid="2871906096248843471">"Sinxronlash tanlamalari"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"Ulanishda muammo yuz berdi."</string>
-  <plurals name="move_messages">
-    <item quantity="one" msgid="320885379869442589">"Xabarni ko‘chirish"</item>
-    <item quantity="other" msgid="371256717624461324">"Xabarlarni ko‘chirish"</item>
-  </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3 hisoblarida ko‘chirib o‘tkazish qo‘llab-quvvatlanmaydi."</string>
-    <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Xabarlarni ko‘chirib bo‘lmaydi, chunki ular turli hisoblarda joylashgan."</string>
-    <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Qoralamalar, Chiquvchi va Yuborilgan xatlar jildidagi xabarlarni ko‘chirib bo‘lmaydi."</string>
-    <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Kelgan"</string>
-    <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Chiquvchi"</string>
-    <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Qoralamalar"</string>
-    <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Chiqitdon"</string>
-    <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Yuborilgan"</string>
-    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Spam"</string>
-    <string name="mailbox_name_display_starred" msgid="7788694947644186069">"Yulduzchali"</string>
-    <string name="mailbox_name_display_unread" msgid="1015674989793998695">"O‘qilmagan"</string>
-    <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Kelgan xatlar"</string>
-    <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Yulduzchali"</string>
-    <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Qoralamalar"</string>
-    <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Chiquvchi xatlar"</string>
-    <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Birgalikda ko‘rish"</string>
-    <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Asl xabar --------\nMavzu: <xliff:g id="SUBJECT">%1$s</xliff:g>\nKimdan: <xliff:g id="SENDER">%2$s</xliff:g>\nKimga: <xliff:g id="TO">%3$s</xliff:g>\nNusxasi, kimga: <xliff:g id="CC_0">%4$s</xliff:g>\n\n"</string>
-    <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Tezkor javobni qo‘yish"</string>
-    <string name="message_compose_insert_quick_response_menu_title" msgid="5817075097532919955">"Tezkor javobni qo‘yish"</string>
-    <string name="message_view_attachment_background_load" msgid="7906875687519445185">"Qayta yo‘naltirilayotgan xabardagi bir yoki undan ortiq biriktirma yuborishdan oldin yuklab olinadi."</string>
-    <string name="attachment_not_found" msgid="7155322700141145123">"Biriktirmani yuklab olib bo‘lmadi."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"Xabarni kodsizlashda xatolik yuz berdi."</string>
-    <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Bir yoki undan ortiq biriktirmalarni qayta yo‘naltirib bo‘lmadi."</string>
-    <string name="forward_download_failed_title" msgid="6139701848515572511">"Biriktirma qayta yo‘nal-madi"</string>
-    <string name="login_failed_ticker" msgid="2169365211566829350">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> hisobiga kirib bo‘lmadi."</string>
-    <string name="login_failed_title" msgid="7624349996212476176">"Tizimga kirib bo‘lmadi."</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>
-  </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>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"Hisobni sozlash"</string>
-    <string name="oauth_authentication_title" msgid="4096761972487140963">"Ruxsat berishni so‘rash"</string>
-    <string name="sign_in_title" msgid="8509755024484685915">"Kirish"</string>
-    <string name="oauth_error_description" msgid="5257268852139229456">"Haqiqiylikni tekshirib bo‘lmadi"</string>
-    <string name="password_warning_label" msgid="1479956455912041077">"E-pochta manzili yoki parol noto‘g‘ri."</string>
-    <string name="email_confirmation_label" msgid="1082319634606902954">"E-pochta manzili:"</string>
-    <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-pochta hisobi"</string>
-    <string name="accounts_welcome" msgid="8337750045270269649">"E-pochtangiz manzili va parolini kiriting."</string>
-    <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-pochta manzili"</string>
-    <string name="or_label" msgid="2207403489755254427">"YOKI"</string>
-    <string name="sign_in_with_google" msgid="9051489501495503976">"Google orqali kirish"</string>
-    <string name="account_setup_basics_password_label" msgid="3402762431598148148">"PAROL"</string>
-    <string name="password_hint" msgid="8835390747504721561">"Parol"</string>
-    <string name="signed_in_with_service_label" msgid="4909910797357155961">"%s hisobiga kirildi"</string>
-    <string name="authentication_label" msgid="6917956186120234602">"HAQIQIYLIKNI TEK-SH"</string>
-    <string name="add_authentication_label" msgid="865206092644419804">"Haqiqiylikni tekshirishni qo‘shish"</string>
-    <string name="clear_authentication_label" msgid="8113966442068335059">"Haqiqiylikni tekshirishni o‘chirish"</string>
-    <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Qo‘lda sozlash"</string>
-    <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Haqiqiy e-pochta manzili va parolni kiriting."</string>
-    <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Hisobdan nusxa olish"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Ushbu foydalanuvchi nomi “<xliff:g id="DUPLICATE">%s</xliff:g>” hisobida allaqachon foydalanilgan."</string>
-    <string name="account_password_spaces_error" msgid="8928309156658903257">"Ushbu parol bir yoki undan ortiq bo‘shliq bilan boshlanadi yoki tugaydi. Ko‘pgina serverlar bo‘shlig‘i bor parollarni qabul qilmaydi."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Hisob haqidagi ma’lumotlar olinmoqda…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Server sozlamalari tekshirilmoqda…"</string>
-    <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"SMTP sozlamalari tekshirilmoqda…"</string>
-    <string name="account_setup_creating_account_msg" msgid="6235569720466839946">"Hisob yaratilmoqda…"</string>
-    <string name="account_setup_ab_headline" msgid="7110531768613341908">"Hisob turini tasdiqlang"</string>
-    <string name="account_setup_ab_instructions_format" msgid="2107254631013471380">"<xliff:g id="EMAIL">%1$s</xliff:g> hisobida <xliff:g id="USERPROTOCOL">%2$s</xliff:g> emas, balki <xliff:g id="PROVIDERPROTOCOL">%3$s</xliff:g> protokolidan foydalanilayotgan bo‘lishi mumkin"</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"Hisobni sozlash"</string>
-    <string name="account_setup_names_headline" msgid="914858472109729140">"Hisobingiz sozlandi va e-pochtangiz tayyor bo‘ldi!"</string>
-    <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ushbu hisobiga nom bering (ixtiyoriy)"</string>
-    <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ismingiz (chiquvchi xabarlarda ko‘rsatiladi)"</string>
-    <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Ushbu maydoncha bo‘sh qoldirilishi mumkin emas."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Hisobni sozlash"</string>
-    <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Hisob turi"</string>
-    <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hisob turini tanlang"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Hisobni sozlash"</string>
-    <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Kiruvchi xatlar serveri sozlamalari"</string>
-    <string name="account_setup_incoming_username_label" msgid="406939983633223354">"FOYDALANUVCHI NOMI"</string>
-    <string name="account_setup_incoming_password_label" msgid="634540235479188709">"PAROL"</string>
-    <string name="account_setup_password_subheading" msgid="2072179928666715013">"Parol"</string>
-    <string name="account_setup_incoming_server_label" msgid="3528558488000638420">"SERVER"</string>
-    <string name="account_setup_incoming_port_label" msgid="5311652277990186704">"PORT"</string>
-    <string name="account_setup_incoming_security_label" msgid="1175710992470593691">"XAVFSIZLIK TURI"</string>
-    <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Hech biri"</string>
-    <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (Barcha sertifikatlarni qabul qilish)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string>
-    <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (barcha sertifikatlarni qabul qilish)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
-    <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"E-pochta xabarini serverdan o‘chirish"</string>
-    <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Hech qachon"</string>
-    <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Kelgan xatlar jildidan o‘chirganimda"</string>
-    <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP yo‘li prefiksi"</string>
-    <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Ixtiyoriy"</string>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Hisobni sozlash"</string>
-    <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Chiquvchi xatlar serveri sozlamalari"</string>
-    <string name="account_setup_outgoing_smtp_server_label" msgid="1164004960070541473">"SMTP SERVERI"</string>
-    <string name="account_setup_outgoing_port_label" msgid="4670120792135566784">"PORT"</string>
-    <string name="account_setup_outgoing_security_label" msgid="9200220309360082664">"XAVFSIZLIK TURI"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Tizimga kirishni talab qilish"</string>
-    <string name="account_setup_outgoing_username_label" msgid="7239411429115525841">"FOYDALANUVCHI NOMI"</string>
-    <string name="account_setup_outgoing_password_label" msgid="3720429254654722208">"PAROL"</string>
-    <string name="account_setup_exchange_certificate_title" msgid="1635140303999054002">"MIJOZ SERTIFIKATI"</string>
-    <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Tanlash"</string>
-    <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Mijoz sertifikatidan foydalanish"</string>
-    <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Olib tashlash"</string>
-    <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Hech biri"</string>
-    <string name="account_setup_exchange_device_id_label" msgid="5105898844003459657">"MOBIL QURILMA ID RAQAMI"</string>
-    <string name="account_setup_options_title" msgid="9016600767888846051">"Hisob sozlamalari"</string>
-    <string name="account_setup_options_headline" msgid="4181274232835368085">"Hisob tanlamalari"</string>
-    <string name="account_setup_options_mail_check_frequency_label" msgid="8321552620846334354">"Sinxronlash oralig‘i:"</string>
-    <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Hech qachon"</string>
-    <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Avtomatik (majburiy)"</string>
-    <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Har 5 daqiqada"</string>
-    <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Har 10 daqiqada"</string>
-    <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Har 15 daqiqada"</string>
-    <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Har 30 daqiqada"</string>
-    <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Har soatda"</string>
-    <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Yangi e-pochta xabarlari to‘g‘risida xabardor qilish"</string>
-    <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Ushbu hisobdagi kontaktlarni sinxronlash"</string>
-    <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Ushbu hisobdagi taqvimni sinxronlash"</string>
-    <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Ushbu hisobdagi e-pochtani sinxronlash"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Wi-Fi ulanganda biriktirmalarni avtomatik ravishda yuklab olish"</string>
-    <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Tugatib bo‘lmadi"</string>
-    <string name="account_setup_options_mail_window_label" msgid="7603869690500525594">"E-pochtani sinxronlash:"</string>
-    <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Avtomatik"</string>
-    <string name="account_setup_options_mail_window_1day" msgid="7727436096227637646">"So‘nggi kun"</string>
-    <string name="account_setup_options_mail_window_3days" msgid="1841106793912850270">"So‘nggi uch kun"</string>
-    <string name="account_setup_options_mail_window_1week" msgid="5804121771990249346">"O‘tgan hafta"</string>
-    <string name="account_setup_options_mail_window_2weeks" msgid="3583478100026382495">"So‘nggi ikki hafta"</string>
-    <string name="account_setup_options_mail_window_1month" msgid="4289585173153789717">"O‘tgan oy"</string>
-    <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Barchasi"</string>
-    <string name="account_setup_options_mail_window_default" msgid="2540360826995543134">"Hisob birlamchi soz-laridan foydalanish"</string>
-    <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Foydalanuvchi nomi yoki parol noto‘g‘ri."</string>
-    <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Kirib bo‘lmadi.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_title" msgid="7365992662150541370">"Hisobni sozlashda muammo yuz berdi"</string>
-    <string name="account_setup_autodiscover_dlg_authfail_message" msgid="8354874879956702097">"Foydalanuvchi nomi, parol va hisob sozlamalari to‘g‘ri ekanligini tasdiqlang."</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Serverga xavfsiz ulanib bo‘lmayapti."</string>
-    <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Serverga xavfsiz ulanib bo‘lmayapti.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Mijoz sertifikati talab qilinadi. Mijoz sertifikati bilan serverga ulanishni xohlaysizmi?"</string>
-    <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Sertifikat haqiqiy emas yoki undan foydalanib bo‘lmaydi."</string>
-    <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Server xatolik bilan javob qaytardi. Foydalanuvchi nomi va parolingizni tekshirib, keyin qayta urinib ko‘ring."</string>
-    <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Serverga ulanib bo‘lmayapti."</string>
-    <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Serverga ulanib bo‘lmayapti.\n(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS server tomonidan qo‘llab-quvvatlanmayapti."</string>
-    <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Haqiqiylikni tekshirish usullari server tomonidan qo‘llab-quvvatlanmaydi."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"Xavfsizlik bilan bog‘liq xato sababli serverga ulanishni ochib bo‘lmadi."</string>
-    <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Serverga ulanib bo‘lmadi."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Server manzilini noto‘g‘ri kiritdingiz yoki server E-pochta qo‘llab-quvvatlamaydigan protokol versiyasini talab qilmoqda."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Ushbu server bilan sinxronlash uchun vakolatingiz yo‘q. Qo‘shimcha ma’lumot olish uchun server administratoriga murojaat qiling."</string>
-    <string name="account_setup_security_required_title" msgid="1850321535870447468">"Xavfsizlikni masofadan turib boshqarish"</string>
-    <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"<xliff:g id="SERVER">%s</xliff:g> serveri Android qurilmangizning ba’zi xavfsizlik funksiyalarini masofadan turib boshqarishga ruxsat berishingizni talab qiladi. Ushbu hisobni sozlashni tugatilsinmi?"</string>
-    <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Sizning Android qurilmangiz server uchun majburiy bo‘lgan himoyalash funksiyalarini qo‘llab-quvvatlamaydi: <xliff:g id="ERROR">%s</xliff:g>"</string>
-    <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Hisobdagi foydalanuvchi nomini o‘zgartira olmaysiz. Boshqa foydalanuvchi nomi bilan yangi hisob qo‘shish uchun Hisob qo‘shish tugmasini bosing."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"OGOHLANTIRISH: Email ilovasi uchun qurilmangizni boshqarish vakolatini to‘xtatish ushbu vakolatdan foydalanuvchi barcha elektron pochta hisoblari, ulardagi xatlar, kontaktlar, taqvim va boshqa ma’lumotlarni ham o‘chirib tashlaydi."</string>
-    <string name="account_security_dialog_title" msgid="430041952584831904">"Xavfsizlik yangilanishi"</string>
-    <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> xavfsizlik sozlamalarini yangilashingizni talab qiladi."</string>
-    <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Xavfsizlik talablari tufayli “<xliff:g id="ACCOUNT">%s</xliff:g>” hisobini sinxronlab bo‘lmaydi."</string>
-    <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"“<xliff:g id="ACCOUNT">%s</xliff:g>” hisobi uchun xavfsizlik sozlamalarini yangilash zarur."</string>
-    <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"“<xliff:g id="ACCOUNT">%s</xliff:g>” hisobida xavfsizlik sozlamalarini yangilandi. Hech narsa qilish shart emas."</string>
-    <string name="security_notification_content_update_title" msgid="2429762903228690154">"Xavfsizlik yangilanishi zarur"</string>
-    <string name="security_notification_content_change_title" msgid="443490921895642130">"Xavfsizlik siyosati o‘zgardi."</string>
-    <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Xavfsizlik qoida. mos kelmaydi"</string>
-    <string name="account_security_title" msgid="3511543138560418587">"Qurilma xavfsizligi"</string>
-    <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"<xliff:g id="SERVER">%s</xliff:g> serveri Android qurilmangizning ayrim xavfsizlik funksiyalarini masofadan turib boshqarishga ruxsat berishingizni talab qiladi."</string>
-    <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Ma’lumotlarni tahrir qilish"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"“<xliff:g id="ACCOUNT">%s</xliff:g>” hisobi uchun qulflash ekrani PIN-kodi yoki parolini o‘zgartirish zarur."</string>
-    <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Qulf. ekrani paroli eskirmoqda"</string>
-    <string name="password_expired_ticker" msgid="4230570412974108968">"Qulflash ekrani PIN-kodi yoki paroli eskirgan."</string>
-    <string name="password_expired_content_title" msgid="4349518706602252979">"Qulf. ekrani paroli eskirgan"</string>
-    <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Qulflash ekrani paroli muddati tugamoqda"</string>
-    <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Siz tez orada qulflash ekrani PIN-kodi yoki parolini o‘zgartirishingiz lozim, aks holda <xliff:g id="ACCOUNT">%s</xliff:g> hisobi ma’lumotlari o‘chib ketadi. Uni hozir o‘zgartirmoqchimisiz?"</string>
-    <string name="password_expired_dialog_title" msgid="2186547998125938084">"Qulflash ekrani paroli eskirgan"</string>
-    <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"<xliff:g id="ACCOUNT">%s</xliff:g> hisobi ma’lumotlari qurilmangizdan o‘chirilmoqda. Uni qulflash ekrani PIN-kodi yoki parolini o‘zgartirish orqali tiklashingiz mumkin. Uni hozir o‘zgartirmoqchimisiz?"</string>
-    <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Saqlanmagan o‘zgartirishlar bekor qilinsinmi?"</string>
-    <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Tizimga kirib bo‘lmadi"</string>
-    <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"<xliff:g id="ACCOUNT">%s</xliff:g> hisobi uchun foydalanuvchi nomi yoki parol noto‘g‘ri. Ularni hozir yangilamoqchimisiz?"</string>
-    <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"<xliff:g id="ACCOUNT">%s</xliff:g> hisobiga kirib bo‘lmadi. Muammoning sababi: <xliff:g id="REASON">%s</xliff:g>. Foydalanuvchi nomi va/yoki parolingizni yangilamoqchimisiz?"</string>
-    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Biriktirmalarni yuklab olish"</string>
-    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Biriktirmalarni Wi-Fi mavjudligida avtomatik yuklab olish"</string>
-    <string name="account_settings_notify_label" msgid="1630001017303007974">"E-pochta bildirishnomalari"</string>
-    <string name="account_settings_summary" msgid="8403582255413830007">"Sinxronlash oralig‘i, bildirishnomalar va h.k."</string>
-    <string name="account_settings_notify_summary" msgid="8134339460923068254">"E-pochta kelganda bildirishnoma yuborish"</string>
-    <string name="account_settings_mail_check_frequency_label" msgid="4322235101687302250">"Sinxronlash oralig‘i"</string>
-    <string name="account_settings_incoming_label" msgid="7858928031806297542">"Kiruvchi xat sozlamalari"</string>
-    <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Foyd. nomi, parol va kiruvchi xatlar serverining boshqa soz-lari"</string>
-    <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Chiquvchi xat sozlamalari"</string>
-    <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Foyd. nomi, parol va chiq. xatlar serverining boshqa soz-lari"</string>
-    <string name="account_settings_enforced_label" msgid="7429582254433588882">"Majburiy tartiblar"</string>
-    <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Hech biri"</string>
-    <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Qo‘llab-quvvatlanmaydigan qoidalar"</string>
-    <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Hech biri"</string>
-    <string name="account_settings_retry_label" msgid="1104680719299842829">"Sinxronlashga urinish"</string>
-    <string name="account_settings_retry_summary" msgid="2703599639846201913">"Ushbu hisobni sinxronlash uchun bu yerga bosing"</string>
-    <string name="account_settings_description_label" msgid="8894815221204511715">"Hisob nomi"</string>
-    <string name="account_settings_name_label" msgid="8186406122590008449">"Ismingiz"</string>
-    <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Tezkor javoblar"</string>
-    <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"E-pochta uchun o‘zingiz tez-tez kiritadigan matnni tahrir qilish"</string>
-    <string name="account_settings_notifications" msgid="1042620094281375043">"Bildirishnoma sozlamalari"</string>
-    <string name="account_settings_data_usage" msgid="6669107430575866736">"Trafik sarfi"</string>
-    <string name="account_settings_policies" msgid="6292833636418641840">"Xavfsizlik siyosati"</string>
-    <string name="system_folders_title" msgid="2934406494244347991">"Tizim jildlari"</string>
-    <string name="system_folders_trash_title" msgid="8470058000681188327">"Chiqitdon"</string>
-    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Serverdan “Chiqitdon” jildini tanlang"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Serverdan “Chiqitdon” jildini tanlang"</string>
-    <string name="system_folders_sent_title" msgid="4265722817877075367">"Yuborilgan xatlar jildi"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Serverdan yuborilgan xatlar jildini tanlang"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Serverdan yuborilgan xatlar jildini tanlang"</string>
-    <string name="edit_quick_response_dialog" msgid="6479106007607928450">"Tezkor javob"</string>
-    <string name="save_action" msgid="1988862706623227093">"Saqlash"</string>
-    <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Kont-larni sinx-lash"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Ushbu hisob kont-larini sinxronlash"</string>
-    <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Taqvimni sinxronlash"</string>
-    <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Ushbu hisobning taqvim tadbirlarini sinxronlash"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-pochtani sinx-lash"</string>
-    <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Ushbu hisob e-pochtasini sinx-lash"</string>
-    <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Tebranish"</string>
-    <string name="account_settings_ringtone" msgid="8229878374785575207">"Rington tanlash"</string>
-    <string name="account_settings_servers" msgid="4925493817981624242">"Server sozlamalari"</string>
-    <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Sinxronlash tanlamalari"</string>
-    <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Sinxronlash tanlamalari (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
-    <string name="mailbox_settings_sync_enabled_label" msgid="1180866791599296994">"Ushbu jildni sinxronlash"</string>
-    <string name="mailbox_settings_sync_enabled_summary" msgid="345878979425044320">"Internetga ulanganda xabarlarni yuklab olish"</string>
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="851180833264474141">"Pochtani sinxronlash kunlari"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="4601797400885989153">"Yuboruvchining rasmi"</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"Faqat ba’zi “Plus” hisoblari ushbu dasturga ulanish uchun ruxsat beradigan POP protokolidan foydalanish vakolatini o‘z ichiga oladi. Agar o‘z e-pochta manzilingiz va parolingiz bilan tizimga kira olmayotgan bo‘lsangiz, demak, sizda bepul hisob mavjud (Plus emas). Ushbu e-pochta hisoblariga kirish uchun veb-brauzerni ishga tushiring."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"Ushbu e-pochta hisobini sozlashdan oldin T-Online veb-saytiga tashrif buyuring va POP3 protokoli bo‘yicha e-pochtaga kirish uchun parol o‘rnating."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"Korporativ"</string>
-    <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
-    <string name="system_account_create_failed" msgid="3673792980526246177">"Hisobni yaratib bo‘lmadi. Qaytadan urinib ko‘ring."</string>
-    <string name="device_admin_label" msgid="8680224994637869414">"Email"</string>
-    <string name="device_admin_description" msgid="426727923791430306">"Serverga oid xavfsizlik qoidalarini kuchga kiritadi"</string>
-    <string name="settings_activity_title" msgid="5185915603716333904">"Sozlamalar"</string>
-    <string name="header_label_general_preferences" msgid="8243724566056800991">"Umumiy sozlamalar"</string>
-    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"O‘chirishdan oldin tasdiqlash"</string>
-    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Yuborishdan oldin tasdiqlash"</string>
-    <string name="more_than_999" msgid="8704425397397918798">"999+"</string>
-    <string name="search_hint" msgid="2200412192574686497">"E-pochtadan qidirish"</string>
-    <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Qurilma kamerasidan foydalanishni taqiqlash"</string>
-    <string name="policy_require_password" msgid="7177274900480984702">"Qurilmani ochish uchun parol so‘rash"</string>
-    <string name="policy_password_history" msgid="5743544498302303181">"So‘nggi parollardan qayta foydalanishni cheklash"</string>
-    <string name="policy_password_expiration" msgid="1248123255253649199">"Parollarning amal qilish muddatini cheklash"</string>
-    <string name="policy_screen_timeout" msgid="414869965358468080">"Kutish rejimida qurilma ekranini har doim quflash"</string>
-    <string name="policy_calendar_age" msgid="627405158087482302">"Sinxronlanadigan taqvim tadbirlari sonini cheklash"</string>
-    <string name="policy_email_age" msgid="7144148367145424963">"Sinx-lanadigan e-pochta xabarlari sonini cheklash"</string>
-    <string name="quick_1" msgid="3426057697353380951">"Katta rahmat!"</string>
-    <string name="quick_2" msgid="4188036352885736617">"Ajoyib fikr!"</string>
-    <string name="quick_3" msgid="8061819976353395585">"Buni keyinroq o‘qib, javob beraman."</string>
-    <string name="quick_4" msgid="3988974084396883051">"Buni ko‘rishib, keyin muhokama qilish lozim."</string>
-    <string name="require_manual_sync_message" msgid="7777357288642785955">"Ushbu hisob uchun rouming vaqtida orqa fonda sinxronlash o‘chirib qo‘yildi."</string>
-    <string name="confirm_response" msgid="9151965975158906286">"Javob yuborilmoqda…"</string>
-    <string name="no_conversations" msgid="5559527390337162819">"Xabarlar yo‘q."</string>
-    <string name="imap_name" msgid="5030473997603483793">"IMAP"</string>
-    <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <string name="folder_picker_title" msgid="860241987640527156">"Jild tanlash"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g>: serverdan jildni tanlang"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g> uchun serverdan jild tanlash"</string>
-    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Jildlar ro‘yxati yuklanmoqda…"</string>
-    <string name="no_quick_responses" msgid="5774427722506187961">"Hech narsa topilmadi"</string>
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0717759..9ed2704 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -40,12 +40,6 @@
     <!-- Actions will be used as buttons and in menu items -->
     <skip />
 
-    <!-- Button name used as part of a multi-step process -->
-    <string name="next_action">Next</string>
-    <!-- Button name used to cancel out of dialog boxes -->
-    <string name="previous_action">Previous</string>
-    <!--  Button name used to complete a multi-step process -->
-    <string name="done_action">Done</string>
     <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
     <string name="create_action">Create new</string>
     <!-- Message informing user when a list that would contain quick responses
@@ -824,4 +818,7 @@
     <!-- This message indicates no quick responses exist to choose from -->
     <string name="no_quick_responses">None available</string>
 
+    <!-- Activity name of the compose activity that should be reconciled -->
+    <string name="reconciliation_compose_activity_name" translatable="false">com.android.email.activity.ComposeActivityEmail</string>
+
 </resources>
diff --git a/res/xml/general_preferences.xml b/res/xml/general_preferences.xml
deleted file mode 100644
index 0bd26fc..0000000
--- a/res/xml/general_preferences.xml
+++ /dev/null
@@ -1,62 +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.
--->
-
-<!-- App-wide preferences -->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <CheckBoxPreference
-        android:key="confirm-delete"
-        android:persistent="true"
-        android:defaultValue="false"
-        android:title="@string/general_preference_confirm_delete_label" />
-
-    <CheckBoxPreference
-        android:key="confirm-send"
-        android:persistent="true"
-        android:defaultValue="false"
-        android:title="@string/general_preference_confirm_send_label" />
-
-    <ListPreference
-        android:key="auto-advance-mode-widget"
-        android:persistent="false"
-        android:title="@string/auto_advance_label"
-        android:summary="@string/auto_advance_summary"
-        android:entries="@array/prefEntries_autoAdvance"
-        android:entryValues="@array/prefValues_autoAdvance"
-        android:dialogTitle="@string/auto_advance_help_title" />
-
-    <CheckBoxPreference
-        android:key="conversation-list-sender-image"
-        android:persistent="true"
-        android:defaultValue="true"
-        android:title="@string/preference_sender_image_title"
-        android:summary="@string/preference_sender_image_description" />
-
-    <CheckBoxPreference
-        android:key="default-reply-all"
-        android:persistent="true"
-        android:defaultValue="false"
-        android:title="@string/preferences_default_reply_all_title"
-        android:summary="@string/preferences_default_reply_all_summary" />
-
-    <CheckBoxPreference
-        android:key="conversation-list-swipe"
-        android:persistent="true"
-        android:defaultValue="true"
-        android:title="@string/preference_swipe_title_delete"
-        android:summary="@string/preference_swipe_description" />
-
-</PreferenceScreen>
diff --git a/res/xml/preference_headers.xml b/res/xml/preference_headers.xml
new file mode 100644
index 0000000..0d2e709
--- /dev/null
+++ b/res/xml/preference_headers.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 Google Inc.
+     Licensed to The Android Open Source Project.
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <header android:fragment="com.android.email.activity.setup.GeneralPreferences"
+            android:title="@string/general_preferences_title" />
+
+</preference-headers>
diff --git a/res/xml/searchable.xml b/res/xml/searchable.xml
index 434d299..be8da67 100644
--- a/res/xml/searchable.xml
+++ b/res/xml/searchable.xml
@@ -18,7 +18,7 @@
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
     android:label="@string/search_title"
     android:hint="@string/search_hint"
-    android:icon="@drawable/ic_menu_search_holo_light"
+    android:icon="@drawable/ic_menu_search"
     android:searchSuggestAuthority="com.android.email.suggestionsprovider"
     android:searchSuggestSelection="query LIKE ?"
     android:searchSuggestIntentAction="android.intent.action.SEARCH"
diff --git a/src/com/android/email/EmailApplication.java b/src/com/android/email/EmailApplication.java
index 79edbed..4692d58 100644
--- a/src/com/android/email/EmailApplication.java
+++ b/src/com/android/email/EmailApplication.java
@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 
+import com.android.email.activity.setup.EmailPreferenceActivity;
 import com.android.email.preferences.EmailPreferenceMigrator;
 import com.android.mail.browse.ConversationMessage;
 import com.android.mail.browse.InlineAttachmentViewIntentBuilder;
@@ -28,6 +29,7 @@
 import com.android.mail.preferences.BasePreferenceMigrator;
 import com.android.mail.preferences.PreferenceMigratorHolder;
 import com.android.mail.preferences.PreferenceMigratorHolder.PreferenceMigratorCreator;
+import com.android.mail.ui.settings.PublicPreferenceActivity;
 import com.android.mail.utils.LogTag;
 
 public class EmailApplication extends Application {
@@ -58,5 +60,6 @@
                     }
                 });
 
+        PublicPreferenceActivity.sPreferenceActivityClass = EmailPreferenceActivity.class;
     }
 }
diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index 215bede..241be14 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -37,7 +37,7 @@
 import android.text.format.DateUtils;
 
 import com.android.email.activity.setup.AccountSecurity;
-import com.android.email.activity.setup.AccountSettings;
+import com.android.email.activity.setup.HeadlessAccountSettingsLoader;
 import com.android.email.provider.EmailProvider;
 import com.android.email.service.EmailServiceUtils;
 import com.android.emailcommon.provider.Account;
@@ -388,10 +388,10 @@
      *
      * NOTE: DO NOT CALL THIS METHOD FROM THE UI THREAD (DATABASE ACCESS)
      */
-    public void showDownloadForwardFailedNotification(Attachment attachment) {
-        Message message = Message.restoreMessageWithId(mContext, attachment.mMessageKey);
+    public void showDownloadForwardFailedNotificationSynchronous(Attachment attachment) {
+        final Message message = Message.restoreMessageWithId(mContext, attachment.mMessageKey);
         if (message == null) return;
-        Mailbox mailbox = Mailbox.restoreMailboxWithId(mContext, message.mMailboxKey);
+        final Mailbox mailbox = Mailbox.restoreMailboxWithId(mContext, message.mMailboxKey);
         showNotification(mailbox.mAccountKey,
                 mContext.getString(R.string.forward_download_failed_ticker),
                 mContext.getString(R.string.forward_download_failed_title),
@@ -412,22 +412,27 @@
      *
      * NOTE: DO NOT CALL THIS METHOD FROM THE UI THREAD (DATABASE ACCESS)
      */
-    public void showLoginFailedNotification(long accountId) {
-        showLoginFailedNotification(accountId, null);
-    }
-
-    public void showLoginFailedNotification(long accountId, String reason) {
+    public void showLoginFailedNotificationSynchronous(long accountId, boolean incoming) {
         final Account account = Account.restoreAccountWithId(mContext, accountId);
         if (account == null) return;
-        final Mailbox mailbox = Mailbox.restoreMailboxOfType(mContext, account.mId,
+        final Mailbox mailbox = Mailbox.restoreMailboxOfType(mContext, accountId,
                 Mailbox.TYPE_INBOX);
         if (mailbox == null) return;
+
+        final Intent settingsIntent;
+        if (incoming) {
+            settingsIntent = new Intent(Intent.ACTION_VIEW,
+                    HeadlessAccountSettingsLoader.getIncomingSettingsUri(accountId));
+        } else {
+            settingsIntent = new Intent(Intent.ACTION_VIEW,
+                    HeadlessAccountSettingsLoader.getOutgoingSettingsUri(accountId));
+        }
         showNotification(mailbox.mAccountKey,
                 mContext.getString(R.string.login_failed_ticker, account.mDisplayName),
                 mContext.getString(R.string.login_failed_title),
                 account.getDisplayName(),
-                AccountSettings.createAccountSettingsIntent(mContext, accountId,
-                        account.mDisplayName, reason), getLoginFailedNotificationId(accountId));
+                settingsIntent,
+                getLoginFailedNotificationId(accountId));
     }
 
     /**
@@ -443,16 +448,16 @@
      *
      * NOTE: DO NOT CALL THIS METHOD FROM THE UI THREAD (DATABASE ACCESS)
      */
-    public void showPasswordExpiringNotification(long accountId) {
-        Account account = Account.restoreAccountWithId(mContext, accountId);
+    public void showPasswordExpiringNotificationSynchronous(long accountId) {
+        final Account account = Account.restoreAccountWithId(mContext, accountId);
         if (account == null) return;
 
-        Intent intent = AccountSecurity.actionDevicePasswordExpirationIntent(mContext,
+        final Intent intent = AccountSecurity.actionDevicePasswordExpirationIntent(mContext,
                 accountId, false);
-        String accountName = account.getDisplayName();
-        String ticker =
+        final String accountName = account.getDisplayName();
+        final String ticker =
             mContext.getString(R.string.password_expire_warning_ticker_fmt, accountName);
-        String title = mContext.getString(R.string.password_expire_warning_content_title);
+        final String title = mContext.getString(R.string.password_expire_warning_content_title);
         showNotification(accountId, ticker, title, accountName, intent,
                 NOTIFICATION_ID_PASSWORD_EXPIRING);
     }
@@ -463,15 +468,15 @@
      *
      * NOTE: DO NOT CALL THIS METHOD FROM THE UI THREAD (DATABASE ACCESS)
      */
-    public void showPasswordExpiredNotification(long accountId) {
-        Account account = Account.restoreAccountWithId(mContext, accountId);
+    public void showPasswordExpiredNotificationSynchronous(long accountId) {
+        final Account account = Account.restoreAccountWithId(mContext, accountId);
         if (account == null) return;
 
-        Intent intent = AccountSecurity.actionDevicePasswordExpirationIntent(mContext,
+        final Intent intent = AccountSecurity.actionDevicePasswordExpirationIntent(mContext,
                 accountId, true);
-        String accountName = account.getDisplayName();
-        String ticker = mContext.getString(R.string.password_expired_ticker);
-        String title = mContext.getString(R.string.password_expired_content_title);
+        final String accountName = account.getDisplayName();
+        final String ticker = mContext.getString(R.string.password_expired_ticker);
+        final String title = mContext.getString(R.string.password_expired_content_title);
         showNotification(accountId, ticker, title, accountName, intent,
                 NOTIFICATION_ID_PASSWORD_EXPIRED);
     }
@@ -503,12 +508,13 @@
      * account settings screen where he can view the list of enforced policies
      */
     public void showSecurityChangedNotification(Account account) {
-        Intent intent =
-                AccountSettings.createAccountSettingsIntent(mContext, account.mId, null, null);
-        String accountName = account.getDisplayName();
-        String ticker =
+        final Intent intent = new Intent(Intent.ACTION_VIEW,
+                HeadlessAccountSettingsLoader.getIncomingSettingsUri(account.getId()));
+        final String accountName = account.getDisplayName();
+        final String ticker =
             mContext.getString(R.string.security_changed_ticker_fmt, accountName);
-        String title = mContext.getString(R.string.security_notification_content_change_title);
+        final String title =
+                mContext.getString(R.string.security_notification_content_change_title);
         showNotification(account.mId, ticker, title, accountName, intent,
                 (int)(NOTIFICATION_ID_BASE_SECURITY_CHANGED + account.mId));
     }
@@ -518,12 +524,13 @@
      * account settings screen where he can view the list of unsupported policies
      */
     public void showSecurityUnsupportedNotification(Account account) {
-        Intent intent =
-                AccountSettings.createAccountSettingsIntent(mContext, account.mId, null, null);
-        String accountName = account.getDisplayName();
-        String ticker =
+        final Intent intent = new Intent(Intent.ACTION_VIEW,
+                HeadlessAccountSettingsLoader.getIncomingSettingsUri(account.getId()));
+        final String accountName = account.getDisplayName();
+        final String ticker =
             mContext.getString(R.string.security_unsupported_ticker_fmt, accountName);
-        String title = mContext.getString(R.string.security_notification_content_unsupported_title);
+        final String title =
+                mContext.getString(R.string.security_notification_content_unsupported_title);
         showNotification(account.mId, ticker, title, accountName, intent,
                 (int)(NOTIFICATION_ID_BASE_SECURITY_NEEDED + account.mId));
    }
diff --git a/src/com/android/email/SecurityPolicy.java b/src/com/android/email/SecurityPolicy.java
index db725b8..3adf8b8 100644
--- a/src/com/android/email/SecurityPolicy.java
+++ b/src/com/android/email/SecurityPolicy.java
@@ -758,13 +758,13 @@
         if (!expired) {
             // 4.  If warning, simply put up a generic notification and report that it came from
             // the shortest-expiring account.
-            NotificationController.getInstance(mContext).showPasswordExpiringNotification(
+            NotificationController.getInstance(mContext).showPasswordExpiringNotificationSynchronous(
                     nextExpiringAccountId);
         } else {
             // 5.  Actually expired - find all accounts that expire passwords, and wipe them
             boolean wiped = wipeExpiredAccounts(context);
             if (wiped) {
-                NotificationController.getInstance(mContext).showPasswordExpiredNotification(
+                NotificationController.getInstance(mContext).showPasswordExpiredNotificationSynchronous(
                         nextExpiringAccountId);
             }
         }
diff --git a/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java b/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
index 9918641..1a5636a 100644
--- a/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
@@ -34,6 +34,7 @@
 import com.android.emailcommon.provider.HostAuth;
 import com.android.emailcommon.provider.Policy;
 import com.android.emailcommon.service.EmailServiceProxy;
+import com.android.emailcommon.service.HostAuthCompat;
 import com.android.emailcommon.utility.Utility;
 import com.android.mail.utils.LogUtils;
 
@@ -358,8 +359,12 @@
                     } else if (errorCode != MessagingException.NO_ERROR) {
                         return new AutoDiscoverResults(false, null);
                     } else {
-                        HostAuth serverInfo =
+                        final HostAuthCompat hostAuthCompat =
                             result.getParcelable(EmailServiceProxy.AUTO_DISCOVER_BUNDLE_HOST_AUTH);
+                        HostAuth serverInfo = null;
+                        if (hostAuthCompat != null) {
+                            serverInfo = hostAuthCompat.toHostAuth();
+                        }
                         return new AutoDiscoverResults(false, serverInfo);
                     }
                 }
diff --git a/src/com/android/email/activity/setup/AccountServerSettingsActivity.java b/src/com/android/email/activity/setup/AccountServerSettingsActivity.java
new file mode 100644
index 0000000..fffa15a
--- /dev/null
+++ b/src/com/android/email/activity/setup/AccountServerSettingsActivity.java
@@ -0,0 +1,261 @@
+/*
+ * Copyright (C) 2014 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.setup;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.android.email.R;
+import com.android.emailcommon.provider.Account;
+import com.android.mail.utils.LogUtils;
+
+public class AccountServerSettingsActivity extends AccountSetupActivity implements
+        SecurityRequiredDialogFragment.Callback, CheckSettingsErrorDialogFragment.Callback,
+        AccountCheckSettingsFragment.Callback, AccountServerBaseFragment.Callback,
+        CheckSettingsProgressDialogFragment.Callback {
+
+    /**
+     * {@link com.android.emailcommon.provider.Account}
+     */
+    private static final String EXTRA_ACCOUNT = "account";
+    /**
+     * Incoming or Outgoing settings?
+     */
+    private static final String EXTRA_WHICH_SETTINGS = "whichSettings";
+    private static final String INCOMING_SETTINGS = "incoming";
+    private static final String OUTGOING_SETTINGS = "outgoing";
+
+    private AccountServerBaseFragment mAccountServerFragment;
+
+    public static Intent getIntentForIncoming(final Context context, final Account account) {
+        final Intent intent = new Intent(context, AccountServerSettingsActivity.class);
+        intent.putExtra(EXTRA_ACCOUNT, account);
+        intent.putExtra(EXTRA_WHICH_SETTINGS, INCOMING_SETTINGS);
+        return intent;
+    }
+
+    public static Intent getIntentForOutgoing(final Context context, final Account account) {
+        final Intent intent = new Intent(context, AccountServerSettingsActivity.class);
+        intent.putExtra(EXTRA_ACCOUNT, account);
+        intent.putExtra(EXTRA_WHICH_SETTINGS, OUTGOING_SETTINGS);
+        return intent;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mSetupData.setFlowMode(SetupDataFragment.FLOW_MODE_EDIT);
+
+        // TODO: this activity is ugly as sin
+        setContentView(R.layout.account_server_settings);
+
+        if (savedInstanceState == null) {
+            final Account account = getIntent().getParcelableExtra(EXTRA_ACCOUNT);
+            if (account == null) {
+                throw new IllegalArgumentException("No account present in intent");
+            }
+            mSetupData.setAccount(account);
+            final String whichSettings = getIntent().getStringExtra(EXTRA_WHICH_SETTINGS);
+            final AccountServerBaseFragment f;
+            if (OUTGOING_SETTINGS.equals(whichSettings)) {
+                f = AccountSetupOutgoingFragment.newInstance(true);
+            } else {
+                f = AccountSetupIncomingFragment.newInstance(true);
+            }
+            getFragmentManager().beginTransaction()
+                    .add(R.id.account_server_settings_container, f)
+                    .commit();
+        }
+    }
+
+    @Override
+    public void onAttachFragment(Fragment fragment) {
+        super.onAttachFragment(fragment);
+        if (fragment instanceof AccountServerBaseFragment) {
+            mAccountServerFragment = (AccountServerBaseFragment) fragment;
+        }
+    }
+
+    public AccountServerBaseFragment getAccountServerFragment() {
+        return mAccountServerFragment;
+    }
+
+    private void forceBack() {
+        super.onBackPressed();
+    }
+
+    /**
+     * Any time we exit via this pathway we put up the exit-save-changes dialog.
+     */
+    @Override
+    public void onBackPressed() {
+        final AccountServerBaseFragment accountServerFragment = getAccountServerFragment();
+        if (accountServerFragment != null) {
+            if (accountServerFragment.haveSettingsChanged()) {
+                UnsavedChangesDialogFragment dialogFragment =
+                        UnsavedChangesDialogFragment.newInstanceForBack();
+                dialogFragment.show(getFragmentManager(), UnsavedChangesDialogFragment.TAG);
+                return; // Prevent "back" from being handled
+            }
+        }
+        super.onBackPressed();
+    }
+
+    @Override
+    public void onNextButton() {}
+
+    /**
+     * Save process is done, dismiss the fragment.
+     */
+    @Override
+    public void onAccountServerSaveComplete() {
+        super.onBackPressed();
+    }
+
+    @Override
+    public void onAccountServerUIComplete(int checkMode) {
+        final Fragment checkerDialog = CheckSettingsProgressDialogFragment.newInstance(checkMode);
+        final Fragment checkerFragment = AccountCheckSettingsFragment.newInstance(checkMode);
+        getFragmentManager().beginTransaction()
+                .add(checkerDialog, CheckSettingsProgressDialogFragment.TAG)
+                .add(checkerFragment, AccountCheckSettingsFragment.TAG)
+                .commit();
+    }
+
+    @Override
+    public void onCheckSettingsProgressDialogCancel() {
+        dismissCheckSettingsFragment();
+    }
+
+    /**
+     * After verifying a new server configuration as OK, we return here and continue. This kicks
+     * off the save process.
+     */
+    @Override
+    public void onCheckSettingsComplete() {
+        dismissCheckSettingsFragment();
+        final AccountServerBaseFragment f = getAccountServerFragment();
+        if (f != null) {
+            f.saveSettings();
+        }
+    }
+
+    @Override
+    public void onCheckSettingsSecurityRequired(String hostName) {
+        dismissCheckSettingsFragment();
+        SecurityRequiredDialogFragment.newInstance(hostName)
+                .show(getFragmentManager(), SecurityRequiredDialogFragment.TAG);
+    }
+
+    @Override
+    public void onCheckSettingsError(int reason, String message) {
+        dismissCheckSettingsFragment();
+        CheckSettingsErrorDialogFragment.newInstance(reason, message)
+                .show(getFragmentManager(), CheckSettingsErrorDialogFragment.TAG);
+    }
+
+    @Override
+    public void onCheckSettingsAutoDiscoverComplete(int result) {
+        throw new IllegalStateException();
+    }
+
+    private void dismissCheckSettingsFragment() {
+        final Fragment f =
+                getFragmentManager().findFragmentByTag(AccountCheckSettingsFragment.TAG);
+        final Fragment d =
+                getFragmentManager().findFragmentByTag(CheckSettingsProgressDialogFragment.TAG);
+        getFragmentManager().beginTransaction()
+                .remove(f)
+                .remove(d)
+                .commit();
+    }
+
+    @Override
+    public void onSecurityRequiredDialogResult(boolean ok) {
+        if (ok) {
+            final AccountServerBaseFragment f = getAccountServerFragment();
+            if (f != null) {
+                f.saveSettings();
+            }
+        }
+        // else just stay here
+    }
+
+    @Override
+    public void onCheckSettingsErrorDialogEditSettings() {
+        // Just stay here
+    }
+
+    @Override
+    public void onCheckSettingsErrorDialogEditCertificate() {
+        final AccountServerBaseFragment f = getAccountServerFragment();
+        if (f instanceof AccountSetupIncomingFragment) {
+            AccountSetupIncomingFragment asif = (AccountSetupIncomingFragment) f;
+            asif.onCertificateRequested();
+        } else {
+            LogUtils.wtf(LogUtils.TAG, "Tried to change cert on non-incoming screen?");
+        }
+    }
+
+    /**
+     * Dialog fragment to show "exit with unsaved changes?" dialog
+     */
+    public static class UnsavedChangesDialogFragment extends DialogFragment {
+        final static String TAG = "UnsavedChangesDialogFragment";
+
+        /**
+         * Creates a save changes dialog when the user navigates "back".
+         * {@link #onBackPressed()} defines in which case this may be triggered.
+         */
+        public static UnsavedChangesDialogFragment newInstanceForBack() {
+            return new UnsavedChangesDialogFragment();
+        }
+
+        // Force usage of newInstance()
+        public UnsavedChangesDialogFragment() {}
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final AccountServerSettingsActivity activity =
+                    (AccountServerSettingsActivity) getActivity();
+
+            return new AlertDialog.Builder(activity)
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
+                    .setTitle(android.R.string.dialog_alert_title)
+                    .setMessage(R.string.account_settings_exit_server_settings)
+                    .setPositiveButton(
+                            android.R.string.ok,
+                            new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    activity.forceBack();
+                                    dismiss();
+                                }
+                            })
+                    .setNegativeButton(
+                            activity.getString(android.R.string.cancel), null)
+                    .create();
+        }
+    }
+}
diff --git a/src/com/android/email/activity/setup/AccountSettings.java b/src/com/android/email/activity/setup/AccountSettings.java
deleted file mode 100644
index f9424a3..0000000
--- a/src/com/android/email/activity/setup/AccountSettings.java
+++ /dev/null
@@ -1,1009 +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.activity.setup;
-
-import android.app.ActionBar;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.preference.PreferenceActivity;
-import android.text.SpannableString;
-import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
-import android.text.util.Linkify;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.TextView;
-
-import com.android.email.R;
-import com.android.email.provider.EmailProvider;
-import com.android.emailcommon.Logging;
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.EmailContent.AccountColumns;
-import com.android.emailcommon.utility.IntentUtilities;
-import com.android.emailcommon.utility.Utility;
-import com.android.mail.providers.Folder;
-import com.android.mail.providers.UIProvider.EditSettingsExtras;
-import com.android.mail.utils.LogUtils;
-import com.android.mail.utils.Utils;
-import com.google.common.annotations.VisibleForTesting;
-
-import java.util.List;
-
-/**
- * Handles account preferences, using multi-pane arrangement when possible.
- *
- * This activity uses the following fragments:
- *   AccountSettingsFragment
- *   Account{Incoming/Outgoing}Fragment
- *   AccountCheckSettingsFragment
- *   GeneralPreferences
- *   DebugFragment
- *
- * TODO: Delete account - on single-pane view (phone UX) the account list doesn't update properly
- * TODO: Handle dynamic changes to the account list (exit if necessary).  It probably makes
- *       sense to use a loader for the accounts list, because it would provide better support for
- *       dealing with accounts being added/deleted and triggering the header reload.
- */
-public class AccountSettings extends PreferenceActivity implements
-        SetupDataFragment.SetupDataContainer, SecurityRequiredDialogFragment.Callback,
-        CheckSettingsErrorDialogFragment.Callback, AccountCheckSettingsFragment.Callback,
-        AccountServerBaseFragment.Callback, CheckSettingsProgressDialogFragment.Callback {
-    /*
-     * Intent to open account settings for account=1
-        adb shell am start -a android.intent.action.EDIT \
-            -d '"content://ui.email.android.com/settings?ACCOUNT_ID=1"'
-     */
-
-    // Intent extras for our internal activity launch
-    private static final String EXTRA_ENABLE_DEBUG = "AccountSettings.enable_debug";
-    private static final String EXTRA_LOGIN_WARNING_FOR_ACCOUNT = "AccountSettings.for_account";
-    private static final String EXTRA_LOGIN_WARNING_REASON_FOR_ACCOUNT =
-            "AccountSettings.for_account_reason";
-    private static final String EXTRA_TITLE = "AccountSettings.title";
-    // STOPSHIP: Do not ship with the debug menu allowed.
-    private static final boolean DEBUG_MENU_ALLOWED = false;
-    public static final String EXTRA_NO_ACCOUNTS = "AccountSettings.no_account";
-    public static final String EXTRA_ACCOUNT = "AccountSettings.account";
-
-    // Intent extras for launch directly from system account manager
-    // NOTE: This string must match the one in res/xml/account_preferences.xml
-    private static String INTENT_ACCOUNT_MANAGER_ENTRY;
-    // NOTE: This constant should eventually be defined in android.accounts.Constants
-    private static final String EXTRA_ACCOUNT_MANAGER_ACCOUNT = "account";
-
-    // Key for arguments bundle for QuickResponse editing
-    private static final String QUICK_RESPONSE_ACCOUNT_KEY = "account";
-
-    // Key codes used to open a debug settings fragment.
-    private static final int[] SECRET_KEY_CODES = {
-            KeyEvent.KEYCODE_D, KeyEvent.KEYCODE_E, KeyEvent.KEYCODE_B, KeyEvent.KEYCODE_U,
-            KeyEvent.KEYCODE_G
-            };
-    private int mSecretKeyCodeIndex = 0;
-
-    // Support for account-by-name lookup
-    private static final String SELECTION_ACCOUNT_EMAIL_ADDRESS =
-        AccountColumns.EMAIL_ADDRESS + "=?";
-
-    // When the user taps "Email Preferences" 10 times in a row, we'll enable the debug settings.
-    private int mNumGeneralHeaderClicked = 0;
-
-    private long mRequestedAccountId;
-    private Header[] mAccountListHeaders;
-    private Header mAppPreferencesHeader;
-    private AccountSettingsFragment mAccountSettingsFragment;
-    private AccountServerBaseFragment mAccountServerFragment;
-    private long mDeletingAccountId = -1;
-    private boolean mShowDebugMenu;
-    private List<Header> mGeneratedHeaders;
-    private Uri mFeedbackUri;
-    private MenuItem mFeedbackMenuItem;
-
-    private SetupDataFragment mSetupData;
-
-    // Async Tasks
-    private LoadAccountListTask mLoadAccountListTask;
-    private GetAccountIdFromAccountTask mGetAccountIdFromAccountTask;
-    private ContentObserver mAccountObserver;
-
-    // Specific callbacks used by settings fragments
-    private final AccountSettingsFragmentCallback mAccountSettingsFragmentCallback
-            = new AccountSettingsFragmentCallback();
-
-    /**
-     * Create and return an intent to display (and edit) settings for a specific account, or -1
-     * for any/all accounts.  If an account name string is provided, a warning dialog will be
-     * displayed as well.
-     */
-    public static Intent createAccountSettingsIntent(final Context context, final long accountId,
-            final String loginWarningAccountName, final String loginWarningReason) {
-        final Uri.Builder b = IntentUtilities.createActivityIntentUrlBuilder(
-                IntentUtilities.PATH_SETTINGS);
-        IntentUtilities.setAccountId(b, accountId);
-        final Intent i = new Intent(Intent.ACTION_EDIT, b.build());
-        i.setPackage(context.getPackageName());
-        if (loginWarningAccountName != null) {
-            i.putExtra(EXTRA_LOGIN_WARNING_FOR_ACCOUNT, loginWarningAccountName);
-        }
-        if (loginWarningReason != null) {
-            i.putExtra(EXTRA_LOGIN_WARNING_REASON_FOR_ACCOUNT, loginWarningReason);
-        }
-        return i;
-    }
-
-    @Override
-    public Intent getIntent() {
-        final Intent intent = super.getIntent();
-        final long accountId = IntentUtilities.getAccountIdFromIntent(intent);
-        if (accountId < 0) {
-            return intent;
-        }
-        Intent modIntent = new Intent(intent);
-        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, AccountSettingsFragment.class.getCanonicalName());
-        modIntent.putExtra(
-                EXTRA_SHOW_FRAGMENT_ARGUMENTS,
-                AccountSettingsFragment.buildArguments(
-                        accountId, IntentUtilities.getAccountNameFromIntent(intent)));
-        modIntent.putExtra(EXTRA_NO_HEADERS, true);
-        return modIntent;
-    }
-
-
-    /**
-     * Launch generic settings and pre-enable the debug preferences
-     */
-    public static void actionSettingsWithDebug(Context fromContext) {
-        final Intent i = new Intent(fromContext, AccountSettings.class);
-        i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        i.putExtra(EXTRA_ENABLE_DEBUG, true);
-        fromContext.startActivity(i);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        final Intent i = getIntent();
-        if (savedInstanceState == null) {
-            // If we are not restarting from a previous instance, we need to
-            // figure out the initial prefs to show.  (Otherwise, we want to
-            // continue showing whatever the user last selected.)
-            if (INTENT_ACCOUNT_MANAGER_ENTRY == null) {
-                INTENT_ACCOUNT_MANAGER_ENTRY = getString(R.string.intent_account_manager_entry);
-            }
-            if (INTENT_ACCOUNT_MANAGER_ENTRY.equals(i.getAction())) {
-                // This case occurs if we're changing account settings from Settings -> Accounts
-                mGetAccountIdFromAccountTask =
-                        (GetAccountIdFromAccountTask) new GetAccountIdFromAccountTask()
-                        .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, i);
-            } else if (i.hasExtra(EditSettingsExtras.EXTRA_FOLDER)) {
-                launchMailboxSettings(i);
-                return;
-            } else if (i.hasExtra(EXTRA_NO_ACCOUNTS)) {
-                final Intent setupIntent = AccountSetupFinal.actionNewAccountWithResultIntent(this);
-                startActivity(setupIntent);
-                finish();
-                return;
-            } else if (i.hasExtra(EXTRA_ACCOUNT)) {
-                final Account account = i.getParcelableExtra(EXTRA_ACCOUNT);
-                mSetupData = new SetupDataFragment(SetupDataFragment.FLOW_MODE_EDIT, account);
-            } else {
-                // Otherwise, we're called from within the Email app and look for our extras
-                mRequestedAccountId = IntentUtilities.getAccountIdFromIntent(i);
-                String loginWarningAccount = i.getStringExtra(EXTRA_LOGIN_WARNING_FOR_ACCOUNT);
-                String loginWarningReason =
-                        i.getStringExtra(EXTRA_LOGIN_WARNING_REASON_FOR_ACCOUNT);
-                if (loginWarningAccount != null) {
-                    // Show dialog (first time only - don't re-show on a rotation)
-                    LoginWarningDialog dialog =
-                            LoginWarningDialog.newInstance(loginWarningAccount, loginWarningReason);
-                    dialog.show(getFragmentManager(), "loginwarning");
-                }
-            }
-        } else {
-            mSetupData = savedInstanceState.getParcelable(SetupDataFragment.EXTRA_SETUP_DATA);
-        }
-        mShowDebugMenu = i.getBooleanExtra(EXTRA_ENABLE_DEBUG, false);
-
-        final String title = i.getStringExtra(EXTRA_TITLE);
-        if (title != null) {
-            setTitle(title);
-        }
-
-        getActionBar().setDisplayOptions(
-                ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
-
-        mAccountObserver = new ContentObserver(Utility.getMainThreadHandler()) {
-            @Override
-            public void onChange(boolean selfChange) {
-                updateAccounts();
-            }
-        };
-
-        mFeedbackUri = Utils.getValidUri(getString(R.string.email_feedback_uri));
-    }
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(
-                outState);
-        // TODO: use the fragment manager to persist this
-        outState.putParcelable(SetupDataFragment.EXTRA_SETUP_DATA, mSetupData);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        getContentResolver().registerContentObserver(Account.NOTIFIER_URI, true, mAccountObserver);
-        updateAccounts();
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        getContentResolver().unregisterContentObserver(mAccountObserver);
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        Utility.cancelTaskInterrupt(mLoadAccountListTask);
-        mLoadAccountListTask = null;
-        Utility.cancelTaskInterrupt(mGetAccountIdFromAccountTask);
-        mGetAccountIdFromAccountTask = null;
-    }
-
-    /**
-     * Listen for secret sequence and, if heard, enable debug menu
-     */
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (event.getKeyCode() == SECRET_KEY_CODES[mSecretKeyCodeIndex]) {
-            mSecretKeyCodeIndex++;
-            if (mSecretKeyCodeIndex == SECRET_KEY_CODES.length) {
-                mSecretKeyCodeIndex = 0;
-                enableDebugMenu();
-            }
-        } else {
-            mSecretKeyCodeIndex = 0;
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(R.menu.settings_menu, menu);
-
-        mFeedbackMenuItem = menu.findItem(R.id.feedback_menu_item);
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        super.onPrepareOptionsMenu(menu);
-
-        if (mFeedbackMenuItem != null) {
-            // We only want to enable the feedback menu item, if there is a valid feedback uri
-            mFeedbackMenuItem.setVisible(!Uri.EMPTY.equals(mFeedbackUri));
-        }
-        return true;
-    }
-
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                // The app icon on the action bar is pressed.  Just emulate a back press.
-                // TODO: this should navigate to the main screen, even if a sub-setting is open.
-                // But we shouldn't just finish(), as we want to show "discard changes?" dialog
-                // when necessary.
-                onBackPressed();
-                break;
-            case R.id.add_new_account:
-                onAddNewAccount();
-                break;
-            case R.id.feedback_menu_item:
-                Utils.sendFeedback(this, mFeedbackUri, false /* reportingProblem */);
-                break;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-        return true;
-    }
-
-    public boolean isValidFragment(String fragmentName) {
-        // We need to make sure that a fragment about to be attached is valid. This corrects
-        // a security vulnerability.
-        return (TextUtils.equals(AccountSettingsFragment.class.getName(), fragmentName) ||
-                TextUtils.equals(GeneralPreferences.class.getName(), fragmentName) ||
-                TextUtils.equals(AccountSetupIncomingFragment.class.getName(), fragmentName) ||
-                TextUtils.equals(AccountSettingsEditQuickResponsesFragment.class.getName(),
-                        fragmentName) ||
-                TextUtils.equals(DebugFragment.class.getName(), fragmentName));
-    }
-
-    @Override
-    public Intent onBuildStartFragmentIntent(String fragmentName, Bundle args,
-            int titleRes, int shortTitleRes) {
-        final Intent intent = super.onBuildStartFragmentIntent(
-                fragmentName, args, titleRes, shortTitleRes);
-
-        // When opening a sub-settings page (e.g. account specific page), see if we want to modify
-        // the activity title.
-        String title = AccountSettingsFragment.getTitleFromArgs(args);
-        if ((titleRes == 0) && (title != null)) {
-            intent.putExtra(EXTRA_TITLE, title);
-        }
-        return intent;
-    }
-
-    /**
-     * Any time we exit via this pathway, and we are showing a server settings fragment,
-     * we put up the exit-save-changes dialog.  This will work for the following cases:
-     *   Cancel button
-     *   Back button
-     *   Up arrow in application icon
-     * It will *not* apply in the following cases:
-     *   Click the parent breadcrumb - need to find a hook for this
-     *   Click in the header list (e.g. another account) - handled elsewhere
-     */
-    @Override
-    public void onBackPressed() {
-        final AccountServerBaseFragment accountServerFragment = getAccountServerFragment();
-        if (accountServerFragment != null) {
-            if (accountServerFragment.haveSettingsChanged()) {
-                UnsavedChangesDialogFragment dialogFragment =
-                        UnsavedChangesDialogFragment.newInstanceForBack();
-                dialogFragment.show(getFragmentManager(), UnsavedChangesDialogFragment.TAG);
-                return; // Prevent "back" from being handled
-            }
-        }
-        super.onBackPressed();
-    }
-
-
-    private void launchMailboxSettings(Intent intent) {
-        final Folder folder = intent.getParcelableExtra(EditSettingsExtras.EXTRA_FOLDER);
-
-        // TODO: determine from the account if we should navigate to the mailbox settings.
-        // See bug 6242668
-
-        // Get the mailbox id from the folder
-        final long mailboxId =
-                Long.parseLong(folder.folderUri.fullUri.getPathSegments().get(1));
-
-        MailboxSettings.start(this, mailboxId);
-        finish();
-    }
-
-    private void enableDebugMenu() {
-        mShowDebugMenu = true;
-        invalidateHeaders();
-    }
-
-    private void onAddNewAccount() {
-        final Intent setupIntent = AccountSetupFinal.actionNewAccountIntent(this);
-        startActivity(setupIntent);
-    }
-
-    /**
-     * Start the async reload of the accounts list (if the headers are being displayed)
-     */
-    private void updateAccounts() {
-        if (hasHeaders()) {
-            Utility.cancelTaskInterrupt(mLoadAccountListTask);
-            mLoadAccountListTask = (LoadAccountListTask)
-                    new LoadAccountListTask().executeOnExecutor(
-                            AsyncTask.THREAD_POOL_EXECUTOR, mDeletingAccountId);
-        }
-    }
-
-    /**
-     * Write the current header (accounts) array into the one provided by the PreferenceActivity.
-     * Skip any headers that match mDeletingAccountId (this is a quick-hide algorithm while a
-     * background thread works on deleting the account).  Also sets mRequestedAccountHeader if
-     * we find the requested account (by id).
-     */
-    @Override
-    public void onBuildHeaders(List<Header> target) {
-        // Always add app preferences as first header
-        target.clear();
-        target.add(getAppPreferencesHeader());
-
-        // Then add zero or more account headers as necessary
-        if (mAccountListHeaders != null) {
-            final int headerCount = mAccountListHeaders.length;
-            for (int index = 0; index < headerCount; index++) {
-                Header header = mAccountListHeaders[index];
-                if (header != null && header.id != HEADER_ID_UNDEFINED) {
-                    if (header.id != mDeletingAccountId) {
-                        target.add(header);
-                        if (header.id == mRequestedAccountId) {
-                            mRequestedAccountId = -1;
-                        }
-                    }
-                }
-            }
-        }
-
-        // finally, if debug header is enabled, show it
-        if (DEBUG_MENU_ALLOWED) {
-            if (mShowDebugMenu) {
-                // setup lightweight header for debugging
-                final Header debugHeader = new Header();
-                debugHeader.title = getText(R.string.debug_title);
-                debugHeader.summary = null;
-                debugHeader.iconRes = 0;
-                debugHeader.fragment = DebugFragment.class.getCanonicalName();
-                debugHeader.fragmentArguments = null;
-                target.add(debugHeader);
-            }
-        }
-
-        // Save for later use (see forceSwitch)
-        mGeneratedHeaders = target;
-    }
-
-    /**
-     * Generate and return the first header, for app preferences
-     */
-    private Header getAppPreferencesHeader() {
-        // Set up fixed header for general settings
-        if (mAppPreferencesHeader == null) {
-            mAppPreferencesHeader = new Header();
-            mAppPreferencesHeader.title = getText(R.string.header_label_general_preferences);
-            mAppPreferencesHeader.summary = null;
-            mAppPreferencesHeader.iconRes = 0;
-            mAppPreferencesHeader.fragment = GeneralPreferences.class.getCanonicalName();
-            mAppPreferencesHeader.fragmentArguments = null;
-        }
-        return mAppPreferencesHeader;
-    }
-
-    /**
-     * This AsyncTask reads the accounts list and generates the headers.  When the headers are
-     * ready, we'll trigger PreferenceActivity to refresh the account list with them.
-     *
-     * The array generated and stored in mAccountListHeaders may be sparse so any readers should
-     * check for and skip over null entries, and should not assume array length is # of accounts.
-     *
-     * TODO: Smaller projection
-     * TODO: Convert to Loader
-     * TODO: Write a test, including operation of deletingAccountId param
-     */
-    private class LoadAccountListTask extends AsyncTask<Long, Void, Object[]> {
-
-        @Override
-        protected Object[] doInBackground(Long... params) {
-            Header[] result = null;
-            Boolean deletingAccountFound = false;
-            final long deletingAccountId = params[0];
-
-            Cursor c = getContentResolver().query(
-                    Account.CONTENT_URI,
-                    Account.CONTENT_PROJECTION, null, null, null);
-            try {
-                int index = 0;
-                result = new Header[c.getCount()];
-
-                while (c.moveToNext()) {
-                    final long accountId = c.getLong(Account.CONTENT_ID_COLUMN);
-                    if (accountId == deletingAccountId) {
-                        deletingAccountFound = true;
-                        continue;
-                    }
-                    final String name = c.getString(Account.CONTENT_DISPLAY_NAME_COLUMN);
-                    final String email = c.getString(Account.CONTENT_EMAIL_ADDRESS_COLUMN);
-                    final Header newHeader = new Header();
-                    newHeader.id = accountId;
-                    newHeader.title = name;
-                    newHeader.summary = email;
-                    newHeader.fragment = AccountSettingsFragment.class.getCanonicalName();
-                    newHeader.fragmentArguments =
-                            AccountSettingsFragment.buildArguments(accountId, email);
-
-                    result[index++] = newHeader;
-                }
-            } finally {
-                if (c != null) {
-                    c.close();
-                }
-            }
-            return new Object[] { result, deletingAccountFound };
-        }
-
-        @Override
-        protected void onPostExecute(Object[] result) {
-            if (isCancelled() || result == null) return;
-            // Extract the results
-            final Header[] headers = (Header[]) result[0];
-            final boolean deletingAccountFound = (Boolean) result[1];
-            // report the settings
-            mAccountListHeaders = headers;
-            invalidateHeaders();
-            if (!deletingAccountFound) {
-                mDeletingAccountId = -1;
-            }
-        }
-    }
-
-    /**
-     * Called when the user selects an item in the header list.  Handles save-data cases as needed
-     *
-     * @param header The header that was selected.
-     * @param position The header's position in the list.
-     */
-    @Override
-    public void onHeaderClick(Header header, int position) {
-        // special case when exiting the server settings fragments
-        final AccountServerBaseFragment accountServerFragment = getAccountServerFragment();
-        if ((accountServerFragment != null) && accountServerFragment.haveSettingsChanged()) {
-            UnsavedChangesDialogFragment dialogFragment =
-                UnsavedChangesDialogFragment.newInstanceForHeader(position);
-            dialogFragment.show(getFragmentManager(), UnsavedChangesDialogFragment.TAG);
-            return;
-        }
-
-        // Secret keys:  Click 10x to enable debug settings
-        if (position == 0) {
-            mNumGeneralHeaderClicked++;
-            if (mNumGeneralHeaderClicked == 10) {
-                enableDebugMenu();
-            }
-        } else {
-            mNumGeneralHeaderClicked = 0;
-        }
-
-        // Process header click normally
-        super.onHeaderClick(header, position);
-    }
-
-    /**
-     * Switch to a specific header without checking for server settings fragments as done
-     * in {@link #onHeaderClick(Header, int)}.  Called after we interrupted a header switch
-     * with a dialog, and the user OK'd it.
-     */
-    private void forceSwitchHeader(int position) {
-        // Ensure the UI visually shows the correct header selected
-        setSelection(position);
-        switchToHeader(mGeneratedHeaders.get(position));
-    }
-
-    /**
-     * Forcefully go backward in the stack. This may potentially discard unsaved settings.
-     */
-    private void forceBack() {
-        super.onBackPressed();
-    }
-
-    @Override
-    public void onAttachFragment(Fragment f) {
-        super.onAttachFragment(f);
-
-        if (f instanceof AccountSettingsFragment) {
-            final AccountSettingsFragment asf = (AccountSettingsFragment) f;
-            mAccountSettingsFragment = asf;
-            asf.setCallback(mAccountSettingsFragmentCallback);
-        } else if (f instanceof AccountServerBaseFragment) {
-            mAccountServerFragment = (AccountServerBaseFragment) f;
-        } else {
-            // Possibly uninteresting fragment, such as a dialog.
-            return;
-        }
-        // When we're changing fragments, enable/disable the add account button
-        invalidateOptionsMenu();
-    }
-
-    @VisibleForTesting
-    protected AccountSettingsFragment getSettingsFragment() {
-        return mAccountSettingsFragment != null && mAccountSettingsFragment.isAdded() ?
-                mAccountSettingsFragment : null;
-    }
-
-    protected AccountServerBaseFragment getAccountServerFragment() {
-        return mAccountServerFragment != null && mAccountServerFragment.isAdded() ?
-                mAccountServerFragment : null;
-    }
-
-    /**
-     * Callbacks for AccountSettingsFragment
-     */
-    private class AccountSettingsFragmentCallback implements AccountSettingsFragment.Callback {
-        @Override
-        public void onSettingsChanged(long accountId, String preference, Object value) {
-            AccountSettings.this.onSettingsChanged(accountId, preference, value);
-        }
-        @Override
-        public void onEditQuickResponses(com.android.mail.providers.Account account) {
-            AccountSettings.this.onEditQuickResponses(account);
-        }
-        @Override
-        public void onIncomingSettings(Account account) {
-            AccountSettings.this.onIncomingSettings(account);
-        }
-        @Override
-        public void onOutgoingSettings(Account account) {
-            AccountSettings.this.onOutgoingSettings(account);
-        }
-        @Override
-        public void abandonEdit() {
-            finish();
-        }
-    }
-
-    @Override
-    public void onNextButton() {}
-
-    /**
-     * Save process is done, dismiss the fragment.
-     */
-    @Override
-    public void onAccountServerSaveComplete() {
-        super.onBackPressed();
-    }
-
-    @Override
-    public void onAccountServerUIComplete(int checkMode) {
-        Fragment checkerDialog = CheckSettingsProgressDialogFragment.newInstance(checkMode);
-        Fragment checkerFragment = AccountCheckSettingsFragment.newInstance(checkMode);
-        getFragmentManager().beginTransaction()
-                .add(checkerDialog, CheckSettingsProgressDialogFragment.TAG)
-                .add(checkerFragment, AccountCheckSettingsFragment.TAG)
-                .commit();
-    }
-
-    @Override
-    public void onCheckSettingsProgressDialogCancel() {
-        dismissCheckSettingsFragment();
-    }
-
-    /**
-     * After verifying a new server configuration as OK, we return here and continue. This kicks
-     * off the save process.
-     */
-    @Override
-    public void onCheckSettingsComplete() {
-        dismissCheckSettingsFragment();
-        final AccountServerBaseFragment f = getAccountServerFragment();
-        if (f != null) {
-            f.saveSettings();
-        }
-    }
-
-    @Override
-    public void onCheckSettingsSecurityRequired(String hostName) {
-        dismissCheckSettingsFragment();
-        SecurityRequiredDialogFragment.newInstance(hostName)
-                .show(getFragmentManager(), SecurityRequiredDialogFragment.TAG);
-    }
-
-    @Override
-    public void onCheckSettingsError(int reason, String message) {
-        dismissCheckSettingsFragment();
-        CheckSettingsErrorDialogFragment.newInstance(reason, message)
-                .show(getFragmentManager(), CheckSettingsErrorDialogFragment.TAG);
-    }
-
-    @Override
-    public void onCheckSettingsAutoDiscoverComplete(int result) {
-        throw new IllegalStateException();
-    }
-
-    private void dismissCheckSettingsFragment() {
-        final Fragment f =
-                getFragmentManager().findFragmentByTag(AccountCheckSettingsFragment.TAG);
-        final Fragment d =
-                getFragmentManager().findFragmentByTag(CheckSettingsProgressDialogFragment.TAG);
-        getFragmentManager().beginTransaction()
-                .remove(f)
-                .remove(d)
-                .commit();
-    }
-
-    @Override
-    public void onSecurityRequiredDialogResult(boolean ok) {
-        if (ok) {
-            final AccountServerBaseFragment f = getAccountServerFragment();
-            if (f != null) {
-                f.saveSettings();
-            }
-        }
-        // else just stay here
-    }
-
-    @Override
-    public void onCheckSettingsErrorDialogEditSettings() {
-        // Just stay here
-    }
-
-    @Override
-    public void onCheckSettingsErrorDialogEditCertificate() {
-        final AccountServerBaseFragment f = getAccountServerFragment();
-        if (f instanceof AccountSetupIncomingFragment) {
-            AccountSetupIncomingFragment asif = (AccountSetupIncomingFragment) f;
-            asif.onCertificateRequested();
-        } else {
-            LogUtils.wtf(LogUtils.TAG, "Tried to change cert on non-incoming screen?");
-        }
-    }
-
-    /**
-     * Some of the settings have changed. Update internal state as necessary.
-     */
-    public void onSettingsChanged(long accountId, String preference, Object value) {
-        if (AccountSettingsFragment.PREFERENCE_DESCRIPTION.equals(preference)) {
-            for (Header header : mAccountListHeaders) {
-                if (header.id == accountId) {
-                    // Manually tweak the header title. We cannot rebuild the header list from
-                    // an account cursor as the account database has not been saved yet.
-                    header.title = value.toString();
-                    invalidateHeaders();
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Dispatch to edit quick responses.
-     */
-    public void onEditQuickResponses(com.android.mail.providers.Account account) {
-        try {
-            final Bundle args = new Bundle(1);
-            args.putParcelable(QUICK_RESPONSE_ACCOUNT_KEY, account);
-            startPreferencePanel(AccountSettingsEditQuickResponsesFragment.class.getName(), args,
-                    R.string.account_settings_edit_quick_responses_label, null, null, 0);
-        } catch (Exception e) {
-            LogUtils.d(Logging.LOG_TAG, "Error while trying to invoke edit quick responses.", e);
-        }
-    }
-
-    /**
-     * Dispatch to edit incoming settings.
-     */
-    public void onIncomingSettings(Account account) {
-        try {
-            mSetupData = new SetupDataFragment(SetupDataFragment.FLOW_MODE_EDIT, account);
-            final Fragment f = AccountSetupIncomingFragment.newInstance(true);
-            // Use startPreferenceFragment here because we need to keep this activity instance
-            startPreferenceFragment(f, true);
-        } catch (Exception e) {
-            LogUtils.d(Logging.LOG_TAG, "Error while trying to invoke store settings.", e);
-        }
-    }
-
-    /**
-     * Dispatch to edit outgoing settings.
-     */
-    public void onOutgoingSettings(Account account) {
-        try {
-            mSetupData = new SetupDataFragment(SetupDataFragment.FLOW_MODE_EDIT, account);
-            final Fragment f = AccountSetupOutgoingFragment.newInstance(true);
-            // Use startPreferenceFragment here because we need to keep this activity instance
-            startPreferenceFragment(f, true);
-        } catch (Exception e) {
-            LogUtils.d(Logging.LOG_TAG, "Error while trying to invoke sender settings.", e);
-        }
-    }
-
-    /**
-     * Delete the selected account
-     */
-    public void deleteAccount(final Account account) {
-        // Kick off the work to actually delete the account
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                final Uri uri = EmailProvider.uiUri("uiaccount", account.mId);
-                getContentResolver().delete(uri, null, null);
-            }}).start();
-
-        // TODO: Remove ui glue for unified
-        // Then update the UI as appropriate:
-        // If single pane, return to the header list.  If multi, rebuild header list
-        if (onIsMultiPane()) {
-            final Header prefsHeader = getAppPreferencesHeader();
-            this.switchToHeader(prefsHeader.fragment, prefsHeader.fragmentArguments);
-            mDeletingAccountId = account.mId;
-            updateAccounts();
-        } else {
-            // We should only be calling this while showing AccountSettingsFragment,
-            // so a finish() should bring us back to headers.  No point hiding the deleted account.
-            finish();
-        }
-    }
-
-    /**
-     * This AsyncTask looks up an account based on its email address (which is what we get from
-     * the Account Manager).  When the account id is determined, we refresh the header list,
-     * which will select the preferences for that account.
-     */
-    private class GetAccountIdFromAccountTask extends AsyncTask<Intent, Void, Long> {
-
-        @Override
-        protected Long doInBackground(Intent... params) {
-            final Intent intent = params[0];
-            android.accounts.Account acct =
-                intent.getParcelableExtra(EXTRA_ACCOUNT_MANAGER_ACCOUNT);
-            return Utility.getFirstRowLong(AccountSettings.this, Account.CONTENT_URI,
-                    Account.ID_PROJECTION, SELECTION_ACCOUNT_EMAIL_ADDRESS,
-                    new String[] {acct.name}, null, Account.ID_PROJECTION_COLUMN, -1L);
-        }
-
-        @Override
-        protected void onPostExecute(Long accountId) {
-            if (accountId != -1 && !isCancelled()) {
-                mRequestedAccountId = accountId;
-                invalidateHeaders();
-            }
-        }
-    }
-
-    /**
-     * Dialog fragment to show "exit with unsaved changes?" dialog
-     */
-    public static class UnsavedChangesDialogFragment extends DialogFragment {
-        final static String TAG = "UnsavedChangesDialogFragment";
-
-        // Argument bundle keys
-        private final static String BUNDLE_KEY_HEADER = "UnsavedChangesDialogFragment.Header";
-        private final static String BUNDLE_KEY_BACK = "UnsavedChangesDialogFragment.Back";
-
-        /**
-         * Creates a save changes dialog when the user selects a new header
-         * @param position The new header index to make active if the user accepts the dialog. This
-         * must be a valid header index although there is no error checking.
-         */
-        public static UnsavedChangesDialogFragment newInstanceForHeader(int position) {
-            final UnsavedChangesDialogFragment f = new UnsavedChangesDialogFragment();
-            final Bundle b = new Bundle(1);
-            b.putInt(BUNDLE_KEY_HEADER, position);
-            f.setArguments(b);
-            return f;
-        }
-
-        /**
-         * Creates a save changes dialog when the user navigates "back".
-         * {@link #onBackPressed()} defines in which case this may be triggered.
-         */
-        public static UnsavedChangesDialogFragment newInstanceForBack() {
-            final UnsavedChangesDialogFragment f = new UnsavedChangesDialogFragment();
-            final Bundle b = new Bundle(1);
-            b.putBoolean(BUNDLE_KEY_BACK, true);
-            f.setArguments(b);
-            return f;
-        }
-
-        // Force usage of newInstance()
-        public UnsavedChangesDialogFragment() {}
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            final AccountSettings activity = (AccountSettings) getActivity();
-            final int position = getArguments().getInt(BUNDLE_KEY_HEADER);
-            final boolean isBack = getArguments().getBoolean(BUNDLE_KEY_BACK);
-
-            return new AlertDialog.Builder(activity)
-                .setIconAttribute(android.R.attr.alertDialogIcon)
-                .setTitle(android.R.string.dialog_alert_title)
-                .setMessage(R.string.account_settings_exit_server_settings)
-                .setPositiveButton(
-                        android.R.string.ok,
-                        new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                if (isBack) {
-                                    activity.forceBack();
-                                } else {
-                                    activity.forceSwitchHeader(position);
-                                }
-                                dismiss();
-                            }
-                        })
-                .setNegativeButton(
-                        activity.getString(android.R.string.cancel), null)
-                .create();
-        }
-    }
-
-    /**
-     * Dialog briefly shown in some cases, to indicate the user that login failed.  If the user
-     * clicks OK, we simply dismiss the dialog, leaving the user in the account settings for
-     * that account;  If the user clicks "cancel", we exit account settings.
-     */
-    public static class LoginWarningDialog extends DialogFragment
-            implements DialogInterface.OnClickListener {
-        private static final String BUNDLE_KEY_ACCOUNT_NAME = "account_name";
-        private String mReason;
-
-        // Public no-args constructor needed for fragment re-instantiation
-        public LoginWarningDialog() {}
-
-        /**
-         * Create a new dialog.
-         */
-        public static LoginWarningDialog newInstance(String accountName, String reason) {
-            final LoginWarningDialog dialog = new LoginWarningDialog();
-            final Bundle b = new Bundle(1);
-            b.putString(BUNDLE_KEY_ACCOUNT_NAME, accountName);
-            dialog.setArguments(b);
-            dialog.mReason = reason;
-            return dialog;
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            final String accountName = getArguments().getString(BUNDLE_KEY_ACCOUNT_NAME);
-
-            final Context context = getActivity();
-            final Resources res = context.getResources();
-            final AlertDialog.Builder b = new AlertDialog.Builder(context);
-            b.setTitle(R.string.account_settings_login_dialog_title);
-            b.setIconAttribute(android.R.attr.alertDialogIcon);
-            if (mReason != null) {
-                final TextView message = new TextView(context);
-                final String alert = res.getString(
-                        R.string.account_settings_login_dialog_reason_fmt, accountName, mReason);
-                SpannableString spannableAlertString = new SpannableString(alert);
-                Linkify.addLinks(spannableAlertString, Linkify.WEB_URLS);
-                message.setText(spannableAlertString);
-                // There must be a better way than specifying size/padding this way
-                // It does work and look right, though
-                final int textSize = res.getDimensionPixelSize(R.dimen.dialog_text_size);
-                message.setTextSize(textSize);
-                final int paddingLeft = res.getDimensionPixelSize(R.dimen.dialog_padding_left);
-                final int paddingOther = res.getDimensionPixelSize(R.dimen.dialog_padding_other);
-                message.setPadding(paddingLeft, paddingOther, paddingOther, paddingOther);
-                message.setMovementMethod(LinkMovementMethod.getInstance());
-                b.setView(message);
-            } else {
-                b.setMessage(res.getString(R.string.account_settings_login_dialog_content_fmt,
-                        accountName));
-            }
-            b.setPositiveButton(android.R.string.ok, this);
-            b.setNegativeButton(android.R.string.cancel, this);
-            return b.create();
-        }
-
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            dismiss();
-            if (which == DialogInterface.BUTTON_NEGATIVE) {
-                getActivity().finish();
-            }
-        }
-    }
-
-    @Override
-    public SetupDataFragment getSetupData() {
-        return mSetupData;
-    }
-}
diff --git a/src/com/android/email/activity/setup/AccountSettingsEditQuickResponsesFragment.java b/src/com/android/email/activity/setup/AccountSettingsEditQuickResponsesFragment.java
index 873f673..3a782ca 100644
--- a/src/com/android/email/activity/setup/AccountSettingsEditQuickResponsesFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsEditQuickResponsesFragment.java
@@ -55,12 +55,17 @@
 public class AccountSettingsEditQuickResponsesFragment extends Fragment {
     private Account mAccount;
 
-    private static final String BUNDLE_KEY_ACTIVITY_TITLE
-            = "AccountSettingsEditQuickResponsesFragment.title";
+    private static final String ARG_ACCOUNT = "account";
 
     // Public no-args constructor needed for fragment re-instantiation
     public AccountSettingsEditQuickResponsesFragment() {}
 
+    public static Bundle createArgs(final Account account) {
+        final Bundle b = new Bundle(1);
+        b.putParcelable(ARG_ACCOUNT, account);
+        return b;
+    }
+
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
@@ -69,11 +74,6 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        // startPreferencePanel launches this fragment with the right title initially, but
-        // if the device is rotated we must set the title ourselves
-        if (savedInstanceState != null) {
-            getActivity().setTitle(savedInstanceState.getString(BUNDLE_KEY_ACTIVITY_TITLE));
-        }
 
         final SimpleCursorAdapter adapter = new SimpleCursorAdapter(getActivity(),
                 R.layout.quick_response_item, null,
@@ -104,16 +104,11 @@
     }
 
     @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putString(BUNDLE_KEY_ACTIVITY_TITLE, (String) getActivity().getTitle());
-    }
-
-    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         Bundle args = getArguments();
-        mAccount = args.getParcelable("account");
+        mAccount = args.getParcelable(ARG_ACCOUNT);
 
         setHasOptionsMenu(true);
     }
diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java
index 8d1b4bb..a234abf 100644
--- a/src/com/android/email/activity/setup/AccountSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java
@@ -18,7 +18,11 @@
 
 import android.app.Activity;
 import android.app.LoaderManager;
-import android.content.*;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.Loader;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.media.Ringtone;
@@ -30,9 +34,9 @@
 import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceFragment;
 import android.provider.CalendarContract;
 import android.provider.ContactsContract;
 import android.provider.Settings;
@@ -47,9 +51,9 @@
 import com.android.email.service.EmailServiceUtils;
 import com.android.email.service.EmailServiceUtils.EmailServiceInfo;
 import com.android.email2.ui.MailActivityEmail;
-import com.android.emailcommon.Logging;
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.EmailContent;
+import com.android.emailcommon.provider.EmailContent.AccountColumns;
 import com.android.emailcommon.provider.Mailbox;
 import com.android.emailcommon.provider.Policy;
 import com.android.mail.preferences.AccountPreferences;
@@ -57,7 +61,9 @@
 import com.android.mail.providers.Folder;
 import com.android.mail.providers.UIProvider;
 import com.android.mail.ui.MailAsyncTaskLoader;
+import com.android.mail.ui.settings.MailAccountPrefsFragment;
 import com.android.mail.ui.settings.SettingsUtils;
+import com.android.mail.utils.ContentProviderTask.UpdateTask;
 import com.android.mail.utils.LogUtils;
 import com.android.mail.utils.NotificationUtils;
 
@@ -72,18 +78,20 @@
  * TODO: Can we defer calling addPreferencesFromResource() until after we load the account?  This
  *       could reduce flicker.
  */
-public class AccountSettingsFragment extends PreferenceFragment
+public class AccountSettingsFragment extends MailAccountPrefsFragment
         implements Preference.OnPreferenceChangeListener {
 
-    // Keys used for arguments bundle
-    private static final String BUNDLE_KEY_ACCOUNT_ID = "AccountSettingsFragment.AccountId";
-    private static final String BUNDLE_KEY_ACCOUNT_EMAIL = "AccountSettingsFragment.Email";
+    private static final String ARG_ACCOUNT_ID = "account_id";
 
     public static final String PREFERENCE_DESCRIPTION = "account_description";
     private static final String PREFERENCE_NAME = "account_name";
     private static final String PREFERENCE_SIGNATURE = "account_signature";
     private static final String PREFERENCE_QUICK_RESPONSES = "account_quick_responses";
     private static final String PREFERENCE_FREQUENCY = "account_check_frequency";
+    private static final String PREFERENCE_SYNC_WINDOW = "account_sync_window";
+    private static final String PREFERENCE_SYNC_EMAIL = "account_sync_email";
+    private static final String PREFERENCE_SYNC_CONTACTS = "account_sync_contacts";
+    private static final String PREFERENCE_SYNC_CALENDAR = "account_sync_calendar";
     private static final String PREFERENCE_BACKGROUND_ATTACHMENTS =
             "account_background_attachments";
     private static final String PREFERENCE_CATEGORY_DATA_USAGE = "data_usage";
@@ -97,9 +105,6 @@
     private static final String PREFERENCE_POLICIES_RETRY_ACCOUNT = "policies_retry_account";
     private static final String PREFERENCE_INCOMING = "incoming";
     private static final String PREFERENCE_OUTGOING = "outgoing";
-    private static final String PREFERENCE_SYNC_CONTACTS = "account_sync_contacts";
-    private static final String PREFERENCE_SYNC_CALENDAR = "account_sync_calendar";
-    private static final String PREFERENCE_SYNC_EMAIL = "account_sync_email";
 
     private static final String PREFERENCE_SYSTEM_FOLDERS = "system_folders";
     private static final String PREFERENCE_SYSTEM_FOLDERS_TRASH = "system_folders_trash";
@@ -116,19 +121,14 @@
     private EditTextPreference mAccountSignature;
     private ListPreference mCheckFrequency;
     private ListPreference mSyncWindow;
-    private CheckBoxPreference mAccountBackgroundAttachments;
     private CheckBoxPreference mInboxVibrate;
     private Preference mInboxRingtone;
-    private CheckBoxPreference mSyncContacts;
-    private CheckBoxPreference mSyncCalendar;
-    private CheckBoxPreference mSyncEmail;
 
     private Context mContext;
 
     private Account mAccount;
     private com.android.mail.providers.Account mUiAccount;
-    private Callback mCallback = EmptyCallback.INSTANCE;
-    private boolean mSaveOnExit;
+    private EmailServiceInfo mServiceInfo;
 
     private Ringtone mRingtone;
 
@@ -138,41 +138,25 @@
      */
     private FolderPreferences mInboxFolderPreferences;
 
-    // The ID of the account being edited
-    private long mAccountId;
+    // The email of the account being edited
+    private String mAccountEmail;
 
     /**
-     * Callback interface that owning activities must provide
+     * If launching with an email address, use this method to build the arguments.
      */
-    public interface Callback {
-        public void onSettingsChanged(long accountId, String preference, Object value);
-        public void onEditQuickResponses(com.android.mail.providers.Account account);
-        public void onIncomingSettings(Account account);
-        public void onOutgoingSettings(Account account);
-        public void abandonEdit();
-    }
-
-    private static class EmptyCallback implements Callback {
-        public static final Callback INSTANCE = new EmptyCallback();
-        @Override public void onSettingsChanged(long accountId, String preference, Object value) {}
-        @Override public void onEditQuickResponses(com.android.mail.providers.Account account) {}
-        @Override public void onIncomingSettings(Account account) {}
-        @Override public void onOutgoingSettings(Account account) {}
-        @Override public void abandonEdit() {}
-    }
-
-    /**
-     * If launching with an arguments bundle, use this method to build the arguments.
-     */
-    public static Bundle buildArguments(long accountId, String email) {
-        Bundle b = new Bundle();
-        b.putLong(BUNDLE_KEY_ACCOUNT_ID, accountId);
-        b.putString(BUNDLE_KEY_ACCOUNT_EMAIL, email);
+    public static Bundle buildArguments(final String email) {
+        final Bundle b = new Bundle(1);
+        b.putString(ARG_ACCOUNT_EMAIL, email);
         return b;
     }
 
-    public static String getTitleFromArgs(Bundle args) {
-        return (args == null) ? null : args.getString(BUNDLE_KEY_ACCOUNT_EMAIL);
+    /**
+     * If launching with an account ID, use this method to build the arguments.
+     */
+    public static Bundle buildArguments(final long accountId) {
+        final Bundle b = new Bundle(1);
+        b.putLong(ARG_ACCOUNT_ID, accountId);
+        return b;
     }
 
     @Override
@@ -198,7 +182,7 @@
         // If not, activity must call startLoadingAccount() directly
         Bundle b = getArguments();
         if (b != null) {
-            mAccountId = b.getLong(BUNDLE_KEY_ACCOUNT_ID, -1);
+            mAccountEmail = b.getString(ARG_ACCOUNT_EMAIL);
         }
         if (savedInstanceState != null) {
             // We won't know what the correct set of sync interval values and strings are until
@@ -233,16 +217,13 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         final Bundle args = new Bundle(1);
-        args.putLong(AccountLoaderCallbacks.ARG_ACCOUNT_ID, mAccountId);
-        getLoaderManager().initLoader(0, args, new AccountLoaderCallbacks(getActivity()));
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (mSaveOnExit) {
-            saveSettings();
+        if (!TextUtils.isEmpty(mAccountEmail)) {
+            args.putString(AccountLoaderCallbacks.ARG_ACCOUNT_EMAIL, mAccountEmail);
+        } else {
+            args.putLong(AccountLoaderCallbacks.ARG_ACCOUNT_ID,
+                    getArguments().getLong(ARG_ACCOUNT_ID, -1));
         }
+        getLoaderManager().initLoader(0, args, new AccountLoaderCallbacks(getActivity()));
     }
 
     @Override
@@ -287,9 +268,10 @@
      * @return True to update the state of the Preference with the new value
      */
     @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue){
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
         // Can't use a switch here. Falling back to a giant conditional.
         final String key = preference.getKey();
+        final ContentValues cv = new ContentValues(1);
         if (key.equals(PREFERENCE_DESCRIPTION)){
             String summary = newValue.toString().trim();
             if (TextUtils.isEmpty(summary)) {
@@ -297,15 +279,14 @@
             }
             mAccountDescription.setSummary(summary);
             mAccountDescription.setText(summary);
-            preferenceChanged(PREFERENCE_DESCRIPTION, summary);
-            return false;
-        } else if (key.equals(PREFERENCE_FREQUENCY)) {
-            final String summary = newValue.toString();
-            final int index = mCheckFrequency.findIndexOfValue(summary);
-            mCheckFrequency.setSummary(mCheckFrequency.getEntries()[index]);
-            mCheckFrequency.setValue(summary);
-            preferenceChanged(PREFERENCE_FREQUENCY, newValue);
-            return false;
+            cv.put(AccountColumns.DISPLAY_NAME, summary);
+        } else if (key.equals(PREFERENCE_NAME)) {
+            final String summary = newValue.toString().trim();
+            if (!TextUtils.isEmpty(summary)) {
+                mAccountName.setSummary(summary);
+                mAccountName.setText(summary);
+                cv.put(AccountColumns.SENDER_NAME, summary);
+            }
         } else if (key.equals(PREFERENCE_SIGNATURE)) {
             // Clean up signature if it's only whitespace (which is easy to do on a
             // soft keyboard) but leave whitespace in place otherwise, to give the user
@@ -317,31 +298,87 @@
             mAccountSignature.setText(signature);
             SettingsUtils.updatePreferenceSummary(mAccountSignature, signature,
                     R.string.preferences_signature_summary_not_set);
-            preferenceChanged(PREFERENCE_SIGNATURE, signature);
-            return false;
-        } else if (key.equals(PREFERENCE_NAME)) {
-            final String summary = newValue.toString().trim();
-            if (!TextUtils.isEmpty(summary)) {
-                mAccountName.setSummary(summary);
-                mAccountName.setText(summary);
-                preferenceChanged(PREFERENCE_NAME, summary);
+            cv.put(AccountColumns.SIGNATURE, signature);
+        } else if (key.equals(PREFERENCE_FREQUENCY)) {
+            final String summary = newValue.toString();
+            final int index = mCheckFrequency.findIndexOfValue(summary);
+            mCheckFrequency.setSummary(mCheckFrequency.getEntries()[index]);
+            mCheckFrequency.setValue(summary);
+            if (mServiceInfo.syncContacts || mServiceInfo.syncCalendar) {
+                // This account allows syncing of contacts and/or calendar, so we will always have
+                // separate preferences to enable or disable syncing of email, contacts, and
+                // calendar.
+                // The "sync frequency" preference really just needs to control the frequency value
+                // in our database.
+                cv.put(AccountColumns.SYNC_INTERVAL, Integer.parseInt(summary));
+            } else {
+                // This account only syncs email (not contacts or calendar), which means that we
+                // will hide the preference to turn syncing on and off. In this case, we want the
+                // sync frequency preference to also control whether or not syncing is enabled at
+                // all. If sync is turned off, we will display "sync never" regardless of what the
+                // numeric value we have stored says.
+                final android.accounts.Account androidAcct = new android.accounts.Account(
+                        mAccount.mEmailAddress, mServiceInfo.accountType);
+                if (Integer.parseInt(summary) == Account.CHECK_INTERVAL_NEVER) {
+                    // Disable syncing from the account manager. Leave the current sync frequency
+                    // in the database.
+                    ContentResolver.setSyncAutomatically(androidAcct, EmailContent.AUTHORITY,
+                            false);
+                } else {
+                    // Enable syncing from the account manager.
+                    ContentResolver.setSyncAutomatically(androidAcct, EmailContent.AUTHORITY,
+                            true);
+                    cv.put(AccountColumns.SYNC_INTERVAL, Integer.parseInt(summary));
+                }
             }
-            return false;
+        } else if (key.equals(PREFERENCE_SYNC_WINDOW)) {
+            final String summary = newValue.toString();
+            int index = mSyncWindow.findIndexOfValue(summary);
+            mSyncWindow.setSummary(mSyncWindow.getEntries()[index]);
+            mSyncWindow.setValue(summary);
+            cv.put(AccountColumns.SYNC_LOOKBACK, Integer.parseInt(summary));
+        } else if (key.equals(PREFERENCE_SYNC_EMAIL)) {
+            final android.accounts.Account androidAcct = new android.accounts.Account(
+                    mAccount.mEmailAddress, mServiceInfo.accountType);
+            ContentResolver.setSyncAutomatically(androidAcct, EmailContent.AUTHORITY,
+                    (Boolean) newValue);
+        } else if (key.equals(PREFERENCE_SYNC_CONTACTS)) {
+            final android.accounts.Account androidAcct = new android.accounts.Account(
+                    mAccount.mEmailAddress, mServiceInfo.accountType);
+            ContentResolver.setSyncAutomatically(androidAcct, ContactsContract.AUTHORITY,
+                    (Boolean) newValue);
+        } else if (key.equals(PREFERENCE_SYNC_CALENDAR)) {
+            final android.accounts.Account androidAcct = new android.accounts.Account(
+                    mAccount.mEmailAddress, mServiceInfo.accountType);
+            ContentResolver.setSyncAutomatically(androidAcct, CalendarContract.AUTHORITY,
+                    (Boolean) newValue);
+        } else if (key.equals(PREFERENCE_BACKGROUND_ATTACHMENTS)) {
+            int newFlags = mAccount.getFlags() & ~(Account.FLAGS_BACKGROUND_ATTACHMENTS);
+
+            newFlags |= (Boolean) newValue ?
+                    Account.FLAGS_BACKGROUND_ATTACHMENTS : 0;
+
+            cv.put(AccountColumns.FLAGS, newFlags);
+        } else if (FolderPreferences.PreferenceKeys.NOTIFICATIONS_ENABLED.equals(key)) {
+            mInboxFolderPreferences.setNotificationsEnabled((Boolean) newValue);
+            return true;
         } else if (FolderPreferences.PreferenceKeys.NOTIFICATION_VIBRATE.equals(key)) {
             final boolean vibrateSetting = (Boolean) newValue;
             mInboxVibrate.setChecked(vibrateSetting);
             mInboxFolderPreferences.setNotificationVibrateEnabled(vibrateSetting);
-            preferenceChanged(FolderPreferences.PreferenceKeys.NOTIFICATION_VIBRATE, newValue);
             return true;
-        } else if (FolderPreferences.PreferenceKeys.NOTIFICATIONS_ENABLED.equals(key)) {
-            mInboxFolderPreferences.setNotificationsEnabled((Boolean) newValue);
-            preferenceChanged(FolderPreferences.PreferenceKeys.NOTIFICATIONS_ENABLED, newValue);
+        } else if (FolderPreferences.PreferenceKeys.NOTIFICATION_RINGTONE.equals(key)) {
             return true;
         } else {
             // Default behavior, just indicate that the preferences were written
-            preferenceChanged(key, newValue);
+            LogUtils.d(LogUtils.TAG, "Unknown preference key %s", key);
             return true;
         }
+        if (cv.size() > 0) {
+            new UpdateTask().run(mContext.getContentResolver(), mAccount.getUri(), cv, null, null);
+            MailActivityEmail.setServicesEnabledAsync(mContext);
+        }
+        return false;
     }
 
     @Override
@@ -351,14 +388,7 @@
     }
 
     /**
-     * Activity provides callbacks here
-     */
-    public void setCallback(Callback callback) {
-        mCallback = (callback == null) ? EmptyCallback.INSTANCE : callback;
-    }
-
-    /**
-     * Async task to load account in order to view/edit it
+     * Async task loader to load account in order to view/edit it
      */
     private static class AccountLoader extends MailAsyncTaskLoader<Map<String, Object>> {
         public static final String RESULT_KEY_ACCOUNT = "account";
@@ -367,11 +397,13 @@
         public static final String RESULT_KEY_INBOX = "inbox";
 
         private final ForceLoadContentObserver mObserver;
+        private final String mAccountEmail;
         private final long mAccountId;
 
-        private AccountLoader(Context context, long accountId) {
+        private AccountLoader(Context context, String accountEmail, long accountId) {
             super(context);
             mObserver = new ForceLoadContentObserver();
+            mAccountEmail = accountEmail;
             mAccountId = accountId;
         }
 
@@ -379,7 +411,12 @@
         public Map<String, Object> loadInBackground() {
             final Map<String, Object> map = new HashMap<String, Object>();
 
-            Account account = Account.restoreAccountWithId(getContext(), mAccountId, mObserver);
+            final Account account;
+            if (!TextUtils.isEmpty(mAccountEmail)) {
+                account = Account.restoreAccountWithAddress(getContext(), mAccountEmail, mObserver);
+            } else {
+                account = Account.restoreAccountWithId(getContext(), mAccountId, mObserver);
+            }
             if (account == null) {
                 return map;
             }
@@ -399,7 +436,8 @@
                     Policy.restorePolicyWithId(getContext(), account.mPolicyKey, mObserver);
 
             final Cursor uiAccountCursor = getContext().getContentResolver().query(
-                    EmailProvider.uiUri("uiaccount", mAccountId), UIProvider.ACCOUNTS_PROJECTION,
+                    EmailProvider.uiUri("uiaccount", account.getId()),
+                    UIProvider.ACCOUNTS_PROJECTION,
                     null, null, null);
 
             if (uiAccountCursor != null) {
@@ -457,6 +495,7 @@
 
     private class AccountLoaderCallbacks
             implements LoaderManager.LoaderCallbacks<Map<String, Object>> {
+        public static final String ARG_ACCOUNT_EMAIL = "accountEmail";
         public static final String ARG_ACCOUNT_ID = "accountId";
         private final Context mContext;
 
@@ -466,9 +505,12 @@
 
         @Override
         public void onLoadFinished(Loader<Map<String, Object>> loader, Map<String, Object> data) {
+            final Activity activity = getActivity();
+            if (activity == null) {
+                return;
+            }
             if (data == null) {
-                mSaveOnExit = false;
-                mCallback.abandonEdit();
+                activity.finish();
                 return;
             }
 
@@ -480,33 +522,33 @@
                 final Intent i = AccountSecurity.actionUpdateSecurityIntent(mContext,
                         mAccount.getId(), true);
                 mContext.startActivity(i);
-                mSaveOnExit = false;
-                mCallback.abandonEdit();
+                activity.finish();
                 return;
             }
 
             final Folder inbox = (Folder) data.get(AccountLoader.RESULT_KEY_INBOX);
 
             if (mUiAccount == null || mAccount == null) {
-                mSaveOnExit = false;
-                mCallback.abandonEdit();
+                activity.finish();
                 return;
             }
 
+            mServiceInfo =
+                    EmailServiceUtils.getServiceInfo(mContext, mAccount.getProtocol(mContext));
+
             if (inbox == null) {
                 mInboxFolderPreferences = null;
             } else {
                 mInboxFolderPreferences =
                         new FolderPreferences(mContext, mUiAccount.getEmailAddress(), inbox, true);
             }
-            if (!mSaveOnExit) {
-                loadSettings();
-            }
+            loadSettings();
         }
 
         @Override
         public Loader<Map<String, Object>> onCreateLoader(int id, Bundle args) {
-            return new AccountLoader(mContext, args.getLong(ARG_ACCOUNT_ID));
+            return new AccountLoader(mContext, args.getString(ARG_ACCOUNT_EMAIL),
+                    args.getLong(ARG_ACCOUNT_ID));
         }
 
         @Override
@@ -565,9 +607,6 @@
      * Load account data into preference UI. This must be called on the main thread.
      */
     private void loadSettings() {
-        // Once loaded the data is ready to be saved, as well
-        mSaveOnExit = false;
-
         final AccountPreferences accountPreferences =
                 new AccountPreferences(mContext, mUiAccount.getEmailAddress());
         if (mInboxFolderPreferences != null) {
@@ -576,9 +615,8 @@
         }
 
         final String protocol = mAccount.getProtocol(mContext);
-        final EmailServiceInfo info = EmailServiceUtils.getServiceInfo(mContext, protocol);
-        if (info == null) {
-            LogUtils.e(Logging.LOG_TAG,
+        if (mServiceInfo == null) {
+            LogUtils.e(LogUtils.TAG,
                     "Could not find service info for account %d with protocol %s", mAccount.mId,
                     protocol);
             getActivity().onBackPressed();
@@ -608,9 +646,9 @@
                 R.string.preferences_signature_summary_not_set);
 
         mCheckFrequency = (ListPreference) findPreference(PREFERENCE_FREQUENCY);
-        mCheckFrequency.setEntries(info.syncIntervalStrings);
-        mCheckFrequency.setEntryValues(info.syncIntervals);
-        if (info.syncContacts || info.syncCalendar) {
+        mCheckFrequency.setEntries(mServiceInfo.syncIntervalStrings);
+        mCheckFrequency.setEntryValues(mServiceInfo.syncIntervals);
+        if (mServiceInfo.syncContacts || mServiceInfo.syncCalendar) {
             // This account allows syncing of contacts and/or calendar, so we will always have
             // separate preferences to enable or disable syncing of email, contacts, and calendar.
             // The "sync frequency" preference really just needs to control the frequency value
@@ -637,7 +675,7 @@
                 new Preference.OnPreferenceClickListener() {
                     @Override
                     public boolean onPreferenceClick(Preference preference) {
-                        mCallback.onEditQuickResponses(mUiAccount);
+                        onEditQuickResponses(mUiAccount);
                         return true;
                     }
                 });
@@ -646,9 +684,10 @@
         PreferenceCategory dataUsageCategory =
                 (PreferenceCategory) findPreference(PREFERENCE_CATEGORY_DATA_USAGE);
 
-        if (info.offerLookback) {
+        if (mServiceInfo.offerLookback) {
             if (mSyncWindow == null) {
                 mSyncWindow = new ListPreference(mContext);
+                mSyncWindow.setKey(PREFERENCE_SYNC_WINDOW);
                 dataUsageCategory.addPreference(mSyncWindow);
             }
             mSyncWindow.setTitle(R.string.account_setup_options_mail_window_label);
@@ -665,27 +704,17 @@
 
             // Must correspond to the hole in the XML file that's reserved.
             mSyncWindow.setOrder(2);
-            mSyncWindow.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object newValue) {
-                    final String summary = newValue.toString();
-                    int index = mSyncWindow.findIndexOfValue(summary);
-                    mSyncWindow.setSummary(mSyncWindow.getEntries()[index]);
-                    mSyncWindow.setValue(summary);
-                    preferenceChanged(preference.getKey(), newValue);
-                    return false;
-                }
-            });
+            mSyncWindow.setOnPreferenceChangeListener(this);
         }
 
         PreferenceCategory folderPrefs =
                 (PreferenceCategory) findPreference(PREFERENCE_SYSTEM_FOLDERS);
         if (folderPrefs != null) {
-            if (info.requiresSetup) {
+            if (mServiceInfo.requiresSetup) {
                 Preference trashPreference = findPreference(PREFERENCE_SYSTEM_FOLDERS_TRASH);
                 Intent i = new Intent(mContext, FolderPickerActivity.class);
                 Uri uri = EmailContent.CONTENT_URI.buildUpon().appendQueryParameter(
-                        "account", Long.toString(mAccountId)).build();
+                        "account", Long.toString(mAccount.getId())).build();
                 i.setData(uri);
                 i.putExtra(FolderPickerActivity.MAILBOX_TYPE_EXTRA, Mailbox.TYPE_TRASH);
                 trashPreference.setIntent(i);
@@ -700,16 +729,15 @@
             }
         }
 
-        mAccountBackgroundAttachments = (CheckBoxPreference)
+        CheckBoxPreference backgroundAttachments = (CheckBoxPreference)
                 findPreference(PREFERENCE_BACKGROUND_ATTACHMENTS);
-        if (mAccountBackgroundAttachments != null) {
-            if (!info.offerAttachmentPreload) {
-                dataUsageCategory.removePreference(mAccountBackgroundAttachments);
-                mAccountBackgroundAttachments = null;
+        if (backgroundAttachments != null) {
+            if (!mServiceInfo.offerAttachmentPreload) {
+                dataUsageCategory.removePreference(backgroundAttachments);
             } else {
-                mAccountBackgroundAttachments.setChecked(
+                backgroundAttachments.setChecked(
                         0 != (mAccount.getFlags() & Account.FLAGS_BACKGROUND_ATTACHMENTS));
-                mAccountBackgroundAttachments.setOnPreferenceChangeListener(this);
+                backgroundAttachments.setOnPreferenceChangeListener(this);
             }
         }
 
@@ -808,7 +836,7 @@
                 new Preference.OnPreferenceClickListener() {
                     @Override
                     public boolean onPreferenceClick(Preference preference) {
-                        mCallback.onIncomingSettings(mAccount);
+                        onIncomingSettings(mAccount);
                         return true;
                     }
                 });
@@ -816,21 +844,21 @@
         // Hide the outgoing account setup link if it's not activated
         Preference prefOutgoing = findPreference(PREFERENCE_OUTGOING);
         if (prefOutgoing != null) {
-            if (info.usesSmtp && mAccount.mHostAuthSend != null) {
+            if (mServiceInfo.usesSmtp && mAccount.mHostAuthSend != null) {
                 prefOutgoing.setOnPreferenceClickListener(
                         new Preference.OnPreferenceClickListener() {
                             @Override
                             public boolean onPreferenceClick(Preference preference) {
-                                mCallback.onOutgoingSettings(mAccount);
+                                onOutgoingSettings(mAccount);
                                 return true;
                             }
                         });
             } else {
-                if (info.usesSmtp) {
+                if (mServiceInfo.usesSmtp) {
                     // We really ought to have an outgoing host auth but we don't.
                     // There's nothing we can do at this point, so just log the error.
-                    LogUtils.e(Logging.LOG_TAG, "Account %d has a bad outbound hostauth",
-                            mAccountId);
+                    LogUtils.e(LogUtils.TAG, "Account %d has a bad outbound hostauth",
+                            mAccount.getId());
                 }
                 PreferenceCategory serverCategory = (PreferenceCategory) findPreference(
                         PREFERENCE_CATEGORY_SERVER);
@@ -838,122 +866,42 @@
             }
         }
 
-        mSyncContacts = (CheckBoxPreference) findPreference(PREFERENCE_SYNC_CONTACTS);
-        mSyncCalendar = (CheckBoxPreference) findPreference(PREFERENCE_SYNC_CALENDAR);
-        mSyncEmail = (CheckBoxPreference) findPreference(PREFERENCE_SYNC_EMAIL);
-        if (mSyncContacts != null && mSyncCalendar != null && mSyncEmail != null) {
-            if (info.syncContacts || info.syncCalendar) {
-                if (info.syncContacts) {
-                    mSyncContacts.setChecked(ContentResolver
+        final CheckBoxPreference syncContacts =
+                (CheckBoxPreference) findPreference(PREFERENCE_SYNC_CONTACTS);
+        final CheckBoxPreference syncCalendar =
+                (CheckBoxPreference) findPreference(PREFERENCE_SYNC_CALENDAR);
+        final CheckBoxPreference syncEmail =
+                (CheckBoxPreference) findPreference(PREFERENCE_SYNC_EMAIL);
+        if (syncContacts != null && syncCalendar != null && syncEmail != null) {
+            if (mServiceInfo.syncContacts || mServiceInfo.syncCalendar) {
+                if (mServiceInfo.syncContacts) {
+                    syncContacts.setChecked(ContentResolver
                             .getSyncAutomatically(androidAcct, ContactsContract.AUTHORITY));
-                    mSyncContacts.setOnPreferenceChangeListener(this);
+                    syncContacts.setOnPreferenceChangeListener(this);
                 } else {
-                    mSyncContacts.setChecked(false);
-                    mSyncContacts.setEnabled(false);
+                    syncContacts.setChecked(false);
+                    syncContacts.setEnabled(false);
                 }
-                if (info.syncCalendar) {
-                    mSyncCalendar.setChecked(ContentResolver
+                if (mServiceInfo.syncCalendar) {
+                    syncCalendar.setChecked(ContentResolver
                             .getSyncAutomatically(androidAcct, CalendarContract.AUTHORITY));
-                    mSyncCalendar.setOnPreferenceChangeListener(this);
+                    syncCalendar.setOnPreferenceChangeListener(this);
                 } else {
-                    mSyncCalendar.setChecked(false);
-                    mSyncCalendar.setEnabled(false);
+                    syncCalendar.setChecked(false);
+                    syncCalendar.setEnabled(false);
                 }
-                mSyncEmail.setChecked(ContentResolver
+                syncEmail.setChecked(ContentResolver
                         .getSyncAutomatically(androidAcct, EmailContent.AUTHORITY));
-                mSyncEmail.setOnPreferenceChangeListener(this);
+                syncEmail.setOnPreferenceChangeListener(this);
             } else {
-                dataUsageCategory.removePreference(mSyncContacts);
-                mSyncContacts = null;
-                dataUsageCategory.removePreference(mSyncCalendar);
-                mSyncCalendar = null;
-                dataUsageCategory.removePreference(mSyncEmail);
-                mSyncEmail = null;
+                dataUsageCategory.removePreference(syncContacts);
+                dataUsageCategory.removePreference(syncCalendar);
+                dataUsageCategory.removePreference(syncEmail);
             }
         }
     }
 
     /**
-     * Called any time a preference is changed.
-     */
-    private void preferenceChanged(String preference, Object value) {
-        mCallback.onSettingsChanged(mAccountId, preference, value);
-        mSaveOnExit = true;
-    }
-
-    /*
-     * Note: This writes the settings on the UI thread.  This has to be done so the settings are
-     * committed before we might be killed.
-     */
-    private void saveSettings() {
-        // Turn off all controlled flags - will turn them back on while checking UI elements
-        int newFlags = mAccount.getFlags() & ~(Account.FLAGS_BACKGROUND_ATTACHMENTS);
-
-        if (mAccountBackgroundAttachments != null) {
-            newFlags |= mAccountBackgroundAttachments.isChecked() ?
-                    Account.FLAGS_BACKGROUND_ATTACHMENTS : 0;
-        }
-
-        final EmailServiceInfo info =
-                EmailServiceUtils.getServiceInfo(mContext, mAccount.getProtocol(mContext));
-        final android.accounts.Account androidAcct = new android.accounts.Account(
-                mAccount.mEmailAddress, info.accountType);
-
-        // If the display name has been cleared, we'll reset it to the default value (email addr)
-        mAccount.setDisplayName(mAccountDescription.getText().trim());
-        // The sender name must never be empty (this is enforced by the preference editor)
-        mAccount.setSenderName(mAccountName.getText().trim());
-        mAccount.setSignature(mAccountSignature.getText());
-        int freq = Integer.parseInt(mCheckFrequency.getValue());
-        if (info.syncContacts || info.syncCalendar) {
-            // This account allows syncing of contacts and/or calendar, so we will always have
-            // separate preferences to enable or disable syncing of email, contacts, and calendar.
-            // The "sync frequency" preference really just needs to control the frequency value
-            // in our database.
-            mAccount.setSyncInterval(Integer.parseInt(mCheckFrequency.getValue()));
-        } else {
-            // This account only syncs email (not contacts or calendar), which means that we will
-            // hide the preference to turn syncing on and off. In this case, we want the sync
-            // frequency preference to also control whether or not syncing is enabled at all. If
-            // sync is turned off, we will display "sync never" regardless of what the numeric
-            // value we have stored says.
-            if (freq == Account.CHECK_INTERVAL_NEVER) {
-                // Disable syncing from the account manager. Leave the current sync frequency
-                // in the database.
-                ContentResolver.setSyncAutomatically(androidAcct, EmailContent.AUTHORITY, false);
-            } else {
-                // Enable syncing from the account manager.
-                ContentResolver.setSyncAutomatically(androidAcct, EmailContent.AUTHORITY, true);
-                mAccount.setSyncInterval(Integer.parseInt(mCheckFrequency.getValue()));
-            }
-        }
-        if (mSyncWindow != null) {
-            mAccount.setSyncLookback(Integer.parseInt(mSyncWindow.getValue()));
-        }
-        mAccount.setFlags(newFlags);
-
-        if (info.syncContacts || info.syncCalendar) {
-            ContentResolver.setSyncAutomatically(androidAcct, ContactsContract.AUTHORITY,
-                    mSyncContacts.isChecked());
-            ContentResolver.setSyncAutomatically(androidAcct, CalendarContract.AUTHORITY,
-                    mSyncCalendar.isChecked());
-            ContentResolver.setSyncAutomatically(androidAcct, EmailContent.AUTHORITY,
-                    mSyncEmail.isChecked());
-        }
-
-        // Commit the changes
-        // Note, this is done in the UI thread because at this point, we must commit
-        // all changes - any time after onPause completes, we could be killed.  This is analogous
-        // to the way that SharedPreferences tries to work off-thread in apply(), but will pause
-        // until completion in onPause().
-        ContentValues cv = AccountSettingsUtils.getAccountContentValues(mAccount);
-        mAccount.update(mContext, cv);
-
-        // Run the remaining changes off-thread
-        MailActivityEmail.setServicesEnabledAsync(mContext);
-    }
-
-    /**
      * Shows the system ringtone picker.
      */
     private void showRingtonePicker() {
@@ -969,4 +917,32 @@
         intent.putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION);
         startActivityForResult(intent, RINGTONE_REQUEST_CODE);
     }
+
+    /**
+     * Dispatch to edit quick responses.
+     */
+    public void onEditQuickResponses(com.android.mail.providers.Account account) {
+        final Bundle args = AccountSettingsEditQuickResponsesFragment.createArgs(account);
+        final PreferenceActivity activity = (PreferenceActivity) getActivity();
+        activity.startPreferencePanel(AccountSettingsEditQuickResponsesFragment.class.getName(),
+                args, R.string.account_settings_edit_quick_responses_label, null, null, 0);
+    }
+
+    /**
+     * Dispatch to edit incoming settings.
+     */
+    public void onIncomingSettings(Account account) {
+        final Intent intent =
+                AccountServerSettingsActivity.getIntentForIncoming(getActivity(), account);
+        getActivity().startActivity(intent);
+    }
+
+    /**
+     * Dispatch to edit outgoing settings.
+     */
+    public void onOutgoingSettings(Account account) {
+        final Intent intent =
+                AccountServerSettingsActivity.getIntentForOutgoing(getActivity(), account);
+        getActivity().startActivity(intent);
+    }
 }
diff --git a/src/com/android/email/activity/setup/AccountSetupCredentialsFragment.java b/src/com/android/email/activity/setup/AccountSetupCredentialsFragment.java
index 8210643..650e988 100644
--- a/src/com/android/email/activity/setup/AccountSetupCredentialsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupCredentialsFragment.java
@@ -79,6 +79,7 @@
     private boolean mOfferOAuth;
     private boolean mOfferCerts;
     private String mProviderId;
+    List<OAuthProvider> mOauthProviders;
 
     private Context mAppContext;
 
@@ -168,16 +169,22 @@
         mAppContext = getActivity().getApplicationContext();
         mEmailAddress = getArguments().getString(EXTRA_EMAIL);
         final String protocol = getArguments().getString(EXTRA_PROTOCOL);
-        // TODO: for now, we might not know what protocol we're using, so just default to
-        // offering oauth
-        mOfferOAuth = true;
+        mOauthProviders = AccountSettingsUtils.getAllOAuthProviders(mAppContext);
         mOfferCerts = true;
         if (protocol != null) {
             final EmailServiceInfo info = EmailServiceUtils.getServiceInfo(mAppContext, protocol);
             if (info != null) {
-                mOfferOAuth = info.offerOAuth;
+                if (mOauthProviders.size() > 0) {
+                    mOfferOAuth = info.offerOAuth;
+                }
                 mOfferCerts = info.offerCerts;
             }
+        } else {
+            // For now, we might not know what protocol we're using, so just default to
+            // offering oauth
+            if (mOauthProviders.size() > 0) {
+                mOfferOAuth = true;
+            }
         }
         mOAuthGroup.setVisibility(mOfferOAuth ? View.VISIBLE : View.GONE);
         mRegularPasswordText.setVisibility(mOfferOAuth ? View.GONE : View.VISIBLE);
@@ -279,13 +286,11 @@
     public void onClick(final View view) {
         final int viewId = view.getId();
         if (viewId == R.id.sign_in_with_oauth) {
-            List<OAuthProvider> oauthProviders = AccountSettingsUtils.getAllOAuthProviders(
-                    mAppContext);
             // TODO currently the only oauth provider we support is google.
             // If we ever have more than 1 oauth provider, then we need to implement some sort
             // of picker UI. For now, just always take the first oauth provider.
-            if (oauthProviders.size() > 0) {
-                mProviderId = oauthProviders.get(0).id;
+            if (mOauthProviders.size() > 0) {
+                mProviderId = mOauthProviders.get(0).id;
                 final Intent i = new Intent(getActivity(), OAuthAuthenticationActivity.class);
                 i.putExtra(OAuthAuthenticationActivity.EXTRA_EMAIL_ADDRESS, mEmailAddress);
                 i.putExtra(OAuthAuthenticationActivity.EXTRA_PROVIDER, mProviderId);
diff --git a/src/com/android/email/activity/setup/AccountSetupFinal.java b/src/com/android/email/activity/setup/AccountSetupFinal.java
index 6c5d023..6c04f62 100644
--- a/src/com/android/email/activity/setup/AccountSetupFinal.java
+++ b/src/com/android/email/activity/setup/AccountSetupFinal.java
@@ -63,9 +63,6 @@
         AccountServerBaseFragment.Callback, AccountSetupCredentialsFragment.Callback,
         DuplicateAccountDialogFragment.Callback, AccountSetupABFragment.Callback {
 
-    // Set to false before shipping, logs PII
-    private final static boolean ENTER_DEBUG_SCREEN = false;
-
     /**
      * Direct access for forcing account creation
      * For use by continuous automated test system (e.g. in conjunction with monkey tests)
@@ -556,16 +553,6 @@
                 } // else fall through
             case STATE_BASICS_POST:
                 if (shouldDivertToManual()) {
-                    // Alternate entry to the debug options screen (for devices without a physical
-                    // keyboard):
-                    //  Username: d@d.d
-                    if (ENTER_DEBUG_SCREEN) {
-                        if ("d@d.d".equals(mSetupData.getEmail())) {
-                            AccountSettings.actionSettingsWithDebug(this);
-                            return;
-                        }
-                    }
-
                     mSkipAutoDiscover = true;
                     mIsPreConfiguredProvider = false;
                     mState = STATE_TYPE;
@@ -767,7 +754,8 @@
             }
         } else {
             mIsPreConfiguredProvider = false;
-            final String existingAccountName = mExistingAccountsMap.get(email);
+            final String existingAccountName =
+                mExistingAccountsMap != null ? mExistingAccountsMap.get(email) : null;
             if (!TextUtils.isEmpty(existingAccountName)) {
                 showDuplicateAccountDialog(existingAccountName);
                 return false;
diff --git a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
index e80aa09..e3ba87f 100644
--- a/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupIncomingFragment.java
@@ -44,6 +44,7 @@
 import com.android.email.view.CertificateSelector;
 import com.android.email.view.CertificateSelector.HostCallback;
 import com.android.emailcommon.Device;
+import com.android.emailcommon.VendorPolicyLoader;
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.Credential;
 import com.android.emailcommon.provider.HostAuth;
@@ -54,6 +55,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Provides UI for IMAP/POP account settings.
@@ -83,6 +85,7 @@
     private View mDeviceIdSection;
     private View mImapPathPrefixSectionView;
     private EditText mImapPathPrefixView;
+    private boolean mOAuthProviderPresent;
     // Delete policy as loaded from the device
     private int mLoadedDeletePolicy;
 
@@ -337,9 +340,13 @@
         final Account account = mSetupData.getAccount();
         final HostAuth recvAuth = account.getOrCreateHostAuthRecv(mAppContext);
         mServiceInfo = mSetupData.getIncomingServiceInfo(getActivity());
-        mAuthenticationView.setAuthInfo(mServiceInfo.offerOAuth, recvAuth);
+        final List<VendorPolicyLoader.OAuthProvider> oauthProviders =
+                AccountSettingsUtils.getAllOAuthProviders(getActivity());
+        final boolean offerOAuth = (mServiceInfo.offerOAuth && oauthProviders.size() > 0);
+
+        mAuthenticationView.setAuthInfo(offerOAuth, recvAuth);
         if (mAuthenticationLabel != null) {
-            if (mServiceInfo.offerOAuth) {
+            if (offerOAuth) {
                 mAuthenticationLabel.setText(R.string.authentication_label);
             } else {
                 mAuthenticationLabel.setText(R.string.account_setup_basics_password_label);
diff --git a/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java b/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java
index 2d3f35a..139f827 100644
--- a/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java
+++ b/src/com/android/email/activity/setup/AccountSetupOutgoingFragment.java
@@ -42,6 +42,7 @@
 import com.android.email.activity.UiUtilities;
 import com.android.email.activity.setup.AuthenticationView.AuthenticationCallback;
 import com.android.email.provider.AccountBackupRestore;
+import com.android.emailcommon.VendorPolicyLoader;
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.Credential;
 import com.android.emailcommon.provider.HostAuth;
@@ -49,6 +50,8 @@
 import com.android.mail.ui.MailAsyncTaskLoader;
 import com.android.mail.utils.LogUtils;
 
+import java.util.List;
+
 /**
  * Provides UI for SMTP account settings (for IMAP/POP accounts).
  *
@@ -236,7 +239,9 @@
                 mRequireLoginView.setChecked(true);
             }
 
-            mAuthenticationView.setAuthInfo(true, sendAuth);
+            final List<VendorPolicyLoader.OAuthProvider> oauthProviders =
+                    AccountSettingsUtils.getAllOAuthProviders(getActivity());
+            mAuthenticationView.setAuthInfo(oauthProviders.size() > 0, sendAuth);
             if (mAuthenticationLabel != null) {
                 mAuthenticationLabel.setText(R.string.authentication_label);
             }
diff --git a/src/com/android/email/activity/setup/EmailPreferenceActivity.java b/src/com/android/email/activity/setup/EmailPreferenceActivity.java
new file mode 100644
index 0000000..dd29b8f
--- /dev/null
+++ b/src/com/android/email/activity/setup/EmailPreferenceActivity.java
@@ -0,0 +1,266 @@
+/*
+ * 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.setup;
+
+import android.app.ActionBar;
+import android.app.Fragment;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.android.email.R;
+import com.android.emailcommon.utility.IntentUtilities;
+import com.android.mail.providers.Folder;
+import com.android.mail.providers.UIProvider.EditSettingsExtras;
+import com.android.mail.ui.settings.MailPreferenceActivity;
+import com.android.mail.utils.Utils;
+
+import java.util.List;
+
+/**
+ * Handles account preferences, using multi-pane arrangement when possible.
+ *
+ * This activity uses the following fragments:
+ *   AccountSettingsFragment
+ *   GeneralPreferences
+ *   DebugFragment
+ *
+ */
+public class EmailPreferenceActivity extends MailPreferenceActivity {
+    /*
+     * Intent to open account settings for account=1
+        adb shell am start -a android.intent.action.EDIT \
+            -d '"content://ui.email.android.com/settings?ACCOUNT_ID=1"'
+     */
+
+    // Intent extras for our internal activity launch
+    private static final String EXTRA_ENABLE_DEBUG = "AccountSettings.enable_debug";
+    // STOPSHIP: Do not ship with the debug menu allowed.
+    private static final boolean DEBUG_MENU_ALLOWED = false;
+
+    // Intent extras for launch directly from system account manager
+    // NOTE: This string must match the one in res/xml/account_preferences.xml
+    private static String INTENT_ACCOUNT_MANAGER_ENTRY;
+
+    // Key codes used to open a debug settings fragment.
+    private static final int[] SECRET_KEY_CODES = {
+            KeyEvent.KEYCODE_D, KeyEvent.KEYCODE_E, KeyEvent.KEYCODE_B, KeyEvent.KEYCODE_U,
+            KeyEvent.KEYCODE_G
+            };
+    private int mSecretKeyCodeIndex = 0;
+
+    // When the user taps "Email Preferences" 10 times in a row, we'll enable the debug settings.
+    private int mNumGeneralHeaderClicked = 0;
+
+    private boolean mShowDebugMenu;
+    private Uri mFeedbackUri;
+    private MenuItem mFeedbackMenuItem;
+
+    @Override
+    public Intent getIntent() {
+        final Intent intent = super.getIntent();
+        final long accountId = IntentUtilities.getAccountIdFromIntent(intent);
+        if (accountId < 0) {
+            return intent;
+        }
+        Intent modIntent = new Intent(intent);
+        modIntent.putExtra(EXTRA_SHOW_FRAGMENT, AccountSettingsFragment.class.getCanonicalName());
+        modIntent.putExtra(
+                EXTRA_SHOW_FRAGMENT_ARGUMENTS,
+                AccountSettingsFragment.buildArguments(
+                        IntentUtilities.getAccountNameFromIntent(intent)));
+        modIntent.putExtra(EXTRA_NO_HEADERS, true);
+        return modIntent;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final Intent i = getIntent();
+        if (savedInstanceState == null) {
+            // If we are not restarting from a previous instance, we need to
+            // figure out the initial prefs to show.  (Otherwise, we want to
+            // continue showing whatever the user last selected.)
+            if (INTENT_ACCOUNT_MANAGER_ENTRY == null) {
+                INTENT_ACCOUNT_MANAGER_ENTRY = getString(R.string.intent_account_manager_entry);
+            }
+            if (INTENT_ACCOUNT_MANAGER_ENTRY.equals(i.getAction())) {
+                // This case occurs if we're changing account settings from Settings -> Accounts.
+                // We get an account object in the intent, but it's not actually useful to us since
+                // it's always just the first account of that type. The user can't specify which
+                // account they wish to view from within the settings UI, so just dump them at the
+                // main screen.
+                // android.accounts.Account acct = i.getParcelableExtra("account");
+            } else if (i.hasExtra(EditSettingsExtras.EXTRA_FOLDER)) {
+                launchMailboxSettings(i);
+                return;
+            } else {
+                // Otherwise, we're called from within the Email app and look for our extras
+                final long accountId = IntentUtilities.getAccountIdFromIntent(i);
+                if (accountId != -1) {
+                    final Bundle args = AccountSettingsFragment.buildArguments(accountId);
+                    startPreferencePanel(AccountSettingsFragment.class.getName(), args,
+                            0, null, null, 0);
+                }
+            }
+        }
+        mShowDebugMenu = i.getBooleanExtra(EXTRA_ENABLE_DEBUG, false);
+
+        getActionBar().setDisplayOptions(
+                ActionBar.DISPLAY_HOME_AS_UP, ActionBar.DISPLAY_HOME_AS_UP);
+
+        mFeedbackUri = Utils.getValidUri(getString(R.string.email_feedback_uri));
+    }
+
+    /**
+     * Listen for secret sequence and, if heard, enable debug menu
+     */
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (event.getKeyCode() == SECRET_KEY_CODES[mSecretKeyCodeIndex]) {
+            mSecretKeyCodeIndex++;
+            if (mSecretKeyCodeIndex == SECRET_KEY_CODES.length) {
+                mSecretKeyCodeIndex = 0;
+                enableDebugMenu();
+            }
+        } else {
+            mSecretKeyCodeIndex = 0;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        getMenuInflater().inflate(R.menu.settings_menu, menu);
+
+        mFeedbackMenuItem = menu.findItem(R.id.feedback_menu_item);
+        return true;
+    }
+
+    @Override
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+
+        if (mFeedbackMenuItem != null) {
+            // We only want to enable the feedback menu item, if there is a valid feedback uri
+            mFeedbackMenuItem.setVisible(!Uri.EMPTY.equals(mFeedbackUri));
+        }
+        return true;
+    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                // The app icon on the action bar is pressed.  Just emulate a back press.
+                // TODO: this should navigate to the main screen, even if a sub-setting is open.
+                // But we shouldn't just finish(), as we want to show "discard changes?" dialog
+                // when necessary.
+                onBackPressed();
+                break;
+            case R.id.feedback_menu_item:
+                Utils.sendFeedback(this, mFeedbackUri, false /* reportingProblem */);
+                break;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean isValidFragment(String fragmentName) {
+        // This activity is not exported, so we can allow any fragment
+        return true;
+    }
+
+    private void launchMailboxSettings(Intent intent) {
+        final Folder folder = intent.getParcelableExtra(EditSettingsExtras.EXTRA_FOLDER);
+
+        // TODO: determine from the account if we should navigate to the mailbox settings.
+        // See bug 6242668
+
+        // Get the mailbox id from the folder
+        final long mailboxId =
+                Long.parseLong(folder.folderUri.fullUri.getPathSegments().get(1));
+
+        MailboxSettings.start(this, mailboxId);
+        finish();
+    }
+
+    private void enableDebugMenu() {
+        mShowDebugMenu = true;
+        invalidateHeaders();
+    }
+
+    private void onAddNewAccount() {
+        final Intent setupIntent = AccountSetupFinal.actionNewAccountIntent(this);
+        startActivity(setupIntent);
+    }
+
+    @Override
+    public void onBuildExtraHeaders(List<Header> target) {
+        super.onBuildExtraHeaders(target);
+        // finally, if debug header is enabled, show it
+        if (DEBUG_MENU_ALLOWED) {
+            if (mShowDebugMenu) {
+                // setup lightweight header for debugging
+                final Header debugHeader = new Header();
+                debugHeader.title = getText(R.string.debug_title);
+                debugHeader.summary = null;
+                debugHeader.iconRes = 0;
+                debugHeader.fragment = DebugFragment.class.getCanonicalName();
+                debugHeader.fragmentArguments = null;
+                target.add(debugHeader);
+            }
+        }
+    }
+
+    /**
+     * Called when the user selects an item in the header list.  Handles save-data cases as needed
+     *
+     * @param header The header that was selected.
+     * @param position The header's position in the list.
+     */
+    @Override
+    public void onHeaderClick(Header header, int position) {
+        // Secret keys:  Click 10x to enable debug settings
+        if (position == 0) {
+            mNumGeneralHeaderClicked++;
+            if (mNumGeneralHeaderClicked == 10) {
+                enableDebugMenu();
+            }
+        } else {
+            mNumGeneralHeaderClicked = 0;
+        }
+
+        // Process header click normally
+        super.onHeaderClick(header, position);
+    }
+
+    @Override
+    public void onAttachFragment(Fragment f) {
+        super.onAttachFragment(f);
+        // When we're changing fragments, enable/disable the add account button
+        invalidateOptionsMenu();
+    }
+}
diff --git a/src/com/android/email/activity/setup/GeneralPreferences.java b/src/com/android/email/activity/setup/GeneralPreferences.java
index 8118268..1f25db5 100644
--- a/src/com/android/email/activity/setup/GeneralPreferences.java
+++ b/src/com/android/email/activity/setup/GeneralPreferences.java
@@ -16,87 +16,37 @@
 
 package com.android.email.activity.setup;
 
-import android.content.ContentResolver;
 import android.os.Bundle;
-import android.preference.ListPreference;
 import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.PreferenceFragment;
+import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 
-import com.android.email.R;
-import com.android.email.provider.EmailProvider;
-import com.android.mail.preferences.MailPrefs;
-import com.android.mail.ui.settings.ClearPictureApprovalsDialogFragment;
+import com.android.mail.preferences.MailPrefs.PreferenceKeys;
+import com.android.mail.ui.settings.GeneralPrefsFragment;
 
-public class GeneralPreferences extends PreferenceFragment implements
-        OnPreferenceChangeListener {
+public class GeneralPreferences extends GeneralPrefsFragment {
 
-    private static final String AUTO_ADVANCE_MODE_WIDGET = "auto-advance-mode-widget";
-
-    private MailPrefs mMailPrefs;
-    private ListPreference mAutoAdvance;
+    public GeneralPreferences() {}
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
 
-        mMailPrefs = MailPrefs.get(getActivity());
-        getPreferenceManager().setSharedPreferencesName(mMailPrefs.getSharedPreferencesName());
-
-        // Load the preferences from an XML resource
-        addPreferencesFromResource(R.xml.general_preferences);
-    }
-
-    @Override
-    public void onResume() {
-        loadSettings();
-        super.onResume();
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        String key = preference.getKey();
-        // Indicate we need to send notifications to UI
-        if (AUTO_ADVANCE_MODE_WIDGET.equals(key)) {
-            mMailPrefs.setAutoAdvanceMode(mAutoAdvance.findIndexOfValue((String) newValue) + 1);
-            return true;
+        final PreferenceScreen ps = getPreferenceScreen();
+        final Preference removalAction = findPreference(PreferenceKeys.REMOVAL_ACTION);
+        if (removalAction != null) {
+            ps.removePreference(removalAction);
         }
+        final Preference confirmArchive = findPreference(PreferenceKeys.CONFIRM_ARCHIVE);
+        final PreferenceGroup removalGroup =
+                (PreferenceGroup) findPreference(REMOVAL_ACTIONS_GROUP);
+        if (confirmArchive != null) {
+            removalGroup.removePreference(confirmArchive);
+        }
+    }
+
+    @Override
+    protected boolean supportsArchive() {
         return false;
     }
-
-    private void loadSettings() {
-        mAutoAdvance = (ListPreference) findPreference(AUTO_ADVANCE_MODE_WIDGET);
-        mAutoAdvance.setValueIndex(mMailPrefs.getAutoAdvanceMode() - 1);
-        mAutoAdvance.setOnPreferenceChangeListener(this);
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        menu.clear();
-        inflater.inflate(R.menu.general_prefs_fragment_menu, menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.clear_picture_approvals_menu_item:
-                clearDisplayImages();
-                return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void clearDisplayImages() {
-        final ClearPictureApprovalsDialogFragment fragment =
-                ClearPictureApprovalsDialogFragment.newInstance();
-        fragment.show(getActivity().getFragmentManager(),
-                ClearPictureApprovalsDialogFragment.FRAGMENT_TAG);
-    }
-
 }
diff --git a/src/com/android/email/activity/setup/HeadlessAccountSettingsLoader.java b/src/com/android/email/activity/setup/HeadlessAccountSettingsLoader.java
index ba43f9d..09eedd9 100644
--- a/src/com/android/email/activity/setup/HeadlessAccountSettingsLoader.java
+++ b/src/com/android/email/activity/setup/HeadlessAccountSettingsLoader.java
@@ -1,21 +1,40 @@
 package com.android.email.activity.setup;
 
 import android.app.Activity;
+import android.app.LoaderManager;
 import android.content.Context;
 import android.content.Intent;
+import android.content.Loader;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.preference.PreferenceActivity;
 
 import com.android.emailcommon.provider.Account;
+import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.utility.IntentUtilities;
+import com.android.mail.ui.MailAsyncTaskLoader;
 
 /**
  * This activity is headless. It exists to load the Account object from  the given account ID and
- * then starts the {@link AccountSettings} activity with the appropriate fragment showing in place.
+ * then starts the {@link AccountServerSettingsActivity} activity with the incoming/outgoing
+ * settings fragment
  */
 public class HeadlessAccountSettingsLoader extends Activity {
 
+    public static Uri getIncomingSettingsUri(long accountId) {
+        final Uri.Builder baseUri = Uri.parse("auth://" + EmailContent.EMAIL_PACKAGE_NAME +
+                ".ACCOUNT_SETTINGS/incoming/").buildUpon();
+        IntentUtilities.setAccountId(baseUri, accountId);
+        return baseUri.build();
+    }
+
+    public static Uri getOutgoingSettingsUri(long accountId) {
+        final Uri.Builder baseUri = Uri.parse("auth://" + EmailContent.EMAIL_PACKAGE_NAME +
+                ".ACCOUNT_SETTINGS/outgoing/").buildUpon();
+        IntentUtilities.setAccountId(baseUri, accountId);
+        return baseUri.build();
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -23,8 +42,9 @@
         final Intent i = getIntent();
         final long accountID = IntentUtilities.getAccountIdFromIntent(i);
 
-        if ("incoming".equals(i.getData().getLastPathSegment())) {
-            new LoadAccountIncomingSettingsAsyncTask(getApplicationContext())
+        if (savedInstanceState == null) {
+            new LoadAccountIncomingSettingsAsyncTask(getApplicationContext(),
+                    "incoming".equals(i.getData().getLastPathSegment()))
                     .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, accountID);
         }
     }
@@ -35,9 +55,11 @@
      */
     private class LoadAccountIncomingSettingsAsyncTask extends AsyncTask<Long, Void, Account> {
         private final Context mContext;
+        private final boolean mIncoming;
 
-        private LoadAccountIncomingSettingsAsyncTask(Context context) {
+        private LoadAccountIncomingSettingsAsyncTask(Context context, boolean incoming) {
             mContext = context;
+            mIncoming = incoming;
         }
 
         protected Account doInBackground(Long... params) {
@@ -46,22 +68,14 @@
 
         protected void onPostExecute(Account result) {
             // create an Intent to view a new activity
-            final Intent intent = new Intent(Intent.ACTION_VIEW);
+            final Intent intent;
+            if (mIncoming) {
+                intent = AccountServerSettingsActivity.getIntentForIncoming(mContext, result);
+            } else {
+                intent = AccountServerSettingsActivity.getIntentForOutgoing(mContext, result);
+            }
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
-            // we are navigating explicitly to the AccountSettings activity
-            intent.setClass(mContext, AccountSettings.class);
-
-            // place the account in the intent as an extra
-            intent.putExtra(AccountSettings.EXTRA_ACCOUNT, result);
-
-            // these extras show the "incoming fragment" in the AccountSettings activity by default
-            intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT,
-                    AccountSetupIncomingFragment.class.getCanonicalName());
-            intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS,
-                    AccountSetupIncomingFragment.getArgs(true));
-            intent.putExtra(PreferenceActivity.EXTRA_NO_HEADERS, true);
-
             mContext.startActivity(intent);
 
             finish();
diff --git a/src/com/android/email/activity/setup/SetupDataFragment.java b/src/com/android/email/activity/setup/SetupDataFragment.java
index df9714c..45b7cf1 100644
--- a/src/com/android/email/activity/setup/SetupDataFragment.java
+++ b/src/com/android/email/activity/setup/SetupDataFragment.java
@@ -76,16 +76,6 @@
         mCredentialResults = null;
     }
 
-    public SetupDataFragment(int flowMode) {
-        this();
-        mFlowMode = flowMode;
-    }
-
-    public SetupDataFragment(int flowMode, Account account) {
-        this(flowMode);
-        setAccount(account);
-    }
-
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
diff --git a/src/com/android/email/mail/store/ServiceStore.java b/src/com/android/email/mail/store/ServiceStore.java
index ca69aeb..ae568f5 100644
--- a/src/com/android/email/mail/store/ServiceStore.java
+++ b/src/com/android/email/mail/store/ServiceStore.java
@@ -26,6 +26,7 @@
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.HostAuth;
 import com.android.emailcommon.service.EmailServiceProxy;
+import com.android.emailcommon.service.HostAuthCompat;
 import com.android.emailcommon.service.IEmailService;
 
 /**
@@ -66,7 +67,8 @@
             if (svc instanceof EmailServiceProxy) {
                 ((EmailServiceProxy)svc).setTimeout(90);
             }
-            return svc.validate(mHostAuth);
+            HostAuthCompat hostAuthCom = new HostAuthCompat(mHostAuth);
+            return svc.validate(hostAuthCom);
         } catch (RemoteException e) {
             throw new MessagingException("Call to validate generated an exception", e);
         }
diff --git a/src/com/android/email/mail/store/imap/ImapResponseParser.java b/src/com/android/email/mail/store/imap/ImapResponseParser.java
index 0c5d07b..4433105 100644
--- a/src/com/android/email/mail/store/imap/ImapResponseParser.java
+++ b/src/com/android/email/mail/store/imap/ImapResponseParser.java
@@ -438,6 +438,9 @@
         } catch (NumberFormatException nfe) {
             throw new MessagingException("Invalid length in literal");
         }
+        if (size < 0) {
+            throw new MessagingException("Invalid negative length in literal");
+        }
         expect('\r');
         expect('\n');
         FixedLengthInputStream in = new FixedLengthInputStream(mIn, size);
diff --git a/src/com/android/email/preferences/EmailPreferenceMigrator.java b/src/com/android/email/preferences/EmailPreferenceMigrator.java
index 1d746e7..99c9a66 100644
--- a/src/com/android/email/preferences/EmailPreferenceMigrator.java
+++ b/src/com/android/email/preferences/EmailPreferenceMigrator.java
@@ -136,6 +136,11 @@
                 try {
                     if (folderCursor.moveToFirst()) {
                         folder = new Folder(folderCursor);
+                    } else {
+                        LogUtils.e(LOG_TAG, "Empty folder cursor for mailbox %s",
+                                LogUtils.sanitizeName(LOG_TAG,
+                                        account.settings.defaultInbox.toString()));
+                        continue;
                     }
                 } finally {
                     folderCursor.close();
diff --git a/src/com/android/email/provider/AccountReconciler.java b/src/com/android/email/provider/AccountReconciler.java
index bcfb675..67e3c3b 100644
--- a/src/com/android/email/provider/AccountReconciler.java
+++ b/src/com/android/email/provider/AccountReconciler.java
@@ -244,16 +244,20 @@
             }
         }
 
-        // If there are no accounts remaining after reconciliation, disable the compose activity
-        final boolean enableCompose = emailProviderAccounts.size() - accountsDeleted > 0;
-        final ComponentName componentName =
-                new ComponentName(context, ComposeActivityEmail.class.getName());
-        context.getPackageManager().setComponentEnabledSetting(componentName,
-                enableCompose ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED :
-                                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-                PackageManager.DONT_KILL_APP);
-        LogUtils.d(LogUtils.TAG, "Setting compose activity to "
-                + (enableCompose ? "enabled" : "disabled"));
+        final String composeActivityName =
+                context.getString(R.string.reconciliation_compose_activity_name);
+        if (!TextUtils.isEmpty(composeActivityName)) {
+            // If there are no accounts remaining after reconciliation, disable the compose activity
+            final boolean enableCompose = emailProviderAccounts.size() - accountsDeleted > 0;
+            final ComponentName componentName = new ComponentName(context, composeActivityName);
+            context.getPackageManager().setComponentEnabledSetting(componentName,
+                    enableCompose ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED :
+                            PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                    PackageManager.DONT_KILL_APP);
+            LogUtils.d(LogUtils.TAG, "Setting compose activity to "
+                    + (enableCompose ? "enabled" : "disabled"));
+        }
+
 
         // If an account has been deleted, the simplest thing is just to kill our process.
         // Otherwise we might have a service running trying to do something for the account
diff --git a/src/com/android/email/provider/EmailMessageCursor.java b/src/com/android/email/provider/EmailMessageCursor.java
index e4aa270..d57fb1e 100644
--- a/src/com/android/email/provider/EmailMessageCursor.java
+++ b/src/com/android/email/provider/EmailMessageCursor.java
@@ -70,7 +70,12 @@
                 if (mHtmlColumnIndex != -1) {
                     final Uri htmlUri = Body.getBodyHtmlUriForMessageWithId(messageId);
                     final InputStream in = cr.openInputStream(htmlUri);
-                    final String underlyingHtmlString = IOUtils.toString(in);
+                    final String underlyingHtmlString;
+                    try {
+                        underlyingHtmlString = IOUtils.toString(in);
+                    } finally {
+                        in.close();
+                    }
                     final String sanitizedHtml = HtmlSanitizer.sanitizeHtml(underlyingHtmlString);
                     mHtmlParts.put(position, sanitizedHtml);
                 }
@@ -81,7 +86,12 @@
                 if (mTextColumnIndex != -1) {
                     final Uri textUri = Body.getBodyTextUriForMessageWithId(messageId);
                     final InputStream in = cr.openInputStream(textUri);
-                    final String underlyingTextString = IOUtils.toString(in);
+                    final String underlyingTextString;
+                    try {
+                        underlyingTextString = IOUtils.toString(in);
+                    } finally {
+                        in.close();
+                    }
                     mTextParts.put(position, underlyingTextString);
                 }
             } catch (final IOException e) {
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 479bba7..99c6765 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -66,8 +66,10 @@
 import com.android.email.Preferences;
 import com.android.email.R;
 import com.android.email.SecurityPolicy;
+import com.android.email.activity.setup.AccountSettingsFragment;
 import com.android.email.activity.setup.AccountSettingsUtils;
-import com.android.email.service.AttachmentDownloadService;
+import com.android.email.activity.setup.HeadlessAccountSettingsLoader;
+import com.android.email.service.AttachmentService;
 import com.android.email.service.EmailServiceUtils;
 import com.android.email.service.EmailServiceUtils.EmailServiceInfo;
 import com.android.email2.ui.MailActivityEmail;
@@ -112,6 +114,7 @@
 import com.android.mail.providers.Settings;
 import com.android.mail.providers.UIProvider;
 import com.android.mail.providers.UIProvider.AccountCapabilities;
+import com.android.mail.providers.UIProvider.AccountColumns.SettingsColumns;
 import com.android.mail.providers.UIProvider.AccountCursorExtraKeys;
 import com.android.mail.providers.UIProvider.ConversationPriority;
 import com.android.mail.providers.UIProvider.ConversationSendingState;
@@ -144,10 +147,6 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 
-/**
- * @author mblank
- *
- */
 public class EmailProvider extends ContentProvider
         implements SharedPreferences.OnSharedPreferenceChangeListener {
 
@@ -181,9 +180,6 @@
     private static final String EMAIL_ATTACHMENT_MIME_TYPE =
         "vnd.android.cursor.item/email-attachment";
 
-    /** The base of the URI that navigates to the settings page to alter email auth credentials */
-    private static Uri BASE_AUTH_URI;
-
     /** Appended to the notification URI for delete operations */
     private static final String NOTIFICATION_OP_DELETE = "delete";
     /** Appended to the notification URI for insert operations */
@@ -274,6 +270,7 @@
     private static final int UI_ALL_FOLDERS = UI_BASE + 19;
     private static final int UI_PURGE_FOLDER = UI_BASE + 20;
     private static final int UI_INBOX = UI_BASE + 21;
+    private static final int UI_ACCTSETTINGS = UI_BASE + 22;
 
     private static final int BODY_BASE = 0xA000;
     private static final int BODY = BODY_BASE;
@@ -1086,9 +1083,6 @@
             UIPROVIDER_RECENT_FOLDERS_NOTIFIER =
                     Uri.parse("content://" + uiNotificationAuthority + "/uirecentfolders");
 
-            BASE_AUTH_URI = Uri.parse("auth://" + EmailContent.EMAIL_PACKAGE_NAME +
-                    ".INCOMING_SETTINGS/incoming/");
-
             // All accounts
             sURIMatcher.addURI(EmailContent.AUTHORITY, "account", ACCOUNT);
             // A specific account
@@ -1195,9 +1189,11 @@
             sURIMatcher.addURI(EmailContent.AUTHORITY, "uiinbox/#", UI_INBOX);
             sURIMatcher.addURI(EmailContent.AUTHORITY, "uiaccount/#", UI_ACCOUNT);
             sURIMatcher.addURI(EmailContent.AUTHORITY, "uiaccts", UI_ACCTS);
+            sURIMatcher.addURI(EmailContent.AUTHORITY, "uiacctsettings", UI_ACCTSETTINGS);
             sURIMatcher.addURI(EmailContent.AUTHORITY, "uiattachments/#", UI_ATTACHMENTS);
             sURIMatcher.addURI(EmailContent.AUTHORITY, "uiattachment/#", UI_ATTACHMENT);
-            sURIMatcher.addURI(EmailContent.AUTHORITY, "uiattachmentbycid/#/*", UI_ATTACHMENT_BY_CID);
+            sURIMatcher.addURI(EmailContent.AUTHORITY, "uiattachmentbycid/#/*",
+                    UI_ATTACHMENT_BY_CID);
             sURIMatcher.addURI(EmailContent.AUTHORITY, "uisearch/#", UI_SEARCH);
             sURIMatcher.addURI(EmailContent.AUTHORITY, "uiaccountdata/#", UI_ACCOUNT_DATA);
             sURIMatcher.addURI(EmailContent.AUTHORITY, "uiloadmore/#", UI_FOLDER_LOAD_MORE);
@@ -1289,7 +1285,11 @@
                     c = uiSearch(uri, projection);
                     return c;
                 case UI_ACCTS:
-                    c = uiAccounts(projection);
+                    final String suppressParam =
+                            uri.getQueryParameter(EmailContent.SUPPRESS_COMBINED_ACCOUNT_PARAM);
+                    final boolean suppressCombined =
+                            suppressParam != null && Boolean.parseBoolean(suppressParam);
+                    c = uiAccounts(projection, suppressCombined);
                     return c;
                 case UI_UNDO:
                     return uiUndo(projection);
@@ -1841,6 +1841,8 @@
                     return pickTrashFolder(uri);
                 case ACCOUNT_PICK_SENT_FOLDER:
                     return pickSentFolder(uri);
+                case UI_ACCTSETTINGS:
+                    return uiUpdateSettings(context, values);
                 case UI_FOLDER:
                     return uiUpdateFolder(context, uri, values);
                 case UI_RECENT_FOLDERS:
@@ -2434,24 +2436,24 @@
         }
     }
 
-    public static interface AttachmentService {
+    public static interface EmailAttachmentService {
         /**
          * Notify the service that an attachment has changed.
          */
-        void attachmentChanged(Context context, long id, int flags);
+        void attachmentChanged(final Context context, final long id, final int flags);
     }
 
-    private final AttachmentService DEFAULT_ATTACHMENT_SERVICE = new AttachmentService() {
+    private final EmailAttachmentService DEFAULT_ATTACHMENT_SERVICE = new EmailAttachmentService() {
         @Override
-        public void attachmentChanged(Context context, long id, int flags) {
+        public void attachmentChanged(final Context context, final long id, final int flags) {
             // The default implementation delegates to the real service.
-            AttachmentDownloadService.attachmentChanged(context, id, flags);
+            AttachmentService.attachmentChanged(context, id, flags);
         }
     };
-    private AttachmentService mAttachmentService = DEFAULT_ATTACHMENT_SERVICE;
+    private EmailAttachmentService mAttachmentService = DEFAULT_ATTACHMENT_SERVICE;
 
     // exposed for testing
-    public void injectAttachmentService(AttachmentService attachmentService) {
+    public void injectAttachmentService(final EmailAttachmentService attachmentService) {
         mAttachmentService =
             attachmentService == null ? DEFAULT_ATTACHMENT_SERVICE : attachmentService;
     }
@@ -2668,13 +2670,13 @@
             + " ELSE " + UIProvider.FolderType.DEFAULT + " END";
 
     private static final String FOLDER_ICON = "CASE " + MailboxColumns.TYPE
-            + " WHEN " + Mailbox.TYPE_INBOX   + " THEN " + R.drawable.ic_folder_inbox
-            + " WHEN " + Mailbox.TYPE_DRAFTS  + " THEN " + R.drawable.ic_folder_drafts
-            + " WHEN " + Mailbox.TYPE_OUTBOX  + " THEN " + R.drawable.ic_folder_outbox
-            + " WHEN " + Mailbox.TYPE_SENT    + " THEN " + R.drawable.ic_folder_sent
-            + " WHEN " + Mailbox.TYPE_TRASH   + " THEN " + R.drawable.ic_folder_trash
-            + " WHEN " + Mailbox.TYPE_STARRED + " THEN " + R.drawable.ic_folder_star
-            + " ELSE -1 END";
+            + " WHEN " + Mailbox.TYPE_INBOX   + " THEN " + R.drawable.ic_drawer_inbox
+            + " WHEN " + Mailbox.TYPE_DRAFTS  + " THEN " + R.drawable.ic_drawer_drafts
+            + " WHEN " + Mailbox.TYPE_OUTBOX  + " THEN " + R.drawable.ic_drawer_outbox
+            + " WHEN " + Mailbox.TYPE_SENT    + " THEN " + R.drawable.ic_drawer_sent
+            + " WHEN " + Mailbox.TYPE_TRASH   + " THEN " + R.drawable.ic_drawer_trash
+            + " WHEN " + Mailbox.TYPE_STARRED + " THEN " + R.drawable.ic_drawer_starred
+            + " ELSE " + R.drawable.ic_drawer_folder + " END";
 
     /**
      * Local-only folders set totalCount < 0; such folders should substitute message count for
@@ -3306,12 +3308,6 @@
                 .appendQueryParameter("account", account).build().toString();
     }
 
-    private static String getExternalUriStringReathentication(long accountId) {
-        final Uri.Builder builder = BASE_AUTH_URI.buildUpon();
-        IntentUtilities.setAccountId(builder, accountId);
-        return builder.build().toString();
-    }
-
     private static String getBits(int bitField) {
         StringBuilder sb = new StringBuilder(" ");
         for (int i = 0; i < 32; i++, bitField >>= 1) {
@@ -3426,7 +3422,8 @@
         }
         if (projectionColumns.contains(UIProvider.AccountColumns.REAUTHENTICATION_INTENT_URI)) {
             values.put(UIProvider.AccountColumns.REAUTHENTICATION_INTENT_URI,
-                    getExternalUriStringReathentication(accountId));
+                    HeadlessAccountSettingsLoader.getIncomingSettingsUri(accountId)
+                    .toString());
         }
         if (projectionColumns.contains(UIProvider.AccountColumns.MIME_TYPE)) {
             values.put(UIProvider.AccountColumns.MIME_TYPE, EMAIL_APP_MIME_TYPE);
@@ -3455,11 +3452,6 @@
             values.put(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ICON,
                     getConversationListIcon(mailPrefs));
         }
-        if (projectionColumns.contains(
-                UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)) {
-            values.put(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS,
-                    "0");
-        }
         if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE)) {
             values.put(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE,
                     Integer.toString(mailPrefs.getAutoAdvanceMode()));
@@ -3489,6 +3481,10 @@
                         UIProvider.SyncStatus.INITIAL_SYNC_NEEDED);
             }
         }
+        if (projectionColumns.contains(UIProvider.AccountColumns.UPDATE_SETTINGS_URI)) {
+            values.put(UIProvider.AccountColumns.UPDATE_SETTINGS_URI,
+                    uiUriString("uiacctsettings", -1));
+        }
         if (projectionColumns.contains(UIProvider.AccountColumns.ENABLE_MESSAGE_TRANSFORMS)) {
             // Email is now sanitized, which grants the ability to inject beautifying javascript.
             values.put(UIProvider.AccountColumns.ENABLE_MESSAGE_TRANSFORMS, 1);
@@ -3541,6 +3537,10 @@
             values.put(UIProvider.AccountColumns.QUICK_RESPONSE_URI,
                     combinedUriString("quickresponse/account", id));
         }
+        if (projectionColumns.contains(UIProvider.AccountColumns.SETTINGS_FRAGMENT_CLASS)) {
+            values.put(UIProvider.AccountColumns.SETTINGS_FRAGMENT_CLASS,
+                    AccountSettingsFragment.class.getName());
+        }
         if (projectionColumns.contains(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR)) {
             values.put(UIProvider.AccountColumns.SettingsColumns.REPLY_BEHAVIOR,
                     mailPrefs.getDefaultReplyAll()
@@ -3625,7 +3625,7 @@
         }
         if (colPosMap.containsKey(UIProvider.AccountColumns.CAPABILITIES)) {
             values[colPosMap.get(UIProvider.AccountColumns.CAPABILITIES)] =
-                    AccountCapabilities.UNDO | AccountCapabilities.SENDING_UNAVAILABLE;
+                    AccountCapabilities.UNDO | AccountCapabilities.VIRTUAL_ACCOUNT;
         }
         if (colPosMap.containsKey(UIProvider.AccountColumns.FOLDER_LIST_URI)) {
             values[colPosMap.get(UIProvider.AccountColumns.FOLDER_LIST_URI)] =
@@ -3662,6 +3662,10 @@
             values[colPosMap.get(UIProvider.AccountColumns.COMPOSE_URI)] =
                     getExternalUriStringEmail2("compose", Long.toString(id));
         }
+        if (colPosMap.containsKey(UIProvider.AccountColumns.UPDATE_SETTINGS_URI)) {
+            values[colPosMap.get(UIProvider.AccountColumns.UPDATE_SETTINGS_URI)] =
+                    uiUriString("uiacctsettings", -1);
+        }
 
         if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE)) {
             values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.AUTO_ADVANCE)] =
@@ -3682,11 +3686,6 @@
             values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ICON)] =
                     getConversationListIcon(mailPrefs);
         }
-        if (colPosMap.containsKey(
-                UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)) {
-            values[colPosMap.get(
-                    UIProvider.AccountColumns.SettingsColumns.CONV_LIST_ATTACHMENT_PREVIEWS)] = 0;
-        }
         if (colPosMap.containsKey(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)) {
             values[colPosMap.get(UIProvider.AccountColumns.SettingsColumns.CONFIRM_DELETE)] =
                     mailPrefs.getConfirmDelete() ? 1 : 0;
@@ -3790,18 +3789,18 @@
                 }
             } else if (column.equals(UIProvider.FolderColumns.ICON_RES_ID)) {
                 if (mailboxType == Mailbox.TYPE_INBOX) {
-                    values[i] = R.drawable.ic_folder_inbox;
+                    values[i] = R.drawable.ic_drawer_inbox;
                 } else if (mailboxType == Mailbox.TYPE_UNREAD) {
-                    values[i] = R.drawable.ic_folder_unread;
+                    values[i] = R.drawable.ic_drawer_unread;
                 } else if (mailboxType == Mailbox.TYPE_STARRED) {
-                    values[i] = R.drawable.ic_folder_star;
+                    values[i] = R.drawable.ic_drawer_starred;
                 }
             }
         }
         return values;
     }
 
-    private Cursor uiAccounts(String[] uiProjection) {
+    private Cursor uiAccounts(String[] uiProjection, boolean suppressCombined) {
         final Context context = getContext();
         final SQLiteDatabase db = getDatabase(context);
         final Cursor accountIdCursor =
@@ -3809,7 +3808,7 @@
         final MatrixCursor mc;
         try {
             boolean combinedAccount = false;
-            if (accountIdCursor.getCount() > 1) {
+            if (!suppressCombined && accountIdCursor.getCount() > 1) {
                 combinedAccount = true;
             }
             final Bundle extras = new Bundle();
@@ -4121,23 +4120,32 @@
         private final int mContentUriIndex;
         private final int mUriIndex;
         private final Context mContext;
+        private final String[] mContentUriStrings;
 
         public AttachmentsCursor(Context context, Cursor cursor) {
             super(cursor);
             mContentUriIndex = cursor.getColumnIndex(UIProvider.AttachmentColumns.CONTENT_URI);
             mUriIndex = cursor.getColumnIndex(UIProvider.AttachmentColumns.URI);
             mContext = context;
-        }
-
-        @Override
-        public String getString(int column) {
-            if (column == mContentUriIndex) {
+            mContentUriStrings = new String[cursor.getCount()];
+            if (mContentUriIndex == -1) {
+                // Nothing to do here, move along
+                return;
+            }
+            while (cursor.moveToNext()) {
+                final int index = cursor.getPosition();
                 final Uri uri = Uri.parse(getString(mUriIndex));
                 final long id = Long.parseLong(uri.getLastPathSegment());
                 final Attachment att = Attachment.restoreAttachmentWithId(mContext, id);
-                if (att == null) return "";
+
+                if (att == null) {
+                    mContentUriStrings[index] = "";
+                    continue;
+                }
+
                 if (!TextUtils.isEmpty(att.getCachedFileUri())) {
-                    return att.getCachedFileUri();
+                    mContentUriStrings[index] = att.getCachedFileUri();
+                    continue;
                 }
 
                 final String contentUri;
@@ -4163,8 +4171,16 @@
                                 .toString();
                     }
                 }
-                return contentUri;
+                mContentUriStrings[index] = contentUri;
 
+            }
+            cursor.moveToPosition(-1);
+        }
+
+        @Override
+        public String getString(int column) {
+            if (column == mContentUriIndex) {
+                return mContentUriStrings[getPosition()];
             } else {
                 return super.getString(column);
             }
@@ -4588,9 +4604,14 @@
                     final int nameColumn = projectionList.indexOf(UIProvider.FolderColumns.NAME);
                     final int typeColumn = projectionList.indexOf(UIProvider.FolderColumns.TYPE);
                     if (c.moveToFirst()) {
-                        c = getUiFolderCursorRowFromMailboxCursorRow(
-                                new MatrixCursorWithCachedColumns(uiProjection),
-                                uiProjection.length, c, nameColumn, typeColumn);
+                        final Cursor closeThis = c;
+                        try {
+                            c = getUiFolderCursorRowFromMailboxCursorRow(
+                                    new MatrixCursorWithCachedColumns(uiProjection),
+                                    uiProjection.length, c, nameColumn, typeColumn);
+                        } finally {
+                            closeThis.close();
+                        }
                     }
                     notifyUri = UIPROVIDER_FOLDER_NOTIFIER.buildUpon().appendPath(mailboxIdString)
                             .build();
@@ -4866,11 +4887,12 @@
         final Mailbox mailbox =
                 getMailboxByAccountIdAndType(accountId, Mailbox.TYPE_DRAFTS);
         if (mailbox == null) return null;
-        final Message msg;
+        Message msg = null;
         if (extras.containsKey(BaseColumns._ID)) {
             final long messageId = extras.getLong(BaseColumns._ID);
             msg = Message.restoreMessageWithId(getContext(), messageId);
-        } else {
+        }
+        if (msg == null) {
             msg = new Message();
         }
         return uiSaveMessage(msg, mailbox, extras);
@@ -5053,6 +5075,23 @@
         return update(ourUri, ourValues, null, null);
     }
 
+    private int uiUpdateSettings(final Context c, final ContentValues uiValues) {
+        final MailPrefs mailPrefs = MailPrefs.get(c);
+
+        if (uiValues.containsKey(SettingsColumns.AUTO_ADVANCE)) {
+            mailPrefs.setAutoAdvanceMode(uiValues.getAsInteger(SettingsColumns.AUTO_ADVANCE));
+        }
+        if (uiValues.containsKey(SettingsColumns.CONVERSATION_VIEW_MODE)) {
+            final int value = uiValues.getAsInteger(SettingsColumns.CONVERSATION_VIEW_MODE);
+            final boolean overviewMode = value == UIProvider.ConversationViewMode.OVERVIEW;
+            mailPrefs.setConversationOverviewMode(overviewMode);
+        }
+
+        c.getContentResolver().notifyChange(UIPROVIDER_ALL_ACCOUNTS_NOTIFIER, null, false);
+
+        return 1;
+    }
+
     private int markAllSeen(final Context context, final String mailboxId) {
         final SQLiteDatabase db = getDatabase(context);
         final String table = Message.TABLE_NAME;
@@ -5582,8 +5621,8 @@
             return;
         }
 
-        LogUtils.d(TAG, "Setting sync interval for account " + accountId + " to " + syncInterval +
-                " minutes");
+        LogUtils.d(TAG, "Setting sync interval for account %s to %d minutes",
+                accountId, syncInterval);
 
         // First remove all existing periodic syncs.
         final List<PeriodicSync> syncs =
@@ -5925,7 +5964,7 @@
                     EmailServiceUtils.getServiceForAccount(context, accountId);
             if (service != null) {
                 try {
-                    service.deleteAccountPIMData(emailAddress);
+                    service.deleteExternalAccountPIMData(emailAddress);
                 } catch (final RemoteException e) {
                     // Can't do anything about this
                 }
diff --git a/src/com/android/email/provider/FolderPickerDialog.java b/src/com/android/email/provider/FolderPickerDialog.java
index 059b82c..37a7ed7 100644
--- a/src/com/android/email/provider/FolderPickerDialog.java
+++ b/src/com/android/email/provider/FolderPickerDialog.java
@@ -62,10 +62,8 @@
                 uri, UIProvider.FOLDERS_PROJECTION, null, null, null);
         try {
             mAdapter = new SeparatedFolderListAdapter();
-            String[] headers = context.getResources()
-                    .getStringArray(R.array.moveto_folder_sections);
             mAdapter.addSection(new FolderPickerSelectorAdapter(context, foldersCursor,
-                    new HashSet<String>(), R.layout.radiobutton_single_folders_view, headers[2]));
+                    new HashSet<String>(), R.layout.multi_folders_view));
             builder.setAdapter(mAdapter, this);
         } finally {
             foldersCursor.close();
diff --git a/src/com/android/email/provider/FolderPickerSelectorAdapter.java b/src/com/android/email/provider/FolderPickerSelectorAdapter.java
index 0685b9d..e832b45 100644
--- a/src/com/android/email/provider/FolderPickerSelectorAdapter.java
+++ b/src/com/android/email/provider/FolderPickerSelectorAdapter.java
@@ -29,8 +29,8 @@
 public class FolderPickerSelectorAdapter extends HierarchicalFolderSelectorAdapter {
 
     public FolderPickerSelectorAdapter(Context context, Cursor folders,
-            Set<String> initiallySelected, int layout, String header) {
-        super(context, folders, initiallySelected, layout, header);
+            Set<String> initiallySelected, int layout) {
+        super(context, folders, initiallySelected, layout);
     }
 
     /**
diff --git a/src/com/android/email/service/AccountService.java b/src/com/android/email/service/AccountService.java
index fa0eef4..5cd3760 100644
--- a/src/com/android/email/service/AccountService.java
+++ b/src/com/android/email/service/AccountService.java
@@ -41,22 +41,6 @@
     private final IAccountService.Stub mBinder = new IAccountService.Stub() {
 
         @Override
-        public void notifyLoginFailed(long accountId, String reason) {
-            NotificationController nc = NotificationController.getInstance(mContext);
-            nc.showLoginFailedNotification(accountId, reason);
-        }
-
-        @Override
-        public void notifyLoginSucceeded(long accountId) {
-            NotificationController.getInstance(mContext).cancelLoginFailedNotification(accountId);
-        }
-
-        @Override
-        public void reconcileAccounts(String protocol, String accountManagerType) {
-            // TODO: No longer used, delete this.
-        }
-
-        @Override
         public int getAccountColor(long accountId) {
             return ResourceHelper.getInstance(mContext).getAccountColor(accountId);
         }
diff --git a/src/com/android/email/service/AttachmentDownloadService.java b/src/com/android/email/service/AttachmentDownloadService.java
deleted file mode 100644
index 5a7c4ac..0000000
--- a/src/com/android/email/service/AttachmentDownloadService.java
+++ /dev/null
@@ -1,1143 +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.service;
-
-import android.accounts.AccountManager;
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.app.Service;
-import android.content.BroadcastReceiver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.ConnectivityManager;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.os.SystemClock;
-import android.text.format.DateUtils;
-
-import com.android.email.AttachmentInfo;
-import com.android.email.EmailConnectivityManager;
-import com.android.email.NotificationController;
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.EmailContent;
-import com.android.emailcommon.provider.EmailContent.Attachment;
-import com.android.emailcommon.provider.EmailContent.AttachmentColumns;
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.service.EmailServiceProxy;
-import com.android.emailcommon.service.EmailServiceStatus;
-import com.android.emailcommon.service.IEmailServiceCallback;
-import com.android.emailcommon.utility.AttachmentUtilities;
-import com.android.emailcommon.utility.Utility;
-import com.android.mail.providers.UIProvider.AttachmentState;
-import com.android.mail.utils.LogUtils;
-
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.PrintWriter;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Queue;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-public class AttachmentDownloadService extends Service implements Runnable {
-    public static final String TAG = LogUtils.TAG;
-
-    // Minimum wait time before retrying a download that failed due to connection error
-    private static final long CONNECTION_ERROR_RETRY_MILLIS = 10 * DateUtils.SECOND_IN_MILLIS;
-    // Number of retries before we start delaying between
-    private static final long CONNECTION_ERROR_DELAY_THRESHOLD = 5;
-    // Maximum time to retry for connection errors.
-    private static final long CONNECTION_ERROR_MAX_RETRIES = 10;
-
-    // Our idle time, waiting for notifications; this is something of a failsafe
-    private static final int PROCESS_QUEUE_WAIT_TIME = 30 * ((int)DateUtils.MINUTE_IN_MILLIS);
-    // How often our watchdog checks for callback timeouts
-    private static final int WATCHDOG_CHECK_INTERVAL = 20 * ((int)DateUtils.SECOND_IN_MILLIS);
-    // How long we'll wait for a callback before canceling a download and retrying
-    private static final int CALLBACK_TIMEOUT = 30 * ((int)DateUtils.SECOND_IN_MILLIS);
-    // Try to download an attachment in the background this many times before giving up
-    private static final int MAX_DOWNLOAD_RETRIES = 5;
-    private static final int PRIORITY_NONE = -1;
-    @SuppressWarnings("unused")
-    // Low priority will be used for opportunistic downloads
-    private static final int PRIORITY_BACKGROUND = 0;
-    // Normal priority is for forwarded downloads in outgoing mail
-    private static final int PRIORITY_SEND_MAIL = 1;
-    // High priority is for user requests
-    private static final int PRIORITY_FOREGROUND = 2;
-
-    // Minimum free storage in order to perform prefetch (25% of total memory)
-    private static final float PREFETCH_MINIMUM_STORAGE_AVAILABLE = 0.25F;
-    // Maximum prefetch storage (also 25% of total memory)
-    private static final float PREFETCH_MAXIMUM_ATTACHMENT_STORAGE = 0.25F;
-
-    // We can try various values here; I think 2 is completely reasonable as a first pass
-    private static final int MAX_SIMULTANEOUS_DOWNLOADS = 2;
-    // Limit on the number of simultaneous downloads per account
-    // Note that a limit of 1 is currently enforced by both Services (MailService and Controller)
-    private static final int MAX_SIMULTANEOUS_DOWNLOADS_PER_ACCOUNT = 1;
-    // Limit on the number of attachments we'll check for background download
-    private static final int MAX_ATTACHMENTS_TO_CHECK = 25;
-
-    private static final String EXTRA_ATTACHMENT =
-        "com.android.email.AttachmentDownloadService.attachment";
-
-    // sRunningService is only set in the UI thread; it's visibility elsewhere is guaranteed
-    // by the use of "volatile"
-    /*package*/ static volatile AttachmentDownloadService sRunningService = null;
-
-    /*package*/ Context mContext;
-    /*package*/ EmailConnectivityManager mConnectivityManager;
-
-    /*package*/ final DownloadSet mDownloadSet = new DownloadSet(new DownloadComparator());
-
-    private final HashMap<Long, Intent> mAccountServiceMap = new HashMap<Long, Intent>();
-    // A map of attachment storage used per account
-    // NOTE: This map is not kept current in terms of deletions (i.e. it stores the last calculated
-    // amount plus the size of any new attachments laoded).  If and when we reach the per-account
-    // limit, we recalculate the actual usage
-    /*package*/ final HashMap<Long, Long> mAttachmentStorageMap = new HashMap<Long, Long>();
-    // A map of attachment ids to the number of failed attempts to download the attachment
-    // NOTE: We do not want to persist this. This allows us to retry background downloading
-    // if any transient network errors are fixed & and the app is restarted
-    /* package */ final HashMap<Long, Integer> mAttachmentFailureMap = new HashMap<Long, Integer>();
-    private final ServiceCallback mServiceCallback = new ServiceCallback();
-
-    private final Object mLock = new Object();
-    private volatile boolean mStop = false;
-
-    /*package*/ AccountManagerStub mAccountManagerStub;
-
-    /**
-     * We only use the getAccounts() call from AccountManager, so this class wraps that call and
-     * allows us to build a mock account manager stub in the unit tests
-     */
-    /*package*/ static class AccountManagerStub {
-        private int mNumberOfAccounts;
-        private final AccountManager mAccountManager;
-
-        AccountManagerStub(Context context) {
-            if (context != null) {
-                mAccountManager = AccountManager.get(context);
-            } else {
-                mAccountManager = null;
-            }
-        }
-
-        /*package*/ int getNumberOfAccounts() {
-            if (mAccountManager != null) {
-                return mAccountManager.getAccounts().length;
-            } else {
-                return mNumberOfAccounts;
-            }
-        }
-
-        /*package*/ void setNumberOfAccounts(int numberOfAccounts) {
-            mNumberOfAccounts = numberOfAccounts;
-        }
-    }
-
-    /**
-     * Watchdog alarm receiver; responsible for making sure that downloads in progress are not
-     * stalled, as determined by the timing of the most recent service callback
-     */
-    public static class Watchdog extends BroadcastReceiver {
-        @Override
-        public void onReceive(final Context context, Intent intent) {
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    watchdogAlarm();
-                }
-            }, "AttachmentDownloadService Watchdog").start();
-        }
-    }
-
-    public static class DownloadRequest {
-        final int priority;
-        final long time;
-        final long attachmentId;
-        final long messageId;
-        final long accountId;
-        boolean inProgress = false;
-        int lastStatusCode;
-        int lastProgress;
-        long lastCallbackTime;
-        long startTime;
-        long retryCount;
-        long retryStartTime;
-
-        private DownloadRequest(Context context, Attachment attachment) {
-            attachmentId = attachment.mId;
-            Message msg = Message.restoreMessageWithId(context, attachment.mMessageKey);
-            if (msg != null) {
-                accountId = msg.mAccountKey;
-                messageId = msg.mId;
-            } else {
-                accountId = messageId = -1;
-            }
-            priority = getPriority(attachment);
-            time = SystemClock.elapsedRealtime();
-        }
-
-        private DownloadRequest(DownloadRequest orig, long newTime) {
-            priority = orig.priority;
-            attachmentId = orig.attachmentId;
-            messageId = orig.messageId;
-            accountId = orig.accountId;
-            time = newTime;
-            inProgress = orig.inProgress;
-            lastStatusCode = orig.lastStatusCode;
-            lastProgress = orig.lastProgress;
-            lastCallbackTime = orig.lastCallbackTime;
-            startTime = orig.startTime;
-            retryCount = orig.retryCount;
-            retryStartTime = orig.retryStartTime;
-        }
-
-
-        @Override
-        public int hashCode() {
-            return (int)attachmentId;
-        }
-
-        /**
-         * Two download requests are equals if their attachment id's are equals
-         */
-        @Override
-        public boolean equals(Object object) {
-            if (!(object instanceof DownloadRequest)) return false;
-            DownloadRequest req = (DownloadRequest)object;
-            return req.attachmentId == attachmentId;
-        }
-    }
-
-    /**
-     * Comparator class for the download set; we first compare by priority.  Requests with equal
-     * priority are compared by the time the request was created (older requests come first)
-     */
-    /*protected*/ static class DownloadComparator implements Comparator<DownloadRequest> {
-        @Override
-        public int compare(DownloadRequest req1, DownloadRequest req2) {
-            int res;
-            if (req1.priority != req2.priority) {
-                res = (req1.priority < req2.priority) ? -1 : 1;
-            } else {
-                if (req1.time == req2.time) {
-                    res = 0;
-                } else {
-                    res = (req1.time > req2.time) ? -1 : 1;
-                }
-            }
-            return res;
-        }
-    }
-
-    /**
-     * The DownloadSet is a TreeSet sorted by priority class (e.g. low, high, etc.) and the
-     * time of the request.  Higher priority requests
-     * are always processed first; among equals, the oldest request is processed first.  The
-     * priority key represents this ordering.  Note: All methods that change the attachment map are
-     * synchronized on the map itself
-     */
-    /*package*/ class DownloadSet extends TreeSet<DownloadRequest> {
-        private static final long serialVersionUID = 1L;
-        private PendingIntent mWatchdogPendingIntent;
-
-        /*package*/ DownloadSet(Comparator<? super DownloadRequest> comparator) {
-            super(comparator);
-        }
-
-        /**
-         * Maps attachment id to DownloadRequest
-         */
-        /*package*/ final ConcurrentHashMap<Long, DownloadRequest> mDownloadsInProgress =
-            new ConcurrentHashMap<Long, DownloadRequest>();
-
-        private void markAttachmentAsFailed(final Attachment att) {
-            final ContentValues cv = new ContentValues();
-            final int flags = Attachment.FLAG_DOWNLOAD_FORWARD | Attachment.FLAG_DOWNLOAD_USER_REQUEST;
-            cv.put(AttachmentColumns.FLAGS, att.mFlags &= ~flags);
-            cv.put(AttachmentColumns.UI_STATE, AttachmentState.FAILED);
-            att.update(mContext, cv);
-        }
-
-        /**
-         * onChange is called by the AttachmentReceiver upon receipt of a valid notification from
-         * EmailProvider that an attachment has been inserted or modified.  It's not strictly
-         * necessary that we detect a deleted attachment, as the code always checks for the
-         * existence of an attachment before acting on it.
-         */
-        public synchronized void onChange(Context context, Attachment att) {
-            DownloadRequest req = findDownloadRequest(att.mId);
-            long priority = getPriority(att);
-            if (priority == PRIORITY_NONE) {
-                if (LogUtils.isLoggable(TAG, LogUtils.DEBUG)) {
-                    LogUtils.d(TAG, "== Attachment changed: " + att.mId);
-                }
-                // In this case, there is no download priority for this attachment
-                if (req != null) {
-                    // If it exists in the map, remove it
-                    // NOTE: We don't yet support deleting downloads in progress
-                    if (LogUtils.isLoggable(TAG, LogUtils.DEBUG)) {
-                        LogUtils.d(TAG, "== Attachment " + att.mId + " was in queue, removing");
-                    }
-                    remove(req);
-                }
-            } else {
-                // Ignore changes that occur during download
-                if (mDownloadsInProgress.containsKey(att.mId)) return;
-                // If this is new, add the request to the queue
-                if (req == null) {
-                    req = new DownloadRequest(context, att);
-                    final AttachmentInfo attachInfo = new AttachmentInfo(context, att);
-                    if (!attachInfo.isEligibleForDownload()) {
-                        // We can't download this file due to policy, depending on what type
-                        // of request we received, we handle the response differently.
-                        if (((att.mFlags & Attachment.FLAG_DOWNLOAD_USER_REQUEST) != 0) ||
-                                ((att.mFlags & Attachment.FLAG_POLICY_DISALLOWS_DOWNLOAD) != 0)) {
-                            // There are a couple of situations where we will not even allow this
-                            // request to go in the queue because we can already process it as a
-                            // failure.
-                            // 1. The user explictly wants to download this attachment from the
-                            // email view but they should not be able to...either because there is
-                            // no app to view it or because its been marked as a policy violation.
-                            // 2. The user is forwarding an email and the attachment has been
-                            // marked as a policy violation. If the attachment is non viewable
-                            // that is OK for forwarding a message so we'll let it pass through
-                            markAttachmentAsFailed(att);
-                            return;
-                        }
-                        // If we get this far it a forward of an attachment that is only
-                        // ineligible because we can't view it or process it. Not because we
-                        // can't download it for policy reasons. Let's let this go through because
-                        // the final recipient of this forward email might be able to process it.
-                    }
-                    add(req);
-                }
-                // If the request already existed, we'll update the priority (so that the time is
-                // up-to-date); otherwise, we create a new request
-                if (LogUtils.isLoggable(TAG, LogUtils.DEBUG)) {
-                    LogUtils.d(TAG, "== Download queued for attachment " + att.mId + ", class " +
-                            req.priority + ", priority time " + req.time);
-                }
-            }
-            // Process the queue if we're in a wait
-            kick();
-        }
-
-        /**
-         * Find a queued DownloadRequest, given the attachment's id
-         * @param id the id of the attachment
-         * @return the DownloadRequest for that attachment (or null, if none)
-         */
-        /*package*/ synchronized DownloadRequest findDownloadRequest(long id) {
-            Iterator<DownloadRequest> iterator = iterator();
-            while(iterator.hasNext()) {
-                DownloadRequest req = iterator.next();
-                if (req.attachmentId == id) {
-                    return req;
-                }
-            }
-            return null;
-        }
-
-        @Override
-        public synchronized boolean isEmpty() {
-            return super.isEmpty() && mDownloadsInProgress.isEmpty();
-        }
-
-        /**
-         * Run through the AttachmentMap and find DownloadRequests that can be executed, enforcing
-         * the limit on maximum downloads
-         */
-        /*package*/ synchronized void processQueue() {
-            if (LogUtils.isLoggable(TAG, LogUtils.DEBUG)) {
-                LogUtils.d(TAG, "== Checking attachment queue, " + mDownloadSet.size()
-                        + " entries");
-            }
-            Iterator<DownloadRequest> iterator = mDownloadSet.descendingIterator();
-            // First, start up any required downloads, in priority order
-            while (iterator.hasNext() &&
-                    (mDownloadsInProgress.size() < MAX_SIMULTANEOUS_DOWNLOADS)) {
-                DownloadRequest req = iterator.next();
-                 // Enforce per-account limit here
-                if (downloadsForAccount(req.accountId) >= MAX_SIMULTANEOUS_DOWNLOADS_PER_ACCOUNT) {
-                    if (LogUtils.isLoggable(TAG, LogUtils.DEBUG)) {
-                        LogUtils.d(TAG, "== Skip #" + req.attachmentId + "; maxed for acct #" +
-                                req.accountId);
-                    }
-                    continue;
-                } else if (Attachment.restoreAttachmentWithId(mContext, req.attachmentId) == null) {
-                    continue;
-                }
-                if (!req.inProgress) {
-                    final long currentTime = SystemClock.elapsedRealtime();
-                    if (req.retryCount > 0 && req.retryStartTime > currentTime) {
-                        LogUtils.d(TAG, "== waiting to retry attachment %d", req.attachmentId);
-                        setWatchdogAlarm(CONNECTION_ERROR_RETRY_MILLIS);
-                        continue;
-                    }
-                    // TODO: We try to gate ineligible downloads from entering the queue but its
-                    // always possible that they made it in here regardless in the future.  In a
-                    // perfect world, we would make it bullet proof with a check for eligibility
-                    // here instead/also.
-                    mDownloadSet.tryStartDownload(req);
-                }
-            }
-
-            // Don't prefetch if background downloading is disallowed
-            EmailConnectivityManager ecm = mConnectivityManager;
-            if (ecm == null) return;
-            if (!ecm.isAutoSyncAllowed()) return;
-            // Don't prefetch unless we're on a WiFi network
-            if (ecm.getActiveNetworkType() != ConnectivityManager.TYPE_WIFI) {
-                return;
-            }
-            // Then, try opportunistic download of appropriate attachments
-            int backgroundDownloads = MAX_SIMULTANEOUS_DOWNLOADS - mDownloadsInProgress.size();
-            // Always leave one slot for user requested download
-            if (backgroundDownloads > (MAX_SIMULTANEOUS_DOWNLOADS - 1)) {
-                // We'll load up the newest 25 attachments that aren't loaded or queued
-                Uri lookupUri = EmailContent.uriWithLimit(Attachment.CONTENT_URI,
-                        MAX_ATTACHMENTS_TO_CHECK);
-                Cursor c = mContext.getContentResolver().query(lookupUri,
-                        Attachment.CONTENT_PROJECTION,
-                        EmailContent.Attachment.PRECACHE_INBOX_SELECTION,
-                        null, AttachmentColumns._ID + " DESC");
-                File cacheDir = mContext.getCacheDir();
-                try {
-                    while (c.moveToNext()) {
-                        Attachment att = new Attachment();
-                        att.restore(c);
-                        Account account = Account.restoreAccountWithId(mContext, att.mAccountKey);
-                        if (account == null) {
-                            // Clean up this orphaned attachment; there's no point in keeping it
-                            // around; then try to find another one
-                            EmailContent.delete(mContext, Attachment.CONTENT_URI, att.mId);
-                        } else {
-                            // Check that the attachment meets system requirements for download
-                            AttachmentInfo info = new AttachmentInfo(mContext, att);
-                            if (info.isEligibleForDownload()) {
-                                // Either the account must be able to prefetch or this must be
-                                // an inline attachment
-                                if (att.mContentId != null ||
-                                        (canPrefetchForAccount(account, cacheDir))) {
-                                    Integer tryCount;
-                                    tryCount = mAttachmentFailureMap.get(att.mId);
-                                    if (tryCount != null && tryCount > MAX_DOWNLOAD_RETRIES) {
-                                        // move onto the next attachment
-                                        continue;
-                                    }
-                                    // Start this download and we're done
-                                    DownloadRequest req = new DownloadRequest(mContext, att);
-                                    mDownloadSet.tryStartDownload(req);
-                                    break;
-                                }
-                            } else {
-                                // If this attachment was ineligible for download
-                                // because of policy related issues, its flags would be set to
-                                // FLAG_POLICY_DISALLOWS_DOWNLOAD and would not show up in the
-                                // query results. We are most likely here for other reasons such
-                                // as the inability to view the attachment. In that case, let's just
-                                // skip it for now.
-                                LogUtils.e(TAG, "== skip attachment %d, it is ineligible", att.mId);
-                            }
-                        }
-                    }
-                } finally {
-                    c.close();
-                }
-            }
-        }
-
-        /**
-         * Count the number of running downloads in progress for this account
-         * @param accountId the id of the account
-         * @return the count of running downloads
-         */
-        /*package*/ synchronized int downloadsForAccount(long accountId) {
-            int count = 0;
-            for (DownloadRequest req: mDownloadsInProgress.values()) {
-                if (req.accountId == accountId) {
-                    count++;
-                }
-            }
-            return count;
-        }
-
-        /**
-         * Watchdog for downloads; we use this in case we are hanging on a download, which might
-         * have failed silently (the connection dropped, for example)
-         */
-        private void onWatchdogAlarm() {
-            // If our service instance is gone, just leave
-            if (mStop) {
-                return;
-            }
-            long now = System.currentTimeMillis();
-            for (DownloadRequest req: mDownloadsInProgress.values()) {
-                // Check how long it's been since receiving a callback
-                long timeSinceCallback = now - req.lastCallbackTime;
-                if (timeSinceCallback > CALLBACK_TIMEOUT) {
-                    if (LogUtils.isLoggable(TAG, LogUtils.DEBUG)) {
-                        LogUtils.d(TAG, "== Download of " + req.attachmentId + " timed out");
-                    }
-                    cancelDownload(req);
-                }
-            }
-            // Check whether we can start new downloads...
-            if (mConnectivityManager != null && mConnectivityManager.hasConnectivity()) {
-                processQueue();
-            }
-            // If there are downloads in progress, reset alarm
-            if (!mDownloadsInProgress.isEmpty()) {
-                if (LogUtils.isLoggable(TAG, LogUtils.DEBUG)) {
-                    LogUtils.d(TAG, "Reschedule watchdog...");
-                }
-                setWatchdogAlarm();
-            }
-        }
-
-        /**
-         * Attempt to execute the DownloadRequest, enforcing the maximum downloads per account
-         * parameter
-         * @param req the DownloadRequest
-         * @return whether or not the download was started
-         */
-        /*package*/ synchronized boolean tryStartDownload(DownloadRequest req) {
-            EmailServiceProxy service = EmailServiceUtils.getServiceForAccount(
-                    AttachmentDownloadService.this, req.accountId);
-
-            // Do not download the same attachment multiple times
-            boolean alreadyInProgress = mDownloadsInProgress.get(req.attachmentId) != null;
-            if (alreadyInProgress) return false;
-
-            try {
-                if (LogUtils.isLoggable(TAG, LogUtils.DEBUG)) {
-                    LogUtils.d(TAG, ">> Starting download for attachment #" + req.attachmentId);
-                }
-                startDownload(service, req);
-            } catch (RemoteException e) {
-                // TODO: Consider whether we need to do more in this case...
-                // For now, fix up our data to reflect the failure
-                cancelDownload(req);
-            }
-            return true;
-        }
-
-        private synchronized DownloadRequest getDownloadInProgress(long attachmentId) {
-            return mDownloadsInProgress.get(attachmentId);
-        }
-
-        private void setWatchdogAlarm(final long delay) {
-            // Lazily initialize the pending intent
-            if (mWatchdogPendingIntent == null) {
-                Intent intent = new Intent(mContext, Watchdog.class);
-                mWatchdogPendingIntent =
-                    PendingIntent.getBroadcast(mContext, 0, intent, 0);
-            }
-            // Set the alarm
-            AlarmManager am = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE);
-            am.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + delay,
-                    mWatchdogPendingIntent);
-        }
-
-        private void setWatchdogAlarm() {
-            setWatchdogAlarm(WATCHDOG_CHECK_INTERVAL);
-        }
-
-        /**
-         * Do the work of starting an attachment download using the EmailService interface, and
-         * set our watchdog alarm
-         *
-         * @param service the service handling the download
-         * @param req the DownloadRequest
-         * @throws RemoteException
-         */
-        private void startDownload(EmailServiceProxy service, DownloadRequest req)
-                throws RemoteException {
-            req.startTime = System.currentTimeMillis();
-            req.inProgress = true;
-            mDownloadsInProgress.put(req.attachmentId, req);
-            service.loadAttachment(mServiceCallback, req.accountId, req.attachmentId,
-                    req.priority != PRIORITY_FOREGROUND);
-            setWatchdogAlarm();
-        }
-
-        private void cancelDownload(DownloadRequest req) {
-            LogUtils.d(TAG, "cancelDownload #%d", req.attachmentId);
-            req.inProgress = false;
-            mDownloadsInProgress.remove(req.attachmentId);
-            // Remove the download from our queue, and then decide whether or not to add it back.
-            remove(req);
-            req.retryCount++;
-            if (req.retryCount > CONNECTION_ERROR_MAX_RETRIES) {
-                LogUtils.d(TAG, "too many failures, giving up");
-            } else {
-                LogUtils.d(TAG, "moving to end of queue, will retry");
-                // The time field of DownloadRequest is final, because it's unsafe to change it
-                // as long as the DownloadRequest is in the DownloadSet. It's needed for the
-                // comparator, so changing time would make the request unfindable.
-                // Instead, we'll create a new DownloadRequest with an updated time.
-                // This will sort at the end of the set.
-                req = new DownloadRequest(req, SystemClock.elapsedRealtime());
-                add(req);
-            }
-        }
-
-        /**
-         * Called when a download is finished; we get notified of this via our EmailServiceCallback
-         * @param attachmentId the id of the attachment whose download is finished
-         * @param statusCode the EmailServiceStatus code returned by the Service
-         */
-        /*package*/ synchronized void endDownload(long attachmentId, int statusCode) {
-            // Say we're no longer downloading this
-            mDownloadsInProgress.remove(attachmentId);
-
-            // TODO: This code is conservative and treats connection issues as failures.
-            // Since we have no mechanism to throttle reconnection attempts, it makes
-            // sense to be cautious here. Once logic is in place to prevent connecting
-            // in a tight loop, we can exclude counting connection issues as "failures".
-
-            // Update the attachment failure list if needed
-            Integer downloadCount;
-            downloadCount = mAttachmentFailureMap.remove(attachmentId);
-            if (statusCode != EmailServiceStatus.SUCCESS) {
-                if (downloadCount == null) {
-                    downloadCount = 0;
-                }
-                downloadCount += 1;
-                mAttachmentFailureMap.put(attachmentId, downloadCount);
-            }
-
-            DownloadRequest req = mDownloadSet.findDownloadRequest(attachmentId);
-            if (statusCode == EmailServiceStatus.CONNECTION_ERROR) {
-                // If this needs to be retried, just process the queue again
-                if (req != null) {
-                    req.retryCount++;
-                    if (req.retryCount > CONNECTION_ERROR_MAX_RETRIES) {
-                        LogUtils.d(TAG, "Connection Error #%d, giving up", attachmentId);
-                        remove(req);
-                    } else if (req.retryCount > CONNECTION_ERROR_DELAY_THRESHOLD) {
-                        // TODO: I'm not sure this is a great retry/backoff policy, but we're
-                        // afraid of changing behavior too much in case something relies upon it.
-                        // So now, for the first five errors, we'll retry immediately. For the next
-                        // five tries, we'll add a ten second delay between each. After that, we'll
-                        // give up.
-                        LogUtils.d(TAG, "ConnectionError #%d, retried %d times, adding delay",
-                                attachmentId, req.retryCount);
-                        req.inProgress = false;
-                        req.retryStartTime = SystemClock.elapsedRealtime() +
-                                CONNECTION_ERROR_RETRY_MILLIS;
-                        setWatchdogAlarm(CONNECTION_ERROR_RETRY_MILLIS);
-                    } else {
-                        LogUtils.d(TAG, "ConnectionError #%d, retried %d times, adding delay",
-                                attachmentId, req.retryCount);
-                        req.inProgress = false;
-                        req.retryStartTime = 0;
-                        kick();
-                    }
-                }
-                return;
-            }
-
-            // If the request is still in the queue, remove it
-            if (req != null) {
-                remove(req);
-            }
-            if (LogUtils.isLoggable(TAG, LogUtils.DEBUG)) {
-                long secs = 0;
-                if (req != null) {
-                    secs = (System.currentTimeMillis() - req.time) / 1000;
-                }
-                String status = (statusCode == EmailServiceStatus.SUCCESS) ? "Success" :
-                    "Error " + statusCode;
-                LogUtils.d(TAG, "<< Download finished for attachment #" + attachmentId + "; " + secs
-                        + " seconds from request, status: " + status);
-            }
-
-            Attachment attachment = Attachment.restoreAttachmentWithId(mContext, attachmentId);
-            if (attachment != null) {
-                long accountId = attachment.mAccountKey;
-                // Update our attachment storage for this account
-                Long currentStorage = mAttachmentStorageMap.get(accountId);
-                if (currentStorage == null) {
-                    currentStorage = 0L;
-                }
-                mAttachmentStorageMap.put(accountId, currentStorage + attachment.mSize);
-                boolean deleted = false;
-                if ((attachment.mFlags & Attachment.FLAG_DOWNLOAD_FORWARD) != 0) {
-                    if (statusCode == EmailServiceStatus.ATTACHMENT_NOT_FOUND) {
-                        // If this is a forwarding download, and the attachment doesn't exist (or
-                        // can't be downloaded) delete it from the outgoing message, lest that
-                        // message never get sent
-                        EmailContent.delete(mContext, Attachment.CONTENT_URI, attachment.mId);
-                        // TODO: Talk to UX about whether this is even worth doing
-                        NotificationController nc = NotificationController.getInstance(mContext);
-                        nc.showDownloadForwardFailedNotification(attachment);
-                        deleted = true;
-                    }
-                    // If we're an attachment on forwarded mail, and if we're not still blocked,
-                    // try to send pending mail now (as mediated by MailService)
-                    if ((req != null) &&
-                            !Utility.hasUnloadedAttachments(mContext, attachment.mMessageKey)) {
-                        if (LogUtils.isLoggable(TAG, LogUtils.DEBUG)) {
-                            LogUtils.d(TAG, "== Downloads finished for outgoing msg #"
-                                    + req.messageId);
-                        }
-                        EmailServiceProxy service = EmailServiceUtils.getServiceForAccount(
-                                mContext, accountId);
-                        try {
-                            service.sendMail(accountId);
-                        } catch (RemoteException e) {
-                            // We tried
-                        }
-                    }
-                }
-                if (statusCode == EmailServiceStatus.MESSAGE_NOT_FOUND) {
-                    Message msg = Message.restoreMessageWithId(mContext, attachment.mMessageKey);
-                    if (msg == null) {
-                        // If there's no associated message, delete the attachment
-                        EmailContent.delete(mContext, Attachment.CONTENT_URI, attachment.mId);
-                    } else {
-                        // If there really is a message, retry
-                        // TODO: How will this get retried? It's still marked as inProgress?
-                        kick();
-                        return;
-                    }
-                } else if (!deleted) {
-                    // Clear the download flags, since we're done for now.  Note that this happens
-                    // only for non-recoverable errors.  When these occur for forwarded mail, we can
-                    // ignore it and continue; otherwise, it was either 1) a user request, in which
-                    // case the user can retry manually or 2) an opportunistic download, in which
-                    // case the download wasn't critical
-                    ContentValues cv = new ContentValues();
-                    int flags =
-                        Attachment.FLAG_DOWNLOAD_FORWARD | Attachment.FLAG_DOWNLOAD_USER_REQUEST;
-                    cv.put(AttachmentColumns.FLAGS, attachment.mFlags &= ~flags);
-                    cv.put(AttachmentColumns.UI_STATE, AttachmentState.SAVED);
-                    attachment.update(mContext, cv);
-                }
-            }
-            // Process the queue
-            kick();
-        }
-    }
-
-    /**
-     * Calculate the download priority of an Attachment.  A priority of zero means that the
-     * attachment is not marked for download.
-     * @param att the Attachment
-     * @return the priority key of the Attachment
-     */
-    private static int getPriority(Attachment att) {
-        int priorityClass = PRIORITY_NONE;
-        int flags = att.mFlags;
-        if ((flags & Attachment.FLAG_DOWNLOAD_FORWARD) != 0) {
-            priorityClass = PRIORITY_SEND_MAIL;
-        } else if ((flags & Attachment.FLAG_DOWNLOAD_USER_REQUEST) != 0) {
-            priorityClass = PRIORITY_FOREGROUND;
-        }
-        return priorityClass;
-    }
-
-    private void kick() {
-        synchronized(mLock) {
-            mLock.notify();
-        }
-    }
-
-    /**
-     * We use an EmailServiceCallback to keep track of the progress of downloads.  These callbacks
-     * come from either Controller (IMAP) or ExchangeService (EAS).  Note that we only implement the
-     * single callback that's defined by the EmailServiceCallback interface.
-     */
-    private class ServiceCallback extends IEmailServiceCallback.Stub {
-        @Override
-        public void loadAttachmentStatus(long messageId, long attachmentId, int statusCode,
-                int progress) {
-            // Record status and progress
-            DownloadRequest req = mDownloadSet.getDownloadInProgress(attachmentId);
-            if (req != null) {
-                if (LogUtils.isLoggable(TAG, LogUtils.DEBUG)) {
-                    String code;
-                    switch(statusCode) {
-                        case EmailServiceStatus.SUCCESS: code = "Success"; break;
-                        case EmailServiceStatus.IN_PROGRESS: code = "In progress"; break;
-                        default: code = Integer.toString(statusCode); break;
-                    }
-                    if (statusCode != EmailServiceStatus.IN_PROGRESS) {
-                        LogUtils.d(TAG, ">> Attachment status " + attachmentId + ": " + code);
-                    } else if (progress >= (req.lastProgress + 10)) {
-                        LogUtils.d(TAG, ">> Attachment progress %d: %d%%", attachmentId, progress);
-                    }
-                }
-                req.lastStatusCode = statusCode;
-                req.lastProgress = progress;
-                req.lastCallbackTime = System.currentTimeMillis();
-                Attachment attachment = Attachment.restoreAttachmentWithId(mContext, attachmentId);
-                 if (attachment != null  && statusCode == EmailServiceStatus.IN_PROGRESS) {
-                    ContentValues values = new ContentValues();
-                    values.put(AttachmentColumns.UI_DOWNLOADED_SIZE,
-                            attachment.mSize * progress / 100);
-                    // Update UIProvider with updated download size
-                    // Individual services will set contentUri and state when finished
-                    attachment.update(mContext, values);
-                }
-            }
-            switch (statusCode) {
-                case EmailServiceStatus.IN_PROGRESS:
-                    break;
-                default:
-                    mDownloadSet.endDownload(attachmentId, statusCode);
-                    break;
-            }
-        }
-    }
-
-    /*package*/ void addServiceIntentForTest(long accountId, Intent intent) {
-        mAccountServiceMap.put(accountId, intent);
-    }
-
-    /*package*/ void onChange(Attachment att) {
-        mDownloadSet.onChange(this, att);
-    }
-
-    /*package*/ boolean isQueued(long attachmentId) {
-        return mDownloadSet.findDownloadRequest(attachmentId) != null;
-    }
-
-    /*package*/ int getSize() {
-        return mDownloadSet.size();
-    }
-
-    /*package*/ boolean dequeue(long attachmentId) {
-        DownloadRequest req = mDownloadSet.findDownloadRequest(attachmentId);
-        if (req != null) {
-            if (LogUtils.isLoggable(TAG, LogUtils.DEBUG)) {
-                LogUtils.d(TAG, "Dequeued attachmentId:  " + attachmentId);
-            }
-            mDownloadSet.remove(req);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Ask the service for the number of items in the download queue
-     * @return the number of items queued for download
-     */
-    public static int getQueueSize() {
-        AttachmentDownloadService service = sRunningService;
-        if (service != null) {
-            return service.getSize();
-        }
-        return 0;
-    }
-
-    /**
-     * Ask the service whether a particular attachment is queued for download
-     * @param attachmentId the id of the Attachment (as stored by EmailProvider)
-     * @return whether or not the attachment is queued for download
-     */
-    public static boolean isAttachmentQueued(long attachmentId) {
-        AttachmentDownloadService service = sRunningService;
-        if (service != null) {
-            return service.isQueued(attachmentId);
-        }
-        return false;
-    }
-
-    /**
-     * Ask the service to remove an attachment from the download queue
-     * @param attachmentId the id of the Attachment (as stored by EmailProvider)
-     * @return whether or not the attachment was removed from the queue
-     */
-    public static boolean cancelQueuedAttachment(long attachmentId) {
-        AttachmentDownloadService service = sRunningService;
-        if (service != null) {
-            return service.dequeue(attachmentId);
-        }
-        return false;
-    }
-
-    public static void watchdogAlarm() {
-        AttachmentDownloadService service = sRunningService;
-        if (service != null) {
-            service.mDownloadSet.onWatchdogAlarm();
-        }
-    }
-
-    // The queue entries here are entries of the form {id, flags}, with the values passed in to
-    // attachmentChanged()
-    private static final Queue<long[]> sAttachmentChangedQueue =
-            new ConcurrentLinkedQueue<long[]>();
-    private static AsyncTask<Void, Void, Void> sAttachmentChangedTask;
-
-    /**
-     * Called directly by EmailProvider whenever an attachment is inserted or changed
-     * @param context the caller's context
-     * @param id the attachment's id
-     * @param flags the new flags for the attachment
-     */
-    public static void attachmentChanged(final Context context, final long id, final int flags) {
-        synchronized (sAttachmentChangedQueue) {
-            sAttachmentChangedQueue.add(new long[]{id, flags});
-
-            if (sAttachmentChangedTask == null) {
-                sAttachmentChangedTask = new AsyncTask<Void, Void, Void>() {
-                    @Override
-                    protected Void doInBackground(Void... params) {
-                        while (true) {
-                            final long[] change;
-                            synchronized (sAttachmentChangedQueue) {
-                                change = sAttachmentChangedQueue.poll();
-                                if (change == null) {
-                                    sAttachmentChangedTask = null;
-                                    return null;
-                                }
-                            }
-                            final long id = change[0];
-                            final long flags = change[1];
-                            final Attachment attachment =
-                                    Attachment.restoreAttachmentWithId(context, id);
-                            if (attachment == null) {
-                                continue;
-                            }
-                            attachment.mFlags = (int) flags;
-                            final Intent intent =
-                                    new Intent(context, AttachmentDownloadService.class);
-                            intent.putExtra(EXTRA_ATTACHMENT, attachment);
-                            context.startService(intent);
-                        }
-                    }
-                }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-            }
-        }
-    }
-
-    /**
-     * Determine whether an attachment can be prefetched for the given account
-     * @return true if download is allowed, false otherwise
-     */
-    public boolean canPrefetchForAccount(Account account, File dir) {
-        // Check account, just in case
-        if (account == null) return false;
-        // First, check preference and quickly return if prefetch isn't allowed
-        if ((account.mFlags & Account.FLAGS_BACKGROUND_ATTACHMENTS) == 0) return false;
-
-        long totalStorage = dir.getTotalSpace();
-        long usableStorage = dir.getUsableSpace();
-        long minAvailable = (long)(totalStorage * PREFETCH_MINIMUM_STORAGE_AVAILABLE);
-
-        // If there's not enough overall storage available, stop now
-        if (usableStorage < minAvailable) {
-            return false;
-        }
-
-        int numberOfAccounts = mAccountManagerStub.getNumberOfAccounts();
-        long perAccountMaxStorage =
-            (long)(totalStorage * PREFETCH_MAXIMUM_ATTACHMENT_STORAGE / numberOfAccounts);
-
-        // Retrieve our idea of currently used attachment storage; since we don't track deletions,
-        // this number is the "worst case".  If the number is greater than what's allowed per
-        // account, we walk the directory to determine the actual number
-        Long accountStorage = mAttachmentStorageMap.get(account.mId);
-        if (accountStorage == null || (accountStorage > perAccountMaxStorage)) {
-            // Calculate the exact figure for attachment storage for this account
-            accountStorage = 0L;
-            File[] files = dir.listFiles();
-            if (files != null) {
-                for (File file : files) {
-                    accountStorage += file.length();
-                }
-            }
-            // Cache the value
-            mAttachmentStorageMap.put(account.mId, accountStorage);
-        }
-
-        // Return true if we're using less than the maximum per account
-        if (accountStorage < perAccountMaxStorage) {
-            return true;
-        } else {
-            if (LogUtils.isLoggable(TAG, LogUtils.DEBUG)) {
-                LogUtils.d(TAG, ">> Prefetch not allowed for account " + account.mId + "; used " +
-                        accountStorage + ", limit " + perAccountMaxStorage);
-            }
-            return false;
-        }
-    }
-
-    @Override
-    public void run() {
-        // These fields are only used within the service thread
-        mContext = this;
-        mConnectivityManager = new EmailConnectivityManager(this, TAG);
-        mAccountManagerStub = new AccountManagerStub(this);
-
-        // Run through all attachments in the database that require download and add them to
-        // the queue
-        int mask = Attachment.FLAG_DOWNLOAD_FORWARD | Attachment.FLAG_DOWNLOAD_USER_REQUEST;
-        Cursor c = getContentResolver().query(Attachment.CONTENT_URI,
-                EmailContent.ID_PROJECTION, "(" + AttachmentColumns.FLAGS + " & ?) != 0",
-                new String[] {Integer.toString(mask)}, null);
-        try {
-            LogUtils.d(TAG, "Count: " + c.getCount());
-            while (c.moveToNext()) {
-                Attachment attachment = Attachment.restoreAttachmentWithId(
-                        this, c.getLong(EmailContent.ID_PROJECTION_COLUMN));
-                if (attachment != null) {
-                    mDownloadSet.onChange(this, attachment);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        finally {
-            c.close();
-        }
-
-        // Loop until stopped, with a 30 minute wait loop
-        while (!mStop) {
-            // Here's where we run our attachment loading logic...
-            // Make a local copy of the variable so we don't null-crash on service shutdown
-            final EmailConnectivityManager ecm = mConnectivityManager;
-            if (ecm != null) {
-                ecm.waitForConnectivity();
-            }
-            if (mStop) {
-                // We might be bailing out here due to the service shutting down
-                break;
-            }
-            mDownloadSet.processQueue();
-            if (mDownloadSet.isEmpty()) {
-                LogUtils.d(TAG, "*** All done; shutting down service");
-                stopSelf();
-                break;
-            }
-            synchronized(mLock) {
-                try {
-                    mLock.wait(PROCESS_QUEUE_WAIT_TIME);
-                } catch (InterruptedException e) {
-                    // That's ok; we'll just keep looping
-                }
-            }
-        }
-
-        // Unregister now that we're done
-        // Make a local copy of the variable so we don't null-crash on service shutdown
-        final EmailConnectivityManager ecm = mConnectivityManager;
-        if (ecm != null) {
-            ecm.unregister();
-        }
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        if (sRunningService == null) {
-            sRunningService = this;
-        }
-        if (intent != null && intent.hasExtra(EXTRA_ATTACHMENT)) {
-            Attachment att = intent.getParcelableExtra(EXTRA_ATTACHMENT);
-            onChange(att);
-        }
-        return Service.START_STICKY;
-    }
-
-    @Override
-    public void onCreate() {
-        // Start up our service thread
-        new Thread(this, "AttachmentDownloadService").start();
-    }
-    @Override
-    public IBinder onBind(Intent intent) {
-        return null;
-    }
-
-    @Override
-    public void onDestroy() {
-        // Mark this instance of the service as stopped
-        mStop = true;
-        if (sRunningService != null) {
-            kick();
-            sRunningService = null;
-        }
-        if (mConnectivityManager != null) {
-            mConnectivityManager.unregister();
-            mConnectivityManager.stopWait();
-            mConnectivityManager = null;
-        }
-    }
-
-    @Override
-    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
-        pw.println("AttachmentDownloadService");
-        long time = System.currentTimeMillis();
-        synchronized(mDownloadSet) {
-            pw.println("  Queue, " + mDownloadSet.size() + " entries");
-            Iterator<DownloadRequest> iterator = mDownloadSet.descendingIterator();
-            // First, start up any required downloads, in priority order
-            while (iterator.hasNext()) {
-                DownloadRequest req = iterator.next();
-                pw.println("    Account: " + req.accountId + ", Attachment: " + req.attachmentId);
-                pw.println("      Priority: " + req.priority + ", Time: " + req.time +
-                        (req.inProgress ? " [In progress]" : ""));
-                Attachment att = Attachment.restoreAttachmentWithId(this, req.attachmentId);
-                if (att == null) {
-                    pw.println("      Attachment not in database?");
-                } else if (att.mFileName != null) {
-                    String fileName = att.mFileName;
-                    String suffix = "[none]";
-                    int lastDot = fileName.lastIndexOf('.');
-                    if (lastDot >= 0) {
-                        suffix = fileName.substring(lastDot);
-                    }
-                    pw.print("      Suffix: " + suffix);
-                    if (att.getContentUri() != null) {
-                        pw.print(" ContentUri: " + att.getContentUri());
-                    }
-                    pw.print(" Mime: ");
-                    if (att.mMimeType != null) {
-                        pw.print(att.mMimeType);
-                    } else {
-                        pw.print(AttachmentUtilities.inferMimeType(fileName, null));
-                        pw.print(" [inferred]");
-                    }
-                    pw.println(" Size: " + att.mSize);
-                }
-                if (req.inProgress) {
-                    pw.println("      Status: " + req.lastStatusCode + ", Progress: " +
-                            req.lastProgress);
-                    pw.println("      Started: " + req.startTime + ", Callback: " +
-                            req.lastCallbackTime);
-                    pw.println("      Elapsed: " + ((time - req.startTime) / 1000L) + "s");
-                    if (req.lastCallbackTime > 0) {
-                        pw.println("      CB: " + ((time - req.lastCallbackTime) / 1000L) + "s");
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/com/android/email/service/AttachmentService.java b/src/com/android/email/service/AttachmentService.java
index 4329fac..f887168 100644
--- a/src/com/android/email/service/AttachmentService.java
+++ b/src/com/android/email/service/AttachmentService.java
@@ -27,7 +27,6 @@
 import android.database.Cursor;
 import android.net.ConnectivityManager;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.SystemClock;
@@ -65,6 +64,9 @@
     // For logging.
     public static final String LOG_TAG = "AttachmentService";
 
+    // STOPSHIP Set this to 0 before shipping.
+    private static final int ENABLE_ATTACHMENT_SERVICE_DEBUG = 0;
+
     // Minimum wait time before retrying a download that failed due to connection error
     private static final long CONNECTION_ERROR_RETRY_MILLIS = 10 * DateUtils.SECOND_IN_MILLIS;
     // Number of retries before we start delaying between
@@ -102,7 +104,10 @@
     // Limit on the number of attachments we'll check for background download
     private static final int MAX_ATTACHMENTS_TO_CHECK = 25;
 
-    private static final String EXTRA_ATTACHMENT = "com.android.email.AttachmentService.attachment";
+    private static final String EXTRA_ATTACHMENT_ID =
+            "com.android.email.AttachmentService.attachment_id";
+    private static final String EXTRA_ATTACHMENT_FLAGS =
+            "com.android.email.AttachmentService.attachment_flags";
 
     // This callback is invoked by the various service implementations to give us download progress
     // since those modules are responsible for the actual download.
@@ -141,14 +146,17 @@
     final DownloadQueue mDownloadQueue = new DownloadQueue();
 
     // The queue entries here are entries of the form {id, flags}, with the values passed in to
-    // attachmentChanged(). Entries in the queue are picked off by calls to attachmentChanged
-    // and processed in an async task in parallel.
+    // attachmentChanged(). Entries in the queue are picked off in processQueue().
     private static final Queue<long[]> sAttachmentChangedQueue =
             new ConcurrentLinkedQueue<long[]>();
 
-    // The task that pulls requests off of the queue of changed attachment and launches
-    // the AttachmentService as needed.  Access to this task is guarded by sAttachmentService.
-    private static AsyncTask<Void, Void, Void> sAttachmentChangedTask;
+    // Extra layer of control over debug logging that should only be enabled when
+    // we need to take an extra deep dive at debugging the workflow in this class.
+    static private void debugTrace(final String format, final Object... args) {
+        if (ENABLE_ATTACHMENT_SERVICE_DEBUG > 0) {
+            LogUtils.d(LOG_TAG, String.format(format, args));
+        }
+    }
 
     /**
      * This class is used to contain the details and state of a particular request to download
@@ -159,7 +167,7 @@
     static class DownloadRequest {
         // Details of the request.
         final int mPriority;
-        final long mTime;
+        final long mCreatedTime;
         final long mAttachmentId;
         final long mMessageId;
         final long mAccountId;
@@ -181,7 +189,7 @@
         @VisibleForTesting
         DownloadRequest(final int attPriority, final long attId) {
             // This constructor should only be used for unit tests.
-            mTime = SystemClock.elapsedRealtime();
+            mCreatedTime = SystemClock.elapsedRealtime();
             mPriority = attPriority;
             mAttachmentId = attId;
             mAccountId = -1;
@@ -198,7 +206,7 @@
                 mAccountId = mMessageId = -1;
             }
             mPriority = getAttachmentPriority(attachment);
-            mTime = SystemClock.elapsedRealtime();
+            mCreatedTime = SystemClock.elapsedRealtime();
         }
 
         private DownloadRequest(final DownloadRequest orig, final long newTime) {
@@ -206,7 +214,7 @@
             mAttachmentId = orig.mAttachmentId;
             mMessageId = orig.mMessageId;
             mAccountId = orig.mAccountId;
-            mTime = newTime;
+            mCreatedTime = newTime;
             mInProgress = orig.mInProgress;
             mLastStatusCode = orig.mLastStatusCode;
             mLastProgress = orig.mLastProgress;
@@ -258,10 +266,10 @@
                 if (req1.mPriority != req2.mPriority) {
                     res = (req1.mPriority < req2.mPriority) ? -1 : 1;
                 } else {
-                    if (req1.mTime == req2.mTime) {
+                    if (req1.mCreatedTime == req2.mCreatedTime) {
                         res = 0;
                     } else {
-                        res = (req1.mTime < req2.mTime) ? -1 : 1;
+                        res = (req1.mCreatedTime < req2.mCreatedTime) ? -1 : 1;
                     }
                 }
                 return res;
@@ -274,7 +282,8 @@
 
         // Secondary collection to quickly find objects w/o the help of an iterator.
         // This class should be kept in lock step with the priority queue.
-        final ConcurrentHashMap<Long, DownloadRequest> mRequestMap = new ConcurrentHashMap<Long, DownloadRequest>();
+        final ConcurrentHashMap<Long, DownloadRequest> mRequestMap =
+                new ConcurrentHashMap<Long, DownloadRequest>();
 
         /**
          * This function will add the request to our collections if it does not already
@@ -293,16 +302,18 @@
             final long requestId = request.mAttachmentId;
             if (requestId < 0) {
                 // Invalid request
-                LogUtils.wtf(AttachmentService.LOG_TAG,
-                        "Adding a DownloadRequest with an invalid id");
+                LogUtils.d(LOG_TAG, "Not adding a DownloadRequest with an invalid attachment id");
                 return false;
             }
+            debugTrace("Queuing DownloadRequest #%d", requestId);
             synchronized (mLock) {
                 // Check to see if this request is is already in the queue
                 final boolean exists = mRequestMap.containsKey(requestId);
                 if (!exists) {
                     mRequestQueue.offer(request);
                     mRequestMap.put(requestId, request);
+                } else {
+                    debugTrace("DownloadRequest #%d was already in the queue");
                 }
             }
             return true;
@@ -319,6 +330,7 @@
                 // If it is invalid, its not in the queue.
                 return true;
             }
+            debugTrace("Removing DownloadRequest #%d", request.mAttachmentId);
             final boolean result;
             synchronized (mLock) {
                 // It is key to keep the map and queue in lock step
@@ -344,6 +356,9 @@
                     mRequestMap.remove(requestId);
                 }
             }
+            if (returnRequest != null) {
+                debugTrace("Retrieved DownloadRequest #%d", returnRequest.mAttachmentId);
+            }
             return returnRequest;
         }
 
@@ -397,6 +412,7 @@
             final AlarmManager am = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
             am.set(AlarmManager.RTC_WAKEUP, System.currentTimeMillis() + delay,
                     mWatchdogPendingIntent);
+            debugTrace("Set up a watchdog for %d millis in the future", delay);
         }
 
         public void setWatchdogAlarm(final Context context) {
@@ -433,9 +449,7 @@
             // Check how long it's been since receiving a callback
             final long timeSinceCallback = now - dr.mLastCallbackTime;
             if (timeSinceCallback > callbackTimeout) {
-                if (LogUtils.isLoggable(LOG_TAG, LogUtils.DEBUG)) {
-                    LogUtils.d(LOG_TAG, "== Download of " + dr.mAttachmentId + " timed out");
-                }
+                LogUtils.d(LOG_TAG, "Timeout for DownloadRequest #%d ", dr.mAttachmentId);
                 return true;
             }
             return false;
@@ -446,14 +460,18 @@
          * have failed silently (the connection dropped, for example)
          */
         void watchdogAlarm(final AttachmentService service, final int callbackTimeout) {
+            debugTrace("Received a timer callback in the watchdog");
+
             // We want to iterate on each of the downloads that are currently in progress and
             // cancel the ones that seem to be taking too long.
             final Collection<DownloadRequest> inProgressRequests =
                     service.mDownloadsInProgress.values();
             for (DownloadRequest req: inProgressRequests) {
+                debugTrace("Checking in-progress request with id: %d", req.mAttachmentId);
                 final boolean shouldCancelDownload = validateDownloadRequest(req, callbackTimeout,
                         System.currentTimeMillis());
                 if (shouldCancelDownload) {
+                    LogUtils.w(LOG_TAG, "Cancelling DownloadRequest #%d", req.mAttachmentId);
                     service.cancelDownload(req);
                     // TODO: Should we also mark the attachment as failed at this point in time?
                 }
@@ -467,9 +485,7 @@
 
         void issueNextWatchdogAlarm(final AttachmentService service) {
             if (!service.mDownloadsInProgress.isEmpty()) {
-                if (LogUtils.isLoggable(LOG_TAG, LogUtils.DEBUG)) {
-                    LogUtils.d(LOG_TAG, "Reschedule watchdog...");
-                }
+                debugTrace("Rescheduling watchdog...");
                 setWatchdogAlarm(service);
             }
         }
@@ -477,8 +493,8 @@
 
     /**
      * We use an EmailServiceCallback to keep track of the progress of downloads.  These callbacks
-     * come from either Controller (IMAP/POP) or ExchangeService (EAS).  Note that we only implement the
-     * single callback that's defined by the EmailServiceCallback interface.
+     * come from either Controller (IMAP/POP) or ExchangeService (EAS).  Note that we only
+     * implement the single callback that's defined by the EmailServiceCallback interface.
      */
     class ServiceCallback extends IEmailServiceCallback.Stub {
 
@@ -506,28 +522,23 @@
         @Override
         public void loadAttachmentStatus(final long messageId, final long attachmentId,
                 final int statusCode, final int progress) {
+            debugTrace(LOG_TAG, "ServiceCallback for attachment #%d", attachmentId);
+
             // Record status and progress
             final DownloadRequest req = mDownloadsInProgress.get(attachmentId);
             if (req != null) {
-                if (LogUtils.isLoggable(LOG_TAG, LogUtils.DEBUG)) {
-                    final String code;
-                    switch(statusCode) {
-                        case EmailServiceStatus.SUCCESS: code = "Success"; break;
-                        case EmailServiceStatus.IN_PROGRESS: code = "In progress"; break;
-                        default: code = Integer.toString(statusCode); break;
-                    }
-                    if (statusCode != EmailServiceStatus.IN_PROGRESS) {
-                        LogUtils.d(LOG_TAG, ">> Attachment status " + attachmentId + ": " + code);
-                    } else if (progress >= (req.mLastProgress + 10)) {
-                        LogUtils.d(LOG_TAG, ">> Attachment progress %d: %d%%", attachmentId,
-                                progress);
-                    }
-                }
+                final long now = System.currentTimeMillis();
+                debugTrace("ServiceCallback: status code changing from %d to %d",
+                        req.mLastStatusCode, statusCode);
+                debugTrace("ServiceCallback: progress changing from %d to %d",
+                        req.mLastProgress,progress);
+                debugTrace("ServiceCallback: last callback time changing from %d to %d",
+                        req.mLastCallbackTime, now);
 
                 // Update some state to keep track of the progress of the download
                 req.mLastStatusCode = statusCode;
                 req.mLastProgress = progress;
-                req.mLastCallbackTime = System.currentTimeMillis();
+                req.mLastCallbackTime = now;
 
                 // Update the attachment status in the provider.
                 final Attachment attachment =
@@ -545,6 +556,7 @@
                         // It is assumed that any other error is either a success or an error
                         // Either way, the final updates to the DownloadRequest and attachment
                         // objects will be handed there.
+                        LogUtils.d(LOG_TAG, "Attachment #%d is done", attachmentId);
                         endDownload(attachmentId, statusCode);
                         break;
                 }
@@ -566,39 +578,13 @@
      * @param flags the new flags for the attachment
      */
     public static void attachmentChanged(final Context context, final long id, final int flags) {
-        synchronized (sAttachmentChangedQueue) {
-            sAttachmentChangedQueue.add(new long[]{id, flags});
-            if (sAttachmentChangedTask == null) {
-                sAttachmentChangedTask = new AsyncTask<Void, Void, Void>() {
-                    @Override
-                    protected Void doInBackground(Void... params) {
-                        while (true) {
-                            final long[] change;
-                            synchronized (sAttachmentChangedQueue) {
-                                change = sAttachmentChangedQueue.poll();
-                                if (change == null) {
-                                    sAttachmentChangedTask = null;
-                                    return null;
-                                }
-                            }
-                            final long id = change[0];
-                            final long flags = change[1];
-                            final Attachment attachment =
-                                    Attachment.restoreAttachmentWithId(context, id);
-                            if (attachment == null) {
-                                continue;
-                            }
-                            attachment.mFlags = (int) flags;
-                            final Intent intent = new Intent(context, AttachmentService.class);
-                            intent.putExtra(EXTRA_ATTACHMENT, attachment);
-                            // This is result in a call to AttachmentService.onStartCommand()
-                            // which will queue the attachment in its internal prioritized queue.
-                            context.startService(intent);
-                        }
-                    }
-                }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-            }
-        }
+        LogUtils.d(LOG_TAG, "Attachment with id: %d will potentially be queued for download", id);
+        // Throw this info into an intent and send it to the attachment service.
+        final Intent intent = new Intent(context, AttachmentService.class);
+        debugTrace("Calling startService with extras %d & %d", id, flags);
+        intent.putExtra(EXTRA_ATTACHMENT_ID, id);
+        intent.putExtra(EXTRA_ATTACHMENT_FLAGS, flags);
+        context.startService(intent);
     }
 
     /**
@@ -610,11 +596,20 @@
         if (sRunningService == null) {
             sRunningService = this;
         }
-        if (intent != null && intent.hasExtra(EXTRA_ATTACHMENT)) {
-            Attachment att = intent.getParcelableExtra(EXTRA_ATTACHMENT);
-            onChange(this, att);
+        if (intent != null) {
+            // Let's add this id/flags combo to the list of potential attachments to process.
+            final long attachment_id = intent.getLongExtra(EXTRA_ATTACHMENT_ID, -1);
+            final int attachment_flags = intent.getIntExtra(EXTRA_ATTACHMENT_FLAGS, -1);
+            if ((attachment_id >= 0) && (attachment_flags >= 0)) {
+                sAttachmentChangedQueue.add(new long[]{attachment_id, attachment_flags});
+                // Process the queue if we're in a wait
+                kick();
+            } else {
+                debugTrace("Received an invalid intent w/o the required extras %d & %d",
+                        attachment_id, attachment_flags);
+            }
         } else {
-            LogUtils.wtf(LOG_TAG, "Received an invalid intent w/o EXTRA_ATTACHMENT");
+            debugTrace("Received a null intent in onStartCommand");
         }
         return Service.START_STICKY;
     }
@@ -636,6 +631,9 @@
 
     @Override
     public void onDestroy() {
+        debugTrace("Destroying AttachmentService object");
+        dumpInProgressDownloads();
+
         // Mark this instance of the service as stopped. Our main loop for the AttachmentService
         // checks for this flag along with the AttachmentWatchdog.
         mStop = true;
@@ -668,11 +666,13 @@
                 EmailContent.ID_PROJECTION, "(" + AttachmentColumns.FLAGS + " & ?) != 0",
                 new String[] {Integer.toString(mask)}, null);
         try {
-            LogUtils.d(LOG_TAG, "Count: " + c.getCount());
+            LogUtils.d(LOG_TAG,
+                    "Count of previous downloads to resume (from db): %d", c.getCount());
             while (c.moveToNext()) {
                 final Attachment attachment = Attachment.restoreAttachmentWithId(
                         this, c.getLong(EmailContent.ID_PROJECTION_COLUMN));
                 if (attachment != null) {
+                    debugTrace("Attempting to download attachment #%d again.", attachment.mId);
                     onChange(this, attachment);
                 }
             }
@@ -692,15 +692,24 @@
             }
             if (mStop) {
                 // We might be bailing out here due to the service shutting down
-                LogUtils.d(LOG_TAG, "*** AttachmentService has been instructed to stop");
+                LogUtils.d(LOG_TAG, "AttachmentService has been instructed to stop");
                 break;
             }
+
+            // In advanced debug mode, let's look at the state of all in-progress downloads
+            // after processQueue() runs.
+            debugTrace("Downloads Map before processQueue");
+            dumpInProgressDownloads();
             processQueue();
-            if (mDownloadQueue.isEmpty()) {
-                LogUtils.d(LOG_TAG, "*** All done; shutting down service");
+            debugTrace("Downloads Map after processQueue");
+            dumpInProgressDownloads();
+
+            if (mDownloadQueue.isEmpty() && (mDownloadsInProgress.size() < 1)) {
+                LogUtils.d(LOG_TAG, "Shutting down service. No in-progress or pending downloads.");
                 stopSelf();
                 break;
             }
+            debugTrace("Run() wait for mLock");
             synchronized(mLock) {
                 try {
                     mLock.wait(PROCESS_QUEUE_WAIT_TIME);
@@ -708,6 +717,7 @@
                     // That's ok; we'll just keep looping
                 }
             }
+            debugTrace("Run() got mLock");
         }
 
         // Unregister now that we're done
@@ -735,37 +745,40 @@
      * existence of an attachment before acting on it.
      */
     public synchronized void onChange(final Context context, final Attachment att) {
+        debugTrace("onChange() for Attachment: #%d", att.mId);
         DownloadRequest req = mDownloadQueue.findRequestById(att.mId);
         final long priority = getAttachmentPriority(att);
         if (priority == PRIORITY_NONE) {
-            if (LogUtils.isLoggable(LOG_TAG, LogUtils.DEBUG)) {
-                LogUtils.d(LOG_TAG, "== Attachment changed: " + att.mId);
-            }
+            LogUtils.d(LOG_TAG, "Attachment #%d has no priority and will not be downloaded",
+                    att.mId);
             // In this case, there is no download priority for this attachment
             if (req != null) {
                 // If it exists in the map, remove it
                 // NOTE: We don't yet support deleting downloads in progress
-                if (LogUtils.isLoggable(LOG_TAG, LogUtils.DEBUG)) {
-                    LogUtils.d(LOG_TAG, "== Attachment " + att.mId + " was in queue, removing");
-                }
                 mDownloadQueue.removeRequest(req);
             }
         } else {
             // Ignore changes that occur during download
-            if (mDownloadsInProgress.containsKey(att.mId)) return;
+            if (mDownloadsInProgress.containsKey(att.mId)) {
+                debugTrace("Attachment #%d was already in the queue", att.mId);
+                return;
+            }
             // If this is new, add the request to the queue
             if (req == null) {
+                LogUtils.d(LOG_TAG, "Attachment #%d is a new download request", att.mId);
                 req = new DownloadRequest(context, att);
                 final AttachmentInfo attachInfo = new AttachmentInfo(context, att);
                 if (!attachInfo.isEligibleForDownload()) {
+                    LogUtils.w(LOG_TAG, "Attachment #%d is not eligible for download", att.mId);
                     // We can't download this file due to policy, depending on what type
                     // of request we received, we handle the response differently.
                     if (((att.mFlags & Attachment.FLAG_DOWNLOAD_USER_REQUEST) != 0) ||
                             ((att.mFlags & Attachment.FLAG_POLICY_DISALLOWS_DOWNLOAD) != 0)) {
+                        LogUtils.w(LOG_TAG, "Attachment #%d cannot be downloaded ever", att.mId);
                         // There are a couple of situations where we will not even allow this
                         // request to go in the queue because we can already process it as a
                         // failure.
-                        // 1. The user explictly wants to download this attachment from the
+                        // 1. The user explicitly wants to download this attachment from the
                         // email view but they should not be able to...either because there is
                         // no app to view it or because its been marked as a policy violation.
                         // 2. The user is forwarding an email and the attachment has been
@@ -781,12 +794,11 @@
                 }
                 mDownloadQueue.addRequest(req);
             }
-            // If the request already existed, we'll update the priority (so that the time is
-            // up-to-date); otherwise, we create a new request
-            if (LogUtils.isLoggable(LOG_TAG, LogUtils.DEBUG)) {
-                LogUtils.d(LOG_TAG, "== Download queued for attachment " + att.mId + ", class " +
-                        req.mPriority + ", priority time " + req.mTime);
-            }
+            // TODO: If the request already existed, we'll update the priority (so that the time is
+            // up-to-date); otherwise, create a new request
+            LogUtils.d(LOG_TAG,
+                    "Attachment #%d queued for download, priority: %d, created time: %d",
+                    att.mId, req.mPriority, req.mCreatedTime);
         }
         // Process the queue if we're in a wait
         kick();
@@ -805,35 +817,63 @@
     }
 
     /**
+     * Set the bits in the provider to mark this download as completed.
+     * @param att The attachment that was downloaded.
+     */
+    void markAttachmentAsCompleted(final Attachment att) {
+        final ContentValues cv = new ContentValues();
+        final int flags = Attachment.FLAG_DOWNLOAD_FORWARD | Attachment.FLAG_DOWNLOAD_USER_REQUEST;
+        cv.put(AttachmentColumns.FLAGS, att.mFlags &= ~flags);
+        cv.put(AttachmentColumns.UI_STATE, AttachmentState.SAVED);
+        att.update(this, cv);
+    }
+
+    /**
      * Run through the AttachmentMap and find DownloadRequests that can be executed, enforcing
      * the limit on maximum downloads
      */
     synchronized void processQueue() {
-        if (LogUtils.isLoggable(LOG_TAG, LogUtils.DEBUG)) {
-            LogUtils.d(LOG_TAG, "== Checking attachment queue, " + mDownloadQueue.getSize()
-                    + " entries");
+        debugTrace("Processing changed queue, num entries: %d", sAttachmentChangedQueue.size());
+
+        // First thing we need to do is process the list of "potential downloads" that we
+        // added to sAttachmentChangedQueue
+        long[] change = sAttachmentChangedQueue.poll();
+        while (change != null) {
+            // Process this change
+            final long id = change[0];
+            final long flags = change[1];
+            final Attachment attachment = Attachment.restoreAttachmentWithId(this, id);
+            if (attachment == null) {
+                LogUtils.w(LOG_TAG, "Could not restore attachment #%d", id);
+                continue;
+            }
+            attachment.mFlags = (int) flags;
+            onChange(this, attachment);
+            change = sAttachmentChangedQueue.poll();
         }
 
+        debugTrace("Processing download queue, num entries: %d", mDownloadQueue.getSize());
+
         while (mDownloadsInProgress.size() < MAX_SIMULTANEOUS_DOWNLOADS) {
             final DownloadRequest req = mDownloadQueue.getNextRequest();
             if (req == null) {
                 // No more queued requests?  We are done for now.
                 break;
             }
-             // Enforce per-account limit here
+            // Enforce per-account limit here
             if (getDownloadsForAccount(req.mAccountId) >= MAX_SIMULTANEOUS_DOWNLOADS_PER_ACCOUNT) {
-                if (LogUtils.isLoggable(LOG_TAG, LogUtils.DEBUG)) {
-                    LogUtils.d(LOG_TAG, "== Skip #" + req.mAttachmentId + "; maxed for acct #" +
-                            req.mAccountId);
-                }
+                LogUtils.w(LOG_TAG, "Skipping #%d; maxed for acct %d",
+                        req.mAttachmentId, req.mAccountId);
                 continue;
-            } else if (Attachment.restoreAttachmentWithId(this, req.mAttachmentId) == null) {
+            }
+            if (Attachment.restoreAttachmentWithId(this, req.mAttachmentId) == null) {
+                LogUtils.e(LOG_TAG, "Could not load attachment: #%d", req.mAttachmentId);
                 continue;
             }
             if (!req.mInProgress) {
                 final long currentTime = SystemClock.elapsedRealtime();
                 if (req.mRetryCount > 0 && req.mRetryStartTime > currentTime) {
-                    LogUtils.d(LOG_TAG, "== waiting to retry attachment %d", req.mAttachmentId);
+                    debugTrace("Need to wait before retrying attachment #%d", req.mAttachmentId);
                     mWatchdog.setWatchdogAlarm(this, CONNECTION_ERROR_RETRY_MILLIS,
                             CALLBACK_TIMEOUT);
                     continue;
@@ -852,17 +892,23 @@
                 (ecm.getActiveNetworkType() != ConnectivityManager.TYPE_WIFI)) {
             // Only prefetch if it if connectivity is available, prefetch is enabled
             // and we are on WIFI
+            LogUtils.d(LOG_TAG, "Skipping opportunistic downloads since WIFI is not available");
             return;
         }
 
         // Then, try opportunistic download of appropriate attachments
-        final int backgroundDownloads = MAX_SIMULTANEOUS_DOWNLOADS - mDownloadsInProgress.size();
-        if ((backgroundDownloads + 1) >= MAX_SIMULTANEOUS_DOWNLOADS) {
+        final int availableBackgroundThreads =
+                MAX_SIMULTANEOUS_DOWNLOADS - mDownloadsInProgress.size() - 1;
+        if (availableBackgroundThreads < 1) {
             // We want to leave one spot open for a user requested download that we haven't
             // started processing yet.
+            LogUtils.d(LOG_TAG, "Skipping opportunistic downloads, %d threads available",
+                    availableBackgroundThreads);
             return;
         }
 
+        debugTrace("Launching up to %d opportunistic downloads", availableBackgroundThreads);
+
         // We'll load up the newest 25 attachments that aren't loaded or queued
         // TODO: We are always looking for MAX_ATTACHMENTS_TO_CHECK, shouldn't this be
         // backgroundDownloads instead?  We should fix and test this.
@@ -881,6 +927,7 @@
                 if (account == null) {
                     // Clean up this orphaned attachment; there's no point in keeping it
                     // around; then try to find another one
+                    debugTrace("Found orphaned attachment #%d", att.mId);
                     EmailContent.delete(this, Attachment.CONTENT_URI, att.mId);
                 } else {
                     // Check that the attachment meets system requirements for download
@@ -890,11 +937,12 @@
                     if (info.isEligibleForDownload()) {
                         // Either the account must be able to prefetch or this must be
                         // an inline attachment.
-                        if (att.mContentId != null ||
-                                (canPrefetchForAccount(account, cacheDir))) {
+                        if (att.mContentId != null || canPrefetchForAccount(account, cacheDir)) {
                             final Integer tryCount = mAttachmentFailureMap.get(att.mId);
                             if (tryCount != null && tryCount > MAX_DOWNLOAD_RETRIES) {
                                 // move onto the next attachment
+                                LogUtils.w(LOG_TAG,
+                                        "Too many failed attempts for attachment #%d ", att.mId);
                                 continue;
                             }
                             // Start this download and we're done
@@ -909,7 +957,7 @@
                         // query results. We are most likely here for other reasons such
                         // as the inability to view the attachment. In that case, let's just
                         // skip it for now.
-                        LogUtils.e(LOG_TAG, "== skip attachment %d, it is ineligible", att.mId);
+                        LogUtils.w(LOG_TAG, "Skipping attachment #%d, it is ineligible", att.mId);
                     }
                 }
             }
@@ -930,12 +978,12 @@
 
         // Do not download the same attachment multiple times
         boolean alreadyInProgress = mDownloadsInProgress.get(req.mAttachmentId) != null;
-        if (alreadyInProgress) return false;
+        if (alreadyInProgress) {
+            debugTrace("This attachment #%d is already in progress", req.mAttachmentId);
+            return false;
+        }
 
         try {
-            if (LogUtils.isLoggable(LOG_TAG, LogUtils.DEBUG)) {
-                LogUtils.d(LOG_TAG, ">> Starting download for attachment #" + req.mAttachmentId);
-            }
             startDownload(service, req);
         } catch (RemoteException e) {
             // TODO: Consider whether we need to do more in this case...
@@ -955,6 +1003,7 @@
      */
     private void startDownload(final EmailServiceProxy service, final DownloadRequest req)
             throws RemoteException {
+        LogUtils.d(LOG_TAG, "Starting download for Attachment #%d", req.mAttachmentId);
         req.mStartTime = System.currentTimeMillis();
         req.mInProgress = true;
         mDownloadsInProgress.put(req.mAttachmentId, req);
@@ -964,16 +1013,16 @@
     }
 
     synchronized void cancelDownload(final DownloadRequest req) {
-        LogUtils.d(LOG_TAG, "cancelDownload #%d", req.mAttachmentId);
+        LogUtils.d(LOG_TAG, "Cancelling download for Attachment #%d", req.mAttachmentId);
         req.mInProgress = false;
         mDownloadsInProgress.remove(req.mAttachmentId);
         // Remove the download from our queue, and then decide whether or not to add it back.
         mDownloadQueue.removeRequest(req);
         req.mRetryCount++;
         if (req.mRetryCount > CONNECTION_ERROR_MAX_RETRIES) {
-            LogUtils.d(LOG_TAG, "too many failures, giving up");
+            LogUtils.w(LOG_TAG, "Too many failures giving up on Attachment #%d", req.mAttachmentId);
         } else {
-            LogUtils.d(LOG_TAG, "moving to end of queue, will retry");
+            debugTrace("Moving to end of queue, will retry #%d", req.mAttachmentId);
             // The time field of DownloadRequest is final, because it's unsafe to change it
             // as long as the DownloadRequest is in the DownloadSet. It's needed for the
             // comparator, so changing time would make the request unfindable.
@@ -990,6 +1039,8 @@
      * @param statusCode the EmailServiceStatus code returned by the Service
      */
     synchronized void endDownload(final long attachmentId, final int statusCode) {
+        LogUtils.d(LOG_TAG, "Finishing download #%d", attachmentId);
+
         // Say we're no longer downloading this
         mDownloadsInProgress.remove(attachmentId);
 
@@ -1006,6 +1057,7 @@
                 downloadCount = 0;
             }
             downloadCount += 1;
+            LogUtils.w(LOG_TAG, "This attachment failed, adding #%d to failure map", attachmentId);
             mAttachmentFailureMap.put(attachmentId, downloadCount);
         }
 
@@ -1016,7 +1068,11 @@
                 req.mRetryCount++;
                 if (req.mRetryCount > CONNECTION_ERROR_MAX_RETRIES) {
                     // We are done, we maxed out our total number of tries.
-                    LogUtils.d(LOG_TAG, "Connection Error #%d, giving up", attachmentId);
+                    // Not that we do not flag this attachment with any special flags so the
+                    // AttachmentService will try to download this attachment again the next time
+                    // that it starts up.
+                    LogUtils.w(LOG_TAG, "Too many tried for connection errors, giving up #%d",
+                            attachmentId);
                     mDownloadQueue.removeRequest(req);
                     // Note that we are not doing anything with the attachment right now
                     // We will annotate it later in this function if needed.
@@ -1026,7 +1082,7 @@
                     // So now, for the first five errors, we'll retry immediately. For the next
                     // five tries, we'll add a ten second delay between each. After that, we'll
                     // give up.
-                    LogUtils.d(LOG_TAG, "ConnectionError #%d, retried %d times, adding delay",
+                    LogUtils.w(LOG_TAG, "ConnectionError #%d, retried %d times, adding delay",
                             attachmentId, req.mRetryCount);
                     req.mInProgress = false;
                     req.mRetryStartTime = SystemClock.elapsedRealtime() +
@@ -1034,7 +1090,7 @@
                     mWatchdog.setWatchdogAlarm(this, CONNECTION_ERROR_RETRY_MILLIS,
                             CALLBACK_TIMEOUT);
                 } else {
-                    LogUtils.d(LOG_TAG, "ConnectionError #%d, retried %d times, adding delay",
+                    LogUtils.w(LOG_TAG, "ConnectionError for #%d, retried %d times, adding delay",
                             attachmentId, req.mRetryCount);
                     req.mInProgress = false;
                     req.mRetryStartTime = 0;
@@ -1049,15 +1105,15 @@
             mDownloadQueue.removeRequest(req);
         }
 
-        if (LogUtils.isLoggable(LOG_TAG, LogUtils.DEBUG)) {
+        if (ENABLE_ATTACHMENT_SERVICE_DEBUG > 0) {
             long secs = 0;
             if (req != null) {
-                secs = (System.currentTimeMillis() - req.mTime) / 1000;
+                secs = (System.currentTimeMillis() - req.mCreatedTime) / 1000;
             }
             final String status = (statusCode == EmailServiceStatus.SUCCESS) ? "Success" :
                 "Error " + statusCode;
-            LogUtils.d(LOG_TAG, "<< Download finished for attachment #" + attachmentId + "; " + secs
-                    + " seconds from request, status: " + status);
+            debugTrace("Download finished for attachment #%d; %d seconds from request, status: %s",
+                    attachmentId, secs, status);
         }
 
         final Attachment attachment = Attachment.restoreAttachmentWithId(this, attachmentId);
@@ -1078,34 +1134,38 @@
                     EmailContent.delete(this, Attachment.CONTENT_URI, attachment.mId);
                     // TODO: Talk to UX about whether this is even worth doing
                     NotificationController nc = NotificationController.getInstance(this);
-                    nc.showDownloadForwardFailedNotification(attachment);
+                    nc.showDownloadForwardFailedNotificationSynchronous(attachment);
                     deleted = true;
+                    LogUtils.w(LOG_TAG, "Deleting forwarded attachment #%d for message #%d",
+                        attachmentId, attachment.mMessageKey);
                 }
                 // If we're an attachment on forwarded mail, and if we're not still blocked,
                 // try to send pending mail now (as mediated by MailService)
                 if ((req != null) &&
                         !Utility.hasUnloadedAttachments(this, attachment.mMessageKey)) {
-                    if (LogUtils.isLoggable(LOG_TAG, LogUtils.DEBUG)) {
-                        LogUtils.d(LOG_TAG, "== Downloads finished for outgoing msg #"
-                                + req.mMessageId);
-                    }
+                    debugTrace("Downloads finished for outgoing msg #%d", req.mMessageId);
                     EmailServiceProxy service = EmailServiceUtils.getServiceForAccount(
                             this, accountId);
                     try {
                         service.sendMail(accountId);
                     } catch (RemoteException e) {
-                        // We tried
+                        LogUtils.e(LOG_TAG, "RemoteException while trying to send message: #%d, %s",
+                                req.mMessageId, e.toString());
                     }
                 }
             }
             if (statusCode == EmailServiceStatus.MESSAGE_NOT_FOUND) {
                 Message msg = Message.restoreMessageWithId(this, attachment.mMessageKey);
                 if (msg == null) {
+                    LogUtils.w(LOG_TAG, "Deleting attachment #%d with no associated message #%d",
+                            attachment.mId, attachment.mMessageKey);
                     // If there's no associated message, delete the attachment
                     EmailContent.delete(this, Attachment.CONTENT_URI, attachment.mId);
                 } else {
                     // If there really is a message, retry
                     // TODO: How will this get retried? It's still marked as inProgress?
+                    LogUtils.w(LOG_TAG, "Retrying attachment #%d with associated message #%d",
+                            attachment.mId, attachment.mMessageKey);
                     kick();
                     return;
                 }
@@ -1115,12 +1175,8 @@
                 // ignore it and continue; otherwise, it was either 1) a user request, in which
                 // case the user can retry manually or 2) an opportunistic download, in which
                 // case the download wasn't critical
-                ContentValues cv = new ContentValues();
-                int flags =
-                    Attachment.FLAG_DOWNLOAD_FORWARD | Attachment.FLAG_DOWNLOAD_USER_REQUEST;
-                cv.put(AttachmentColumns.FLAGS, attachment.mFlags &= ~flags);
-                cv.put(AttachmentColumns.UI_STATE, AttachmentState.SAVED);
-                attachment.update(this, cv);
+                LogUtils.d(LOG_TAG, "Attachment #%d successfully downloaded!", attachment.mId);
+                markAttachmentAsCompleted(attachment);
             }
         }
         // Process the queue
@@ -1169,14 +1225,20 @@
         if (account == null) return false;
 
         // First, check preference and quickly return if prefetch isn't allowed
-        if ((account.mFlags & Account.FLAGS_BACKGROUND_ATTACHMENTS) == 0) return false;
+        if ((account.mFlags & Account.FLAGS_BACKGROUND_ATTACHMENTS) == 0) {
+            debugTrace("Prefetch is not allowed for this account: %d", account.getId());
+            return false;
+        }
 
         final long totalStorage = dir.getTotalSpace();
         final long usableStorage = dir.getUsableSpace();
         final long minAvailable = (long)(totalStorage * PREFETCH_MINIMUM_STORAGE_AVAILABLE);
 
         // If there's not enough overall storage available, stop now
-        if (usableStorage < minAvailable) return false;
+        if (usableStorage < minAvailable) {
+            debugTrace("Not enough physical storage for prefetch");
+            return false;
+        }
 
         final int numberOfAccounts = mAccountManagerStub.getNumberOfAccounts();
         // Calculate an even per-account storage although it would make a lot of sense to not
@@ -1204,10 +1266,8 @@
 
         // Return true if we're using less than the maximum per account
         if (accountStorage >= perAccountMaxStorage) {
-            if (LogUtils.isLoggable(LOG_TAG, LogUtils.DEBUG)) {
-                LogUtils.d(LOG_TAG, ">> Prefetch not allowed for account " + account.mId +
-                        "; used " + accountStorage + ", limit " + perAccountMaxStorage);
-            }
+            debugTrace("Prefetch not allowed for account %d; used: %d, limit %d",
+                    account.mId, accountStorage, perAccountMaxStorage);
             return false;
         }
         return true;
@@ -1221,6 +1281,33 @@
     }
 
     // For Debugging.
+    synchronized public void dumpInProgressDownloads() {
+        if (ENABLE_ATTACHMENT_SERVICE_DEBUG < 1) {
+            LogUtils.d(LOG_TAG, "Advanced logging not configured.");
+        }
+        for (final DownloadRequest req : mDownloadsInProgress.values()) {
+            LogUtils.d(LOG_TAG, "--BEGIN DownloadRequest DUMP--");
+            LogUtils.d(LOG_TAG, "Account: #%d", req.mAccountId);
+            LogUtils.d(LOG_TAG, "Message: #%d", req.mMessageId);
+            LogUtils.d(LOG_TAG, "Attachment: #%d", req.mAttachmentId);
+            LogUtils.d(LOG_TAG, "Created Time: %d", req.mCreatedTime);
+            LogUtils.d(LOG_TAG, "Priority: %d", req.mPriority);
+            if (req.mInProgress == true) {
+                LogUtils.d(LOG_TAG, "This download is in progress");
+            } else {
+                LogUtils.d(LOG_TAG, "This download is not in progress");
+            }
+            LogUtils.d(LOG_TAG, "Start Time: %d", req.mStartTime);
+            LogUtils.d(LOG_TAG, "Retry Count: %d", req.mRetryCount);
+            LogUtils.d(LOG_TAG, "Retry Start Tiome: %d", req.mRetryStartTime);
+            LogUtils.d(LOG_TAG, "Last Status Code: %d", req.mLastStatusCode);
+            LogUtils.d(LOG_TAG, "Last Progress: %d", req.mLastProgress);
+            LogUtils.d(LOG_TAG, "Last Callback Time: %d", req.mLastCallbackTime);
+            LogUtils.d(LOG_TAG, "------------------------------");
+        }
+    }
+
+
     @Override
     public void dump(final FileDescriptor fd, final PrintWriter pw, final String[] args) {
         pw.println("AttachmentService");
@@ -1234,7 +1321,7 @@
             // concern with this debug method.
             for (final DownloadRequest req : mDownloadQueue.mRequestMap.values()) {
                 pw.println("    Account: " + req.mAccountId + ", Attachment: " + req.mAttachmentId);
-                pw.println("      Priority: " + req.mPriority + ", Time: " + req.mTime +
+                pw.println("      Priority: " + req.mPriority + ", Time: " + req.mCreatedTime +
                         (req.mInProgress ? " [In progress]" : ""));
                 final Attachment att = Attachment.restoreAttachmentWithId(this, req.mAttachmentId);
                 if (att == null) {
diff --git a/src/com/android/email/service/EmailBroadcastProcessorService.java b/src/com/android/email/service/EmailBroadcastProcessorService.java
index b3a1510..b967121 100644
--- a/src/com/android/email/service/EmailBroadcastProcessorService.java
+++ b/src/com/android/email/service/EmailBroadcastProcessorService.java
@@ -38,7 +38,6 @@
 import com.android.email.Preferences;
 import com.android.email.R;
 import com.android.email.SecurityPolicy;
-import com.android.email.activity.setup.AccountSettings;
 import com.android.email.provider.AccountReconciler;
 import com.android.emailcommon.Logging;
 import com.android.emailcommon.VendorPolicyLoader;
@@ -74,10 +73,6 @@
     // Action used for BroadcastReceiver entry point
     private static final String ACTION_BROADCAST = "broadcast_receiver";
 
-    // Dialing "*#*#36245#*#*" to open the debug screen.   "36245" = "email"
-    private static final String ACTION_SECRET_CODE = "android.provider.Telephony.SECRET_CODE";
-    private static final String SECRET_CODE_HOST_DEBUG_SCREEN = "36245";
-
     // This is a helper used to process DeviceAdminReceiver messages
     private static final String ACTION_DEVICE_POLICY_ADMIN = "com.android.email.devicepolicy";
     private static final String EXTRA_DEVICE_POLICY_ADMIN = "message_code";
@@ -133,9 +128,6 @@
 
             if (Intent.ACTION_BOOT_COMPLETED.equals(broadcastAction)) {
                 onBootCompleted();
-            } else if (ACTION_SECRET_CODE.equals(broadcastAction)
-                    && SECRET_CODE_HOST_DEBUG_SCREEN.equals(broadcastIntent.getData().getHost())) {
-                AccountSettings.actionSettingsWithDebug(this);
             } else if (AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION.equals(broadcastAction)) {
                 onSystemAccountChanged();
             } else if (Intent.ACTION_LOCALE_CHANGED.equals(broadcastAction) ||
diff --git a/src/com/android/email/service/EmailServiceStub.java b/src/com/android/email/service/EmailServiceStub.java
index 2e20a93..264e5b6 100644
--- a/src/com/android/email/service/EmailServiceStub.java
+++ b/src/com/android/email/service/EmailServiceStub.java
@@ -28,7 +28,6 @@
 import com.android.email.NotificationController;
 import com.android.email.mail.Sender;
 import com.android.email.mail.Store;
-import com.android.email.provider.AccountReconciler;
 import com.android.email.service.EmailServiceUtils.EmailServiceInfo;
 import com.android.email2.ui.MailActivityEmail;
 import com.android.emailcommon.Logging;
@@ -51,9 +50,10 @@
 import com.android.emailcommon.provider.EmailContent.BodyColumns;
 import com.android.emailcommon.provider.EmailContent.MailboxColumns;
 import com.android.emailcommon.provider.EmailContent.MessageColumns;
-import com.android.emailcommon.provider.HostAuth;
 import com.android.emailcommon.provider.Mailbox;
 import com.android.emailcommon.service.EmailServiceStatus;
+import com.android.emailcommon.service.EmailServiceVersion;
+import com.android.emailcommon.service.HostAuthCompat;
 import com.android.emailcommon.service.IEmailService;
 import com.android.emailcommon.service.IEmailServiceCallback;
 import com.android.emailcommon.service.SearchParams;
@@ -90,7 +90,7 @@
     }
 
     @Override
-    public Bundle validate(HostAuth hostauth) throws RemoteException {
+    public Bundle validate(HostAuthCompat hostAuthCom) throws RemoteException {
         // TODO Auto-generated method stub
         return null;
     }
@@ -219,7 +219,7 @@
                     new MessageRetrievalListenerBridge(messageId, attachmentId, cb));
 
             // If we failed to load the attachment, throw an Exception here, so that
-            // AttachmentDownloadService knows that we failed
+            // AttachmentService knows that we failed
             if (storePart.getBody() == null) {
                 throw new MessagingException("Attachment not loaded.");
             }
@@ -389,8 +389,8 @@
     }
 
     @Override
-    public void deleteAccountPIMData(final String emailAddress) throws RemoteException {
-        AccountReconciler.reconcileAccounts(mContext);
+    public void deleteExternalAccountPIMData(final String emailAddress) throws RemoteException {
+        // No need to do anything here, for IMAP and POP accounts none of our data is external.
     }
 
     @Override
@@ -433,7 +433,7 @@
         final ContentResolver resolver = context.getContentResolver();
         final Cursor c = resolver.query(EmailContent.Message.CONTENT_URI,
                 EmailContent.Message.ID_COLUMN_PROJECTION,
-                MessageColumns.MAILBOX_KEY + "=?", new String[] { Long.toString(outboxId) },
+                MessageColumns.MAILBOX_KEY + "=?", new String[] { Long.toString(outboxId)},
                 null);
         try {
             // 2.  exit early
@@ -472,7 +472,8 @@
                 } catch (MessagingException me) {
                     // report error for this message, but keep trying others
                     if (me instanceof AuthenticationFailedException) {
-                        nc.showLoginFailedNotification(account.mId);
+                        nc.showLoginFailedNotificationSynchronous(account.mId,
+                                false /* incoming */);
                     }
                     continue;
                 }
@@ -509,10 +510,14 @@
             nc.cancelLoginFailedNotification(account.mId);
         } catch (MessagingException me) {
             if (me instanceof AuthenticationFailedException) {
-                nc.showLoginFailedNotification(account.mId);
+                nc.showLoginFailedNotificationSynchronous(account.mId, false /* incoming */);
             }
         } finally {
             c.close();
         }
     }
+
+    public int getApiVersion() {
+        return EmailServiceVersion.CURRENT;
+    }
 }
diff --git a/src/com/android/email/service/EmailServiceUtils.java b/src/com/android/email/service/EmailServiceUtils.java
index 6218937..54dcdd8 100644
--- a/src/com/android/email/service/EmailServiceUtils.java
+++ b/src/com/android/email/service/EmailServiceUtils.java
@@ -54,6 +54,8 @@
 import com.android.emailcommon.provider.HostAuth;
 import com.android.emailcommon.service.EmailServiceProxy;
 import com.android.emailcommon.service.EmailServiceStatus;
+import com.android.emailcommon.service.EmailServiceVersion;
+import com.android.emailcommon.service.HostAuthCompat;
 import com.android.emailcommon.service.IEmailService;
 import com.android.emailcommon.service.IEmailServiceCallback;
 import com.android.emailcommon.service.SearchParams;
@@ -654,7 +656,7 @@
         }
 
         @Override
-        public Bundle validate(HostAuth hostauth) throws RemoteException {
+        public Bundle validate(HostAuthCompat hostauth) throws RemoteException {
             return null;
         }
 
@@ -680,7 +682,7 @@
         }
 
         @Override
-        public void deleteAccountPIMData(final String emailAddress) throws RemoteException {
+        public void deleteExternalAccountPIMData(final String emailAddress) throws RemoteException {
         }
 
         @Override
@@ -702,5 +704,8 @@
             return EmailServiceStatus.SUCCESS;
         }
 
+        public int getApiVersion() {
+            return EmailServiceVersion.CURRENT;
+        }
     }
 }
diff --git a/src/com/android/email/service/ImapService.java b/src/com/android/email/service/ImapService.java
index 9efed3b..5abd05d 100644
--- a/src/com/android/email/service/ImapService.java
+++ b/src/com/android/email/service/ImapService.java
@@ -178,7 +178,7 @@
             }
             if (e instanceof AuthenticationFailedException) {
                 // Generate authentication notification
-                nc.showLoginFailedNotification(account.mId);
+                nc.showLoginFailedNotificationSynchronous(account.mId, true /* incoming */);
             }
             throw e;
         } finally {
diff --git a/src/com/android/email/service/Pop3Service.java b/src/com/android/email/service/Pop3Service.java
index d94146e..ebd748b 100644
--- a/src/com/android/email/service/Pop3Service.java
+++ b/src/com/android/email/service/Pop3Service.java
@@ -118,7 +118,7 @@
             }
             if (e instanceof AuthenticationFailedException) {
                 // Generate authentication notification
-                nc.showLoginFailedNotification(account.mId);
+                nc.showLoginFailedNotificationSynchronous(account.mId, true /* incoming */);
             }
             throw e;
         }
diff --git a/src/com/android/email2/ui/MailActivityEmail.java b/src/com/android/email2/ui/MailActivityEmail.java
index 90364d9..0723e64 100644
--- a/src/com/android/email2/ui/MailActivityEmail.java
+++ b/src/com/android/email2/ui/MailActivityEmail.java
@@ -29,7 +29,7 @@
 import com.android.email.NotificationController;
 import com.android.email.Preferences;
 import com.android.email.provider.EmailProvider;
-import com.android.email.service.AttachmentDownloadService;
+import com.android.email.service.AttachmentService;
 import com.android.email.service.EmailServiceUtils;
 import com.android.emailcommon.Logging;
 import com.android.emailcommon.TempDirectory;
@@ -45,7 +45,6 @@
 import com.android.mail.utils.LogTag;
 import com.android.mail.utils.LogUtils;
 import com.android.mail.utils.Utils;
-import com.android.mail.welcome.WelcomeTourCompletionListener;
 
 public class MailActivityEmail extends com.android.mail.ui.MailActivity {
     /**
@@ -124,13 +123,15 @@
     private static void setServicesEnabled(Context context, boolean enabled) {
         PackageManager pm = context.getPackageManager();
         pm.setComponentEnabledSetting(
-                new ComponentName(context, AttachmentDownloadService.class),
+                new ComponentName(context, AttachmentService.class),
                 enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED :
                     PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                 PackageManager.DONT_KILL_APP);
 
         // Start/stop the various services depending on whether there are any accounts
-        startOrStopService(enabled, context, new Intent(context, AttachmentDownloadService.class));
+        // TODO: Make sure that the AttachmentService responds to this request as it
+        // expects a particular set of data in the intents that it receives or it ignores.
+        startOrStopService(enabled, context, new Intent(context, AttachmentService.class));
         NotificationController.getInstance(context).watchForMessages();
     }
 
@@ -214,12 +215,6 @@
         Utility.enableStrictMode(enabled);
     }
 
-    @Override
-    public void onWelcomeTourRequested(
-            WelcomeTourCompletionListener completionListener) {
-        // Do nothing.
-    }
-
     private Intent getViewIntent(long accountId, long mailboxId) {
         final ContentResolver contentResolver = getContentResolver();
 
diff --git a/src/com/android/mail/providers/EmailAccountCacheProvider.java b/src/com/android/mail/providers/EmailAccountCacheProvider.java
index fafe267..77a9db2 100644
--- a/src/com/android/mail/providers/EmailAccountCacheProvider.java
+++ b/src/com/android/mail/providers/EmailAccountCacheProvider.java
@@ -21,7 +21,7 @@
 import android.net.Uri;
 
 import com.android.email.R;
-import com.android.email.activity.setup.AccountSettings;
+import com.android.email.activity.setup.AccountSetupFinal;
 
 public class EmailAccountCacheProvider extends MailAppProvider {
     // Content provider for Email
@@ -42,12 +42,7 @@
 
     @Override
     protected Intent getNoAccountsIntent(Context context) {
-        Intent intent = new Intent();
-        intent.setPackage(context.getPackageName());
-        intent.setAction(Intent.ACTION_EDIT);
-        intent.setData(Uri.parse("content://ui.email.android.com/settings"));
-        intent.putExtra(AccountSettings.EXTRA_NO_ACCOUNTS, true);
-        return intent;
+        return AccountSetupFinal.actionNewAccountWithResultIntent(context);
     }
 
     @Override
diff --git a/tests/src/com/android/email/activity/setup/AccountSetupIncomingTests.java b/tests/src/com/android/email/activity/setup/AccountSetupIncomingTests.java
index 46b0016..bac1e68 100644
--- a/tests/src/com/android/email/activity/setup/AccountSetupIncomingTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSetupIncomingTests.java
@@ -197,7 +197,9 @@
         final HostAuth auth = account.getOrCreateHostAuthRecv(context);
         auth.setHostAuthFromString(storeUriString);
         final SetupDataFragment setupDataFragment =
-                new SetupDataFragment(SetupDataFragment.FLOW_MODE_NORMAL, account);
+                new SetupDataFragment();
+        setupDataFragment.setFlowMode(SetupDataFragment.FLOW_MODE_NORMAL);
+        setupDataFragment.setAccount(account);
         final Intent i = new Intent(AccountSetupFinal.ACTION_JUMP_TO_INCOMING);
         i.putExtra(SetupDataFragment.EXTRA_SETUP_DATA, setupDataFragment);
         return i;
diff --git a/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java b/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java
index ac33492..f1f9ae0 100644
--- a/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSetupOptionsTests.java
@@ -172,7 +172,9 @@
         final HostAuth auth = account.getOrCreateHostAuthRecv(context);
         auth.setHostAuthFromString(storeUri);
         final SetupDataFragment setupDataFragment =
-                new SetupDataFragment(SetupDataFragment.FLOW_MODE_NORMAL, account);
+                new SetupDataFragment();
+        setupDataFragment.setFlowMode(SetupDataFragment.FLOW_MODE_NORMAL);
+        setupDataFragment.setAccount(account);
         final Intent i = new Intent(AccountSetupFinal.ACTION_JUMP_TO_OPTIONS);
         i.putExtra(SetupDataFragment.EXTRA_SETUP_DATA, setupDataFragment);
         return i;
diff --git a/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java b/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java
index 770a3ea..5cb6a94 100644
--- a/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java
+++ b/tests/src/com/android/email/activity/setup/AccountSetupOutgoingTests.java
@@ -202,7 +202,9 @@
         final HostAuth auth = account.getOrCreateHostAuthSend(context);
         auth.setHostAuthFromString(senderUriString);
         final SetupDataFragment setupDataFragment =
-                new SetupDataFragment(SetupDataFragment.FLOW_MODE_NORMAL, account);
+                new SetupDataFragment();
+        setupDataFragment.setFlowMode(SetupDataFragment.FLOW_MODE_NORMAL);
+        setupDataFragment.setAccount(account);
         final Intent i = new Intent(AccountSetupFinal.ACTION_JUMP_TO_OUTGOING);
         i.putExtra(SetupDataFragment.EXTRA_SETUP_DATA, setupDataFragment);
         return i;
diff --git a/tests/src/com/android/email/activity/setup/AccountSettingsTests.java b/tests/src/com/android/email/activity/setup/EmailPreferenceActivityTests.java
similarity index 89%
rename from tests/src/com/android/email/activity/setup/AccountSettingsTests.java
rename to tests/src/com/android/email/activity/setup/EmailPreferenceActivityTests.java
index 9111523..ff11383 100644
--- a/tests/src/com/android/email/activity/setup/AccountSettingsTests.java
+++ b/tests/src/com/android/email/activity/setup/EmailPreferenceActivityTests.java
@@ -40,7 +40,8 @@
  */
 @Suppress
 @MediumTest
-public class AccountSettingsTests extends ActivityInstrumentationTestCase2<AccountSettings> {
+public class EmailPreferenceActivityTests
+        extends ActivityInstrumentationTestCase2<EmailPreferenceActivity> {
 
     private long mAccountId;
     private Account mAccount;
@@ -50,8 +51,8 @@
 
     private static final String PREFERENCE_FREQUENCY = "account_check_frequency";
 
-    public AccountSettingsTests() {
-        super(AccountSettings.class);
+    public EmailPreferenceActivityTests() {
+        super(EmailPreferenceActivity.class);
     }
 
     /**
@@ -124,13 +125,13 @@
      * Get the activity (which causes it to be started, using our intent) and get the UI fields
      */
     private void getActivityAndFields() throws Throwable {
-        final AccountSettings theActivity = getActivity();
+        final EmailPreferenceActivity theActivity = getActivity();
 
         runTestOnUiThread(new Runnable() {
             public void run() {
-                AccountSettingsFragment f = theActivity.getSettingsFragment();
-                mCheckFrequency =
-                    (ListPreference) f.findPreference(PREFERENCE_FREQUENCY);
+                //AccountSettingsFragment f = theActivity.getSettingsFragment();
+                //mCheckFrequency =
+                //    (ListPreference) f.findPreference(PREFERENCE_FREQUENCY);
             }
         });
     }
@@ -162,8 +163,8 @@
         mAccount.save(mContext);
         mAccountId = mAccount.mId;
 
-        // accountId, loginWarningAccountName, loginWarningReason
-        return AccountSettings.createAccountSettingsIntent(mContext, mAccountId, null, null);
+        // TODO: We don't have an intent that takes an account object
+        return null;
     }
 
 }
diff --git a/tests/src/com/android/email/provider/AttachmentProviderTests.java b/tests/src/com/android/email/provider/AttachmentProviderTests.java
index 2ef6fcd..f68069a 100644
--- a/tests/src/com/android/email/provider/AttachmentProviderTests.java
+++ b/tests/src/com/android/email/provider/AttachmentProviderTests.java
@@ -659,7 +659,7 @@
     private String createAttachmentFile(Account forAccount, long id) throws IOException {
         File outFile = getAttachmentFile(forAccount, id);
         Bitmap bitmap = BitmapFactory.decodeResource(getContext().getResources(),
-                R.drawable.ic_attachment_holo_light);
+                R.drawable.ic_attach_file_20dp);
         FileOutputStream out = new FileOutputStream(outFile);
         bitmap.compress(Bitmap.CompressFormat.PNG, 100, out);
         out.close();
diff --git a/tests/src/com/android/email/provider/ProviderTests.java b/tests/src/com/android/email/provider/ProviderTests.java
index b7e6922..a1506fd 100644
--- a/tests/src/com/android/email/provider/ProviderTests.java
+++ b/tests/src/com/android/email/provider/ProviderTests.java
@@ -34,7 +34,7 @@
 import android.test.suitebuilder.annotation.SmallTest;
 import android.test.suitebuilder.annotation.Suppress;
 
-import com.android.email.provider.EmailProvider.AttachmentService;
+import com.android.email.provider.EmailProvider.EmailAttachmentService;
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.provider.EmailContent.AccountColumns;
@@ -110,7 +110,8 @@
         }
     }
 
-    private static final AttachmentService MOCK_ATTACHMENT_SERVICE = new AttachmentService() {
+    private static final EmailAttachmentService MOCK_ATTACHMENT_SERVICE =
+            new EmailAttachmentService() {
         @Override
         public void attachmentChanged(Context context, long id, int flags) {
             // Noop. Don't download attachments.
diff --git a/tests/src/com/android/email/service/AttachmentDownloadServiceTests.java b/tests/src/com/android/email/service/AttachmentDownloadServiceTests.java
deleted file mode 100644
index 32b68f7..0000000
--- a/tests/src/com/android/email/service/AttachmentDownloadServiceTests.java
+++ /dev/null
@@ -1,283 +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.service;
-
-import android.content.Context;
-import android.test.suitebuilder.annotation.Suppress;
-
-import com.android.email.AccountTestCase;
-import com.android.email.EmailConnectivityManager;
-import com.android.email.provider.ProviderTestUtils;
-import com.android.email.service.AttachmentDownloadService.DownloadRequest;
-import com.android.email.service.AttachmentDownloadService.DownloadSet;
-import com.android.emailcommon.provider.Account;
-import com.android.emailcommon.provider.EmailContent.Attachment;
-import com.android.emailcommon.provider.EmailContent.Message;
-import com.android.emailcommon.provider.Mailbox;
-import com.android.emailcommon.service.EmailServiceStatus;
-
-import java.io.File;
-import java.util.Iterator;
-
-/**
- * Tests of the AttachmentDownloadService
- *
- * You can run this entire test case with:
- *   runtest -c com.android.email.service.AttachmentDownloadServiceTests email
- */
-@Suppress
-public class AttachmentDownloadServiceTests extends AccountTestCase {
-    private AttachmentDownloadService mService;
-    private Context mMockContext;
-    private Account mAccount;
-    private Mailbox mMailbox;
-    private long mAccountId;
-    private long mMailboxId;
-    private AttachmentDownloadService.AccountManagerStub mAccountManagerStub;
-    private MockDirectory mMockDirectory;
-
-    private DownloadSet mDownloadSet;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mMockContext = getMockContext();
-
-        // Set up an account and mailbox
-        mAccount = ProviderTestUtils.setupAccount("account", false, mMockContext);
-        mAccount.mFlags |= Account.FLAGS_BACKGROUND_ATTACHMENTS;
-        mAccount.save(mMockContext);
-        mAccountId = mAccount.mId;
-
-        mMailbox = ProviderTestUtils.setupMailbox("mailbox", mAccountId, true, mMockContext);
-        mMailboxId = mMailbox.mId;
-
-        // Set up our download service to simulate a running environment
-        // Use the NullEmailService so that the loadAttachment calls become no-ops
-        mService = new AttachmentDownloadService();
-        mService.mContext = mMockContext;
-        // there's no NullEmailService class
-        /*mService.addServiceIntentForTest(mAccountId, new Intent(mContext,
-                NullEmailService.class));*/
-        mAccountManagerStub = new AttachmentDownloadService.AccountManagerStub(null);
-        mService.mAccountManagerStub = mAccountManagerStub;
-        mService.mConnectivityManager = new MockConnectivityManager(mContext, "mock");
-        mDownloadSet = mService.mDownloadSet;
-        mMockDirectory =
-            new MockDirectory(mService.mContext.getCacheDir().getAbsolutePath());
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-        super.tearDown();
-    }
-
-    /**
-     * This test creates attachments and places them in the DownloadSet; we then do various checks
-     * that exercise its functionality.
-     */
-    public void testDownloadSet() {
-        // TODO: Make sure that this doesn't interfere with the "real" ADS that might be running
-        // on device
-        Message message = ProviderTestUtils.setupMessage("message", mAccountId, mMailboxId, false,
-                true, mMockContext);
-        Attachment att1 = ProviderTestUtils.setupAttachment(message.mId, "filename1", 1000,
-                Attachment.FLAG_DOWNLOAD_USER_REQUEST, true, mMockContext);
-        Attachment att2 = ProviderTestUtils.setupAttachment(message.mId, "filename2", 1000,
-                Attachment.FLAG_DOWNLOAD_FORWARD, true, mMockContext);
-        Attachment att3 = ProviderTestUtils.setupAttachment(message.mId, "filename3", 1000,
-                Attachment.FLAG_DOWNLOAD_FORWARD, true, mMockContext);
-        Attachment att4 = ProviderTestUtils.setupAttachment(message.mId, "filename4", 1000,
-                Attachment.FLAG_DOWNLOAD_USER_REQUEST, true, mMockContext);
-        // Indicate that these attachments have changed; they will be added to the queue
-        mDownloadSet.onChange(mMockContext, att1);
-        mDownloadSet.onChange(mMockContext, att2);
-        mDownloadSet.onChange(mMockContext, att3);
-        mDownloadSet.onChange(mMockContext, att4);
-        Iterator<DownloadRequest> iterator = mDownloadSet.descendingIterator();
-        // Check the expected ordering; 1 & 4 are higher priority than 2 & 3
-        // 1 and 3 were created earlier than their priority equals
-        long[] expectedAttachmentIds = new long[] {att1.mId, att4.mId, att2.mId, att3.mId};
-        for (int i = 0; i < expectedAttachmentIds.length; i++) {
-            assertTrue(iterator.hasNext());
-            DownloadRequest req = iterator.next();
-            assertEquals(expectedAttachmentIds[i], req.attachmentId);
-        }
-
-        // Process the queue; attachment 1 should be marked "in progress", and should be in
-        // the in-progress map
-        mDownloadSet.processQueue();
-        DownloadRequest req = mDownloadSet.findDownloadRequest(att1.mId);
-        assertNotNull(req);
-        assertTrue(req.inProgress);
-        assertTrue(mDownloadSet.mDownloadsInProgress.containsKey(att1.mId));
-        // There should also be only one download in progress (testing the per-account limitation)
-        assertEquals(1, mDownloadSet.mDownloadsInProgress.size());
-        // End the "download" with a connection error; we should still have this in the queue,
-        // but it should no longer be in-progress
-        mDownloadSet.endDownload(att1.mId, EmailServiceStatus.CONNECTION_ERROR);
-        assertFalse(req.inProgress);
-        assertEquals(0, mDownloadSet.mDownloadsInProgress.size());
-
-        mDownloadSet.processQueue();
-        // Things should be as they were earlier; att1 should be an in-progress download
-        req = mDownloadSet.findDownloadRequest(att1.mId);
-        assertNotNull(req);
-        assertTrue(req.inProgress);
-        assertTrue(mDownloadSet.mDownloadsInProgress.containsKey(att1.mId));
-        // Successfully download the attachment; there should be no downloads in progress, and
-        // att1 should no longer be in the queue
-        mDownloadSet.endDownload(att1.mId, EmailServiceStatus.SUCCESS);
-        assertEquals(0, mDownloadSet.mDownloadsInProgress.size());
-        assertNull(mDownloadSet.findDownloadRequest(att1.mId));
-
-        // Test dequeue and isQueued
-        assertEquals(3, mDownloadSet.size());
-        mService.dequeue(att2.mId);
-        assertEquals(2, mDownloadSet.size());
-        assertTrue(mService.isQueued(att4.mId));
-        assertTrue(mService.isQueued(att3.mId));
-
-        mDownloadSet.processQueue();
-        // att4 should be the download in progress
-        req = mDownloadSet.findDownloadRequest(att4.mId);
-        assertNotNull(req);
-        assertTrue(req.inProgress);
-        assertTrue(mDownloadSet.mDownloadsInProgress.containsKey(att4.mId));
-    }
-
-    /**
-     * A mock file directory containing a single (Mock)File.  The total space, usable space, and
-     * length of the single file can be set
-     */
-    private static class MockDirectory extends File {
-        private static final long serialVersionUID = 1L;
-        private long mTotalSpace;
-        private long mUsableSpace;
-        private MockFile[] mFiles;
-        private final MockFile mMockFile = new MockFile();
-
-
-        public MockDirectory(String path) {
-            super(path);
-            mFiles = new MockFile[1];
-            mFiles[0] = mMockFile;
-        }
-
-        private void setTotalAndUsableSpace(long total, long usable) {
-            mTotalSpace = total;
-            mUsableSpace = usable;
-        }
-
-        @Override
-        public long getTotalSpace() {
-            return mTotalSpace;
-        }
-
-        @Override
-        public long getUsableSpace() {
-            return mUsableSpace;
-        }
-
-        public void setFileLength(long length) {
-            mMockFile.mLength = length;
-        }
-
-        @Override
-        public File[] listFiles() {
-            return mFiles;
-        }
-    }
-
-    /**
-     * A mock file that reports back a pre-set length
-     */
-    private static class MockFile extends File {
-        private static final long serialVersionUID = 1L;
-        private long mLength = 0;
-
-        public MockFile() {
-            super("_mock");
-        }
-
-        @Override
-        public long length() {
-            return mLength;
-        }
-    }
-
-    private static class MockConnectivityManager extends EmailConnectivityManager {
-        public MockConnectivityManager(Context context, String name) {
-            super(context, name);
-        }
-
-        @Override
-        public void waitForConnectivity() {
-        }
-
-        @Override
-        public boolean isAutoSyncAllowed() {
-            return true;
-        }
-    }
-
-    public void testCanPrefetchForAccount() {
-        // First, test our "global" limits (based on free storage)
-        // Mock storage @ 100 total and 26 available
-        // Note that all file lengths in this test are in arbitrary units
-        mMockDirectory.setTotalAndUsableSpace(100L, 26L);
-        // Mock 2 accounts in total
-        mAccountManagerStub.setNumberOfAccounts(2);
-        // With 26% available, we should be ok to prefetch
-        assertTrue(mService.canPrefetchForAccount(mAccount, mMockDirectory));
-        // Now change to 24 available
-        mMockDirectory.setTotalAndUsableSpace(100L, 24L);
-        // With 24% available, we should NOT be ok to prefetch
-        assertFalse(mService.canPrefetchForAccount(mAccount, mMockDirectory));
-
-        // Now, test per-account storage
-        // Mock storage @ 100 total and 50 available
-        mMockDirectory.setTotalAndUsableSpace(100L, 50L);
-        // Mock a file of length 12, but need to uncache previous amount first
-        mService.mAttachmentStorageMap.remove(mAccountId);
-        mMockDirectory.setFileLength(11);
-        // We can prefetch since 11 < 50/4
-        assertTrue(mService.canPrefetchForAccount(mAccount, mMockDirectory));
-        // Mock a file of length 13, but need to uncache previous amount first
-        mService.mAttachmentStorageMap.remove(mAccountId);
-        mMockDirectory.setFileLength(13);
-        // We can't prefetch since 13 > 50/4
-        assertFalse(mService.canPrefetchForAccount(mAccount, mMockDirectory));
-    }
-
-    public void testCanPrefetchForAccountNoBackgroundDownload() {
-        Account account = ProviderTestUtils.setupAccount("account2", false, mMockContext);
-        account.mFlags &= ~Account.FLAGS_BACKGROUND_ATTACHMENTS;
-        account.save(mMockContext);
-
-        // First, test our "global" limits (based on free storage)
-        // Mock storage @ 100 total and 26 available
-        // Note that all file lengths in this test are in arbitrary units
-        mMockDirectory.setTotalAndUsableSpace(100L, 26L);
-        // Mock 2 accounts in total
-        mAccountManagerStub.setNumberOfAccounts(2);
-
-        // With 26% available, we should be ok to prefetch,
-        // *but* bg download is disabled on the account.
-        assertFalse(mService.canPrefetchForAccount(account, mMockDirectory));
-    }
-}
diff --git a/tests/src/com/android/email/service/AttachmentServiceTests.java b/tests/src/com/android/email/service/AttachmentServiceTests.java
index 7ae06bb..2794daf 100644
--- a/tests/src/com/android/email/service/AttachmentServiceTests.java
+++ b/tests/src/com/android/email/service/AttachmentServiceTests.java
@@ -391,7 +391,7 @@
         for (int i = 0; i < dq.getSize(); i++){
             final AttachmentService.DownloadRequest returnRequest = dq.getNextRequest();
             assertNotNull(returnRequest);
-            final long requestTime = returnRequest.mTime;
+            final long requestTime = returnRequest.mCreatedTime;
             // The time should be going up.
             assertTrue(requestTime >= lastTime);
             lastTime = requestTime;