diff --git a/emailcommon/src/com/android/emailcommon/provider/Account.java b/emailcommon/src/com/android/emailcommon/provider/Account.java
old mode 100644
new mode 100755
index bffba5d..757118b
--- a/emailcommon/src/com/android/emailcommon/provider/Account.java
+++ b/emailcommon/src/com/android/emailcommon/provider/Account.java
@@ -671,10 +671,6 @@
      */
     @Override
     public int update(Context context, ContentValues cv) {
-        if (mPolicy != null && mPolicyKey <= 0) {
-            // If a policy is set and there's no policy, link it to the account
-            Policy.setAccountPolicy(context, this, mPolicy, null);
-        }
         if (cv.containsKey(AccountColumns.IS_DEFAULT) &&
                 cv.getAsBoolean(AccountColumns.IS_DEFAULT)) {
             ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
diff --git a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
old mode 100644
new mode 100755
index 4587673..ac0d659
--- a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
+++ b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
@@ -1437,5 +1437,8 @@
         public static final String MAX_CALENDAR_LOOKBACK = "maxCalendarLookback";
         // Indicates that the server allows password recovery, not that we support it
         public static final String PASSWORD_RECOVERY_ENABLED = "passwordRecoveryEnabled";
+        // Tokenized strings indicating protocol specific policies enforced/unsupported
+        public static final String PROTOCOL_POLICIES_ENFORCED = "protocolPoliciesEnforced";
+        public static final String PROTOCOL_POLICIES_UNSUPPORTED = "protocolPoliciesUnsupported";
     }
 }
diff --git a/emailcommon/src/com/android/emailcommon/provider/Policy.java b/emailcommon/src/com/android/emailcommon/provider/Policy.java
old mode 100644
new mode 100755
index 5c95abe..d43290f
--- a/emailcommon/src/com/android/emailcommon/provider/Policy.java
+++ b/emailcommon/src/com/android/emailcommon/provider/Policy.java
@@ -16,21 +16,17 @@
 
 package com.android.emailcommon.provider;
 import android.app.admin.DevicePolicyManager;
-import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
-import android.content.OperationApplicationException;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.os.RemoteException;
-import android.util.Log;
 
+import com.android.emailcommon.utility.TextUtilities;
 import com.android.emailcommon.utility.Utility;
-import com.google.common.annotations.VisibleForTesting;
 
 import java.util.ArrayList;
 
@@ -56,6 +52,8 @@
     public static final int PASSWORD_MODE_SIMPLE = 1;
     public static final int PASSWORD_MODE_STRONG = 2;
 
+    public static final char POLICY_STRING_DELIMITER = '\1';
+
     public int mPasswordMode;
     public int mPasswordMinLength;
     public int mPasswordMaxFails;
@@ -76,6 +74,8 @@
     public int mMaxEmailLookback;
     public int mMaxCalendarLookback;
     public boolean mPasswordRecoveryEnabled;
+    public String mProtocolPoliciesEnforced;
+    public String mProtocolPoliciesUnsupported;
 
     public static final int CONTENT_ID_COLUMN = 0;
     public static final int CONTENT_PASSWORD_MODE_COLUMN = 1;
@@ -98,6 +98,8 @@
     public static final int CONTENT_MAX_EMAIL_LOOKBACK_COLUMN = 18;
     public static final int CONTENT_MAX_CALENDAR_LOOKBACK_COLUMN = 19;
     public static final int CONTENT_PASSWORD_RECOVERY_ENABLED_COLUMN = 20;
+    public static final int CONTENT_PROTOCOL_POLICIES_ENFORCED_COLUMN = 21;
+    public static final int CONTENT_PROTOCOL_POLICIES_UNSUPPORTED_COLUMN = 22;
 
     public static final String[] CONTENT_PROJECTION = new String[] {RECORD_ID,
         PolicyColumns.PASSWORD_MODE, PolicyColumns.PASSWORD_MIN_LENGTH,
@@ -109,7 +111,8 @@
         PolicyColumns.DONT_ALLOW_ATTACHMENTS, PolicyColumns.DONT_ALLOW_HTML,
         PolicyColumns.MAX_ATTACHMENT_SIZE, PolicyColumns.MAX_TEXT_TRUNCATION_SIZE,
         PolicyColumns.MAX_HTML_TRUNCATION_SIZE, PolicyColumns.MAX_EMAIL_LOOKBACK,
-        PolicyColumns.MAX_CALENDAR_LOOKBACK, PolicyColumns.PASSWORD_RECOVERY_ENABLED
+        PolicyColumns.MAX_CALENDAR_LOOKBACK, PolicyColumns.PASSWORD_RECOVERY_ENABLED,
+        PolicyColumns.PROTOCOL_POLICIES_ENFORCED, PolicyColumns.PROTOCOL_POLICIES_UNSUPPORTED
     };
 
     public static final Policy NO_POLICY = new Policy();
@@ -139,6 +142,24 @@
                 Account.ID_PROJECTION_COLUMN, Account.NO_ACCOUNT);
     }
 
+    public static ArrayList<String> addPolicyStringToList(String policyString,
+            ArrayList<String> policyList) {
+        if (policyString != null) {
+            int start = 0;
+            int len = policyString.length();
+            while(start < len) {
+                int end = policyString.indexOf(POLICY_STRING_DELIMITER, start);
+                if (end > start) {
+                    policyList.add(policyString.substring(start, end));
+                    start = end + 1;
+                } else {
+                    break;
+                }
+            }
+        }
+        return policyList;
+    }
+
     // We override this method to insure that we never write invalid policy data to the provider
     @Override
     public Uri save(Context context) {
@@ -146,76 +167,6 @@
         return super.save(context);
     }
 
-    public static void clearAccountPolicy(Context context, Account account) {
-        setAccountPolicy(context, account, null, null);
-    }
-
-    /**
-     * Convenience method for {@link #setAccountPolicy(Context, Account, Policy, String)}.
-     */
-    @VisibleForTesting
-    public static void setAccountPolicy(Context context, long accountId, Policy policy,
-            String securitySyncKey) {
-        setAccountPolicy(context, Account.restoreAccountWithId(context, accountId),
-                policy, securitySyncKey);
-    }
-
-    /**
-     * Set the policy for an account atomically; this also removes any other policy associated with
-     * the account and sets the policy key for the account.  If policy is null, the policyKey is
-     * set to 0 and the securitySyncKey to null.  Also, update the account object to reflect the
-     * current policyKey and securitySyncKey
-     * @param context the caller's context
-     * @param account the account whose policy is to be set
-     * @param policy the policy to set, or null if we're clearing the policy
-     * @param securitySyncKey the security sync key for this account (ignored if policy is null)
-     */
-    public static void setAccountPolicy(Context context, Account account, Policy policy,
-            String securitySyncKey) {
-        if (DEBUG_POLICY) {
-            Log.d(TAG, "Set policy for account " + account.mDisplayName + ": " +
-                    ((policy == null) ? "none" : policy.toString()));
-        }
-        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
-
-        // Make sure this is a valid policy set
-        if (policy != null) {
-            policy.normalize();
-            // Add the new policy (no account will yet reference this)
-            ops.add(ContentProviderOperation.newInsert(
-                    Policy.CONTENT_URI).withValues(policy.toContentValues()).build());
-            // Make the policyKey of the account our newly created policy, and set the sync key
-            ops.add(ContentProviderOperation.newUpdate(
-                    ContentUris.withAppendedId(Account.CONTENT_URI, account.mId))
-                    .withValueBackReference(AccountColumns.POLICY_KEY, 0)
-                    .withValue(AccountColumns.SECURITY_SYNC_KEY, securitySyncKey)
-                    .build());
-        } else {
-            ops.add(ContentProviderOperation.newUpdate(
-                    ContentUris.withAppendedId(Account.CONTENT_URI, account.mId))
-                    .withValue(AccountColumns.SECURITY_SYNC_KEY, null)
-                    .withValue(AccountColumns.POLICY_KEY, 0)
-                    .build());
-        }
-
-        // Delete the previous policy associated with this account, if any
-        if (account.mPolicyKey > 0) {
-            ops.add(ContentProviderOperation.newDelete(
-                    ContentUris.withAppendedId(
-                            Policy.CONTENT_URI, account.mPolicyKey)).build());
-        }
-
-        try {
-            context.getContentResolver().applyBatch(EmailContent.AUTHORITY, ops);
-            account.refresh(context);
-        } catch (RemoteException e) {
-           // This is fatal to a remote process
-            throw new IllegalStateException("Exception setting account policy.");
-        } catch (OperationApplicationException e) {
-            // Can't happen; our provider doesn't throw this exception
-        }
-    }
-
     /**
      * Review all attachment records for this account, and reset the "don't allow download" flag
      * as required by the account's new security policies
@@ -286,6 +237,7 @@
     public boolean equals(Object other) {
         if (!(other instanceof Policy)) return false;
         Policy otherPolicy = (Policy)other;
+        // Policies here are enforced by the DPM
         if (mRequireEncryption != otherPolicy.mRequireEncryption) return false;
         if (mRequireEncryptionExternal != otherPolicy.mRequireEncryptionExternal) return false;
         if (mRequireRemoteWipe != otherPolicy.mRequireRemoteWipe) return false;
@@ -296,10 +248,13 @@
         if (mPasswordMaxFails != otherPolicy.mPasswordMaxFails) return false;
         if (mPasswordMinLength != otherPolicy.mPasswordMinLength) return false;
         if (mPasswordMode != otherPolicy.mPasswordMode) return false;
+        if (mDontAllowCamera != otherPolicy.mDontAllowCamera) return false;
+
+        // Policies here are enforced by the Exchange sync manager
+        // They should eventually be removed from Policy and replaced with some opaque data
         if (mRequireManualSyncWhenRoaming != otherPolicy.mRequireManualSyncWhenRoaming) {
             return false;
         }
-        if (mDontAllowCamera != otherPolicy.mDontAllowCamera) return false;
         if (mDontAllowAttachments != otherPolicy.mDontAllowAttachments) return false;
         if (mDontAllowHtml != otherPolicy.mDontAllowHtml) return false;
         if (mMaxAttachmentSize != otherPolicy.mMaxAttachmentSize) return false;
@@ -308,6 +263,15 @@
         if (mMaxEmailLookback != otherPolicy.mMaxEmailLookback) return false;
         if (mMaxCalendarLookback != otherPolicy.mMaxCalendarLookback) return false;
         if (mPasswordRecoveryEnabled != otherPolicy.mPasswordRecoveryEnabled) return false;
+
+        if (!TextUtilities.stringOrNullEquals(mProtocolPoliciesEnforced,
+                otherPolicy.mProtocolPoliciesEnforced)) {
+            return false;
+        }
+        if (!TextUtilities.stringOrNullEquals(mProtocolPoliciesUnsupported,
+                otherPolicy.mProtocolPoliciesUnsupported)) {
+            return false;
+        }
         return true;
     }
 
@@ -353,6 +317,9 @@
         mMaxEmailLookback = cursor.getInt(CONTENT_MAX_EMAIL_LOOKBACK_COLUMN);
         mMaxCalendarLookback = cursor.getInt(CONTENT_MAX_CALENDAR_LOOKBACK_COLUMN);
         mPasswordRecoveryEnabled = cursor.getInt(CONTENT_PASSWORD_RECOVERY_ENABLED_COLUMN) == 1;
+        mProtocolPoliciesEnforced = cursor.getString(CONTENT_PROTOCOL_POLICIES_ENFORCED_COLUMN);
+        mProtocolPoliciesUnsupported =
+            cursor.getString(CONTENT_PROTOCOL_POLICIES_UNSUPPORTED_COLUMN);
     }
 
     @Override
@@ -378,6 +345,8 @@
         values.put(PolicyColumns.MAX_EMAIL_LOOKBACK, mMaxEmailLookback);
         values.put(PolicyColumns.MAX_CALENDAR_LOOKBACK, mMaxCalendarLookback);
         values.put(PolicyColumns.PASSWORD_RECOVERY_ENABLED, mPasswordRecoveryEnabled);
+        values.put(PolicyColumns.PROTOCOL_POLICIES_ENFORCED, mProtocolPoliciesEnforced);
+        values.put(PolicyColumns.PROTOCOL_POLICIES_UNSUPPORTED, mProtocolPoliciesUnsupported);
         return values;
     }
 
@@ -508,6 +477,8 @@
         dest.writeInt(mMaxEmailLookback);
         dest.writeInt(mMaxCalendarLookback);
         dest.writeInt(mPasswordRecoveryEnabled ? 1 : 0);
+        dest.writeString(mProtocolPoliciesEnforced);
+        dest.writeString(mProtocolPoliciesUnsupported);
     }
 
     /**
@@ -536,5 +507,7 @@
         mMaxEmailLookback = in.readInt();
         mMaxCalendarLookback = in.readInt();
         mPasswordRecoveryEnabled = in.readInt() == 1;
+        mProtocolPoliciesEnforced = in.readString();
+        mProtocolPoliciesUnsupported = in.readString();
     }
 }
\ No newline at end of file
diff --git a/emailcommon/src/com/android/emailcommon/service/IPolicyService.aidl b/emailcommon/src/com/android/emailcommon/service/IPolicyService.aidl
old mode 100644
new mode 100755
index e9bcf42..9d4be36
--- a/emailcommon/src/com/android/emailcommon/service/IPolicyService.aidl
+++ b/emailcommon/src/com/android/emailcommon/service/IPolicyService.aidl
@@ -19,12 +19,7 @@
 
 interface IPolicyService {
     boolean isActive(in Policy policies);
-    void policiesRequired(long accountId);
-    void policiesUpdated(long accountId);
     void setAccountHoldFlag(long accountId, boolean newState);
-    boolean isActiveAdmin();
-    // This is about as oneway as you can get
+    void setAccountPolicy(long accountId, in Policy policy, String securityKey);
     oneway void remoteWipe();
-    boolean isSupported(in Policy policies);
-    Policy clearUnsupportedPolicies(in Policy policies);
 }
\ No newline at end of file
diff --git a/emailcommon/src/com/android/emailcommon/service/PolicyServiceProxy.java b/emailcommon/src/com/android/emailcommon/service/PolicyServiceProxy.java
old mode 100644
new mode 100755
index a3b317e..26e820d
--- a/emailcommon/src/com/android/emailcommon/service/PolicyServiceProxy.java
+++ b/emailcommon/src/com/android/emailcommon/service/PolicyServiceProxy.java
@@ -49,24 +49,6 @@
     }
 
     @Override
-    public Policy clearUnsupportedPolicies(final Policy arg0) throws RemoteException {
-        setTask(new ProxyTask() {
-            public void run() throws RemoteException {
-                mReturn = mService.clearUnsupportedPolicies(arg0);
-            }
-        }, "clearUnsupportedPolicies");
-        waitForCompletion();
-        if (DEBUG_PROXY) {
-            Log.v(TAG, "clearUnsupportedPolicies: " + ((mReturn == null) ? "null" : mReturn));
-        }
-        if (mReturn == null) {
-            throw new ServiceUnavailableException("clearUnsupportedPolicies");
-        } else {
-            return (Policy)mReturn;
-        }
-    }
-
-    @Override
     public boolean isActive(final Policy arg0) throws RemoteException {
         setTask(new ProxyTask() {
             public void run() throws RemoteException {
@@ -85,48 +67,14 @@
     }
 
     @Override
-    public boolean isActiveAdmin() throws RemoteException {
+    public void setAccountPolicy(final long accountId, final Policy policy,
+            final String securityKey) throws RemoteException {
         setTask(new ProxyTask() {
             public void run() throws RemoteException {
-                mReturn = mService.isActiveAdmin();
+                mService.setAccountPolicy(accountId, policy, securityKey);
             }
-        }, "isActiveAdmin");
+        }, "setAccountPolicy");
         waitForCompletion();
-        if (DEBUG_PROXY) {
-            Log.v(TAG, "isActiveAdmin: " + ((mReturn == null) ? "null" : mReturn));
-        }
-        if (mReturn == null) {
-            throw new ServiceUnavailableException("isActiveAdmin");
-        } else {
-            return (Boolean)mReturn;
-        }
-    }
-
-    @Override
-    public boolean isSupported(final Policy arg0) throws RemoteException {
-        setTask(new ProxyTask() {
-            public void run() throws RemoteException {
-                mReturn = mService.isSupported(arg0);
-            }
-        }, "isSupported");
-        waitForCompletion();
-        if (DEBUG_PROXY) {
-            Log.v(TAG, "isSupported: " + ((mReturn == null) ? "null" : mReturn));
-        }
-        if (mReturn == null) {
-            throw new ServiceUnavailableException("isSupported");
-        } else {
-            return (Boolean)mReturn;
-        }
-    }
-
-    @Override
-    public void policiesRequired(final long arg0) throws RemoteException {
-        setTask(new ProxyTask() {
-            public void run() throws RemoteException {
-                mService.policiesRequired(arg0);
-            }
-        }, "policiesRequired");
     }
 
     @Override
@@ -147,15 +95,6 @@
         }, "setAccountHoldFlag");
     }
 
-    @Override
-    public void policiesUpdated(final long arg0) throws RemoteException {
-        setTask(new ProxyTask() {
-            public void run() throws RemoteException {
-                mService.policiesUpdated(arg0);
-            }
-        }, "policiesUpdated");
-    }
-
     // Static methods that encapsulate the proxy calls above
     public static boolean isActive(Context context, Policy policies) {
         try {
@@ -165,22 +104,6 @@
         return false;
     }
 
-    public static void policiesRequired(Context context, long accountId) {
-        try {
-            new PolicyServiceProxy(context).policiesRequired(accountId);
-        } catch (RemoteException e) {
-            throw new IllegalStateException("PolicyService transaction failed");
-        }
-    }
-
-    public static void policiesUpdated(Context context, long accountId) {
-        try {
-            new PolicyServiceProxy(context).policiesUpdated(accountId);
-        } catch (RemoteException e) {
-            throw new IllegalStateException("PolicyService transaction failed");
-        }
-    }
-
     public static void setAccountHoldFlag(Context context, Account account, boolean newState) {
         try {
             new PolicyServiceProxy(context).setAccountHoldFlag(account.mId, newState);
@@ -189,14 +112,6 @@
         }
     }
 
-    public static boolean isActiveAdmin(Context context) {
-        try {
-            return new PolicyServiceProxy(context).isActiveAdmin();
-        } catch (RemoteException e) {
-        }
-        return false;
-    }
-
     public static void remoteWipe(Context context) {
         try {
             new PolicyServiceProxy(context).remoteWipe();
@@ -205,17 +120,11 @@
         }
     }
 
-    public static boolean isSupported(Context context, Policy policy) {
+    public static void setAccountPolicy(Context context, long accountId, Policy policy,
+            String securityKey) {
         try {
-            return new PolicyServiceProxy(context).isSupported(policy);
-        } catch (RemoteException e) {
-        }
-        return false;
-     }
-
-    public static Policy clearUnsupportedPolicies(Context context, Policy policy) {
-        try {
-            return new PolicyServiceProxy(context).clearUnsupportedPolicies(policy);
+            new PolicyServiceProxy(context).setAccountPolicy(accountId, policy, securityKey);
+            return;
         } catch (RemoteException e) {
         }
         throw new IllegalStateException("PolicyService transaction failed");
diff --git a/emailcommon/src/com/android/emailcommon/utility/TextUtilities.java b/emailcommon/src/com/android/emailcommon/utility/TextUtilities.java
old mode 100644
new mode 100755
index 59f6fd2..0aa9190
--- a/emailcommon/src/com/android/emailcommon/utility/TextUtilities.java
+++ b/emailcommon/src/com/android/emailcommon/utility/TextUtilities.java
@@ -714,4 +714,15 @@
 
         return (CharSequence)sb;
    }
+
+    /**
+     * Determine whether two Strings (either of which might be null) are the same; this is true
+     * when both are null or both are Strings that are equal.
+     */
+    public static boolean stringOrNullEquals(String a, String b) {
+        if (a == null && b == null) return true;
+        if (a != null && b != null && a.equals(b)) return true;
+        return false;
+    }
+
 }
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 781144b..0114da8 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Boodskap weggegooi."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Boodskap as konsep gestoor."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Kan nie die aanhegsel vertoon nie."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Kan nie aanhegsel wys nie."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Kon nie aanhegsel \"<xliff:g id="FILENAME">%s</xliff:g>\" laai nie."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Open tans boodskap..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> boodskap geskuif na <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Kon een of meer aanhegsels nie aanstuur nie"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Aanhegsel nie aangestuur nie"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>-aanmelding het misluk"</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Aanmelding het misluk"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Kan nie aanmeld nie"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Die gebruikernaam of wagwoord vir <xliff:g id="ACCOUNT">%s</xliff:g> is verkeerd. Dateer hulle nou op?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Verstek rekening"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Stuur e-pos by verstek vanaf hierdie rekening"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Laai aanhegsels outomaties af"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Laai aanhegsels outomaties af wanneer aan WiFi gekoppel is"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Laai aanhegsels af"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Laai aanhegsels outomaties af na onlangse boodskappe via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-poskennisgewings"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Sinkroniseerfrekwensie, kennisgewings, ens."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Wys in statusbalk wanneer e-pos aankom"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groot"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Reusagtig"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Antwoord almal"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Maak \"Antwoord almal\" die verstek vir reageer op boodskappe"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Laai verstek vir \"Wys prente\" terug"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Laai verstek terug vir alle senders (moenie prente outomaties wys nie)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Maak \"Antwoord-aan-almal\" die verstek opsie vir boodskapantwoorde"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Vra om prente te wys"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Prente in boodskappe sal nie outomaties gewys word nie"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Wys prente\" uitgevee."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> van <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Wag vir sinkronisasie"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Jou e-posadres sal binnekort verskyn."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Raak ikoon om te verander."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Gekombineerde inkassie"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Ongelees"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Gester"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ed952ae..cde79d0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"መልዕክት ተወግዷል።"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"መልዕክትእንደረቂቅ ተቀምጧል።"</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"ዓባሪውን ማሳየት አይቻልም::"</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"ዓባሪውን ማሳየት አይቻልም::"</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"ዓባሪ \" <xliff:g id="FILENAME">%s</xliff:g>\"ን መስቀል አልተቻለም::"</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"መልዕክት በመክፈት ላይ...."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> መልዕክት ወደ<xliff:g id="MAILBOX_NAME">%2$s</xliff:g> ዞርዋል"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"አንድ ወይም ከዛ በላይ ዓባሪዎችን ለማስተላለፍ አልተቻለም::"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"አባሪ አልተላለፈም"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> በመለያ መግባት ተሰናክሏል::"</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"በመለያ መግባት ተሰናክሏል"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">" የ<xliff:g id="ACCOUNT">%s</xliff:g> ተጠቃሚ ስም ወይም ይለፍቃል የተሳሳተ ነው። አሁን ይዘምኑ?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"ነባሪ መለያ"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"ከዚህ መለያ በነባሪኢሜይል ላክ"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"አባሪዎችን በራስ-አውርድ"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"ወደ Wi-Fi ስትገናኝ አባሪዎችን በራስ ሰር አውርድ"</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="6301122709602752038">"ኢሜይል ሲደርስ በሁኔታ አሞሌ ውስጥ አሳውቅ"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"ትልቅ"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ግዙፍ"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"ለሁሉም ምላሽ ስጥ"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"ለመልዕክቶች ለመመለስ \'ለሁሉም መልስ\'ን ነባሪ አድርግ"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"ለ\"ምስሎችን አሳይ\" ነባሪ እነበረበት መልስ"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"ለሁሉም ላኪዎች(ፎቶዎችን በራስ ሰር አታሳይ) ነባሪ እነበረበት መልስ"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"“ለሁሉም መልስ”ን ለመልዕክት መልሶች ነባሪ አድርግ"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"ስዕሎችን ለማሳየት ጠይቅ"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"በመልዕክቶች ውስጥ ስዕሎች በራስሰር  አይታዩም፡፡"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"ፎቶዎች አሳይ\" ጠርቷል።"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> ከ <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"አስምር በመጠበቅ ላይ"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"ያንተ ኢሜይል በቅርቡ ብቅ ይላል::"</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"ለመለወጥ አዶ ንካ::"</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"የተቀላቀለ ገቢ መልዕክት"</string>
     <string name="widget_unread" msgid="4404711399009077833">"ያልተነበበ"</string>
     <string name="widget_starred" msgid="8290352707134011791">"ኮከብ የተደረገባቸው"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d9e4697..3a27132 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"تمّ إلغاء الرسالة."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"تمّ حفظ الرسالة كمسودة."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"لا يمكن عرض المرفق."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"لا يمكن عرض المرفق."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"تعذر تحميل المرفق \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"جارٍ فتح الرسالة…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"تم نقل رسالة <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> إلى <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"تتعذر إعادة توجيه واحد أو أكثر من المرفقات."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"لم تتم إعادة توجيه المرفق"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"أخفق تسجيل الدخول إلى <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"أخفق تسجيل الدخول"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"اسم المستخدم أو كلمة مرور <xliff:g id="ACCOUNT">%s</xliff:g> غير صحيحة. هل تريد التحديث الآن؟"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"الحساب الافتراضي"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"إرسال البريد الإلكتروني من هذا الحساب افتراضيًا"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"تنزيل تلقائي للمرفقات"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"تنزيل المرفقات تلقائيًا عند الاتصال بشبكة WiFi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"تنزيل المرفقات"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"تنزيل مرفقات الرسائل الأخيرة تلقائيًا عبر WiFi"</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="6301122709602752038">"التنبيه في شريط النظام عند استلام رسالة إلكترونية"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"كبير"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ضخم"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"الرد على الكل"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"جعل \"الرد على الكل\" هو الإعداد الافتراضي للرد على الرسائل"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"استعادة الإعداد الافتراضي لـ \"إظهار الصور\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"استعادة الإعداد الافتراضي لجميع المرسلين (عدم إظهار الصور تلقائيًا)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"جعل \"الرد على الكل\" هو الإعداد الافتراضي للرد على الرسائل"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"طلب عرض الصور"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"لن يتم عرض الصور الواردة في الرسائل تلقائيًا"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"تم إلغاء تحديد \"إظهار الصور\"."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> من <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"في انتظار المزامنة"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"ستظهر رسالتك الإلكترونية قريبًا."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"المس الرمز للتغيير."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"بريد وارد مجمّع"</string>
     <string name="widget_unread" msgid="4404711399009077833">"غير مقروءة"</string>
     <string name="widget_starred" msgid="8290352707134011791">"الرسائل المميزة بنجمة"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index d4ff47b..ab6c4d9 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -128,7 +128,7 @@
     <string name="message_compose_cc_label" msgid="5608567337432359209">"Як:"</string>
     <string name="message_compose_bcc_label" msgid="8619598628773345338">"Ск:"</string>
     <string name="message_compose_subject_label" msgid="1592314202889683309">"Тема:"</string>
-    <!-- outdated translation 7575406246484103697 -->     <string name="message_compose_body_hint" msgid="3864004548670233396">"Ново съобщение"</string>
+    <string name="message_compose_body_hint" msgid="3864004548670233396">"Напишете имейл"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Оригинално съобщение --------"\n"Тема: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"От: <xliff:g id="SENDER">%2$s</xliff:g>"\n"До: <xliff:g id="TO">%3$s</xliff:g>"\n"Як: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> написа:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Цитиран текст"</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Съобщението е отхвърлено."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Съобщението е запазено като чернова."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Прикаченият файл не може да се покаже."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Прикаченият файл не може да се покаже."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Прикаченият файл „<xliff:g id="FILENAME">%s</xliff:g>“ не можа да се зареди."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Съобщението се отваря…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> съобщение е преместено в/ъв <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Един или повече прикачени файла не можаха да се препратят."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Прикаченото не бе препратено"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Не влязохте: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Влизането не бе успешно"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Потребителското име или паролата за <xliff:g id="ACCOUNT">%s</xliff:g> не са правилни. Искате ли да ги актуализирате сега?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Основен профил"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Изпращане на имейл от този профил по подразбиране"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Автоизтегляне на прикачените"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Автоматично изтегляне на прикачените файлове при връзка с WiFi"</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="6301122709602752038">"Известие в системната лента при получаване на имейл"</string>
@@ -437,7 +436,7 @@
     <item msgid="4415205108584620118">"Малък шрифт на текста"</item>
     <item msgid="4550219696381691112">"Нормален шрифт на текста"</item>
     <item msgid="6227813549949219991">"Голям шрифт на текста"</item>
-    <item msgid="1197917420815786571">"Огромен шрифт на текста"</item>
+    <item msgid="1197917420815786571">"Огромен текст"</item>
   </string-array>
     <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Размер на текста на съобщенията"</string>
     <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Миниатюрен"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Голям"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Огромен"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Отговор до всички"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"„Отговор до всички“ да е стандартната опция при отговор на съобщения"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Възстановяване на стандартните настройки за „Показване на снимките“"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Възстановяване на стандартните настройки за всички податели (снимките да не се показват автоматично)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"„Отговор до всички“ да е стандартната опция при отговор на съобщения"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Питане дали снимките да се показват"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Снимките в съобщенията няма да бъдат показвани автоматично"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"„Показване на снимките“ е изчистено."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> от <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Изчаква се синхронизиране"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Имейлът ви ще се покаже скоро."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Докосн. за промяна."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Комбинирана вх. поща"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Непрочетени"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Със звезда"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index f08b4ae..28461f3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Missatge descartat."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Missatge desat com a esborrany."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"No es pot mostrar el fitxer adjunt."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"No es pot mostrar el fitxer adjunt."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"No s\'ha pogut carregar el fitxer adjunt \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"S\'està obrint el missatge..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> missatge mogut a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"No s\'han pogut reenviar un o més fitxers adjunts."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"El fitxer adjunt no s\'ha reenviat"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"L\'inici de sessió de <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ha fallat."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"L\'inici de sessió ha fallat"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"No es pot iniciar la sessió"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"El nom d\'usuari o la contrasenya de <xliff:g id="ACCOUNT">%s</xliff:g> són incorrectes. Vols actualitzar-los ara?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Compte predeterminat"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Envia correu electrònic des d\'aquest compte de manera predeterminada"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Baixada autom. fitxers adjunts"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Baixa fitxers adjunts automàticament quan hi hagi connexió Wi-Fi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Baixada de fitxers adjunts"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Baixa automàtic. fitxers adjunts de missatges recents per Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificacions de correu electrònic"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Freqüència de sincronització, notificacions, etc."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notifica a la barra del sistema quan arribi un correu electrònic"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Gran"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Respon a tots"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Defineix \"Respon a tots\" com a opció predeterminada per respondre missatges"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Restaura el valor predeterminat de \"Mostra les imatges\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Restaura el valor predeterminat de tots els remitents (no mostris les fotos automàticament)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Fes que \"Respon a tots\" sigui l\'opció predet. per respondre missatges"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Pregunta per mostrar imatges"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"No es mostraran automàticament les imatges dels missatges"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"S\'ha esborrat \"Mostra les imatges\"."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"S\'està esperant per sincronitzar"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"El teu correu electrònic apareixerà aviat."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Toca la icona per canviar."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Safata d\'entrada combinada"</string>
     <string name="widget_unread" msgid="4404711399009077833">"No llegits"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Destacats"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0529f96..e6f2b64 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Zpráva byla zrušena."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Zpráva byla uložena jako koncept."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Přílohu nelze zobrazit."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Přílohu nelze zobrazit."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Přílohu <xliff:g id="FILENAME">%s</xliff:g> nelze načíst."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Otevírání zprávy..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> zpráva byla přesunuta do schránky <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nepodařilo se přeposlat jednu nebo více příloh."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Příloha nebyla přeposlána"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Přihlášení selhalo: <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Přihlášení selhalo"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Přihlášení se nezdařilo."</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Uživatelské jméno nebo heslo pro účet <xliff:g id="ACCOUNT">%s</xliff:g> je nesprávné. Chcete údaje aktualizovat?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Výchozí účet"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Ve výchozím nastavení odesílat e-maily z tohoto účtu"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Automaticky stahovat přílohy"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Během připojení k síti Wi-Fi automaticky stahovat přílohy"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Stáhnout přílohy"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automaticky stahovat přílohy posledních zpráv pomocí sítě Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mailová upozornění"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frekvence synchronizace, oznámení apod."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Oznámit příchod e-mailu na systémové liště"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Velký"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Velmi velký"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odpovědět všem"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Nastavit volbu Odpovědět všem jako výchozí volbu odpovídání na zprávy"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Obnovit výchozí nastavení možnosti Zobrazovat obrázky"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Obnovit výchozí nastavení pro všechny odesílatele (nezobrazovat obrázky automaticky)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Nastavit volbu Odpovědět všem jako výchozí volbu odpovídání na zprávy"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Dotazovat se na zobrazování obrázků"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Obrázky ve zprávách se automaticky nezobrazí"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Nastavení Zobrazit obrázky bylo smazáno."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Čekání na synchronizaci"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Vaše e-maily se brzy zobrazí."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Změníte klepnutím na ikonu."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Všechny Doručené p."</string>
     <string name="widget_unread" msgid="4404711399009077833">"Nepřečtené"</string>
     <string name="widget_starred" msgid="8290352707134011791">"S hvězdičkou"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b95d89c..b403382 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Besked kasseret."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Beskeden er gemt som kladde."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Den vedhæftede fil kan ikke vises."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Den vedhæftede fil kan ikke vises."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Den vedhæftede fil \"<xliff:g id="FILENAME">%s</xliff:g>\" kunne ikke indlæses."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Åbner besked..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> beskeder er flyttet til <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"En eller flere vedhæftede filer kunne ikke videresendes."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Vedhæftet fil er ikke sendt"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> kunne ikke logge ind."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Login mislykkedes"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Login mislykkedes"</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>
@@ -232,7 +231,7 @@
     <string name="message_view_move_to_newer" msgid="2190862552581773765">"Nyere"</string>
     <string name="message_view_move_to_older" msgid="4993043091356700890">"Ældre"</string>
     <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string>
-    <string name="account_setup_basics_title" msgid="3578333196594678422">"Konfiguration af konto"</string>
+    <string name="account_setup_basics_title" msgid="3578333196594678422">"Kontoindstillinger"</string>
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Tilføj en Exchange-konto"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Tilføj en Exchange ActiveSync-konto"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-mailkonto"</string>
@@ -250,15 +249,15 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Henter kontooplysninger ..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Kontrollerer indstillinger for indgående server ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Kontrollerer indstillinger for udgående server ..."</string>
-    <string name="account_setup_names_title" msgid="8483517350241119291">"Konfiguration af konto"</string>
+    <string name="account_setup_names_title" msgid="8483517350241119291">"Kontoindstillinger"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Din konto er oprettet, og der er e-mail på vej."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Giv kontoen et navn (valgfrit)"</string>
     <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Dit navn (vist på udgående beskeder)"</string>
     <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Dette felt må ikke være tomt."</string>
-    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Konfiguration af konto"</string>
+    <string name="account_setup_account_type_title" msgid="7156551693961182124">"Kontoindstillinger"</string>
     <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Kontotype"</string>
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hvilken slags konto er dette?"</string>
-    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Konfiguration af konto"</string>
+    <string name="account_setup_incoming_title" msgid="6796626791039136005">"Kontoindstillinger"</string>
     <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Indstillinger for indgående server"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Brugernavn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Adgangskode"</string>
@@ -276,7 +275,7 @@
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Når jeg sletter fra Indbakke"</string>
     <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"Præfiks for IMAP-sti"</string>
     <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valgfrit"</string>
-    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Konfiguration af konto"</string>
+    <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Kontoindstillinger"</string>
     <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Indstillinger for udgående server"</string>
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
@@ -284,7 +283,7 @@
     <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Kræver login"</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brugernavn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Adgangskode"</string>
-    <string name="account_setup_exchange_title" msgid="396004732514751781">"Konfiguration af konto"</string>
+    <string name="account_setup_exchange_title" msgid="396004732514751781">"Kontoindstillinger"</string>
     <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Serverindstillinger"</string>
     <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string>
     <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domæne\\brugernavn"</string>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Brugernavn eller adgangskode for <xliff:g id="ACCOUNT">%s</xliff:g> er forkert. Vil du opdatere dem nu?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Send e-mail fra denne konto som standard"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Download vedhæftning automatisk"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Download automatisk vedhæftede filer ved Wi-Fi-forbindelse"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Download vedhæftede filer"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Download autom. vedhæftede filer i de seneste beskeder via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail-beskeder"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synkroniseringsinterval, meddelelser osv."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Underret i statuslinjen, når der kommer e-mail"</string>
@@ -412,7 +411,7 @@
     <string name="toast_mailbox_not_found" msgid="4960014581292378895">"Mappen blev ikke fundet. Den kan være blevet fjernet."</string>
     <string name="provider_note_live" msgid="2995297671709325333">"Det er kun nogle \"Plus\"-konti med POP-adgang, der tillader, at dette program opretter forbindelse. Hvis du ikke kan logge ind med din rigtige e-mail-adresse og adgangskode, har du muligvis ikke en betalt \"Plus\"-konto. Åbn webbrowseren igen for at få adgang til disse e-mail-konti."</string>
     <string name="provider_note_t_online" msgid="1630642061431427894">"Inden du konfigurerer denne e-mail-konto, skal du gå til T-Onlines websted og oprette en adgangskode for e-mail-adgang via POP3."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"Virksomhed"</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Exchange"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="3673792980526246177">"Kontoen kunne ikke oprettes. Prøv igen."</string>
     <string name="device_admin_label" msgid="8680224994637869414">"E-mail"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kæmpestor"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Svar alle"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Gør \"Svar alle\" til standard, når du besvarer beskeder"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Gendan standard for \"Vis billeder\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Gendan standard for alle afsendere (vis ikke billeder automatisk)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Gør \"Svar alle\" til standardsvar for meddelelser"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Bed om at vise billeder"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Billeder i meddelelser vises ikke automatisk"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Vis billeder\" er ryddet."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> af <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Venter på synkronisering"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Dine e-mails dukker snart op."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Tryk for at skifte."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Kombineret indbakke"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Ulæste"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Stjernemarkeret"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f3d10ac..715f178 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Nachricht gelöscht"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Nachricht als Entwurf gespeichert"</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Anhang kann nicht angezeigt werden."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Der Anhang kann nicht angezeigt werden."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Der Anhang \"<xliff:g id="FILENAME">%s</xliff:g>\" kann nicht geladen werden."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Nachricht wird geöffnet..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> Nachricht verschoben in: <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Mindestens ein Anhang wurde nicht weitergeleitet."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Anhang nicht weitergeleitet"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Fehler beim Anmelden in <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Fehler bei Anmeldung"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Anmeldung nicht möglich"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Der Nutzername oder das Passwort für <xliff:g id="ACCOUNT">%s</xliff:g> ist falsch. Jetzt aktualisieren?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"E-Mails standardmäßig von diesem Konto senden"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Anhänge autom. herunterladen"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatischer Download von Anhängen bei WLAN-Verbindung"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Anhänge herunterladen"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Anhänge neuer Nachrichten automatisch über WLAN herunterladen"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-Mail-Benachrichtigung"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synchronisierungshäufigkeit, Benachrichtigungen usw."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Bei E-Mail-Eingang Benachrichtigung in der Systemleiste"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groß"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sehr groß"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Allen antworten"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"\"Allen antworten\" als Standard für die E-Mail-Beantwortung festlegen"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Auf Standardeinstellung für \"Bilder anzeigen\" zurücksetzen"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Auf Standardeinstellung für alle Absender zurücksetzen (Bilder nicht automatisch anzeigen)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"\"Allen antworten\" als Standard für die E-Mail-Beantwortung festlegen"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Anzeige der Bilder anfordern"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Bilder in E-Mails werden nicht automatisch angezeigt."</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Bilder anzeigen\" gelöscht"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> von <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Warten auf Synchronisierung"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Ihre E-Mail wird in Kürze angezeigt."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Symbol zum Wechseln berühren."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Kombinierter Posteingang"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Ungelesen"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Markiert"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0276452..a79300a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Το μήνυμα απορρίφθηκε."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Το μήνυμα αποθηκεύτηκε ως πρόχειρο."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Δεν είναι δυνατή η εμφάνιση της επισύναψης."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Δεν είναι δυνατή η εμφάνιση του συνημμένου."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Δεν ήταν δυνατή η φόρτωση του συνημμένου \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Άνοιγμα μηνύματος…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> μήνυμα μετακινήθηκε σε <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Δεν ήταν δυνατή η προώθηση μίας ή περισσότερων επισυνάψεων."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Η επισύναψη δεν προωθήθηκε"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Αποτυχία σύνδεσης <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Η σύνδεση απέτυχε"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Το όνομα χρήστη ή ο κωδικός πρόσβασης για τον λογαριασμό <xliff:g id="ACCOUNT">%s</xliff:g> είναι λανθασμένα. Θέλετε να τα ενημερώσετε τώρα;"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Προεπιλεγμένος λογαριασμός"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από αυτόν τον λογαριασμό από προεπιλογή"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Αυτόματη λήψη συνημμένων"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Αυτόματη λήψη συνημμένων κατά τη σύνδεση σε δίκτυο WiFi"</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="6301122709602752038">"Εμφάνιση ειδοποίησης στη γραμμή συστήματος κατά τη λήψη μηνύματος ηλεκτρονικού ταχυδρομείου"</string>
@@ -437,7 +436,7 @@
     <item msgid="4415205108584620118">"Μικρό κείμενο"</item>
     <item msgid="4550219696381691112">"Κείμενο κανονικού μεγέθους"</item>
     <item msgid="6227813549949219991">"Μεγάλο κείμενο"</item>
-    <item msgid="1197917420815786571">"Πάρα πολύ μεγάλο κείμενο"</item>
+    <item msgid="1197917420815786571">"Τεράστιο κείμενο"</item>
   </string-array>
     <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Μέγεθος κειμένου μηνύματος"</string>
     <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Πολύ μικρό"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Μεγάλο"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Πολύ μεγάλο"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Απάντηση σε όλους"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Ορισμός \"Απάντηση σε όλους\" ως προεπιλογή για απάντηση σε μηνύματα."</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Επαναφορά προεπιλογής για την επιλογή \"Εμφάνιση εικόνων\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Επαναφορά προεπιλογών για όλους τους αποστολείς (να μην εμφανίζονται εικόνες αυτόματα)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Ορισμός \"Απάντηση σε όλους\" ως προεπιλογή για απαντήσεις σε μηνύματα."</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Ερώτηση για εμφάνιση εικόνων"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Οι εικόνες σε μηνύματα δεν θα εμφανίζονται αυτόματα"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Καταργήθηκε η επιλογή του στοιχείου \"Εμφάνιση εικόνων\"."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Αναμονή για συγχρονισμό"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Η ηλεκτρονική αλληλογραφία σας θα εμφανιστεί σύντομα."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Αγγίξτε το εικονίδιο για αλλαγή."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Συνδ. προβ. εισερχ."</string>
     <string name="widget_unread" msgid="4404711399009077833">"Μη αναγνωσμένα"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Με αστέρι"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 5ebebd5..c036543 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Message discarded."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Message saved as draft."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Can\'t display the attachment."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Can\'t display attachment."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Couldn\'t load attachment \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Opening message…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> message moved to <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Could not forward one or more attachments"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Attachment not forwarded"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> sign-in failed."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Sign-in failed"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Couldn\'t sign in"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"The username or password for <xliff:g id="ACCOUNT">%s</xliff:g> is incorrect. Update them now?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Default account"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Send email from this account by default"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Auto-download attachments"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatically download attachments when connected to Wi-Fi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Download attachments"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Auto-download attachments to recent messages via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Email notifications"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Sync frequency, notifications, etc."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notify in System bar when emails arrive"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Large"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Huge"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Reply all"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Make \'Reply all\' the default for responding to messages"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Restore default for \"Show pictures\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Restore default for all senders (don\'t show pictures automatically)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Make \"Reply all\" the default for message replies"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Ask to show pictures"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Pictures in messages won\'t be shown automatically"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Show pictures\" cleared."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Waiting for sync"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Your email will appear soon."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Touch icon to change."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Combined Inbox"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Unread"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Starred"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index fcb648f..944b1c3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mensaje descartado."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mensaje guardado como borrador."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"No se puede mostrar el archivo adjunto."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"No se puede mostrar el archivo adjunto."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"No se ha podido cargar el archivo adjunto \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Abriendo el mensaje…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensaje trasladado a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"No se pudieron enviar uno o más adjuntos."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"No se reenvió el archivo adjunto"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Error al acceder a <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Error al acceder"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"No se ha podido acceder."</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"El nombre de usuario o la contraseña de <xliff:g id="ACCOUNT">%s</xliff:g>no es correcta. ¿Deseas actualizarlos ahora?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Cuenta predeterminada"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar mensaje de correo electrónico desde esta cuenta de forma predeterminada"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descargar archivos adj. automat."</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descargar adjuntos automáticamente al conectar a una red Wi-Fi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descargar archivos adjuntos"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descarga automática por Wi-Fi de los adjuntos de msjs. recientes"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificaciones de correo electrónico"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frecuencia de sincronización, notificaciones, etc."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar en la barra de estado cuando llegue un correo electrónico"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Responder a todos"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Elige \"Responder a todos\" como opción predeterminada para los mensajes."</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Restablecer predeterminado para \"Mostrar imágenes\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Restablecer predeterminado para todos los remitentes (no mostrar imágenes automáticamente)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Predetermina \"Responder a todos\" para las respuestas de mensajes."</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Preguntar antes de mostrar imágenes"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Las imágenes de los mensajes no se mostrarán automáticamente."</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Se borró \"Mostrar imágenes\"."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Esperando para sincronizar"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Tu correo electrónico aparecerá en breve."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Toca el ícono para cambiar."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Combinación de Recibidos"</string>
     <string name="widget_unread" msgid="4404711399009077833">"No leídos"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Destacados"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 529a027..6e803f3 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -128,7 +128,7 @@
     <string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
     <string name="message_compose_bcc_label" msgid="8619598628773345338">"CCO:"</string>
     <string name="message_compose_subject_label" msgid="1592314202889683309">"Asunto:"</string>
-    <string name="message_compose_body_hint" msgid="3864004548670233396">"Redactar correo electrónico"</string>
+    <string name="message_compose_body_hint" msgid="3864004548670233396">"Redactar correo"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Original Message --------"\n"Subject: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"From: <xliff:g id="SENDER">%2$s</xliff:g>"\n"To: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> wrote:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Texto entre comillas"</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mensaje descartado"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mensaje guardado como borrador"</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"No se puede mostrar el archivo adjunto."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"No se puede mostrar el archivo adjunto."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"No se ha podido cargar el archivo adjunto \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Abriendo mensaje…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"Se ha movido <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensaje a <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>."</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Error al enviar uno o varios archivos adjuntos"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Archivo adjunto no reenviado"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Error al iniciar sesión en <xliff:g id="ACCOUNT_NAME">%s</xliff:g>"</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Error al iniciar sesión"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Error al 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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"El nombre de usuario o la contraseña de <xliff:g id="ACCOUNT">%s</xliff:g> son incorrectos. ¿Quieres actualizarlos ahora?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Cuenta predeterminada"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar correo electrónico desde esta cuenta de forma predeterminada"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descargar adjuntos automáticamente"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descargar adjuntos automáticamente al conectar a una red Wi-Fi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descargar archivos adjuntos"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descarga automática de adjuntos de mensajes recientes por Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificaciones de correo"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frecuencia de sincronización, notificaciones, etc."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar en barra del sistema cuando llegue un correo electrónico"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Responder a todos"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Elige Responder a todos como opción predeterminada para los mensajes"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Restaurar valores predeterminados para Mostrar imágenes"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Restaurar valores predeterminados para todos los remitentes (no mostrar imágenes automáticamente)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Elegir \"Responder a todos\" como opción predeterminada para los mensajes"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Preguntar para mostrar imágenes"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Las imágenes de los mensajes no se mostrarán automáticamente."</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Se ha restaurado la opción Mostrar imágenes."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Esperando para sincronizar"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Tu correo electrónico aparecerá en breve."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Toca para cambiar"</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Combinación de recibidos"</string>
     <string name="widget_unread" msgid="4404711399009077833">"No leídos"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Destacados"</string>
diff --git a/res/values-es/uploader.xml b/res/values-es/uploader.xml
index c77ad1b..2317ddd 100644
--- a/res/values-es/uploader.xml
+++ b/res/values-es/uploader.xml
@@ -29,7 +29,7 @@
     <string name="format_progress_percent" msgid="1420459750508777491">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
     <string name="account" msgid="5199161365824352613">"Cuenta"</string>
     <string name="upload" msgid="2615541458361216022">"Subir"</string>
-    <string name="ok" msgid="2516349681897895312">"ACEPTAR"</string>
+    <string name="ok" msgid="2516349681897895312">"Aceptar"</string>
     <string name="cancel" msgid="1207103189404543868">"Cancelar"</string>
     <string name="uploading_to" msgid="3986362895940069510">"Subiendo a "<b>"%s"</b></string>
     <string name="uploading_for" msgid="1735961974624867111">" para "<b>"%s"</b></string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e8dfa97..94d9db9 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -188,7 +188,7 @@
     <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"این پیوست یک برنامه است. باید قبل از نصب آن، منبع‌های ناشناس را در تنظیمات &gt; برنامه‌ها بررسی کنید."</string>
     <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"نمی‌توان برنامه‎ها را به طور مستقیم از ایمیل نصب کرد. ابتدا این برنامه را ذخیره کنید و سپس آنرا با استفاده از برنامه \"دانلودها\" نصب کنید."</string>
     <string name="attachment_not_found" msgid="7155322700141145123">"نمی‌توان پیوست را دانلود کرد."</string>
-    <string name="message_decode_error" msgid="5016042255170947834">"هنگام رمزگشایی پیام خطایی روی داد."</string>
+    <string name="message_decode_error" msgid="5016042255170947834">"هنگام رمزگشایی پیام، خطایی روی داد."</string>
     <string name="eml_view_title" msgid="8827210108543430336">"مشاهده <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="message_delete_dialog_title" msgid="6603370107217227252"></string>
   <plurals name="message_delete_confirm">
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"پیام رد شد."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"پیام به عنوان پیش نویس ذخیره شد."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"نمایش پیوست امکانپذیر نیست."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"نمایش پیوست امکان‌پذیر نیست."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"نمی‌توان پیوست \"<xliff:g id="FILENAME">%s</xliff:g>\" را بارگیری کرد."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"درحال بازکردن پیام..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> پیام به <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> انتقال یافت"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"یک یا چند پیوست باز ارسال نشد."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"پیوست هدایت نشد"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"ورود به سیستم <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ناموفق بود."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"ورود به سیستم ناموفق بود"</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>
@@ -324,13 +323,13 @@
     <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"استفاده از پیش فرض حساب"</string>
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"نام کاربری یا رمز ورود نادرست است."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"نام کاربری یا رمز ورود نادرست است. "\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
-    <string name="account_setup_failed_dlg_certificate_message" msgid="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_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="1280569002588325367">"گواهی سرویس‌ گیرنده مورد نیاز است. اتصال به سرور با گواهی سرویس‌ گیرنده؟"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"گواهینامه نامعتبر است و یا غیر قابل‌دسترسی است."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"سرور با یک خطا پاسخ داد. لطفاً نام کاربری و گذرواژه خود را بررسی کرده و دوباره امتحان کنید."</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_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>
@@ -343,7 +342,7 @@
     <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="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> از شما می‌خواهد تنظیمات امنیتی خود را به‌روزرسانی کنید."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"تنظیمات امنیتی حساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" باید به روزرسانی شود."</string>
     <string name="security_notification_content_title" msgid="3352841884304076235">"به روزرسانی امنیتی لازم است"</string>
     <string name="account_security_title" msgid="3511543138560418587">"امنیت دستگاه"</string>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"نام کاربری یا رمز ورود <xliff:g id="ACCOUNT">%s</xliff:g> نادرست است. اکنون آنها را به روزرسانی می کنید؟"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"حساب پیش فرض"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"ارسال ایمیل از این حساب به صورت پیش فرض"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"دانلود خودکار پیوست ها"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"دانلود خودکار پیوست‌ها هنگام اتصال به WiFi"</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="6301122709602752038">"ورود ایمیل در نوار سیستم اعلام شود"</string>
@@ -423,7 +422,7 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> نتیجه از <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"تنظیمات"</string>
-    <string name="header_label_general_preferences" msgid="9204600297009680176">"کلی"</string>
+    <string name="header_label_general_preferences" msgid="9204600297009680176">"عمومی"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"برنامه کاربردی"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"پیشرفته خودکار"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"انتخاب کنید بعد از حذف یک پیام، چه صفحه‌ای نشان داده شود"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"بزرگ"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"بسیار بزرگ"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"پاسخ به همه"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"\"پاسخ به همه\" پیش فرض پاسخگویی به پیام‌ها شود"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"بازیابی پیش فرض برای \"نمایش تصاویر\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"بازیابی پیش فرض برای همه ارسال کننده ها (تصاویر به صورت خودکار نشان داده نشود)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"\"پاسخ به همه\" را پیش‌فرض پاسخ‌های پیام قرار دهید"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"درخواست جهت نشان دادن تصاویر"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"تصاویر در پیام‌ها به صورت خودکار نشان داده نخواهد شد"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"نمایش تصاویر\" پاک شد."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> از <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"در انتظار همگام سازی"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"ایمیل شما به زودی ظاهر خواهد شد."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"برای تغییر نماد را لمس کنید."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"صندوق ورودی ترکیبی"</string>
     <string name="widget_unread" msgid="4404711399009077833">"خوانده نشده"</string>
     <string name="widget_starred" msgid="8290352707134011791">"ستاره دار"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c813141..395c839 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Viesti hylätty."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Viesti tallennettiin luonnokseksi."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Liitetiedostoa ei voi näyttää."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Liitetiedostoa ei voi näyttää."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Liitettä <xliff:g id="FILENAME">%s</xliff:g> ei voitu ladata."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Avataan viestiä..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> viesti siirretty kansioon <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Vähintään yhden liitteen edelleenlähettäminen epäonnistui."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Liitettä ei lähetetty edelleen"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Kirjautuminen tiliin <xliff:g id="ACCOUNT_NAME">%s</xliff:g> epäonnistui."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Kirjautuminen epäonnistui"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Kirjautuminen ei onnistu"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> t"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> t"</item>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Tilin <xliff:g id="ACCOUNT">%s</xliff:g> käyttäjänimi tai salasana on virheellinen. Päivitetäänkö?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Oletustili"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Lähetä sähköposti oletuksena tältä tililtä"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Lataa liitetiedostot automaattisesti"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Lataa liitteet automaattisesti wifi-yhteyden ollessa käytössä."</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Lataa liitetiedostoja"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Lataa viimeaikaisten viestien liitteet wifi-yhteyden kautta."</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Sähköposti-ilmoitukset"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synkronoinnin tiheys, ilmoitukset jne."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Ilmoita tilarivissä, kun sähköpostiviesti saapuu"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Suuri"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Hyvin suuri"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Vastaa kaikille"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Aseta viesteihin vastaamisen oletusvalinnaksi Vastaa kaikille"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Palauta Näytä kuvat -oletusasetukset"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Palauta kaikkien lähettäjien oletukset (kuvia ei näytetä automaattisesti)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Aseta viesteihin vastaamisen oletusvalinnaksi Vastaa kaikille."</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Kysy lupa kuvien näyttämiseen"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Kuvien viestit eivät näy automaattisesti."</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Näytä kuvat poistettu."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Odotetaan synkronointia"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Sähköposti tulee näkyviin pian."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Muuta: kosketa kuvak."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Yhd. postilaatikko"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Lukemattomat"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Tähdelliset"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index df19574..6cd9676 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -67,7 +67,7 @@
     <item quantity="one" msgid="320885379869442589">"Déplacer le message"</item>
     <item quantity="other" msgid="371256717624461324">"Déplacer des messages"</item>
   </plurals>
-    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"Le ou les messages ne peuvent pas être déplacés, car cette action n\'est pas compatible avec les comptes POP3."</string>
+    <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"Les messages ne peuvent pas être déplacés, car cette action n\'est pas compatible avec les comptes POP3."</string>
     <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Impossible de déplacer le message, car la sélection comprend plusieurs comptes."</string>
     <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Impossible de déplacer les messages se trouvant dans les dossiers \"Brouillons\", \"Boîte d\'envoi\" et \"Messages envoyés\"."</string>
   <plurals name="notification_new_one_account_fmt">
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Message supprimé."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Brouillon enregistré"</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Impossible d\'afficher la pièce jointe."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Impossible d\'afficher la pièce jointe."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Impossible de charger la pièce jointe \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Ouverture du message…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> message déplacé vers <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Impossible de transférer une ou plusieurs pièces jointes."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Pièce jointe non transférée"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Échec de la connexion au compte <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Échec de la connexion"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Impossible de se connecter"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
@@ -238,7 +237,7 @@
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Compte de messagerie"</string>
     <string name="accounts_welcome" msgid="1491126253077950685">"Vous pouvez configurer une messagerie pour la plupart des comptes en quelques étapes seulement."</string>
     <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Vous pouvez configurer un compte Exchange en quelques étapes seulement."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Vous pouvez configurer un compte ActiveSync Exchange en quelques étapes seulement."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Vous pouvez configurer un compte Exchange ActiveSync en quelques étapes seulement."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Adresse e-mail"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Mot de passe"</string>
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Par défaut, envoyer les e-mails avec ce compte"</string>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Le nom d\'utilisateur ou le mot de passe du compte <xliff:g id="ACCOUNT">%s</xliff:g> est incorrect. Mettre à jour maintenant ?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Compte par défaut"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Par défaut, envoyer les e-mails avec ce compte"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Téléch. pièces jointes automatiquement"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Télécharger auto. pièces jointes si connecté à un réseau Wi-Fi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Télécharger les pièces jointes"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Téléch. auto des pièces jointes aux messages récents via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notifications"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Fréquence de synchronisation, notifications, etc."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Afficher une notification dans la barre système à la réception d\'e-mails"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Très grande"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Répondre à tous"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Utiliser \"Répondre à tous\" par défaut pour répondre aux messages"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Restaurer les valeurs par défaut pour l\'option \"Afficher les images\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Restaurer les valeurs par défaut pour tous les expéditeurs (ne pas afficher les images automatiquement)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Utiliser \"Répondre à tous\" par défaut pour répondre aux messages"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Demander avant d\'afficher les images"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Les images contenues dans les messages ne s\'afficheront pas automatiquement."</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Option \"Afficher les images\" désactivée."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> sur <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"En attente de synchronisation"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Votre e-mail va bientôt s\'afficher."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Appuyez pour changer."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Boîte réception combinée"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Non lus"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Suivis"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 6551bc0..abfda3c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"संदेश छोड़ दिया गया."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"संदेश ड्राफ़्ट के रूप में सहेजा गया."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"अनुलग्‍नक प्रदर्शित नहीं हो सकता."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"अनुलग्‍नक प्रदर्शित नहीं हो सकता."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"अनुलग्नक \" <xliff:g id="FILENAME">%s</xliff:g>\" लोड नहीं किया जा सका."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"संदेश खोल रहा है…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> संदेश <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> में ले जाया गया"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"एक या अधिक अनुलग्‍नक अग्रेषित नहीं किए जा सके."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"अनुलग्‍नक अग्रेषित नहीं किया गया"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> साइन इन विफल."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"साइन इन विफल"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> का उपयोगकर्ता नाम या पासवर्ड गलत है. उन्‍हें अभी अपडेट करें?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"डिफ़ॉल्‍ट खाता"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"डिफ़ॉल्‍ट रूप से, इस खाते से ईमेल भेजें"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"अनुलग्नक स्वत: डाउनलोड करें"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"WiFi से कनेक्‍ट होने पर अनुलग्‍नक स्‍वचालित रूप से डाउनलोड करें"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"अनुलग्नकों को डाउनलोड करें"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"WiFi के माध्यम से हाल के संदेशों के अनुलग्नक स्वत: डाउनलोड करें"</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="6301122709602752038">"ईमेल आने पर सिस्‍टम बार में सूचित करें"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"बड़ा"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"बहुत बड़ा"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"सभी को प्रत्‍युत्तर दें"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"संदेशों के प्रतिसाद के लिए \'सभी को प्रत्युत्तर दें\' को डिफ़ॉल्ट बनाएं"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"\"चित्र दिखाएं\" के लिए डिफ़ॉल्‍ट पुनर्स्‍थापित करें"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"सभी प्रेषकों के लिए डिफ़ॉल्‍ट पुनर्स्‍थापित करें (चित्रों को स्‍वचालित रूप से न दिखाएं)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"संदेशों के प्रत्‍युत्तर के लिए \"सभी को प्रत्युत्तर दें\" डिफ़ॉल्ट बनाएं"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"चित्र दिखाने के लिए पूछें"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"संदेशों के चित्र स्वचालित रूप से नहीं दिखाए जाएंगे"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"चित्र दिखाएं\" साफ़ किया गया."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_2">%2$s</xliff:g> का <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"समन्वयन की प्रतीक्षा कर रहा है"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"आपका ईमेल जल्‍दी ही दिखाई देगा."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"बदलने हेतु आइकन स्‍पर्श करें."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"संयोजित इनबॉक्‍स"</string>
     <string name="widget_unread" msgid="4404711399009077833">"अपठित"</string>
     <string name="widget_starred" msgid="8290352707134011791">"तारांकित"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index ceeb3cd..a57f34f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -128,7 +128,7 @@
     <string name="message_compose_cc_label" msgid="5608567337432359209">"Kopija:"</string>
     <string name="message_compose_bcc_label" msgid="8619598628773345338">"Skriv. kop:"</string>
     <string name="message_compose_subject_label" msgid="1592314202889683309">"Predmet:"</string>
-    <!-- outdated translation 7575406246484103697 -->     <string name="message_compose_body_hint" msgid="3864004548670233396">"Stvori novu poruku"</string>
+    <string name="message_compose_body_hint" msgid="3864004548670233396">"Stvori novi poruku e-pošte"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Izvorna poruka --------"\n"Predmet: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Šalje: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Prima: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopija: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> je napisao:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citirani tekst"</string>
@@ -186,7 +186,7 @@
     <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Ovaj je privitak prevelik za preuzimanje putem mobilne mreže. Možete ga preuzeti sljedeći put kad se spojite na Wi-Fi mrežu."</string>
     <string name="attachment_info_no_intent" msgid="8139209405745777924">"Nema instalirane aplikacije koja može otvoriti taj privitak. Pokušajte preuzeti odgovarajuću aplikaciju s Android Marketa."</string>
     <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Ovaj je privitak aplikacija. Morate uključiti potvrdni okvir stavke \"Nepoznati izvori\" na zaslonu Postavke &gt; Aplikacije da biste je mogli instalirati."</string>
-    <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Aplikacija se ne može instalirati izravno iz e-pošte. majprije spremite ovu aplikaciju, a zatim je instalirajte pomoću aplikacije Preuzimanja."</string>
+    <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Aplikacija se ne može instalirati izravno iz e-pošte. Prvo spremite ovu aplikaciju, a zatim je instalirajte pomoću aplikacije Preuzimanja."</string>
     <string name="attachment_not_found" msgid="7155322700141145123">"Preuzimanje privitka nije uspjelo."</string>
     <string name="message_decode_error" msgid="5016042255170947834">"Došlo je do pogreške prilikom dekodiranja poruke."</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Prikaz <xliff:g id="FILENAME">%s</xliff:g>"</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Poruka je odbačena."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Poruka je spremljena kao skica."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Nije moguće prikazati privitak."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Privitak nije moguće prikazati."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Učitavanje privitka \"<xliff:g id="FILENAME">%s</xliff:g>\" nije uspjelo."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Otvaranje poruke…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> poruka premještena u <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Jedan ili više privitaka nije bilo moguće proslijediti."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Privitak nije proslijeđen"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Neuspješna prijava na račun <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Prijava nije uspjela"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Neuspjela prijava"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Korisničko ime ili zaporka za <xliff:g id="ACCOUNT">%s</xliff:g> nisu točni. Ažurirati sada?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Zadani račun"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Šalji e-poštu s ovog računa prema zadanim postavkama"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Automatsko preuzimanje privitaka"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatski preuzmi privitke tijekom povezanosti s WiFi mrežom"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Preuzimanje privitaka"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatsko preuzimanje privitaka uz nedavne poruke WiFi mrežom"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Obavijesti e-pošte"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Učestalost sinkronizacije, obavijesti itd."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Obavijesti u traci sustava kad stigne e-pošta"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Velik"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Ogroman"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odgovori svima"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Učini \"Odgovori svima\" zadanom postavkom za odgovor na poruke"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Vrati zadano za \"Prikaži slike\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Vrati zadano za sve pošiljatelje (ne prikazuj slike automatski)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Neka \"Odgovori svima\" bude zadana postavka za odgovore na poruke"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Pitaj treba li prikazati slike"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Slike u porukama neće se ​​automatski prikazivati"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Prikaži slike\" izbrisano."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> od <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Čekanje na sinkronizaciju"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Vaša će se e-pošta uskoro pojaviti."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Dodir. za promjenu."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Komb. prist. pošta"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Nepročitano"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Označeno zvjezdicom"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1e78c66..01f61c4 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -128,7 +128,7 @@
     <string name="message_compose_cc_label" msgid="5608567337432359209">"Másolat:"</string>
     <string name="message_compose_bcc_label" msgid="8619598628773345338">"Titkos más.:"</string>
     <string name="message_compose_subject_label" msgid="1592314202889683309">"Tárgy:"</string>
-    <string name="message_compose_body_hint" msgid="3864004548670233396">"E-mail írása"</string>
+    <string name="message_compose_body_hint" msgid="3864004548670233396">"Levélírás"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Eredeti üzenet --------"\n"Tárgy: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Feladó: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Címzett: <xliff:g id="TO">%3$s</xliff:g>"\n"Másolatot kap: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> a következőt írta:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Idézett szöveg"</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Üzenet elvetve."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Az üzenet mentve piszkozatként."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Nem lehet megjeleníteni a mellékletet."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Nem lehet megjeleníteni a mellékletet."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Nem sikerült betölteni a következő mellékletet: \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Üzenet megnyitása..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> üzenet áthelyezve ide: <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Egy vagy több melléklet nem továbbítható."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"A melléklet nincs továbbítva"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> bejelentkezése sikertelen volt."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Sikertelen bejelentkezés"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Sikertelen bejelentkezés"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> felhasználóneve vagy jelszava helytelen. Frissíti most?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Alapértelmezett fiók"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"E-mail küldése ebből a fiókból alapértelmezés szerint"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Mellékletek automatikus letöltése"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Mellékletek automatikus letöltése WiFi-kapcsolatnál"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Mellékletek letöltése"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Mellékletek automatikus letöltése az üzenetekbe Wi-Fin keresztül"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mail értesítések"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Szinkronizálási gyakoriság, értesítések stb."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Értesítés megjelenítése a Rendszersávon e-mailek érkezése esetén"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Nagy"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Óriási"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Válasz mindenkinek"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"A \"Válasz mindenkinek\" legyen az alapértelmezett válaszolási mód"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Alapértelmezett beállítások visszaállítása \"Képek megjelenítése\" esetén"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Alapértelmezett beállítások visszaállítása minden feladó esetén (ne mutassa automatikusan a képeket)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"A \"Válasz mindenkinek\" legyen az alapértelmezett válaszolási mód"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Kérdezzen rá a képek megjelenítésére"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Az üzenetekben lévő képek nem jelennek meg automatikusan"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Képek megjelenítése\" törölve."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_2">%2$s</xliff:g>/<xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Várakozás a szinkronizálásra"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"E-mail címe hamarosan megjelenik."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Ikonérintéssel válthat"</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Összes e-mail"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Olvasatlan"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Csillagozott"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5c72d93..f60d1a0 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -17,9 +17,9 @@
 <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">"Baca lampiran email"</string>
-    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Izinkan aplikasi membaca lampiran email Anda."</string>
+    <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Mengizinkan aplikasi membaca lampiran email Anda."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Akses data penyedia email"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Izinkan aplikasi ini mengakses basis data email Anda, termasuk pesan yang diterima, pesan yang dikirim, nama pengguna, dan sandi."</string>
+    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Mengizinkan aplikasi ini mengakses basis data email Anda, termasuk pesan yang diterima, pesan yang dikirim, nama pengguna, dan sandi."</string>
     <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="compose_title" msgid="427986915662706899">"Tulis"</string>
     <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
@@ -61,7 +61,7 @@
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Pilih lampiran"</string>
     <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Pindahkan ke"</string>
     <string name="status_loading_messages" msgid="6552307237621292344">"Memuat pesan…"</string>
-    <string name="status_network_error" msgid="2611654064403817391">"Masalah koneksi."</string>
+    <string name="status_network_error" msgid="2611654064403817391">"Masalah sambungan."</string>
     <string name="error_loading_message_body" msgid="6775234299515596760">"Tidak dapat memuat teks pesan. Pesan mungkin terlalu besar untuk dilihat."</string>
   <plurals name="move_messages">
     <item quantity="one" msgid="320885379869442589">"Pindahkan pesan"</item>
@@ -128,7 +128,7 @@
     <string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
     <string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
     <string name="message_compose_subject_label" msgid="1592314202889683309">"Subjek:"</string>
-    <!-- outdated translation 7575406246484103697 -->     <string name="message_compose_body_hint" msgid="3864004548670233396">"Tulis Surat"</string>
+    <string name="message_compose_body_hint" msgid="3864004548670233396">"Tulis email"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Pesan Asli --------"\n"Subjek: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Dari: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Kepada: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n" <xliff:g id="SENDER">%s</xliff:g> menulis:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Kutipan teks"</string>
@@ -185,8 +185,8 @@
     <string name="attachment_info_policy" msgid="3560422300127587508">"Lampiran ini tidak dapat disimpan atau dibuka karena kebijakan keamanan akun ini."</string>
     <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Lampiran ini terlalu besar untuk diunduh melalui jaringan seluler. Anda dapat mengunduhnya saat tersambung lagi ke jaringan Wi-Fi."</string>
     <string name="attachment_info_no_intent" msgid="8139209405745777924">"Tidak ada apl terpasang yang dapat membuka lampiran ini. Coba unduh apl yang tepat dari Android Market."</string>
-    <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Lampiran ini adalah sebuah apl. Anda harus memeriksa Sumber Tak Dikenal dalam Setelan &gt; Apl sebelum Anda dapat memasangnya."</string>
-    <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Apl tidak dapat dipasang dari email secara langsung. Simpan apl ini terlebih dulu, lalu pasang menggunakan apl Unduhan."</string>
+    <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Lampiran ini adalah sebuah apl. Anda harus mencentang Sumber Tidak Dikenal dalam Setelan &gt; Apl sebelum Anda dapat memasangnya."</string>
+    <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Apl tidak dapat dipasang langsung dari email. Simpan apl ini terlebih dahulu, lalu pasang menggunakan apl Unduhan."</string>
     <string name="attachment_not_found" msgid="7155322700141145123">"Tidak dapat mengunduh lampiran."</string>
     <string name="message_decode_error" msgid="5016042255170947834">"Terjadi galat saat mengawasandikan pesan."</string>
     <string name="eml_view_title" msgid="8827210108543430336">"Melihat <xliff:g id="FILENAME">%s</xliff:g>"</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Pesan dibuang."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Pesan disimpan sebagai draf."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Tidak dapat menampilkan lampiran."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Tidak dapat menampilkan lampiran."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Tidak dapat memuat lampiran \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Membuka pesan…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> pesan dipindahkan ke <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -211,8 +210,8 @@
   </plurals>
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Tidak dapat meneruskan satu lampiran atau lebih."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Lampiran tidak diteruskan"</string>
-    <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> gagal masuk."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Gagal masuk"</string>
+    <string name="login_failed_ticker" msgid="5749227022559285302">"Gagal masuk <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Tidak dapat masuk"</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>
@@ -333,15 +332,15 @@
     <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Tidak dapat menyambung ke server."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string>
     <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS diperlukan, tetapi tidak didukung oleh server."</string>
     <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Metode autentikasi tidak didukung oleh server."</string>
-    <string name="account_setup_failed_security" msgid="925820957665764964">"Tidak dapat membuka koneksi ke server karena galat keamanan."</string>
+    <string name="account_setup_failed_security" msgid="925820957665764964">"Tidak dapat membuka sambungan ke server karena galat keamanan."</string>
     <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Tidak dapat membuka koneksi ke server."</string>
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Anda mengetikkan alamat server yang salah atau server memerlukan versi protokol yang tidak didukung Email."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Anda tidak berhak menyinkronkan dengan server ini. Hubungi administrator server untuk informasi lebih lanjut."</string>
+    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Anda tidak memiliki izin untuk menyinkronkan dengan server ini. Hubungi administrator server untuk informasi lebih lanjut."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Administrasi keamanan jarak jauh"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Server <xliff:g id="SERVER">%s</xliff:g> meminta Anda mengizinkannya mengontrol beberapa fitur keamanan perangkat Android dari jarak jauh. Apakah Anda ingin menyelesaikan penyiapan akun ini?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Server ini memerlukan fitur keamanan yang tidak didukung perangkat Android Anda, termasuk: <xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Anda tidak dapat mengubah nama pengguna akun. Untuk menambahkan akun dengan nama pengguna lain, sentuh Tambahkan Akun."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"PERINGATAN: Menonaktifkan otoritas apl Email untuk mengatur perangkat Anda akan menghapus semua akun Email yang memerlukannya, beserta email, data kenalan, acara kalender, dan data lainnya."</string>
+    <string name="disable_admin_warning" msgid="6196985268695592382">"PERINGATAN: Menonaktifkan otoritas apl Email untuk mengatur perangkat Anda akan menghapus semua akun email yang memerlukannya, beserta email, data kenalan, acara kalender, dan data lainnya."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Pembaruan keamanan"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> mengharuskan Anda memperbarui setelan keamanan."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Akun \"<xliff:g id="ACCOUNT">%s</xliff:g>\" memerlukan pembaruan setelan keamanan."</string>
@@ -349,7 +348,7 @@
     <string name="account_security_title" msgid="3511543138560418587">"Keamanan perangkat"</string>
     <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Server <xliff:g id="SERVER">%s</xliff:g> meminta Anda mengizinkannya mengontrol beberapa fitur keamanan perangkat Android dari jarak jauh."</string>
     <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Edit detail"</string>
-    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" mengharuskan Anda mengubah PIN kunci layar atau sandi."</string>
+    <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" mengharuskan Anda mengubah PIN atau sandi pengunci layar."</string>
     <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Sandi pengunci layar akan kedaluwarsa"</string>
     <string name="password_expired_ticker" msgid="4230570412974108968">"PIN atau sandi pengunci layar Anda kedaluwarsa."</string>
     <string name="password_expired_content_title" msgid="4349518706602252979">"Sandi pengunci layar kedaluwarsa"</string>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Nama pengguna atau sandi untuk <xliff:g id="ACCOUNT">%s</xliff:g> salah. Mutakhirkan keduanya sekarang?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Akun bawaan"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Kirim email dari akun ini secara bawaan"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Unduh-otomatis lampiran"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Otomatis mengunduh lampiran ketika tersambung ke WiFi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Unduh lampiran"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Unduh-otomatis lampiran pada pesan terbaru melalui WiFi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Pemberitahuan email"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Sinkronkan frekuensi, pemberitahuan, dll."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Beri tahukan dalam bilah Sistem ketika email tiba"</string>
@@ -410,7 +409,7 @@
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Pilih map"</string>
     <string name="toast_account_not_found" msgid="8144242451730692816">"Akun tidak ditemukan. Akun mungkin telah dihapus."</string>
     <string name="toast_mailbox_not_found" msgid="4960014581292378895">"Map tidak ditemukan. Map mungkin telah dihapus."</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"Hanya beberapa akun \"Plus\" termasuk akses POP yang memungkinkan program ini tersambung. Jika tidak dapat masuk dengan sandi dan alamat email yang benar, Anda mungkin tidak memiliki akun \"Plus\" berbayar. Luncurkan peramban web untuk mendapat akses ke akun email ini."</string>
+    <string name="provider_note_live" msgid="2995297671709325333">"Hanya beberapa akun \"Plus\" termasuk akses POP yang mengizinkan program ini tersambung. Jika tidak dapat masuk dengan sandi dan alamat email yang benar, Anda mungkin tidak memiliki akun \"Plus\" berbayar. Luncurkan peramban web untuk mendapat akses ke akun email ini."</string>
     <string name="provider_note_t_online" msgid="1630642061431427894">"Sebelum menyiapkan akun email ini, kunjungi situs web T-Online dan buat sandi untuk akses email POP3."</string>
     <string name="exchange_name" msgid="1190783774800310346">"Perusahaan"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Besar"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sangat besar"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Balas semua"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Jadikan \'Balas semua\' sebagai bawaan untuk menjawab pesan"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Pulihkan bawaan untuk \"Tampilkan gambar\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Pulihkan bawaan untuk semua pengirim (jangan tampilkan gambar secara otomatis)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Jadikan \"Balas semua\" sebagai bawaan untuk membalas pesan"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Tanyakan untuk menampilkan gambar"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Gambar dalam pesan tidak akan ditampilkan secara otomatis"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Tampilkan gambar\" dihapus."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> dari <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Menunggu sinkronisasi"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Email Anda akan segera muncul."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Snth ikon utk mngubah."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Kotak Masuk Gabungan"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Belum Dibaca"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Yang berkilau bintangnya"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 1a16088..4614731 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -60,7 +60,7 @@
     <string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"Invia tutti messaggi"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Scegli allegato"</string>
     <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Sposta in"</string>
-    <string name="status_loading_messages" msgid="6552307237621292344">"Caricamento messaggi in corso…"</string>
+    <string name="status_loading_messages" msgid="6552307237621292344">"Caricamento messaggi..."</string>
     <string name="status_network_error" msgid="2611654064403817391">"Problema di connessione."</string>
     <string name="error_loading_message_body" msgid="6775234299515596760">"Impossibile caricare il testo del messaggio. Il messaggio potrebbe essere troppo grande per poter essere visualizzato."</string>
   <plurals name="move_messages">
@@ -128,7 +128,7 @@
     <string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
     <string name="message_compose_bcc_label" msgid="8619598628773345338">"Ccn:"</string>
     <string name="message_compose_subject_label" msgid="1592314202889683309">"Oggetto:"</string>
-    <string name="message_compose_body_hint" msgid="3864004548670233396">"Componi il messaggio"</string>
+    <string name="message_compose_body_hint" msgid="3864004548670233396">"Scrivi email"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Messaggio originale --------"\n"Oggetto: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Da: <xliff:g id="SENDER">%2$s</xliff:g>"\n"A: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> ha scritto:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Testo tra virgolette"</string>
@@ -201,10 +201,9 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Messaggio eliminato."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Messaggio salvato come bozza."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Impossibile visualizzare l\'allegato."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
-    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Apertura messaggio in corso…"</string>
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Impossibile visualizzare l\'allegato."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Impossibile caricare l\'allegato \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
+    <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Apertura messaggio..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> messaggio spostato in <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> messaggi spostati in <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Impossibile inoltrare uno o più allegati."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Allegato non inoltrato"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Accesso a <xliff:g id="ACCOUNT_NAME">%s</xliff:g> non riuscito."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Accesso non riuscito"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Accesso non riuscito"</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>
@@ -247,8 +246,8 @@
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Account duplicato"</string>
     <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Utilizzi già questo nome utente per l\'account \"<xliff:g id="DUPLICATE">%s</xliff:g>\"."</string>
     <string name="account_password_spaces_error" msgid="8928309156658903257">"Questa password inizia o termina con uno o più spazi. Molti server non supportano le password contenenti spazi."</string>
-    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recupero informazioni sull\'account in corso…"</string>
-    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verifica delle impostazioni del server della posta in arrivo in corso…"</string>
+    <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recupero informazioni sull\'account…"</string>
+    <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Verifica impostazioni server della posta in arrivo..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Verifica impostazioni server posta in uscita…"</string>
     <string name="account_setup_names_title" msgid="8483517350241119291">"Impostazione account"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"Il tuo account è stato impostato e l\'email sarà presto disponibile."</string>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Il nome utente o la password per <xliff:g id="ACCOUNT">%s</xliff:g> non sono corretti. Aggiornarli ora?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Account predefinito"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Invia email da questo account per impostazione predefinita"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Download automatico allegati"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Scarica automaticamente allegati quando connesso a rete Wi-Fi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Scarica allegati"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Scarica automaticamente allegati messaggi recenti tramite Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notifiche email"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frequenza sincronizzazione, notifiche e altro."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notifica sulla barra di sistema l\'arrivo di email"</string>
@@ -417,7 +416,7 @@
     <string name="system_account_create_failed" msgid="3673792980526246177">"Impossibile creare l\'account. Riprova."</string>
     <string name="device_admin_label" msgid="8680224994637869414">"Posta"</string>
     <string name="device_admin_description" msgid="426727923791430306">"Abilita norme di sicurezza specificate dal server"</string>
-    <string name="gal_searching_fmt" msgid="6140450617663543464">"Ricerca in <xliff:g id="DOMAIN">%s</xliff:g> in corso..."</string>
+    <string name="gal_searching_fmt" msgid="6140450617663543464">"Ricerca in <xliff:g id="DOMAIN">%s</xliff:g>in corso"</string>
   <plurals name="gal_completed_fmt">
     <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> risultato da <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> risultati da <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grandi"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Molto grandi"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Rispondi a tutti"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Imposta \"Rispondi a tutti\" come opzione predefinita per le risposte"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Ripristina impostazioni predefinite di \"Mostra immagini\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Ripristina impostazioni predefinite per tutti i mittenti (non visualizzare automaticamente le immagini)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Imposta \"Rispondi a tutti\" come opzione predefinita per le risposte"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Chiedi di mostrare le immagini"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Le immagini all\'interno dei messaggi non verranno visualizzate automaticamente"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Impostazioni di \"Mostra immagini\" cancellate."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> di <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"In attesa di sincronizzazione"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Le email verranno visualizzate a breve."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Icona per modificare"</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Posta in arr. combinata"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Da leggere"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Speciali"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 93dfd38..bf10f52 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"ההודעה נמחקה."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"ההודעה נשמרה כטיוטה."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"לא ניתן להציג את הקובץ המצורף."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"לא ניתן להציג את הקובץ המצורף."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"לא ניתן היה לטעון את הקובץ המצורף \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"פותח הודעה…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"הודעה <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> הועברה אל <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"לא ניתן להעביר קובץ מצורף אחד או יותר."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"הקובץ המצורף לא הועבר"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"הכניסה ל-<xliff:g id="ACCOUNT_NAME">%s</xliff:g> נכשלה."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"הכניסה נכשלה"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"שם המשתמש או הסיסמה עבור <xliff:g id="ACCOUNT">%s</xliff:g> שגויים. לעדכן אותם כעת?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"חשבון ברירת מחדל"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"שלח דוא\"ל מחשבון זה כברירת מחדל"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"הורדה אוטומטית של קבצים מצורפים"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"הורד קבצים מצורפים באופן אוטומטי כאשר יש חיבור ל-WiFi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"הורד קבצים מצורפים"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"הורד באופן אוטומטי קבצים מצורפים להודעות שהתקבלו לאחרונה באמצעות WiFi"</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="6301122709602752038">"הצג הודעה בשורת המערכת כאשר מגיע דוא\"ל"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"גדול"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ענק"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"השב לכולם"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"הפוך את \'השב לכולם\' לברירת המחדל של מענה להודעות"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"שחזר ברירת מחדל עבור \'הצג תמונות\'"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"שחזר ברירת מחדל עבור כל השולחים (אל תציג תמונות באופן אוטומטי)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"הפוך את \'השב לכולם\' לברירת המחדל של מענה להודעות"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"בקש להציג תמונות"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"תמונות בהודעות לא יוצגו באופן אוטומטי"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"רשימת \'הצג תמונות\' נוקתה."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> מתוך <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"ממתין לסינכרון"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"הדוא\"ל שלך יופיע בקרוב."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"גע בסמל כדי לשנות."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"דואר נכנס משולב"</string>
     <string name="widget_unread" msgid="4404711399009077833">"לא נקרא"</string>
     <string name="widget_starred" msgid="8290352707134011791">"מסומן בכוכבית"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index db3d870..8ee37a1 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -128,7 +128,7 @@
     <string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
     <string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
     <string name="message_compose_subject_label" msgid="1592314202889683309">"件名:"</string>
-    <!-- outdated translation 7575406246484103697 -->     <string name="message_compose_body_hint" msgid="3864004548670233396">"メッセージを作成"</string>
+    <string name="message_compose_body_hint" msgid="3864004548670233396">"メールを作成します"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- 元のメッセージ --------"\n"件名: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"From: <xliff:g id="SENDER">%2$s</xliff:g>"\n"To: <xliff:g id="TO">%3$s</xliff:g>"\n"Cc: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>: "\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"元のメッセージ"</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"メッセージを破棄しました。"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"メッセージを下書き保存しました。"</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"添付ファイルを表示できません。"</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"添付ファイルを表示できません。"</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"添付ファイル「<xliff:g id="FILENAME">%s</xliff:g>」を読み込むことができませんでした。"</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"メッセージを開いています..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g>件のメッセージを<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>に移動しました"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"添付ファイルを転送できませんでした。"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"添付ファイルを転送できません"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>でログインできませんでした。"</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"ログインできませんでした"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g>のユーザー名またはパスワードが正しくありません。今すぐ更新しますか？"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"優先アカウントにする"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"いつもこのアカウントでメールを送信"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"添付ファイルの自動ダウンロード"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Wi-Fiへの接続時に添付ファイルを自動的にダウンロードする"</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="6301122709602752038">"メール受信: システムバーで通知"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"極大"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"全員に返信"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"メールに返信する際に毎回「全員に返信」する"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"[画像を表示]をデフォルトに戻す"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"すべての送信者をデフォルトに戻す（画像を自動的に表示しない）"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"メールに返信する際に毎回「全員に返信」する"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"画像の表示を確認"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"メールの画像が自動的には表示されない"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"[画像を表示]を解除しました。"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"同期を待機中"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"まもなくメールが表示されます。"</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"タップで変更"</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"統合受信トレイ"</string>
     <string name="widget_unread" msgid="4404711399009077833">"未読"</string>
     <string name="widget_starred" msgid="8290352707134011791">"スター付き"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 88d81b0..37d7280 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -19,9 +19,9 @@
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"이메일 첨부파일 읽기"</string>
     <string name="permission_read_attachment_desc" msgid="6592948507403743153">"애플리케이션이 이메일 첨부파일을 읽도록 허용합니다."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"이메일 제공업체 데이터 액세스"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"애플리케이션이 받은 메일, 보낸 메일, 사용자 이름 및 비밀번호를 비롯하여 이메일 데이터베이스에 액세스하도록 합니다."</string>
+    <string name="permission_access_provider_desc" msgid="2221907862438022705">"애플리케이션이 받은 메일, 보낸 메일, 사용자 이름 및 비밀번호를 포함하는 이메일 데이터베이스에 액세스하도록 합니다."</string>
     <string name="app_name" msgid="5815426892327290362">"이메일"</string>
-    <string name="compose_title" msgid="427986915662706899">"메시지작성"</string>
+    <string name="compose_title" msgid="427986915662706899">"편지쓰기"</string>
     <string name="debug_title" msgid="5175710493691536719">"디버그"</string>
     <string name="next_action" msgid="3931301986364184415">"다음"</string>
     <string name="okay_action" msgid="8365197396795675617">"확인"</string>
@@ -46,7 +46,7 @@
     <string name="remove_star_action" msgid="6689770999647007163">"별표 삭제"</string>
     <string name="refresh_action" msgid="5951383001436708175">"새로고침"</string>
     <string name="add_account_action" msgid="8835736309476033727">"계정 추가"</string>
-    <string name="compose_action" msgid="4045702519637388045">"메시지작성"</string>
+    <string name="compose_action" msgid="4045702519637388045">"편지쓰기"</string>
     <string name="search_action" msgid="6325101454876682308">"검색"</string>
     <string name="account_settings_action" msgid="4494079183315085171">"계정 설정"</string>
     <string name="settings_action" msgid="6334807007967459412">"설정"</string>
@@ -102,7 +102,7 @@
   </plurals>
     <string name="debug_version_fmt" msgid="6160213145745376955">"버전: <xliff:g id="VERSION">%s</xliff:g>"</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_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>
@@ -113,7 +113,7 @@
     <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"최근 폴더"</string>
     <string name="message_subject_description" msgid="3597047441062021199">"제목"</string>
     <string name="message_is_empty_description" msgid="4004644319382041459">"(제목 없음)"</string>
-    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"더 많은 메시지 로드"</string>
+    <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"더 많은 메일 표시"</string>
   <plurals name="message_view_selected_message_count">
     <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g>개 선택됨"</item>
     <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g>개 선택됨"</item>
@@ -129,7 +129,7 @@
     <string name="message_compose_bcc_label" msgid="8619598628773345338">"숨은 참조:"</string>
     <string name="message_compose_subject_label" msgid="1592314202889683309">"제목:"</string>
     <string name="message_compose_body_hint" msgid="3864004548670233396">"이메일 작성"</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_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- 원본 메일 --------"\n"제목: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"보낸사람: <xliff:g id="SENDER">%2$s</xliff:g>"\n"받는사람: <xliff:g id="TO">%3$s</xliff:g>"\n"참조: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>님이 작성:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"받은메일"</string>
     <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"받은메일 포함"</string>
@@ -154,7 +154,7 @@
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"중지"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"첨부파일을 <xliff:g id="FILENAME">%s</xliff:g>(으)로 저장했습니다."</string>
     <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"첨부파일을 저장할 수 없습니다."</string>
-    <string name="message_view_attachment_background_load" msgid="756797444835526487">"참고: 전달된 메시지에서 하나 이상의 첨부파일을 보내기 전에 다운로드합니다."</string>
+    <string name="message_view_attachment_background_load" msgid="756797444835526487">"참고: 메일을 전달하기 전에 첨부파일을 다운로드합니다."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"메일"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"초대"</string>
   <plurals name="message_view_show_attachments_action">
@@ -196,14 +196,13 @@
     <item quantity="other" msgid="4437637377522896262">"이 메일을 삭제하시겠습니까?"</item>
   </plurals>
   <plurals name="message_deleted_toast">
-    <item quantity="one" msgid="710742672464447084">"메시지를 삭제했습니다."</item>
-    <item quantity="other" msgid="6574961322865652255">"메시지를 삭제했습니다."</item>
+    <item quantity="one" msgid="710742672464447084">"메일을 삭제했습니다."</item>
+    <item quantity="other" msgid="6574961322865652255">"메일을 삭제했습니다."</item>
   </plurals>
-    <string name="message_discarded_toast" msgid="3891461729325584026">"메시지를 삭제했습니다."</string>
+    <string name="message_discarded_toast" msgid="3891461729325584026">"메일을 삭제했습니다."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"메일이 임시보관함에 저장되었습니다."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"첨부파일을 표시할 수 없습니다."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"첨부파일을 표시할 수 없습니다."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"첨부파일 \'<xliff:g id="FILENAME">%s</xliff:g>\'을(를) 로드하지 못했습니다."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"메일을 여는 중…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"메일 <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>개가 <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>(으)로 이동됨"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"하나 이상의 첨부파일을 전달하지 못했습니다."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"첨부파일을 전달하지 못했습니다."</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>에 로그인하지 못했습니다."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"로그인 실패"</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>
@@ -236,12 +235,12 @@
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Exchange 계정 추가"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Exchange ActiveSync 계정 추가"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"이메일 계정"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"간단한 몇 단계를 거쳐 대부분의 계정에 대해 이메일을 설정할 수 있습니다."</string>
-    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"간단한 몇 단계를 거쳐 Exchange 계정을 설정할 수 있습니다."</string>
-    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"간단한 몇 단계를 거쳐 Exchange ActiveSync 계정을 설정할 수 있습니다."</string>
+    <string name="accounts_welcome" msgid="1491126253077950685">"간단한 절차만으로 대부분의 계정에 대해 이메일을 설정할 수 있습니다."</string>
+    <string name="accounts_welcome_exchange" msgid="4432917203403596617">"간단한 절차만으로 Exchange 계정을 설정할 수 있습니다."</string>
+    <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"간단한 절차만으로 Exchange ActiveSync 계정을 설정할 수 있습니다."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"이메일 주소"</string>
     <string name="account_setup_basics_password_label" msgid="9133549799291519298">"비밀번호"</string>
-    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"이 계정에서 이메일 보냄(기본값)"</string>
+    <string name="account_setup_basics_default_label" msgid="5924790142029806711">"기본적으로 이 계정에서 이메일 전송"</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"수동 설정"</string>
     <string name="account_setup_username_password_toast" msgid="3968270274727947460">"올바른 이메일 주소와 비밀번호를 입력하세요."</string>
     <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"중복 계정"</string>
@@ -253,7 +252,7 @@
     <string name="account_setup_names_title" msgid="8483517350241119291">"계정 설정"</string>
     <string name="account_setup_names_headline" msgid="2413440250372658881">"계정이 설정되었으며 이메일을 사용할 수 있습니다."</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_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>
@@ -274,7 +273,7 @@
     <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_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>
@@ -306,11 +305,11 @@
     <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">"1시간마다"</string>
-    <string name="account_setup_options_default_label" msgid="8869166381331276697">"이 계정에서 이메일을 보냅니다(기본값)."</string>
+    <string name="account_setup_options_default_label" msgid="8869166381331276697">"기본적으로 이 계정에서 이메일 전송"</string>
     <string name="account_setup_options_notify_label" msgid="1247525794828820038">"이메일이 오면 알림"</string>
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"이 계정에서 연락처를 동기화합니다."</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"이 계정에서 캘린더를 동기화합니다."</string>
-    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"이 계정에서 이메일을 동기화합니다."</string>
+    <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"이메일 동기화"</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="7582247646138987328">"동기화할 일 수"</string>
@@ -335,13 +334,13 @@
     <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_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">"이 서버는 <xliff:g id="ERROR">%s</xliff:g> 등 Android 기기가 지원하지 않는 보안 기능을 필요로 합니다."</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"계정 사용자 이름을 변경할 수 없습니다. 다른 사용자 이름으로 계정을 추가하려면 \'계정 추가\'를 터치하세요."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"경고: 이메일 앱의 기기 관리 권한을 비활성화하면 관련된 모든 이메일 계정의 이메일, 주소록, 캘린더 일정 및 기타 데이터가 모두 삭제됩니다."</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_notification_ticker_fmt" msgid="1108023476125276507">"\'<xliff:g id="ACCOUNT">%s</xliff:g>\' 계정을 사용하려면 보안 설정을 업데이트해야 합니다."</string>
@@ -361,9 +360,9 @@
     <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"로그인하지 못했습니다."</string>
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g>의 사용자 이름 또는 비밀번호가 잘못되었습니다. 지금 업데이트하시겠습니까?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"기본 계정"</string>
-    <string name="account_settings_default_summary" msgid="1531901438624688482">"이 계정에서 이메일 보냄(기본값)"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"첨부파일 자동 다운로드"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"WiFi에 연결되면 자동으로 첨부파일 다운로드"</string>
+    <string name="account_settings_default_summary" msgid="1531901438624688482">"기본적으로 이 계정에서 이메일 전송"</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="6301122709602752038">"이메일이 오면 시스템 바에서 알림"</string>
@@ -411,8 +410,8 @@
     <string name="toast_account_not_found" msgid="8144242451730692816">"계정을 찾을 수 없습니다. 삭제되었을 수 있습니다."</string>
     <string name="toast_mailbox_not_found" msgid="4960014581292378895">"폴더를 찾을 수 없습니다. 삭제되었을 수 있습니다."</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="provider_note_t_online" msgid="1630642061431427894">"이메일 계정을 설정하기 전에 T-Online 웹사이트를 방문하고 POP3 이메일 액세스용 비밀번호를 만드세요."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Exchange 계정"</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>
@@ -446,17 +445,16 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"크게"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"아주 크게"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"전체답장"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"메일 답장 시, \'전체답장\'을 기본값으로 설정"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"\'이미지 표시\'에 대한 기본값 복원"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"모든 발신자에 대한 기본값 복원(자동으로 이미지 표시 안함)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"메일 답장 시, \'전체답장\'을 기본값으로 설정"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"사진을 표시하도록 요청"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"메일의 사진이 자동으로 표시되지 않음"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\'이미지 표시\'가 초기화되었습니다."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g>/<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"동기화 대기 중"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"이메일이 곧 표시됩니다."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"변경하려면 아이콘을 터치합니다."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"모든 받은편지함"</string>
     <string name="widget_unread" msgid="4404711399009077833">"읽지않음"</string>
-    <string name="widget_starred" msgid="8290352707134011791">"중요편지함"</string>
+    <string name="widget_starred" msgid="8290352707134011791">"별표편지함"</string>
     <string name="widget_loading" msgid="2340962056927255554">"로드 중..."</string>
     <string name="widget_touch_to_configure" msgid="7062039013915225323">"설정하려면 터치하세요."</string>
     <string name="widget_no_accounts" msgid="2412482205591224408">"아직 이메일 계정을 설정하지 않았습니다."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e06af27..1cced02 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Pranešimas atmestas."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Pranešimas išsaugotas kaip juodraštis."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Nepavyksta pateikti priedo."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Nepavyksta pateikti priedo."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Nepavyko įkelti priedo „<xliff:g id="FILENAME">%s</xliff:g>“."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Atidaromas pranešimas…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"Į <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> perkelti pranešimai: <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nepavyko persiųsti mažiausiai vieno priedo."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Priedas nepersiųstas"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Įvyko prisijungimo prie „<xliff:g id="ACCOUNT_NAME">%s</xliff:g>“ klaida."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Įvyko prisijungimo klaida"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Nepavyko prisijungti"</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>
@@ -236,7 +235,7 @@
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Pridėti „Exchange“ paskyrą"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Pridėti „Exchange ActiveSync“ paskyrą"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"El. pašto paskyra"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Daugelyje paskyrų galite nustatyti el. paštą, atlikę vos kelis veiksmus."</string>
+    <string name="accounts_welcome" msgid="1491126253077950685">"Daugelyje paskyrų galite nustatyti el. paštą atlikę vos kelis veiksmus."</string>
     <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Galite nustatyti „Exchange“ paskyrą atlikę vos kelis veiksmus."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Galite nustatyti „Exchange ActiveSync“ paskyrą atlikę vos kelis veiksmus."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"El. pašto adresas"</string>
@@ -335,7 +334,7 @@
     <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Serveris nepalaiko tapatybės nustatymo metodų."</string>
     <string name="account_setup_failed_security" msgid="925820957665764964">"Nepavyko užmegzti ryšio su serveriu dėl saugos klaidos."</string>
     <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Nepavyko užmegzti ryšio su serveriu."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Įvedėte neteisingą serverio adresą arba serveriui reikalinga el. pašto nepalaikoma protokolo versija."</string>
+    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Įvedėte netinkamą serverio adresą arba serveriui reikalinga el. pašto nepalaikoma protokolo versija."</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Neturite leidimo sinchronizuoti su šiuo serveriu. Jei reikia daugiau informacijos, susisiekite su serverio administratoriumi."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Nuotolinis saugos administravimas"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Serveris „<xliff:g id="SERVER">%s</xliff:g>“ reikalauja leisti jam nuotoliniu būdu valdyti kai kurias „Android“ įrenginio saugos funkcijas. Ar norite užbaigti šios paskyros nustatymą?"</string>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"„<xliff:g id="ACCOUNT">%s</xliff:g>“ naudotojo vardas ar slaptažodis neteisingas. Atnaujinti juos dabar?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Numatytoji paskyra"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Pagal numatytuosius nustatymus siųsti el. laišką iš šios paskyros"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Automat. atsisiunčiami priedai"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatiškai atsisiųsti priedus, kai prisijungiama prie „Wi-Fi“"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Atsisiųsti priedus"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatiškai atsis. naujausių pranešimų priedai per „Wi-Fi“"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"El. pašto pranešimai"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Sinchronizavimo dažnumas, pranešimai ir kt."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Kai atsiunčiamas el. laiškas, pranešti sistemos juostoje"</string>
@@ -411,7 +410,7 @@
     <string name="toast_account_not_found" msgid="8144242451730692816">"Paskyra nerasta. Galbūt ji buvo pašalinta."</string>
     <string name="toast_mailbox_not_found" msgid="4960014581292378895">"Aplankas nerastas. Galbūt jis buvo pašalintas."</string>
     <string name="provider_note_live" msgid="2995297671709325333">"Tik kai kuriose „Plus“ paskyrose yra POP prieiga, leidžianti prisijungti šiai programai. Jei negalite prisijungti naudodami tinkamą el. pašto adresą ir slaptažodį, galbūt neapmokėjote „Plus“ paskyros. Paleiskite žiniatinklio naršyklę, kad gautumėte prieigą prie šių el. pašto paskyrų."</string>
-    <string name="provider_note_t_online" msgid="1630642061431427894">"Prieš nustatydami šią el. pašto paskyrą, apsilankykite „T-Online“ svetainėje ir sukurkite POP3 el. pašto prieigos slaptažodį."</string>
+    <string name="provider_note_t_online" msgid="1630642061431427894">"Prieš nustatydami šią el. pašto paskyrą apsilankykite „T-Online“ svetainėje ir sukurkite POP3 el. pašto prieigos slaptažodį."</string>
     <string name="exchange_name" msgid="1190783774800310346">"Įmonės"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
     <string name="system_account_create_failed" msgid="3673792980526246177">"Nepavyko sukurti paskyros. Bandykite dar kartą."</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Didelis"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Itin didelis"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Atsakyti visiems"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Atsakyti į pranešimus pasirinkite „Atsakyti visiems“ kaip numat. nust."</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Atkurti numatytuosius funkcijos „Rodyti paveikslėlius“ nustatymus"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Atkurti visų siuntėjų numatytuosius nustatymus (automatiškai nerodyti paveikslėlių)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Kaip numatyt. atsakymų į praneš. nustat. pasirinkti „Atsakyti visiems“"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Paprašyti rodyti paveikslėlius"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Pranešimuose esantys paveikslėliai nebus rodomi automatiškai"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"„Rodyti paveikslėlius“ išvalyta."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> iš <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Laukiama sinchronizavimo"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Jūsų el. paštas netrukus bus parodytas."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Kad pak., pal. pikt."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Sujungt. Gautieji"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Neskaityta"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Pažymėta žvaigždute"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ecf3388..b767cff 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Ziņojums ir atmests."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Ziņojums ir saglabāts kā melnraksts."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Nevar parādīt pielikumu."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Nevarēja parādīt pielikumu."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Nevarēja ielādēt pielikumu <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Notiek ziņojuma atvēršana…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ziņojums pārvietots uz <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nevarēja pārsūtīt vienu vai vairākus pielikumus."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Pielikums netika nosūtīts."</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Neizdevās pierakstīties kontā <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Neizdevās pierakstīties"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Nevarēja pierakstīties"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Konta <xliff:g id="ACCOUNT">%s</xliff:g> lietotājvārds un parole nav pareizi. Vai atjaunināt tos tūlīt?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Noklusējuma konts"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Pēc noklusējuma sūtīt e-pasta ziņojumus no šī konta"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Pielikumu automāt. lejupielāde"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automātiski ielādēt pielikumus, ja izveidots Wi-Fi savienojums"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Lejupielādēt pielikumus"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automātiski lejupielādēt jaunāko ziņojumu pielikumus Wi-Fi tīklā"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-pasta paziņojumi"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Sinhronizācijas biežums, paziņojumi u.c."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Rādīt paziņojumu statusa joslā, kad tiek saņemts e-pasta ziņojums"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Liels"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Milzīgs"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Atbildēt visiem"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Atbildēšanai uz ziņojumiem kā noklusējumu iestatīt Atbildēt visiem"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Atjaunot noklusējuma vērtību iestatījumam Rādīt attēlus"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Atjaunot noklusējuma iestatījumus visiem sūtītājiem (nerādīt attēlus automātiski)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Atbildēšanai uz ziņojumiem kā noklusējumu iestatīt Atbildēt visiem"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Pieprasīt attēlu rādīšanu"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Ziņojumos ietvertie attēli netiks automātiski rādīti."</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Iestatījums Rādīt attēlus ir notīrīts."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> no <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Gaida sinhronizāciju"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Drīz tiks parādīts jūsu e-pasta saturs."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Mainiet pieskaroties"</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Kombinētā iesūtne"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Nelasītie"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Atzīm. ar zvaigznīti"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index db6b20e..3850413 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mesej dibuang."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mesej disimpan sebagai draf."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Tidak boleh memaparkan lampiran."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Tidak boleh memaparkan lampiran."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Tidak dapat memuatkan lampiran \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Membuka mesej..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mesej dialih ke <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Tidak boleh mengirim semula satu atau lebih lampiran."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Lampiran tidak dikirim semula"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Log masuk <xliff:g id="ACCOUNT_NAME">%s</xliff:g> gagal."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Log masuk gagal"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Tidak dapat melog masuk"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Nama pengguna atau kata laluan untuk <xliff:g id="ACCOUNT">%s</xliff:g> tidak betul. Kemas kininya sekarang?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Akaun lalai"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Hantar e-mel daripada akaun ini secara lalainya"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Automuat turun lampiran"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Memuat turun lampiran secara automatik apabila disambungkan kepada WiFi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Muat turun lampiran"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Auto muat turun lampiran ke mesej terbaharu melalui Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Pemberitahuan e-mel"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Kekerapan penyegerakan, pemberitahuan, dsb."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Beritahu dalam bar Sistem apabila e-mel diterima"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Besar"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Sangat besar"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Balas kepada semua"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Jadikan \'Balas kepada semua\' lalai untuk membalas mesej"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Pulihkan lalai untuk \"Tunjukkan gambar\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Pulihkan lalai untuk semua pengirim (jangan tunjukkan gambar secara automatik)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Jadikan \"Balas kepada semua\" sebagai lalai untuk balasan mesej"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Minta untuk menunjukkan gambar"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Gambar dalam mesej tidak akan ditunjukkan secara automatik"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Tunjukkan gambar\" sudah dipadam bersih."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> dari <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Menunggu penyegerakan"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"E-mel anda akan muncul tidak lama lagi."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Sentuh ikon untuk menukar."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Peti Masuk Gabungan"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Belum dibaca"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Berbintang"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 7ffbb53..1187eb3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -19,7 +19,7 @@
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"Les e-postvedlegg"</string>
     <string name="permission_read_attachment_desc" msgid="6592948507403743153">"Gir appen tilgang til å lese e-postvedleggene dine."</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"Få tilgang til data om e-postleverandør"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Gir programmet tilgang til e-postdatabasen, inklusivt mottatte og sendte meldinger samt brukernavn og passord."</string>
+    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Gir appen tilgang til e-postdatabasen, inklusivt mottatte og sendte meldinger samt brukernavn og passord."</string>
     <string name="app_name" msgid="5815426892327290362">"E-post"</string>
     <string name="compose_title" msgid="427986915662706899">"Skriv e-post"</string>
     <string name="debug_title" msgid="5175710493691536719">"Debug"</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Meldingen ble forkastet."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Meldingen ble lagret som utkast."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Kan ikke vise vedlegget."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Kan ikke vise vedlegg."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Kunne ikke laste inn vedlegget «<xliff:g id="FILENAME">%s</xliff:g>»."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Åpner melding …"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> melding flyttet til <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Kunne ikke videresende ett eller flere vedlegg."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Vedlegget ble ikke videresendt"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Pålogging til <xliff:g id="ACCOUNT_NAME">%s</xliff:g> mislyktes."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Pålogging mislyktes"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Kunne ikke logge på"</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>
@@ -335,7 +334,7 @@
     <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Autentiseringsmetoder støttes ikke av tjeneren."</string>
     <string name="account_setup_failed_security" msgid="925820957665764964">"Kunne ikke åpne tilkobling til tjener på grunn av sikkerhetsfeil."</string>
     <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Kan ikke åpne tilkobling til tjener."</string>
-    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Du har angitt feil tjeneradresse, eller tjeneren krever en protokollversjon som ikke håndteres av e-postprogrammet."</string>
+    <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Du har angitt feil tjeneradresse, eller tjeneren krever en protokollversjon som ikke håndteres av e-post-appen."</string>
     <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Du har ikke tillatelse til å synkronisere med denne tjeneren. Ta kontakt med tjenerens administrator for mer informasjon."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Fjernadministrasjon av sikkerhet"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Tjeneren <xliff:g id="SERVER">%s</xliff:g> krever at den kan kontrollere noen av sikkerhetsfunksjonene på Android-enheten utenfra. Ønsker du å fullføre oppsettet av kontoen?"</string>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Brukernavn eller passord for <xliff:g id="ACCOUNT">%s</xliff:g> er feil. Vil du oppdatere nå?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Bruk denne kontoen som standard for utgående e-post."</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Automatisk nedlasting av vedlegg"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Last ned vedlegg automatisk når du er koblet til WiFi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Nedlasting av vedlegg"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Last ned vedlegg automatisk til nye meldinger via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Varsling om e-post"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synkroniseringsfrekvens, varslinger m.m."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Gi beskjed i systemfeltet når nye e-postmeldinger kommer"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kjempestor"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Svar alle"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Bruk «Svar alle» som standard for å svare på e-poster"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Gjenopprett standard for «Vis bilder»"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Gjenopprett standard for alle avsendere (ikke vis bilder automatisk)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Bruk «Svar alle» som standard for svar på e-poster"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Be om å vise bilder"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Bilder vises ikke automatisk i e-poster"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"«Vis bilder» er tømt."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Venter på synkronisering"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"E-posten din vil dukke opp snart."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Endre: Trykk ikon."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Kombinert innboks"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Ulest"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Stjernemerket"</string>
diff --git a/res/values-nb/uploader.xml b/res/values-nb/uploader.xml
index 48a1962..2d7eed1 100644
--- a/res/values-nb/uploader.xml
+++ b/res/values-nb/uploader.xml
@@ -12,7 +12,7 @@
     <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d bilder ??? %2$d videoer"</string>
     <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"lavt batteri"</string>
     <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"bildekvote er overskredet"</string>
-    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"streifing"</string>
+    <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string>
     <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"venter på Wi-Fi"</string>
     <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"forsinket inntil enheten lades"</string>
     <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"venter på tilkobling"</string>
@@ -51,7 +51,7 @@
     <string name="pause_state_need_connectivity" msgid="338696137467815955">"satt på pause – venter på tilkobling"</string>
     <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"satt på pause – PWA-kvote brukt opp"</string>
     <string name="pause_state_need_wifi" msgid="231858819136516913">"satt på pause – venter på Wi-Fi"</string>
-    <string name="pause_state_roaming" msgid="1811348200068311099">"satt på pause – streifing"</string>
+    <string name="pause_state_roaming" msgid="1811348200068311099">"satt på pause – roaming"</string>
     <string name="pause_state_retrying" msgid="3734440128828177639">"venter på å prøve på nytt"</string>
     <string name="retry_in_1min" msgid="2242454935194420914">"Ett minutt"</string>
     <string name="retry_in_2min" msgid="5845688527405283031">"To minutter"</string>
@@ -119,8 +119,8 @@
     <string name="preference_plus_upload_status" msgid="7925576302519589779">"Opplastingsstatus"</string>
     <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avansert"</string>
     <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Opplastinger fra mobil"</string>
-    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Opplastinger ved streifing"</string>
-    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Last opp bilder og videoer ved streifing på datanettverk"</string>
+    <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Opplastinger ved roaming"</string>
+    <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Last opp bilder og videoer ved roaming på datanettverk"</string>
     <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Batteriopplastinger"</string>
     <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Last opp bilder og videoer bare under lading"</string>
     <string name="preference_plus_sync_all" msgid="2563137874388611459">"Last opp eksisterende bilder"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 09d5fd8..76f6b93 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -184,7 +184,7 @@
     <string name="attachment_info_malware" msgid="6576029010855055528">"U kunt dit bericht niet opslaan of openen omdat dit type bijlage schadelijke software kan bevatten."</string>
     <string name="attachment_info_policy" msgid="3560422300127587508">"Deze bijlage kan niet worden opgeslagen of geopend als gevolg van het beveiligingsbeleid van dit account."</string>
     <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Deze bijlage is te groot om te downloaden via een mobiel netwerk. U kunt de bijlage downloaden wanneer u weer verbinding maakt met een Wi-Fi-netwerk."</string>
-    <string name="attachment_info_no_intent" msgid="8139209405745777924">"Er is geen geïnstalleerde app beschikbaar die de bijlage kan openen. Download een geschikte app van Android Market."</string>
+    <string name="attachment_info_no_intent" msgid="8139209405745777924">"Er is geen app geïnstalleerd die de bijlage kan openen. Download een geschikte app van Android Market."</string>
     <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Deze bijlage is een app. U moet \'Onbekende bronnen\' aanvinken in \'Instellingen\' &gt; \'Apps\' voordat u de app kunt installeren."</string>
     <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Apps kunnen niet rechtstreeks via e-mail worden geïnstalleerd. Sla de app eerst op en installeer deze via de app Downloads."</string>
     <string name="attachment_not_found" msgid="7155322700141145123">"Kan de bijlage niet downloaden."</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Bericht wordt verwijderd"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Bericht opgeslagen als concept."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Kan bijlage niet weergeven."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Kan bijlage niet weergegeven."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Kan de bijlage \'<xliff:g id="FILENAME">%s</xliff:g>\' niet laden."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Bericht openen..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> bericht verplaatst naar <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Kan een of meer bijlagen niet doorsturen."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Bijlage niet doorgestuurd"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g>: aanmelden mislukt."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Aanmelden mislukt"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Kan niet aanmelden"</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>
@@ -336,7 +335,7 @@
     <string name="account_setup_failed_security" msgid="925820957665764964">"Kan geen verbinding maken met de server wegens een beveiligingsfout."</string>
     <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Kan geen verbinding met de server maken."</string>
     <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"U heeft een onjuist serveradres getypt of de server vereist een protocolversie die niet door E-mail wordt ondersteund."</string>
-    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"U heeft geen toestemming om met deze server te synchroniseren. Neem voor meer informatie contact op met de beheerder van uw server."</string>
+    <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"U heeft geen toestemming met deze server te synchroniseren. Neem voor meer informatie contact op met de beheerder van uw server."</string>
     <string name="account_setup_security_required_title" msgid="1850321535870447468">"Extern beveiligingsbeheer"</string>
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"De server <xliff:g id="SERVER">%s</xliff:g> vereist dat u de server toestemming geeft bepaalde beveiligingsfuncties van uw Android-apparaat extern te bedienen. Wilt u het instellen van dit account voltooien?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Voor deze server zijn beveiligingsfuncties nodig die uw Android-apparaat niet ondersteunt, waaronder: <xliff:g id="ERROR">%s</xliff:g>"</string>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"De gebruikersnaam of het wachtwoord voor <xliff:g id="ACCOUNT">%s</xliff:g> is onjuist. Nu bijwerken?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standaardaccount"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"E-mail standaard vanaf dit account verzenden"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Bijlagen automatisch downloaden"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Bijlagen automatisch downloaden indien verbonden met wifi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Bijlagen downloaden"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Bijlagen van recente berichten automatisch downloaden via wifi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Meldingen via e-mail"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synchronisatiefrequentie, meldingen, enzovoort"</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Melding in de systeembalk wanneer er e-mail binnenkomt"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Groot"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorm"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Allen beantwoorden"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"\'Allen beantwoorden\' gebruiken als standaard beantwoordingsoptie"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Standaardinstellingen herstellen voor \'Afbeeldingen weergeven\'"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Standaardinstellingen voor alle afzenders herstellen (afbeeldingen niet automatisch weergeven)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"\'Allen beantwoorden\' instellen als standaardoptie voor berichtreacties"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Vragen om afbeeldingen weer te geven"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Afbeeldingen in berichten worden niet automatisch weergegeven"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\'Afbeeldingen weergeven\' gewist."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> van <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Wachten op synchronisatie"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Uw e-mail wordt over enkele ogenblikken weergegeven."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Raak pictogram aan voor wijzigen."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Gecombineerde Inbox"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Ongelezen"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Met ster"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 94102e7..3d29b3c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -128,7 +128,7 @@
     <string name="message_compose_cc_label" msgid="5608567337432359209">"DW:"</string>
     <string name="message_compose_bcc_label" msgid="8619598628773345338">"UDW:"</string>
     <string name="message_compose_subject_label" msgid="1592314202889683309">"Temat:"</string>
-    <string name="message_compose_body_hint" msgid="3864004548670233396">"Utwórz e-mail."</string>
+    <string name="message_compose_body_hint" msgid="3864004548670233396">"Napisz e-maila."</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Wiadomość oryginalna --------"\n"Temat: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Od: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Do: <xliff:g id="TO">%3$s</xliff:g>"\n"DW: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"Użytkownik <xliff:g id="SENDER">%s</xliff:g> napisał:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Cytowany tekst"</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Wiadomość została odrzucona."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Wiadomość została zapisana jako wersja robocza."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Nie można wyświetlić załącznika."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Nie można wyświetlić załącznika."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Nie można wczytać załącznika „<xliff:g id="FILENAME">%s</xliff:g>”."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Otwieranie wiadomości…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"Przeniesiono <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> wiadomość do <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Co najmniej jednego załącznika nie można przekazać dalej."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Nie przekazano załącznika"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Nie udało się zalogować na konto <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Logowanie nieudane"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Nie można się zalogować"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Nazwa użytkownika lub hasło dla konta <xliff:g id="ACCOUNT">%s</xliff:g> są niepoprawne. Zaktualizować je teraz?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Domyślne konto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Domyślnie wysyłaj wiadomości e-mail z tego konta"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Automatyczne pobierz załączniki"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatycznie pobieraj załączniki, gdy połączono z siecią Wi-Fi."</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Pobieraj załączniki"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automatycznie pobieraj załączniki najnowszych wiadomości przez Wi-Fi."</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Powiadomienia e-mail"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Częstotliwość synchronizacji, powiadomienia itd."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Powiadamiaj na pasku systemu o otrzymaniu wiadomości e-mail"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Duży"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Wielki"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odpowiedz wszystkim"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Ustaw opcję „Odpowiedz wszystkim” jako domyślną dla wiadomości"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Przywróć wartość domyślną opcji „Pokaż obrazy”"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Przywróć wartość domyślną dla wszystkich nadawców (nie pokazuj obrazów automatycznie)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Ustaw opcję „Odpowiedz wszystkim” jako domyślną dla wiadomości."</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Pytaj, czy pokazać obrazy"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Obrazy w wiadomościach nie będą pokazywane automatycznie."</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Opcja „Pokaż obrazy” została wyczyszczona."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Oczekiwanie na synchronizację"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Twoja poczta e-mail pojawi się za chwilę."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Dotknij, aby zmienić."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Wszystkie skrzynki odbiorcze"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Nieprzeczytane"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Oznaczone gwiazdką"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9e8b739..b85440c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mensagem rejeitada."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mensagem guardada como rascunho."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Não é possível visualizar o anexo."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Não é possível visualizar o anexo."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Não foi possível carregar o anexo  “<xliff:g id="FILENAME">%s</xliff:g>”."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"A abrir a mensagem…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensagem movida para <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Não foi possível encaminhar um ou mais anexos."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"O anexo não foi encaminhado"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Falha no início de sessão de <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Falha ao iniciar sessão"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Impossível iniciar sessão"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"O nome de utilizador ou palavra-passe para <xliff:g id="ACCOUNT">%s</xliff:g> estão incorretos. Quer atualizá-los agora?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Conta predefinida"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar e-mail a partir desta conta por predefinição"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Transf. automática dos anexos"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Transferir automaticamente anexos quando ligado a uma rede Wi-Fi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Transferir anexos"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Transferir automaticamente anexos de mensagens recentes p/ Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificações de e-mail"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frequência da sincronização, notificações, etc."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar na barra de sistema quando chegar e-mail"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Muito grande"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Responder a todos"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Tornar “Responder a todos” a opção predef. para responder a mensagens"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Repor predefinição para \"Mostrar imagens\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Repor predefinição para todos os remetentes (não mostrar imagens automaticamente)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Predefinir \"Responder a todos\" para mensagens de resposta"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Perguntar para mostrar fotografias"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"As fotografias em mensagens não serão apresentadas automaticamente"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Mostrar imagens\" desmarcada."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"A aguardar sincronização"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"O e-mail aparecerá em breve."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Toque ícone p/ mudar."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Cx entrada combinada"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Não lida"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Com estrela"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 594f81b..bb505df 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mensagem descartada."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mensagem salva como rascunho."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Não é possível exibir o anexo."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Não é possível exibir o anexo."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Não foi possível carregar o anexo \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Abrindo a mensagem…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mensagens movidas para <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Não foi possível encaminhar todos os anexos."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Anexo não encaminhado"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Falha no login de <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Falha ao fazer login"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Não foi possível fazer login"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"O nome de usuário ou a senha de <xliff:g id="ACCOUNT">%s</xliff:g> estão incorretos. Atualizar agora?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Conta padrão"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Enviar e-mail desta conta por padrão"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Download automático dos anexos"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Transferir anexos automaticamente quando conectado à rede Wi-Fi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Fazer download dos anexos"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Fazer download automát. dos anexos de mens. recentes via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificações de e-mail"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frequência de sincronização, notificações etc."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Notificar sobre chegada de e-mails na barra de sistema"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Grande"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Enorme"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Responder a todos"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Tornar padrão a opção \"Responder a todos\" para responder a mensagens"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Restaurar padrão de \"Mostrar fotos\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Restaurar padrão para todos os remetentes (não mostrar fotos automaticamente)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Tornar a opção \"Responder a todos\" padrão p/ respostas das mensagens"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Pedir para exibir imagens"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"As imagens das mensagens não serão exibidas automaticamente"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Opção \"Mostrar fotos\" desmarcada."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> de <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Aguardando sincronização"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Seu e-mail aparecerá em breve."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Toque para mudar."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Caixa de entrada mesclada"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Não lidas"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Com estrela"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index a23682a..031d207 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -602,8 +602,6 @@
     <skip />
     <!-- no translation found for waitinf_for_sync_message_2 (5656175205790694016) -->
     <skip />
-    <!-- no translation found for widget_other_views (4988574907386539499) -->
-    <skip />
     <!-- no translation found for widget_all_mail (4352573990283094963) -->
     <skip />
     <!-- no translation found for widget_unread (4404711399009077833) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 7d18959..3eeacd7 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -128,7 +128,7 @@
     <string name="message_compose_cc_label" msgid="5608567337432359209">"Cc:"</string>
     <string name="message_compose_bcc_label" msgid="8619598628773345338">"Bcc:"</string>
     <string name="message_compose_subject_label" msgid="1592314202889683309">"Subiect:"</string>
-    <string name="message_compose_body_hint" msgid="3864004548670233396">"Compuneţi un mesaj de e-mail"</string>
+    <string name="message_compose_body_hint" msgid="3864004548670233396">"Scrieţi un e-mail"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mesajul original --------"\n"Subiect: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De la: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Către: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> a scris:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Mesaj citat"</string>
@@ -153,7 +153,7 @@
     <string name="message_view_attachment_saved" msgid="3432810414785232025">"Salvat"</string>
     <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Opriţi"</string>
     <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Ataşament salvat ca <xliff:g id="FILENAME">%s</xliff:g>."</string>
-    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Ataşament. nu s-a putut salva."</string>
+    <string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Nu s-a salvat ataşamentul."</string>
     <string name="message_view_attachment_background_load" msgid="756797444835526487">"Notă: unul sau mai multe ataşamente din mesajul dvs. redirecţionat vor fi descărcate înainte de a fi trimise."</string>
     <string name="message_view_show_message_action" msgid="5134222901019191436">"Mesaj"</string>
     <string name="message_view_show_invite_action" msgid="8862797393776226777">"Invitaţi"</string>
@@ -182,7 +182,7 @@
     <string name="attachment_info_application_settings" msgid="4124655487276125596">"Setări aplicaţii"</string>
     <string name="attachment_info_unknown" msgid="8342655396805943320">"Nu se poate deschide ataşamentul."</string>
     <string name="attachment_info_malware" msgid="6576029010855055528">"Nu puteţi salva sau deschide acest fişier, deoarece acest tip de ataşament ar putea conţine programe rău intenţionate."</string>
-    <string name="attachment_info_policy" msgid="3560422300127587508">"Acest ataşament nu pot fi salvat sau deschis din cauza politicilor de securitate ale acestui cont."</string>
+    <string name="attachment_info_policy" msgid="3560422300127587508">"Acest ataşament nu poate fi salvat sau deschis din cauza politicilor de securitate ale acestui cont."</string>
     <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Acest ataşament este prea mare pentru a fi descărcat prin reţeaua mobilă. Îl puteţi descărca cu proxima ocazie când vă conectaţi la o reţea Wi-Fi."</string>
     <string name="attachment_info_no_intent" msgid="8139209405745777924">"Nu există nicio aplicaţie instalată care să poată deschide acest ataşament. Încercaţi să descărcaţi o aplicaţie corespunzătoare din Android Market."</string>
     <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Acest ataşament este o aplicaţie. Înainte de a o putea instala, trebuie să bifaţi Surse necunoscute din Setări &gt; Aplicaţii."</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Mesaj refuzat."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Mesaj salvat ca mesaj nefinalizat."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Ataşamentul nu se poate afişa."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Ataşamentul nu se poate afişa."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Ataşamentul „<xliff:g id="FILENAME">%s</xliff:g>” nu a putut fi încărcat."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Se deschide mesajul..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> mesaj mutat în <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nu se pot redirecţiona unul sau mai multe ataşamente."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Ataşamentul nu a fost trimis"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Conectare eşuată la <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Conectare eşuată"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Nu s-a putut conecta"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
     <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> O"</item>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Numele de utilizator sau parola pentru <xliff:g id="ACCOUNT">%s</xliff:g> este incorectă. Le actualizaţi acum?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Cont prestabilit"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Trimiteţi e-mailuri de pe acest cont în mod prestabilit"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descărcaţi automat ataşamentele"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Ataşam. se desc. automat doar când sunteţi conectat(ă) la Wi-Fi."</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Descărcaţi ataşamentele"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Descărcaţi în mod automat prin Wi-Fi ataşam. mesaj. recente"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Notificările de e-mail"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frecvenţa sincronizării, notificări etc."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Doresc să fiu notificat(ă) în bara de sistem la primirea e-mailurilor"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Mare"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Foarte mare"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Răspundeţi tuturor"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Setaţi „Răspundeţi tuturor” ca opţiune prestabilită de răspuns la mesaje"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Reveniţi la setarea prestabilită pentru „Afişaţi fotografiile”"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Reveniţi la setarea prestabilită pentru toţi expeditorii (nu afişaţi fotografiile în mod automat)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Setaţi „Răspundeţi tuturor” ca opţ. prestabilită de răspuns la mesaje"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Solicitaţi permisiunea de a afişa imagini"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Imaginile din mesaje nu vor fi afişate în mod automat"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Opţiunea „Afişaţi fotografiile” este debifată."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> din <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Se aşteaptă sincronizarea"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"E-mailul dvs. va apărea în curând."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"At. pict. pt. modif."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Toate e-mailurile"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Necitite"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Cu stea"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 6ffcc7c..4d6e1f3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -18,9 +18,9 @@
     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="6592948507403743153">"Приложение получит доступ к прикрепленным файлам в сообщениях эл. почты."</string>
-    <string name="permission_access_provider_label" msgid="378256653525377586">"Доступ к данным поставщика услуг эл. почты"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Приложение получит доступ к базе данных программы электронной почты, которая включает входящие и отправленные письма, имена пользователей и пароли."</string>
-    <string name="app_name" msgid="5815426892327290362">"Написать письмо"</string>
+    <string name="permission_access_provider_label" msgid="378256653525377586">"Доступ к данным сервиса эл. почты"</string>
+    <string name="permission_access_provider_desc" msgid="2221907862438022705">"Приложение получит доступ к базе данных программы электронной почты, которая включает полученные и отправленные письма, имена пользователей и пароли."</string>
+    <string name="app_name" msgid="5815426892327290362">"Email"</string>
     <string name="compose_title" msgid="427986915662706899">"Новое сообщение"</string>
     <string name="debug_title" msgid="5175710493691536719">"Выполнить отладку"</string>
     <string name="next_action" msgid="3931301986364184415">"Далее"</string>
@@ -68,7 +68,7 @@
     <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_multiple_accounts_toast" msgid="7922594026384944163">"Не удалось переместить сообщения, так как они находятся в разных аккаунтах."</string>
     <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Нельзя перемещать сообщения из папок \"Черновики\", \"Исходящие\" и \"Отправленные\"."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"Непрочитанных: <xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
@@ -128,7 +128,7 @@
     <string name="message_compose_cc_label" msgid="5608567337432359209">"Копия:"</string>
     <string name="message_compose_bcc_label" msgid="8619598628773345338">"Скрытая копия:"</string>
     <string name="message_compose_subject_label" msgid="1592314202889683309">"Тема:"</string>
-    <string name="message_compose_body_hint" msgid="3864004548670233396">"Написать сообщение"</string>
+    <string name="message_compose_body_hint" msgid="3864004548670233396">"Текст сообщения"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Исходное сообщение --------"\n"Тема: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"От: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Кому: <xliff:g id="TO">%3$s</xliff:g>"\n"Копия: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"Пользователь <xliff:g id="SENDER">%s</xliff:g> писал:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Цитируемый текст"</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Черновик удален."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Черновик сообщения сохранен."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Невозможно отобразить прикрепленный файл."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Невозможно отобразить прикрепленный файл."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Не удалось загрузить файл \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Сообщение открывается…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"Сообщение (<xliff:g id="NUM_MESSAGE">%1$d</xliff:g>) перемещено в папку <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Сбой при пересылке прикрепленных файлов."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Не удалось переслать вложение"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Ошибка авторизации <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Не удалось войти в аккаунт"</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>
@@ -236,7 +235,7 @@
     <string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Добавить аккаунт Exchange"</string>
     <string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Добавить аккаунт Exchange ActiveSync"</string>
     <string name="account_setup_basics_headline" msgid="6726590205905464015">"Аккаунт эл. почты"</string>
-    <string name="accounts_welcome" msgid="1491126253077950685">"Email можно легко настроить для большинства популярных почтовых служб."</string>
+    <string name="accounts_welcome" msgid="1491126253077950685">"Email поддерживает большинство популярных почтовых служб."</string>
     <string name="accounts_welcome_exchange" msgid="4432917203403596617">"Настроить аккаунт Exchange очень просто."</string>
     <string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Настроить аккаунт Exchange ActiveSync очень просто."</string>
     <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Адрес электронной почты"</string>
@@ -245,7 +244,7 @@
     <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_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="5356212700221438863">"Проверка настроек сервера входящих сообщений..."</string>
@@ -325,7 +324,7 @@
     <string name="account_setup_failed_dlg_auth_message" msgid="42827150104879570">"Неверное имя пользователя или пароль."</string>
     <string name="account_setup_failed_dlg_auth_message_fmt" msgid="8598560266430207606">"Неверное имя пользователя или пароль."\n"<xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_failed_dlg_certificate_message" msgid="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_dlg_certificate_message_fmt" msgid="2121921642915593041">"Не удалось установить защищенное подключение к серверу."\n"<xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_failed_certificate_required" msgid="1280569002588325367">"Необходим сертификат клиента. Подключиться к серверу?"</string>
     <string name="account_setup_failed_certificate_inaccessible" msgid="7245835883180762722">"Сертификат недействителен или недоступен."</string>
     <string name="account_setup_failed_check_credentials_message" msgid="222908719765968691">"Ошибка сервера. Проверьте имя пользователя и пароль и повторите попытку."</string>
@@ -339,8 +338,8 @@
     <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="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">"ВНИМАНИЕ! Отключение прав на администрирование вашего устройства для приложения Email приведет к удалению всех аккаунтов электронной почты, которые используют эти права. Кроме того, будут удалены все письма, контакты, календари и другие данные, связанные с этими аккаунтами."</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Неверное имя пользователя или пароль аккаунта <xliff:g id="ACCOUNT">%s</xliff:g>. Обновить их сейчас?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Аккаунт по умолчанию"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Сделать аккаунтом электронной почты по умолчанию для отправки сообщений"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Автозагрузка прикрепл. файлов"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Загружать прикрепленные файлы при подключении к Wi-Fi"</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="6301122709602752038">"При получении почты показывать оповещение в строке состояния системы"</string>
@@ -386,7 +385,7 @@
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Синхронизировать контакты этого аккаунта"</string>
     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Синхронизировать календарь"</string>
     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Синхронизировать календарь этого аккаунта"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Синхрон-ть почту"</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_vibrate_when_summary" msgid="3991584445166247189">"Вибросигнал при получении сообщения"</string>
@@ -410,7 +409,7 @@
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Выберите папку"</string>
     <string name="toast_account_not_found" msgid="8144242451730692816">"Аккаунт не найден. Возможно, он удален."</string>
     <string name="toast_mailbox_not_found" msgid="4960014581292378895">"Папка не найдена. Возможно, она удалена."</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"Доступ по протоколу POP, позволяющий этой программе подключаться, разрешен только в некоторых аккаунтах Plus. Если вам не удается войти со своим адресом электронной почты и паролем, скорее всего, у вас бесплатный аккаунт (не Plus). Доступ к такому аккаунту электронной почты возможен через браузер."</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>
@@ -433,8 +432,8 @@
     <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Списку сообщений"</string>
     <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Размер шрифта"</string>
   <string-array name="general_preference_text_zoom_summary_array">
-    <item msgid="4693576184223089069">"Очень маленький"</item>
-    <item msgid="4415205108584620118">"Маленький"</item>
+    <item msgid="4693576184223089069">"Мелкий"</item>
+    <item msgid="4415205108584620118">"Небольшой"</item>
     <item msgid="4550219696381691112">"Обычный"</item>
     <item msgid="6227813549949219991">"Большой"</item>
     <item msgid="1197917420815786571">"Огромный"</item>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Крупный"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Огромный"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Ответить всем"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Всегда отвечать всем участникам переписки"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Восстановить значение по умолчанию для параметра \"Показать изображения\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Восстановить значения по умолчанию для всех отправителей (отключить автоматический показ их изображений)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Всегда отвечать всем участникам переписки"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Запрашивать разрешение на показ изображений"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Автоматический показ изображений в сообщениях будет отключен"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Показ изображений отключен."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> из <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Ожидание синхронизации"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Ваши письма скоро загрузятся."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Нажмите, чтобы изменить."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Все входящие"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Непрочитанные"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Помеченные"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 48f1bc5..3e60ae9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -128,7 +128,7 @@
     <string name="message_compose_cc_label" msgid="5608567337432359209">"Kópia:"</string>
     <string name="message_compose_bcc_label" msgid="8619598628773345338">"Skr. kópia:"</string>
     <string name="message_compose_subject_label" msgid="1592314202889683309">"Predmet:"</string>
-    <string name="message_compose_body_hint" msgid="3864004548670233396">"Vytvoriť e-mail"</string>
+    <string name="message_compose_body_hint" msgid="3864004548670233396">"Napísať e-mail"</string>
     <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Pôvodná správa --------"\n"Predmet: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Odosielateľ: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Komu: <xliff:g id="TO">%3$s</xliff:g>"\n"Kópia: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>napísal/a:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Citovaný text"</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Správa bola zahodená."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Správa bola uložená ako koncept."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Prílohu sa nepodarilo zobraziť."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Príloha sa nedá zobraziť."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Prílohu „<xliff:g id="FILENAME">%s</xliff:g>“ sa nepodarilo načítať."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Prebieha otváranie správy..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> správa bola presunutá do schránky <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Nepodarilo sa poslať ďalej jednu alebo viac príloh."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Príloha nebola poslaná ďalej"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Prihlásenie do účtu <xliff:g id="ACCOUNT_NAME">%s</xliff:g> zlyhalo."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Prihlásenie zlyhalo"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Prihlásenie sa nepodarilo"</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>
@@ -341,7 +340,7 @@
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Server <xliff:g id="SERVER">%s</xliff:g> vyžaduje povolenie, aby mohol vzdialene ovládať niektoré funkcie zabezpečenia vášho zariadenia so systémom Android. Chcete dokončiť nastavenie tohto účtu?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Tento server vyžaduje bezpečnostné funkcie, ktoré vaše zariadenie so systémom Android nepodporuje (vrátane: <xliff:g id="ERROR">%s</xliff:g>)."</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Používateľské meno účtu nemôžete zmeniť. Ak chcete pridať účet s iným používateľským menom, dotknite sa možnosti Pridať účet."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"UPOZORNENIE: ak deaktivujete oprávnenie aplikácie E-mail spravovať toto zariadenie, budú odstránené všetky účty aplikácie E-mail, ktoré toto oprávnenie vyžadujú. Spoločne s týmito účtami budú odstránené aj všetky ich e-maily, kontakty, udalosti kalendára a ďalšie údaje."</string>
+    <string name="disable_admin_warning" msgid="6196985268695592382">"UPOZORNENIE: Ak deaktivujete oprávnenie aplikácie E-mail spravovať toto zariadenie, budú odstránené všetky účty aplikácie E-mail, ktoré toto oprávnenie vyžadujú. Spoločne s týmito účtami budú odstránené aj všetky ich e-maily, kontakty, udalosti kalendára a ďalšie údaje."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Bezpečnostná aktualizácia"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> vyžaduje, aby ste zmenili nastavenia zabezpečenia."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> požaduje aktualizáciu nastavení zabezpečenia."</string>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Používateľské meno alebo heslo pre účet <xliff:g id="ACCOUNT">%s</xliff:g> je nesprávne. Chcete ich aktualizovať?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Predvolený účet"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"V predvolenom nastavení odosielať e-maily z tohto účtu"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Automaticky prevziať prílohy"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automaticky prevziať prílohy počas pripojenia k sieti Wi-Fi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Preberať všetky prílohy"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Automaticky preberať prílohy najnovších správ prostredníctvom siete Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-mailové upozornenia"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Frekvencia synchronizácie, oznámení atď."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Zobraziť upozornenie na príchod e-mailu v systémovom paneli"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Veľké"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Veľmi veľké"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odpovedať všetkým"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Nastaviť voľbu „Odpovedať všetkým“ ako predvol. voľbu odpov. na správy"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Obnoviť predvolenú hodnotu pre nastavenie „Zobraziť obrázky“"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Obnoviť predvolené hodnoty nastavení pre všetkých odosielateľov (nezobrazovať obrázky automaticky)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Nastaviť voľbu „Odpovedať všetkým“ ako predvol. voľbu odpov. na správy"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Opýtať sa, či zobraziť obrázky"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Obrázky sa v správach nebudú zobrazovať automaticky"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Nastavenie „Zobraziť obrázky“ bolo vymazané."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> z <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Prebieha synchronizácia"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Váš e-mail sa čoskoro zobrazí."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Zmeňte klep. na ikonu"</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Doručená pošta (všetky)"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Neprečítané"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Označené hviezdičkou"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ef3e114..8953f6e 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Sporočilo zavrženo."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Sporočilo shranjeno kot osnutek."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Priloge ni mogoče prikazati."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Priloge ni mogoče prikazati."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Priloge »<xliff:g id="FILENAME">%s</xliff:g>« ni bilo mogoče naložiti."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Odpiranje sporočila ..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> sporočil premaknjenih v <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Ene ali več prilog ni bilo mogoče posredovati."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Priloga ni bila posredovana"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Prijava v račun <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ni uspela."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Prijava ni uspela"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Prijava ni uspela"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Uporabniško ime ali geslo za <xliff:g id="ACCOUNT">%s</xliff:g> je napačno. Ali ju želite posodobiti?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Privzeti račun"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Privzeto pošiljaj e-pošto iz tega računa"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Samodejni prenos prilog"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Samodejni prenos prilog, ko je na voljo povezava Wi-Fi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Prenesi priloge"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Samodejni prenos prilog k nedavnim sporočilom s povezavo Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-poštna obvestila"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Pogostost sinhronizacije, obvestila itd."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Ko pride e-pošta, obvesti v sistemski vrstici"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Velika"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Velikanska"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Odgovori vsem"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Naj bo »Odgovori vsem« privzeta nastavitev za odgovore na sporočila"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Obnovi privzeto za »Pokaži slike«"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Obnovi privzeto za vse pošiljatelje (slik ne pokaži samodejno)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"»Odgovori vsem« naj bo privzeta izbira za odgovore na sporočila"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Vprašaj, ali naj bodo slike prikazane"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Slike v sporočilih ne bodo prikazane samodejno"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Možnost »Pokaži slike« je počiščena."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> od <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Čakanje na sinhronizacijo"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Vaša e-pošta se bo pojavila kmalu."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Tapnite ikono, da spremenite."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Kombiniran nabiralnik"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Neprebrano"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Z zvezdico"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b872c46..1caa06f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -181,7 +181,7 @@
     <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi подешавања"</string>
     <string name="attachment_info_application_settings" msgid="4124655487276125596">"Подешавања апликације"</string>
     <string name="attachment_info_unknown" msgid="8342655396805943320">"Није могуће отворити прилог."</string>
-    <string name="attachment_info_malware" msgid="6576029010855055528">"Не можете да сачувате или отворите ову датотеку јер овај тип прилога може да садржи злонамерни софтвер."</string>
+    <string name="attachment_info_malware" msgid="6576029010855055528">"Не можете да сачувате или отворите ову датотеку јер овај тип прилога можда садржи злонамерни софтвер."</string>
     <string name="attachment_info_policy" msgid="3560422300127587508">"Овај прилог није могуће сачувати или отворити због смерница за безбедност овог налога."</string>
     <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Овај прилог је превелик да бисте га преузели преко мобилне мреже. Можете да га преузмете када се следећи пут повежете са Wi-Fi мрежом."</string>
     <string name="attachment_info_no_intent" msgid="8139209405745777924">"Нема инсталиране апликације која може да отвори овај прилог. Покушајте да преузмете одговарајућу апликацију са Android Market-а."</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Порука је одбачена."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Порука је сачувана као недовршена."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Није могуће приказати прилог."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Није могуће приказати прилог."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Није могуће учитати прилог „<xliff:g id="FILENAME">%s</xliff:g>“."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Отварање поруке…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> порука је премештено у <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Није могуће проследити један или више прилога."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Прилог није прослеђен"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Пријављивање на налог <xliff:g id="ACCOUNT_NAME">%s</xliff:g> није успело."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Пријављивање није успело"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Корисничко име или лозинка за <xliff:g id="ACCOUNT">%s</xliff:g> су нетачни. Желите ли да их ажурирате сада?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Подразумевани налог"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Подразумевано шаљи поруке е-поште са овог налога"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Аутоматско преузимање прилога"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Аутоматско преузимање прилога када постоји веза са WiFi мрежом"</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="6301122709602752038">"Обавештавање на системској траци када стигне порука е-поште"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Велика"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Огромно"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Одговори свима"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Постави опцију „Одговори свима“ као подразумевану за одговоре на поруке"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Враћање подразумеваних подешавања за „Прикажи слике“"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Враћање подразумеваних подешавања за све пошиљаоце (слике се не приказују аутоматски)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Постављање опције „Одговори свима“ као подразумеване за одговоре"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Захтев за приказивање слика"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Слике из порука се неће аутоматски приказивати"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Избор опције „Прикажи слике“ је опозван."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> од <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Чека се синхронизација"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Адреса е-поште ће се ускоро приказати."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Додирните икону да бисте променили."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Комбиноване Примљене"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Непрочитане"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Са звездицом"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 10610a9..7b8b00e 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Meddelandet slängs."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Meddelande sparat som utkast."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Det går inte att visa bilagan."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Det går inte att visa bilagan."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Det gick inte att läsa in bilagan <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Meddelandet öppnas..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> meddelandet har flyttats till <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Det gick inte att vidarebefordra en eller flera bilagor."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Bilagan vidarebefordrades inte"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Inloggning på <xliff:g id="ACCOUNT_NAME">%s</xliff:g> misslyckades."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Inloggningen misslyckades"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Det gick inte att logga in."</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Du har angett ett felaktigt användarnamn eller lösenord for <xliff:g id="ACCOUNT">%s</xliff:g>. Vill du uppdatera dem nu?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Skicka e-post från det här kontot som standard"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Hämta bilagor automatiskt"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Hämta bilagor automatiskt när enheten är ansluten till Wi-Fi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Hämta bilagor"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Hämta automatiskt bilagor för de senaste meddelandena via Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-postaviseringar"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Synkroniseringsfrekvens, aviseringar osv."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Avisera i systemfältet vid e-postmeddelande"</string>
@@ -410,7 +409,7 @@
     <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Välj en mapp"</string>
     <string name="toast_account_not_found" msgid="8144242451730692816">"Kontot hittades inte. Det kan ha tagits bort."</string>
     <string name="toast_mailbox_not_found" msgid="4960014581292378895">"Mappen hittades inte. Den kan ha tagits bort."</string>
-    <string name="provider_note_live" msgid="2995297671709325333">"POP-åtkomst, som gör så att denna app kan ansluta, ingår bara i vissa pluskonton. Om det inte går att logga in med rätt e-postadress och lösenord kanske du inte har betalat för ett pluskonto. Öppna webbläsaren igen om du vill få åtkomst tills dessa e-postkonton."</string>
+    <string name="provider_note_live" msgid="2995297671709325333">"POP-åtkomst, som gör att denna app kan ansluta, ingår bara i vissa pluskonton. Om det inte går att logga in med rätt e-postadress och lösenord kanske du inte har betalat för ett pluskonto. Öppna webbläsaren igen om du vill få åtkomst till dessa e-postkonton."</string>
     <string name="provider_note_t_online" msgid="1630642061431427894">"Innan du skapar e-postkontot besöker du T-Onlines webbplats och skapar ett lösenord för POP3-åtkomst till e-post."</string>
     <string name="exchange_name" msgid="1190783774800310346">"Företag"</string>
     <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Jättestor"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Svara alla"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Använd Svara alla som standard vid svar på meddelanden"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Återställ standard för \"Visa bilder\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Återställ standard för alla avsändare (visa inte bilder automatiskt)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Använd Svara alla som standard vid svar på meddelanden"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Fråga om bilder ska visas"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Bilder i meddelanden kommer inte att visas automatiskt"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Visa bilder\" rensas."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Väntar på synk"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Din e-post visas snart."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Tryck för att ändra."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Kombinerad inkorg"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Olästa"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Stjärnmärkt"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9baa9e9..d37fc2f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Ujumbe umetupwa."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Ujumbe umehifadhiwa kama rasimu."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Haiwezikuonyesha kiambatisho."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Haiwezi kuonyesha kiambatisho"</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Haikuweza kupakia kiambatisho hiki  \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Inafungua ujumbe..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"Barua <xliff:g id="NUM_MESSAGE">%1$d</xliff:g>zimehamishwa hadi <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Haikuweza kusambaza kiambatisho kimoja au zaidi."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Kiambatishho hakijasambazwa"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ilishindwa kuingia."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Imeshindwa kuingia"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Haingeweza kuingia"</string>
   <plurals name="message_view_attachment_bytes">
     <item quantity="one" msgid="8914124732074848509">"B <xliff:g id="SIZE_IN_BYTES">%d</xliff:g>"</item>
     <item quantity="other" msgid="4613385949384337840">"B <xliff:g id="SIZE_IN_BYTES">%d</xliff:g>"</item>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Jina la mtumiaji au nenosiri la <xliff:g id="ACCOUNT">%s</xliff:g> si sahihi. Yasasishe saa hii?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Akaunti chaguo-msingi"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Tuma barua pepe kutoka kwa akaunti hii kwa chaguo-msingi"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Pakua kioto viambatisho"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Pakua ambatisho zako otomatiki wakati umeunganishwa kwa WiFi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Pakua viambatisho"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Pakua-otomatiki viambatisho kwa ujumbe wa hivi karibuni kupitia Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Arifa za barua pepe"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Mara za kusawazisha, kutuma arifa, n.k."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Arifu katika upau wa hali barua pepe inapofika"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Kubwa"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Kubwa mno"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Jibu wote"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Fanya \'Jibu wote\' iwe chaguo mbadala ya kujibu ujumbe"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Rejesha chaguo-msingi la \"Onyesha picha\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Rejesha chaguo-msingi kwa watumaji wote (usionyeshe picha kiotomatiki)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Fanya \"Jibu wote\" iwe chaguo-msingi kwa majibu ya ujumbe"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Uliza kuonyesha picha"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Picha kwenye ujumbe hazitaonekana kiotomatiki"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Onyesha picha zilizoondolewa."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> ya <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Inasubiri kusawazisha"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Barua pepe yako itaonekana hivi karibuni."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Gusa aikoni ili kubadilisha"</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Kikasha Kilichochanganywa"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Haijasomwa"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Zenye Nyota"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9928ea5..553b236 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"ยกเลิกข้อความแล้ว"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"บันทึกข้อความเป็นร่างจดหมาย"</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"ไม่สามารถแสดงไฟล์แนบ"</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"ไม่สามารถแสดงไฟล์แนบ"</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"ไม่สามารถโหลดไฟล์แนบ \"<xliff:g id="FILENAME">%s</xliff:g>\""</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"กำลังเปิดข้อความ..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ข้อความถูกย้ายไปที่ <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"ไม่สามารถส่งต่อไฟล์แนบอย่างน้อยหนึ่งรายการ"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"ไม่ได้ส่งต่อเอกสารแนบ"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"การลงชื่อเข้าใช้ <xliff:g id="ACCOUNT_NAME">%s</xliff:g> ล้มเหลว"</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"การลงชื่อเข้าใช้ล้มเหลว"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"ชื่อผู้ใช้หรือรหัสผ่านสำหรับ <xliff:g id="ACCOUNT">%s</xliff:g> ไม่ถูกต้อง อัปเดตชื่อผู้ใช้และรหัสผ่านตอนนี้หรือไม่"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"บัญชีเริ่มต้น"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"ส่งอีเมลจากบัญชีนี้เป็นค่าเริ่มต้น"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"ดาวน์โหลดไฟล์แนบอัตโนมัติ"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"ดาวน์โหลดไฟล์แนบโดยอัตโนมัติเมื่อเชื่อมต่อกับ WiFi"</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="6301122709602752038">"แจ้งในแถบระบบเมื่อได้รับอีเมล"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"ใหญ่"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"ใหญ่มาก"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"ตอบกลับทั้งหมด"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"กำหนดให้ \"ตอบกลับทั้งหมด\" เป็นค่าเริ่มต้นสำหรับการตอบกลับข้อความ"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"กู้คืนค่าเริ่มต้นสำหรับ \"แสดงภาพ\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"กู้คืนค่าเริ่มต้นสำหรับผู้ส่งทั้งหมด (ไม่แสดงภาพโดยอัตโนมัติ)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"กำหนดให้ \"ตอบทั้งหมด\" เป็นค่าเริ่มต้นสำหรับการตอบกลับข้อความ"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"ถามเพื่อจะแสดงรูปภาพ"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"รูปภาพในข้อความจะไม่แสดงโดยอัตโนมัติ"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"แสดงรูปภาพ\" ถูกยกเลิกการเลือก"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> จาก <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"กำลังรอการซิงค์"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"อีเมลของคุณจะปรากฏขึ้นในไม่ช้า"</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"แตะไอคอนเพื่อเปลี่ยน"</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"กล่องจดหมายรวม"</string>
     <string name="widget_unread" msgid="4404711399009077833">"ยังไม่ได้อ่าน"</string>
     <string name="widget_starred" msgid="8290352707134011791">"ที่ติดดาว"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f76311d..7d1f86f 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Itinapon ang mensahe."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Na-save ang mensahe bilang draft."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Hindi maipakita ang attachment."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Hindi maipakita ang attachment."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Hindi ma-load ang attachment na \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Binubuksan ang mensahe…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> (na) mensahe ang nailipat sa <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Hindi makapagpasa ng isa o higit pang mga attachment."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Hindi napasa ang attachment"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Nabigo sa pag-signin sa <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Nabigo ang pag-signin"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Hindi makapag-sign in"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Hindi tama ang username o password para sa <xliff:g id="ACCOUNT">%s</xliff:g>. I-update ang mga ito ngayon?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Default na account"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Magpadala ng email mula sa account na ito bilang default"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Awtomatiko i-download attachment"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Awtomatikong mag-download ng mga attachment kapag nakakonekta sa WiFi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Mag-download ng mga attachment"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Awto i-download mga attachment sa mga bagong mensahe sa Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Mga notification sa email"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Dalas ng pag-sync, mga notification, atbp."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"I-notify sa System bar kapag dumating ang email"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Malaki"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Malaki"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Tumugon sa lahat"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Gawing default ang \'Tumugon sa lahat\' para sa pagtugon sa mga mensahe"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Ibalik ang default para sa \"Ipakita ang mga larawan\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Ibalik ang default para sa lahat ng mga nagpapadala (huwag awtomatikong ipakita ang mga larawan)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Gawing default ang \"Tumugon sa lahat\" para sa mga pagtugon sa mensahe"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Hilinging ipakita ang mga larawan"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Hindi awtomatikong ipapakita ang mga larawan sa mga mensahe"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Na-clear ang \"Ipakita ang mga larawan\"."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> ng <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Naghihintay ng pag-sync"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Lilitaw ang iyong email sa lalong madaling panahon."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Pndot icon pra bago."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Pinagsamang Inbox"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Hindi pa nabasa"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Naka-star"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 90d48bc..96214a4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"İleti silindi."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"İleti taslak olarak kaydedildi."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Ek görüntülenemiyor."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Ek görüntülenemiyor."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Ek yüklenemedi: \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"İleti açılıyor..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> ileti <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> posta kutusuna taşındı"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Bir veya birden fazla ek yönlendirilemedi."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Ek yönlendirilmedi"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> oturumu açılamadı"</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Oturum açma başarısız oldu"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Oturum açılamadı"</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>
@@ -341,7 +340,7 @@
     <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"<xliff:g id="SERVER">%s</xliff:g> sunucusu, Android cihazınızın bazı güvenlik özelliklerini uzaktan kontrol etmesine izin vermenizi gerektiriyor. Bu hesabı ayarlamayı tamamlamak istiyor musunuz?"</string>
     <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Bu sunucu, Android cihazınız tarafından desteklenmeyen güvenlik özellikleri gerektiriyor, örneğin: <xliff:g id="ERROR">%s</xliff:g>"</string>
     <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Bir hesabın kullanıcı adını değiştiremezsiniz. Farklı kullanıcı adıyla hesap eklemek için Hesap ekle\'ye dokunun."</string>
-    <string name="disable_admin_warning" msgid="6196985268695592382">"UYARI: E-posta uygulamasının cihazınızı yönetme yetkisinin devre dışı bırakılması, bunu gerektiren tüm e-posta hesaplarının yanı sıra bu hesaplar ait e-postaları, kişileri, takvim olaylarını ve diğer verileri  siler."</string>
+    <string name="disable_admin_warning" msgid="6196985268695592382">"UYARI: E-posta uygulamasının cihazınızı yönetme yetkisinin devre dışı bırakılması, bunu gerektiren tüm e-posta hesaplarının yanı sıra bu hesaplar ait e-postaları, kişileri, takvim olaylarını ve diğer verileri siler."</string>
     <string name="account_security_dialog_title" msgid="430041952584831904">"Güvenlik güncellemesi"</string>
     <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"<xliff:g id="ACCOUNT">%s</xliff:g> için güvenlik ayarlarınızı güncellemeniz gerekiyor."</string>
     <string name="security_notification_ticker_fmt" msgid="1108023476125276507">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" hesabı, güvenlik ayarları güncellemesi gerektiriyor."</string>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> için kullanıcı adı veya şifre yanlış. Şimdi güncellemek ister misiniz?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Varsayılan hesap"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"E-postaları varsayılan olarak bu hesaptan gönder"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Ekleri otomatik indir"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Kablosuz\'a bağlandığında ekleri otomatik olarak indir"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Ekleri indir"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Son iletilerin eklerini Kablosuz üzerinden otomatik indir"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"E-posta bildirimleri"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Sıklığı, bildirimleri vs. senkronize et"</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"E-posta geldiğinde Sistem çubuğunda bildir"</string>
@@ -386,7 +385,7 @@
     <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Bu hesaba ilişkin kişileri senkronize et"</string>
     <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"Takvim\'i Senkronize Et"</string>
     <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"Bu hesaba ilişkin takvimi senkronize et"</string>
-    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-postayı senk et"</string>
+    <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-postayı senk. et"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Bu hesaba ilişkin e-postaları senkronize et"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Titreşim"</string>
     <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"E-posta geldiğinde aynı zamanda titret"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Büyük"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Çok büyük"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Yanıtı tüm alıcılara gönder"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"İletileri yanıtlarken, \"Yanıtı tüm alıcılara gönder\" varsayılan olsun"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"\"Resimleri göster\" için varsayılan ayarları geri yükle"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Tüm gönderenler için varsayılan ayarları geri yükle (resimleri otomatik olarak gösterme)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"İleti yanıtlarında \"Yanıtı tüm alıcılara gönder\"i varsayılan yap"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Resimleri göstermek için sor"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"İletilerdeki resimler otomatik olarak gösterilmeyecek"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Resimleri göster\" temizlendi."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> / <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Senkronize etmek için bekleniyor"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"E-postanız yakında görüntülenecek."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Değiştirmek için simgeye dokunun."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Birleştirlmş Gln Kts"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Okunmayan"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Yıldızlı"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index d93a0f0..a2b56d6 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Повідомл. відхилено."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Лист збереж. як чернетку."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Неможливо показати вкладений файл."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Неможливо показати вкладений файл."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Не вдалося завантажити вкладений файл \"<xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Відкривання повідомлення…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"До <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> переміщено <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> повідомлення"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Не вдалося переслати один або кілька вкладених файлів."</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Вкладений файл не переслано"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"Помилка входу в обліковий запис <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Помилка входу"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Ім’я користувача чи пароль для <xliff:g id="ACCOUNT">%s</xliff:g> неправильні. Оновити зараз?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Обл. зап. за умовч."</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Надіс. ел.листи з цього обл. зап. за умовч."</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Автомат. завантаж. вклад. файли"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Автомат. завантажувати вкладені файли, коли є з’єднання з WiFi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Завантажити вкладені файли"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Автом. завантажувати вклад.файли з останніх повідомл. через WiFi"</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="6301122709602752038">"Сповіщати в системному рядку про надходження листа"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Великий"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Дуже великий"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Відповісти всім"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Зробити \"Відповісти всім\" відповіддю на повідомлення за умовчанням"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Відновити налаштування за умовчанням \"Показати зображення\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Відновити налаштування за умовчанням для всіх відправників (не показувати зображення автоматично)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Зробити \"Відповісти всім\" відповіддю на повідомлення за умовчанням"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Запитувати, чи показувати зображення"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Зображення в повідомленнях не відображатимуться автоматично"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Налаштування \"Показати зображення\" очищено."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> з <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Очікування на синхронізацію"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Ваша електронна пошта з’явиться незабаром."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Торк.знач.для зміни."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Об\'єднані Вхідні"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Непрочитані"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Із зірочкою"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index abd153f..06ae15a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Tin nhắn đã bị hủy."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Tin nhắn đã được lưu dưới dạng tin nháp."</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Không thể hiển thị tệp đính kèm."</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Không thể hiển thị tệp đính kèm."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Không thể tải tệp đính kèm \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Đang mở thư…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"Đã di chuyển <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> thư tới <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Không thể chuyển tiếp một hoặc nhiều tệp đính kèm"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Tệp đính kèm không được chuyển tiếp"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> đăng nhập không thành công."</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Đăng nhập không thành công"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Không thể đăng nhập"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Tên người dùng hoặc mật khẩu của <xliff:g id="ACCOUNT">%s</xliff:g> không đúng. Cập nhật tên người dùng hoặc mật khẩu ngay bây giờ?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"Tài khoản mặc định"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Gửi email từ tài khoản này theo mặc định"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Tự động tải xuống tệp đính kèm"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Tự động tải xuống tệp đính kèm khi kết nối với WiFi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Tải xuống tệp đính kèm"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Tự động tải xuống tệp đính kèm tin nhắn gần đây qua Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Thông báo qua email"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Đồng bộ hóa tần suất, thông báo, v.v."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Thông báo trên thanh Hệ thống khi email đến"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Lớn"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Rất lớn"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Trả lời tất cả"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Đặt \'Trả lời tất cả\' làm mặc định để trả lời thư"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Khôi phục cài đặt mặc định cho \"Hiển thị ảnh\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Khôi phục cài đặt mặc định cho tất cả người gửi (không tự động hiển thị ảnh)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Đặt \"Trả lời tất cả\" làm mặc định để trả lời thư"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Yêu cầu hiển thị hình ảnh"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Hình ảnh trong thư sẽ không được tự động hiển thị"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"Đã xóa \"Hiển thị hình ảnh\"."</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> trong tổng số <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Đang đợi đồng bộ hóa"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Email của bạn sẽ xuất hiện sớm."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Chạm b.t để chuyển."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Hộp thư đến kết hợp"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Chưa đọc"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Được gắn dấu sao"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2bccb9d..e0992fd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"邮件已舍弃。"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"信息已存为草稿。"</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"无法显示该附件。"</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"无法显示附件。"</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"无法加载附件“<xliff:g id="FILENAME">%s</xliff:g>”。"</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"正在打开邮件..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"已将 <xliff:g id="NUM_MESSAGE">%1$d</xliff:g> 封邮件移至<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"一个或多个附件无法转发。"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"无法转发附件"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> 登录失败。"</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"登录失败"</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> 的用户名或密码错误。要立即更新吗？"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"默认帐户"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"默认情况下从此帐户发送电子邮件"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"自动下载附件"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"连接到 Wi-Fi 时自动下载附件"</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="6301122709602752038">"收到电子邮件时在系统栏中显示通知"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"超大"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"全部回复"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"将“全部回复”作为回复邮件的默认设置"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"恢复“显示图片”的默认设置"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"恢复所有发件人的默认设置（不自动显示图片）"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"将“全部回复”设置为默认的邮件回复操作"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"请求显示图片"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"邮件中的图片不会自动显示"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"“显示图片”设置已清除。"</string>
     <string name="position_of_count" msgid="7989353140376877792">"第 <xliff:g id="ID_1">%1$d</xliff:g> 封，共 <xliff:g id="ID_2">%2$s</xliff:g> 封"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"正在等待同步"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"系统很快就会显示您的电子邮件。"</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"触摸图标即可更改。"</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"合并的收件箱"</string>
     <string name="widget_unread" msgid="4404711399009077833">"未读邮件"</string>
     <string name="widget_starred" msgid="8290352707134011791">"已加星标的邮件"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 16ee909..19a2988 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -19,7 +19,7 @@
     <string name="permission_read_attachment_label" msgid="9208086010625033590">"讀取電子郵件附件"</string>
     <string name="permission_read_attachment_desc" msgid="6592948507403743153">"允許這個應用程式讀取您的電子郵件附件。"</string>
     <string name="permission_access_provider_label" msgid="378256653525377586">"存取電子郵件供應商資料"</string>
-    <string name="permission_access_provider_desc" msgid="2221907862438022705">"允許此應用程式存取您的電子郵件資料庫，包括已接收郵件、已傳送郵件、使用者名稱和密碼。"</string>
+    <string name="permission_access_provider_desc" msgid="2221907862438022705">"允許這個應用程式存取您的電子郵件資料庫，包括收到的郵件、送出的郵件、使用者名稱和密碼。"</string>
     <string name="app_name" msgid="5815426892327290362">"電子郵件"</string>
     <string name="compose_title" msgid="427986915662706899">"撰寫郵件"</string>
     <string name="debug_title" msgid="5175710493691536719">"偵錯"</string>
@@ -182,11 +182,11 @@
     <string name="attachment_info_application_settings" msgid="4124655487276125596">"應用程式設定"</string>
     <string name="attachment_info_unknown" msgid="8342655396805943320">"無法開啟附件。"</string>
     <string name="attachment_info_malware" msgid="6576029010855055528">"這類附件可能含有惡意軟體，因此您無法儲存或開啟這個檔案。"</string>
-    <string name="attachment_info_policy" msgid="3560422300127587508">"由於這個帳戶的安全性政策，因此無法儲存或開啟這個附件。"</string>
+    <string name="attachment_info_policy" msgid="3560422300127587508">"受限於這個帳戶的安全性政策，系統無法儲存或開啟這個附件。"</string>
     <string name="attachment_info_wifi_only" msgid="1481120960014563617">"這個附件過大，無法透過行動網路下載，您可以在下次連上 WiFi 網路時重新下載。"</string>
     <string name="attachment_info_no_intent" msgid="8139209405745777924">"您所安裝的應用程式都無法開啟這個附件，不妨從 Android Market 下載適用的應用程式試試看。"</string>
     <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"這個附件是應用程式，您必須前往 [設定] &gt; [應用程式] 中勾選 [不明的來源]，才能安裝這個應用程式。"</string>
-    <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"您無法直接透過電子郵件安裝應用程式，請先儲存這個應用程式，然後使用「下載」應用程式進行安裝。"</string>
+    <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"您無法直接透過電子郵件安裝應用程式。請先儲存這個應用程式，然後使用「下載」應用程式進行安裝。"</string>
     <string name="attachment_not_found" msgid="7155322700141145123">"無法下載附件。"</string>
     <string name="message_decode_error" msgid="5016042255170947834">"為郵件解碼時發生錯誤。"</string>
     <string name="eml_view_title" msgid="8827210108543430336">"檢視 <xliff:g id="FILENAME">%s</xliff:g>"</string>
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"已捨棄郵件。"</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"已儲存郵件草稿。"</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"無法顯示附件。"</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"無法顯示附件。"</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"無法載入附件「<xliff:g id="FILENAME">%s</xliff:g>」。"</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"正在開啟郵件…"</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> 封郵件已移至<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"無法轉寄一或多個附件。"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"無法轉寄附件"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> 登入失敗。"</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"登入失敗"</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>
@@ -254,7 +253,7 @@
     <string name="account_setup_names_headline" msgid="2413440250372658881">"您的帳戶已設定完成，可以收發電子郵件了！"</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_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>
@@ -311,7 +310,7 @@
     <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"同步處理此帳戶的聯絡人。"</string>
     <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"同步處理此帳戶的日曆。"</string>
     <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"同步處理此帳戶所寄的電子郵件。"</string>
-    <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"連上 Wi-Fi 時自動下載附件"</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="7582247646138987328">"同步處理的天數"</string>
     <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"自動"</string>
@@ -341,7 +340,7 @@
     <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="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_notification_ticker_fmt" msgid="1108023476125276507">"「<xliff:g id="ACCOUNT">%s</xliff:g>」帳戶必須進行安全性設定更新。"</string>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"<xliff:g id="ACCOUNT">%s</xliff:g> 的使用者名稱或密碼不正確，要立即更新嗎？"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"預設帳戶"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"預設使用這個帳戶傳送電子郵件"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"自動下載附件"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"連上 Wi-Fi 時自動下載附件"</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="6301122709602752038">"收到電子郵件時，在系統列中顯示通知"</string>
@@ -411,7 +410,7 @@
     <string name="toast_account_not_found" msgid="8144242451730692816">"找不到帳戶，帳戶可能已遭移除。"</string>
     <string name="toast_mailbox_not_found" msgid="4960014581292378895">"找不到資料夾，資料夾可能已遭移除。"</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="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>
@@ -426,7 +425,7 @@
     <string name="header_label_general_preferences" msgid="9204600297009680176">"一般"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"應用程式"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"自動推進"</string>
-    <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"選擇在您刪除郵件後所要顯示的畫面"</string>
+    <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"選擇刪除郵件後所要顯示的畫面"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"推進至"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"較新的郵件"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"較舊的郵件"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"大"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"最大"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"回覆所有人"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"將「回覆所有人」設為預設的回信方式"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"還原「顯示圖片」的預設值"</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"還原所有寄件者的預設值 (不要自動顯示圖片)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"將「回覆所有人」設為預設的回信方式"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"詢問後才可顯示圖片"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"系統不會自動顯示郵件中的圖片"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"「顯示圖片」已清除。"</string>
     <string name="position_of_count" msgid="7989353140376877792">"第 <xliff:g id="ID_1">%1$d</xliff:g> 封，共 <xliff:g id="ID_2">%2$s</xliff:g> 封"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"正在等待同步處理"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"您的電子郵件即將顯示。"</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"輕觸圖示即可變更。"</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"整合式收件匣"</string>
     <string name="widget_unread" msgid="4404711399009077833">"未讀取"</string>
     <string name="widget_starred" msgid="8290352707134011791">"已加星號"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index e111533..a05af63 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -201,9 +201,8 @@
   </plurals>
     <string name="message_discarded_toast" msgid="3891461729325584026">"Umlayezo ulahliwe."</string>
     <string name="message_saved_toast" msgid="8443125659172627665">"Umlayezo ulondolozwe njengokungaphelele"</string>
-    <!-- outdated translation 5557358787789844554 -->     <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Ayikwazi ukuvula okunamathiselwe kwi-imeyili"</string>
-    <!-- no translation found for message_view_load_attachment_failed_toast (8605967295095023587) -->
-    <skip />
+    <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Ayikwazi ukuveza okunamekiwe."</string>
+    <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Yehlulekile ukufaka okunamathiselwe kwi-imeyli \" <xliff:g id="FILENAME">%s</xliff:g>\"."</string>
     <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Ivula umyalezo..."</string>
   <plurals name="message_moved_toast">
     <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> umyalezo uhambiswe e-<xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item>
@@ -212,7 +211,7 @@
     <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Ayikwazi ukudlulisa isinamathiseli esisodwa noma ezengeziwe"</string>
     <string name="forward_download_failed_title" msgid="6139701848515572511">"Okunamathiselwa kwi-imeyli akuthunyelwanga"</string>
     <string name="login_failed_ticker" msgid="5749227022559285302">"<xliff:g id="ACCOUNT_NAME">%s</xliff:g> ukungena ngemvume kwehlulekile"</string>
-    <!-- outdated translation 791871543602843876 -->     <string name="login_failed_title" msgid="7624349996212476176">"Kwehlulekile ukungena ngemvume"</string>
+    <string name="login_failed_title" msgid="7624349996212476176">"Ayikwazanga ukungena ngemvume."</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>
@@ -362,8 +361,8 @@
     <string name="account_settings_login_dialog_content_fmt" msgid="3492735234999710234">"Igama lomsebenzisi noma i-password ka <xliff:g id="ACCOUNT">%s</xliff:g> ayilungile. Wabuyekeze manje?"</string>
     <string name="account_settings_default_label" msgid="3575963379680943640">"I-akhawunti ezenzakalelayo"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Thumela i-imeyli kusuka kule akhawunti ngokuzenzakalelayo"</string>
-    <!-- outdated translation 6044567979405738536 -->     <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Izinamathiseli zokulanda okuzenzakalelayo"</string>
-    <!-- outdated translation 323937814012234081 -->     <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Layisha okunamathiselwa kwi-imeyili ngokuzenzakalelayo uma uxhunyiwe kwi-Wi-Fi"</string>
+    <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Layisha ngokungenisa okunamathelayo"</string>
+    <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Dawuniloda ngokuzenzakalla ukunamathiseleka emiyalezweni yakamuva nge-Wi-Fi"</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Izaziso ze-Imeyli"</string>
     <string name="account_settings_summary" msgid="8403582255413830007">"Ukuvama kokuvumelanisa, isaziso, nokunye."</string>
     <string name="account_settings_notify_summary" msgid="6301122709602752038">"Ngazise Kusistimu ochaza ngesimo uma i-imeyli ifika"</string>
@@ -446,14 +445,13 @@
     <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Okukhulu"</string>
     <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Khulu"</string>
     <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Phendula konke"</string>
-    <!-- outdated translation 917669156784760966 -->     <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Yenza okuthi \"Phendula Konke\" kube okumisiwe kokuphenudula imiyalezo"</string>
-    <!-- outdated translation 8540277615940620308 -->     <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Buyisela okuzenzakalelayo koku \"Bonisa izithombe\""</string>
-    <!-- outdated translation 2018233140620247 -->     <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Buyisela okuzenzakalelayo kwabathumeli bonke (ungabonisi izithombe ngokuzenzakalelayo)"</string>
+    <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Enza \"Phendula konke\" idifalithi yezimpendulo zemiyaezo"</string>
+    <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Cela ukukhombisa izithombe"</string>
+    <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Izithombe emilayezweni ingekwe ivezwe"</string>
     <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Bonisa izithombe\" ezisusiwe"</string>
     <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> ku-<xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Ilinde ukuvumelanisa"</string>
     <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"I-imeyli yakho izovela maduze."</string>
-    <string name="widget_other_views" msgid="4988574907386539499">"Cindezela isithonjana ukuze ushintshe."</string>
     <string name="widget_all_mail" msgid="4352573990283094963">"Ibhokisi lemiyalezo engenayo elihlanganisiwe"</string>
     <string name="widget_unread" msgid="4404711399009077833">"Akufundiwe"</string>
     <string name="widget_starred" msgid="8290352707134011791">"Okunenkanyezi"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 391565a..e54ea86 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -856,14 +856,30 @@
          provisioning, just before jumping into system settings such as Device Policy grant,
          PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
     <string name="account_security_dialog_content_fmt">
-         <xliff:g id="account">%s</xliff:g> requires that you update your security settings.</string>
+         <xliff:g id="account">%s</xliff:g> requires that you update your security
+         settings.</string>
 
     <!-- Notification ticker when device security required (note: unused in Holo XL) -->
-    <string name="security_notification_ticker_fmt">
+    <string name="security_unsupported_ticker_fmt">
+            Account \"<xliff:g id="account">%s</xliff:g>\" cannot be synced due to security
+    requirements.</string>
+    <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+    <string name="security_needed_ticker_fmt">
             Account \"<xliff:g id="account">%s</xliff:g>\" requires security settings update.
     </string>
+    <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+    <string name="security_changed_ticker_fmt">
+            Account \"<xliff:g id="account">%s</xliff:g>\" changed its security settings; no user
+            action is required.
+    </string>
     <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
-    <string name="security_notification_content_title">Security update required</string>
+    <string name="security_notification_content_update_title">Security update required</string>
+    <!-- Notification content title when device security policies have changed [CHAR_LIMIT=30] -->
+    <string name="security_notification_content_change_title">Security policies have
+         changed</string>
+    <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
+    <string name="security_notification_content_unsupported_title">Security policies cannot be
+         met</string>
     <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
     <string name="account_security_title">Device security</string>
     <!-- Additional diagnostic text when the email app asserts control of the phone.
@@ -937,15 +953,27 @@
     <string name="account_settings_mail_check_frequency_label">Inbox check frequency</string>
     <!-- On Settings screen, setting option name -->
     <string name="account_settings_incoming_label">Incoming settings</string>
-   <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+    <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
     <string name="account_settings_incoming_summary">
         Username, password, and other incoming server settings</string>
     <!-- On Settings screen, setting option name -->
     <string name="account_settings_outgoing_label">Outgoing settings</string>
-   <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+    <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
     <string name="account_settings_outgoing_summary">
         Username, password, and other outgoing server settings</string>
     <!-- On Settings screen, setting option name -->
+    <string name="account_settings_enforced_label">Policies enforced</string>
+    <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+    <string name="account_settings_enforced_summary">None</string>
+    <!-- On Settings screen, setting option name -->
+    <string name="account_settings_unsupported_label">Unsupported policies</string>
+    <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+    <string name="account_settings_unsupported_summary">None</string>
+    <!-- On Settings screen, label for button that attempts to sync the account -->
+    <string name="account_settings_retry_label">Attempt sync</string>
+    <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
+    <string name="account_settings_retry_summary">Tap here to attempt to sync this account (i.e. if server settings have changed)</string>
+    <!-- On Settings screen, setting option name -->
     <string name="account_settings_description_label">Account name</string>
     <!-- On Settings screen, setting option name -->
     <string name="account_settings_name_label">Your name</string>
@@ -963,6 +991,8 @@
     <string name="account_settings_notifications">Notification settings</string>
     <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
     <string name="account_settings_data_usage">Data usage</string>
+    <!-- On Settings screen, section heading -->
+    <string name="account_settings_policies">Security policies</string>
 
     <!-- On settings screen, dialog heading informing user to edit a quick response -->
     <string name="edit_quick_response_dialog">Edit quick response</string>
@@ -1169,6 +1199,8 @@
     <string name="waitinf_for_sync_message_2">Your email will appear soon.</string>
 
     <!-- Widget -->
+    <!-- Instruction for how to move to different widget views [CHAR LIMIT=20] -->
+    <string name="widget_other_views">Touch icon to change.</string>
     <!-- Header for the "Combined Inbox" view (showing mail in all inboxes) [CHAR LIMIT=20] -->
     <string name="widget_all_mail">Combined Inbox</string>
     <!-- Header for the "Unread" widget view (showing all unread mail) [CHAR LIMIT=20] -->
@@ -1213,4 +1245,17 @@
     <!-- A long placeholder string to be used in template XML files message_list_item_*.xml.
          Used only in layout computation, and never actually exposed to the user. -->
     <string name="long_string" translatable="false">looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong</string>
+
+    <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=40] -->
+    <string name="policy_dont_allow_camera">Disallow use of the device\'s camera</string>
+    <!-- A policy requiring a device lock screen password [CHAR LIMIT=40] -->
+    <string name="policy_require_password">Require device password</string>
+    <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=40] -->
+    <string name="policy_password_history">Restrict the reuse of recent passwords</string>
+    <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=40] -->
+    <string name="policy_password_expiration">Require passwords to expire</string>
+    <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=40] -->
+    <string name="policy_screen_timeout">Require an idle device to lock its screen</string>
 </resources>
+
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
old mode 100644
new mode 100755
index 7b6fa9b..e553863
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -136,6 +136,26 @@
     </PreferenceCategory>
 
     <PreferenceCategory
+        android:key="account_policies"
+        android:title="@string/account_settings_policies">
+
+        <com.android.email.activity.setup.PolicyListPreference
+            android:key="policies_enforced"
+            android:title="@string/account_settings_enforced_label"
+            android:summary="@string/account_settings_enforced_summary" />
+
+        <com.android.email.activity.setup.PolicyListPreference
+            android:key="policies_unsupported"
+            android:title="@string/account_settings_unsupported_label"
+            android:summary="@string/account_settings_unsupported_summary" />
+
+        <Preference
+            android:key="policies_retry_account"
+            android:title="@string/account_settings_retry_label"
+            android:summary="@string/account_settings_retry_summary" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
         android:title="@string/account_settings_category_delete_account">
 
         <PreferenceScreen
diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index 5ed3e01..eaf0213 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -52,6 +52,7 @@
 import com.android.emailcommon.provider.EmailContent.Message;
 import com.android.emailcommon.provider.EmailContent.MessageColumns;
 import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.utility.EmailAsyncTask;
 import com.android.emailcommon.utility.Utility;
 import com.google.common.annotations.VisibleForTesting;
 
@@ -62,7 +63,6 @@
  * Class that manages notifications.
  */
 public class NotificationController {
-    private static final int NOTIFICATION_ID_SECURITY_NEEDED = 1;
     /** Reserved for {@link com.android.exchange.CalendarSyncEnabler} */
     @SuppressWarnings("unused")
     private static final int NOTIFICATION_ID_EXCHANGE_CALENDAR_ADDED = 2;
@@ -70,8 +70,11 @@
     private static final int NOTIFICATION_ID_PASSWORD_EXPIRING = 4;
     private static final int NOTIFICATION_ID_PASSWORD_EXPIRED = 5;
 
+    private static final int NOTIFICATION_ID_BASE_MASK = 0xF0000000;
     private static final int NOTIFICATION_ID_BASE_NEW_MESSAGES = 0x10000000;
     private static final int NOTIFICATION_ID_BASE_LOGIN_WARNING = 0x20000000;
+    private static final int NOTIFICATION_ID_BASE_SECURITY_NEEDED = 0x30000000;
+    private static final int NOTIFICATION_ID_BASE_SECURITY_CHANGED = 0x40000000;
 
     /** Selection to retrieve accounts that should we notify user for changes */
     private final static String NOTIFIED_ACCOUNT_SELECTION =
@@ -144,7 +147,7 @@
     private boolean needsOngoingNotification(int notificationId) {
         // "Security needed" must be ongoing so that the user doesn't close it; otherwise, sync will
         // be prevented until a reboot.  Consider also doing this for password expired.
-        return notificationId == NOTIFICATION_ID_SECURITY_NEEDED;
+        return (notificationId & NOTIFICATION_ID_BASE_MASK) == NOTIFICATION_ID_BASE_SECURITY_NEEDED;
     }
 
     /**
@@ -591,24 +594,67 @@
     }
 
     /**
-     * Show (or update) a security needed notification. The given account is used to update
-     * the display text, but, all accounts share the same notification ID.
+     * Show (or update) a security needed notification. If tapped, the user is taken to a
+     * dialog asking whether he wants to update his settings.
      */
     public void showSecurityNeededNotification(Account account) {
         Intent intent = AccountSecurity.actionUpdateSecurityIntent(mContext, account.mId, true);
         String accountName = account.getDisplayName();
         String ticker =
-            mContext.getString(R.string.security_notification_ticker_fmt, accountName);
-        String title = mContext.getString(R.string.security_notification_content_title);
+            mContext.getString(R.string.security_needed_ticker_fmt, accountName);
+        String title = mContext.getString(R.string.security_notification_content_update_title);
         showAccountNotification(account, ticker, title, accountName, intent,
-                NOTIFICATION_ID_SECURITY_NEEDED);
+                (int)(NOTIFICATION_ID_BASE_SECURITY_NEEDED + account.mId));
     }
 
     /**
-     * Cancels the security needed notification.
+     * Show (or update) a security changed notification. If tapped, the user is taken to the
+     * 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);
+        String accountName = account.getDisplayName();
+        String ticker =
+            mContext.getString(R.string.security_changed_ticker_fmt, accountName);
+        String title = mContext.getString(R.string.security_notification_content_change_title);
+        showAccountNotification(account, ticker, title, accountName, intent,
+                (int)(NOTIFICATION_ID_BASE_SECURITY_CHANGED + account.mId));
+    }
+
+    /**
+     * Show (or update) a security unsupported notification. If tapped, the user is taken to the
+     * 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);
+        String accountName = account.getDisplayName();
+        String ticker =
+            mContext.getString(R.string.security_unsupported_ticker_fmt, accountName);
+        String title = mContext.getString(R.string.security_notification_content_unsupported_title);
+        showAccountNotification(account, ticker, title, accountName, intent,
+                (int)(NOTIFICATION_ID_BASE_SECURITY_NEEDED + account.mId));
+   }
+
+    /**
+     * Cancels all security needed notifications.
      */
     public void cancelSecurityNeededNotification() {
-        mNotificationManager.cancel(NOTIFICATION_ID_SECURITY_NEEDED);
+        EmailAsyncTask.runAsyncParallel(new Runnable() {
+            @Override
+            public void run() {
+                Cursor c = mContext.getContentResolver().query(Account.CONTENT_URI,
+                        Account.ID_PROJECTION, null, null, null);
+                try {
+                    while (c.moveToNext()) {
+                        long id = c.getLong(Account.ID_PROJECTION_COLUMN);
+                        mNotificationManager.cancel(
+                               (int)(NOTIFICATION_ID_BASE_SECURITY_NEEDED + id));
+                    }
+                }
+                finally {
+                    c.close();
+                }
+            }});
     }
 
     /**
diff --git a/src/com/android/email/SecurityPolicy.java b/src/com/android/email/SecurityPolicy.java
index f571e8a..71793a0 100644
--- a/src/com/android/email/SecurityPolicy.java
+++ b/src/com/android/email/SecurityPolicy.java
@@ -20,11 +20,15 @@
 import android.app.admin.DeviceAdminReceiver;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
+import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
+import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
+import android.content.OperationApplicationException;
 import android.database.Cursor;
+import android.os.RemoteException;
 import android.util.Log;
 
 import com.android.email.service.EmailBroadcastProcessorService;
@@ -34,9 +38,12 @@
 import com.android.emailcommon.provider.EmailContent.AccountColumns;
 import com.android.emailcommon.provider.EmailContent.PolicyColumns;
 import com.android.emailcommon.provider.Policy;
+import com.android.emailcommon.utility.TextUtilities;
 import com.android.emailcommon.utility.Utility;
 import com.google.common.annotations.VisibleForTesting;
 
+import java.util.ArrayList;
+
 /**
  * Utility functions to support reading and writing security policies, and handshaking the device
  * into and out of various security states.
@@ -204,11 +211,12 @@
     }
 
     /**
-     * API: Report that policies may have been updated due to rewriting values in an Account.
-     * @param accountId the account that has been updated, -1 if unknown/deleted
+     * API: Report that policies may have been updated due to rewriting values in an Account; we
+     * clear the aggregate policy (so it can be recomputed) and set the policies in the DPM
      */
-    public synchronized void policiesUpdated(long accountId) {
+    public synchronized void policiesUpdated() {
         mAggregatePolicy = null;
+        setActivePolicies();
     }
 
     /**
@@ -221,58 +229,7 @@
         if (Email.DEBUG) {
             Log.d(TAG, "reducePolicies");
         }
-        policiesUpdated(-1);
-        setActivePolicies();
-    }
-
-    /**
-     * API: Query if the proposed set of policies are supported on the device.
-     *
-     * @param policy the polices that were requested
-     * @return boolean if supported
-     */
-    public boolean isSupported(Policy policy) {
-        // IMPLEMENTATION:  At this time, the only policy which might not be supported is
-        // encryption (which requires low-level systems support).  Other policies are fully
-        // supported by the framework and do not need to be checked.
-        if (policy.mRequireEncryption) {
-            int encryptionStatus = getDPM().getStorageEncryptionStatus();
-            if (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_UNSUPPORTED) {
-                return false;
-            }
-        }
-
-        // If we ever support devices that can't disable cameras for any reason, we should
-        // indicate as such in the mDontAllowCamera policy
-
-        return true;
-    }
-
-    /**
-     * API: Remove any unsupported policies
-     *
-     * This is used when we have a set of polices that have been requested, but the server
-     * is willing to allow unsupported policies to be considered optional.
-     *
-     * @param policy the polices that were requested
-     * @return the same PolicySet if all are supported;  A replacement PolicySet if any
-     *   unsupported policies were removed
-     */
-    public Policy clearUnsupportedPolicies(Policy policy) {
-        // IMPLEMENTATION:  At this time, the only policy which might not be supported is
-        // encryption (which requires low-level systems support).  Other policies are fully
-        // supported by the framework and do not need to be checked.
-        if (policy.mRequireEncryption) {
-            int encryptionStatus = getDPM().getStorageEncryptionStatus();
-            if (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_UNSUPPORTED) {
-                policy.mRequireEncryption = false;
-            }
-        }
-
-        // If we ever support devices that can't disable cameras for any reason, we should
-        // clear the mDontAllowCamera policy
-
-        return policy;
+        policiesUpdated();
     }
 
     /**
@@ -303,6 +260,9 @@
             if ((reasons & INACTIVE_NEED_ENCRYPTION) != 0) {
                 sb.append("encryption ");
             }
+            if ((reasons & INACTIVE_PROTOCOL_POLICIES) != 0) {
+                sb.append("protocol ");
+            }
             Log.d(TAG, sb.toString());
         }
         return reasons == 0;
@@ -329,6 +289,11 @@
     public final static int INACTIVE_NEED_ENCRYPTION = 8;
 
     /**
+     * Return bits from isActive:  Protocol-specific policies cannot be enforced
+     */
+    public final static int INACTIVE_PROTOCOL_POLICIES = 16;
+
+    /**
      * API: Query used to determine if a given policy is "active" (the device is operating at
      * the required security level).
      *
@@ -418,6 +383,10 @@
             // password failures are counted locally - no test required here
             // no check required for remote wipe (it's supported, if we're the admin)
 
+            if (policy.mProtocolPoliciesUnsupported != null) {
+                reasons |= INACTIVE_PROTOCOL_POLICIES;
+            }
+
             // If we made it all the way, reasons == 0 here.  Otherwise it's a list of grievances.
             return reasons;
         }
@@ -514,24 +483,122 @@
         Account account = Account.restoreAccountWithId(mContext, accountId);
         // In case the account has been deleted, just return
         if (account == null) return;
+        if (account.mPolicyKey == 0) return;
+        Policy policy = Policy.restorePolicyWithId(mContext, account.mPolicyKey);
+        if (policy == null) return;
         if (Email.DEBUG) {
-            if (account.mPolicyKey == 0) {
-                Log.d(TAG, "policiesRequired for " + account.mDisplayName + ": none");
-            } else {
-                Policy policy = Policy.restorePolicyWithId(mContext, account.mPolicyKey);
-                if (policy == null) {
-                    Log.w(TAG, "No policy??");
-                } else {
-                    Log.d(TAG, "policiesRequired for " + account.mDisplayName + ": " + policy);
-                }
-            }
+            Log.d(TAG, "policiesRequired for " + account.mDisplayName + ": " + policy);
         }
 
         // Mark the account as "on hold".
         setAccountHoldFlag(mContext, account, true);
 
-        // Put up a notification
-        NotificationController.getInstance(mContext).showSecurityNeededNotification(account);
+        // Put up an appropriate notification
+        if (policy.mProtocolPoliciesUnsupported == null) {
+            NotificationController.getInstance(mContext).showSecurityNeededNotification(account);
+        } else {
+            NotificationController.getInstance(mContext).showSecurityUnsupportedNotification(
+                    account);
+        }
+    }
+
+    public static void clearAccountPolicy(Context context, Account account) {
+        setAccountPolicy(context, account, null, null);
+    }
+
+    /**
+     * Set the policy for an account atomically; this also removes any other policy associated with
+     * the account and sets the policy key for the account.  If policy is null, the policyKey is
+     * set to 0 and the securitySyncKey to null.  Also, update the account object to reflect the
+     * current policyKey and securitySyncKey
+     * @param context the caller's context
+     * @param account the account whose policy is to be set
+     * @param policy the policy to set, or null if we're clearing the policy
+     * @param securitySyncKey the security sync key for this account (ignored if policy is null)
+     */
+    public static void setAccountPolicy(Context context, Account account, Policy policy,
+            String securitySyncKey) {
+        ArrayList<ContentProviderOperation> ops = new ArrayList<ContentProviderOperation>();
+
+        // Make sure this is a valid policy set
+        if (policy != null) {
+            policy.normalize();
+            // Add the new policy (no account will yet reference this)
+            ops.add(ContentProviderOperation.newInsert(
+                    Policy.CONTENT_URI).withValues(policy.toContentValues()).build());
+            // Make the policyKey of the account our newly created policy, and set the sync key
+            ops.add(ContentProviderOperation.newUpdate(
+                    ContentUris.withAppendedId(Account.CONTENT_URI, account.mId))
+                    .withValueBackReference(AccountColumns.POLICY_KEY, 0)
+                    .withValue(AccountColumns.SECURITY_SYNC_KEY, securitySyncKey)
+                    .build());
+        } else {
+            ops.add(ContentProviderOperation.newUpdate(
+                    ContentUris.withAppendedId(Account.CONTENT_URI, account.mId))
+                    .withValue(AccountColumns.SECURITY_SYNC_KEY, null)
+                    .withValue(AccountColumns.POLICY_KEY, 0)
+                    .build());
+        }
+
+        // Delete the previous policy associated with this account, if any
+        if (account.mPolicyKey > 0) {
+            ops.add(ContentProviderOperation.newDelete(
+                    ContentUris.withAppendedId(
+                            Policy.CONTENT_URI, account.mPolicyKey)).build());
+        }
+
+        try {
+            context.getContentResolver().applyBatch(EmailContent.AUTHORITY, ops);
+            account.refresh(context);
+        } catch (RemoteException e) {
+           // This is fatal to a remote process
+            throw new IllegalStateException("Exception setting account policy.");
+        } catch (OperationApplicationException e) {
+            // Can't happen; our provider doesn't throw this exception
+        }
+    }
+
+    public void setAccountPolicy(long accountId, Policy policy, String securityKey) {
+        Account account = Account.restoreAccountWithId(mContext, accountId);
+        Policy oldPolicy = null;
+        if (account.mPolicyKey > 0) {
+            oldPolicy = Policy.restorePolicyWithId(mContext, account.mPolicyKey);
+        }
+        boolean policyChanged = !oldPolicy.equals(policy);
+        if (!policyChanged && (TextUtilities.stringOrNullEquals(securityKey,
+                account.mSecuritySyncKey))) {
+            Log.d(Logging.LOG_TAG, "setAccountPolicy; policy unchanged");
+        } else {
+            setAccountPolicy(mContext, account, policy, securityKey);
+            policiesUpdated();
+        }
+
+        boolean setHold = false;
+        if (policy.mProtocolPoliciesUnsupported != null) {
+            // We can't support this, reasons in unsupportedRemotePolicies
+            Log.d(Logging.LOG_TAG,
+                    "Notify policies for " + account.mDisplayName + " not supported.");
+            setHold = true;
+            NotificationController.getInstance(mContext).showSecurityUnsupportedNotification(
+                    account);
+            // Erase data
+            Controller.getInstance(mContext).deleteSyncedDataSync(accountId);
+        } else if (isActive(policy)) {
+            if (policyChanged) {
+                Log.d(Logging.LOG_TAG, "Notify policies for " + account.mDisplayName + " changed.");
+                // Notify that policies changed
+                NotificationController.getInstance(mContext).showSecurityChangedNotification(
+                        account);
+            }
+        } else {
+            setHold = true;
+            Log.d(Logging.LOG_TAG, "Notify policies for " + account.mDisplayName +
+                    " are not being enforced.");
+            // Put up a notification
+            NotificationController.getInstance(mContext).showSecurityNeededNotification(account);
+        }
+        // Set/clear the account hold.
+        setAccountHoldFlag(mContext, account, setHold);
     }
 
     /**
@@ -600,7 +667,7 @@
         } finally {
             c.close();
         }
-        policiesUpdated(-1);
+        policiesUpdated();
     }
 
     /**
diff --git a/src/com/android/email/activity/Welcome.java b/src/com/android/email/activity/Welcome.java
index e777461..8280732 100644
--- a/src/com/android/email/activity/Welcome.java
+++ b/src/com/android/email/activity/Welcome.java
@@ -41,6 +41,7 @@
 import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.provider.EmailContent.Message;
 import com.android.emailcommon.provider.Mailbox;
+import com.android.emailcommon.provider.Policy;
 import com.android.emailcommon.utility.EmailAsyncTask;
 import com.android.emailcommon.utility.IntentUtilities;
 import com.android.emailcommon.utility.Utility;
@@ -414,7 +415,19 @@
         @Override
         public void onAccountSecurityHold(long accountId) {
             cleanUp();
-
+            // If we can't find the account, we know what to do
+            Account account = Account.restoreAccountWithId(Welcome.this, accountId);
+            if (account == null) {
+                onAccountNotFound();
+                return;
+            }
+            // If there's no policy or it's "unsupported", act like the account doesn't exist
+            Policy policy = Policy.restorePolicyWithId(Welcome.this, account.mPolicyKey);
+            if (policy == null || (policy.mProtocolPoliciesUnsupported != null)) {
+                onAccountNotFound();
+                return;
+            }
+            // Otherwise, try advancing security
             ActivityHelper.showSecurityHoldDialog(Welcome.this, accountId);
             finish();
         }
diff --git a/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java b/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
index ace59c3..a88e4b7 100644
--- a/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountCheckSettingsFragment.java
@@ -469,8 +469,10 @@
                                 EmailServiceProxy.VALIDATE_BUNDLE_POLICY_SET));
                         return new MessagingException(resultCode, mStoreHost);
                     } else if (resultCode == MessagingException.SECURITY_POLICIES_UNSUPPORTED) {
-                        String[] data = bundle.getStringArray(
-                                EmailServiceProxy.VALIDATE_BUNDLE_UNSUPPORTED_POLICIES);
+                        Policy policy = (Policy)bundle.getParcelable(
+                                EmailServiceProxy.VALIDATE_BUNDLE_POLICY_SET);
+                        String unsupported = policy.mProtocolPoliciesUnsupported;
+                        String[] data = unsupported.split("" + Policy.POLICY_STRING_DELIMITER);
                         return new MessagingException(resultCode, mStoreHost, data);
                     } else if (resultCode != MessagingException.NO_ERROR) {
                         String errorMessage =
diff --git a/src/com/android/email/activity/setup/AccountSecurity.java b/src/com/android/email/activity/setup/AccountSecurity.java
index 8c8ce5a..ec336d5 100644
--- a/src/com/android/email/activity/setup/AccountSecurity.java
+++ b/src/com/android/email/activity/setup/AccountSecurity.java
@@ -119,6 +119,7 @@
             finish();
             return;
         }
+
         // Special handling for password expiration events
         if (passwordExpiring || passwordExpired) {
             FragmentManager fm = getFragmentManager();
diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java
index 5f8f189..1acc55b 100644
--- a/src/com/android/email/activity/setup/AccountSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java
@@ -27,6 +27,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Vibrator;
@@ -43,6 +44,7 @@
 
 import com.android.email.Email;
 import com.android.email.R;
+import com.android.email.SecurityPolicy;
 import com.android.email.mail.Sender;
 import com.android.emailcommon.AccountManagerTypes;
 import com.android.emailcommon.CalendarProviderStub;
@@ -51,8 +53,11 @@
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.provider.HostAuth;
+import com.android.emailcommon.provider.Policy;
 import com.android.emailcommon.utility.Utility;
 
+import java.util.ArrayList;
+
 /**
  * Fragment containing the main logic for account settings.  This also calls out to other
  * fragments for server settings.
@@ -81,6 +86,10 @@
     private static final String PREFERENCE_VIBRATE_WHEN = "account_settings_vibrate_when";
     private static final String PREFERENCE_RINGTONE = "account_ringtone";
     private static final String PREFERENCE_CATEGORY_SERVER = "account_servers";
+    private static final String PREFERENCE_CATEGORY_POLICIES = "account_policies";
+    private static final String PREFERENCE_POLICIES_ENFORCED = "policies_enforced";
+    private static final String PREFERENCE_POLICIES_UNSUPPORTED = "policies_unsupported";
+    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";
@@ -352,6 +361,46 @@
     }
 
     /**
+     * From a Policy, create and return an ArrayList of Strings that describe (simply) those
+     * policies that are supported by the OS.  At the moment, the strings are simple (e.g.
+     * "password required"); we should probably add more information (# characters, etc.), though
+     */
+    private ArrayList<String> getSystemPoliciesList(Policy policy) {
+        Resources res = mContext.getResources();
+        ArrayList<String> policies = new ArrayList<String>();
+        if (policy.mPasswordMode != Policy.PASSWORD_MODE_NONE) {
+            policies.add(res.getString(R.string.policy_require_password));
+        }
+        if (policy.mPasswordHistory > 0) {
+            policies.add(res.getString(R.string.policy_password_history));
+        }
+        if (policy.mPasswordExpirationDays > 0) {
+            policies.add(res.getString(R.string.policy_password_expiration));
+        }
+        if (policy.mMaxScreenLockTime > 0) {
+            policies.add(res.getString(R.string.policy_screen_timeout));
+        }
+        if (policy.mDontAllowCamera) {
+            policies.add(res.getString(R.string.policy_dont_allow_camera));
+        }
+        return policies;
+    }
+
+    private void setPolicyListSummary(ArrayList<String> policies, String policiesToAdd,
+            String preferenceName) {
+        Policy.addPolicyStringToList(policiesToAdd, policies);
+        if (policies.size() > 0) {
+            Preference p = findPreference(preferenceName);
+            StringBuilder sb = new StringBuilder();
+            for (String desc: policies) {
+                sb.append(desc);
+                sb.append('\n');
+            }
+            p.setSummary(sb.toString());
+        }
+    }
+
+    /**
      * Load account data into preference UI
      */
     private void loadSettings() {
@@ -397,7 +446,6 @@
         });
 
         mAccountSignature = (EditTextPreference) findPreference(PREFERENCE_SIGNATURE);
-        String signature = mAccount.getSignature();
         mAccountSignature.setText(mAccount.getSignature());
         mAccountSignature.setOnPreferenceChangeListener(
             new Preference.OnPreferenceChangeListener() {
@@ -520,6 +568,45 @@
             notificationsCategory.removePreference(mAccountVibrateWhen);
         }
 
+        final Preference retryAccount = findPreference(PREFERENCE_POLICIES_RETRY_ACCOUNT);
+        final PreferenceCategory policiesCategory = (PreferenceCategory) findPreference(
+                PREFERENCE_CATEGORY_POLICIES);
+        if (mAccount.mPolicyKey > 0) {
+            // Make sure we have most recent data from account
+            mAccount.refresh(mContext);
+            Policy policy = Policy.restorePolicyWithId(mContext, mAccount.mPolicyKey);
+            if (policy == null) {
+                // The account has been deleted?  Crazy, but not impossible
+                return;
+            }
+            if (policy.mProtocolPoliciesEnforced != null) {
+                ArrayList<String> policies = getSystemPoliciesList(policy);
+                setPolicyListSummary(policies, policy.mProtocolPoliciesEnforced,
+                        PREFERENCE_POLICIES_ENFORCED);
+            }
+            if (policy.mProtocolPoliciesUnsupported != null) {
+                ArrayList<String> policies = new ArrayList<String>();
+                setPolicyListSummary(policies, policy.mProtocolPoliciesUnsupported,
+                        PREFERENCE_POLICIES_UNSUPPORTED);
+            } else {
+                // Don't show "retry" unless we have unsupported policies
+                policiesCategory.removePreference(retryAccount);
+            }
+        } else {
+            // Remove the category completely if there are no policies
+            getPreferenceScreen().removePreference(policiesCategory);
+        }
+
+        retryAccount.setOnPreferenceClickListener(
+                new Preference.OnPreferenceClickListener() {
+                    public boolean onPreferenceClick(Preference preference) {
+                        // Release the account
+                        SecurityPolicy.setAccountHoldFlag(mContext, mAccount, false);
+                        // Remove the preference
+                        policiesCategory.removePreference(retryAccount);
+                        return true;
+                    }
+                });
         findPreference(PREFERENCE_INCOMING).setOnPreferenceClickListener(
                 new Preference.OnPreferenceClickListener() {
                     public boolean onPreferenceClick(Preference preference) {
diff --git a/src/com/android/email/activity/setup/PolicyListPreference.java b/src/com/android/email/activity/setup/PolicyListPreference.java
new file mode 100644
index 0000000..3a32438
--- /dev/null
+++ b/src/com/android/email/activity/setup/PolicyListPreference.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2011 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.content.Context;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.TextView;
+
+/**
+ * Simple text preference allowing a large number of lines
+ */
+public class PolicyListPreference extends Preference {
+    // Arbitrary, but large number (we don't, and won't, have nearly this many)
+    public static final int MAX_POLICIES = 24;
+
+    public PolicyListPreference(Context ctx, AttributeSet attrs, int defStyle) {
+        super(ctx, attrs, defStyle);
+    }
+
+    public PolicyListPreference(Context ctx, AttributeSet attrs) {
+        super(ctx, attrs);
+    }
+
+    @Override
+    protected void onBindView(View view) {
+        super.onBindView(view);
+        ((TextView)view.findViewById(android.R.id.summary)).setMaxLines(MAX_POLICIES);
+    }
+}
diff --git a/src/com/android/email/provider/EmailProvider.java b/src/com/android/email/provider/EmailProvider.java
index 59acee1..f15b76f 100644
--- a/src/com/android/email/provider/EmailProvider.java
+++ b/src/com/android/email/provider/EmailProvider.java
@@ -160,8 +160,9 @@
     // Version 26: Update IMAP accounts to add FLAG_SUPPORTS_SEARCH flag
     // Version 27: Add protocolSearchInfo to Message table
     // Version 28: Add notifiedMessageId and notifiedMessageCount to Account
+    // Version 29: Add protocolPoliciesEnforced and protocolPoliciesUnsupported to Policy
 
-    public static final int DATABASE_VERSION = 28;
+    public static final int DATABASE_VERSION = 29;
 
     // Any changes to the database format *must* include update-in-place code.
     // Original version: 2
@@ -651,7 +652,9 @@
             + PolicyColumns.MAX_HTML_TRUNCATION_SIZE + " integer, "
             + PolicyColumns.MAX_EMAIL_LOOKBACK + " integer, "
             + PolicyColumns.MAX_CALENDAR_LOOKBACK + " integer, "
-            + PolicyColumns.PASSWORD_RECOVERY_ENABLED + " integer"
+            + PolicyColumns.PASSWORD_RECOVERY_ENABLED + " integer, "
+            + PolicyColumns.PROTOCOL_POLICIES_ENFORCED + " text, "
+            + PolicyColumns.PROTOCOL_POLICIES_UNSUPPORTED + " text"
             + ");";
         db.execSQL("create table " + Policy.TABLE_NAME + s);
     }
@@ -1341,10 +1344,22 @@
                             + " add column " + Account.NOTIFIED_MESSAGE_COUNT + " integer;");
                 } catch (SQLException e) {
                     // Shouldn't be needed unless we're debugging and interrupt the process
-                    Log.w(TAG, "Exception upgrading EmailProvider.db from 27 to 27 " + e);
+                    Log.w(TAG, "Exception upgrading EmailProvider.db from 27 to 28 " + e);
                 }
                 oldVersion = 28;
             }
+            if (oldVersion == 28) {
+                try {
+                    db.execSQL("alter table " + Policy.TABLE_NAME
+                            + " add column " + Policy.PROTOCOL_POLICIES_ENFORCED + " text;");
+                    db.execSQL("alter table " + Policy.TABLE_NAME
+                            + " add column " + Policy.PROTOCOL_POLICIES_UNSUPPORTED + " text;");
+                } catch (SQLException e) {
+                    // Shouldn't be needed unless we're debugging and interrupt the process
+                    Log.w(TAG, "Exception upgrading EmailProvider.db from 28 to 29 " + e);
+                }
+                oldVersion = 29;
+            }
         }
 
         @Override
diff --git a/src/com/android/email/service/PolicyService.java b/src/com/android/email/service/PolicyService.java
index a97f659..2394eed 100644
--- a/src/com/android/email/service/PolicyService.java
+++ b/src/com/android/email/service/PolicyService.java
@@ -16,15 +16,15 @@
 
 package com.android.email.service;
 
-import com.android.email.SecurityPolicy;
-import com.android.emailcommon.provider.Policy;
-import com.android.emailcommon.service.IPolicyService;
-
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
 
+import com.android.email.SecurityPolicy;
+import com.android.emailcommon.provider.Policy;
+import com.android.emailcommon.service.IPolicyService;
+
 public class PolicyService extends Service {
 
     private SecurityPolicy mSecurityPolicy;
@@ -35,32 +35,16 @@
             return mSecurityPolicy.isActive(policy);
         }
 
-        public void policiesRequired(long accountId) {
-            mSecurityPolicy.policiesRequired(accountId);
-        }
-
-        public void policiesUpdated(long accountId) {
-            mSecurityPolicy.policiesUpdated(accountId);
-        }
-
         public void setAccountHoldFlag(long accountId, boolean newState) {
             SecurityPolicy.setAccountHoldFlag(mContext, accountId, newState);
         }
 
-        public boolean isActiveAdmin() {
-            return mSecurityPolicy.isActiveAdmin();
-        }
-
         public void remoteWipe() {
             mSecurityPolicy.remoteWipe();
         }
 
-        public boolean isSupported(Policy policy) {
-            return mSecurityPolicy.isSupported(policy);
-        }
-
-        public Policy clearUnsupportedPolicies(Policy policy) {
-            return mSecurityPolicy.clearUnsupportedPolicies(policy);
+        public void setAccountPolicy(long accountId, Policy policy, String securityKey) {
+            mSecurityPolicy.setAccountPolicy(accountId, policy, securityKey);
         }
     };
 
diff --git a/tests/src/com/android/email/SecurityPolicyTests.java b/tests/src/com/android/email/SecurityPolicyTests.java
old mode 100644
new mode 100755
index ed26485..1a9731b
--- a/tests/src/com/android/email/SecurityPolicyTests.java
+++ b/tests/src/com/android/email/SecurityPolicyTests.java
@@ -142,7 +142,7 @@
         Account a3 = ProviderTestUtils.setupAccount("sec-3", true, mMockContext);
         Policy p3ain = setupPolicy(10, Policy.PASSWORD_MODE_SIMPLE, 0, 0, false, 0, 0, 0,
                 false, false);
-        Policy.setAccountPolicy(mMockContext, a3, p3ain, null);
+        SecurityPolicy.setAccountPolicy(mMockContext, a3, p3ain, null);
         Policy p3aout = mSecurityPolicy.computeAggregatePolicy();
         assertNotNull(p3aout);
         assertEquals(p3ain, p3aout);
@@ -150,7 +150,7 @@
         // Repeat that test with fully-populated policies
         Policy p3bin = setupPolicy(10, Policy.PASSWORD_MODE_SIMPLE, 15, 16, false, 6, 2, 3,
                 false, false);
-        Policy.setAccountPolicy(mMockContext, a3, p3bin, null);
+        SecurityPolicy.setAccountPolicy(mMockContext, a3, p3bin, null);
         Policy p3bout = mSecurityPolicy.computeAggregatePolicy();
         assertNotNull(p3bout);
         assertEquals(p3bin, p3bout);
@@ -166,7 +166,7 @@
         Policy p4in = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 0, 5, 7,
                 false, true);
         Account a4 = ProviderTestUtils.setupAccount("sec-4", true, mMockContext);
-        Policy.setAccountPolicy(mMockContext, a4, p4in, null);
+        SecurityPolicy.setAccountPolicy(mMockContext, a4, p4in, null);
         Policy p4out = mSecurityPolicy.computeAggregatePolicy();
         assertNotNull(p4out);
         assertEquals(20, p4out.mPasswordMinLength);
@@ -192,7 +192,7 @@
         Policy p5in = setupPolicy(4, Policy.PASSWORD_MODE_SIMPLE, 5, 6, true, 1, 0, 0,
                 true, false);
         Account a5 = ProviderTestUtils.setupAccount("sec-5", true, mMockContext);
-        Policy.setAccountPolicy(mMockContext, a5, p5in, null);
+        SecurityPolicy.setAccountPolicy(mMockContext, a5, p5in, null);
         Policy p5out = mSecurityPolicy.computeAggregatePolicy();
         assertNotNull(p5out);
         assertEquals(20, p5out.mPasswordMinLength);
@@ -236,17 +236,17 @@
         long accountId = account.mId;
         Policy initial = setupPolicy(10, Policy.PASSWORD_MODE_SIMPLE, 0, 0, false, 0, 0, 0,
                 false, false);
-        Policy.setAccountPolicy(mMockContext, accountId, initial, null);
+        SecurityPolicy.setAccountPolicy(mMockContext, account, initial, null);
 
         long oldKey = assertAccountPolicyConsistent(account.mId, 0);
 
         Policy updated = setupPolicy(10, Policy.PASSWORD_MODE_SIMPLE, 0, 0, false, 0, 0, 0,
                 false, false);
-        Policy.setAccountPolicy(mMockContext, accountId, updated, null);
+        SecurityPolicy.setAccountPolicy(mMockContext, account, updated, null);
         oldKey = assertAccountPolicyConsistent(account.mId, oldKey);
 
         // Remove the policy
-        Policy.clearAccountPolicy(
+        SecurityPolicy.clearAccountPolicy(
                 mMockContext, Account.restoreAccountWithId(mMockContext, accountId));
         assertNull("old policy not cleaned up",
                 Policy.restorePolicyWithId(mMockContext, oldKey));
@@ -306,15 +306,15 @@
         Account a1 = ProviderTestUtils.setupAccount("disable-1", true, mMockContext);
         Policy p1 = setupPolicy(10, Policy.PASSWORD_MODE_SIMPLE, 0, 0, false, 0, 0, 0,
                 false, false);
-        Policy.setAccountPolicy(mMockContext, a1, p1, "security-sync-key-1");
+        SecurityPolicy.setAccountPolicy(mMockContext, a1, p1, "security-sync-key-1");
 
         Account a2 = ProviderTestUtils.setupAccount("disable-2", true, mMockContext);
         Policy p2 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 0, 0, 0,
                 false, false);
-        Policy.setAccountPolicy(mMockContext, a2, p2, "security-sync-key-2");
+        SecurityPolicy.setAccountPolicy(mMockContext, a2, p2, "security-sync-key-2");
 
         Account a3 = ProviderTestUtils.setupAccount("disable-3", true, mMockContext);
-        Policy.clearAccountPolicy(mMockContext, a3);
+        SecurityPolicy.clearAccountPolicy(mMockContext, a3);
 
         mSecurityPolicy = SecurityPolicy.getInstance(mMockContext);
 
@@ -359,7 +359,7 @@
             ProviderTestUtils.setupAccount("expiring-2", true, mMockContext);
         Policy p2 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 30, 0, 0,
                 false, true);
-        Policy.setAccountPolicy(mMockContext, a2, p2, null);
+        SecurityPolicy.setAccountPolicy(mMockContext, a2, p2, null);
 
         // The expiring account should be returned
         nextExpiringAccountId = SecurityPolicy.findShortestExpiration(mMockContext);
@@ -369,7 +369,7 @@
         Account a3 = ProviderTestUtils.setupAccount("expiring-3", true, mMockContext);
         Policy p3 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 60, 0, 0,
                 false, true);
-        Policy.setAccountPolicy(mMockContext, a3, p3, null);
+        SecurityPolicy.setAccountPolicy(mMockContext, a3, p3, null);
 
         // The original expiring account (a2) should be returned
         nextExpiringAccountId = SecurityPolicy.findShortestExpiration(mMockContext);
@@ -379,7 +379,7 @@
         Account a4 = ProviderTestUtils.setupAccount("expiring-4", true, mMockContext);
         Policy p4 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 15, 0, 0,
                 false, true);
-        Policy.setAccountPolicy(mMockContext, a4, p4, null);
+        SecurityPolicy.setAccountPolicy(mMockContext, a4, p4, null);
 
         // The new expiring account (a4) should be returned
         nextExpiringAccountId = SecurityPolicy.findShortestExpiration(mMockContext);
@@ -409,7 +409,7 @@
         Account a2 = ProviderTestUtils.setupAccount("expired-2", true, mMockContext);
         Policy p2 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 0, 0, 0,
                 false, true);
-        Policy.setAccountPolicy(mMockContext, a2, p2, null);
+        SecurityPolicy.setAccountPolicy(mMockContext, a2, p2, null);
 
         // Add a mailbox & messages to each account
         long account1Id = a1.mId;
@@ -435,7 +435,7 @@
         Account a3 = ProviderTestUtils.setupAccount("expired-3", true, mMockContext);
         Policy p3 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 30, 0, 0,
                 false, true);
-        Policy.setAccountPolicy(mMockContext, a3, p3, null);
+        SecurityPolicy.setAccountPolicy(mMockContext, a3, p3, null);
 
         // Add mailbox & messages to 3rd account
         long account3Id = a3.mId;
@@ -467,38 +467,6 @@
     }
 
     /**
-     * Test the code that clears unsupported policies
-     * TODO inject a mock DPM so we can directly control & test all cases, no matter what device
-     */
-    public void testClearUnsupportedPolicies() {
-        Policy p1 =
-            setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, false, false);
-        Policy p2 =
-            setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, true, false);
-
-        mSecurityPolicy = SecurityPolicy.getInstance(mMockContext);
-        DevicePolicyManager dpm = mSecurityPolicy.getDPM();
-        boolean hasEncryption =
-            dpm.getStorageEncryptionStatus() != DevicePolicyManager.ENCRYPTION_STATUS_UNSUPPORTED;
-
-        Policy p1Result = mSecurityPolicy.clearUnsupportedPolicies(p1);
-        Policy p2Result = mSecurityPolicy.clearUnsupportedPolicies(p2);
-
-        // No changes expected when encryptionRequested was false
-        assertEquals(p1, p1Result);
-        if (hasEncryption) {
-            // No changes expected
-            assertEquals(p2, p2Result);
-        } else {
-            // If encryption is unsupported, encryption policy bits are cleared
-            Policy policyExpect =
-                setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, false,
-                        false);
-            assertEquals(policyExpect, p2Result);
-        }
-    }
-
-    /**
      * Test the code that converts from exchange-style quality to DPM/Lockscreen style quality.
      */
     public void testGetDPManagerPasswordQuality() {
diff --git a/tests/src/com/android/email/provider/PolicyTests.java b/tests/src/com/android/email/provider/PolicyTests.java
old mode 100644
new mode 100755
index 2903c45..e18b2c9
--- a/tests/src/com/android/email/provider/PolicyTests.java
+++ b/tests/src/com/android/email/provider/PolicyTests.java
@@ -16,6 +16,12 @@
 
 package com.android.email.provider;
 
+import android.content.Context;
+import android.os.Parcel;
+import android.test.ProviderTestCase2;
+import android.test.suitebuilder.annotation.MediumTest;
+
+import com.android.email.SecurityPolicy;
 import com.android.emailcommon.provider.Account;
 import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.provider.EmailContent.Attachment;
@@ -24,11 +30,6 @@
 import com.android.emailcommon.provider.Mailbox;
 import com.android.emailcommon.provider.Policy;
 
-import android.content.Context;
-import android.os.Parcel;
-import android.test.ProviderTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
-
 import java.util.ArrayList;
 
 /**
@@ -68,10 +69,10 @@
         // Setup two accounts with policies
         Account account1 = ProviderTestUtils.setupAccount("acct1", true, mMockContext);
         Policy policy1 = new Policy();
-        Policy.setAccountPolicy(mMockContext, account1, policy1, securitySyncKey);
+        SecurityPolicy.setAccountPolicy(mMockContext, account1, policy1, securitySyncKey);
         Account account2 = ProviderTestUtils.setupAccount("acct2", true, mMockContext);
         Policy policy2 = new Policy();
-        Policy.setAccountPolicy(mMockContext, account2, policy2, securitySyncKey);
+        SecurityPolicy.setAccountPolicy(mMockContext, account2, policy2, securitySyncKey);
         // Get the accounts back from the database
         account1.refresh(mMockContext);
         account2.refresh(mMockContext);
@@ -92,7 +93,7 @@
         assertEquals(0, account.mPolicyKey);
         assertEquals(0, EmailContent.count(mMockContext, Policy.CONTENT_URI));
         Policy policy = new Policy();
-        Policy.setAccountPolicy(mMockContext, account, policy, securitySyncKey);
+        SecurityPolicy.setAccountPolicy(mMockContext, account, policy, securitySyncKey);
         account.refresh(mMockContext);
         // We should have a policyKey now
         assertTrue(account.mPolicyKey > 0);
@@ -103,7 +104,7 @@
         assertEquals(policy, dbPolicy);
         // The account should have the security sync key set
         assertEquals(securitySyncKey, account.mSecuritySyncKey);
-        Policy.clearAccountPolicy(mMockContext, account);
+        SecurityPolicy.clearAccountPolicy(mMockContext, account);
         account.refresh(mMockContext);
         // Make sure policyKey is cleared and policy is deleted
         assertEquals(0, account.mPolicyKey);
@@ -118,11 +119,12 @@
         att.mAccountKey = acct.mId;
         return att;
     }
+
     public void testSetAttachmentFlagsForNewPolicy() {
         Account acct = ProviderTestUtils.setupAccount("acct1", true, mMockContext);
         Policy policy1 = new Policy();
         policy1.mDontAllowAttachments = true;
-        Policy.setAccountPolicy(mMockContext, acct, policy1, null);
+        SecurityPolicy.setAccountPolicy(mMockContext, acct, policy1, null);
         Mailbox box = ProviderTestUtils.setupMailbox("box1", acct.mId, true, mMockContext);
         Message msg1 = ProviderTestUtils.setupMessage("message1", acct.mId, box.mId, false, false,
                 mMockContext);
diff --git a/tests/src/com/android/email/provider/ProviderTests.java b/tests/src/com/android/email/provider/ProviderTests.java
old mode 100644
new mode 100755
index ebf3243..a33daca
--- a/tests/src/com/android/email/provider/ProviderTests.java
+++ b/tests/src/com/android/email/provider/ProviderTests.java
@@ -36,6 +36,7 @@
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import com.android.email.SecurityPolicy;
 import com.android.email.provider.EmailProvider.AttachmentService;
 import com.android.emailcommon.AccountManagerTypes;
 import com.android.emailcommon.provider.Account;
@@ -2529,7 +2530,7 @@
         Policy p2 = new Policy();
         p2.save(mMockContext);
         Policy p3 = new Policy();
-        Policy.setAccountPolicy(mMockContext, a.mId, p3, "0");
+        SecurityPolicy.setAccountPolicy(mMockContext, a, p3, "0");
 
         // We don't want anything cached or the tests below won't work.  Note that
         // deleteUnlinked is only called by EmailProvider when the caches are empty