diff options
| author | Marc Blank <mblank@google.com> | 2012-08-21 15:21:40 -0700 |
|---|---|---|
| committer | Marc Blank <mblank@google.com> | 2012-08-22 14:17:57 -0700 |
| commit | 70edcf05387df33f4761b766add6b80999e425e9 (patch) | |
| tree | 14717efa1a01fb7d8bdea090f171d68bc30da3f6 | |
| parent | 0b9f23cae28a57730653af7be074a367e3ae4a09 (diff) | |
| download | android_packages_apps_Email-70edcf05387df33f4761b766add6b80999e425e9.tar.gz android_packages_apps_Email-70edcf05387df33f4761b766add6b80999e425e9.tar.bz2 android_packages_apps_Email-70edcf05387df33f4761b766add6b80999e425e9.zip | |
Integrate Imap2 into Email
* Also, convert imap accounts to imap2
* The original imap service remains, but is no used
* There remain some questions about how the upgrade
should work in terms of settings
Change-Id: I0e05edad6a1553f428a2c2fa3daf1df878d4b5f7
78 files changed, 216 insertions, 1984 deletions
diff --git a/Android.mk b/Android.mk index 7a124eb7a..084b4ee17 100644 --- a/Android.mk +++ b/Android.mk @@ -40,7 +40,7 @@ LOCAL_ASSET_DIR := $(LOCAL_PATH)/$(unified_email_dir)/assets LOCAL_AAPT_FLAGS := --auto-add-overlay LOCAL_AAPT_FLAGS += --extra-packages com.android.ex.chips:com.android.mail:com.android.email:com.android.ex.photo -LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon2 guava android-common-chips android-common-photoviewer +LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon2 com.android.emailsync guava android-common-chips android-common-photoviewer LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4 LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13 diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a420f33c0..76cc169dc 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -546,6 +546,25 @@ android:resource="@xml/imap2_authenticator" /> </service> + + <service + android:name=".imap2.EmailSyncAdapterService" + android:exported="true"> + <intent-filter> + <action + android:name="android.content.SyncAdapter" /> + </intent-filter> + <meta-data android:name="android.content.SyncAdapter" + android:resource="@xml/syncadapter_imap2" /> + </service> + + <service + android:name=".imap2.Imap2SyncManager" + android:enabled="true" + android:permission="com.android.email.permission.ACCESS_PROVIDER" + > + </service> + <provider android:name=".provider.AttachmentProvider" android:authorities="com.android.email.attachmentprovider" diff --git a/emailsync/src/com/android/emailsync/SyncManager.java b/emailsync/src/com/android/emailsync/SyncManager.java index 785c825b5..4a518d939 100644 --- a/emailsync/src/com/android/emailsync/SyncManager.java +++ b/emailsync/src/com/android/emailsync/SyncManager.java @@ -89,7 +89,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public abstract class SyncManager extends Service implements Runnable { - private static final String TAG = "SyncServiceManager"; + private static String TAG = "SyncManager"; // The SyncServiceManager's mailbox "id" public static final int EXTRA_MAILBOX_ID = -1; @@ -274,9 +274,9 @@ public abstract class SyncManager extends Service implements Runnable { public abstract String getAccountManagerType(); /** - * Returns the intent action used for this sync service + * Returns the intent used for this sync service */ - public abstract String getServiceIntentAction(); + public abstract Intent getServiceIntent(); /** * Returns the callback proxy used for communicating back with the Email app @@ -1092,7 +1092,7 @@ public abstract class SyncManager extends Service implements Runnable { static public void alert(Context context, final long id) { final SyncManager ssm = INSTANCE; - checkSyncServiceManagerServiceRunning(); + checkSyncManagerRunning(); if (id < 0) { log("SyncServiceManager alert"); kick("ping SyncServiceManager"); @@ -1356,16 +1356,17 @@ public abstract class SyncManager extends Service implements Runnable { @SuppressWarnings("deprecation") @Override public void onCreate() { + TAG = getClass().getSimpleName(); Utility.runAsync(new Runnable() { @Override public void run() { // Quick checks first, before getting the lock if (sStartingUp) return; synchronized (sSyncLock) { - alwaysLog("!!! EAS SyncServiceManager, onCreate"); + alwaysLog("!!! onCreate"); // Try to start up properly; we might be coming back from a crash that the Email // application isn't aware of. - startService(new Intent(getServiceIntentAction())); + startService(getServiceIntent()); if (sStop) { return; } @@ -1376,8 +1377,8 @@ public abstract class SyncManager extends Service implements Runnable { @SuppressWarnings("deprecation") @Override public int onStartCommand(Intent intent, int flags, int startId) { - alwaysLog("!!! EAS SyncServiceManager, onStartCommand, startingUp = " + sStartingUp + - ", running = " + (INSTANCE != null)); + alwaysLog("!!! onStartCommand, startingUp = " + sStartingUp + ", running = " + + (INSTANCE != null)); if (!sStartingUp && INSTANCE == null) { sStartingUp = true; Utility.runAsync(new Runnable() { @@ -1409,7 +1410,7 @@ public abstract class SyncManager extends Service implements Runnable { Thread.sleep(5000); } catch (InterruptedException e) { } - startService(new Intent(getServiceIntentAction())); + startService(getServiceIntent()); }}); return; } @@ -1447,7 +1448,7 @@ public abstract class SyncManager extends Service implements Runnable { @SuppressWarnings("deprecation") @Override public void onDestroy() { - log("!!! EAS SyncServiceManager, onDestroy"); + log("!!! onDestroy"); // Handle shutting down off the UI thread Utility.runAsync(new Runnable() { @Override @@ -1485,11 +1486,11 @@ public abstract class SyncManager extends Service implements Runnable { } /** - * Start up the SyncServiceManager service if it's not already running + * Start up the SyncManager service if it's not already running * This is a stopgap for cases in which SyncServiceManager died (due to a crash somewhere in * com.android.email) and hasn't been restarted. See the comment for onCreate for details */ - static void checkSyncServiceManagerServiceRunning() { + static void checkSyncManagerRunning() { SyncManager ssm = INSTANCE; if (ssm == null) return; if (sServiceThread == null) { @@ -1502,7 +1503,7 @@ public abstract class SyncManager extends Service implements Runnable { @Override public void run() { sStop = false; - alwaysLog("SyncServiceManager thread running"); + alwaysLog("Service thread running"); TempDirectory.setTempDirectory(this); @@ -1587,7 +1588,7 @@ public abstract class SyncManager extends Service implements Runnable { startService(new Intent(this, SyncManager.class)); } catch (RuntimeException e) { // Crash; this is a completely unexpected runtime error - Log.e(TAG, "RuntimeException in SyncServiceManager", e); + Log.e(TAG, "RuntimeException", e); throw e; } finally { shutdown(); @@ -1598,7 +1599,7 @@ public abstract class SyncManager extends Service implements Runnable { synchronized (sSyncLock) { // If INSTANCE is null, we've already been shut down if (INSTANCE != null) { - log("SyncServiceManager shutting down..."); + log("Shutting down..."); // Stop our running syncs stopServiceThreads(); diff --git a/imap2/Android.mk b/imap2/Android.mk deleted file mode 100644 index da642b4ba..000000000 --- a/imap2/Android.mk +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2008, The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# -# Imap2 -# -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_SRC_FILES += $(call all-java-files-under, ../src/com/beetstra) - -LOCAL_STATIC_JAVA_LIBRARIES := android-common com.android.emailcommon2 com.android.emailsync - -LOCAL_PACKAGE_NAME := Imap2 - -#LOCAL_PROGUARD_FLAG_FILES := proguard.flags -LOCAL_SDK_VERSION := 15 - -include $(BUILD_PACKAGE) - -# additionally, build unit tests in a separate .apk -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/imap2/AndroidManifest.xml b/imap2/AndroidManifest.xml deleted file mode 100644 index b4ee3d0d6..000000000 --- a/imap2/AndroidManifest.xml +++ /dev/null @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<manifest - xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.imap2" - android:versionCode="000000" - android:versionName="0.1" - > - - <uses-permission - android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> - <uses-permission - android:name="android.permission.ACCESS_NETWORK_STATE"/> - <uses-permission - android:name="android.permission.INTERNET"/> - <uses-permission - android:name="android.permission.VIBRATE"/> - <uses-permission - android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <uses-permission - android:name="android.permission.GET_ACCOUNTS" /> - <uses-permission - android:name="android.permission.MANAGE_ACCOUNTS" /> - <uses-permission - android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> - <uses-permission - android:name="android.permission.READ_SYNC_SETTINGS" /> - <uses-permission - android:name="android.permission.WRITE_SYNC_SETTINGS" /> - - <uses-permission - android:name="android.permission.USE_CREDENTIALS"/> - - <!-- Only required if a store implements push mail and needs to keep network open --> - <uses-permission - android:name="android.permission.WAKE_LOCK"/> - <uses-permission - android:name="android.permission.READ_PHONE_STATE"/> - - <uses-permission - android:name="com.android.email.permission.READ_ATTACHMENT"/> - <uses-permission - android:name="com.android.email.permission.ACCESS_PROVIDER"/> - - <application - android:icon="@mipmap/icon" - android:label="@string/app_name" - android:name="Imap2" - android:theme="@android:style/Theme.Holo.Light" - > - - <receiver - android:name="com.android.emailsync.EmailSyncAlarmReceiver"/> - <receiver - android:name="com.android.emailsync.MailboxAlarmReceiver"/> - - <receiver - android:name=".Imap2BroadcastReceiver" - android:enabled="true"> - <intent-filter> - <action - android:name="android.intent.action.BOOT_COMPLETED" /> - <action - android:name="android.intent.action.DEVICE_STORAGE_LOW" /> - <action - android:name="android.intent.action.DEVICE_STORAGE_OK" /> - <action - android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED" /> - </intent-filter> - </receiver> - - <service - android:name=".BroadcastProcessorService" /> - - <!--Required stanza to register the EAS EmailSyncAdapterService with SyncManager --> - <service - android:name=".EmailSyncAdapterService" - android:exported="true"> - <intent-filter> - <action - android:name="android.content.SyncAdapter" /> - </intent-filter> - <meta-data android:name="android.content.SyncAdapter" - android:resource="@xml/syncadapter_email" /> - </service> - - <service - android:name="com.android.imap2.Imap2SyncManager" - android:enabled="true" - android:permission="com.android.email.permission.ACCESS_PROVIDER" - > - <intent-filter> - <action - android:name="com.android.email.IMAP2_INTENT" /> - </intent-filter> - </service> - - </application> -</manifest> diff --git a/imap2/res/mipmap-hdpi/icon.png b/imap2/res/mipmap-hdpi/icon.png Binary files differdeleted file mode 100644 index 6fd0a9851..000000000 --- a/imap2/res/mipmap-hdpi/icon.png +++ /dev/null diff --git a/imap2/res/mipmap-mdpi/icon.png b/imap2/res/mipmap-mdpi/icon.png Binary files differdeleted file mode 100644 index 0369413ad..000000000 --- a/imap2/res/mipmap-mdpi/icon.png +++ /dev/null diff --git a/imap2/res/mipmap-xhdpi/icon.png b/imap2/res/mipmap-xhdpi/icon.png Binary files differdeleted file mode 100644 index 777ef30ee..000000000 --- a/imap2/res/mipmap-xhdpi/icon.png +++ /dev/null diff --git a/imap2/res/values-af/strings.xml b/imap2/res/values-af/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-af/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-am/strings.xml b/imap2/res/values-am/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-am/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-ar/strings.xml b/imap2/res/values-ar/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-ar/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-be/strings.xml b/imap2/res/values-be/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-be/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-bg/strings.xml b/imap2/res/values-bg/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-bg/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-ca/strings.xml b/imap2/res/values-ca/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-ca/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-cs/strings.xml b/imap2/res/values-cs/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-cs/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-da/strings.xml b/imap2/res/values-da/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-da/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-de/strings.xml b/imap2/res/values-de/strings.xml deleted file mode 100644 index 3c2e559c3..000000000 --- a/imap2/res/values-de/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"IMAP2"</string> -</resources> diff --git a/imap2/res/values-el/strings.xml b/imap2/res/values-el/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-el/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-en-rGB/strings.xml b/imap2/res/values-en-rGB/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-en-rGB/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-es-rUS/strings.xml b/imap2/res/values-es-rUS/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-es-rUS/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-es/strings.xml b/imap2/res/values-es/strings.xml deleted file mode 100644 index 3c2e559c3..000000000 --- a/imap2/res/values-es/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"IMAP2"</string> -</resources> diff --git a/imap2/res/values-et/strings.xml b/imap2/res/values-et/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-et/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-fa/strings.xml b/imap2/res/values-fa/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-fa/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-fi/strings.xml b/imap2/res/values-fi/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-fi/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-fr/strings.xml b/imap2/res/values-fr/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-fr/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-hi/strings.xml b/imap2/res/values-hi/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-hi/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-hr/strings.xml b/imap2/res/values-hr/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-hr/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-hu/strings.xml b/imap2/res/values-hu/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-hu/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-in/strings.xml b/imap2/res/values-in/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-in/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-it/strings.xml b/imap2/res/values-it/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-it/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-iw/strings.xml b/imap2/res/values-iw/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-iw/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-ja/strings.xml b/imap2/res/values-ja/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-ja/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-ko/strings.xml b/imap2/res/values-ko/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-ko/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-lt/strings.xml b/imap2/res/values-lt/strings.xml deleted file mode 100644 index 3c2e559c3..000000000 --- a/imap2/res/values-lt/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"IMAP2"</string> -</resources> diff --git a/imap2/res/values-lv/strings.xml b/imap2/res/values-lv/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-lv/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-ms/strings.xml b/imap2/res/values-ms/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-ms/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-nb/strings.xml b/imap2/res/values-nb/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-nb/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-nl/strings.xml b/imap2/res/values-nl/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-nl/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-pl/strings.xml b/imap2/res/values-pl/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-pl/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-pt-rPT/strings.xml b/imap2/res/values-pt-rPT/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-pt-rPT/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-pt/strings.xml b/imap2/res/values-pt/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-pt/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-ro/strings.xml b/imap2/res/values-ro/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-ro/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-ru/strings.xml b/imap2/res/values-ru/strings.xml deleted file mode 100644 index 3c2e559c3..000000000 --- a/imap2/res/values-ru/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"IMAP2"</string> -</resources> diff --git a/imap2/res/values-sk/strings.xml b/imap2/res/values-sk/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-sk/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-sl/strings.xml b/imap2/res/values-sl/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-sl/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-sr/strings.xml b/imap2/res/values-sr/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-sr/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-sv/strings.xml b/imap2/res/values-sv/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-sv/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-sw/strings.xml b/imap2/res/values-sw/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-sw/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-th/strings.xml b/imap2/res/values-th/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-th/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-tl/strings.xml b/imap2/res/values-tl/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-tl/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-tr/strings.xml b/imap2/res/values-tr/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-tr/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-uk/strings.xml b/imap2/res/values-uk/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-uk/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-vi/strings.xml b/imap2/res/values-vi/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-vi/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-zh-rCN/strings.xml b/imap2/res/values-zh-rCN/strings.xml deleted file mode 100644 index 3c2e559c3..000000000 --- a/imap2/res/values-zh-rCN/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"IMAP2"</string> -</resources> diff --git a/imap2/res/values-zh-rTW/strings.xml b/imap2/res/values-zh-rTW/strings.xml deleted file mode 100644 index d19ec89b6..000000000 --- a/imap2/res/values-zh-rTW/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"Imap2"</string> -</resources> diff --git a/imap2/res/values-zu/strings.xml b/imap2/res/values-zu/strings.xml deleted file mode 100644 index b595bbba3..000000000 --- a/imap2/res/values-zu/strings.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_name" msgid="8277676436260081413">"I-Imap2"</string> -</resources> diff --git a/imap2/res/values/strings.xml b/imap2/res/values/strings.xml deleted file mode 100644 index ea8c8c07e..000000000 --- a/imap2/res/values/strings.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - - <!-- Name of application on Home screen --> - <string name="app_name">Imap2</string> - - <!-- The next set of strings are used server-side and must not be localized. --> - <!-- Do Not Translate. This is the name of the "inbox" folder, on the server. --> - <string name="mailbox_name_server_inbox" translatable="false">Inbox</string> - <!-- Do Not Translate. This is the name of the "outbox" folder, on the server. --> - <string name="mailbox_name_server_outbox" translatable="false">Outbox</string> - <!-- Do Not Translate. This is the name of the "drafts" folder, on the server. --> - <string name="mailbox_name_server_drafts" translatable="false">Drafts</string> - <!-- Do Not Translate. This is the name of the "trash" folder, on the server. --> - <string name="mailbox_name_server_trash" translatable="false">Trash</string> - <!-- Do Not Translate. This is the name of the "sent" folder, on the server. --> - <string name="mailbox_name_server_sent" translatable="false">Sent</string> - <!-- Do Not Translate. This is the name of the "junk" folder, on the server. --> - <string name="mailbox_name_server_junk" translatable="false">Junk</string> - -</resources> - diff --git a/imap2/src/com/android/imap2/BroadcastProcessorService.java b/imap2/src/com/android/imap2/BroadcastProcessorService.java deleted file mode 100644 index b86183dc8..000000000 --- a/imap2/src/com/android/imap2/BroadcastProcessorService.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2011 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.imap2; - -import android.accounts.AccountManager; -import android.app.IntentService; -import android.content.Context; -import android.content.Intent; -import android.util.Log; - -import com.android.emailcommon.Logging; -import com.android.emailsync.SyncManager; - -/** - * The service that really handles broadcast intents on a worker thread. - * - * We make it a service, because: - * <ul> - * <li>So that it's less likely for the process to get killed. - * <li>Even if it does, the Intent that have started it will be re-delivered by the system, - * and we can start the process again. (Using {@link #setIntentRedelivery}). - * </ul> - */ -public class BroadcastProcessorService extends IntentService { - // Action used for BroadcastReceiver entry point - private static final String ACTION_BROADCAST = "broadcast_receiver"; - - public BroadcastProcessorService() { - // Class name will be the thread name. - super(BroadcastProcessorService.class.getName()); - // Intent should be redelivered if the process gets killed before completing the job. - setIntentRedelivery(true); - } - - /** - * Entry point for {@link Imap2BroadcastReceiver}. - */ - public static void processBroadcastIntent(Context context, Intent broadcastIntent) { - Intent i = new Intent(context, BroadcastProcessorService.class); - i.setAction(ACTION_BROADCAST); - i.putExtra(Intent.EXTRA_INTENT, broadcastIntent); - context.startService(i); - } - - @Override - protected void onHandleIntent(Intent intent) { - // Dispatch from entry point - final String action = intent.getAction(); - if (ACTION_BROADCAST.equals(action)) { - final Intent broadcastIntent = intent.getParcelableExtra(Intent.EXTRA_INTENT); - final String broadcastAction = broadcastIntent.getAction(); - - if (Intent.ACTION_BOOT_COMPLETED.equals(broadcastAction)) { - onBootCompleted(); - } else if (AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION.equals(broadcastAction)) { - Log.d(Logging.LOG_TAG, "Login accounts changed; reconciling..."); - SyncManager.reconcileAccounts(this); - } - } - } - - /** - * Handles {@link Intent#ACTION_BOOT_COMPLETED}. Called on a worker thread. - */ - private void onBootCompleted() { - startService(new Intent(this, Imap2SyncManager.class)); - } -} diff --git a/imap2/src/com/android/imap2/Imap2.java b/imap2/src/com/android/imap2/Imap2.java deleted file mode 100644 index 2a2995f6b..000000000 --- a/imap2/src/com/android/imap2/Imap2.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.imap2; - -import android.app.Application; - -public class Imap2 extends Application { - // TODO Investigate whether this class is needed -} diff --git a/imap2/src/com/android/imap2/Imap2BroadcastReceiver.java b/imap2/src/com/android/imap2/Imap2BroadcastReceiver.java deleted file mode 100644 index 8ea3c0029..000000000 --- a/imap2/src/com/android/imap2/Imap2BroadcastReceiver.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2012 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.imap2; - -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; - -/** - * The broadcast receiver. The actual job is done in EmailBroadcastProcessor on a worker thread. - */ -public class Imap2BroadcastReceiver extends BroadcastReceiver { - @Override - public void onReceive(Context context, Intent intent) { - BroadcastProcessorService.processBroadcastIntent(context, intent); - } -} diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml deleted file mode 100644 index ffba7b45e..000000000 --- a/res/values-sv/strings.xml +++ /dev/null @@ -1,503 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright (C) 2008 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="permission_read_attachment_label" msgid="9208086010625033590">"Läs bilagor i e-postmeddelanden"</string> - <string name="permission_read_attachment_desc" msgid="3394721085306308972">"Tillåter att appen läser bilagor i e-postmeddelanden."</string> - <string name="permission_access_provider_label" msgid="378256653525377586">"Använd data från e-postleverantören"</string> - <string name="permission_access_provider_desc" msgid="6296566558584670348">"Tillåter att appen kommer åt e-postdatabasen med bland annat mottagna meddelanden, skickade meddelanden, användarnamn och lösenord."</string> - <string name="app_name" msgid="5815426892327290362">"E-post"</string> - <string name="compose_title" msgid="427986915662706899">"Skriv"</string> - <string name="debug_title" msgid="5175710493691536719">"Felsökning"</string> - <string name="next_action" msgid="3931301986364184415">"Nästa"</string> - <string name="okay_action" msgid="8365197396795675617">"OK"</string> - <string name="cancel_action" msgid="6967435583794021865">"Avbryt"</string> - <string name="previous_action" msgid="5181616311579820981">"Föregående"</string> - <string name="send_action" msgid="1729766205562446418">"Skicka"</string> - <string name="reply_action" msgid="4262472229221507619">"Svara"</string> - <string name="reply_all_action" msgid="6192179825726332152">"Svara alla"</string> - <string name="delete_action" msgid="8421026208288857155">"Ta bort"</string> - <string name="forward_action" msgid="669174181042344116">"Framåt"</string> - <string name="favorite_action" msgid="4664259801498253756">"Stjärnmärk"</string> - <string name="done_action" msgid="7497990549515580249">"Klar"</string> - <string name="create_action" msgid="3062715563215392251">"Skapa nytt"</string> - <string name="delete_quick_response_action" msgid="3076922270182841978">"Ta bort"</string> - <string name="quick_responses_empty_view" msgid="3960050972306132367">"Inga snabba svar."</string> - <string name="discard_action" msgid="6532206074859505968">"Släng"</string> - <string name="save_draft_action" msgid="6413714270991417223">"Spara utkast"</string> - <string name="show_quick_text_list_dialog_action" msgid="4136018559611145202">"Infoga snabbsvar"</string> - <string name="read_action" msgid="4701484794504781686">"Markera som läst"</string> - <string name="unread_action" msgid="6280399049357552826">"Markera som oläst"</string> - <string name="set_star_action" msgid="4660317166196258160">"Lägg till stjärna"</string> - <string name="remove_star_action" msgid="6689770999647007163">"Ta bort stjärna"</string> - <string name="refresh_action" msgid="5951383001436708175">"Uppdatera"</string> - <string name="add_account_action" msgid="8835736309476033727">"Lägg till konto"</string> - <string name="compose_action" msgid="4045702519637388045">"Skriv"</string> - <string name="search_action" msgid="6325101454876682308">"Sök"</string> - <string name="account_settings_action" msgid="4494079183315085171">"Kontoinställningar"</string> - <string name="settings_action" msgid="6334807007967459412">"Inställningar"</string> - <string name="menu_folder_options" msgid="2871906096248843471">"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="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> - <string name="close_action" msgid="533058985745238100">"Stäng"</string> - <string name="message_list_send_pending_messages_action" msgid="8502942186631824114">"Skicka meddelanden"</string> - <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Välj bilaga"</string> - <string name="move_to_folder_dialog_title" msgid="2614318192482193898">"Flytta till"</string> - <string name="status_loading_messages" msgid="6552307237621292344">"Läser in meddelanden…"</string> - <string name="status_network_error" msgid="2611654064403817391">"Anslutningsproblem."</string> - <string name="error_loading_message_body" msgid="6775234299515596760">"Det gick inte att läsa in meddelandetexten. Meddelandet kan vara för stort för att visas."</string> - <plurals name="move_messages"> - <item quantity="one" msgid="320885379869442589">"Flytta meddelandet"</item> - <item quantity="other" msgid="371256717624461324">"Flytta meddelanden"</item> - </plurals> - <string name="cannot_move_protocol_not_supported_toast" msgid="6558083148128616292">"POP3-konton har inte stöd för att flytta meddelanden."</string> - <string name="cannot_move_multiple_accounts_toast" msgid="7922594026384944163">"Det går inte att flytta meddelandena. De markerade objekten kommer från flera olika konton."</string> - <string name="cannot_move_special_mailboxes_toast" msgid="7093107954841896970">"Det går inte att flytta meddelanden i Utkast, Utkorgen och Skickade."</string> - <plurals name="notification_new_one_account_fmt"> - <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> oläst (<xliff:g id="ACCOUNT">%2$s</xliff:g>"</item> - <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> oläst (<xliff:g id="ACCOUNT">%2$s</xliff:g>"</item> - <item quantity="other" msgid="6937673814351448076">"<xliff:g id="UNREAD_MESSAGE_COUNT">%1$d</xliff:g> oläst (<xliff:g id="ACCOUNT">%2$s</xliff:g>"</item> - </plurals> - <plurals name="notification_new_multi_account_fmt"> - <item quantity="few" msgid="1991747245324120305">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konton"</item> - <item quantity="other" msgid="2723797835410343458">"i <xliff:g id="NUMBER_ACCOUNTS">%d</xliff:g> konton"</item> - </plurals> - <string name="notification_to_account" msgid="2078557719010667913">"till <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> nya meddelanden"</string> - <string name="account_name_display_all" msgid="837218861494831989">"Alla konton"</string> - <plurals name="number_of_accounts"> - <item quantity="one" msgid="6343953132237244947">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> konto"</item> - <item quantity="other" msgid="8548760449976444566">"<xliff:g id="NUM_ACCOUNTS">%1$d</xliff:g> konton"</item> - </plurals> - <string name="mailbox_name_display_inbox" msgid="3542327124749861736">"Inkorgen"</string> - <string name="mailbox_name_display_outbox" msgid="2826214174661417662">"Utkorgen"</string> - <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Utkast"</string> - <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Papperskorgen"</string> - <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Skickat"</string> - <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Skräp"</string> - <string name="mailbox_name_display_unread" msgid="1015674989793998695">"Olästa"</string> - <string name="picker_mailbox_name_all_unread" msgid="6392491216581687644">"Inkorg (olästa)"</string> - <string name="picker_mailbox_name_all_inbox" msgid="2277030979530376085">"Inkorg (alla)"</string> - <string name="picker_combined_view_fmt" msgid="6276294768978512737">"Kombinerad vy (<xliff:g id="COUNT">%s</xliff:g>)"</string> - <plurals name="picker_combined_view_account_count"> - <item quantity="one" msgid="380235084337895804">"<xliff:g id="ACCOUNT_COUNT">%d</xliff:g> konto"</item> - <item quantity="other" msgid="4145163147488719025">"<xliff:g id="ACCOUNT_COUNT">%d</xliff:g> konton"</item> - </plurals> - <string name="debug_version_fmt" msgid="6160213145745376955">"Version: <xliff:g id="VERSION">%s</xliff:g>"</string> - <string name="account_folder_list_summary_inbox" msgid="7518263761297423255">"Inkorgen"</string> - <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Stjärnmärkta"</string> - <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Utkast"</string> - <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Utkorgen"</string> - <string name="mailbox_list_account_selector_combined_view" msgid="1556327299894225044">"Kombinerad vy"</string> - <string name="mailbox_list_account_selector_show_all_folders" msgid="4185052839366909439">"Visa alla mappar"</string> - <string name="mailbox_list_account_selector_account_header" msgid="4261295503836387876">"Konton"</string> - <string name="mailbox_list_account_selector_mailbox_header_fmt" msgid="3320144348694625092">"Senaste mappar (<xliff:g id="EMAIL_ADDRESS">%s</xliff:g>)"</string> - <string name="mailbox_list_user_mailboxes" msgid="484260487104726379">"Alla mappar"</string> - <string name="mailbox_list_recent_mailboxes" msgid="8922653040520361032">"Senaste mapparna"</string> - <string name="message_subject_description" msgid="3597047441062021199">"Ämne"</string> - <string name="message_is_empty_description" msgid="4004644319382041459">"Inget ämne"</string> - <string name="message_list_load_more_messages_action" msgid="7428302707908825692">"Hämta fler meddelanden"</string> - <plurals name="message_view_selected_message_count"> - <item quantity="one" msgid="5064657358375178519">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> markerad"</item> - <item quantity="other" msgid="7901361399231876038">"<xliff:g id="MESSAGE_COUNT">%d</xliff:g> markerade"</item> - </plurals> - <string name="message_list_no_messages" msgid="7846910091922523867">"Inga meddelanden"</string> - <string name="message_compose_to_hint" msgid="2891895306418177013">"Till"</string> - <string name="message_compose_cc_hint" msgid="8481884461031434144">"Kopia"</string> - <string name="message_compose_bcc_hint" msgid="9177337492358841680">"Hemlig kopia"</string> - <string name="message_compose_subject_hint" msgid="6993487234024160782">"Ämne"</string> - <string name="message_compose_from_label" msgid="4084843296548498041">"Från:"</string> - <string name="to" msgid="4392614766835725698">"Till"</string> - <string name="cc" msgid="7017720927911078193">"Kopia"</string> - <string name="bcc" msgid="3098643138241111579">"Hemlig kopia"</string> - <string name="subject_hint" msgid="7253964583324677128">"Ämne"</string> - <string name="body_hint" msgid="4279864165439577668">"Skriv ett e-postmeddelande"</string> - <string name="message_compose_fwd_header_fmt" msgid="5181300290654579434">\n\n"-------- Ursprungligt meddelande --------"\n"Ämne: <xliff:g id="SUBJECT">%1$s</xliff:g>"\n"Från: <xliff:g id="SENDER">%2$s</xliff:g>"\n"Till: <xliff:g id="TO">%3$s</xliff:g>"\n"Kopia: <xliff:g id="CC_0">%4$s</xliff:g>"\n\n</string> - <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g> skrev:"\n\n</string> - <string name="message_compose_quoted_text_label" msgid="6950097435198536165">"Inkludera citerad text"</string> - <string name="message_compose_include_quoted_text_checkbox_label" msgid="8165567368956050390">"Inkludera text"</string> - <string name="message_compose_error_no_recipients" msgid="140299472517968199">"Lägg till minst en mottagare."</string> - <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Några av e-postadresserna är ogiltiga."</string> - <string name="message_compose_attachment_size" msgid="4401081828287333647">"Filen är för stor för att bifogas."</string> - <string name="message_compose_insert_quick_response_list_title" msgid="5314107302508728189">"Infoga snabbsvar"</string> - <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> och <xliff:g id="NUMBER">%2$d</xliff:g> andra"</string> - <string name="message_view_to_label" msgid="6485191743265527381">"Till:"</string> - <string name="message_view_cc_label" msgid="6322992216371163122">"Kopia:"</string> - <string name="message_view_bcc_label" msgid="7577479221285310198">"Hemlig kopia:"</string> - <string name="message_view_date_label" msgid="7033814961837313339">"Datum:"</string> - <string name="message_view_from_label" msgid="6055076379282772675">"Från:"</string> - <string name="message_view_subject_label" msgid="3731022187530000852">"Ämne:"</string> - <string name="message_view_attachment_view_action" msgid="4408093860407096078">"Visa"</string> - <string name="message_view_attachment_install_action" msgid="381211378884166381">"Installera"</string> - <string name="message_view_attachment_play_action" msgid="5214215414665114061">"Spela upp"</string> - <string name="message_view_attachment_load_action" msgid="8645178445048233745">"Läs in"</string> - <string name="message_view_attachment_info_action" msgid="3908148393469626740">"Info"</string> - <string name="message_view_attachment_save_action" msgid="4704436274670997903">"Spara"</string> - <string name="message_view_attachment_saved" msgid="3432810414785232025">"Sparad"</string> - <string name="message_view_attachment_cancel_action" msgid="316700885943712101">"Stoppa"</string> - <string name="message_view_status_attachment_saved" msgid="8878790392556284868">"Bilagan har sparats som <xliff:g id="FILENAME">%s</xliff:g>."</string> - <string name="message_view_status_attachment_not_saved" msgid="4013475734255421939">"Kunde inte spara bilagan."</string> - <string name="message_view_attachment_background_load" msgid="7906875687519445185">"En eller flera bilagor i det vidarebefordrade meddelandet hämtas innan de skickas."</string> - <string name="message_view_show_message_action" msgid="5134222901019191436">"Meddelande"</string> - <string name="message_view_show_invite_action" msgid="8862797393776226777">"Bjud in"</string> - <plurals name="message_view_show_attachments_action"> - <item quantity="one" msgid="7594476368958824007">"Bilaga <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item> - <item quantity="other" msgid="974463163535515223">"Bilagor <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item> - </plurals> - <string name="message_view_show_pictures_action" msgid="5059936981743072545">"Visa bilder"</string> - <string name="message_view_always_show_pictures_button" msgid="6523810929103546865">"Visa alltid"</string> - <string name="message_view_always_show_pictures_prompt" msgid="7685500276479967959">"Visa alltid bilder från den här avsändaren"</string> - <string name="message_view_always_show_pictures_confirmation" msgid="6838463134312859448">"Bilder från den här avsändaren visas automatiskt."</string> - <string name="message_view_invite_view" msgid="5521032519960111675">"Visa i Kalender"</string> - <string name="message_view_invite_title" msgid="3418949733434713805">"Kalenderinbjudan"</string> - <string name="message_view_invite_text" msgid="1212799906603873708">"Delta?"</string> - <string name="message_view_invite_accept" msgid="744546668021679819">" Ja"</string> - <string name="message_view_invite_maybe" msgid="7555189462441562318">" Kanske"</string> - <string name="message_view_invite_decline" msgid="6119797303297149463">" Nej"</string> - <string name="message_view_invite_toast_yes" msgid="6802274503171644414">"Du har accepterat inbjudan."</string> - <string name="message_view_invite_toast_maybe" msgid="8547454326090527202">"Du har svarat Kanske på den här inbjudan."</string> - <string name="message_view_invite_toast_no" msgid="1842341256942784143">"Du har tackat nej till inbjudan."</string> - <string name="message_view_show_details" msgid="6287415596441037095">"Visa information"</string> - <string name="message_view_message_details_dialog_title" msgid="9042008615386883449">"Meddelandeinfo"</string> - <string name="attachment_info_dialog_default_title" msgid="4995755709689009622">"Information om bifogad fil"</string> - <string name="attachment_info_dialog_wifi_title" msgid="3174350153882915382">"Wi-Fi-anslutning krävs"</string> - <string name="attachment_info_wifi_settings" msgid="96432970927503597">"Wi-Fi-inställningar"</string> - <string name="attachment_info_application_settings" msgid="4124655487276125596">"Appinställningar"</string> - <string name="attachment_info_unknown" msgid="8342655396805943320">"Det går inte att öppna den bifogade filen."</string> - <string name="attachment_info_malware" msgid="6576029010855055528">"Du kan inte spara eller öppna filen eftersom denna typ av bilaga kan innehålla skadlig programvara."</string> - <string name="attachment_info_policy" msgid="3560422300127587508">"Det går inte att spara eller öppna bilagan på grund av kontots säkerhetsprinciper."</string> - <string name="attachment_info_wifi_only" msgid="1481120960014563617">"Den bifogade filen är så stor att du inte kan hämta den via det mobila nätverket. Du kan hämta den nästa gång som enheten ansluts till ett Wi-Fi-nätverk."</string> - <string name="attachment_info_no_intent" msgid="8139209405745777924">"Det finns ingen installerad app som kan öppna den här bilagan. Prova att hämta en lämplig app från Android Market."</string> - <string name="attachment_info_sideload_disabled" msgid="3270731101769840006">"Den här bilagan är en app. Du måste markera Okända källor i Inställningar > Appar innan du kan installera den."</string> - <string name="attachment_info_apk_install_disabled" msgid="2817790592227462682">"Appar kan inte installeras direkt från e-post. Spara först appen och installera den sedan med appen Hämtningar."</string> - <string name="attachment_not_found" msgid="7155322700141145123">"Det gick inte att hämta bilagan."</string> - <string name="message_decode_error" msgid="5016042255170947834">"Ett fel inträffade när meddelandet avkodades."</string> - <string name="eml_view_title" msgid="8827210108543430336">"Visar <xliff:g id="FILENAME">%s</xliff:g>"</string> - <string name="message_delete_dialog_title" msgid="6603370107217227252"></string> - <plurals name="message_delete_confirm"> - <item quantity="one" msgid="3799616435056423256">"Vill du ta bort meddelandet?"</item> - <item quantity="other" msgid="4437637377522896262">"Vill du ta bort meddelandena?"</item> - </plurals> - <plurals name="message_deleted_toast"> - <item quantity="one" msgid="710742672464447084">"Meddelandet tas bort."</item> - <item quantity="other" msgid="6574961322865652255">"Meddelandena har tagits bort."</item> - </plurals> - <string name="message_discarded_toast" msgid="3891461729325584026">"Meddelandet slängs."</string> - <string name="message_saved_toast" msgid="8443125659172627665">"Meddelande sparat som utkast."</string> - <string name="message_view_display_attachment_toast" msgid="7714482237896346836">"Det går inte att visa bilagan."</string> - <string name="message_view_load_attachment_failed_toast" msgid="8605967295095023587">"Det gick inte att läsa in bilagan <xliff:g id="FILENAME">%s</xliff:g>."</string> - <string name="message_view_parse_message_toast" msgid="8830378966553031281">"Meddelandet öppnas..."</string> - <plurals name="message_moved_toast"> - <item quantity="one" msgid="3098493230185412871">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> meddelandet har flyttats till <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item> - <item quantity="other" msgid="2286739630865943494">"<xliff:g id="NUM_MESSAGE">%1$d</xliff:g> meddelanden har flyttats till <xliff:g id="MAILBOX_NAME">%2$s</xliff:g>"</item> - </plurals> - <string name="forward_download_failed_ticker" msgid="6176608320359303255">"Det gick inte att vidarebefordra en eller flera bilagor."</string> - <string name="forward_download_failed_title" msgid="6139701848515572511">"Bilagan vidarebefordrades inte"</string> - <string name="login_failed_ticker" msgid="2169365211566829350">"Det gick inte att logga in <xliff:g id="ACCOUNT_NAME">%s</xliff:g>."</string> - <string name="login_failed_title" msgid="7624349996212476176">"Det gick inte att logga in."</string> - <plurals name="message_view_attachment_bytes"> - <item quantity="one" msgid="8914124732074848509">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item> - <item quantity="other" msgid="4613385949384337840">"<xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B"</item> - </plurals> - <plurals name="message_view_attachment_kilobytes"> - <item quantity="one" msgid="869981846437074463">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item> - <item quantity="other" msgid="8869993299924901593">"<xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB"</item> - </plurals> - <plurals name="message_view_attachment_megabytes"> - <item quantity="one" msgid="7527095670565758434">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item> - <item quantity="other" msgid="4365876866570165282">"<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB"</item> - </plurals> - <plurals name="message_view_attachment_gigabytes"> - <item quantity="one" msgid="6261986598249539093">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item> - <item quantity="other" msgid="1041353825053598633">"<xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB"</item> - </plurals> - <string name="message_view_move_to_newer" msgid="2190862552581773765">"Nyare"</string> - <string name="message_view_move_to_older" msgid="4993043091356700890">"Äldre"</string> - <string name="message_list_subject_snippet_divider" msgid="1783589062530679520">" – "</string> - <string name="account_setup_basics_title" msgid="3578333196594678422">"Kontoinställningar"</string> - <string name="account_setup_basics_headline" msgid="6726590205905464015">"E-postkonto"</string> - <string name="accounts_welcome" msgid="8337750045270269649">"Du kan konfigurera ditt konto med några få steg."</string> - <string name="account_setup_basics_email_label" msgid="3454164053624112047">"E-postadress"</string> - <string name="account_setup_basics_password_label" msgid="9133549799291519298">"Lösenord"</string> - <string name="account_setup_basics_default_label" msgid="8896222991837026736">"Skicka e-post från det här kontot som standard"</string> - <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuell inställning"</string> - <string name="account_setup_username_password_toast" msgid="3968270274727947460">"Ange en giltig e-postadress och lösenord."</string> - <string name="account_duplicate_dlg_title" msgid="8089732986912704425">"Dubblettkonto"</string> - <string name="account_duplicate_dlg_message_fmt" msgid="6447629283679935840">"Du använder redan det här användarnamnet för kontot <xliff:g id="DUPLICATE">%s</xliff:g>."</string> - <string name="account_password_spaces_error" msgid="8928309156658903257">"Det här lösenordet inleds eller avslutas med ett eller flera mellanslag. Många servrar saknar stöd för lösenord med mellanslag."</string> - <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Hämtar kontoinformation…"</string> - <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Validerar serverinställningar ..."</string> - <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Validerar SMTP-inställningar ..."</string> - <string name="account_setup_names_title" msgid="8483517350241119291">"Kontoinställningar"</string> - <string name="account_setup_names_headline" msgid="914858472109729140">"Ditt konto är färdigt och snart kan du skicka och ta emot e-postmeddelanden."</string> - <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ge kontot ett namn (valfritt)"</string> - <string name="account_setup_names_user_name_label" msgid="8967410178488604770">"Ditt namn (visas för utgående meddelanden)"</string> - <string name="account_setup_names_user_name_empty_error" msgid="6791427018325367364">"Fältet får inte vara tomt."</string> - <string name="account_setup_account_type_title" msgid="7156551693961182124">"Kontoinställningar"</string> - <string name="account_setup_account_type_headline" msgid="3574102329184831086">"Kontotyp"</string> - <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Vilken typ av konto är det här?"</string> - <string name="account_setup_incoming_title" msgid="6796626791039136005">"Kontoinställningar"</string> - <string name="account_setup_incoming_headline" msgid="6183711037633407184">"Inkommande serverinställningar"</string> - <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Användarnamn"</string> - <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Lösenord"</string> - <string name="account_setup_incoming_server_label" msgid="1480342966630002638">"Server"</string> - <string name="account_setup_incoming_port_label" msgid="8214738923690447796">"Port"</string> - <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Säkerhetstyp"</string> - <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ingen"</string> - <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="6151855090123117538">"SSL/TLS (acceptera alla certifikat)"</string> - <string name="account_setup_incoming_security_ssl_label" msgid="2798501138420163861">"SSL/TLS"</string> - <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="6149084428423662620">"STARTTLS (acceptera alla certifikat)"</string> - <string name="account_setup_incoming_security_tls_label" msgid="6573498431821879660">"STARTTLS"</string> - <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Ta bort e-post från servern"</string> - <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Aldrig"</string> - <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"När jag tar bort något från min Inkorg"</string> - <string name="account_setup_incoming_imap_path_prefix_label" msgid="401167247072926810">"IMAP-sökvägsprefix"</string> - <string name="account_setup_incoming_imap_path_prefix_hint" msgid="9190845919067906033">"Valfritt"</string> - <string name="account_setup_outgoing_title" msgid="7208495965665711539">"Kontoinställningar"</string> - <string name="account_setup_outgoing_headline" msgid="2025001060935366394">"Utgående serverinställningar"</string> - <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-server"</string> - <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string> - <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Säkerhetstyp"</string> - <string name="account_setup_outgoing_require_login_label" msgid="7779484127897397562">"Kräv inloggning"</string> - <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Användarnamn"</string> - <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Lösenord"</string> - <string name="account_setup_exchange_title" msgid="396004732514751781">"Kontoinställningar"</string> - <string name="account_setup_exchange_headline" msgid="6099049671599242131">"Serverinställningar"</string> - <string name="account_setup_exchange_server_label" msgid="795137797983360826">"Server"</string> - <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domän\\Användarnamn"</string> - <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Använd säker anslutning (SSL)"</string> - <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Acceptera alla SSL-certifikat"</string> - <string name="account_setup_exchange_certificate_title" msgid="8473793588405277962">"Klientcertifikat"</string> - <string name="account_setup_exchange_select_certificate" msgid="1536103662037268683">"Välj"</string> - <string name="account_setup_exchange_use_certificate" msgid="8690682770083161349">"Använd klientcertifikat"</string> - <string name="account_setup_exchange_remove_certificate" msgid="5633249155510301766">"Ta bort"</string> - <string name="account_setup_exchange_no_certificate" msgid="1119542961954780872">"Inga"</string> - <string name="account_setup_exchange_device_id_label" msgid="1646827333223157658">"Den mobila enhetens ID"</string> - <string name="account_setup_options_title" msgid="9016600767888846051">"Kontoinställningar"</string> - <string name="account_setup_options_headline" msgid="4181274232835368085">"Kontoalternativ"</string> - <string name="account_setup_options_mail_check_frequency_label" msgid="4824859792882810053">"Intervall för e-postkontroll"</string> - <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Aldrig"</string> - <string name="account_setup_options_mail_check_frequency_push" msgid="5934525907736008673">"Automatiskt (push)"</string> - <string name="account_setup_options_mail_check_frequency_5min" msgid="6388939895878539307">"Var 5:e minut"</string> - <string name="account_setup_options_mail_check_frequency_10min" msgid="5344463157247877480">"Var 10:e minut"</string> - <string name="account_setup_options_mail_check_frequency_15min" msgid="5052776740089741793">"Var 15:e minut"</string> - <string name="account_setup_options_mail_check_frequency_30min" msgid="1097088928685931864">"Var 30:e minut"</string> - <string name="account_setup_options_mail_check_frequency_1hour" msgid="3767715356039692899">"Varje timme"</string> - <string name="account_setup_options_default_label" msgid="2617227194283720914">"Skicka e-post från det här kontot som standard"</string> - <string name="account_setup_options_notify_label" msgid="7046146571560728829">"Meddela mig när jag får e-post"</string> - <string name="account_setup_options_sync_contacts_label" msgid="276492345599531778">"Synkronisera kontakter från det här kontot"</string> - <string name="account_setup_options_sync_calendar_label" msgid="3222151135467189411">"Synkronisera kalendern från det här kontot"</string> - <string name="account_setup_options_sync_email_label" msgid="8585177128405004068">"Synkronisera e-post från det här kontot"</string> - <string name="account_setup_options_background_attachments_label" msgid="5247749298276451846">"Hämta bilagor automatiskt när enheten är ansluten till Wi-Fi"</string> - <string name="account_setup_failed_dlg_title" msgid="9083263347962940552">"Det gick inte att avsluta"</string> - <string name="account_setup_options_mail_window_label" msgid="7582247646138987328">"Dagar för synkronisering"</string> - <string name="account_setup_options_mail_window_auto" msgid="4188895354366183790">"Automatisk"</string> - <string name="account_setup_options_mail_window_1day" msgid="3965715241135811407">"En dag"</string> - <string name="account_setup_options_mail_window_3days" msgid="736181102295878114">"Tre dagar"</string> - <string name="account_setup_options_mail_window_1week" msgid="5639718031108023741">"En vecka"</string> - <string name="account_setup_options_mail_window_2weeks" msgid="4567049268124213035">"Två veckor"</string> - <string name="account_setup_options_mail_window_1month" msgid="5846359669750047081">"En månad"</string> - <string name="account_setup_options_mail_window_all" msgid="5372861827683632364">"Alla"</string> - <string name="account_setup_options_mail_window_default" msgid="8321351926520165832">"Använd standardinställning"</string> - <string name="account_setup_failed_dlg_auth_message" msgid="426627755590431364">"Användarnamnet eller lösenordet är felaktigt."</string> - <string name="account_setup_failed_dlg_auth_message_fmt" msgid="2081384892947238930">"Inloggningen misslyckades."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string> - <string name="account_setup_failed_dlg_certificate_message" msgid="3836152264696108805">"Det går inte att upprätta en säker anslutning till servern."</string> - <string name="account_setup_failed_dlg_certificate_message_fmt" msgid="2121921642915593041">"Det går inte att upprätta en säker anslutning till servern."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string> - <string name="account_setup_failed_certificate_required" msgid="2689944595775206006">"Ett klientcertifikat måste anges. Vill du ansluta till servern med ett klientcertifikat?"</string> - <string name="account_setup_failed_certificate_inaccessible" msgid="3563840279690749547">"Certifikatet är ogiltigt eller otillgängligt."</string> - <string name="account_setup_failed_check_credentials_message" msgid="6531658092540248067">"Servern svarade med ett fel. Kontrollera ditt användarnamn och lösenord och försök igen."</string> - <string name="account_setup_failed_dlg_server_message" msgid="4942810054116129684">"Det går inte att ansluta till servern."</string> - <string name="account_setup_failed_dlg_server_message_fmt" msgid="2525425638303883232">"Det går inte att ansluta till servern."\n"(<xliff:g id="ERROR">%s</xliff:g>)"</string> - <string name="account_setup_failed_tls_required" msgid="307030406688611327">"TLS krävs men stöds inte av servern."</string> - <string name="account_setup_failed_auth_required" msgid="6799839150250217566">"Servern stöder inte autentiseringsmetoderna."</string> - <string name="account_setup_failed_security" msgid="925820957665764964">"Det gick inte att ansluta till servern på grund av ett säkerhetsfel."</string> - <string name="account_setup_failed_ioerror" msgid="7802604687451830378">"Det gick inte att ansluta till servern."</string> - <string name="account_setup_failed_protocol_unsupported" msgid="4607759927226943569">"Du angav en felaktig serveradress eller så kräver servern en protokollversion som inte stöds av e-postklienten."</string> - <string name="account_setup_failed_access_denied" msgid="6835358740050287051">"Du är inte behörig att synkronisera med servern. Kontakta serverns administratör om du vill ha mer information."</string> - <string name="account_setup_security_required_title" msgid="1850321535870447468">"Fjärradministrera säkerhet"</string> - <string name="account_setup_security_policies_required_fmt" msgid="5410714107656671761">"Servern <xliff:g id="SERVER">%s</xliff:g> måste kunna fjärrkontrollera vissa säkerhetsfunktioner i din Android-enhet. Vill du slutföra konfigurationen av kontot?"</string> - <string name="account_setup_failed_security_policies_unsupported" msgid="3210264746877120355">"Den här servern kräver säkerhetsfunktioner som din Android-enhet inte stöder, inklusive: <xliff:g id="ERROR">%s</xliff:g>"</string> - <string name="account_setup_username_uneditable_error" msgid="1618869759801584109">"Det går inte att ändra användarnamnet för ett konto. Om du vill lägga till ett konto med ett annat användarnamn trycker du på Lägg till konto."</string> - <string name="disable_admin_warning" msgid="6196985268695592382">"VARNING! Om du inaktiverar e-postappens behörighet att administrera enheten raderas alla e-postkonton som behöver behörigheten. Även e-post, kontakter, kalenderhändelser och andra data raderas."</string> - <string name="account_security_dialog_title" msgid="430041952584831904">"Säkerhetsuppdatering"</string> - <string name="account_security_dialog_content_fmt" msgid="8843806143923278214">"Enligt <xliff:g id="ACCOUNT">%s</xliff:g> måste du uppdatera säkerhetsinställningarna."</string> - <string name="security_unsupported_ticker_fmt" msgid="5166579214529283975">"Det går inte att synkronisera kontot <xliff:g id="ACCOUNT">%s</xliff:g> på grund av säkerhetskrav."</string> - <string name="security_needed_ticker_fmt" msgid="2120499087897133665">"Säkerhetsinställningarna måste uppdateras för kontot <xliff:g id="ACCOUNT">%s</xliff:g>."</string> - <string name="security_changed_ticker_fmt" msgid="2609435447352755285">"Säkerhetsinställningarna ändrades för kontot <xliff:g id="ACCOUNT">%s</xliff:g>. Inga åtgärder krävs från användaren."</string> - <string name="security_notification_content_update_title" msgid="2429762903228690154">"Säkerhetsuppdatering krävs"</string> - <string name="security_notification_content_change_title" msgid="443490921895642130">"Säkerhetspolicyer har ändrats"</string> - <string name="security_notification_content_unsupported_title" msgid="7315219208043169233">"Säkerhetspolicy kan ej följas"</string> - <string name="account_security_title" msgid="3511543138560418587">"Säkerhet för enhet"</string> - <string name="account_security_policy_explanation_fmt" msgid="6932627044314460766">"Servern <xliff:g id="SERVER">%s</xliff:g> måste kunna fjärrkontrollera vissa säkerhetsfunktioner i din Android-enhet."</string> - <string name="account_setup_failed_dlg_edit_details_action" msgid="5355993309841479360">"Redigera information"</string> - <string name="password_expire_warning_ticker_fmt" msgid="2459977229180023773">"Enligt <xliff:g id="ACCOUNT">%s</xliff:g> måste du ändra PIN-kod eller lösenord till skärmlåset."</string> - <string name="password_expire_warning_content_title" msgid="7174669014074849304">"Skärmlösenordet går snart ut"</string> - <string name="password_expired_ticker" msgid="4230570412974108968">"PIN-koden eller lösenordet till skärmlåset har gått ut."</string> - <string name="password_expired_content_title" msgid="4349518706602252979">"Skärmlösenordet har gått ut"</string> - <string name="password_expire_warning_dialog_title" msgid="1687074175399798189">"Skärmlåslösenordet går ut inom kort"</string> - <string name="password_expire_warning_dialog_content_fmt" msgid="4293446611405084436">"Du måste ändra PIN-kod eller lösenord för skärmlåset snart, annars raderas data för kontot <xliff:g id="ACCOUNT">%s</xliff:g>. Vill du ändra nu?"</string> - <string name="password_expired_dialog_title" msgid="2186547998125938084">"Skärmlåslösenordet har gått ut"</string> - <string name="password_expired_dialog_content_fmt" msgid="6538210092073931079">"Alla data för <xliff:g id="ACCOUNT">%s</xliff:g> tas bort från enheten. Du kan återställa dem genom att ändra PIN-koden eller lösenordet för skärmlåset. Vill du göra det nu?"</string> - <string name="account_settings_exit_server_settings" msgid="8006323251094711431">"Vill du ignorera ändringar som inte har sparats?"</string> - <string name="account_settings_login_dialog_title" msgid="4024422579146302775">"Det gick inte att logga in."</string> - <string name="account_settings_login_dialog_content_fmt" msgid="8849649646111167377">"Användarnamnet eller lösenordet för <xliff:g id="ACCOUNT">%s</xliff:g> är felaktigt. Vill du uppdatera dem nu?"</string> - <string name="account_settings_login_dialog_reason_fmt" msgid="4266359321648406752">"Det gick inte att logga in på <xliff:g id="ACCOUNT">%s</xliff:g>. Servern svarade: <xliff:g id="REASON">%s</xliff:g> Vill du uppdatera ditt användarnamn och/eller ditt lösenord?"</string> - <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string> - <string name="account_settings_default_summary" msgid="1531901438624688482">"Skicka e-post från det här kontot som standard"</string> - <string name="account_settings_background_attachments_label" msgid="2980317599840958688">"Hämta bilagor"</string> - <string name="account_settings_background_attachments_summary" msgid="5954218549226189376">"Hämta automatiskt bilagor för de senaste meddelandena via Wi-Fi"</string> - <string name="account_settings_notify_label" msgid="1630001017303007974">"E-postaviseringar"</string> - <string name="account_settings_summary" msgid="8403582255413830007">"Synkroniseringsfrekvens, aviseringar osv."</string> - <string name="account_settings_notify_summary" msgid="8134339460923068254">"Skicka meddelande när du får e-post"</string> - <string name="account_settings_mail_check_frequency_label" msgid="8271462919214560616">"Intervall för e-postkontroll"</string> - <string name="account_settings_incoming_label" msgid="7858928031806297542">"Inkommande inställningar"</string> - <string name="account_settings_incoming_summary" msgid="2923044634831881068">"Användarnamn, lösenord och andra inkommande serverinställningar"</string> - <string name="account_settings_outgoing_label" msgid="4464829249980026745">"Utgående inställningar"</string> - <string name="account_settings_outgoing_summary" msgid="3572093624332724311">"Användarnamn, lösenord och andra utgående serverinställningar"</string> - <string name="account_settings_enforced_label" msgid="7429582254433588882">"Verkställda policyer"</string> - <string name="account_settings_enforced_summary" msgid="8140860420440447771">"Inga"</string> - <string name="account_settings_unsupported_label" msgid="1954091071454235577">"Policyer som inte stöds"</string> - <string name="account_settings_unsupported_summary" msgid="2107633813351863608">"Inga"</string> - <string name="account_settings_retry_label" msgid="1104680719299842829">"Synkroniseringsförsök"</string> - <string name="account_settings_retry_summary" msgid="2703599639846201913">"Tryck här för att synkronisera kontot"</string> - <string name="account_settings_description_label" msgid="8894815221204511715">"Kontonamn"</string> - <string name="account_settings_name_label" msgid="8186406122590008449">"Ditt namn"</string> - <string name="account_settings_signature_label" msgid="4091969938785803201">"Signatur"</string> - <string name="account_settings_edit_quick_responses_label" msgid="3106019627675996480">"Snabbsvar"</string> - <string name="account_settings_edit_quick_responses_summary" msgid="8056686122888722591">"Redigera text som du ofta infogar när du skriver e-post"</string> - <string name="account_settings_signature_hint" msgid="7262183168962779403">"Lägg till text i meddelanden som du skickar"</string> - <string name="account_settings_notifications" msgid="1042620094281375043">"Meddelandeinställningar"</string> - <string name="account_settings_data_usage" msgid="6669107430575866736">"Dataanvändning"</string> - <string name="account_settings_policies" msgid="6292833636418641840">"Säkerhetspolicyer"</string> - <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Redigera snabbsvar"</string> - <string name="save_action" msgid="1988862706623227093">"Spara"</string> - <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synkronisera kontakter"</string> - <string name="account_settings_sync_contacts_summary" msgid="816919452270997919">"Synkronisera kontakter för det här kontot"</string> - <string name="account_settings_sync_calendar_enable" msgid="6855333393468628003">"Synkronisera kalender"</string> - <string name="account_settings_sync_calendar_summary" msgid="7606340353079301703">"Synka kalenderhändelse för kontot"</string> - <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> - <string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Kontot <xliff:g id="ACCOUNT">%s</xliff:g> tas bort från E-post."</string> - <string name="account_settings_category_delete_account" msgid="5128545184407925226">"Ta bort konto"</string> - <string name="account_settings_delete_account_label" msgid="4889158717472601718">"Ta bort konto"</string> - <string name="mailbox_settings_activity_title" msgid="4705845931573373274">"Synkroniseringsalternativ"</string> - <string name="mailbox_settings_activity_title_with_mailbox" msgid="6485481250424219240">"Synkroniseringsalternativ ( <xliff:g id="MAILBOXX_NAME">%s</xliff:g> )"</string> - <string name="mailbox_preferences_header" msgid="9077316556563252246">"Synkroniseringsinställningar"</string> - <string name="mailbox_settings_mailbox_check_frequency_label" msgid="1246075442689328906">"Intervall för kontroll"</string> - <string name="mailbox_settings_mailbox_sync_window_label" msgid="2957945231022052672">"Dagar för synkronisering"</string> - <string name="account_shortcut_picker_name" msgid="1994861845225243190">"Epostkonto"</string> - <string name="account_shortcut_picker_title" msgid="1039929224016048015">"Välj ett konto"</string> - <string name="mailbox_shortcut_picker_title" msgid="4152973927804882131">"Välj en mapp"</string> - <string name="toast_account_not_found" msgid="8144242451730692816">"Kontot hittades inte. Det kan ha tagits bort."</string> - <string name="toast_mailbox_not_found" msgid="4960014581292378895">"Mappen hittades inte. Den kan ha tagits bort."</string> - <string name="provider_note_live" msgid="2995297671709325333">"POP-åtkomst, som gör att denna app kan ansluta, ingår bara i vissa pluskonton. Om det inte går att logga in med rätt e-postadress och lösenord kanske du inte har betalat för ett pluskonto. Öppna webbläsaren igen om du vill få åtkomst till dessa e-postkonton."</string> - <string name="provider_note_t_online" msgid="1630642061431427894">"Innan du skapar e-postkontot besöker du T-Onlines webbplats och skapar ett lösenord för POP3-åtkomst till e-post."</string> - <string name="exchange_name" msgid="1190783774800310346">"Företag"</string> - <string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string> - <string name="system_account_create_failed" msgid="3673792980526246177">"Det gick inte att skapa kontot. Försök igen."</string> - <string name="device_admin_label" msgid="8680224994637869414">"E-post"</string> - <string name="device_admin_description" msgid="426727923791430306">"Aktiverar serverangivna säkerhetsprinciper"</string> - <string name="gal_searching_fmt" msgid="6140450617663543464">"Söker <xliff:g id="DOMAIN">%s</xliff:g>…"</string> - <plurals name="gal_completed_fmt"> - <item quantity="one" msgid="7496785524617037642">"<xliff:g id="RESULTS">%1$d</xliff:g> resultat från <xliff:g id="DOMAIN">%2$s</xliff:g>"</item> - <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> resultat från <xliff:g id="DOMAIN">%2$s</xliff:g>"</item> - </plurals> - <string name="settings_activity_title" msgid="5185915603716333904">"Inställningar"</string> - <string name="header_label_general_preferences" msgid="8243724566056800991">"Allmänna inställningar"</string> - <string name="category_general_preferences" msgid="2742423840964045801">"App"</string> - <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Flytta automatiskt"</string> - <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Välj vilken skärm som ska visas när du tar bort ett meddelande"</string> - <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Dölj kryssrutor"</string> - <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"I samtalslistan trycker du länge om du vill markera"</string> - <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Bekräfta innan du tar bort"</string> - <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Meddelanden"</string> - <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Dra bort om du vill radera"</string> - <string name="general_preference_swipe_delete_summary" msgid="8436295841738696770">"Meddelanden"</string> - <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Bekräfta innan du skickar"</string> - <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Meddelanden"</string> - <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Flytta till"</string> - <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Nyare meddelande"</string> - <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Äldre meddelande"</string> - <string name="general_preference_auto_advance_message_list" msgid="7834069275897767359">"Meddelandelista"</string> - <string name="general_preference_text_zoom_label" msgid="4021955890499565713">"Storlek på text i meddelande"</string> - <string-array name="general_preference_text_zoom_summary_array"> - <item msgid="4693576184223089069">"Pytteliten text"</item> - <item msgid="4415205108584620118">"Liten text"</item> - <item msgid="4550219696381691112">"Normalstor text"</item> - <item msgid="6227813549949219991">"Stor text"</item> - <item msgid="1197917420815786571">"Jättestor text"</item> - </string-array> - <string name="general_preference_text_zoom_dialog_title" msgid="7446841758331151643">"Storlek på text i meddelande"</string> - <string name="general_preference_text_zoom_tiny" msgid="2948174583663330937">"Pytteliten"</string> - <string name="general_preference_text_zoom_small" msgid="6618520238223144876">"Liten"</string> - <string name="general_preference_text_zoom_normal" msgid="1765540147950855479">"Normal"</string> - <string name="general_preference_text_zoom_large" msgid="6874323663381586918">"Stor"</string> - <string name="general_preference_text_zoom_huge" msgid="4270503132355963031">"Jättestor"</string> - <string name="general_preference_reply_all_label" msgid="7806833609810003510">"Svara alla"</string> - <string name="general_preference_reply_all_summary" msgid="9191932552604733245">"Använd Svara alla som standard vid svar på meddelanden"</string> - <string name="general_preferences_clear_trusted_senders_title" msgid="507988226277210305">"Fråga om bilder ska visas"</string> - <string name="general_preferences_clear_trusted_senders_summary" msgid="2648501128162793879">"Bilder i meddelanden kommer inte att visas automatiskt"</string> - <string name="trusted_senders_cleared" msgid="4762002183756251723">"\"Visa bilder\" rensas."</string> - <string name="position_of_count" msgid="7989353140376877792">"<xliff:g id="ID_1">%1$d</xliff:g> av <xliff:g id="ID_2">%2$s</xliff:g>"</string> - <string name="waitinf_for_sync_message_1" msgid="1393719303955128036">"Väntar på synk"</string> - <string name="waitinf_for_sync_message_2" msgid="5656175205790694016">"Din e-post visas snart."</string> - <string name="widget_other_views" msgid="4988574907386539499">"Tryck för att ändra."</string> - <string name="widget_all_mail" msgid="4352573990283094963">"Kombinerad inkorg"</string> - <string name="widget_unread" msgid="4404711399009077833">"Olästa"</string> - <string name="widget_starred" msgid="8290352707134011791">"Stjärnmärkt"</string> - <string name="widget_loading" msgid="2340962056927255554">"Läser in..."</string> - <string name="widget_touch_to_configure" msgid="7062039013915225323">"Tryck här för att konfigurera."</string> - <string name="widget_no_accounts" msgid="2412482205591224408">"Du har ännu inte skapat ett e-postkonto."</string> - <string name="more_than_999" msgid="8704425397397918798">">999"</string> - <string name="search_hint" msgid="2200412192574686497">"Sök efter e-post"</string> - <string name="search_mailbox_hint" msgid="7854987729678942790">"Sök i <xliff:g id="ID_1">%1$s</xliff:g>"</string> - <string name="search_header_text_fmt" msgid="3857004638127418247">"Sökresultat för <xliff:g id="ID_1">%1$s</xliff:g>"</string> - <string name="search_slow_warning_title" msgid="2826118321880530239">"Väntar på resultat"</string> - <string name="search_slow_warning_message" msgid="8494483410797387903">"Vissa servrar kan ta lång tid."</string> - <string name="action_bar_mailbox_list_title" msgid="7484457755531286333">"Mappar"</string> - <string name="policy_dont_allow_camera" msgid="5744573062306937302">"Tillåt inte användning av kameran"</string> - <string name="policy_require_password" msgid="7177274900480984702">"Kräv lösenord för enheten"</string> - <string name="policy_password_history" msgid="5743544498302303181">"Begränsa återanvändning av lösenord"</string> - <string name="policy_password_expiration" msgid="1248123255253649199">"Kräv att lösenord upphör att gälla"</string> - <string name="policy_screen_timeout" msgid="414869965358468080">"Kräv låst skärm på inaktiva enheter"</string> - <string name="policy_calendar_age" msgid="627405158087482302">"Begränsa antalet kalenderhändelser som synkas"</string> - <string name="policy_email_age" msgid="7144148367145424963">"Begränsa antalet e-postmeddelanden som synkas"</string> - <string name="quick_1" msgid="3426057697353380951">"Tack!"</string> - <string name="quick_2" msgid="4188036352885736617">"Låter bra!"</string> - <string name="quick_3" msgid="8061819976353395585">"Jag läser detta senare och återkommer till dig."</string> - <string name="quick_4" msgid="3988974084396883051">"Vi kan diskutera detta på ett möte."</string> - <string name="require_manual_sync_message" msgid="7777357288642785955">"Bakgrundssynkronisering för det här kontot har inaktiverats vid roaming."</string> - <string name="confirm_response" msgid="9151965975158906286">"Skickar svar ..."</string> - <string name="no_conversations" msgid="5559527390337162819">"Inga meddelanden."</string> - <string name="imap2_name" msgid="2742745881421883233">"Push för IMAP"</string> - <string name="folder_picker_title" msgid="5213735893918108637">"Svårt att välja?"</string> - <string name="trash_folder_selection_title" msgid="8287461989726013461">"Välj servermapp f. papperskorg"</string> - <string name="sent_folder_selection_title" msgid="3868598259968276968">"Välj servermapp för skickat"</string> - <string name="create_new_folder" msgid="2726544180243210741">"Skapa mapp"</string> -</resources> diff --git a/res/values-sv/uploader.xml b/res/values-sv/uploader.xml deleted file mode 100644 index f3b3b1ee7..000000000 --- a/res/values-sv/uploader.xml +++ /dev/null @@ -1,137 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Copyright 2009 Google Inc. All Rights Reserved. --> - -<resources xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="application_name" msgid="7812006268714926951">"Direktöverföring"</string> - <string name="picasa_default_destination" msgid="2052406684123992574">"Album för direktöverföring"</string> - <string name="summary_title_uploading" msgid="3357617474017589370">"Överför"</string> - <string name="summary_title_finished" msgid="7775292294989807025">"Slutförda"</string> - <string name="summary_title_paused" msgid="8936561302881926595">"Pausad"</string> - <string name="summary_subtitle_uploading_format" msgid="8787409179557302869">"%1$d%% • %2$d foton • %3$d videor"</string> - <string name="summary_subtitle_counts_format" msgid="7867903205999702138">"%1$d foton • %2$d videor"</string> - <string name="summary_subtitle_paused_low_battery" msgid="7030423720574078362">"svagt batteri"</string> - <string name="summary_subtitle_paused_photos_quota" msgid="3057279018089658614">"bildkvoten har överskridits"</string> - <string name="summary_subtitle_paused_roaming" msgid="974863046888934062">"roaming"</string> - <string name="summary_subtitle_paused_need_wifi" msgid="2264018871872109546">"väntar på Wi-Fi"</string> - <string name="summary_subtitle_paused_need_charger" msgid="3256171133661659691">"fördröjs tills laddaren ansluts"</string> - <string name="summary_subtitle_paused_need_network" msgid="1922651711990030201">"väntar på anslutning"</string> - <string name="summary_subtitle_paused_retry_format" msgid="3851931944505090119">"försöker igen om %s"</string> - <string name="summary_menu_show_pending" msgid="658361192495996">"Visa väntande överföringar"</string> - <string name="summary_menu_show_finished" msgid="8544099132633066086">"Visa slutförda överföringar"</string> - <string name="menu_view_online" msgid="6546633605818509942">"Visa online"</string> - <string name="menu_show_pending_items" msgid="8798191388238604213">"Visa väntande överföringar"</string> - <string name="menu_hide_pending_items" msgid="9216079748638469160">"Dölj väntande överföringar"</string> - <string name="menu_show_completed_items" msgid="4380487776635859783">"Visa detaljer"</string> - <string name="menu_hide_completed_items" msgid="6126007571523662799">"Dölj detaljer"</string> - <string name="menu_settings" msgid="5088116127086866634">"Inställningar"</string> - <string name="format_date_uploaded" msgid="803752037646090928">"Överförde %s"</string> - <string name="format_progress_percent" msgid="4347398038122210157">"<xliff:g id="NUMBER">%d</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string> - <string name="account" msgid="5199161365824352613">"Konto"</string> - <string name="upload" msgid="2615541458361216022">"Överför"</string> - <string name="ok" msgid="2516349681897895312">"OK"</string> - <string name="cancel" msgid="1207103189404543868">"Avbryt"</string> - <string name="uploading_to" msgid="3986362895940069510">"Överför till "<b>"%s"</b></string> - <string name="uploading_for" msgid="1735961974624867111">" för "<b>"%s"</b></string> - <string name="destination_format" msgid="7472552212462849956">"%1$s \"%2$s\""</string> - <string name="toast_intent_error" msgid="6164928822619692280">"Det gick inte att initiera överföringen."</string> - <string name="toast_file_error" msgid="1315722681020841350">"Filen är inte tillgänglig."</string> - <string name="account_error" msgid="1904775271866104941">"Det gick inte att ta emot kontoinformation."</string> - <string name="toast_failed_auth" msgid="2196450105656960566">"Ett problem uppstod när du skulle logga in på ditt konto."</string> - <string name="upload_state_queued" msgid="3990598443227105526"></string> - <string name="upload_state_waiting_retry" msgid="471790705731784779">"Väntar på nytt försök"</string> - <string name="upload_state_waiting_wifi" msgid="234662717256366625">"Väntar på Wi-Fi"</string> - <string name="upload_state_uploading" msgid="82854465974176047">"Överförs"</string> - <string name="upload_state_failed" msgid="3799932718800848294">"Misslyckades"</string> - <string name="upload_state_completed" msgid="5638163990418071018">"Slutförd"</string> - <string name="pause_state_running" msgid="711411177620353982">"överför"</string> - <string name="pause_state_manually_paused" msgid="4837627990158796573">"manuellt pausad"</string> - <string name="pause_state_low_battery" msgid="3154677586511229063">"pausad – svagt batteri"</string> - <string name="pause_state_need_charger" msgid="5014741655713255815">"pausad – fördröjs tills laddaren ansluts"</string> - <string name="pause_state_need_connectivity" msgid="338696137467815955">"pausad – väntar på anslutning"</string> - <string name="pause_state_need_photos_quota" msgid="4026149712680343993">"pausad - utanför PWA-kvot"</string> - <string name="pause_state_need_wifi" msgid="231858819136516913">"pausad – väntar på Wi-Fi"</string> - <string name="pause_state_roaming" msgid="1811348200068311099">"pausad – roaming"</string> - <string name="pause_state_retrying" msgid="3734440128828177639">"väntar på nytt försök"</string> - <string name="retry_in_1min" msgid="2242454935194420914">"1 minut"</string> - <string name="retry_in_2min" msgid="5845688527405283031">"2 minuter"</string> - <string name="retry_in_5min" msgid="3153220715959570358">"5 minuter"</string> - <string name="retry_no_data" msgid="630347885498641534">"Ingen dataanslutning"</string> - <string name="account_out_of_quota" msgid="1849612079678906607">"Kontots diskkvot är slut"</string> - <string name="completed_no_file" msgid="6719715000947601844">"Filen hittades inte"</string> - <string name="failed_bad_response" msgid="8357723053952213242">"Fel på tjänsten"</string> - <string name="failed_network_error" msgid="2531660472217573602">"Nätverksfel"</string> - <string name="failed_server_auth" msgid="2428208784689362254">"Autentiseringen misslyckades"</string> - <string name="manager_list_switcher_pending_format" msgid="3517166351274747172">"Väntande överföringar [%d]"</string> - <string name="manager_list_switcher_completed_format" msgid="4700366545949687846">"Slutförda överföringar [%d]"</string> - <string name="manager_pause" msgid="7046645023617816964">"Pausa överföringar"</string> - <string name="manager_resume" msgid="1608630525599824933">"Återuppta överföring"</string> - <string name="manager_upload_now" msgid="2284408578936376342">"Överför nu"</string> - <string name="manager_upload_later" msgid="5453932124711705632">"Överför senare"</string> - <string name="manager_do_not_upload" msgid="1934417351195364210">"Överför inte"</string> - <string name="manager_view_media" msgid="3714544539986850549">"Visa"</string> - <string name="manager_retry" msgid="939534318469518843">"Försök igen"</string> - <string name="manager_toast_canceled" msgid="2331820022556147571">"Överföringen har avbrutits"</string> - <string name="manager_toast_not_canceled" msgid="4274246237708259185">"Överföringen är redan slutförd"</string> - <string name="manager_sync_all" msgid="5207146576940014345">"Synka alla"</string> - <string name="manager_activity_last_sync_format" msgid="3521722786363963155">"Senaste synkroniseringen:"\n"%1$s"\n"%2$s"</string> - <string name="finished_empty" msgid="689924777356099393">"Listan över slutförda objekt är tom."</string> - <string name="notify_uploads" msgid="8593982942665493037">"Direktöverföring"</string> - <string name="notify_resolved" msgid="8111194870485485674">"Överföring slutförd"</string> - <string name="notify_paused" msgid="3999817913227671338">"Paus i överföringen"</string> - <string name="notify_activation_reminder" msgid="1639234651193843030">"Direktöverföring har inte aktiverats än"</string> - <string name="dialog_first_wifi" msgid="4318047428346248089">"Stora videoklipp överförs bara via en Wi-Fi-anslutning."</string> - <string name="dialog_sync_all_scanning" msgid="3175935645776839524">"Söker efter filer ..."</string> - <string name="dialog_sync_all_preparing" msgid="1666557491871126684">"<xliff:g id="PHOTOCOUNT">%1$d</xliff:g> foton och <xliff:g id="VIDEOCOUNT">%2$d</xliff:g> videor förbereds för överföring ..."</string> - <string name="dialog_sync_all_found_none" msgid="4066988191364416995">"Inga fler foton/videoklipp behöver överföras."</string> - <string name="dialog_sync_all_server_error" msgid="2177063494820815086">"Det gick inte att kontakta servern. Försök igen senare."</string> - <string name="dialog_sync_all_canceled" msgid="2595386304244274687">"Synka alla avbröts"</string> - <string name="dialog_sync_all_error_title" msgid="6227689508729774372">"Synka alla"</string> - <string name="manager_view_completed" msgid="5119780300858727185">"Visa slutförda"</string> - <string name="manager_view_pending" msgid="4403346072556950609">"Visa väntande"</string> - <string name="preference_category_title_general" msgid="330919434495694575">"Allmänt"</string> - <string name="preference_title_pause_all_uploads" msgid="4188909974244266321">"Pausa alla överföringar"</string> - <string name="preference_title_need_power" msgid="9165152026296632685">"Ladda"</string> - <string name="preference_summary_need_power" msgid="1829578224249216151">"Överför endast när telefonen laddas."</string> - <string name="preference_title_need_wifi" msgid="2398468701949227352">"Wi-Fi"</string> - <string name="preference_summary_need_wifi" msgid="4627730244549568487">"Överför endast när Wi-Fi är tillgängligt."</string> - <string name="preference_category_title_photos" msgid="8558221017057440259">"Foton"</string> - <string name="preference_title_photos_account" msgid="1235191190019405102">"Konto"</string> - <string name="preference_title_photos_upload_connectivity" msgid="8026800699913042033">"Villkor för överföring"</string> - <string name="preference_title_photo_size" msgid="2291608017215972660">"Fotostorlek"</string> - <string name="preference_category_title_videos" msgid="8962400910793075570">"Videor"</string> - <string name="preference_title_videos_account" msgid="6675545508568161301">"Konto"</string> - <string name="preference_title_videos_account_summary" msgid="2925385281151195648">"Kontot för foton används vid överföring av videoklipp."</string> - <string name="preference_title_videos_upload_connectivity" msgid="4029897303763182477">"Villkor för överföring"</string> - <string name="preference_title_videos_upload_connectivity_summary" msgid="2228943790654186152">"Anslutningsinställningarna för foton används för närvarande."</string> - <string name="preference_mobile_data_usage_for_photos_only" msgid="8047534381344601018">"Foton endast via mobila nätverk"</string> - <string name="preference_mobile_data_usage_for_all_media" msgid="4228623171763750182">"Överför bilder och videor via mobila nätverk"</string> - <string name="preference_mobile_data_usage_never" msgid="4887062654163669480">"Bilder och videor endast via Wi-Fi"</string> - <string name="preference_category_title_about" msgid="3001183168471659844">"Om"</string> - <string name="preference_title_camera_sync_version" msgid="1590760570503808392">"Direktöverföring, v."</string> - <string name="photos_upload_dimension_1600" msgid="2261848079760937674">"Rekommenderas: 1600 pixlar (för delning, utskrifter och skärmsläckare)"</string> - <string name="photos_upload_dimension_original" msgid="6807552546029109517">"Ursprunglig storlek (långsam överföring)"</string> - <string name="pause_state_need_media" msgid="3849758767808306320">"pausad – SD-kortet är inte tillgängligt"</string> - <string name="summary_subtitle_paused_need_media" msgid="8674787576306211689">"SD-kortet är inte tillgängligt"</string> - <string name="preference_plus_title" msgid="8505499389432915393">"Direktöverf.inst."</string> - <string name="preference_plus_enable_cs" msgid="8946492352805623630">"Direktöverföring"</string> - <string name="preference_plus_enable_cs_summary" msgid="8412139973136041010">"Överför nya bilder och videor till ett privat webbalbum automatiskt"</string> - <string name="preference_plus_upload_status" msgid="7925576302519589779">"Överföringsstatus"</string> - <string name="preference_plus_category_advanced" msgid="1159923217131890712">"Avancerat"</string> - <string name="preference_plus_mobile_data_connection" msgid="5368391437581896915">"Mobilöverföringar"</string> - <string name="preference_plus_sync_while_roaming" msgid="137428136220746649">"Överföring vid roaming"</string> - <string name="preference_plus_sync_while_roaming_summary" msgid="358436280727344717">"Överför bilder och videor under roaming"</string> - <string name="preference_plus_delay_sync_until_charging" msgid="2327042451671101467">"Batteriladdning"</string> - <string name="preference_plus_delay_sync_until_charging_summary" msgid="8613924819421248445">"Överför bilder och videor endast när batteriet laddas"</string> - <string name="preference_plus_sync_all" msgid="2563137874388611459">"Överför befintliga foton"</string> - <string name="preference_plus_sync_all_description" msgid="2789041515679642463">"Överför alla befintliga bilder och videor från telefonen nu"</string> - <string name="summary_subtitle_disabled" msgid="8964378166312900703">"Inaktiverad"</string> - <string name="preference_summary_header_format" msgid="8850267704647137239">"%1$s: %2$s"</string> - <string name="preference_summary_uploading_percent" msgid="3266958005329832043">"Överför (%1$d%%)"</string> - <string name="preference_summary_uploading_format" msgid="6092575579212954671">": %1$d av %2$d"</string> - <string name="preference_summary_uploading_paused" msgid="2413016492323452882">"Pausad: Tryck om du vill återuppta överföringen."</string> - <string name="preference_plus_sync_all_prompt_title" msgid="7677605572146032195">"Överför befintliga foton"</string> - <string name="preference_plus_sync_all_prompt_text" msgid="2215794846784161524">"Det kan ta en stund att överföra foton och videor som inte redan har överförts från mobilen till ett privat album på webben, men det sker i bakgrunden. Vill du fortsätta?"</string> - <string name="preference_plus_sync_all_prompt_yes" msgid="4844977073896196919">"Ja"</string> - <string name="preference_plus_sync_all_prompt_no" msgid="4216190537695947368">"Nej"</string> -</resources> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 74db9d5be..26e2f8e38 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -25,6 +25,7 @@ <attr name="protocol" format="string"/> <attr name="name" format="string"/> <attr name="accountType" format="string"/> + <attr name="replaceWith" format="string"/> <attr name="serviceClass" format="string"/> <attr name="intent" format="string"/> <attr name="port" format="integer"/> diff --git a/res/xml/services.xml b/res/xml/services.xml index 6203ebf01..0629859c6 100644 --- a/res/xml/services.xml +++ b/res/xml/services.xml @@ -65,16 +65,17 @@ email:inferPrefix="pop" /> <emailservice - email:protocol="imap" + email:protocol="imap2" email:name="IMAP" - email:accountType="com.android.email" - email:serviceClass="com.android.email.service.ImapService" + email:accountType="com.android.imap2" + email:serviceClass="com.android.email.imap2.Imap2SyncManager" email:port="143" email:portSsl="993" - email:syncIntervalStrings="@array/account_settings_check_frequency_entries" - email:syncIntervals="@array/account_settings_check_frequency_values" - email:defaultSyncInterval="mins15" + email:syncIntervalStrings="@array/account_settings_check_frequency_entries_push" + email:syncIntervals="@array/account_settings_check_frequency_values_push" + email:defaultSyncInterval="push" + email:offerLookback="true" email:offerTls="true" email:usesSmtp="true" email:offerAttachmentPreload="true" @@ -104,22 +105,8 @@ email:syncCalendar="true" /> <emailservice - email:protocol="imap2" - email:name="Push IMAP" - email:accountType="com.android.imap2" - email:intent="com.android.email.IMAP2_INTENT" - email:port="143" - email:portSsl="993" - email:syncIntervalStrings="@array/account_settings_check_frequency_entries_push" - email:syncIntervals="@array/account_settings_check_frequency_values_push" - email:defaultSyncInterval="push" - - email:offerLookback="true" - email:offerTls="true" - email:usesSmtp="true" - email:offerAttachmentPreload="true" - email:offerPrefix="true" - email:syncChanges="true" - email:inferPrefix="imap" + email:protocol="imap" + email:accountType="com.android.email" + email:replaceWith="imap2" /> </emailservices> diff --git a/imap2/res/xml/syncadapter_email.xml b/res/xml/syncadapter_imap2.xml index 278f4ad4e..278f4ad4e 100644 --- a/imap2/res/xml/syncadapter_email.xml +++ b/res/xml/syncadapter_imap2.xml diff --git a/imap2/src/com/android/imap2/AttachmentLoader.java b/src/com/android/email/imap2/AttachmentLoader.java index e00c23478..2e776be29 100644 --- a/imap2/src/com/android/imap2/AttachmentLoader.java +++ b/src/com/android/email/imap2/AttachmentLoader.java @@ -13,17 +13,17 @@ * limitations under the License. */ -package com.android.imap2; +package com.android.email.imap2; import android.content.Context; import android.os.RemoteException; +import com.android.email.imap2.Imap2SyncService.Connection; import com.android.emailcommon.provider.EmailContent.Attachment; import com.android.emailcommon.provider.EmailContent.Message; import com.android.emailcommon.service.EmailServiceStatus; import com.android.emailsync.PartRequest; import com.android.emailcommon.utility.AttachmentUtilities; -import com.android.imap2.Imap2SyncService.Connection; import com.android.mail.providers.UIProvider; import org.apache.james.mime4j.decoder.Base64InputStream; diff --git a/imap2/src/com/android/imap2/EmailSyncAdapterService.java b/src/com/android/email/imap2/EmailSyncAdapterService.java index d3a530d14..4366d0f96 100644 --- a/imap2/src/com/android/imap2/EmailSyncAdapterService.java +++ b/src/com/android/email/imap2/EmailSyncAdapterService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.imap2; +package com.android.email.imap2; import com.android.emailcommon.provider.EmailContent; import com.android.emailcommon.provider.EmailContent.AccountColumns; diff --git a/imap2/src/com/android/imap2/Imap2SyncManager.java b/src/com/android/email/imap2/Imap2SyncManager.java index 564e4218e..e52ee339a 100644 --- a/imap2/src/com/android/imap2/Imap2SyncManager.java +++ b/src/com/android/email/imap2/Imap2SyncManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.imap2; +package com.android.email.imap2; import android.content.ContentResolver; import android.content.ContentUris; @@ -45,6 +45,7 @@ import com.android.emailcommon.service.SearchParams; import com.android.emailsync.AbstractSyncService; import com.android.emailsync.PartRequest; import com.android.emailsync.SyncManager; +import com.android.email.R; import com.android.mail.providers.UIProvider; import com.android.mail.providers.UIProvider.AccountCapabilities; import com.android.mail.providers.UIProvider.LastSyncResult; @@ -61,6 +62,11 @@ public class Imap2SyncManager extends SyncManager { private static final EmailServiceCallback sCallbackProxy = new EmailServiceCallback(mCallbackList); + private Intent mIntent; + + private static final String IMAP2_ACCOUNT_TYPE = "com.android.imap2"; + private static final String PROTOCOL = "imap2"; + /** * Create our EmailService implementation here. */ @@ -319,12 +325,15 @@ public class Imap2SyncManager extends SyncManager { @Override public String getAccountManagerType() { - return "com.android.imap2"; + return IMAP2_ACCOUNT_TYPE; } @Override - public String getServiceIntentAction() { - return "com.android.email.IMAP2_INTENT"; + public Intent getServiceIntent() { + if (mIntent == null) { + mIntent = new Intent(this, Imap2SyncManager.class); + } + return mIntent; } @Override @@ -335,7 +344,7 @@ public class Imap2SyncManager extends SyncManager { @Override protected void runAccountReconcilerSync(Context context) { alwaysLog("Reconciling accounts..."); - new AccountServiceProxy(context).reconcileAccounts("imap2", getAccountManagerType()); + new AccountServiceProxy(context).reconcileAccounts(PROTOCOL, getAccountManagerType()); } @Override diff --git a/imap2/src/com/android/imap2/Imap2SyncService.java b/src/com/android/email/imap2/Imap2SyncService.java index 75566c80a..65a55b4c6 100644 --- a/imap2/src/com/android/imap2/Imap2SyncService.java +++ b/src/com/android/email/imap2/Imap2SyncService.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.android.imap2; +package com.android.email.imap2; import android.content.ContentProviderOperation; import android.content.ContentProviderOperation.Builder; @@ -29,6 +29,7 @@ import android.os.Bundle; import android.os.RemoteException; import android.util.Log; +import com.android.email.imap2.smtp.SmtpSender; import com.android.emailcommon.Logging; import com.android.emailcommon.TrafficFlags; import com.android.emailcommon.internet.MimeUtility; @@ -61,7 +62,6 @@ import com.android.emailsync.AbstractSyncService; import com.android.emailsync.PartRequest; import com.android.emailsync.Request; import com.android.emailsync.SyncManager; -import com.android.imap2.smtp.SmtpSender; import com.android.mail.providers.UIProvider; import com.beetstra.jutf7.CharsetProvider; import com.google.common.annotations.VisibleForTesting; @@ -1169,6 +1169,7 @@ public class Imap2SyncService extends AbstractSyncService { final Cursor unloaded = mResolver.query(Message.CONTENT_URI, Message.CONTENT_PROJECTION, MessageColumns.FLAG_LOADED + "=" + Message.FLAG_LOADED_UNLOADED, null, MessageColumns.TIMESTAMP + " desc"); + if (unloaded == null) return; int cnt = unloaded.getCount(); // If there aren't any, we're done if (cnt > 0) { @@ -1182,11 +1183,15 @@ public class Imap2SyncService extends AbstractSyncService { mBodyThread.start(); userLog("***** Starting mBodyThread " + mBodyThread.getId()); } else { + // fetchMessageData closes the cursor fetchMessageData(mConnection, unloaded); } } else { + // fetchMessageData closes the cursor fetchMessageData(mConnection, unloaded); } + } else { + unloaded.close(); } } diff --git a/imap2/src/com/android/imap2/ImapId.java b/src/com/android/email/imap2/ImapId.java index 5c9085c44..47c7431d7 100644 --- a/imap2/src/com/android/imap2/ImapId.java +++ b/src/com/android/email/imap2/ImapId.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.imap2; +package com.android.email.imap2; import android.content.Context; import android.os.Build; diff --git a/imap2/src/com/android/imap2/ImapInputStream.java b/src/com/android/email/imap2/ImapInputStream.java index 1730a117d..9fe080900 100644 --- a/imap2/src/com/android/imap2/ImapInputStream.java +++ b/src/com/android/email/imap2/ImapInputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.imap2; +package com.android.email.imap2; import java.io.FilterInputStream; import java.io.IOException; diff --git a/imap2/src/com/android/imap2/Parser.java b/src/com/android/email/imap2/Parser.java index 101f0c558..239298ede 100644 --- a/imap2/src/com/android/imap2/Parser.java +++ b/src/com/android/email/imap2/Parser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.imap2; +package com.android.email.imap2; import java.util.ArrayList; diff --git a/imap2/src/com/android/imap2/QuotedPrintable.java b/src/com/android/email/imap2/QuotedPrintable.java index 6171d9224..54885e950 100644 --- a/imap2/src/com/android/imap2/QuotedPrintable.java +++ b/src/com/android/email/imap2/QuotedPrintable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.imap2; +package com.android.email.imap2; public class QuotedPrintable { static public String toString (String str) { diff --git a/imap2/src/com/android/imap2/SearchRequest.java b/src/com/android/email/imap2/SearchRequest.java index 1b9976a85..fc1e52bb7 100644 --- a/imap2/src/com/android/imap2/SearchRequest.java +++ b/src/com/android/email/imap2/SearchRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.imap2; +package com.android.email.imap2; import com.android.emailcommon.provider.EmailContent.Message; import com.android.emailcommon.service.SearchParams; diff --git a/imap2/src/com/android/imap2/smtp/MailTransport.java b/src/com/android/email/imap2/smtp/MailTransport.java index 7f6cedce5..2dd80c40d 100644 --- a/imap2/src/com/android/imap2/smtp/MailTransport.java +++ b/src/com/android/email/imap2/smtp/MailTransport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.imap2.smtp; +package com.android.email.imap2.smtp; import com.android.emailcommon.Logging; import com.android.emailcommon.mail.CertificateValidationException; diff --git a/imap2/src/com/android/imap2/smtp/SmtpSender.java b/src/com/android/email/imap2/smtp/SmtpSender.java index c8bdf43a3..a90aea649 100644 --- a/imap2/src/com/android/imap2/smtp/SmtpSender.java +++ b/src/com/android/email/imap2/smtp/SmtpSender.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.imap2.smtp; +package com.android.email.imap2.smtp; import android.content.Context; import android.util.Base64; diff --git a/src/com/android/email/service/EmailServiceUtils.java b/src/com/android/email/service/EmailServiceUtils.java index d44d9697d..ec0850db2 100644 --- a/src/com/android/email/service/EmailServiceUtils.java +++ b/src/com/android/email/service/EmailServiceUtils.java @@ -16,22 +16,35 @@ package com.android.email.service; +import android.accounts.AccountManager; +import android.accounts.AccountManagerFuture; +import android.accounts.AuthenticatorException; +import android.accounts.OperationCanceledException; import android.app.Service; +import android.content.ContentResolver; +import android.content.ContentUris; +import android.content.ContentValues; import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; +import android.database.Cursor; +import android.net.Uri; import android.os.Bundle; import android.os.IBinder; import android.os.RemoteException; +import android.provider.CalendarContract; +import android.provider.ContactsContract; import android.util.Log; import com.android.email.R; import com.android.emailcommon.Api; import com.android.emailcommon.Logging; import com.android.emailcommon.provider.Account; +import com.android.emailcommon.provider.EmailContent; import com.android.emailcommon.provider.HostAuth; +import com.android.emailcommon.provider.EmailContent.AccountColumns; import com.android.emailcommon.service.EmailServiceProxy; import com.android.emailcommon.service.IEmailService; import com.android.emailcommon.service.IEmailServiceCallback; @@ -202,11 +215,110 @@ public class EmailServiceUtils { } } + private static void finishAccountManagerBlocker(AccountManagerFuture<?> future) { + try { + // Note: All of the potential errors are simply logged + // here, as there is nothing to actually do about them. + future.getResult(); + } catch (OperationCanceledException e) { + Log.w(Logging.LOG_TAG, e.toString()); + } catch (AuthenticatorException e) { + Log.w(Logging.LOG_TAG, e.toString()); + } catch (IOException e) { + Log.w(Logging.LOG_TAG, e.toString()); + } + } + + /** + * "Change" the account manager type of the account; this entails deleting the account + * and adding a new one. We can't call into AccountManager on the UI thread, but we might + * well be on it (currently no clean way of guaranteeing that we're not). + * + * @param context the caller's context + * @param amAccount the AccountManager account we're changing + * @param newType the new AccountManager type for this account + * @param newProtocol the protocol now being used + */ + private static void updateAccountManagerType(final Context context, + final android.accounts.Account amAccount, final String newType, + final String newProtocol) { + // STOPSHIP There must be a better way + Thread amThread = new Thread(new Runnable() { + @Override + public void run() { + updateAccountManagerTypeImpl(context, amAccount, newType, newProtocol); + }}); + amThread.start(); + } + + private static void updateAccountManagerTypeImpl(Context context, + android.accounts.Account amAccount, String newType, String newProtocol) { + ContentResolver resolver = context.getContentResolver(); + Cursor c = resolver.query(Account.CONTENT_URI, Account.CONTENT_PROJECTION, + AccountColumns.EMAIL_ADDRESS + "=?", new String[] { amAccount.name }, null); + // That's odd, isn't it? + if (c == null) return; + try { + if (c.moveToNext()) { + Log.w(Logging.LOG_TAG, "Converting " + amAccount.name + " to " + newProtocol); + // Get the EmailProvider Account/HostAuth + Account account = new Account(); + account.restore(c); + HostAuth hostAuth = + HostAuth.restoreHostAuthWithId(context, account.mHostAuthKeyRecv); + if (hostAuth == null) return; + + ContentValues accountValues = new ContentValues(); + int oldFlags = account.mFlags; + + // Mark the provider account incomplete so it can't get reconciled away + account.mFlags |= Account.FLAGS_INCOMPLETE; + accountValues.put(AccountColumns.FLAGS, account.mFlags); + Uri accountUri = ContentUris.withAppendedId(Account.CONTENT_URI, account.mId); + resolver.update(accountUri, accountValues, null, null); + + // Change the HostAuth to reference the new protocol; this has to be done before + // trying to create the AccountManager account (below) + ContentValues hostValues = new ContentValues(); + hostValues.put(HostAuth.PROTOCOL, newProtocol); + resolver.update(ContentUris.withAppendedId(HostAuth.CONTENT_URI, hostAuth.mId), + hostValues, null, null); + + try { + // Get current settings for the existing AccountManager account + boolean email = ContentResolver.getSyncAutomatically(amAccount, + EmailContent.AUTHORITY); + boolean contacts = ContentResolver.getSyncAutomatically(amAccount, + ContactsContract.AUTHORITY); + boolean calendar = ContentResolver.getSyncAutomatically(amAccount, + CalendarContract.AUTHORITY); + + // Delete the AccountManager account + AccountManagerFuture<?> amFuture = AccountManager.get(context) + .removeAccount(amAccount, null, null); + finishAccountManagerBlocker(amFuture); + + // Set up a new AccountManager account with new type and old settings + amFuture = MailService.setupAccountManagerAccount(context, account, email, + calendar, contacts, null); + finishAccountManagerBlocker(amFuture); + Log.w(Logging.LOG_TAG, "Conversion complete!"); + } finally { + // Clear the incomplete flag on the provider account + accountValues.put(AccountColumns.FLAGS, oldFlags); + resolver.update(accountUri, accountValues, null, null); + } + } + } finally { + c.close(); + } + } + /** * Parse services.xml file to find our available email services */ @SuppressWarnings("unchecked") - private static void findServices(Context context) { + private static synchronized void findServices(Context context) { try { Resources res = context.getResources(); XmlResourceParser xml = res.getXml(R.xml.services); @@ -218,10 +330,27 @@ public class EmailServiceUtils { EmailServiceInfo info = new EmailServiceInfo(); TypedArray ta = res.obtainAttributes(xml, R.styleable.EmailServiceInfo); info.protocol = ta.getString(R.styleable.EmailServiceInfo_protocol); + info.accountType = ta.getString(R.styleable.EmailServiceInfo_accountType); + // Handle upgrade of one protocol to another (e.g. imap to imap2) + String newProtocol = ta.getString(R.styleable.EmailServiceInfo_replaceWith); + if (newProtocol != null) { + EmailServiceInfo newInfo = getServiceInfo(context, newProtocol); + if (newInfo == null) { + throw new IllegalStateException( + "Replacement service not found: " + newProtocol); + } + AccountManager am = AccountManager.get(context); + android.accounts.Account[] amAccounts = + am.getAccountsByType(info.accountType); + for (android.accounts.Account amAccount: amAccounts) { + updateAccountManagerType(context, amAccount, newInfo.accountType, + newProtocol); + } + continue; + } info.name = ta.getString(R.styleable.EmailServiceInfo_name); String klass = ta.getString(R.styleable.EmailServiceInfo_serviceClass); info.intentAction = ta.getString(R.styleable.EmailServiceInfo_intent); - info.accountType = ta.getString(R.styleable.EmailServiceInfo_accountType); info.defaultSsl = ta.getBoolean(R.styleable.EmailServiceInfo_defaultSsl, false); info.port = ta.getInteger(R.styleable.EmailServiceInfo_port, 0); info.portSsl = ta.getInteger(R.styleable.EmailServiceInfo_portSsl, 0); diff --git a/src/com/android/email/service/MailService.java b/src/com/android/email/service/MailService.java index 48cf9d2aa..cc99789aa 100644 --- a/src/com/android/email/service/MailService.java +++ b/src/com/android/email/service/MailService.java @@ -18,6 +18,7 @@ package com.android.email.service; import android.accounts.AccountManager; import android.accounts.AccountManagerCallback; +import android.accounts.AccountManagerFuture; import android.app.Service; import android.content.Context; import android.content.Intent; @@ -138,12 +139,14 @@ public class MailService extends Service { providerContext); } - public static void setupAccountManagerAccount(Context context, Account account, - boolean email, boolean calendar, boolean contacts, + public static AccountManagerFuture<Bundle> setupAccountManagerAccount(Context context, + Account account, boolean email, boolean calendar, boolean contacts, AccountManagerCallback<Bundle> callback) { Bundle options = new Bundle(); HostAuth hostAuthRecv = HostAuth.restoreHostAuthWithId(context, account.mHostAuthKeyRecv); - if (hostAuthRecv == null) return; + if (hostAuthRecv == null) { + return null; + } // Set up username/password options.putString(EasAuthenticatorService.OPTIONS_USERNAME, account.mEmailAddress); options.putString(EasAuthenticatorService.OPTIONS_PASSWORD, hostAuthRecv.mPassword); @@ -151,7 +154,7 @@ public class MailService extends Service { options.putBoolean(EasAuthenticatorService.OPTIONS_CALENDAR_SYNC_ENABLED, calendar); options.putBoolean(EasAuthenticatorService.OPTIONS_EMAIL_SYNC_ENABLED, email); EmailServiceInfo info = EmailServiceUtils.getServiceInfo(context, hostAuthRecv.mProtocol); - AccountManager.get(context).addAccount(info.accountType, null, null, options, null, + return AccountManager.get(context).addAccount(info.accountType, null, null, options, null, callback, null); } } |
