Merge "Revert "Restore the account using SetupData after rotating the screen.""
diff --git a/Android.mk b/Android.mk
index 8b1df5b..843eda7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -37,7 +37,7 @@
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-LOCAL_SDK_VERSION := 16
+LOCAL_SDK_VERSION := current
# The Emma tool analyzes code coverage when running unit tests on the
# application. This configuration line selects which packages will be analyzed,
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9a7db74..3831181 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -22,7 +22,7 @@
>
<!-- This needs to be present when we are doing unbundled releases. -->
- <uses-sdk android:targetSdkVersion="16" android:minSdkVersion="14" />
+ <uses-sdk android:targetSdkVersion="17" android:minSdkVersion="14" />
<original-package
android:name="com.android.email" />
@@ -64,6 +64,9 @@
<uses-permission
android:name="android.permission.READ_PHONE_STATE"/>
+ <!-- Required for sending images from Gallery -->
+ <uses-permission android:name="com.google.android.gallery3d.permission.GALLERY_PROVIDER" />
+
<!-- Grant permission to other apps to view attachments -->
<permission
android:name="com.android.email.permission.READ_ATTACHMENT"
@@ -229,6 +232,7 @@
<activity
android:name=".activity.MessageCompose"
android:label="@string/compose_title"
+ android:enabled="false"
android:theme="@android:style/Theme.Holo.Light"
>
<intent-filter>
@@ -450,6 +454,7 @@
android:authorities="com.android.email.attachmentprovider"
android:multiprocess="true"
android:grantUriPermissions="true"
+ android:exported="true"
android:readPermission="com.android.email.permission.READ_ATTACHMENT"
/>
@@ -460,6 +465,7 @@
android:authorities="com.android.email.provider;com.android.email.notifier"
android:multiprocess="true"
android:permission="com.android.email.permission.ACCESS_PROVIDER"
+ android:exported="true"
android:label="@string/app_name"
/>
diff --git a/emailcommon/src/com/android/emailcommon/provider/Account.java b/emailcommon/src/com/android/emailcommon/provider/Account.java
index 97a6f12..254a10b 100755
--- a/emailcommon/src/com/android/emailcommon/provider/Account.java
+++ b/emailcommon/src/com/android/emailcommon/provider/Account.java
@@ -70,7 +70,7 @@
// Whether or not the user has asked for notifications of new mail in this account
public final static int FLAGS_NOTIFY_NEW_MAIL = 1<<0;
// Whether or not the user has asked for vibration notifications with all new mail
- public final static int FLAGS_VIBRATE_ALWAYS = 1<<1;
+ public final static int FLAGS_VIBRATE = 1<<1;
// Bit mask for the account's deletion policy (see DELETE_POLICY_x below)
public static final int FLAGS_DELETE_POLICY_MASK = 1<<2 | 1<<3;
public static final int FLAGS_DELETE_POLICY_SHIFT = 2;
@@ -82,8 +82,6 @@
// required by the server; in this state, the user MUST be alerted to the need to update
// security settings. Sync adapters SHOULD NOT attempt to sync when this flag is set.
public static final int FLAGS_SECURITY_HOLD = 1<<5;
- // Whether or not the user has asked for vibration notifications when the ringer is silent
- public static final int FLAGS_VIBRATE_WHEN_SILENT = 1<<6;
// Whether the account supports "smart forward" (i.e. the server appends the original
// message along with any attachments to the outgoing message)
public static final int FLAGS_SUPPORTS_SMART_FORWARD = 1<<7;
@@ -373,8 +371,7 @@
/**
* @return the flags for this account
* @see #FLAGS_NOTIFY_NEW_MAIL
- * @see #FLAGS_VIBRATE_ALWAYS
- * @see #FLAGS_VIBRATE_WHEN_SILENT
+ * @see #FLAGS_VIBRATE
*/
public int getFlags() {
return mFlags;
@@ -383,8 +380,7 @@
/**
* Set the flags for this account
* @see #FLAGS_NOTIFY_NEW_MAIL
- * @see #FLAGS_VIBRATE_ALWAYS
- * @see #FLAGS_VIBRATE_WHEN_SILENT
+ * @see #FLAGS_VIBRATE
* @param newFlags the new value for the flags
*/
public void setFlags(int newFlags) {
@@ -574,7 +570,7 @@
return c.getLong(Account.ID_PROJECTION_COLUMN);
}
} finally {
- c.close();
+ if (c != null && !c.isClosed()) c.close();
}
return Account.NO_ACCOUNT;
}
@@ -976,4 +972,4 @@
sb.append(']');
return sb.toString();
}
-}
\ No newline at end of file
+}
diff --git a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
index f9fe696..add9f53 100755
--- a/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
+++ b/emailcommon/src/com/android/emailcommon/provider/EmailContent.java
@@ -25,6 +25,7 @@
import android.content.OperationApplicationException;
import android.database.Cursor;
import android.net.Uri;
+import android.os.Binder;
import android.os.Environment;
import android.os.Parcel;
import android.os.Parcelable;
@@ -155,6 +156,7 @@
*/
public static <T extends EmailContent> T restoreContentWithId(Context context,
Class<T> klass, Uri contentUri, String[] contentProjection, long id) {
+ long token = Binder.clearCallingIdentity();
Uri u = ContentUris.withAppendedId(contentUri, id);
Cursor c = context.getContentResolver().query(u, contentProjection, null, null, null);
if (c == null) throw new ProviderUnavailableException();
@@ -166,6 +168,7 @@
}
} finally {
c.close();
+ Binder.restoreCallingIdentity(token);
}
}
diff --git a/emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java b/emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java
index 33419f8..55ae014 100644
--- a/emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java
+++ b/emailcommon/src/com/android/emailcommon/utility/EmailClientConnectionManager.java
@@ -98,9 +98,11 @@
}
KeyManager keyManager =
KeyChainKeyManager.fromAlias(context, hostAuth.mClientCertAlias);
- boolean insecure = hostAuth.shouldTrustAllServerCerts();
- SSLSocketFactory ssf = SSLUtils.getHttpSocketFactory(insecure, keyManager);
- registry.register(new Scheme(schemeName, ssf, hostAuth.mPort));
+ SSLCertificateSocketFactory underlying = SSLUtils.getSSLSocketFactory(
+ hostAuth.shouldTrustAllServerCerts(), 0 /* no timeout */);
+ underlying.setKeyManagers(new KeyManager[] { keyManager });
+ registry.register(
+ new Scheme(schemeName, new SSLSocketFactory(underlying), hostAuth.mPort));
}
}
diff --git a/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java b/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
index b21c68f..85b77c1 100644
--- a/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
+++ b/emailcommon/src/com/android/emailcommon/utility/SSLUtils.java
@@ -47,19 +47,20 @@
* Optionally bypass all SSL certificate checks.
*
* @param insecure if true, bypass all SSL certificate checks
+ * @param timeout the timeout value in milliseconds or {@code 0} for an infinite timeout.
*/
public synchronized static SSLCertificateSocketFactory getSSLSocketFactory(
- boolean insecure) {
+ boolean insecure, int timeout) {
if (insecure) {
if (sInsecureFactory == null) {
sInsecureFactory = (SSLCertificateSocketFactory)
- SSLCertificateSocketFactory.getInsecure(0, null);
+ SSLCertificateSocketFactory.getInsecure(timeout, null);
}
return sInsecureFactory;
} else {
if (sSecureFactory == null) {
sSecureFactory = (SSLCertificateSocketFactory)
- SSLCertificateSocketFactory.getDefault(0, null);
+ SSLCertificateSocketFactory.getDefault(timeout, null);
}
return sSecureFactory;
}
@@ -70,7 +71,7 @@
* Apache HTTP stack.
*/
public static SSLSocketFactory getHttpSocketFactory(boolean insecure, KeyManager keyManager) {
- SSLCertificateSocketFactory underlying = getSSLSocketFactory(insecure);
+ SSLCertificateSocketFactory underlying = getSSLSocketFactory(insecure, 0 /* no timeout */);
if (keyManager != null) {
underlying.setKeyManagers(new KeyManager[] { keyManager });
}
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index e31628f..73bed8e 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -18,8 +18,10 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginTop="6dip"
- android:layout_marginBottom="6dip"
+ android:layout_marginTop="@dimen/widget_margin_top"
+ android:layout_marginLeft="@dimen/widget_margin_left"
+ android:layout_marginRight="@dimen/widget_margin_right"
+ android:layout_marginBottom="@dimen/widget_margin_bottom"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
@@ -74,7 +76,8 @@
android:id="@+id/widget_compose"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_menu_compose_normal_holo_light" />
+ android:src="@drawable/ic_menu_compose_normal_holo_light"
+ android:contentDescription="@string/compose_action" />
</LinearLayout>
<ListView
android:id="@+id/message_list"
diff --git a/res/menu-sw600dp/email_activity_options.xml b/res/menu-sw600dp/email_activity_options.xml
index 71aebb7..78e4d9d 100644
--- a/res/menu-sw600dp/email_activity_options.xml
+++ b/res/menu-sw600dp/email_activity_options.xml
@@ -48,10 +48,12 @@
with the phone menu. -->
<item
android:id="@+id/newer"
+ android:title="@string/newer_action"
android:visible="false"
/>
<item
android:id="@+id/older"
+ android:title="@string/older_action"
android:visible="false"
/>
<item
diff --git a/res/menu/email_activity_options.xml b/res/menu/email_activity_options.xml
index 33ee507..b1fce45 100644
--- a/res/menu/email_activity_options.xml
+++ b/res/menu/email_activity_options.xml
@@ -52,6 +52,7 @@
<!-- Note the order; we want to show them to the right of delete/move -->
<item
android:id="@+id/newer"
+ android:title="@string/newer_action"
android:orderInCategory="1500"
android:icon="@drawable/menu_item_newer"
android:showAsAction="always"
@@ -59,6 +60,7 @@
/>
<item
android:id="@+id/older"
+ android:title="@string/older_action"
android:orderInCategory="1600"
android:icon="@drawable/menu_item_older"
android:showAsAction="always"
diff --git a/res/menu/message_view_fragment_option.xml b/res/menu/message_view_fragment_option.xml
index d3c12e8..f650e7e 100644
--- a/res/menu/message_view_fragment_option.xml
+++ b/res/menu/message_view_fragment_option.xml
@@ -37,12 +37,14 @@
<!-- Note the order; we want to show them to the right of delete/move -->
<item
android:id="@+id/newer"
+ android:title="@string/newer_action"
android:icon="@drawable/menu_item_newer"
android:showAsAction="always"
android:visible="false"
/>
<item
android:id="@+id/older"
+ android:title="@string/older_action"
android:icon="@drawable/menu_item_older"
android:showAsAction="always"
android:visible="false"
diff --git a/res/mipmap-xxhdpi/ic_launcher_email.png b/res/mipmap-xxhdpi/ic_launcher_email.png
new file mode 100644
index 0000000..7a8e157
--- /dev/null
+++ b/res/mipmap-xxhdpi/ic_launcher_email.png
Binary files differ
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index fae1776..b5cc80e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Sinkroniseeropsies"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Merk as ongelees"</string>
<string name="move_action" msgid="3059189775933985898">"Skuif"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Jonger"</string>
+ <string name="older_action" msgid="4504015635360605471">"Ouer"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Voeg Cc/Bcc by"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Heg lêer aan"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinkroniseer e-pos"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinkroniseer e-pos vir hierdie rekening"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreer"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibreer ook wanneer e-pos aankom"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Altyd"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Net wanneer stil"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nooit"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibreer"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Kies \'n luitoon"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Bedienerinstellings"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Verwyder rekening"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d41eb1b..d1bc33a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -50,9 +50,11 @@
<string name="search_action" msgid="6325101454876682308">" ፈልግ"</string>
<string name="account_settings_action" msgid="4494079183315085171">"መለያ ቅንብሮች"</string>
<string name="settings_action" msgid="6334807007967459412">"ቅንብሮች"</string>
- <string name="mailbox_settings_action" msgid="8008375875310554776">"አሳምር አማራጮች"</string>
+ <string name="mailbox_settings_action" msgid="8008375875310554776">"አስምር አማራጮች"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"እንዳልተነበበ ምልክት አድርግ"</string>
<string name="move_action" msgid="3059189775933985898">"አንቀሳቅስ"</string>
+ <string name="newer_action" msgid="8950909456802330593">"አዲስ"</string>
+ <string name="older_action" msgid="4504015635360605471">"የቆየ"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ካርቦን ቅጂ/ስውር ቅጂ"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"ካርቦን ቅጂ (ካቅ) / ስውር ቅጂ አክል"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"ፋይል አያይዝ"</string>
@@ -172,7 +174,7 @@
<string name="message_view_invite_maybe" msgid="7555189462441562318">" ምናልባት"</string>
<string name="message_view_invite_decline" msgid="6119797303297149463">" አይ"</string>
<string name="message_view_invite_toast_yes" msgid="6802274503171644414">"ይህን ግብዣ ተቀብለሃል::"</string>
- <string name="message_view_invite_toast_maybe" msgid="8547454326090527202">"ለዚህ ግብዣ \"ምናልባት\" ብለህ መልስ ሰጥተሃል።"</string>
+ <string name="message_view_invite_toast_maybe" msgid="8547454326090527202">"ለእዚህ ግብዣ \"ምናልባት\" ብለህ መልስ ሰጥተሃል።"</string>
<string name="message_view_invite_toast_no" msgid="1842341256942784143">"ይህን ግብዣ ውድቅ አድርገኸዋል::"</string>
<string name="message_view_show_details" msgid="6287415596441037095">"ዝርዝሮቹን አሳይ"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"የመልዕክት ዝርዝሮች"</string>
@@ -307,12 +309,12 @@
<string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"በየሰዓቱ"</string>
<string name="account_setup_options_default_label" msgid="8869166381331276697">"ከዚህ መለያ በነባሪኢሜይል ላክ"</string>
<string name="account_setup_options_notify_label" msgid="1247525794828820038">"ኢሜይል ሲደርስ አሳውቀኝ።"</string>
- <string name="account_setup_options_sync_contacts_label" msgid="7467467090023434271">"ከዚህ መለያ ዕውቂያዎች አሳምር"</string>
- <string name="account_setup_options_sync_calendar_label" msgid="3195979658426293931">"ከዚህ መለያ የቀን አቆጣጠር አሳምር።"</string>
- <string name="account_setup_options_sync_email_label" msgid="3930927721878987383">"ከዚህ መለያ ኢሜይል አሳምር።"</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_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_label" msgid="7582247646138987328">"ቀኖች አስምር"</string>
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"ራስ ሰር"</string>
<string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"አንድ ቀን"</string>
<string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"ሦስት ቀን"</string>
@@ -364,7 +366,7 @@
<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_summary" msgid="8403582255413830007">"ድግግሞሽ፣ ማሳወቂያዎች፣ ወዘተ አስምር።"</string>
<string name="account_settings_notify_summary" msgid="6301122709602752038">"ኢሜይል ሲደርስ በሁኔታ አሞሌ ውስጥ አሳውቅ"</string>
<string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"የገቢ መልዕክት ምልከታ ድግግሞሽ"</string>
<string name="account_settings_incoming_label" msgid="7858928031806297542">"የገቢ ቅንብሮች"</string>
@@ -381,26 +383,21 @@
<string name="account_settings_data_usage" msgid="6669107430575866736">"የውሂብ አጠቃቀም"</string>
<string name="edit_quick_response_dialog" msgid="4322494050816995390">"ፈጣን ምላሽ አርትዕ"</string>
<string name="save_action" msgid="1988862706623227093">"አስቀምጥ"</string>
- <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"ዕውቂያዎች አሳምር"</string>
- <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"ለዚህ መለያ እውቂያዎች አሳምር"</string>
- <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"የቀን አቆጣጠር አሳምር"</string>
- <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"ለዚህ መለያ የቀን አቆጣጠር አሳምር"</string>
+ <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"ዕውቂያዎች አስምር"</string>
+ <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"ለእዚህ መለያ እውቂያዎች አስምር"</string>
+ <string name="account_settings_sync_calendar_enable" msgid="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_summary" msgid="262964076412310990">"ለዚህ መለያ ኢሜይል አሳምር"</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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"ዘወትር"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"ፀጥታ ሲሆን ብቻ"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"በፍፁም"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"ንዘር"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"የደወል ቅላጼ ምረጥ"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"የአገልጋይ ቅንብሮች"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"መለያ አስወግድ"</string>
<string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"መለያው \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ከኢሜይል ይወገዳል።"</string>
<string name="account_settings_category_delete_account" msgid="5128545184407925226">"መለያ አስወግድ"</string>
<string name="account_settings_delete_account_label" msgid="4889158717472601718">"መለያ አስወግድ"</string>
- <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"አሳምር አማራጮች"</string>
- <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"የ(<xliff:g id="MAILBOXX_NAME">%s</xliff:g>) አሳምር አማራጮች"</string>
+ <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"አስምር አማራጮች"</string>
+ <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"የ(<xliff:g id="MAILBOXX_NAME">%s</xliff:g>) አስምር አማራጮች"</string>
<string name="mailbox_preferences_header" msgid="9077316556563252246">"ቅንብሮች አስምር"</string>
<string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"ድግግሞሽ ተመልከት"</string>
<string name="mailbox_settings_mailbox_sync_window_label" msgid="2957945231022052672">"ቀኖች ለአሳምር"</string>
@@ -467,5 +464,5 @@
<string name="search_slow_warning_title" msgid="2826118321880530239">"ውጤቶችን በመጠበቅ ላይ"</string>
<string name="search_slow_warning_message" msgid="8494483410797387903">"አንዳንድ አገልጋዮች ረጅም ጊዜ ሊወስዱ ይችላሉ።"</string>
<string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"አቃፊዎች"</string>
- <string name="require_manual_sync_message" msgid="7777357288642785955">"ውጫዊ አገልግሎት በማድረግ ጊዜ የዳራ ማመሳሰል ለዚህ መለያ ቦዝኗል፡፡"</string>
+ <string name="require_manual_sync_message" msgid="7777357288642785955">"ውጫዊ አገልግሎት በማድረግ ጊዜ የዳራ ማመሳሰል ለእዚህ መለያ ቦዝኗል፡፡"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 40ccf84..f914b9d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"خيارات المزامنة"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"تعليمها بـ \"غير مقروءة\""</string>
<string name="move_action" msgid="3059189775933985898">"نقل"</string>
+ <string name="newer_action" msgid="8950909456802330593">"أحدث"</string>
+ <string name="older_action" msgid="4504015635360605471">"أقدم"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+نسخة إلى/ مخفية"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"إضافة نسخة/ مخفية"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"إرفاق ملف"</string>
@@ -388,11 +390,6 @@
<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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"دومًا"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"فقط عندما يكون صامتًا"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"مطلقًا"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"اهتزاز"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"اختيار نغمة الرنين"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"إعدادات الخادم"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"إزالة الحساب"</string>
@@ -414,7 +411,7 @@
<string name="exchange_name" msgid="1190783774800310346">"الشركة"</string>
<string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
<string name="system_account_create_failed" msgid="3673792980526246177">"تعذر إنشاء الحساب. أعد المحاولة."</string>
- <string name="device_admin_label" msgid="8680224994637869414">"إرسال رسالة إلكترونية"</string>
+ <string name="device_admin_label" msgid="8680224994637869414">"بريد إلكتروني"</string>
<string name="device_admin_description" msgid="426727923791430306">"لتمكين سياسات الأمان الخاصة بالخادم"</string>
<string name="gal_searching_fmt" msgid="6140450617663543464">"جارِ البحث <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
<plurals name="gal_completed_fmt">
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 5607894..ef29e79 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Параметры сінхранізацыі"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Пазначыць як непрачытанае"</string>
<string name="move_action" msgid="3059189775933985898">"Перанесці"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Навей"</string>
+ <string name="older_action" msgid="4504015635360605471">"Старэй"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Копія/УК"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Дадаць Копію/УК"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Далучыць файл"</string>
@@ -388,11 +390,6 @@
<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">"Таксама вібраваць пры атрыманні электроннага лiста"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Заўсёды"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Толькі ў рэжыме без гуку"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ніколі"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вібрацыя"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Выбраць рынгтон"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Налады сервера"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Выдаліць уліковы запіс"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 038ab66..a288a25 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Опции за синхронизиране"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Непрочетено"</string>
<string name="move_action" msgid="3059189775933985898">"Местене"</string>
+ <string name="newer_action" msgid="8950909456802330593">"По-ново"</string>
+ <string name="older_action" msgid="4504015635360605471">"По-старо"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Як/Ск"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Добавяне на Як:/Ск:"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Прикачване на файл"</string>
@@ -388,11 +390,6 @@
<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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Винаги"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Само при тих режим"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никога"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибриране"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Избор на мелодия"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Настройки на сървъра"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Премахване на профил"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4aa52e5..7f048c8 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opcions de sincronització"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marca com a no llegit"</string>
<string name="move_action" msgid="3059189775933985898">"Mou"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Més recent"</string>
+ <string name="older_action" msgid="4504015635360605471">"Més antic"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Cco"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Afegeix Cc/Cco"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Adjunta un fitxer"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronitza el correu electrònic"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincr. miss. correu d\'aquest compte"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibra"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibra també quan arribi correu electrònic"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Només quan està en silenci"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibra"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Tria un to"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Configuració del servidor"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Elimina el compte"</string>
@@ -467,5 +464,5 @@
<string name="search_slow_warning_title" msgid="2826118321880530239">"S\'estan esperant els resultats"</string>
<string name="search_slow_warning_message" msgid="8494483410797387903">"Alguns servidors poden trigar molt."</string>
<string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Carpetes"</string>
- <string name="require_manual_sync_message" msgid="7777357288642785955">"La sincronització de fons per a aquest compte està desactivada en itinerància."</string>
+ <string name="require_manual_sync_message" msgid="7777357288642785955">"La sincronització en segon pla d\'aquest compte s\'ha desactivat en itinerància."</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index aaf2ed9..af23d58 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Možnosti synchronizace"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Označit jako nepřečtené"</string>
<string name="move_action" msgid="3059189775933985898">"Přesunout"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Novější"</string>
+ <string name="older_action" msgid="4504015635360605471">"Starší"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Kopie/skrytá"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Přidat kopii/skrytou kopii"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Přiložit soubor"</string>
@@ -361,7 +363,7 @@
<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">"Použít tento účet jako výchozí pro odesílání e-mailů"</string>
- <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Stáhnout přílohy"</string>
+ <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Stahovat 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>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchronizovat e-maily"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchronizovat e-mail pro tento účet"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrace"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Při příchodu e-mailu také vibrovat"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vždy"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Pouze v tichém režimu"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikdy"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrace"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Vybrat vyzvánění"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Nastavení serveru"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Odebrat účet"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c6773b1..0b1a914 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -33,7 +33,7 @@
<string name="delete_action" msgid="8421026208288857155">"Slet"</string>
<string name="forward_action" msgid="669174181042344116">"Videresend"</string>
<string name="favorite_action" msgid="4664259801498253756">"Stjernemarker"</string>
- <string name="done_action" msgid="7497990549515580249">"Udfør"</string>
+ <string name="done_action" msgid="7497990549515580249">"Færdig"</string>
<string name="create_action" msgid="3062715563215392251">"Opret nyt"</string>
<string name="delete_quick_response_action" msgid="3076922270182841978">"Slet"</string>
<string name="quick_responses_empty_view" msgid="1693308598242828422">"Ingen hurtige svar"</string>
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Indstillinger for synkronisering"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Markér som ulæst"</string>
<string name="move_action" msgid="3059189775933985898">"Flyt"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Nyere"</string>
+ <string name="older_action" msgid="4504015635360605471">"Ældre"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Tilføj Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Vedhæft fil"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkroniser e-mails"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkroniser e-mail for denne konto"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibration"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrer også, når der kommer e-mail"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Altid"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kun ved lydløs"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldrig"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibration"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Vælg ringetone"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Serverindstillinger"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Fjern konto"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d44a1d7..fcc668d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Synchronisierungsoptionen"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Als ungelesen markieren"</string>
<string name="move_action" msgid="3059189775933985898">"Verschieben"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Neuere"</string>
+ <string name="older_action" msgid="4504015635360605471">"Ältere"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Cc/Bcc hinzufügen"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Datei anhängen"</string>
@@ -68,7 +70,7 @@
<item quantity="other" msgid="371256717624461324">"Nachrichten verschieben"</item>
</plurals>
<string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"Verschieben wird für POP3-Konten nicht unterstützt."</string>
- <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Verschieben nicht möglich, da mehrere Konten ausgewählt wurden."</string>
+ <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Verschieben nicht möglich, weil mehrere Konten ausgewählt wurden."</string>
<string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Nachrichten im Postausgang und den Ordnern \"Entwürfe\" und \"Gesendet\" können nicht verschoben werden."</string>
<plurals name="notification_new_one_account_fmt">
<item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> ungelesen (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
@@ -76,8 +78,8 @@
<item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> ungelesen (<xliff:g id="ACCOUNT">%2$s</xliff:g>)"</item>
</plurals>
<plurals name="notification_new_multi_account_fmt">
- <item quantity="few" msgid="1991747245324120305">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> Google-Konten"</item>
- <item quantity="other" msgid="2723797835410343458">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> Google-Konten"</item>
+ <item quantity="few" msgid="1991747245324120305">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> Google Konten"</item>
+ <item quantity="other" msgid="2723797835410343458">"in <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> Google Konten"</item>
</plurals>
<string name="notification_to_account" msgid="2078557719010667913">"an <xliff:g id="RECEIVER_NAME">%1$s</xliff:g>"</string>
<string name="notification_multiple_new_messages_fmt" msgid="2606649762841566104">"<xliff:g id="ID_1">%1$d</xliff:g> neue Nachrichten"</string>
@@ -165,7 +167,7 @@
<string name="message_view_always_show_pictures_button" msgid="6523810929103546865">"Immer anzeigen"</string>
<string name="message_view_always_show_pictures_prompt" msgid="7685500276479967959">"Bilder von diesem Absender immer anzeigen"</string>
<string name="message_view_always_show_pictures_confirmation" msgid="6838463134312859448">"Bilder von diesem Absender werden automatisch angezeigt."</string>
- <string name="message_view_invite_view" msgid="5521032519960111675">"Im Kalender anzeigen"</string>
+ <string name="message_view_invite_view" msgid="5521032519960111675">"Im Kalender ansehen"</string>
<string name="message_view_invite_title" msgid="3418949733434713805">"Kalendereinladung"</string>
<string name="message_view_invite_text" msgid="1212799906603873708">"Teilnehmen?"</string>
<string name="message_view_invite_accept" msgid="744546668021679819">" Ja"</string>
@@ -181,7 +183,7 @@
<string name="attachment_info_wifi_settings" msgid="96432970927503597">"WLAN-Einstellungen"</string>
<string name="attachment_info_application_settings" msgid="4124655487276125596">"App-Einstellungen"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Anhang kann nicht geöffnet werden."</string>
- <string name="attachment_info_malware" msgid="6576029010855055528">"Sie können diese Datei nicht öffnen oder speichern, da diese Art von Anhang möglicherweise schädliche Software enthält."</string>
+ <string name="attachment_info_malware" msgid="6576029010855055528">"Sie können diese Datei nicht öffnen oder speichern, weil diese Art von Anhang möglicherweise schädliche Software enthält."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"Dieser Anhang kann aufgrund der Sicherheitsrichtlinien dieses Kontos nicht gespeichert oder geöffnet werden."</string>
<string name="attachment_info_wifi_only" msgid="1481120960014563617">"Dieser Anhang ist zu groß, um ihn über ein Mobilfunknetz herunterzuladen. Sie können ihn herunterladen, sobald Sie das nächste Mal mit einem WLAN-Netzwerk verbunden sind."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"Sie verfügen über keine App, mit der Sie diesen Anhang öffnen können. Laden Sie eine entsprechende App von Android Market herunter."</string>
@@ -352,7 +354,7 @@
<string name="password_expire_warning_content_title" msgid="7174669014074849304">"Sperr-Passwort läuft ab"</string>
<string name="password_expired_ticker" msgid="4230570412974108968">"Ihre PIN bzw. Ihr Passwort zum Sperren des Bildschirms ist abgelaufen."</string>
<string name="password_expired_content_title" msgid="4349518706602252979">"Sperr-Passwort abgelaufen"</string>
- <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Passwort für Bildschirmsperre läuft ab"</string>
+ <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Passwort für Display-Sperre läuft ab"</string>
<string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Sie müssen Ihre PIN bzw. Ihr Passwort zum Sperren des Bildschirms bald ändern, sonst werden die Daten für <xliff:g id="ACCOUNT">%s</xliff:g> gelöscht. Jetzt ändern?"</string>
<string name="password_expired_dialog_title" msgid="2186547998125938084">"Sperr-Passwort abgelaufen"</string>
<string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Die Daten für <xliff:g id="ACCOUNT">%s</xliff:g> werden von Ihrem Gerät gelöscht. Sie können sie wiederherstellen, indem Sie Ihre PIN bzw. Ihr Passwort zum Sperren des Bildschirms ändern. Jetzt ändern?"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-Mails synchr."</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"E-Mails dieses Kontos synchronisieren"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibration"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Bei E-Mail-Eingang zusätzlich vibrieren"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Immer"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Nur im Lautlos-Modus"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nie"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibration"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Klingelton auswählen"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Servereinstellungen"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Konto entfernen"</string>
@@ -462,7 +459,7 @@
<string name="widget_no_mailboxes" msgid="5222354534538852579">"Dieses Konto ist nicht synchronisiert. Versuchen Sie es später erneut."</string>
<string name="more_than_999" msgid="8704425397397918798">"999+"</string>
<string name="search_hint" msgid="2200412192574686497">"In E-Mails suchen"</string>
- <string name="search_mailbox_hint" msgid="7854987729678942790">"<xliff:g id="ID_1">%1$s</xliff:g> durchsuchen"</string>
+ <string name="search_mailbox_hint" msgid="7854987729678942790">"In <xliff:g id="ID_1">%1$s</xliff:g> suchen"</string>
<string name="search_header_text_fmt" msgid="2638602588841231811">"Ergebnisse"</string>
<string name="search_slow_warning_title" msgid="2826118321880530239">"Warten auf Ergebnisse"</string>
<string name="search_slow_warning_message" msgid="8494483410797387903">"Bei einigen Servern benötigen Sie möglicherweise etwas mehr Geduld."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 65d5cbf..74e74ae 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Επιλογές συγχρονισμού"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Επισήμανση ως μη αναγνωσμένα"</string>
<string name="move_action" msgid="3059189775933985898">"Μετακίνηση"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Νεότερο"</string>
+ <string name="older_action" msgid="4504015635360605471">"Παλαιότερο"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Κοιν./Κρ.κοιν."</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Προσθ.Κοιν./Κρ.κοιν."</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Επισύναψη αρχείου"</string>
@@ -388,11 +390,6 @@
<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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Πάντα"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Μόνο στο αθόρυβο"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ποτέ"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Δόνηση"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Επιλέξτε ήχο κλήσης"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Ρυθμίσεις διακομιστή"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Κατάργηση λογαριασμού"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6c84afa..d254454 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Sync options"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Mark as unread"</string>
<string name="move_action" msgid="3059189775933985898">"Move"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Newer"</string>
+ <string name="older_action" msgid="4504015635360605471">"Older"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Add Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Attach file"</string>
@@ -316,7 +318,7 @@
<string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatic"</string>
<string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"One day"</string>
<string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Three days"</string>
- <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"one week"</string>
+ <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"One week"</string>
<string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Two weeks"</string>
<string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"One month"</string>
<string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"All"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sync Email"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sync email for this account"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrate"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Also vibrate when email arrives"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Always"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Only when silent"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Never"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrate"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Choose ringtone"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Server settings"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Remove account"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8a0f3a0..60ef315 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -41,9 +41,9 @@
<string name="save_draft_action" msgid="6413714270991417223">"Guardar borrador"</string>
<string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Insertar respuesta rápida"</string>
<string name="read_action" msgid="4701484794504781686">"Marcar leída"</string>
- <string name="unread_action" msgid="6280399049357552826">"Marcar no leída"</string>
- <string name="set_star_action" msgid="4660317166196258160">"Agregar asterisco"</string>
- <string name="remove_star_action" msgid="6689770999647007163">"Eliminar asterisco"</string>
+ <string name="unread_action" msgid="6280399049357552826">"Marcar como no leída"</string>
+ <string name="set_star_action" msgid="4660317166196258160">"Destacar"</string>
+ <string name="remove_star_action" msgid="6689770999647007163">"Eliminar estrella"</string>
<string name="refresh_action" msgid="5951383001436708175">"Actualizar"</string>
<string name="add_account_action" msgid="8835736309476033727">"Agregar cuenta"</string>
<string name="compose_action" msgid="4045702519637388045">"Redactar"</string>
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opciones de sincronización"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leídos"</string>
<string name="move_action" msgid="3059189775933985898">"Mover"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Nuevos"</string>
+ <string name="older_action" msgid="4504015635360605471">"Antiguos"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ CC/CCO"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Agregar CC/CCO"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Adjuntar un archivo"</string>
@@ -102,7 +104,7 @@
</plurals>
<string name="debug_version_fmt" msgid="6160213145745376955">"Versión: <xliff:g id="VERSION">%s</xliff:g>"</string>
<string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Bandeja de entrada"</string>
- <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Marcado con asterisco"</string>
+ <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Destacados"</string>
<string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Borradores"</string>
<string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Bandeja de salida"</string>
<string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Vista combinada"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar correo"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar el correo de esta cuenta"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar también cuando llegue un correo"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Siempre"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo en modo silencioso"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Seleccionar tono"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Configuración del servidor"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminar cuenta"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index dac59dc..1121964 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -53,8 +53,10 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opciones de sincronización"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leído"</string>
<string name="move_action" msgid="3059189775933985898">"Mover"</string>
- <string name="plus_cc_label" msgid="3365150001259912183">"+ CC/CCO"</string>
- <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Añadir CC/CCO"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Más reciente"</string>
+ <string name="older_action" msgid="4504015635360605471">"Más antiguo"</string>
+ <string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Cco"</string>
+ <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Añadir Cc/Cco"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Adjuntar archivo"</string>
<string name="close_action" msgid="533058985745238100">"Cerrar"</string>
<string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"Enviar todos"</string>
@@ -120,16 +122,16 @@
</plurals>
<string name="message_list_no_messages" msgid="7846910091922523867">"No hay ningún mensaje."</string>
<string name="message_compose_to_hint" msgid="2891895306418177013">"Para"</string>
- <string name="message_compose_cc_hint" msgid="8481884461031434144">"CC"</string>
- <string name="message_compose_bcc_hint" msgid="9177337492358841680">"CCO"</string>
+ <string name="message_compose_cc_hint" msgid="8481884461031434144">"Cc"</string>
+ <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Cco"</string>
<string name="message_compose_subject_hint" msgid="6993487234024160782">"Asunto"</string>
<string name="message_compose_from_label" msgid="4084843296548498041">"De:"</string>
<string name="to" msgid="4392614766835725698">"Para"</string>
- <string name="cc" msgid="7017720927911078193">"CC"</string>
- <string name="bcc" msgid="3098643138241111579">"CCO"</string>
+ <string name="cc" msgid="7017720927911078193">"Cc"</string>
+ <string name="bcc" msgid="3098643138241111579">"Cco"</string>
<string name="subject_hint" msgid="7253964583324677128">"Asunto"</string>
<string name="body_hint" msgid="4279864165439577668">"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_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="6950097435198536165">"Incluir texto citado"</string>
<string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Incluir texto"</string>
@@ -139,8 +141,8 @@
<string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Usar respuesta rápida"</string>
<string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> y <xliff:g id="NUMBER">%2$d</xliff:g> más"</string>
<string name="message_view_to_label" msgid="6485191743265527381">"Para:"</string>
- <string name="message_view_cc_label" msgid="6322992216371163122">"CC:"</string>
- <string name="message_view_bcc_label" msgid="7577479221285310198">"CCO:"</string>
+ <string name="message_view_cc_label" msgid="6322992216371163122">"Cc:"</string>
+ <string name="message_view_bcc_label" msgid="7577479221285310198">"Cco:"</string>
<string name="message_view_date_label" msgid="7033814961837313339">"Fecha:"</string>
<string name="message_view_from_label" msgid="6055076379282772675">"De:"</string>
<string name="message_view_subject_label" msgid="3731022187530000852">"Asunto:"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar correo"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar correo de esta cuenta"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar también cuando llegue un mensaje"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Siempre"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo en modo silencio"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibración"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Seleccionar tono"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Ajustes del servidor"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminar cuenta"</string>
@@ -457,7 +454,7 @@
<string name="widget_unread" msgid="4404711399009077833">"No leídos"</string>
<string name="widget_starred" msgid="8290352707134011791">"Destacados"</string>
<string name="widget_loading" msgid="2340962056927255554">"Cargando…"</string>
- <string name="widget_touch_to_configure" msgid="7062039013915225323">"Toca para configurar."</string>
+ <string name="widget_touch_to_configure" msgid="7062039013915225323">"Toca para configurar"</string>
<string name="widget_no_accounts" msgid="2412482205591224408">"Aún no se ha configurado una cuenta de correo electrónico."</string>
<string name="widget_no_mailboxes" msgid="5222354534538852579">"Esta cuenta no está sincronizada. Inténtalo de nuevo más tarde."</string>
<string name="more_than_999" msgid="8704425397397918798">"999+"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index fbd275b..2e01766 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Sünkroonimisvalikud"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Märgi mitteloetuks"</string>
<string name="move_action" msgid="3059189775933985898">"Teisalda"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Uuemad"</string>
+ <string name="older_action" msgid="4504015635360605471">"Vanemad"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ koopia/pimek."</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Lisa koopia/pimekoopia väli"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Manusta fail"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sünkrooni meil"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Konto meili sünkroonimine"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreering"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibreeri ka meilisõnumi saabumisel"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Alati"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Ainult hääletus režiimis"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mitte kunagi"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibreering"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Vali helin"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Serveri seaded"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Konto eemaldamine"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 69f1979..beecdb8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/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>
@@ -40,8 +40,8 @@
<string name="discard_action" msgid="6532206074859505968">"صرفنظر"</string>
<string name="save_draft_action" msgid="6413714270991417223">"ذخیره پیش نویس"</string>
<string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"درج پاسخ سریع"</string>
- <string name="read_action" msgid="4701484794504781686">"علامت گذاری بعنوان خوانده شده"</string>
- <string name="unread_action" msgid="6280399049357552826">"علامت گذاری بعنوان خوانده نشده"</string>
+ <string name="read_action" msgid="4701484794504781686">"علامتگذاری بهعنوان خوانده شده"</string>
+ <string name="unread_action" msgid="6280399049357552826">"علامتگذاری بهعنوان خوانده نشده"</string>
<string name="set_star_action" msgid="4660317166196258160">"افزودن ستاره"</string>
<string name="remove_star_action" msgid="6689770999647007163">"حذف ستاره"</string>
<string name="refresh_action" msgid="5951383001436708175">"تازه کردن"</string>
@@ -51,21 +51,23 @@
<string name="account_settings_action" msgid="4494079183315085171">"تنظیمات حساب"</string>
<string name="settings_action" msgid="6334807007967459412">"تنظیمات"</string>
<string name="mailbox_settings_action" msgid="8008375875310554776">"گزینههای همگامسازی"</string>
- <string name="mark_as_unread_action" msgid="3766298115778767554">"علامت گذاری بعنوان خوانده نشده"</string>
+ <string name="mark_as_unread_action" msgid="3766298115778767554">"علامتگذاری بهعنوان خوانده نشده"</string>
<string name="move_action" msgid="3059189775933985898">"انتقال"</string>
- <string name="plus_cc_label" msgid="3365150001259912183">"+ گیرنده کپی/گیرنده مخفی"</string>
- <string name="add_cc_bcc_menu" msgid="4757145078498200242">"افزودن گیرنده کپی/گیرنده کپی مخفی"</string>
+ <string name="newer_action" msgid="8950909456802330593">"جدیدتر"</string>
+ <string name="older_action" msgid="4504015635360605471">"قدیمیتر"</string>
+ <string name="plus_cc_label" msgid="3365150001259912183">"+ گیرندهٔ کپی/گیرنده مخفی"</string>
+ <string name="add_cc_bcc_menu" msgid="4757145078498200242">"افزودن گیرندهٔ کپی/گیرندهٔ کپی مخفی"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"پیوست کردن فایل"</string>
<string name="close_action" msgid="533058985745238100">"بستن"</string>
- <string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"ارسال تمام پیام ها"</string>
+ <string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"ارسال تمام پیامها"</string>
<string name="choose_attachment_dialog_title" msgid="81937507117528954">"انتخاب پیوست"</string>
<string name="move_to_folder_dialog_title" msgid="2614318192482193898">"انتقال به"</string>
- <string name="status_loading_messages" msgid="6552307237621292344">"در حال بارگیری پیام ها..."</string>
+ <string name="status_loading_messages" msgid="6552307237621292344">"در حال بارگیری پیامها..."</string>
<string name="status_network_error" msgid="2611654064403817391">"مشکل اتصال."</string>
<string name="error_loading_message_body" msgid="6775234299515596760">"نوشتار پیام بارگیری نشد. ممکن است پیام خیلی بزرگ باشد و نشان داده نشود."</string>
<plurals name="move_messages">
<item quantity="one" msgid="320885379869442589">"انتقال پیام"</item>
- <item quantity="other" msgid="371256717624461324">"انتقال پیام ها"</item>
+ <item quantity="other" msgid="371256717624461324">"انتقال پیامها"</item>
</plurals>
<string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"انتقال در حسابهای POP3 پشتیبانی نمیشود."</string>
<string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"انتقال امکانپذیر نیست. مورد انتخابی شامل چندین حساب است."</string>
@@ -88,7 +90,7 @@
</plurals>
<string name="mailbox_name_display_inbox" msgid="3542327124749861736">"صندوق ورودی"</string>
<string name="mailbox_name_display_outbox" msgid="2826214174661417662">"صندوق خروجی"</string>
- <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"پیش نویس ها"</string>
+ <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"پیشنویسها"</string>
<string name="mailbox_name_display_trash" msgid="9139069064580630647">"سطل زباله"</string>
<string name="mailbox_name_display_sent" msgid="3426058998191869523">"ارسال شد"</string>
<string name="mailbox_name_display_junk" msgid="9046762505977999288">"ناخواسته"</string>
@@ -102,44 +104,44 @@
</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_drafts" msgid="5514845993247300437">"پیش نویس ها"</string>
+ <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"ستارهدار"</string>
+ <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"پیشنویسها"</string>
<string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"صندوق خروجی"</string>
<string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"نمای مرکب"</string>
- <string name="mailbox_list_account_selector_show_all_folders" msgid="4185052839366909439">"نمایش تمام پوشه ها"</string>
- <string name="mailbox_list_account_selector_account_header" msgid="4261295503836387876">"حساب ها"</string>
- <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"پوشه های جدید (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
- <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"همه پوشه ها"</string>
- <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"پوشه های اخیر"</string>
+ <string name="mailbox_list_account_selector_show_all_folders" msgid="4185052839366909439">"نمایش تمام پوشهها"</string>
+ <string name="mailbox_list_account_selector_account_header" msgid="4261295503836387876">"حسابها"</string>
+ <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"پوشههای جدید (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string>
+ <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"همه پوشهها"</string>
+ <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>
</plurals>
<string name="message_list_no_messages" msgid="7846910091922523867">"پیامی موجود نیست"</string>
<string name="message_compose_to_hint" msgid="2891895306418177013">"گیرنده"</string>
- <string name="message_compose_cc_hint" msgid="8481884461031434144">"گیرنده کپی"</string>
- <string name="message_compose_bcc_hint" msgid="9177337492358841680">"گیرنده کپی مخفی"</string>
+ <string name="message_compose_cc_hint" msgid="8481884461031434144">"گیرندهٔ کپی"</string>
+ <string name="message_compose_bcc_hint" msgid="9177337492358841680">"گیرندهٔ کپی مخفی"</string>
<string name="message_compose_subject_hint" msgid="6993487234024160782">"موضوع"</string>
<string name="message_compose_from_label" msgid="4084843296548498041">"از:"</string>
<string name="to" msgid="4392614766835725698">"گیرنده"</string>
- <string name="cc" msgid="7017720927911078193">"گیرنده کپی"</string>
- <string name="bcc" msgid="3098643138241111579">"گیرنده کپی مخفی"</string>
+ <string name="cc" msgid="7017720927911078193">"گیرندهٔ کپی"</string>
+ <string name="bcc" msgid="3098643138241111579">"گیرندهٔ کپی مخفی"</string>
<string name="subject_hint" msgid="7253964583324677128">"موضوع"</string>
<string name="body_hint" msgid="4279864165439577668">"نوشتن ایمیل"</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="6950097435198536165">"شامل نوشتار نقل قول شده"</string>
<string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"شامل متن"</string>
<string name="message_compose_error_no_recipients" msgid="4903715888250785486">"باید حداقل یک گیرنده اضافه کنید."</string>
- <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"برخی از آدرس های ایمیل نامعتبر هستند."</string>
- <string name="message_compose_attachment_size" msgid="4401081828287333647">"فایل خیلی بزرگ است و پیوست نمی شود"</string>
+ <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"برخی از آدرسهای ایمیل نامعتبر هستند."</string>
+ <string name="message_compose_attachment_size" msgid="4401081828287333647">"فایل خیلی بزرگ است و پیوست نمیشود"</string>
<string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"درج پاسخ سریع"</string>
<string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> و <xliff:g id="NUMBER">%2$d</xliff:g> دیگر"</string>
<string name="message_view_to_label" msgid="6485191743265527381">"گیرنده:"</string>
- <string name="message_view_cc_label" msgid="6322992216371163122">"گیرنده کپی:"</string>
+ <string name="message_view_cc_label" msgid="6322992216371163122">"گیرندهٔ کپی:"</string>
<string name="message_view_bcc_label" msgid="7577479221285310198">"گیرنده مخفی:"</string>
<string name="message_view_date_label" msgid="7033814961837313339">"تاریخ:"</string>
<string name="message_view_from_label" msgid="6055076379282772675">"از:"</string>
@@ -152,14 +154,14 @@
<string name="message_view_attachment_save_action" msgid="4704436274670997903">"ذخیره"</string>
<string name="message_view_attachment_saved" msgid="3432810414785232025">"ذخیره شد"</string>
<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_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">
<item quantity="one" msgid="7594476368958824007">"پیوست <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
- <item quantity="other" msgid="974463163535515223">"پیوست ها <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
+ <item quantity="other" msgid="974463163535515223">"پیوستها <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
</plurals>
<string name="message_view_show_pictures_action" msgid="5059936981743072545">"نمایش تصاویر"</string>
<string name="message_view_always_show_pictures_button" msgid="6523810929103546865">"همیشه نشان داده شود"</string>
@@ -167,7 +169,7 @@
<string name="message_view_always_show_pictures_confirmation" msgid="6838463134312859448">"تصاویری از این فرستنده به طور خودکار نشان داده خواهد شد."</string>
<string name="message_view_invite_view" msgid="5521032519960111675">"مشاهده در تقویم"</string>
<string name="message_view_invite_title" msgid="3418949733434713805">"دعوت تقویم"</string>
- <string name="message_view_invite_text" msgid="1212799906603873708">"می روید؟"</string>
+ <string name="message_view_invite_text" msgid="1212799906603873708">"میروید؟"</string>
<string name="message_view_invite_accept" msgid="744546668021679819">" بله"</string>
<string name="message_view_invite_maybe" msgid="7555189462441562318">" شاید"</string>
<string name="message_view_invite_decline" msgid="6119797303297149463">" خیر"</string>
@@ -180,10 +182,10 @@
<string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"اتصال Wi-Fi مورد نیاز است"</string>
<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_unknown" msgid="8342655396805943320">"پیوست باز نمیشود."</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_wifi_only" msgid="1481120960014563617">"این پیوست برای دانلود از طریق شبکهٔ تلفن همراه خیلی بزرگ است. میتوانید دفعه دیگر که به یک شبکه Wi-Fi متصل میشوید، آنرا دانلود کنید."</string>
<string name="attachment_info_no_intent" msgid="8139209405745777924">"هیچ برنامه نصب شدهای برای باز کردن این پیوست وجود ندارد. یک برنامه مناسب از Android Market نصب کنید."</string>
<string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"این پیوست یک برنامه است. باید قبل از نصب آن، منبعهای ناشناس را در تنظیمات > برنامهها بررسی کنید."</string>
<string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"نمیتوان برنامهها را به طور مستقیم از ایمیل نصب کرد. ابتدا این برنامه را ذخیره کنید و سپس آنرا با استفاده از برنامه \"دانلودها\" نصب کنید."</string>
@@ -197,13 +199,13 @@
</plurals>
<plurals name="message_deleted_toast">
<item quantity="one" msgid="710742672464447084">"پیام حذف شد."</item>
- <item quantity="other" msgid="6574961322865652255">"پیام ها حذف شدند."</item>
+ <item quantity="other" msgid="6574961322865652255">"پیامها حذف شدند."</item>
</plurals>
<string name="message_discarded_toast" msgid="3891461729325584026">"پیام رد شد."</string>
- <string name="message_saved_toast" msgid="8443125659172627665">"پیام به عنوان پیش نویس ذخیره شد."</string>
+ <string name="message_saved_toast" msgid="8443125659172627665">"پیام بهعنوان پیش نویس ذخیره شد."</string>
<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>
+ <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>
<item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> پیام به <xliff:g id="MAILBOX_NAME">%2$s</xliff:g> انتقال یافت"</item>
@@ -240,19 +242,19 @@
<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>
<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_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>
<string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"در حال بررسی تنظیمات سرور خروجی..."</string>
<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>
@@ -272,7 +274,7 @@
<string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string>
<string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"حذف ایمیل از سرور"</string>
<string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"هرگز"</string>
- <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"هنگامی که من از صندوق ورودی حذف می کنم"</string>
+ <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"هنگامی که من از صندوق ورودی حذف میکنم"</string>
<string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"پیشوند مسیر IMAP"</string>
<string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"اختیاری"</string>
<string name="account_setup_outgoing_title" msgid="7208495965665711539">"تنظیم حساب"</string>
@@ -288,7 +290,7 @@
<string name="account_setup_exchange_server_label" msgid="795137797983360826">"سرور"</string>
<string name="account_setup_exchange_username_label" msgid="6517176180828983060">"دامنه/نام کاربری"</string>
<string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"از اتصال امن (SSL) استفاده شود"</string>
- <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"پذیرش همه گواهی های SSL"</string>
+ <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"پذیرش همه گواهیهای SSL"</string>
<string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"گواهی سرویس گیرنده"</string>
<string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"انتخاب"</string>
<string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"استفاده از گواهی مشتری"</string>
@@ -296,21 +298,21 @@
<string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"هیچکدام"</string>
<string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"شناسه تلفن همراه"</string>
<string name="account_setup_options_title" msgid="9016600767888846051">"تنظیمات حساب"</string>
- <string name="account_setup_options_headline" msgid="4181274232835368085">"گزینه های حساب"</string>
+ <string name="account_setup_options_headline" msgid="4181274232835368085">"گزینههای حساب"</string>
<string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"دفعات بررسی صندوق ورودی"</string>
<string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"هرگز"</string>
<string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"خودکار (پیام سرویس)"</string>
- <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"هر 5 دقیقه"</string>
- <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"هر 10 دقیقه"</string>
- <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"هر 15 دقیقه"</string>
- <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"هر 30 دقیقه"</string>
+ <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"هر ۵ دقیقه"</string>
+ <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"هر ۱۰ دقیقه"</string>
+ <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"هر ۱۵ دقیقه"</string>
+ <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"هر ۳۰ دقیقه"</string>
<string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"هر ساعت"</string>
- <string name="account_setup_options_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_background_attachments_label" msgid="5247749298276451846">"دانلود خودکار پیوست ها هنگام اتصال به Wi-Fi"</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_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>
@@ -320,51 +322,51 @@
<string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"دو هفته"</string>
<string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"یک ماه"</string>
<string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"همه"</string>
- <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"استفاده از پیش فرض حساب"</string>
+ <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_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_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_tls_required" msgid="307030406688611327">"TLS لازم است اما توسط سرور پشتیبانی نمی شود."</string>
+ <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS لازم است اما توسط سرور پشتیبانی نمیشود."</string>
<string name="account_setup_failed_auth_required" msgid="6799839150250217566">"روشهای تأیید اعتبار توسط سرور پشتیبانی نمیشوند."</string>
<string name="account_setup_failed_security" msgid="925820957665764964">"به دلیل خطای امنیتی، اتصال به سرور باز نمیشود."</string>
<string name="account_setup_failed_ioerror" msgid="7802604687451830378">"اتصال به سرور برقرار نمیشود."</string>
<string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"آدرس سرور را اشتباه وارد کردهاید یا سرور به نسخه پروتکلی احتیاج دارد که ایمیل پشتیبانی نمیکند."</string>
<string name="account_setup_failed_access_denied" msgid="6835358740050287051">"شما اجازه همگامسازی با این سرور را ندارید. برای کسب اطلاعات بیشتر با سرپرست سرور خود تماس بگیرید."</string>
<string name="account_setup_security_required_title" msgid="1850321535870447468">"مدیریت امنیت راه دور"</string>
- <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"سرور <xliff:g id="SERVER">%s</xliff:g> از شما می خواهد که به آن اجازه دهید برخی از ویژگی های امنیتی دستگاه Android شما را از راه دور کنترل کند. آیا می خواهید تنظیم این حساب را به پایان برسانید؟"</string>
- <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"این سرور نیاز به ویژگیهای امنیتی دارد که دستگاه Android شما پشتیبانی نمی کند، از جمله:<xliff:g id="ERROR">%s</xliff:g>"</string>
+ <string name="account_setup_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>
- <string name="security_notification_content_title" msgid="3352841884304076235">"به روزرسانی امنیتی لازم است"</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>
- <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"سرور <xliff:g id="SERVER">%s</xliff:g> از شما می خواهد که به آن اجازه دهید برخی از ویژگی های امنیتی دستگاه Android شما را از راه دور کنترل کند."</string>
+ <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"سرور <xliff:g id="SERVER">%s</xliff:g> از شما میخواهد که به آن اجازه دهید برخی از ویژگیهای امنیتی دستگاه Android شما را از راه دور کنترل کند."</string>
<string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"ویرایش جزئیات"</string>
<string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"\"<xliff:g id="ACCOUNT">%s</xliff:g>\" از شما میخواهد کد پین یا گذرواژه قفل صفحه را تغییر دهید."</string>
<string name="password_expire_warning_content_title" msgid="7174669014074849304">"رمز ورود قفل صفحه در حال انقضا"</string>
<string name="password_expired_ticker" msgid="4230570412974108968">"کد پین یا رمز ورود قفل صفحه منقضی شده است."</string>
<string name="password_expired_content_title" msgid="4349518706602252979">"رمز ورود قفل صفحه منقضی شده است"</string>
<string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"رمز ورود قفل صفحه در حال انقضا"</string>
- <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"شما باید به زودی کد پین یا رمز ورود قفل صفحه را تغییر دهید، در غیر این صورت داده های <xliff:g id="ACCOUNT">%s</xliff:g> پاک می شود. اکنون تغییر می دهید؟"</string>
+ <string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"شما باید به زودی کد پین یا رمز ورود قفل صفحه را تغییر دهید، در غیر این صورت دادههای <xliff:g id="ACCOUNT">%s</xliff:g> پاک میشود. اکنون تغییر میدهید؟"</string>
<string name="password_expired_dialog_title" msgid="2186547998125938084">"رمز ورود قفل صفحه منقضی شده است"</string>
- <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"داده های <xliff:g id="ACCOUNT">%s</xliff:g> از دستگاه شما حذف می شوند. می توانید با تغییر کد پین یا رمز ورود صفحه قفل خود آنها را بازیابی کنید. اکنون آنرا تغییر می دهید؟"</string>
+ <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"دادههای <xliff:g id="ACCOUNT">%s</xliff:g> از دستگاه شما حذف میشوند. میتوانید با تغییر کد پین یا رمز ورود صفحه قفل خود آنها را بازیابی کنید. اکنون آنرا تغییر میدهید؟"</string>
<string name="account_settings_exit_server_settings" msgid="8006323251094711431">"از تغییرات ذخیره نشده صرفنظر شود؟"</string>
<string name="account_settings_login_dialog_title" msgid="4024422579146302775">"ورود به سیستم ممکن نیست"</string>
- <string name="account_settings_login_dialog_content_fmt" msgid="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>
+ <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>
<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_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>
<string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"دفعات بررسی صندوق دریافت"</string>
<string name="account_settings_incoming_label" msgid="7858928031806297542">"تنظیمات ورودی"</string>
@@ -375,33 +377,28 @@
<string name="account_settings_name_label" msgid="8186406122590008449">"نام شما"</string>
<string name="account_settings_signature_label" msgid="4091969938785803201">"امضا"</string>
<string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"پاسخهای سریع"</string>
- <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"متنی را که غالباً هنگام نوشتن ایمیل ها درج می کنید، ویرایش کنید"</string>
- <string name="account_settings_signature_hint" msgid="7262183168962779403">"افزودن متن به پیام هایی که ارسال می کنید"</string>
+ <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"متنی را که غالباً هنگام نوشتن ایمیلها درج میکنید، ویرایش کنید"</string>
+ <string name="account_settings_signature_hint" msgid="7262183168962779403">"افزودن متن به پیامهایی که ارسال میکنید"</string>
<string name="account_settings_notifications" msgid="1042620094281375043">"تنظیمات اعلان"</string>
<string name="account_settings_data_usage" msgid="6669107430575866736">"مصرف داده"</string>
<string name="edit_quick_response_dialog" msgid="4322494050816995390">"ویرایش پاسخ سریع"</string>
<string name="save_action" msgid="1988862706623227093">"ذخیره"</string>
- <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"همگام سازی مخاطبین"</string>
- <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"همگام سازی مخاطبین برای این حساب"</string>
- <string name="account_settings_sync_calendar_enable" msgid="3039820725699412208">"همگام سازی تقویم"</string>
- <string name="account_settings_sync_calendar_summary" msgid="5241995538395965804">"همگام سازی تقویم برای این حساب"</string>
+ <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"همگامسازی مخاطبین"</string>
+ <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"همگامسازی مخاطبین برای این حساب"</string>
+ <string name="account_settings_sync_calendar_enable" msgid="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_summary" msgid="262964076412310990">"همگام سازی ایمیل برای این حساب"</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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"همیشه"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"فقط هنگام ساکت بودن"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"هرگز"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"لرزش"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"انتخاب آهنگ زنگ"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"تنظیمات سرور"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"حذف حساب"</string>
- <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"حساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" از ایمیل حذف می شود."</string>
+ <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"حساب \"<xliff:g id="ACCOUNT">%s</xliff:g>\" از ایمیل حذف میشود."</string>
<string name="account_settings_category_delete_account" msgid="5128545184407925226">"حذف حساب"</string>
<string name="account_settings_delete_account_label" msgid="4889158717472601718">"حذف حساب"</string>
<string name="mailbox_settings_activity_title" msgid="4705845931573373274">"گزینههای همگامسازی"</string>
<string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"گزینههای همگامسازی (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
- <string name="mailbox_preferences_header" msgid="9077316556563252246">"تنظیمات همگام سازی"</string>
+ <string name="mailbox_preferences_header" msgid="9077316556563252246">"تنظیمات همگامسازی"</string>
<string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"بررسی فرکانس"</string>
<string name="mailbox_settings_mailbox_sync_window_label" msgid="2957945231022052672">"تعداد روز برای همگامسازی"</string>
<string name="account_shortcut_picker_name" msgid="1994861845225243190">"حساب ایمیل"</string>
@@ -415,7 +412,7 @@
<string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
<string name="system_account_create_failed" msgid="3673792980526246177">"حساب ایجاد نشد. دوباره امتحان کنید."</string>
<string name="device_admin_label" msgid="8680224994637869414">"ایمیل"</string>
- <string name="device_admin_description" msgid="426727923791430306">"خط مشی های امنیتی تعیین شده توسط سرور را فعال می کند"</string>
+ <string name="device_admin_description" msgid="426727923791430306">"خط مشیهای امنیتی تعیین شده توسط سرور را فعال میکند"</string>
<string name="gal_searching_fmt" msgid="6140450617663543464">"در حال جستجو <xliff:g id="DOMAIN">%s</xliff:g>..."</string>
<plurals name="gal_completed_fmt">
<item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> نتیجه از <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
@@ -423,7 +420,7 @@
</plurals>
<string name="settings_activity_title" msgid="5185915603716333904">"تنظیمات"</string>
<string name="header_label_general_preferences" msgid="9204600297009680176">"عمومی"</string>
- <string name="category_general_preferences" msgid="2742423840964045801">"برنامه کاربردی"</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_dialog_title" msgid="5405052109452503909">"پیشروی به"</string>
@@ -450,12 +447,12 @@
<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_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>
@@ -466,6 +463,6 @@
<string name="search_header_text_fmt" msgid="2638602588841231811">"نتایج"</string>
<string name="search_slow_warning_title" msgid="2826118321880530239">"در انتظار نتایج"</string>
<string name="search_slow_warning_message" msgid="8494483410797387903">"در بعضی از سرورها ممکن است زمان طولانی شود."</string>
- <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"پوشه ها"</string>
+ <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"پوشهها"</string>
<string name="require_manual_sync_message" msgid="7777357288642785955">"هنگام رومینگ، همگامسازی پسزمینه برای این حساب غیرفعال است."</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5e1a482..8130638 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Synkronointiasetukset"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Merkitse lukemattomaksi"</string>
<string name="move_action" msgid="3059189775933985898">"Siirrä"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Uudemmat"</string>
+ <string name="older_action" msgid="4504015635360605471">"Vanhemmat"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Kopio/piilok."</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Lisää kopio/piilok."</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Liitä tiedosto"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkronoi sähköposti"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkronoi tämän tilin sähköpostit"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Värinä"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Käytä värinää, kun sähköpostiviesti saapuu"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Aina"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Vain äänettömässä tilassa"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ei koskaan"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Värinä"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Valitse soittoääni"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Palvelinasetukset"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Poista tili"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f1cc8c1..83e9e2d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Options de synchronisation"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marquer comme non lu"</string>
<string name="move_action" msgid="3059189775933985898">"Déplacer"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Plus récent"</string>
+ <string name="older_action" msgid="4504015635360605471">"Plus ancien"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Cci"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Ajouter Cc/Cci"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Joindre un fichier"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchr. messagerie"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchroniser les e-mails pour ce compte"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibreur"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrer à la réception d\'un e-mail"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Toujours"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"En mode silencieux"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Jamais"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibreur"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Sélectionner une sonnerie"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Paramètres du serveur"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Supprimer le compte"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 60d39d5..faf4429 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"समन्वयन विकल्प"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"बिना पढ़ी के रूप में चिह्नित करें"</string>
<string name="move_action" msgid="3059189775933985898">"ले जाएं"</string>
+ <string name="newer_action" msgid="8950909456802330593">"नया"</string>
+ <string name="older_action" msgid="4504015635360605471">"पुराना"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"Cc/Bcc जोड़ें"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Cc/Bcc जोड़ें"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"फ़ाइल अनुलग्न करें"</string>
@@ -164,7 +166,7 @@
<string name="message_view_show_pictures_action" msgid="5059936981743072545">"चित्र दिखाएं"</string>
<string name="message_view_always_show_pictures_button" msgid="6523810929103546865">"हमेशा दिखाएं"</string>
<string name="message_view_always_show_pictures_prompt" msgid="7685500276479967959">"इस प्रेषक के चित्र हमेशा दिखाएं:"</string>
- <string name="message_view_always_show_pictures_confirmation" msgid="6838463134312859448">"इस प्रेषक के चित्रों को स्वचालित रूप से दिखाया जाएगा."</string>
+ <string name="message_view_always_show_pictures_confirmation" msgid="6838463134312859448">"इस प्रेषक के चित्रों को अपने आप दिखाया जाएगा."</string>
<string name="message_view_invite_view" msgid="5521032519960111675">"कैलेंडर में देखें"</string>
<string name="message_view_invite_title" msgid="3418949733434713805">"कैलेंडर आमंत्रण"</string>
<string name="message_view_invite_text" msgid="1212799906603873708">"आप जा रहे हैं?"</string>
@@ -172,7 +174,7 @@
<string name="message_view_invite_maybe" msgid="7555189462441562318">" शायद"</string>
<string name="message_view_invite_decline" msgid="6119797303297149463">" नहीं"</string>
<string name="message_view_invite_toast_yes" msgid="6802274503171644414">"आपने यह आमंत्रण स्वीकार कर लिया है."</string>
- <string name="message_view_invite_toast_maybe" msgid="8547454326090527202">"आपने इस आमंत्रण के लिए \"संभवतः\" प्रत्युत्तर दिया है."</string>
+ <string name="message_view_invite_toast_maybe" msgid="8547454326090527202">"आपने इस आमंत्रण के लिए \"संभवतः\" जवाब दिया है."</string>
<string name="message_view_invite_toast_no" msgid="1842341256942784143">"आपने यह आमंत्रण अस्वीकार कर दिया है."</string>
<string name="message_view_show_details" msgid="6287415596441037095">"विवरण दिखाएं"</string>
<string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"संदेश विवरण"</string>
@@ -290,7 +292,7 @@
<string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"सुरक्षित कनेक्शन (SSL) का उपयोग करें"</string>
<string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"सभी SSL प्रमाणपत्र स्वीकार करें"</string>
<string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"क्लाइंट प्रमाणपत्र"</string>
- <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"चयन करें"</string>
+ <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"चुनें"</string>
<string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"क्लाइंट प्रमाणपत्र का उपयोग करें"</string>
<string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"निकालें"</string>
<string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"कोई नहीं"</string>
@@ -376,7 +378,7 @@
<string name="account_settings_signature_label" msgid="4091969938785803201">"हस्ताक्षर"</string>
<string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"त्वरित प्रतिसाद"</string>
<string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"वह पाठ संपादित करें जिसे आप अक्सर ईमेल लिखते समय शामिल करते हैं"</string>
- <string name="account_settings_signature_hint" msgid="7262183168962779403">"आपके भेजे जाने वाले संदेशों में पाठ संशोधित करें"</string>
+ <string name="account_settings_signature_hint" msgid="7262183168962779403">"आपके भेजे जाने वाले संदेशों में पाठ बदलें"</string>
<string name="account_settings_notifications" msgid="1042620094281375043">"सूचना सेटिंग"</string>
<string name="account_settings_data_usage" msgid="6669107430575866736">"डेटा उपयोग"</string>
<string name="edit_quick_response_dialog" msgid="4322494050816995390">"त्वरित प्रतिसाद संपादित करें"</string>
@@ -388,11 +390,6 @@
<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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"हमेशा"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"केवल मौन होने पर"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"कभी नहीं"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"कंपन"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"रिंगटोन चुनें"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"सर्वर सेटिंग"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"खाता निकालें"</string>
@@ -406,7 +403,7 @@
<string name="mailbox_settings_mailbox_sync_window_label" msgid="2957945231022052672">"समन्वयन के लिए दिन:"</string>
<string name="account_shortcut_picker_name" msgid="1994861845225243190">"ईमेल खाता"</string>
<string name="account_shortcut_picker_title" msgid="1039929224016048015">"कोई खाता चुनें"</string>
- <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"फ़ोल्डर का चयन करें"</string>
+ <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 पहुंच प्राप्त होती है जो इस प्रोग्राम को कनेक्ट करने देती है. यदि आप अपने सही ईमेल पते और पासवर्ड द्वारा साइन इन नहीं कर पा रहे हैं, तो हो सकता है कि आपके पास सशुल्क \"प्लस\" खाता न हो. इन ईमेल खातों में पहुंच प्राप्त करने के लिए वेब ब्राउज़र लॉन्च करें."</string>
@@ -447,7 +444,7 @@
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"सभी को प्रत्युत्तर दें"</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="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>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1140abb..5c15db6 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opcije sinkronizacije"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Označi kao nepročitano"</string>
<string name="move_action" msgid="3059189775933985898">"Premjesti"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Novije"</string>
+ <string name="older_action" msgid="4504015635360605471">"Starije"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Kop/skr.kop."</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Dodaj kopiju/skrivenu kopiju"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Priloži datoteku"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sink. e-pošte"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sink. e-pošte za ovaj račun"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibracija"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibracija i kad stigne e-pošta"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Uvijek"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Samo ako je bešumno"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikad"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibracija"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Odaberite melodiju zvona"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Postavke poslužitelja"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Ukloni račun"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e61ee35..536081b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Szinkronizálási beállítások"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Megjelölés olvasatlanként"</string>
<string name="move_action" msgid="3059189775933985898">"Áthelyezés"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Újabb"</string>
+ <string name="older_action" msgid="4504015635360605471">"Korábbi"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Másolatmezők"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Másolatmezők is"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Fájl csatolása"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-mail szinkroniz."</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"A fiók e-mailjeinek szinkronizálása"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rezgés"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Rezgés e-mail érkezésekor is"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Mindig"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Csak néma üzemmódban"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Soha"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Rezgés"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Válasszon csengőhangot"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Szerverbeállítások"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Fiók törlése"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 59640d9..876a64b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -32,7 +32,7 @@
<string name="reply_all_action" msgid="6192179825726332152">"Balas ke semua"</string>
<string name="delete_action" msgid="8421026208288857155">"Hapus"</string>
<string name="forward_action" msgid="669174181042344116">"Teruskan"</string>
- <string name="favorite_action" msgid="4664259801498253756">"Kilaukan Bintang"</string>
+ <string name="favorite_action" msgid="4664259801498253756">"Bintangi"</string>
<string name="done_action" msgid="7497990549515580249">"Selesai"</string>
<string name="create_action" msgid="3062715563215392251">"Buat baru"</string>
<string name="delete_quick_response_action" msgid="3076922270182841978">"Hapus"</string>
@@ -42,8 +42,8 @@
<string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Masukkan tanggapan cepat"</string>
<string name="read_action" msgid="4701484794504781686">"Tandai sudah dibaca"</string>
<string name="unread_action" msgid="6280399049357552826">"Tandai belum dibaca"</string>
- <string name="set_star_action" msgid="4660317166196258160">"Kilaukan bintang"</string>
- <string name="remove_star_action" msgid="6689770999647007163">"Redupkan bintang"</string>
+ <string name="set_star_action" msgid="4660317166196258160">"Bintangi"</string>
+ <string name="remove_star_action" msgid="6689770999647007163">"Hapus bintang"</string>
<string name="refresh_action" msgid="5951383001436708175">"Segarkan"</string>
<string name="add_account_action" msgid="8835736309476033727">"Tambahkan akun"</string>
<string name="compose_action" msgid="4045702519637388045">"Tulis"</string>
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opsi sinkronisasi"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Tandai belum dibaca"</string>
<string name="move_action" msgid="3059189775933985898">"Pindahkan"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Lebih baru"</string>
+ <string name="older_action" msgid="4504015635360605471">"Lebih lama"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Tambahkan Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Lampirkan file"</string>
@@ -102,7 +104,7 @@
</plurals>
<string name="debug_version_fmt" msgid="6160213145745376955">"Versi: <xliff:g id="VERSION">%s</xliff:g>"</string>
<string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Kotak Masuk"</string>
- <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Yang berkilau bintangnya"</string>
+ <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Yang berbintang"</string>
<string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Draf"</string>
<string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Kotak Keluar"</string>
<string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Tampilan kombinasi"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinkronkan email"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinkronkan email untuk akun ini"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Getar"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Juga bergetar ketika email tiba"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Selalu"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Hanya saat senyap"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Tidak pernah"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Getar"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Pilih nada dering"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Setelan server"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Hapus akun"</string>
@@ -455,7 +452,7 @@
<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>
+ <string name="widget_starred" msgid="8290352707134011791">"Yang berbintang"</string>
<string name="widget_loading" msgid="2340962056927255554">"Memuat…"</string>
<string name="widget_touch_to_configure" msgid="7062039013915225323">"Sentuh untuk menyiapkan."</string>
<string name="widget_no_accounts" msgid="2412482205591224408">"Anda belum menyiapkan akun email."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index cbe5eb0..78c7952 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opzioni di sincronizzazione"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Segna come da leggere"</string>
<string name="move_action" msgid="3059189775933985898">"Sposta"</string>
+ <string name="newer_action" msgid="8950909456802330593">"+ recente"</string>
+ <string name="older_action" msgid="4504015635360605471">"- recente"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Ccn"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Aggiungi Cc/Ccn"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Allega file"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizza email"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizza le email per questo account"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrazione"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Attiva anche vibrazione all\'arrivo di email"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Solo in modalità silenziosa"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrazione"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Scegli suoneria"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Impostazioni server"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Rimuovi account"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2dce2da..4993d8e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"אפשרויות סינכרון"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"סמן כלא נקרא"</string>
<string name="move_action" msgid="3059189775933985898">"העבר"</string>
+ <string name="newer_action" msgid="8950909456802330593">"חדש יותר"</string>
+ <string name="older_action" msgid="4504015635360605471">"ישן יותר"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ עותק/עותק מוסתר"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"הוסף עותק/עותק מוסתר"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"צרף קובץ"</string>
@@ -62,7 +64,7 @@
<string name="move_to_folder_dialog_title" msgid="2614318192482193898">"העבר אל"</string>
<string name="status_loading_messages" msgid="6552307237621292344">"טוען הודעות..."</string>
<string name="status_network_error" msgid="2611654064403817391">"בעיה בחיבור."</string>
- <string name="error_loading_message_body" msgid="6775234299515596760">"לא ניתן לטעון את טקסט ההודעה. ייתכן שההודעה גדולה מדי להצגה."</string>
+ <string name="error_loading_message_body" msgid="6775234299515596760">"לא ניתן להעלות את טקסט ההודעה. ייתכן שההודעה גדולה מדי להצגה."</string>
<plurals name="move_messages">
<item quantity="one" msgid="320885379869442589">"העבר הודעה"</item>
<item quantity="other" msgid="371256717624461324">"העבר הודעות"</item>
@@ -388,11 +390,6 @@
<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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"תמיד"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"במצב שקט בלבד"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"אף פעם"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"רטט"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"בחר רינגטון"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"הגדרות שרת"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"הסר חשבון"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a679af5..558ca89 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"同期オプション"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"未読にする"</string>
<string name="move_action" msgid="3059189775933985898">"移動"</string>
+ <string name="newer_action" msgid="8950909456802330593">"前"</string>
+ <string name="older_action" msgid="4504015635360605471">"次"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"Cc/Bccを追加"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Cc/Bccを追加"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"ファイルを添付"</string>
@@ -388,11 +390,6 @@
<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">"メール受信: バイブレーションON"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"常に使用"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"マナーモード時のみ"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"使用しない"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"バイブレーション"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"着信音を選択"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"サーバー設定"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"アカウントを削除"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7a46585..302f19e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"동기화 옵션"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"읽지않음으로 표시"</string>
<string name="move_action" msgid="3059189775933985898">"이동"</string>
+ <string name="newer_action" msgid="8950909456802330593">"다음"</string>
+ <string name="older_action" msgid="4504015635360605471">"이전"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"참조/숨은참조 추가"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"참조/숨은참조 추가"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"파일 첨부"</string>
@@ -388,11 +390,6 @@
<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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"항상"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"무음 시에만"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"안함"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"진동"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"벨소리 선택"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"서버 설정"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"계정 삭제"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c550eb7..b2a0599 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Sinchronizavimo parinktys"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Pažymėti kaip neskaitytą"</string>
<string name="move_action" msgid="3059189775933985898">"Perkelti"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Naujesnis"</string>
+ <string name="older_action" msgid="4504015635360605471">"Senesnis"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ kop. / nemat. kop."</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Pridėti Cc / Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Pridėti failą"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinchron. el. paštą"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinchron. šios paskyros el. paštą"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibruoti"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Taip pat vibruoti, kai gaunamas el. laiškas"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Visada"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tik kai veikia tyliai"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Niekada"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibruoti"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Pasirinkti skambėjimo toną"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Serverio nustatymai"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Pašalinti paskyrą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 4f987f6..843453d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Sinhronizācijas opcijas"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Atzīmēt kā nelasītu"</string>
<string name="move_action" msgid="3059189775933985898">"Pārvietot"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Jaunāki"</string>
+ <string name="older_action" msgid="4504015635360605471">"Vecāki"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Kopija/d. kop."</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Piev. kop./d. kop."</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Pievienot failu"</string>
@@ -241,7 +243,7 @@
<string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-pasta adrese"</string>
<string name="account_setup_basics_password_label" msgid="9133549799291519298">"Parole"</string>
<string name="account_setup_basics_default_label" msgid="5924790142029806711">"Pēc noklusējuma sūtīt e-pastu no šī konta."</string>
- <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuāla iestatīšana"</string>
+ <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuāla iest."</string>
<string name="account_setup_username_password_toast" msgid="3968270274727947460">"Ierakstiet derīgu e-pasta adresi un paroli."</string>
<string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dublikāta konts"</string>
<string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Jūs jau izmantojat šo lietotājvārdu kontam <xliff:g id="DUPLICATE">%s</xliff:g>."</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinhronizēt e-pastu"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinhronizēt e-pastu šim kontam"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrozvans"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Izmantot vibrozvanu, kad tiek saņemts e-pasta ziņojums"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vienmēr"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tikai klusuma režīmā"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nekad"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrozvans"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Izvēlēties zvana signālu"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Servera iestatījumi"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Konta noņemšana"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 2a687fa..effce35 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Pilihan segerak"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Tandakan belum dibaca"</string>
<string name="move_action" msgid="3059189775933985898">"Alih"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Lebih baharu"</string>
+ <string name="older_action" msgid="4504015635360605471">"Lebih lama"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Sk/Skt"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Tambah Sk/Skt"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Lampirkan fail"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Segerakkan e-mel"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Segerakkan e-mel untuk akaun ini"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Getar"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Juga bergetar semasa e-mel diterima"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sentiasa"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Apabila senyap sahaja"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Jangan sekali-kali"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Getar"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Pilih nada dering"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Tetapan pelayan"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Alih keluar akaun"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1d5fc1c..d157c64 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Synkroniseringsalternativer"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Merk som ulest"</string>
<string name="move_action" msgid="3059189775933985898">"Flytt"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Nyere"</string>
+ <string name="older_action" msgid="4504015635360605471">"Eldre"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ kopi/blindkopi"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Legg til Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Legg ved fil"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkroniser e-post"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkroniser e-postmeldinger fra denne kontoen"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrering"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrer også når nye e-postmeldinger mottas"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Alltid"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kun i stillemodus"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldri"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrering"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Velg ringetone"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Innstillinger for tjener"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Fjern"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e51bde0..94b50de 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Synchronisatieopties"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Markeren als ongelezen"</string>
<string name="move_action" msgid="3059189775933985898">"Verpl."</string>
+ <string name="newer_action" msgid="8950909456802330593">"Nieuwer"</string>
+ <string name="older_action" msgid="4504015635360605471">"Ouder"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Cc/Bcc toevoegen"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Bestand bijvoegen"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"E-mail synch."</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"E-mail voor dit account synchroniseren"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Trillen"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Ook trillen wanneer er e-mail binnenkomt"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Altijd"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Alleen indien stil"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nooit"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Trillen"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Beltoon kiezen"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Serverinstellingen"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Account verwijderen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index da6b011..9f1ce15 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opcje synchronizacji"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Oznacz jako nieprzeczytane"</string>
<string name="move_action" msgid="3059189775933985898">"Przenieś"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Nowsze"</string>
+ <string name="older_action" msgid="4504015635360605471">"Starsze"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ DW/UDW"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Dodaj DW/UDW"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Załącz plik"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchronizuj e-maile"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchronizuj wiadomości e-mail dla tego konta"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Wibracje"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Wibracje także po otrzymaniu e-maila"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Zawsze"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Tylko po wyciszeniu"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nigdy"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Wibracje"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Wybierz dzwonek"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Ustawienia serwera"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Usuń konto"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 241141d..b16c53d 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -20,7 +20,7 @@
<string name="permission_read_attachment_desc" msgid="6592948507403743153">"Permite que esta aplicação leia os seus anexos de e-mail."</string>
<string name="permission_access_provider_label" msgid="378256653525377586">"Aceder a dados do fornecedor de e-mail"</string>
<string name="permission_access_provider_desc" msgid="2221907862438022705">"Permite que esta aplicação aceda à base de dados do e-mail, incluindo às mensagens recebidas, mensagens enviadas, nomes de utilizadores e palavras-passe."</string>
- <string name="app_name" msgid="5815426892327290362">"E-mail"</string>
+ <string name="app_name" msgid="5815426892327290362">"Email"</string>
<string name="compose_title" msgid="427986915662706899">"Redigir"</string>
<string name="debug_title" msgid="5175710493691536719">"Depuração"</string>
<string name="next_action" msgid="3931301986364184415">"Seguinte"</string>
@@ -44,7 +44,7 @@
<string name="unread_action" msgid="6280399049357552826">"Marcar como não lida"</string>
<string name="set_star_action" msgid="4660317166196258160">"Adicionar estrela"</string>
<string name="remove_star_action" msgid="6689770999647007163">"Remover estrela"</string>
- <string name="refresh_action" msgid="5951383001436708175">"Actualizar"</string>
+ <string name="refresh_action" msgid="5951383001436708175">"Atualizar"</string>
<string name="add_account_action" msgid="8835736309476033727">"Adicionar conta"</string>
<string name="compose_action" msgid="4045702519637388045">"Redigir"</string>
<string name="search_action" msgid="6325101454876682308">"Pesquisar"</string>
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opções de sincronização"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como não lida"</string>
<string name="move_action" msgid="3059189775933985898">"Mover"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Mais recente"</string>
+ <string name="older_action" msgid="4504015635360605471">"Mais antigo"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Adicionar Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Anexar ficheiro"</string>
@@ -128,7 +130,7 @@
<string name="cc" msgid="7017720927911078193">"Cc"</string>
<string name="bcc" msgid="3098643138241111579">"Bcc"</string>
<string name="subject_hint" msgid="7253964583324677128">"Assunto"</string>
- <string name="body_hint" msgid="4279864165439577668">"Escrever e-mail"</string>
+ <string name="body_hint" msgid="4279864165439577668">"Escrever email"</string>
<string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Mensagem original --------"\n"Assunto: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"De: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Para: <xliff:g id="TO">%3$s</xliff:g>"\n"CC: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string>
<string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> escreveu:"\n\n</string>
<string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Incluir texto citado"</string>
@@ -234,11 +236,11 @@
<string name="account_setup_basics_title" msgid="3578333196594678422">"Configuração da conta"</string>
<string name="account_setup_basics_exchange_title" msgid="1147638872869594157">"Adicionar uma conta do Exchange"</string>
<string name="account_setup_basics_exchange_title_alternate" msgid="4980422714586153809">"Adicionar uma conta do Exchange ActiveSync"</string>
- <string name="account_setup_basics_headline" msgid="6726590205905464015">"Conta de e-mail"</string>
+ <string name="account_setup_basics_headline" msgid="6726590205905464015">"Conta de email"</string>
<string name="accounts_welcome" msgid="1491126253077950685">"Pode configurar o e-mail para a maioria das contas em apenas alguns passos."</string>
<string name="accounts_welcome_exchange" msgid="4432917203403596617">"É possível configurar uma conta do Exchange em apenas alguns passos."</string>
<string name="accounts_welcome_exchange_alternate" msgid="1319376442032224845">"Pode configurar uma conta Exchange ActiveSync em apenas alguns passos."</string>
- <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Endereço de e-mail"</string>
+ <string name="account_setup_basics_email_label" msgid="3454164053624112047">"Endereço de email"</string>
<string name="account_setup_basics_password_label" msgid="9133549799291519298">"Palavra-passe"</string>
<string name="account_setup_basics_default_label" msgid="5924790142029806711">"Enviar e-mail a partir desta conta por predefinição."</string>
<string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Configuração manual"</string>
@@ -355,7 +357,7 @@
<string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Palavra-passe de bloq. do ecrã a expirar"</string>
<string name="password_expire_warning_dialog_content_fmt" msgid="4595246020880351045">"Tem de alterar em breve o PIN ou palavra-passe de bloqueio do ecrã ou os dados para <xliff:g id="ACCOUNT">%s</xliff:g> serão apagados. Quer alterar agora?"</string>
<string name="password_expired_dialog_title" msgid="2186547998125938084">"A palavra-passe de bloq. do ecrã expirou"</string>
- <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Os dados para <xliff:g id="ACCOUNT">%s</xliff:g> estão a ser apagados do seu aparelho. Pode restaurá-los alterando o PIN ou palavra-passe de bloqueio do ecrã. Alterar agora?"</string>
+ <string name="password_expired_dialog_content_fmt" msgid="5982207349002500211">"Os dados para <xliff:g id="ACCOUNT">%s</xliff:g> estão a ser apagados do seu dispositivo. Pode restaurá-los alterando o PIN ou palavra-passe de bloqueio do ecrã. Alterar agora?"</string>
<string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Rejeitar alterações não guardadas?"</string>
<string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Não foi possível iniciar sessão."</string>
<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>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar e-mail"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar e-mail para esta conta"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar também quando chega e-mail"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Apenas quando está em silêncio"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Escolher toque"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Definições do servidor"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Remover conta"</string>
@@ -409,12 +406,12 @@
<string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Selecione uma pasta"</string>
<string name="toast_account_not_found" msgid="8144242451730692816">"Não foi possível localizar a conta. Pode ter sido removida."</string>
<string name="toast_mailbox_not_found" msgid="4960014581292378895">"Não foi possível localizar a pasta. Pode ter sido removida."</string>
- <string name="provider_note_live" msgid="2995297671709325333">"Apenas algumas contas “Plus” incluem acesso POP, permitindo a ligação deste programa. Se não conseguir iniciar sessão com o endereço de e-mail e palavra-passe corretos, é possível que não tenha uma conta “Plus” paga. Inicie o navegador de internet para obter acesso a essas contas de e-mail."</string>
+ <string name="provider_note_live" msgid="2995297671709325333">"Apenas algumas contas “Plus” incluem acesso POP, permitindo a ligação deste programa. Se não conseguir iniciar sessão com o endereço de email e palavra-passe corretos, é possível que não tenha uma conta “Plus” paga. Inicie o navegador de Internet para obter acesso a essas contas de email."</string>
<string name="provider_note_t_online" msgid="1630642061431427894">"Antes de configurar esta conta de e-mail, visite o Web site T-Online e crie uma palavra-passe de acesso a e-mail POP3."</string>
<string name="exchange_name" msgid="1190783774800310346">"Empresa"</string>
<string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
<string name="system_account_create_failed" msgid="3673792980526246177">"Não foi possível criar a conta. Tente novamente."</string>
- <string name="device_admin_label" msgid="8680224994637869414">"E-mail"</string>
+ <string name="device_admin_label" msgid="8680224994637869414">"Email"</string>
<string name="device_admin_description" msgid="426727923791430306">"Activa as políticas de segurança especificadas pelo servidor"</string>
<string name="gal_searching_fmt" msgid="6140450617663543464">"A pesquisar <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
<plurals name="gal_completed_fmt">
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f42a4fc..bf28ec3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opções de sincronização"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como não lida"</string>
<string name="move_action" msgid="3059189775933985898">"Mover"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Recente"</string>
+ <string name="older_action" msgid="4504015635360605471">"Antiga"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Cco"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Adicionar Cc/Cco"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Anexar arquivo"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincronizar e-mail"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronizar e-mail para esta conta"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrar também quando chegar e-mails"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Sempre"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Apenas quando estiver no silencioso"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nunca"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Selecionar toque"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Configurações do servidor"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Remover conta"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 6968f92..84a7d99 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -67,6 +67,10 @@
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar sco nunlegì"</string>
<!-- no translation found for move_action (3059189775933985898) -->
<skip />
+ <!-- no translation found for newer_action (8950909456802330593) -->
+ <skip />
+ <!-- no translation found for older_action (4504015635360605471) -->
+ <skip />
<!-- no translation found for plus_cc_label (3365150001259912183) -->
<skip />
<!-- no translation found for add_cc_bcc_menu (4757145078498200242) -->
@@ -554,11 +558,6 @@
<skip />
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincronisar ils e-mails per quest conto"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrar"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Era vibrar sch\'in e-mail arriva"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Adina"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Mo sche silenzius"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Mai"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrar"</string>
<!-- no translation found for account_settings_ringtone (8229878374785575207) -->
<skip />
<string name="account_settings_servers" msgid="4925493817981624242">"Parameters dal server"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 454f59b..b3307de 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opţiuni de sincronizare"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marcaţi drept necitit"</string>
<string name="move_action" msgid="3059189775933985898">"Mutaţi"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Mai noi"</string>
+ <string name="older_action" msgid="4504015635360605471">"Mai vechi"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Adăugaţi Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Ataşaţi un fişier"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sincroniz. e-mailul"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sincron. e-mail pt. acest cont"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrare"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrare şi la sosirea mesajelor de e-mail"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Întotdeauna"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Numai când profilul este Silenţios"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Niciodată"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrare"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Alegeţi un ton de sonerie"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Setări server"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Eliminaţi contul"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 490edc6..17c7eec 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="permission_read_attachment_label" msgid="9208086010625033590">"Открывать прикрепленные файлы"</string>
+ <string name="permission_read_attachment_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>
@@ -53,8 +53,10 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Параметры синхронизации"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Отметить как непрочитанное"</string>
<string name="move_action" msgid="3059189775933985898">"Переместить"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Следующее"</string>
+ <string name="older_action" msgid="4504015635360605471">"Предыдущее"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"Добавить копию"</string>
- <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Копия/скрытая копия"</string>
+ <string name="add_cc_bcc_menu" msgid="4757145078498200242">"Копия/скрытая"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Прикрепить файл"</string>
<string name="close_action" msgid="533058985745238100">"Закрыть"</string>
<string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"Отправить все сообщ."</string>
@@ -388,11 +390,6 @@
<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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Всегда"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Только в режиме без звука"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никогда"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибросигнал"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Выбрать рингтон"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Настройки сервера"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Удалить аккаунт"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 096d19a..3d321ee 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Možnosti synchronizácie"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Označiť ako neprečítané"</string>
<string name="move_action" msgid="3059189775933985898">"Presunúť"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Novšie"</string>
+ <string name="older_action" msgid="4504015635360605471">"Staršie"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+Kópia/skr.kópia"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Pridať kópiu/skr.k."</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Pripojiť súbor"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchroniz. e-mail"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchr. e-mail pre tento účet"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrovať"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrovať aj pri príchode e-mailu"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vždy"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Iba v tichom režime"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikdy"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrovať"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Zvoliť vyzváňací tón"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Nastavenia servera"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Odstrániť účet"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e5d71a1..2f9542d 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Možnosti sinhronizacije"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Označi kot neprebrano"</string>
<string name="move_action" msgid="3059189775933985898">"Premakni"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Novejše"</string>
+ <string name="older_action" msgid="4504015635360605471">"Starejše"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Kp/Skp"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Dodaj Kp/Skp"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Priloži datoteko"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Sinhroniz. e-pošte"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sinhroniziraj e-pošto za ta račun"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibriranje"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibriraj tudi, ko prejmem e-pošto"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Vedno"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Samo v tihem načinu"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Nikoli"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibriranje"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Izberite melodijo zvonjenja"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Nastavitve strežnika"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Odstrani račun"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index be05d06..70e9124 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Опције синхронизације"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Означи као непрочитано"</string>
<string name="move_action" msgid="3059189775933985898">"Премести"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Новија"</string>
+ <string name="older_action" msgid="4504015635360605471">"Старијa"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Додај Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Приложи датотеку"</string>
@@ -388,11 +390,6 @@
<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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Увек"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Само у нечујном режиму"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Никад"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вибрација"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Изабери мелодију звона"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Подешавања сервера"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Уклони налог"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index fbc5f6f..3aef2c4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Synkroniseringsalternativ"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Markera som oläst"</string>
<string name="move_action" msgid="3059189775933985898">"Flytta"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Nyare"</string>
+ <string name="older_action" msgid="4504015635360605471">"Äldre"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+kopia/heml kop"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Lägg till kopia/hemlig kopia"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Bifoga fil"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synkronisera e-post"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synkronisera e-post för det här kontot"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrera"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Vibrerar även vid inkommande e-post"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Alltid"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Bara vid tyst"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Aldrig"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Vibrera"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Välj ringsignal"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Serverinställningar"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Ta bort konto"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index cddf5c5..896d20a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Chaguo za kusawazisha"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Tia alama kuwa haijasomwa"</string>
<string name="move_action" msgid="3059189775933985898">"Hamisha"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Mpya zaidi"</string>
+ <string name="older_action" msgid="4504015635360605471">"Nzee zaidi"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Nakala kwa/Nakala fiche kwa"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Ongeza Nakala kwa/Nakala fiche kwa"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Ambatisha faili"</string>
@@ -179,14 +181,14 @@
<string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Maelezo ya kiambatisho"</string>
<string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Inahitaji muunganisho wa Wi-Fi"</string>
<string name="attachment_info_wifi_settings" msgid="96432970927503597">"Mipangilio ya mtandao-hewa"</string>
- <string name="attachment_info_application_settings" msgid="4124655487276125596">"Mipangilio ya prog"</string>
+ <string name="attachment_info_application_settings" msgid="4124655487276125596">"Mipangilio ya programu"</string>
<string name="attachment_info_unknown" msgid="8342655396805943320">"Haiwezi kufungua kiambatisho."</string>
<string name="attachment_info_malware" msgid="6576029010855055528">"Hauwezi kuhifadhi au kufungua faili hii kwa sababu ya aina hii ya kiambatisho kinaweza kuwa na programu hasidi."</string>
<string name="attachment_info_policy" msgid="3560422300127587508">"KIambatisho hiki hakiwezi kuhifadhiwa au kufunguliwa kwa sababu ya sera za usalama za akaunti hii."</string>
<string name="attachment_info_wifi_only" msgid="1481120960014563617">"Kiambataisho hiki ni kirefu mno kuweza kupakua kupitia kwa mtandao wa simu. Unaweza kuipakua wakati mwingine ukiunganisha kwa mtandao-hewa."</string>
- <string name="attachment_info_no_intent" msgid="8139209405745777924">"Hakuna prog zilizosakinishwa ambazo zinaweza kufungua kiambatisho hiki. Jaribu kupakua programu ifaayo kutoka kwa Android Market."</string>
- <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Kiambatisho hiki ni prog. Unapaswa kuangalia Vyanzo Visivyojulikana katika Mipangilio &gt, Prog kabla uweze kuisanidi."</string>
- <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Prog haziwezi kusakinishwa moja kwa moja kutoka kwa barua pepe. Kwanza hifadhi programu hii na kisha isakinishe kwa kutumia programu za Upakuzi."</string>
+ <string name="attachment_info_no_intent" msgid="8139209405745777924">"Hakuna programu zilizosakinishwa ambazo zinaweza kufungua kiambatisho hiki. Jaribu kupakua programuramu ifaayo kutoka kwa Android Market."</string>
+ <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Kiambatisho hiki ni programu. Unapaswa kuangalia Vyanzo Visivyojulikana katika Mipangilio na Programu kabla ya kuisanidi."</string>
+ <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Programu haziwezi kusakinishwa moja kwa moja kutoka kwa barua pepe. Kwanza hifadhi programu hii na kisha isakinishe kwa kutumia programu ya Vipakuzi."</string>
<string name="attachment_not_found" msgid="7155322700141145123">"Haikuweza kupakia kiambatisho hiki."</string>
<string name="message_decode_error" msgid="5016042255170947834">"Kulikuwa na hitilafu wakati wa usimbuaji wa ujumbe."</string>
<string name="eml_view_title" msgid="8827210108543430336">"Kutazama <xliff:g id="FILENAME">%s</xliff:g>"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Landanisha barua pepe"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sawazisha barua pepe za akaunti hii"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Tetema"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Pia tetema baruapepe inapofika"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Kila wakati"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kukiwa kimya tu"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Katu"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Tetema"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Chagua toni ya mlio"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Mipangilio ya seva"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Ondoa akaunti"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 8a5a431..0b6e1e7 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"ตัวเลือกการซิงค์"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"ทำเครื่องหมายว่ายังไม่ได้อ่าน"</string>
<string name="move_action" msgid="3059189775933985898">"ย้าย"</string>
+ <string name="newer_action" msgid="8950909456802330593">"ใหม่กว่า"</string>
+ <string name="older_action" msgid="4504015635360605471">"เก่ากว่า"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ สำเนา/สำเนาลับ"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"เพิ่มสำเนา/สำเนาลับ"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"แนบไฟล์"</string>
@@ -235,7 +237,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">"คุณสามารถตั้งค่าอีเมลสำหรับ\\nบัญชีส่วนใหญ่ได้ในไม่กี่ขั้นตอน"</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>
@@ -388,11 +390,6 @@
<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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"ทุกครั้ง"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"เฉพาะเมื่อปิดเสียง"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"ไม่ต้องเลย"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"สั่น"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"เลือกเสียงเรียกเข้า"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"การตั้งค่าเซิร์ฟเวอร์"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"ลบบัญชี"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f927ff7..47766ec 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Mga pagpipilian sa pag-sync"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Markahan bilang hindi pa nababasa"</string>
<string name="move_action" msgid="3059189775933985898">"Ilipat"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Mas Bago"</string>
+ <string name="older_action" msgid="4504015635360605471">"Mas Luma"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Magdagdag ng Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Mag-attach ng file"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"I-sync ang email"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"I-sync ang email sa account na ito"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"I-vibrate"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"I-vibrate rin kapag dumating ang email"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Palagi"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kapag tahimik lang"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Hindi kailanman"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"I-vibrate"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Pumili ng ringtone"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Mga setting ng server"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Alisin ang account"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f4bf51b..6a575bd 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Senkronizasyon seçenekleri"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Okunmadı olarak işaretle"</string>
<string name="move_action" msgid="3059189775933985898">"Taşı"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Daha yeni"</string>
+ <string name="older_action" msgid="4504015635360605471">"Daha eski"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Cc/Bcc Ekle"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Dosya ekleyin"</string>
@@ -388,11 +390,6 @@
<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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Her zaman"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Yalnızca sessizken"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Hiçbir zaman"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Titreşim"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Zil sesi seçin"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Sunucu ayarları"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Hesabı kaldır"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 69dde3c..a35be39 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Параметри синхронізації"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Позн. як непрочит."</string>
<string name="move_action" msgid="3059189775933985898">"Переміст."</string>
+ <string name="newer_action" msgid="8950909456802330593">"Новіші"</string>
+ <string name="older_action" msgid="4504015635360605471">"Старіші"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+Копія/прихована"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Копія/прихов. копія"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Вкласти файл"</string>
@@ -388,11 +390,6 @@
<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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Завжди"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Лише в беззвуч. реж."</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Ніколи"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Вібросигнал"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Вибрати сигнал дзвінка"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Налашт-ня сервера"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Видал. обл. зап."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 379c025..1e778bb 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Tùy chọn đồng bộ hóa"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Đánh dấu là chưa đọc"</string>
<string name="move_action" msgid="3059189775933985898">"Di chuyển"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Mới hơn"</string>
+ <string name="older_action" msgid="4504015635360605471">"Cũ hơn"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Thêm Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Đính kèm tệp"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Đồng bộ hóa email"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Đồng bộ hóa email cho tài khoản này"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Rung"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Cũng rung khi email đến"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Luôn luôn"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Chỉ khi ở chế độ im lặng"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Chưa bao giờ"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Rung"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Chọn nhạc chuông"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Cài đặt máy chủ"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Xóa tài khoản"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 69c1529..053fd32 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"同步选项"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"标记为未读"</string>
<string name="move_action" msgid="3059189775933985898">"移动"</string>
+ <string name="newer_action" msgid="8950909456802330593">"后一封邮件"</string>
+ <string name="older_action" msgid="4504015635360605471">"前一封邮件"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+抄送/密送"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"添加抄送/密送地址"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"添加附件"</string>
@@ -375,7 +377,7 @@
<string name="account_settings_name_label" msgid="8186406122590008449">"您的姓名"</string>
<string name="account_settings_signature_label" msgid="4091969938785803201">"签名"</string>
<string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"快速回复"</string>
- <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"编辑撰写电子邮件时经常插入的文本"</string>
+ <string name="account_settings_edit_quick_responses_summary" msgid="5284435342418252369">"编辑您在写电子邮件时经常插入的文本"</string>
<string name="account_settings_signature_hint" msgid="7262183168962779403">"在您发送的邮件中附加文本"</string>
<string name="account_settings_notifications" msgid="1042620094281375043">"通知设置"</string>
<string name="account_settings_data_usage" msgid="6669107430575866736">"数据使用"</string>
@@ -388,11 +390,6 @@
<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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"始终"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"仅在静音时"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"永不"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"振动"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"选择铃声"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"服务器设置"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"删除帐户"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 19935da..32bb0b6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"同步處理選項"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"標示為未讀取"</string>
<string name="move_action" msgid="3059189775933985898">"移動"</string>
+ <string name="newer_action" msgid="8950909456802330593">"較新"</string>
+ <string name="older_action" msgid="4504015635360605471">"較舊"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"新增副本/密件副本"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"新增副本/密件副本"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"附加檔案"</string>
@@ -60,7 +62,7 @@
<string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"傳送所有郵件"</string>
<string name="choose_attachment_dialog_title" msgid="81937507117528954">"選擇附件"</string>
<string name="move_to_folder_dialog_title" msgid="2614318192482193898">"移至"</string>
- <string name="status_loading_messages" msgid="6552307237621292344">"正在載入郵件..."</string>
+ <string name="status_loading_messages" msgid="6552307237621292344">"正在載入郵件…"</string>
<string name="status_network_error" msgid="2611654064403817391">"連線問題。"</string>
<string name="error_loading_message_body" msgid="6775234299515596760">"無法載入郵件文字，郵件可能過大以致於無法檢視。"</string>
<plurals name="move_messages">
@@ -246,9 +248,9 @@
<string name="account_duplicate_dlg_title" msgid="8089732986912704425">"複製帳戶"</string>
<string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"您的「<xliff:g id="DUPLICATE">%s</xliff:g>」帳戶已經使用這個使用者名稱。"</string>
<string name="account_password_spaces_error" msgid="8928309156658903257">"這組密碼的開頭或結尾為一或多個空白字元，許多伺服器都不支援包含空白字元的密碼。"</string>
- <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"正在擷取帳戶資訊..."</string>
- <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"正在檢查收信伺服器設定..."</string>
- <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"正在檢查外寄伺服器設定..."</string>
+ <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"正在擷取帳戶資訊…"</string>
+ <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"正在檢查收信伺服器設定…"</string>
+ <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"正在檢查外寄伺服器設定…"</string>
<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>
@@ -388,11 +390,6 @@
<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>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"一律"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"靜音時才啟用"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"永遠不要"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"震動"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"選擇鈴聲"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"伺服器設定"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"移除帳戶"</string>
@@ -446,7 +443,7 @@
<string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"最大"</string>
<string name="general_preference_reply_all_label" msgid="7806833609810003510">"回覆所有人"</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_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>
@@ -456,7 +453,7 @@
<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_loading" msgid="2340962056927255554">"載入中..."</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>
<string name="widget_no_mailboxes" msgid="5222354534538852579">"這個帳戶尚未同步處理，請稍後再試。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index f09335c..cff871e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Vumelanisa okukhethwa kukho"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Maka njengokungafundiwe"</string>
<string name="move_action" msgid="3059189775933985898">"Khipha"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Okushanyana"</string>
+ <string name="older_action" msgid="4504015635360605471">"Okudadlana"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Engeza Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Namathisela ifayela"</string>
@@ -388,11 +390,6 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Vumelanisa i-imeyli"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Vumelanisa i-imeyli yale akhawunti"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Dlidliza"</string>
- <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Iyadlidliza futhi lapho i-imeyli ifika"</string>
- <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Njalo"</string>
- <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kuphela uma ithulile"</string>
- <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Akusoze"</string>
- <string name="account_settings_vibrate_when_dlg_title" msgid="308167729046312952">"Dlidliza"</string>
<string name="account_settings_ringtone" msgid="8229878374785575207">"Khetha ithoni yokukhala"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Izilungiselelo Zeseva"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Khipha i-akhawunti"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c881e6e..33a1928 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -109,23 +109,6 @@
<item>6</item>
</string-array>
- <!-- The vibrate notification modes -->
- <string-array name="account_settings_vibrate_when_entries">
- <!-- Always -->
- <item>@string/account_settings_vibrate_when_always</item>
- <!-- Only when the phone is in Silent mode -->
- <item>@string/account_settings_vibrate_when_silent</item>
- <!-- Never -->
- <item>@string/account_settings_vibrate_when_never</item>
- </string-array>
-
- <!-- The vibrate notification values -->
- <string-array translatable="false" name="account_settings_vibrate_when_values">
- <item>always</item>
- <item>silent</item>
- <item>never</item>
- </string-array>
-
<!-- Auto-advance options (DO NOT change the order. Code assumes this order)-->
<string-array name="general_preference_auto_advance_entries">
<!-- Move to newer -->
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 7f9b98d..df55c89 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -90,4 +90,8 @@
<dimen name="search_view_width">400dip</dimen>
+ <dimen name="widget_margin_top">0dip</dimen>
+ <dimen name="widget_margin_left">0dip</dimen>
+ <dimen name="widget_margin_right">0dip</dimen>
+ <dimen name="widget_margin_bottom">0dip</dimen>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4b85002..c39ee4a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -100,6 +100,10 @@
<string name="mark_as_unread_action">Mark as unread</string>
<!-- Menu item for moving messages to folders [CHAR LIMIT=10] -->
<string name="move_action">Move</string>
+ <!-- Menu item for navigating to an newer message [CHAR LIMIT=10] -->
+ <string name="newer_action">Newer</string>
+ <!-- Menu item for navigating to an older message [CHAR LIMIT=10] -->
+ <string name="older_action">Older</string>
<!-- Button label for adding CC/BCC fields on message compose. [CHAR LIMIT=16] -->
<string name="plus_cc_label">+ Cc/Bcc</string>
<!-- Menu item label for adding CC/BCC fields on message compose. [CHAR LIMIT=20] -->
@@ -984,17 +988,6 @@
<!-- On Settings screen, vibrate pop-up menu label -->
<string name="account_settings_vibrate_when_label">Vibrate</string>
- <!-- On Settings screen, vibrate pop-up menu summary text -->
- <string name="account_settings_vibrate_when_summary">Also vibrate when email arrives</string>
- <!-- On Settings screen, vibrate pop-up menu option "always" text -->
- <string name="account_settings_vibrate_when_always">Always</string>
- <!-- On Settings screen, vibrate pop-up menu option "silent" text -->
- <string name="account_settings_vibrate_when_silent">Only when silent</string>
- <!-- On Settings screen, vibrate pop-up menu option "never" text -->
- <string name="account_settings_vibrate_when_never">Never</string>
-
- <!-- Dialog title for the Vibrate dialog -->
- <string name="account_settings_vibrate_when_dlg_title">Vibrate</string>
<!-- On Settings screen, setting option name -->
<string name="account_settings_ringtone">Choose ringtone</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 009924e..3156219 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -138,6 +138,11 @@
<item name="android:layout_height">match_parent</item>
</style>
+ <style name="subject_action_bar_title_text" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
+ <item name="android:textColor">#323232</item>
+ <item name="android:textSize">16dp</item>
+ </style>
+
<style name="message_view_text">
<item name="android:textSize">14dip</item>
<item name="android:textColor">@color/text_secondary_color</item>
diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml
index 7b6fa9b..66a71f3 100644
--- a/res/xml/account_settings_preferences.xml
+++ b/res/xml/account_settings_preferences.xml
@@ -107,16 +107,11 @@
android:ringtoneType="notification"
android:defaultValue="content://settings/system/notification_sound" />
- <ListPreference
- android:key="account_settings_vibrate_when"
- android:layout="?android:attr/preferenceLayoutChild"
+ <CheckBoxPreference
+ android:key="account_settings_vibrate"
android:dependency="account_notify"
- android:defaultValue="never"
- android:title="@string/account_settings_vibrate_when_label"
- android:summary="@string/account_settings_vibrate_when_summary"
- android:entries="@array/account_settings_vibrate_when_entries"
- android:entryValues="@array/account_settings_vibrate_when_values"
- android:dialogTitle="@string/account_settings_vibrate_when_dlg_title" />
+ android:defaultValue="false"
+ android:title="@string/account_settings_vibrate_when_label" />
</PreferenceCategory>
diff --git a/res/xml/device_admin.xml b/res/xml/device_admin.xml
index e700f79..10648df 100644
--- a/res/xml/device_admin.xml
+++ b/res/xml/device_admin.xml
@@ -24,5 +24,6 @@
<expire-password />
<encrypted-storage />
<disable-camera />
+ <disable-keyguard-features />
</uses-policies>
</device-admin>
diff --git a/res/xml/widget_info.xml b/res/xml/widget_info.xml
index 5f3622f..b8bd4dc 100644
--- a/res/xml/widget_info.xml
+++ b/res/xml/widget_info.xml
@@ -22,4 +22,4 @@
android:initialLayout="@layout/widget"
android:resizeMode="horizontal|vertical"
android:configure="com.android.email.widget.WidgetConfiguration"
- />
+ android:widgetCategory="home_screen|keyguard" />
diff --git a/src/com/android/email/Email.java b/src/com/android/email/Email.java
index 7ab69d4..d81c1dd 100644
--- a/src/com/android/email/Email.java
+++ b/src/com/android/email/Email.java
@@ -137,6 +137,11 @@
MailService.actionReschedule(context);
}
pm.setComponentEnabledSetting(
+ new ComponentName(context, MessageCompose.class),
+ enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED :
+ PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+ PackageManager.DONT_KILL_APP);
+ pm.setComponentEnabledSetting(
new ComponentName(context, ShortcutPicker.class),
enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED :
PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index 2331f5a..529d721 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -668,16 +668,14 @@
void setupSoundAndVibration(Notification.Builder builder, Account account) {
final int flags = account.mFlags;
final String ringtoneUri = account.mRingtoneUri;
- final boolean vibrate = (flags & Account.FLAGS_VIBRATE_ALWAYS) != 0;
- final boolean vibrateWhenSilent = (flags & Account.FLAGS_VIBRATE_WHEN_SILENT) != 0;
- final boolean isRingerSilent = getRingerMode() != AudioManager.RINGER_MODE_NORMAL;
+ final boolean vibrate = (flags & Account.FLAGS_VIBRATE) != 0;
int defaults = Notification.DEFAULT_LIGHTS;
- if (vibrate || (vibrateWhenSilent && isRingerSilent)) {
+ if (vibrate) {
defaults |= Notification.DEFAULT_VIBRATE;
}
- builder.setSound((ringtoneUri == null) ? null : Uri.parse(ringtoneUri))
+ builder.setSound(TextUtils.isEmpty(ringtoneUri) ? null : Uri.parse(ringtoneUri))
.setDefaults(defaults);
}
diff --git a/src/com/android/email/SecurityPolicy.java b/src/com/android/email/SecurityPolicy.java
index 82358b5..391ddeb 100644
--- a/src/com/android/email/SecurityPolicy.java
+++ b/src/com/android/email/SecurityPolicy.java
@@ -28,11 +28,10 @@
import android.content.Intent;
import android.content.OperationApplicationException;
import android.database.Cursor;
-import android.net.Uri;
+import android.os.Build;
import android.os.RemoteException;
import android.util.Log;
-import com.android.email.provider.EmailProvider;
import com.android.email.service.EmailBroadcastProcessorService;
import com.android.emailcommon.Logging;
import com.android.emailcommon.provider.Account;
@@ -65,7 +64,7 @@
private static final int DEVICE_ADMIN_MESSAGE_PASSWORD_EXPIRING = 4;
private static final String HAS_PASSWORD_EXPIRATION =
- PolicyColumns.PASSWORD_EXPIRATION_DAYS + ">0";
+ PolicyColumns.PASSWORD_EXPIRATION_DAYS + ">0";
/**
* Get the security policy instance
@@ -85,6 +84,7 @@
mDPM = null;
mAdminName = new ComponentName(context, PolicyAdmin.class);
mAggregatePolicy = null;
+ setActivePolicies();
}
/**
@@ -114,21 +114,21 @@
@VisibleForTesting
Policy computeAggregatePolicy() {
boolean policiesFound = false;
- Policy aggregate = new Policy();
- aggregate.mPasswordMinLength = Integer.MIN_VALUE;
- aggregate.mPasswordMode = Integer.MIN_VALUE;
- aggregate.mPasswordMaxFails = Integer.MAX_VALUE;
- aggregate.mPasswordHistory = Integer.MIN_VALUE;
- aggregate.mPasswordExpirationDays = Integer.MAX_VALUE;
- aggregate.mPasswordComplexChars = Integer.MIN_VALUE;
- aggregate.mMaxScreenLockTime = Integer.MAX_VALUE;
- aggregate.mRequireRemoteWipe = false;
- aggregate.mRequireEncryption = false;
+ Policy ap = new Policy();
+ ap.mPasswordMinLength = Integer.MIN_VALUE;
+ ap.mPasswordMode = Integer.MIN_VALUE;
+ ap.mPasswordMaxFails = Integer.MAX_VALUE;
+ ap.mPasswordHistory = Integer.MIN_VALUE;
+ ap.mPasswordExpirationDays = Integer.MAX_VALUE;
+ ap.mPasswordComplexChars = Integer.MIN_VALUE;
+ ap.mMaxScreenLockTime = Integer.MAX_VALUE;
+ ap.mRequireRemoteWipe = false;
+ ap.mRequireEncryption = false;
// This can never be supported at this time. It exists only for historic reasons where
// this was able to be supported prior to the introduction of proper removable storage
// support for external storage.
- aggregate.mRequireEncryptionExternal = false;
+ ap.mRequireEncryptionExternal = false;
Cursor c = mContext.getContentResolver().query(Policy.CONTENT_URI,
Policy.CONTENT_PROJECTION, null, null, null);
@@ -139,32 +139,31 @@
if (Email.DEBUG) {
Log.d(TAG, "Aggregate from: " + policy);
}
- aggregate.mPasswordMinLength =
- Math.max(policy.mPasswordMinLength, aggregate.mPasswordMinLength);
- aggregate.mPasswordMode = Math.max(policy.mPasswordMode, aggregate.mPasswordMode);
+ ap.mPasswordMinLength = Math.max(policy.mPasswordMinLength, ap.mPasswordMinLength);
+ ap.mPasswordMode = Math.max(policy.mPasswordMode, ap.mPasswordMode);
if (policy.mPasswordMaxFails > 0) {
- aggregate.mPasswordMaxFails =
- Math.min(policy.mPasswordMaxFails, aggregate.mPasswordMaxFails);
+ ap.mPasswordMaxFails =
+ Math.min(policy.mPasswordMaxFails, ap.mPasswordMaxFails);
}
if (policy.mMaxScreenLockTime > 0) {
- aggregate.mMaxScreenLockTime = Math.min(policy.mMaxScreenLockTime,
- aggregate.mMaxScreenLockTime);
+ ap.mMaxScreenLockTime =
+ Math.min(policy.mMaxScreenLockTime, ap.mMaxScreenLockTime);
}
if (policy.mPasswordHistory > 0) {
- aggregate.mPasswordHistory =
- Math.max(policy.mPasswordHistory, aggregate.mPasswordHistory);
+ ap.mPasswordHistory =
+ Math.max(policy.mPasswordHistory, ap.mPasswordHistory);
}
if (policy.mPasswordExpirationDays > 0) {
- aggregate.mPasswordExpirationDays =
- Math.min(policy.mPasswordExpirationDays, aggregate.mPasswordExpirationDays);
+ ap.mPasswordExpirationDays =
+ Math.min(policy.mPasswordExpirationDays, ap.mPasswordExpirationDays);
}
if (policy.mPasswordComplexChars > 0) {
- aggregate.mPasswordComplexChars = Math.max(policy.mPasswordComplexChars,
- aggregate.mPasswordComplexChars);
+ ap.mPasswordComplexChars =
+ Math.max(policy.mPasswordComplexChars, ap.mPasswordComplexChars);
}
- aggregate.mRequireRemoteWipe |= policy.mRequireRemoteWipe;
- aggregate.mRequireEncryption |= policy.mRequireEncryption;
- aggregate.mDontAllowCamera |= policy.mDontAllowCamera;
+ ap.mRequireRemoteWipe |= policy.mRequireRemoteWipe;
+ ap.mRequireEncryption |= policy.mRequireEncryption;
+ ap.mDontAllowCamera |= policy.mDontAllowCamera;
policiesFound = true;
}
} finally {
@@ -172,19 +171,19 @@
}
if (policiesFound) {
// final cleanup pass converts any untouched min/max values to zero (not specified)
- if (aggregate.mPasswordMinLength == Integer.MIN_VALUE) aggregate.mPasswordMinLength = 0;
- if (aggregate.mPasswordMode == Integer.MIN_VALUE) aggregate.mPasswordMode = 0;
- if (aggregate.mPasswordMaxFails == Integer.MAX_VALUE) aggregate.mPasswordMaxFails = 0;
- if (aggregate.mMaxScreenLockTime == Integer.MAX_VALUE) aggregate.mMaxScreenLockTime = 0;
- if (aggregate.mPasswordHistory == Integer.MIN_VALUE) aggregate.mPasswordHistory = 0;
- if (aggregate.mPasswordExpirationDays == Integer.MAX_VALUE)
- aggregate.mPasswordExpirationDays = 0;
- if (aggregate.mPasswordComplexChars == Integer.MIN_VALUE)
- aggregate.mPasswordComplexChars = 0;
+ if (ap.mPasswordMinLength == Integer.MIN_VALUE) ap.mPasswordMinLength = 0;
+ if (ap.mPasswordMode == Integer.MIN_VALUE) ap.mPasswordMode = 0;
+ if (ap.mPasswordMaxFails == Integer.MAX_VALUE) ap.mPasswordMaxFails = 0;
+ if (ap.mMaxScreenLockTime == Integer.MAX_VALUE) ap.mMaxScreenLockTime = 0;
+ if (ap.mPasswordHistory == Integer.MIN_VALUE) ap.mPasswordHistory = 0;
+ if (ap.mPasswordExpirationDays == Integer.MAX_VALUE)
+ ap.mPasswordExpirationDays = 0;
+ if (ap.mPasswordComplexChars == Integer.MIN_VALUE)
+ ap.mPasswordComplexChars = 0;
if (Email.DEBUG) {
- Log.d(TAG, "Calculated Aggregate: " + aggregate);
+ Log.d(TAG, "Calculated Aggregate: " + ap);
}
- return aggregate;
+ return ap;
}
if (Email.DEBUG) {
Log.d(TAG, "Calculated Aggregate: no policy");
@@ -462,8 +461,13 @@
// local wipe (failed passwords limit)
dpm.setMaximumFailedPasswordsForWipe(mAdminName, aggregatePolicy.mPasswordMaxFails);
// password expiration (days until a password expires). API takes mSec.
- dpm.setPasswordExpirationTimeout(mAdminName,
- aggregatePolicy.getDPManagerPasswordExpirationTimeout());
+ long oldExpiration = dpm.getPasswordExpirationTimeout(mAdminName);
+ long newExpiration = aggregatePolicy.getDPManagerPasswordExpirationTimeout();
+ // we only set this if it has changed; otherwise, we're pushing out the existing
+ // expiration time!
+ if (oldExpiration != newExpiration) {
+ dpm.setPasswordExpirationTimeout(mAdminName, newExpiration);
+ }
// password history length (number of previous passwords that may not be reused)
dpm.setPasswordHistoryLength(mAdminName, aggregatePolicy.mPasswordHistory);
// password minimum complex characters.
@@ -479,6 +483,15 @@
// encryption required
dpm.setStorageEncryption(mAdminName, aggregatePolicy.mRequireEncryption);
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+ // Disable/re-enable keyguard features as required
+ boolean noKeyguardFeatures =
+ aggregatePolicy.mPasswordMode != Policy.PASSWORD_MODE_NONE;
+ dpm.setKeyguardDisabledFeatures(mAdminName,
+ (noKeyguardFeatures ? DevicePolicyManager.KEYGUARD_DISABLE_FEATURES_ALL :
+ DevicePolicyManager.KEYGUARD_DISABLE_FEATURES_NONE));
+ }
+
}
}
@@ -560,7 +573,7 @@
context.getContentResolver().applyBatch(EmailContent.AUTHORITY, ops);
account.refresh(context);
} catch (RemoteException e) {
- // This is fatal to a remote process
+ // 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
@@ -671,7 +684,9 @@
return dpm.isAdminActive(mAdminName)
&& dpm.hasGrantedPolicy(mAdminName, DeviceAdminInfo.USES_POLICY_EXPIRE_PASSWORD)
&& dpm.hasGrantedPolicy(mAdminName, DeviceAdminInfo.USES_ENCRYPTED_STORAGE)
- && dpm.hasGrantedPolicy(mAdminName, DeviceAdminInfo.USES_POLICY_DISABLE_CAMERA);
+ && dpm.hasGrantedPolicy(mAdminName, DeviceAdminInfo.USES_POLICY_DISABLE_CAMERA)
+ && dpm.hasGrantedPolicy(mAdminName,
+ DeviceAdminInfo.USES_POLICY_DISABLE_KEYGUARD_FEATURES);
}
/**
diff --git a/src/com/android/email/activity/ActionBarController.java b/src/com/android/email/activity/ActionBarController.java
index 4a5df7c..adb1b1b 100644
--- a/src/com/android/email/activity/ActionBarController.java
+++ b/src/com/android/email/activity/ActionBarController.java
@@ -24,7 +24,10 @@
import android.database.Cursor;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
import android.text.TextUtils;
+import android.text.style.TextAppearanceSpan;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -62,6 +65,13 @@
private static final int LOADER_ID_ACCOUNT_LIST
= EmailActivity.ACTION_BAR_CONTROLLER_LOADER_ID_BASE + 0;
+ private static final int DISPLAY_TITLE_MULTIPLE_LINES = 0x20;
+ private static final int ACTION_BAR_MASK =
+ ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_CUSTOM
+ | ActionBar.DISPLAY_SHOW_TITLE | DISPLAY_TITLE_MULTIPLE_LINES;
+ private static final int CUSTOM_ACTION_BAR_OPTIONS =
+ ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_CUSTOM;
+
private final Context mContext;
private final LoaderManager mLoaderManager;
private final ActionBar mActionBar;
@@ -194,6 +204,8 @@
* Called when the search box is closed.
*/
public void onSearchExit();
+
+ public void onUpPressed();
}
public ActionBarController(Context context, LoaderManager loaderManager,
@@ -208,7 +220,7 @@
mAccountsSelectorAdapter = new AccountSelectorAdapter(mContext);
// Configure action bar.
- mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_CUSTOM);
+ enterCustomActionBarMode();
// Prepare the custom view
mActionBar.setCustomView(R.layout.action_bar_custom_view);
@@ -235,6 +247,16 @@
}
}
});
+ // this other click listener handles clicks that ought to be aliased to "up"
+ // only one or the other listener should be active at any time
+ mActionBarCustomView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ mCallback.onUpPressed();
+ }
+ });
+ // pick a sane default. later enabled in updateTitle().
+ mActionBarCustomView.setClickable(false);
}
private void initSearchViews() {
@@ -410,6 +432,7 @@
private void updateTitle() {
mAccountsSelectorAdapter.swapCursor(mCursor);
+ enterCustomActionBarMode();
if (mCursor == null) {
// Initial load not finished.
mActionBarCustomView.setVisibility(View.GONE);
@@ -449,19 +472,27 @@
UiUtilities.setVisibilitySafe(mSearchContainer, View.GONE);
if (mTitleMode == Callback.TITLE_MODE_MESSAGE_SUBJECT) {
- mAccountSpinnerLine1View.setSingleLine(false);
- mAccountSpinnerLine1View.setMaxLines(2);
- mAccountSpinnerLine1View.setText(mCallback.getMessageSubject());
- mAccountSpinnerLine2View.setVisibility(View.GONE);
-
- mAccountSpinnerCountView.setVisibility(View.GONE);
-
+ // Use two line title action bar mode
+ enterMultiLineTitleActionBarMode();
+ String subject = mCallback.getMessageSubject();
+ if (subject == null) {
+ subject = "";
+ }
+ final SpannableString title = new SpannableString(subject);
+ final SpannableStringBuilder builder = new SpannableStringBuilder();
+ title.setSpan(new TextAppearanceSpan(mContext, R.style.subject_action_bar_title_text),
+ 0, subject.length(), 0);
+ builder.append(title);
+ mActionBar.setTitle(builder);
+ mActionBar.setSubtitle(null);
+ } else if (mTitleMode == Callback.TITLE_MODE_ACCOUNT_WITH_ALL_FOLDERS_LABEL) {
+ enterSingleLineTitleActionBarMode();
+ mActionBar.setTitle(mAllFoldersLabel);
+ mActionBar.setSubtitle(mCursor.getAccountDisplayName());
} else {
// Get mailbox name
final String mailboxName;
- if (mTitleMode == Callback.TITLE_MODE_ACCOUNT_WITH_ALL_FOLDERS_LABEL) {
- mailboxName = mAllFoldersLabel;
- } else if (mTitleMode == Callback.TITLE_MODE_ACCOUNT_WITH_MAILBOX) {
+ if (mTitleMode == Callback.TITLE_MODE_ACCOUNT_WITH_MAILBOX) {
mailboxName = mCursor.getMailboxDisplayName();
} else {
mailboxName = null;
@@ -490,16 +521,31 @@
boolean spinnerEnabled =
((mTitleMode & TITLE_MODE_SPINNER_ENABLED) != 0) && mCursor.shouldEnableSpinner();
-
setSpinnerEnabled(spinnerEnabled);
}
+ private void enterCustomActionBarMode() {
+ mActionBar.setDisplayOptions(CUSTOM_ACTION_BAR_OPTIONS, ACTION_BAR_MASK);
+ }
+
+ private void enterMultiLineTitleActionBarMode() {
+ mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE
+ | DISPLAY_TITLE_MULTIPLE_LINES, ACTION_BAR_MASK);
+ }
+
+ private void enterSingleLineTitleActionBarMode() {
+ mActionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_HOME | ActionBar.DISPLAY_SHOW_TITLE,
+ ACTION_BAR_MASK);
+ }
+
private void setSpinnerEnabled(boolean enabled) {
if (enabled == mAccountSpinner.isEnabled()) {
return;
}
mAccountSpinner.setEnabled(enabled);
+ mAccountSpinner.setClickable(enabled);
+ mActionBarCustomView.setClickable(!enabled);
if (enabled) {
mAccountSpinner.setBackgroundDrawable(mAccountSpinnerDefaultBackground);
} else {
diff --git a/src/com/android/email/activity/EmailActivity.java b/src/com/android/email/activity/EmailActivity.java
index a8ff8f9..f823b4b 100644
--- a/src/com/android/email/activity/EmailActivity.java
+++ b/src/com/android/email/activity/EmailActivity.java
@@ -27,6 +27,7 @@
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import android.view.WindowManager;
import android.widget.TextView;
import com.android.email.Controller;
diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index 0ac7301..1d51e3a 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -371,7 +371,9 @@
private void setAccount(Account account) {
if (account == null) {
- throw new IllegalArgumentException();
+ Utility.showToast(this, R.string.widget_no_accounts);
+ Log.d(Logging.LOG_TAG, "The account has been deleted, force finish it");
+ finish();
}
mAccount = account;
mFromView.setText(account.mEmailAddress);
diff --git a/src/com/android/email/activity/UIControllerOnePane.java b/src/com/android/email/activity/UIControllerOnePane.java
index 2ce9357..05f8e53 100644
--- a/src/com/android/email/activity/UIControllerOnePane.java
+++ b/src/com/android/email/activity/UIControllerOnePane.java
@@ -253,6 +253,11 @@
public void onSearchExit() {
UIControllerOnePane.this.onSearchExit();
}
+
+ @Override
+ public void onUpPressed() {
+ onBackPressed(false);
+ }
}
public UIControllerOnePane(EmailActivity activity) {
diff --git a/src/com/android/email/activity/UIControllerTwoPane.java b/src/com/android/email/activity/UIControllerTwoPane.java
index b73229f..58914e7 100644
--- a/src/com/android/email/activity/UIControllerTwoPane.java
+++ b/src/com/android/email/activity/UIControllerTwoPane.java
@@ -739,5 +739,10 @@
public void onSearchExit() {
UIControllerTwoPane.this.onSearchExit();
}
+
+ @Override
+ public void onUpPressed() {
+ onBackPressed(false);
+ }
}
}
diff --git a/src/com/android/email/activity/Welcome.java b/src/com/android/email/activity/Welcome.java
index 6fd3534..062ca22 100644
--- a/src/com/android/email/activity/Welcome.java
+++ b/src/com/android/email/activity/Welcome.java
@@ -86,7 +86,7 @@
*/
private static final String EXTRA_DEBUG_PANE_MODE = "DEBUG_PANE_MODE";
- private static final String VIEW_MAILBOX_INTENT_URL_PATH = "/view/mailbox";
+ public static final String VIEW_MAILBOX_INTENT_URL_PATH = "/view/mailbox";
private final EmailAsyncTask.Tracker mTaskTracker = new EmailAsyncTask.Tracker();
diff --git a/src/com/android/email/activity/setup/AccountSettingsFragment.java b/src/com/android/email/activity/setup/AccountSettingsFragment.java
index 7e19076..02ef74c 100644
--- a/src/com/android/email/activity/setup/AccountSettingsFragment.java
+++ b/src/com/android/email/activity/setup/AccountSettingsFragment.java
@@ -78,7 +78,8 @@
private static final String PREFERENCE_CATEGORY_DATA_USAGE = "data_usage";
private static final String PREFERENCE_CATEGORY_NOTIFICATIONS = "account_notifications";
private static final String PREFERENCE_NOTIFY = "account_notify";
- private static final String PREFERENCE_VIBRATE_WHEN = "account_settings_vibrate_when";
+ private static final String PREFERENCE_VIBRATE = "account_settings_vibrate";
+ private static final String PREFERENCE_VIBRATE_OLD = "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_INCOMING = "incoming";
@@ -88,11 +89,6 @@
private static final String PREFERENCE_SYNC_EMAIL = "account_sync_email";
private static final String PREFERENCE_DELETE_ACCOUNT = "delete_account";
- // These strings must match account_settings_vibrate_when_* strings in strings.xml
- private static final String PREFERENCE_VALUE_VIBRATE_WHEN_ALWAYS = "always";
- private static final String PREFERENCE_VALUE_VIBRATE_WHEN_SILENT = "silent";
- private static final String PREFERENCE_VALUE_VIBRATE_WHEN_NEVER = "never";
-
private EditTextPreference mAccountDescription;
private EditTextPreference mAccountName;
private EditTextPreference mAccountSignature;
@@ -101,7 +97,7 @@
private CheckBoxPreference mAccountBackgroundAttachments;
private CheckBoxPreference mAccountDefault;
private CheckBoxPreference mAccountNotify;
- private ListPreference mAccountVibrateWhen;
+ private CheckBoxPreference mAccountVibrate;
private RingtonePreference mAccountRingtone;
private CheckBoxPreference mSyncContacts;
private CheckBoxPreference mSyncCalendar;
@@ -175,6 +171,8 @@
}
super.onCreate(savedInstanceState);
+ upgradeVibrateSetting();
+
// Load the preferences from an XML resource
addPreferencesFromResource(R.xml.account_settings_preferences);
@@ -192,6 +190,20 @@
mAccountDirty = false;
}
+ /**
+ * Upgrades the old tri-state vibrate setting to the new boolean value.
+ */
+ private void upgradeVibrateSetting() {
+ final SharedPreferences sharedPreferences = getPreferenceManager().getSharedPreferences();
+
+ if (!sharedPreferences.contains(PREFERENCE_VIBRATE)) {
+ // Try to migrate the old one
+ final boolean vibrate =
+ "always".equals(sharedPreferences.getString(PREFERENCE_VIBRATE_OLD, ""));
+ sharedPreferences.edit().putBoolean(PREFERENCE_VIBRATE, vibrate);
+ }
+ }
+
@Override
public void onActivityCreated(Bundle savedInstanceState) {
if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) {
@@ -502,33 +514,21 @@
prefs.edit().putString(PREFERENCE_RINGTONE, mAccount.getRingtone()).apply();
// Set the vibrator value, or hide it on devices w/o a vibrator
- mAccountVibrateWhen = (ListPreference) findPreference(PREFERENCE_VIBRATE_WHEN);
+ mAccountVibrate = (CheckBoxPreference) findPreference(PREFERENCE_VIBRATE);
Vibrator vibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);
if (vibrator.hasVibrator()) {
// Calculate the value to set based on the choices, and set the value.
- final boolean vibrateAlways = 0 != (mAccount.getFlags() & Account.FLAGS_VIBRATE_ALWAYS);
- final boolean vibrateWhenSilent =
- 0 != (mAccount.getFlags() & Account.FLAGS_VIBRATE_WHEN_SILENT);
- final String vibrateSetting =
- vibrateAlways ? PREFERENCE_VALUE_VIBRATE_WHEN_ALWAYS :
- vibrateWhenSilent ? PREFERENCE_VALUE_VIBRATE_WHEN_SILENT :
- PREFERENCE_VALUE_VIBRATE_WHEN_NEVER;
- mAccountVibrateWhen.setValue(vibrateSetting);
+ final boolean vibrate = 0 != (mAccount.getFlags() & Account.FLAGS_VIBRATE);
+ mAccountVibrate.setChecked(vibrate);
- // Update the summary string.
- final int index = mAccountVibrateWhen.findIndexOfValue(vibrateSetting);
- mAccountVibrateWhen.setSummary(mAccountVibrateWhen.getEntries()[index]);
-
- // When the value is changed, update the summary in addition to the setting.
- mAccountVibrateWhen.setOnPreferenceChangeListener(
+ // When the value is changed, update the setting.
+ mAccountVibrate.setOnPreferenceChangeListener(
new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
- final String vibrateSetting = newValue.toString();
- final int index = mAccountVibrateWhen.findIndexOfValue(vibrateSetting);
- mAccountVibrateWhen.setSummary(mAccountVibrateWhen.getEntries()[index]);
- mAccountVibrateWhen.setValue(vibrateSetting);
- onPreferenceChanged(PREFERENCE_VIBRATE_WHEN, newValue);
+ final boolean vibrateSetting = (Boolean) newValue;
+ mAccountVibrate.setChecked(vibrateSetting);
+ onPreferenceChanged(PREFERENCE_VIBRATE, newValue);
return false;
}
});
@@ -536,7 +536,7 @@
// No vibrator present. Remove the preference altogether.
PreferenceCategory notificationsCategory = (PreferenceCategory)
findPreference(PREFERENCE_CATEGORY_NOTIFICATIONS);
- notificationsCategory.removePreference(mAccountVibrateWhen);
+ notificationsCategory.removePreference(mAccountVibrate);
}
findPreference(PREFERENCE_INCOMING).setOnPreferenceClickListener(
@@ -639,7 +639,7 @@
// Turn off all controlled flags - will turn them back on while checking UI elements
int newFlags = mAccount.getFlags() &
~(Account.FLAGS_NOTIFY_NEW_MAIL |
- Account.FLAGS_VIBRATE_ALWAYS | Account.FLAGS_VIBRATE_WHEN_SILENT |
+ Account.FLAGS_VIBRATE |
Account.FLAGS_BACKGROUND_ATTACHMENTS);
newFlags |= mAccountBackgroundAttachments.isChecked() ?
@@ -655,10 +655,8 @@
if (mSyncWindow != null) {
mAccount.setSyncLookback(Integer.parseInt(mSyncWindow.getValue()));
}
- if (mAccountVibrateWhen.getValue().equals(PREFERENCE_VALUE_VIBRATE_WHEN_ALWAYS)) {
- newFlags |= Account.FLAGS_VIBRATE_ALWAYS;
- } else if (mAccountVibrateWhen.getValue().equals(PREFERENCE_VALUE_VIBRATE_WHEN_SILENT)) {
- newFlags |= Account.FLAGS_VIBRATE_WHEN_SILENT;
+ if (mAccountVibrate.isChecked()) {
+ newFlags |= Account.FLAGS_VIBRATE;
}
SharedPreferences prefs = mAccountRingtone.getPreferenceManager().getSharedPreferences();
mAccount.setRingtone(prefs.getString(PREFERENCE_RINGTONE, null));
diff --git a/src/com/android/email/mail/store/ImapFolder.java b/src/com/android/email/mail/store/ImapFolder.java
index 3ab7bba..bd194be 100644
--- a/src/com/android/email/mail/store/ImapFolder.java
+++ b/src/com/android/email/mail/store/ImapFolder.java
@@ -60,7 +60,6 @@
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Locale;
class ImapFolder extends Folder {
private final static Flag[] PERMANENT_FLAGS =
@@ -187,7 +186,7 @@
}
}
try {
- connection.executeSimpleCommand(String.format(Locale.US,
+ connection.executeSimpleCommand(String.format(
ImapConstants.STATUS + " \"%s\" (" + ImapConstants.UIDVALIDITY + ")",
ImapStore.encodeFolderName(mName, mStore.mPathPrefix)));
mExists = true;
@@ -233,8 +232,7 @@
}
}
try {
- connection.executeSimpleCommand(String.format(Locale.US,
- ImapConstants.CREATE + " \"%s\"",
+ connection.executeSimpleCommand(String.format(ImapConstants.CREATE + " \"%s\"",
ImapStore.encodeFolderName(mName, mStore.mPathPrefix)));
return true;
@@ -258,7 +256,7 @@
checkOpen();
try {
List<ImapResponse> responseList = mConnection.executeSimpleCommand(
- String.format(Locale.US, ImapConstants.UID_COPY + " %s \"%s\"",
+ String.format(ImapConstants.UID_COPY + " %s \"%s\"",
ImapStore.joinMessageUids(messages),
ImapStore.encodeFolderName(folder.getName(), mStore.mPathPrefix)));
// Build a message map for faster UID matching
@@ -346,7 +344,7 @@
try {
int unreadMessageCount = 0;
List<ImapResponse> responses = mConnection.executeSimpleCommand(String.format(
- Locale.US, ImapConstants.STATUS + " \"%s\" (" + ImapConstants.UNSEEN + ")",
+ ImapConstants.STATUS + " \"%s\" (" + ImapConstants.UNSEEN + ")",
ImapStore.encodeFolderName(mName, mStore.mPathPrefix)));
// S: * STATUS mboxname (MESSAGES 231 UIDNEXT 44292)
for (ImapResponse response : responses) {
@@ -480,7 +478,7 @@
throw new MessagingException(String.format("Invalid range: %d %d", start, end));
}
return getMessagesInternal(
- searchForUids(String.format(Locale.US, "%d:%d NOT DELETED", start, end)), listener);
+ searchForUids(String.format("%d:%d NOT DELETED", start, end)), listener);
}
@Override
@@ -575,7 +573,7 @@
}
try {
- mConnection.sendCommand(String.format(Locale.US,
+ mConnection.sendCommand(String.format(
ImapConstants.UID_FETCH + " %s (%s)", ImapStore.joinMessageUids(messages),
Utility.combine(fetchFields.toArray(new String[fetchFields.size()]), ' ')
), false);
@@ -755,7 +753,7 @@
} else {
if (e.isString()) {
- mp.setSubType(bs.getStringOrEmpty(i).getString().toLowerCase(Locale.US));
+ mp.setSubType(bs.getStringOrEmpty(i).getString().toLowerCase());
}
break; // Ignore the rest of the list.
}
@@ -780,7 +778,7 @@
final ImapString type = bs.getStringOrEmpty(0);
final ImapString subType = bs.getStringOrEmpty(1);
final String mimeType =
- (type.getString() + "/" + subType.getString()).toLowerCase(Locale.US);
+ (type.getString() + "/" + subType.getString()).toLowerCase();
final ImapList bodyParams = bs.getListOrEmpty(2);
final ImapString cid = bs.getStringOrEmpty(3);
@@ -815,7 +813,7 @@
// TODO We need to convert " into %22, but
// because MimeUtility.getHeaderParameter doesn't recognize it,
// we can't fix it for now.
- contentType.append(String.format(Locale.US, ";\n %s=\"%s\"",
+ contentType.append(String.format(";\n %s=\"%s\"",
bodyParams.getStringOrEmpty(i - 1).getString(),
bodyParams.getStringOrEmpty(i).getString()));
}
@@ -838,7 +836,7 @@
if (bodyDisposition.size() > 0) {
final String bodyDisposition0Str =
- bodyDisposition.getStringOrEmpty(0).getString().toLowerCase(Locale.US);
+ bodyDisposition.getStringOrEmpty(0).getString().toLowerCase();
if (!TextUtils.isEmpty(bodyDisposition0Str)) {
contentDisposition.append(bodyDisposition0Str);
}
@@ -852,9 +850,9 @@
for (int i = 1, count = bodyDispositionParams.size(); i < count; i += 2) {
// TODO We need to convert " into %22. See above.
- contentDisposition.append(String.format(Locale.US, ";\n %s=\"%s\"",
+ contentDisposition.append(String.format(";\n %s=\"%s\"",
bodyDispositionParams.getStringOrEmpty(i - 1)
- .getString().toLowerCase(Locale.US),
+ .getString().toLowerCase(),
bodyDispositionParams.getStringOrEmpty(i).getString()));
}
}
@@ -863,7 +861,7 @@
if ((size > 0)
&& (MimeUtility.getHeaderParameter(contentDisposition.toString(), "size")
== null)) {
- contentDisposition.append(String.format(Locale.US, ";\n size=%d", size));
+ contentDisposition.append(String.format(";\n size=%d", size));
}
if (contentDisposition.length() > 0) {
@@ -939,7 +937,7 @@
}
mConnection.sendCommand(
- String.format(Locale.US, ImapConstants.APPEND + " \"%s\" (%s) {%d}",
+ String.format(ImapConstants.APPEND + " \"%s\" (%s) {%d}",
ImapStore.encodeFolderName(mName, mStore.mPathPrefix),
flagList,
out.getCount()), false);
@@ -984,13 +982,13 @@
}
// Most servers don't care about parenthesis in the search query [and, some
// fail to work if they are used]
- String[] uids = searchForUids(String.format(Locale.US, "HEADER MESSAGE-ID %s", messageId));
+ String[] uids = searchForUids(String.format("HEADER MESSAGE-ID %s", messageId));
if (uids.length > 0) {
message.setUid(uids[0]);
}
// However, there's at least one server [AOL] that fails to work unless there
// are parenthesis, so, try this as a last resort
- uids = searchForUids(String.format(Locale.US, "(HEADER MESSAGE-ID %s)", messageId));
+ uids = searchForUids(String.format("(HEADER MESSAGE-ID %s)", messageId));
if (uids.length > 0) {
message.setUid(uids[0]);
}
@@ -1038,7 +1036,7 @@
allFlags = flagList.substring(1);
}
try {
- mConnection.executeSimpleCommand(String.format(Locale.US,
+ mConnection.executeSimpleCommand(String.format(
ImapConstants.UID_STORE + " %s %s" + ImapConstants.FLAGS_SILENT + " (%s)",
ImapStore.joinMessageUids(messages),
value ? "+" : "-",
@@ -1076,7 +1074,7 @@
*/
private void doSelect() throws IOException, MessagingException {
List<ImapResponse> responses = mConnection.executeSimpleCommand(
- String.format(Locale.US, ImapConstants.SELECT + " \"%s\"",
+ String.format(ImapConstants.SELECT + " \"%s\"",
ImapStore.encodeFolderName(mName, mStore.mPathPrefix)));
// Assume the folder is opened read-write; unless we are notified otherwise
diff --git a/src/com/android/email/mail/store/Pop3Store.java b/src/com/android/email/mail/store/Pop3Store.java
index ea3685e..b3ee420 100644
--- a/src/com/android/email/mail/store/Pop3Store.java
+++ b/src/com/android/email/mail/store/Pop3Store.java
@@ -722,8 +722,8 @@
"Pop3Store.fetch called with non-Pop3 Message");
}
Pop3Message pop3Message = (Pop3Message)message;
- String response = executeSimpleCommand("LIST " +
- mUidToMsgNumMap.get(pop3Message.getUid()));
+ String response = executeSimpleCommand(String.format("LIST %d",
+ mUidToMsgNumMap.get(pop3Message.getUid())));
try {
String[] listParts = response.split(" ");
int msgNum = Integer.parseInt(listParts[1]);
@@ -786,13 +786,13 @@
int messageId = mUidToMsgNumMap.get(message.getUid());
if (lines == -1) {
// Fetch entire message
- response = executeSimpleCommand("RETR " + messageId);
+ response = executeSimpleCommand(String.format("RETR %d", messageId));
} else {
// Fetch partial message. Try "TOP", and fall back to slower "RETR" if necessary
try {
- response = executeSimpleCommand("TOP " + messageId + ' ' + lines);
+ response = executeSimpleCommand(String.format("TOP %d %d", messageId, lines));
} catch (MessagingException me) {
- response = executeSimpleCommand("RETR " + messageId);
+ response = executeSimpleCommand(String.format("RETR %d", messageId));
}
}
if (response != null) {
@@ -846,7 +846,8 @@
}
try {
for (Message message : messages) {
- executeSimpleCommand("DELE " + mUidToMsgNumMap.get(message.getUid()));
+ executeSimpleCommand(String.format("DELE %s",
+ mUidToMsgNumMap.get(message.getUid())));
}
}
catch (IOException ioe) {
diff --git a/src/com/android/email/mail/transport/MailTransport.java b/src/com/android/email/mail/transport/MailTransport.java
index 751be50..3f4d7bc 100644
--- a/src/com/android/email/mail/transport/MailTransport.java
+++ b/src/com/android/email/mail/transport/MailTransport.java
@@ -167,7 +167,8 @@
try {
SocketAddress socketAddress = new InetSocketAddress(getHost(), getPort());
if (canTrySslSecurity()) {
- mSocket = SSLUtils.getSSLSocketFactory(canTrustAllCertificates()).createSocket();
+ mSocket = SSLUtils.getSSLSocketFactory(
+ canTrustAllCertificates(), SOCKET_CONNECT_TIMEOUT).createSocket();
} else {
mSocket = new Socket();
}
@@ -203,8 +204,9 @@
@Override
public void reopenTls() throws MessagingException {
try {
- mSocket = SSLUtils.getSSLSocketFactory(canTrustAllCertificates())
- .createSocket(mSocket, getHost(), getPort(), true);
+ mSocket =
+ SSLUtils.getSSLSocketFactory(canTrustAllCertificates(), SOCKET_CONNECT_TIMEOUT)
+ .createSocket(mSocket, getHost(), getPort(), true);
mSocket.setSoTimeout(SOCKET_READ_TIMEOUT);
mIn = new BufferedInputStream(mSocket.getInputStream(), 1024);
mOut = new BufferedOutputStream(mSocket.getOutputStream(), 512);
@@ -281,20 +283,34 @@
*/
@Override
public void close() {
+ if (Email.DEBUG) {
+ Log.d(Logging.LOG_TAG, "*** " + mDebugLabel + " close " +
+ getHost() + ":" + String.valueOf(getPort()));
+ }
+
try {
mIn.close();
} catch (Exception e) {
// May fail if the connection is already closed.
+ if (Email.DEBUG) {
+ Log.d(Logging.LOG_TAG, e.toString());
+ }
}
try {
mOut.close();
} catch (Exception e) {
// May fail if the connection is already closed.
+ if (Email.DEBUG) {
+ Log.d(Logging.LOG_TAG, e.toString());
+ }
}
try {
mSocket.close();
} catch (Exception e) {
// May fail if the connection is already closed.
+ if (Email.DEBUG) {
+ Log.d(Logging.LOG_TAG, e.toString());
+ }
}
mIn = null;
mOut = null;
diff --git a/src/com/android/email/mail/transport/SmtpSender.java b/src/com/android/email/mail/transport/SmtpSender.java
index a9b13a6..1f87922 100644
--- a/src/com/android/email/mail/transport/SmtpSender.java
+++ b/src/com/android/email/mail/transport/SmtpSender.java
@@ -202,15 +202,15 @@
Address[] bcc = Address.unpack(message.mBcc);
try {
- executeSimpleCommand("MAIL FROM: " + "<" + from.getAddress() + ">");
+ executeSimpleCommand("MAIL FROM:" + "<" + from.getAddress() + ">");
for (Address address : to) {
- executeSimpleCommand("RCPT TO: " + "<" + address.getAddress() + ">");
+ executeSimpleCommand("RCPT TO:" + "<" + address.getAddress() + ">");
}
for (Address address : cc) {
- executeSimpleCommand("RCPT TO: " + "<" + address.getAddress() + ">");
+ executeSimpleCommand("RCPT TO:" + "<" + address.getAddress() + ">");
}
for (Address address : bcc) {
- executeSimpleCommand("RCPT TO: " + "<" + address.getAddress() + ">");
+ executeSimpleCommand("RCPT TO:" + "<" + address.getAddress() + ">");
}
executeSimpleCommand("DATA");
// TODO byte stuffing
diff --git a/src/com/android/email/provider/DBHelper.java b/src/com/android/email/provider/DBHelper.java
index 6721569..9372547 100644
--- a/src/com/android/email/provider/DBHelper.java
+++ b/src/com/android/email/provider/DBHelper.java
@@ -531,6 +531,16 @@
@Override
public void onOpen(SQLiteDatabase db) {
+ try {
+ // Cleanup some nasty records
+ db.execSQL("delete from " + Account.TABLE_NAME
+ + " WHERE " + AccountColumns.DISPLAY_NAME + " ISNULL;");
+ db.execSQL("delete from " + HostAuth.TABLE_NAME
+ + " WHERE " + HostAuthColumns.PROTOCOL + " ISNULL;");
+ } catch (SQLException e) {
+ // Shouldn't be needed unless we're debugging and interrupt the process
+ Log.w(TAG, "Exception cleaning EmailProvider.db" + e);
+ }
}
}
@@ -942,16 +952,20 @@
Cursor c = db.query(Account.TABLE_NAME,
new String[] {EmailContent.RECORD_ID /*0*/, AccountColumns.SECURITY_FLAGS /*1*/},
AccountColumns.SECURITY_FLAGS + ">0", null, null, null, null);
- ContentValues cv = new ContentValues();
- String[] args = new String[1];
- while (c.moveToNext()) {
- long securityFlags = c.getLong(1 /*SECURITY_FLAGS*/);
- Policy policy = LegacyPolicySet.flagsToPolicy(securityFlags);
- long policyId = db.insert(Policy.TABLE_NAME, null, policy.toContentValues());
- cv.put(AccountColumns.POLICY_KEY, policyId);
- cv.putNull(AccountColumns.SECURITY_FLAGS);
- args[0] = Long.toString(c.getLong(0 /*RECORD_ID*/));
- db.update(Account.TABLE_NAME, cv, EmailContent.RECORD_ID + "=?", args);
+ try {
+ ContentValues cv = new ContentValues();
+ String[] args = new String[1];
+ while (c.moveToNext()) {
+ long securityFlags = c.getLong(1 /*SECURITY_FLAGS*/);
+ Policy policy = LegacyPolicySet.flagsToPolicy(securityFlags);
+ long policyId = db.insert(Policy.TABLE_NAME, null, policy.toContentValues());
+ cv.put(AccountColumns.POLICY_KEY, policyId);
+ cv.putNull(AccountColumns.SECURITY_FLAGS);
+ args[0] = Long.toString(c.getLong(0 /*RECORD_ID*/));
+ db.update(Account.TABLE_NAME, cv, EmailContent.RECORD_ID + "=?", args);
+ }
+ } finally {
+ c.close();
}
}
diff --git a/src/com/android/email/provider/WidgetProvider.java b/src/com/android/email/provider/WidgetProvider.java
index 0f6731b..7ac09c7 100644
--- a/src/com/android/email/provider/WidgetProvider.java
+++ b/src/com/android/email/provider/WidgetProvider.java
@@ -110,10 +110,6 @@
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- if (intent.getData() != null) {
- // EmailWidget creates intents, so it knows how to handle them.
- EmailWidget.processIntent(this, intent);
- }
return Service.START_NOT_STICKY;
}
diff --git a/src/com/android/email/service/EmailBroadcastProcessorService.java b/src/com/android/email/service/EmailBroadcastProcessorService.java
index bfd4f3f..36447cb 100644
--- a/src/com/android/email/service/EmailBroadcastProcessorService.java
+++ b/src/com/android/email/service/EmailBroadcastProcessorService.java
@@ -106,7 +106,8 @@
if (Intent.ACTION_BOOT_COMPLETED.equals(broadcastAction)) {
onBootCompleted();
-
+ // Force policies to be set in DPM
+ SecurityPolicy.getInstance(this);
// TODO: Do a better job when we get ACTION_DEVICE_STORAGE_LOW.
// The code below came from very old code....
} else if (Intent.ACTION_DEVICE_STORAGE_LOW.equals(broadcastAction)) {
diff --git a/src/com/android/email/service/PopImapSyncAdapterService.java b/src/com/android/email/service/PopImapSyncAdapterService.java
index ac47bba..553876b 100644
--- a/src/com/android/email/service/PopImapSyncAdapterService.java
+++ b/src/com/android/email/service/PopImapSyncAdapterService.java
@@ -87,18 +87,25 @@
if (extras.getBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, false)) {
String emailAddress = account.name;
// Find an EmailProvider account with the Account's email address
- Cursor c = context.getContentResolver().query(
- com.android.emailcommon.provider.Account.CONTENT_URI,
- EmailContent.ID_PROJECTION, AccountColumns.EMAIL_ADDRESS + "=?",
- new String[] {emailAddress}, null);
- if (c.moveToNext()) {
- // If we have one, find the inbox and start it syncing
- long accountId = c.getLong(EmailContent.ID_PROJECTION_COLUMN);
- long mailboxId = Mailbox.findMailboxOfType(context, accountId,
- Mailbox.TYPE_INBOX);
- if (mailboxId > 0) {
- Log.d(TAG, "Starting manual sync for account " + emailAddress);
- Controller.getInstance(context).updateMailbox(accountId, mailboxId, false);
+ Cursor c = null;
+ try {
+ c = context.getContentResolver().query(
+ com.android.emailcommon.provider.Account.CONTENT_URI,
+ EmailContent.ID_PROJECTION, AccountColumns.EMAIL_ADDRESS + "=?",
+ new String[] {emailAddress}, null);
+ if (c != null && c.moveToNext()) {
+ // If we have one, find the inbox and start it syncing
+ long accountId = c.getLong(EmailContent.ID_PROJECTION_COLUMN);
+ long mailboxId = Mailbox.findMailboxOfType(context, accountId,
+ Mailbox.TYPE_INBOX);
+ if (mailboxId > 0) {
+ Log.d(TAG, "Starting manual sync for account " + emailAddress);
+ Controller.getInstance(context).updateMailbox(accountId, mailboxId, false);
+ }
+ }
+ } finally {
+ if ( c != null) {
+ c.close();
}
}
}
diff --git a/src/com/android/email/widget/EmailWidget.java b/src/com/android/email/widget/EmailWidget.java
index a589a22..49cfb96 100644
--- a/src/com/android/email/widget/EmailWidget.java
+++ b/src/com/android/email/widget/EmailWidget.java
@@ -221,57 +221,26 @@
* @param baseUri the base uri for the command
* @param args any arguments to the command
*/
- private void setFillInIntent(RemoteViews views, int viewId, Uri baseUri, String ... args) {
- Intent intent = new Intent();
- Builder builder = baseUri.buildUpon();
- for (String arg: args) {
- builder.appendPath(arg);
+ private void setFillInIntent(RemoteViews views, int viewId, Uri baseUri, String messageId,
+ String mailboxId) {
+ Intent intent = null;
+ try {
+ intent = getOpenMessageIntent(mContext, Long.parseLong(messageId),
+ Long.parseLong(mailboxId));
+ } catch (NumberFormatException e) {
+ if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) {
+ Log.d(TAG, "#setFillInIntent(); invalid messageId: " + messageId +
+ " or mailboxId: " + mailboxId);
+ }
}
- intent.setDataAndType(builder.build(), WIDGET_DATA_MIME_TYPE);
views.setOnClickFillInIntent(viewId, intent);
}
- /**
- * Called back by {@link com.android.email.provider.WidgetProvider.WidgetService} to
- * handle intents created by remote views.
- */
- public static boolean processIntent(Context context, Intent intent) {
- final Uri data = intent.getData();
- if (data == null) {
- return false;
- }
- List<String> pathSegments = data.getPathSegments();
- // Our path segments are <command>, <arg1> [, <arg2>]
- // First, a quick check of Uri validity
- if (pathSegments.size() < 2) {
- throw new IllegalArgumentException();
- }
- String command = pathSegments.get(0);
- // Ignore unknown action names
- try {
- final long arg1 = Long.parseLong(pathSegments.get(1));
- if (EmailWidget.COMMAND_NAME_VIEW_MESSAGE.equals(command)) {
- // "view", <message id>, <mailbox id>
- openMessage(context, Long.parseLong(pathSegments.get(2)), arg1);
- }
- } catch (NumberFormatException e) {
- // Shouldn't happen as we construct all of the Uri's
- return false;
- }
- return true;
- }
-
- private static void openMessage(final Context context, final long mailboxId,
- final long messageId) {
- EmailAsyncTask.runAsyncParallel(new Runnable() {
- @Override
- public void run() {
- Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId);
- if (mailbox == null) return;
- context.startActivity(Welcome.createOpenMessageIntent(context, mailbox.mAccountKey,
- mailboxId, messageId));
- }
- });
+ private Intent getOpenMessageIntent(final Context context, final long messageId,
+ final long mailboxId) {
+ Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId);
+ return Welcome.createOpenMessageIntent(context, mailbox.mAccountKey,
+ mailboxId, messageId);
}
private void setTextViewTextAndDesc(RemoteViews views, final int id, String text) {
@@ -317,7 +286,8 @@
if (isCursorValid()) {
// Show compose icon & message list
- if (mAccountId == Account.ACCOUNT_ID_COMBINED_VIEW) {
+ if (mAccountId == Account.ACCOUNT_ID_COMBINED_VIEW
+ || Account.restoreAccountWithId(mContext, mAccountId) == null) {
// Don't allow compose for "combined" view
views.setViewVisibility(R.id.widget_compose, View.INVISIBLE);
} else {
@@ -344,8 +314,8 @@
}
// Use a bare intent for our template; we need to fill everything in
- intent = new Intent(mContext, WidgetService.class);
- PendingIntent pendingIntent = PendingIntent.getService(mContext, 0, intent,
+ intent = new Intent(mContext, Welcome.class);
+ PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent,
PendingIntent.FLAG_UPDATE_CURRENT);
views.setPendingIntentTemplate(R.id.message_list, pendingIntent);
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index 345bbb2..69d6b05 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -45,7 +45,7 @@
// A user-requested sync/refresh is in progress
public static final int USER_REFRESH = 1<<0;
// A user-requested query is in progress
- public static final int USER_QUERY = 1<<1;
+ public static final int LIVE_QUERY = 1<<1;
// A user request for additional results is in progress
public static final int USER_MORE_RESULTS = 1<<2;
// A background sync is in progress
diff --git a/src/org/apache/james/mime4j/util/CharsetUtil.java b/src/org/apache/james/mime4j/util/CharsetUtil.java
index 0fc267d..f26b44f 100644
--- a/src/org/apache/james/mime4j/util/CharsetUtil.java
+++ b/src/org/apache/james/mime4j/util/CharsetUtil.java
@@ -23,6 +23,7 @@
import java.nio.charset.IllegalCharsetNameException;
import java.nio.charset.UnsupportedCharsetException;
import java.util.HashMap;
+import java.util.Locale;
import java.util.TreeSet;
//BEGIN android-changed: Stubbing out logging
@@ -1023,13 +1024,13 @@
for (int i = 0; i < JAVA_CHARSETS.length; i++) {
try {
String s = new String(dummy, JAVA_CHARSETS[i].canonical);
- decodingSupported.add(JAVA_CHARSETS[i].canonical.toLowerCase());
+ decodingSupported.add(JAVA_CHARSETS[i].canonical.toLowerCase(Locale.US));
} catch (UnsupportedOperationException e) {
} catch (UnsupportedEncodingException e) {
}
try {
"dummy".getBytes(JAVA_CHARSETS[i].canonical);
- encodingSupported.add(JAVA_CHARSETS[i].canonical.toLowerCase());
+ encodingSupported.add(JAVA_CHARSETS[i].canonical.toLowerCase(Locale.US));
} catch (UnsupportedOperationException e) {
} catch (UnsupportedEncodingException e) {
}
@@ -1038,13 +1039,13 @@
charsetMap = new HashMap<String, Charset>();
for (int i = 0; i < JAVA_CHARSETS.length; i++) {
Charset c = JAVA_CHARSETS[i];
- charsetMap.put(c.canonical.toLowerCase(), c);
+ charsetMap.put(c.canonical.toLowerCase(Locale.US), c);
if (c.mime != null) {
- charsetMap.put(c.mime.toLowerCase(), c);
+ charsetMap.put(c.mime.toLowerCase(Locale.US), c);
}
if (c.aliases != null) {
for (int j = 0; j < c.aliases.length; j++) {
- charsetMap.put(c.aliases[j].toLowerCase(), c);
+ charsetMap.put(c.aliases[j].toLowerCase(Locale.US), c);
}
}
}
@@ -1136,7 +1137,7 @@
* otherwise.
*/
public static boolean isEncodingSupported(String charsetName) {
- return encodingSupported.contains(charsetName.toLowerCase());
+ return encodingSupported.contains(charsetName.toLowerCase(Locale.US));
}
/**
@@ -1151,7 +1152,7 @@
* otherwise.
*/
public static boolean isDecodingSupported(String charsetName) {
- return decodingSupported.contains(charsetName.toLowerCase());
+ return decodingSupported.contains(charsetName.toLowerCase(Locale.US));
}
/**
@@ -1162,7 +1163,7 @@
* @return the MIME preferred name or <code>null</code> if not known.
*/
public static String toMimeCharset(String charsetName) {
- Charset c = charsetMap.get(charsetName.toLowerCase());
+ Charset c = charsetMap.get(charsetName.toLowerCase(Locale.US));
if (c != null) {
return c.mime;
}
@@ -1181,7 +1182,7 @@
* @return the canonical Java name or <code>null</code> if not known.
*/
public static String toJavaCharset(String charsetName) {
- Charset c = charsetMap.get(charsetName.toLowerCase());
+ Charset c = charsetMap.get(charsetName.toLowerCase(Locale.US));
if (c != null) {
return c.canonical;
}
diff --git a/tests/src/com/android/email/NotificationControllerTest.java b/tests/src/com/android/email/NotificationControllerTest.java
index 8f36300..8ce1823 100644
--- a/tests/src/com/android/email/NotificationControllerTest.java
+++ b/tests/src/com/android/email/NotificationControllerTest.java
@@ -70,8 +70,8 @@
// === Ringer mode change ===
mRingerMode = AudioManager.RINGER_MODE_NORMAL;
- // VIBRATE_ALWAYS, with a ringer tone
- a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS;
+ // VIBRATE, with a ringer tone
+ a1.mFlags = Account.FLAGS_VIBRATE;
nb.setDefaults(0);
nb.setSound(null);
@@ -83,19 +83,6 @@
assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
- // FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone
- a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT;
-
- nb.setDefaults(0);
- nb.setSound(null);
- mTarget.setupSoundAndVibration(nb, a1);
- n = nb.getNotification();
-
- assertEquals(expectedRingtone, n.sound);
- assertFalse((n.defaults & Notification.DEFAULT_VIBRATE) != 0); // no vibe
- assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
- assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
-
// No VIBRATE flags, with a ringer tone
a1.mFlags = 0;
@@ -112,21 +99,8 @@
// === Ringer mode change ===
mRingerMode = AudioManager.RINGER_MODE_VIBRATE;
- // VIBRATE_ALWAYS, with a ringer tone
- a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS;
-
- nb.setDefaults(0);
- nb.setSound(null);
- mTarget.setupSoundAndVibration(nb, a1);
- n = nb.getNotification();
-
- assertEquals(expectedRingtone, n.sound);
- assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0);
- assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
- assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
-
- // FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone
- a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT;
+ // VIBRATE, with a ringer tone
+ a1.mFlags = Account.FLAGS_VIBRATE;
nb.setDefaults(0);
nb.setSound(null);
@@ -154,21 +128,8 @@
// === Ringer mode change ===
mRingerMode = AudioManager.RINGER_MODE_SILENT;
- // VIBRATE_ALWAYS, with a ringer tone
- a1.mFlags = Account.FLAGS_VIBRATE_ALWAYS;
-
- nb.setDefaults(0);
- nb.setSound(null);
- mTarget.setupSoundAndVibration(nb, a1);
- n = nb.getNotification();
-
- assertEquals(expectedRingtone, n.sound);
- assertTrue((n.defaults & Notification.DEFAULT_VIBRATE) != 0);
- assertTrue((n.flags & Notification.FLAG_SHOW_LIGHTS) != 0); // always set
- assertTrue((n.defaults & Notification.DEFAULT_LIGHTS) != 0); // always set
-
- // FLAGS_VIBRATE_WHEN_SILENT, with a ringer tone
- a1.mFlags = Account.FLAGS_VIBRATE_WHEN_SILENT;
+ // VIBRATE, with a ringer tone
+ a1.mFlags = Account.FLAGS_VIBRATE;
nb.setDefaults(0);
nb.setSound(null);
diff --git a/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java b/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java
index 0f320b6..8e9ab75 100644
--- a/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java
+++ b/tests/src/com/android/email/mail/transport/SmtpSenderUnitTests.java
@@ -174,9 +174,9 @@
* Prepare to receive a simple message (see setupSimpleMessage)
*/
private void expectSimpleMessage(MockTransport mockTransport) {
- mockTransport.expect("MAIL FROM: <Jones@Registry.Org>",
+ mockTransport.expect("MAIL FROM:<Jones@Registry.Org>",
"250 2.1.0 <Jones@Registry.Org> sender ok");
- mockTransport.expect("RCPT TO: <Smith@Registry.Org>",
+ mockTransport.expect("RCPT TO:<Smith@Registry.Org>",
"250 2.1.5 <Smith@Registry.Org> recipient ok");
mockTransport.expect("DATA", "354 enter mail, end with . on a line by itself");
mockTransport.expect("Date: .*");
