From ba96b02f84d11e1ad673b3f826260c5f19ba3753 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 6 Sep 2018 09:44:36 +0000 Subject: [PATCH] Drop support for encryption https://forum.xda-developers.com/showpost.php?p=77544698&postcount=789 Closes #76 Closes #93 --- .idea/caches/build_file_checksums.ser | Bin 535 -> 535 bytes README.md | 1 - app/build.gradle | 3 - .../eu/faircode/email/ActivityCompose.java | 1 - .../java/eu/faircode/email/ActivityView.java | 1 - .../eu/faircode/email/AdapterAttachment.java | 55 ++-- .../eu/faircode/email/FragmentCompose.java | 175 +----------- .../eu/faircode/email/FragmentMessage.java | 254 ------------------ app/src/main/res/menu/action_compose.xml | 6 - app/src/main/res/menu/menu_view.xml | 5 - app/src/main/res/values-af/strings.xml | 8 +- app/src/main/res/values-ar-rBH/strings.xml | 8 +- app/src/main/res/values-ar-rEG/strings.xml | 8 +- app/src/main/res/values-ar-rSA/strings.xml | 8 +- app/src/main/res/values-ar-rYE/strings.xml | 8 +- app/src/main/res/values-ar/strings.xml | 8 +- app/src/main/res/values-ca/strings.xml | 8 +- app/src/main/res/values-cs/strings.xml | 8 +- app/src/main/res/values-da/strings.xml | 8 +- app/src/main/res/values-de/strings.xml | 34 ++- app/src/main/res/values-el/strings.xml | 8 +- app/src/main/res/values-en/strings.xml | 8 +- app/src/main/res/values-es-rES/strings.xml | 8 +- app/src/main/res/values-fi/strings.xml | 8 +- app/src/main/res/values-fr/strings.xml | 22 +- app/src/main/res/values-he/strings.xml | 8 +- app/src/main/res/values-hu/strings.xml | 8 +- app/src/main/res/values-it/strings.xml | 8 +- app/src/main/res/values-iw/strings.xml | 8 +- app/src/main/res/values-ja/strings.xml | 8 +- app/src/main/res/values-ko/strings.xml | 8 +- app/src/main/res/values-nb/strings.xml | 8 +- app/src/main/res/values-nl/strings.xml | 8 +- app/src/main/res/values-no/strings.xml | 8 +- app/src/main/res/values-pl/strings.xml | 8 +- app/src/main/res/values-pt-rBR/strings.xml | 8 +- app/src/main/res/values-pt-rPT/strings.xml | 8 +- app/src/main/res/values-ro/strings.xml | 22 +- app/src/main/res/values-ru/strings.xml | 8 +- app/src/main/res/values-sr/strings.xml | 8 +- app/src/main/res/values-sv-rSE/strings.xml | 8 +- app/src/main/res/values-tr/strings.xml | 8 +- app/src/main/res/values-uk/strings.xml | 8 +- app/src/main/res/values-vi/strings.xml | 8 +- app/src/main/res/values-zh-rCN/strings.xml | 8 +- app/src/main/res/values-zh-rTW/strings.xml | 8 +- app/src/main/res/values/strings.xml | 5 - 47 files changed, 129 insertions(+), 719 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index a1aa757bca86520b043a74ce99c0fd6ea2735123..8da23f427dd815ec2d24354f88c3bfb8ef52525c 100644 GIT binary patch delta 33 rcmV++0N($X1eXMmm;|mdmg}*cY5@_xIAPQYw!YBtd0vWuIm3E*`!Ns0 delta 33 rcmV++0N($X1eXMmm;|Xl#H+EKY5@`WAQPxb tos = new ArrayList<>(); - for (InternetAddress ia : ato) - tos.add(ia.getAddress()); - - Intent data = new Intent(); - data.setAction(OpenPgpApi.ACTION_ENCRYPT); - data.putExtra(OpenPgpApi.EXTRA_USER_IDS, tos.toArray(new String[0])); - data.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true); - - Multipart multipart = new MimeMultipart(); - - BodyPart bpMessage = new MimeBodyPart(); - bpMessage.setContent(pbody, "text/html; charset=" + Charset.defaultCharset().name()); - multipart.addBodyPart(bpMessage); - - List attachments = db.attachment().getAttachments(id); - for (final EntityAttachment attachment : attachments) - if (attachment.available) { - BodyPart bpAttachment = new MimeBodyPart(); - bpAttachment.setFileName(attachment.name); - - File file = EntityAttachment.getFile(context, attachment.id); - FileDataSource dataSource = new FileDataSource(file); - dataSource.setFileTypeMap(new FileTypeMap() { - @Override - public String getContentType(File file) { - return attachment.type; - } - - @Override - public String getContentType(String filename) { - return attachment.type; - } - }); - bpAttachment.setDataHandler(new DataHandler(dataSource)); - - multipart.addBodyPart(bpAttachment); - } else - throw new IllegalArgumentException(context.getString(R.string.title_attachments_missing)); - - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - multipart.writeTo(bos); - - ByteArrayInputStream is = new ByteArrayInputStream(bos.toByteArray()); - ByteArrayOutputStream os = new ByteArrayOutputStream(); - - OpenPgpApi api = new OpenPgpApi(context, openPgpConnection.getService()); - Intent result = api.executeApi(data, is, os); - int code = result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR); - switch (code) { - case OpenPgpApi.RESULT_CODE_SUCCESS: { - Log.i(Helper.TAG, "PGP encrypted"); - - for (EntityAttachment attachment : attachments) - db.attachment().deleteAttachment(attachment.id); - - EntityAttachment attachment = new EntityAttachment(); - attachment.message = id; - attachment.sequence = 1; - attachment.name = "encrypted.asc"; - attachment.type = "application/octet-stream"; - attachment.size = os.size(); - attachment.progress = 0; - attachment.id = db.attachment().insertAttachment(attachment); - - File file = attachment.getFile(context, attachment.id); - BufferedOutputStream out = null; - try { - out = new BufferedOutputStream(new FileOutputStream(file)); - os.writeTo(out); - } finally { - if (out != null) - try { - out.close(); - } catch (IOException e) { - Log.e(Helper.TAG, e + "\n" + Log.getStackTraceString(e)); - } - } - - attachment.progress = null; - attachment.available = true; - db.attachment().updateAttachment(attachment); - - break; - } - case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: { - Log.i(Helper.TAG, "PGP user interaction"); - PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT); - args.putParcelable("pi", pi); - return null; - } - case OpenPgpApi.RESULT_CODE_ERROR: { - OpenPgpError error = result.getParcelableExtra(OpenPgpApi.RESULT_ERROR); - throw new IllegalArgumentException(error.getMessage()); - } - } - } - // Save message ID String msgid = draft.msgid; @@ -1148,7 +998,7 @@ public class FragmentCompose extends FragmentEx { draft.ui_hide = false; draft.ui_found = false; draft.id = db.message().insertMessage(draft); - draft.write(getContext(), action == R.id.action_encrypt ? "" : pbody); + draft.write(getContext(), pbody); // Restore attachments for (EntityAttachment attachment : attachments) { @@ -1189,23 +1039,10 @@ public class FragmentCompose extends FragmentEx { if (draft != null) Toast.makeText(getContext(), R.string.title_draft_saved, Toast.LENGTH_LONG).show(); - } else if (action == R.id.action_send || action == R.id.action_encrypt) { - if (draft == null) { - PendingIntent pi = args.getParcelable("pi"); - try { - startIntentSenderForResult( - pi.getIntentSender(), - ActivityCompose.REQUEST_OPENPGP, - null, 0, 0, 0, - new Bundle()); - } catch (IntentSender.SendIntentException ex) { - Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show(); - } - } else { - autosave = false; - getFragmentManager().popBackStack(); - Toast.makeText(getContext(), R.string.title_queued, Toast.LENGTH_LONG).show(); - } + } else if (action == R.id.action_send) { + autosave = false; + getFragmentManager().popBackStack(); + Toast.makeText(getContext(), R.string.title_queued, Toast.LENGTH_LONG).show(); } } diff --git a/app/src/main/java/eu/faircode/email/FragmentMessage.java b/app/src/main/java/eu/faircode/email/FragmentMessage.java index 6087d082..2110ec38 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessage.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessage.java @@ -19,12 +19,9 @@ package eu.faircode.email; Copyright 2018 by Marcel Bokhorst (M66B) */ -import android.app.PendingIntent; -import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.IntentFilter; import android.content.SharedPreferences; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -59,24 +56,14 @@ import android.widget.Toast; import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.floatingactionbutton.FloatingActionButton; -import com.google.android.material.snackbar.Snackbar; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; -import org.openintents.openpgp.OpenPgpError; -import org.openintents.openpgp.util.OpenPgpApi; -import org.openintents.openpgp.util.OpenPgpServiceConnection; import org.xml.sax.XMLReader; -import java.io.BufferedOutputStream; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.net.URL; import java.text.Collator; import java.text.DateFormat; @@ -87,12 +74,6 @@ import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.Locale; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import javax.mail.internet.InternetAddress; -import javax.mail.internet.InternetHeaders; -import javax.mail.internet.MimeBodyPart; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -107,8 +88,6 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import static android.app.Activity.RESULT_OK; - public class FragmentMessage extends FragmentEx { private ViewGroup view; private View vwAnswerAnchor; @@ -145,15 +124,10 @@ public class FragmentMessage extends FragmentEx { private boolean headers = false; private AdapterAttachment adapter; - private OpenPgpServiceConnection openPgpConnection = null; - private boolean debug; private DateFormat df = SimpleDateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT); - private ExecutorService executor = Executors.newCachedThreadPool(Helper.backgroundThreadFactory); - private static final long CACHE_IMAGE_DURATION = 3 * 24 * 3600 * 1000L; - static final String ACTION_DECRYPT_MESSAGE = BuildConfig.APPLICATION_ID + ".DECRYPT_MESSAGE"; @Override public void onCreate(Bundle savedInstanceState) { @@ -163,33 +137,6 @@ public class FragmentMessage extends FragmentEx { message = (TupleMessageEx) getArguments().getSerializable("message"); else message = (TupleMessageEx) savedInstanceState.getSerializable("message"); - - openPgpConnection = new OpenPgpServiceConnection(getContext(), "org.sufficientlysecure.keychain"); - openPgpConnection.bindToService(); - } - - @Override - public void onResume() { - super.onResume(); - LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext()); - IntentFilter iff = new IntentFilter(ACTION_DECRYPT_MESSAGE); - lbm.registerReceiver(receiver, iff); - } - - @Override - public void onPause() { - super.onPause(); - LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext()); - lbm.unregisterReceiver(receiver); - } - - @Override - public void onDestroy() { - if (openPgpConnection != null) { - openPgpConnection.unbindFromService(); - openPgpConnection = null; - } - super.onDestroy(); } @Override @@ -575,7 +522,6 @@ public class FragmentMessage extends FragmentEx { menu.findItem(R.id.menu_show_headers).setEnabled(message.uid != null); menu.findItem(R.id.menu_show_headers).setVisible(!free); menu.findItem(R.id.menu_reply_all).setVisible(!inOutbox); - menu.findItem(R.id.menu_decrypt).setVisible(!inOutbox); } @Override @@ -602,9 +548,6 @@ public class FragmentMessage extends FragmentEx { case R.id.menu_answer: onMenuAnswer(); return true; - case R.id.menu_decrypt: - onMenuDecrypt(); - return true; default: return super.onOptionsItemSelected(item); } @@ -731,45 +674,6 @@ public class FragmentMessage extends FragmentEx { }); } - private void onMenuDecrypt() { - try { - // Find encrypted message - String begin = "-----BEGIN PGP MESSAGE-----"; - String end = "-----END PGP MESSAGE-----"; - Document document = Jsoup.parse(message.read(getContext())); - - String encrypted = document.text(); - - int efrom = encrypted.indexOf(begin) + begin.length(); - int eto = encrypted.indexOf(end); - if (efrom < 0 || eto < 0) - throw new IllegalArgumentException(getString(R.string.title_not_encrypted)); - - encrypted = begin + "\n" + encrypted.substring(efrom, eto).replace(" ", "\n") + end + "\n"; - InputStream is = new ByteArrayInputStream(encrypted.getBytes("UTF-8")); - - decrypt(is, false); - - } catch (Throwable ex) { - Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex)); - if (ex instanceof IllegalArgumentException) - Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show(); - else - Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show(); - } - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - Log.i(Helper.TAG, "Message onActivityResult request=" + requestCode + " result=" + resultCode + " data=" + data); - if (resultCode == RESULT_OK) { - if (requestCode == ActivityView.REQUEST_OPENPGP) { - Log.i(Helper.TAG, "User interacted"); - onMenuDecrypt(); - } - } - } - private void onActionSpam() { AlertDialog.Builder builder = new AlertDialog.Builder(getContext()); builder @@ -1210,162 +1114,4 @@ public class FragmentMessage extends FragmentEx { return result; } - - private void decrypt(InputStream is, final boolean isPart) { - Log.i(Helper.TAG, "On decrypt"); - - if (!PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean("pro", false)) { - FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); - fragmentTransaction.replace(R.id.content_frame, new FragmentPro()).addToBackStack("pro"); - fragmentTransaction.commit(); - return; - } - - if (openPgpConnection == null || !openPgpConnection.isBound()) - throw new IllegalArgumentException(getString(R.string.title_no_openpgp)); - - if (message.to == null || message.to.length == 0) - throw new IllegalArgumentException(getString(R.string.title_to_missing)); - - final ByteArrayOutputStream os = new ByteArrayOutputStream(); - - InternetAddress to = (InternetAddress) message.to[0]; - - Intent data = new Intent(); - data.setAction(OpenPgpApi.ACTION_DECRYPT_VERIFY); - data.putExtra(OpenPgpApi.EXTRA_USER_IDS, new String[]{to.getAddress()}); - - OpenPgpApi api = new OpenPgpApi(getContext(), openPgpConnection.getService()); - api.executeApiAsync(data, is, os, new OpenPgpApi.IOpenPgpCallback() { - @Override - public void onReturn(Intent result) { - try { - int code = result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR); - switch (code) { - case OpenPgpApi.RESULT_CODE_SUCCESS: { - Log.i(Helper.TAG, "Decrypted"); - String decrypted = os.toString("UTF-8"); - if (isPart) { - InternetHeaders ih = new InternetHeaders(); - ih.addHeader("Content-Type", "multipart/alternative"); - final MimeBodyPart part = new MimeBodyPart(ih, decrypted.getBytes()); - - String dbody = MessageHelper.getHtml(part); - message.write(getContext(), dbody); - - // Store attachments - executor.submit(new Runnable() { - @Override - public void run() { - DB db = DB.getInstance(getContext()); - try { - db.beginTransaction(); - - for (EntityAttachment attachment : db.attachment().getAttachments(message.id)) - if ("encrypted.asc".equals(attachment.name)) - db.attachment().deleteAttachment(attachment.id); - - int sequence = 0; - for (EntityAttachment attachment : MessageHelper.getAttachments(part)) { - - attachment.message = message.id; - attachment.sequence = ++sequence; - attachment.id = db.attachment().insertAttachment(attachment); - - File file = EntityAttachment.getFile(getContext(), attachment.id); - - // Store attachment - InputStream is = null; - OutputStream os = null; - try { - is = attachment.part.getInputStream(); - os = new BufferedOutputStream(new FileOutputStream(file)); - - int size = 0; - byte[] buffer = new byte[Helper.ATTACHMENT_BUFFER_SIZE]; - for (int len = is.read(buffer); len != -1; len = is.read(buffer)) { - size += len; - os.write(buffer, 0, len); - } - - // Store attachment data - attachment.size = size; - attachment.progress = null; - attachment.available = true; - db.attachment().updateAttachment(attachment); - } finally { - try { - if (is != null) - is.close(); - } finally { - if (os != null) - os.close(); - } - } - } - - db.setTransactionSuccessful(); - } catch (Throwable ex) { - Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex)); - } finally { - db.endTransaction(); - } - } - }); - } else - message.write(getContext(), "
" + decrypted.replaceAll("\\r?\\n", "
") + "
"); - - Bundle args = new Bundle(); - args.putLong("id", message.id); - args.putBoolean("show_images", false); - - pbBody.setVisibility(View.VISIBLE); - bodyTask.load(FragmentMessage.this, args); - - break; - } - case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: { - Log.i(Helper.TAG, "User interaction"); - PendingIntent pi = result.getParcelableExtra(OpenPgpApi.RESULT_INTENT); - startIntentSenderForResult( - pi.getIntentSender(), - ActivityView.REQUEST_OPENPGP, - null, 0, 0, 0, - new Bundle()); - break; - } - case OpenPgpApi.RESULT_CODE_ERROR: { - OpenPgpError error = result.getParcelableExtra(OpenPgpApi.RESULT_ERROR); - throw new IllegalArgumentException(error.getMessage()); - } - } - } catch (Throwable ex) { - Log.e(Helper.TAG, ex + "\n" + Log.getStackTraceString(ex)); - if (ex instanceof IllegalArgumentException) - Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show(); - else - Toast.makeText(getContext(), ex.toString(), Toast.LENGTH_LONG).show(); - } - } - }); - } - - BroadcastReceiver receiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - new SimpleTask() { - @Override - protected InputStream onLoad(Context context, Bundle args) throws Throwable { - File file = (File) args.getSerializable("file"); - FileInputStream fis = new FileInputStream(file); - return fis; - } - - @Override - protected void onLoaded(Bundle args, InputStream data) { - decrypt(data, true); - } - }.load(FragmentMessage.this, intent.getExtras()); - } - }; } diff --git a/app/src/main/res/menu/action_compose.xml b/app/src/main/res/menu/action_compose.xml index df4cbe74..9b8f1ad7 100644 --- a/app/src/main/res/menu/action_compose.xml +++ b/app/src/main/res/menu/action_compose.xml @@ -14,12 +14,6 @@ android:title="@string/title_save" app:showAsAction="ifRoom" /> - - - - diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index f7bd122a..6ca2e1d3 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -78,9 +78,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -147,10 +147,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml index bf8103fb..cf8c96e7 100644 --- a/app/src/main/res/values-ar-rBH/strings.xml +++ b/app/src/main/res/values-ar-rBH/strings.xml @@ -94,9 +94,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -163,10 +163,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml index bf8103fb..cf8c96e7 100644 --- a/app/src/main/res/values-ar-rEG/strings.xml +++ b/app/src/main/res/values-ar-rEG/strings.xml @@ -94,9 +94,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -163,10 +163,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index bf8103fb..cf8c96e7 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -94,9 +94,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -163,10 +163,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml index bf8103fb..cf8c96e7 100644 --- a/app/src/main/res/values-ar-rYE/strings.xml +++ b/app/src/main/res/values-ar-rYE/strings.xml @@ -94,9 +94,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -163,10 +163,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index bf8103fb..cf8c96e7 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -94,9 +94,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -163,10 +163,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index f7bd122a..6ca2e1d3 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -78,9 +78,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -147,10 +147,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 5fa9360e..03caad09 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -86,9 +86,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -155,10 +155,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index d3baee5d..134997ce 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -78,9 +78,9 @@ Brugernavn Adgangskode Vælg konto - Vejledning + Authorizing account … + Advanced Gem sendte beskeder (aktivér kun hvis nødvendigt) - Keep-alive interval (minutes) Synkronisér (modtag meddelelser) Synkronisér (send meddelelser) Primær (standard konto) @@ -147,10 +147,6 @@ Send Vis CC/BCC Vedhæft fil - OpenPGP ikke tilgængelig - Krypteret meddelelse ikke fundet - Kryptér - Dekryptér Afsender mangler Modtager mangler Vedhæftede filer indlæses stadig diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6aca340d..6ae51f3a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -45,10 +45,10 @@ Um E-Mails zu empfangen Identitäten verwalten Um E-Mails zu senden - Disable battery optimizations - To continuously receive email (optional) - In the next dialog, select \"All apps\" at the top, select this app and select and confirm \"Don\'t optimize\" - Disable data saving + Deaktiviere Akku-Optimierung + Um kontinuierlich E-Mails zu empfangen (optional) + Rufen Sie im folgendem Auswahldialog (oben) \"Alle Apps\" auf; wählen Sie anschließend FairEmail aus und bestätigen Sie die Option \"Nicht optimieren\" mit Fertig. + Deaktivere Datenreduzierung Berechtigungen erteilen Um Adressen zu autovervollständigen (optional) To Do @@ -57,12 +57,12 @@ Erweiterte Optionen Verwende WebView, um externe Links anzuzeigen Anstatt Chrome benutzerdefinierte Tabs - HTML Formatierung von Nachrichten entfernen + HTML-Formatierung von Nachrichten entfernen IMAP Daten komprimieren Debuggen Wählen Sie … Ihr Name - Ihre E-Mail Adresse + Ihre E-Mail-Adresse Antwortadresse Optional Verknüpftes Konto @@ -78,9 +78,9 @@ Benutzername Passwort Konto wählen - Anweisungen + Autorisieren Konto … + Advanced Speichere gesendete Nachrichten (nur bei Bedarf aktivieren) - Keep-alive-Intervall (Minuten) Synchronisiere (empfange E-Mails) Synchronisiere (sende E-Mails) Primär (Standard-Konto) @@ -99,7 +99,7 @@ Möchten Sie dieses Konto unwiderruflich löschen? Möchten Sie diese Identität unwiderruflich löschen? Synchronisiere (empfange E-Mails) - Show in unified inbox + Im gemeinsamen Posteingang anzeigen Synchronisiere (Tage) Gemeinsamer Posteingang Posteingang @@ -123,7 +123,7 @@ Als ungelesen markieren Weiterleiten Antworten an alle - Show headers + Kopfzeile anzeigen Original anzeigen Papierkorb Spam @@ -147,10 +147,6 @@ Senden CC/BCC anzeigen Anhang hinzufügen - OpenPGP nicht verfügbar - Verschlüsselte Nachricht nicht gefunden - Verschlüsseln - Entschlüsseln Absender fehlt Empfänger fehlt Anhänge werden noch geladen @@ -168,7 +164,7 @@ Unterhaltung Synchronisieren Primär - Unified inbox + Sammeleingang Keine Verbindung Verbinde Verbunden @@ -177,11 +173,11 @@ Nach links wischen, um in den Papierkorb zu werfen; nach rechts wischen zum archivieren (sofern verfügbar); langes drücken, um als gelesen/ungelesen zu markieren Verstanden Dies ist eine Premium Funktion - Liste der Premium Funktionen + Liste der Pro-Funktionen Kaufen - Das Kaufen der Premium Funktionen erlaubt es Ihnen alle momentan und zukünftig verfügbaren Premium Funktionen zu nutzen und ermöglicht die Entwicklung und Pflege der App - Alle Premium Funktionen sind aktiviert - Alle Premium Funktionen aktiviert + Der Erwerb der Pro-Funktionen erlaubt es Ihnen alle momentan und zukünftig verfügbaren Pro-Funktionen zu nutzen und ermöglicht die Weiterentwicklung und Pflege der App + Alle Pro-Funktionen sind aktiviert + Alle Pro-Funktionen aktiviert Ungültige Antwort Protokoll Debuginformationen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index f7bd122a..6ca2e1d3 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -78,9 +78,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -147,10 +147,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index f7bd122a..6ca2e1d3 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -78,9 +78,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -147,10 +147,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index f7bd122a..6ca2e1d3 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -78,9 +78,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -147,10 +147,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index f7bd122a..6ca2e1d3 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -78,9 +78,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -147,10 +147,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index eb27d1ac..d8860d6b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -45,10 +45,10 @@ Recevoir des e-mails Gérer les identités Envoyer des e-mails - Disable battery optimizations - To continuously receive email (optional) - In the next dialog, select \"All apps\" at the top, select this app and select and confirm \"Don\'t optimize\" - Disable data saving + Désactiver les optimisations de la batterie + Pour recevoir des e-mails en continu (facultatif) + Sur le prochain écran, sélectionnez \"Toutes les applis\" en haut, recherchez cette appli puis sélectionnez et validez \"Ne pas optimiser\" + Désactiver l\'économie de données Accorder les autorisations Saisie semi-automatique des adresses (facultatif) À faire @@ -78,9 +78,9 @@ Nom d’utilisateur Mot de passe Sélectionner un compte - Instructions + Autorisation du compte en cours … + Advanced Stocker les messages envoyés (à activer si nécessaire) - Intervalle de maintien de connexion (minutes) Synchroniser (recevoir des messages) Synchroniser (envoyer des messages) Principal (compte par défaut) @@ -99,7 +99,7 @@ Supprimer définitivement ce compte ? Supprimer définitivement cette identité ? Synchroniser (recevoir des messages) - Show in unified inbox + Afficher dans la boîte de réception unifiée Synchroniser (jours) Boite de réception unifiée Boîte de réception @@ -123,7 +123,7 @@ Marquer comme non lu Transférer Répondre à tous - Show headers + Afficher les en-têtes Afficher l\'original Corbeille Spam @@ -147,10 +147,6 @@ Envoyer Afficher Cc/Cci Ajouter une pièce jointe - OpenPGP n’est pas disponible - Message chiffré non trouvé - Chiffrer - Déchiffrer Expéditeur manquant Destinataire manquant Pièces jointes en cours de chargement @@ -168,7 +164,7 @@ Fil de discussion Synchroniser Principal - Unified inbox + Boite de réception unifiée Déconnecté Connexion en cours Connecté diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 99ded4c5..df8eb9e5 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -86,9 +86,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -155,10 +155,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f7bd122a..6ca2e1d3 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -78,9 +78,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -147,10 +147,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d1d8099c..5e19507f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -78,9 +78,9 @@ Nome utente Password Select account - Instructions + Authorizing account … + Advanced Conserva i messaggi inviati (abilita solo se necessario) - Keep-alive interval (minutes) Sincronizza (ricevi messaggi) Sincronizza (invia messaggi) Principale (account predefinito) @@ -147,10 +147,6 @@ Invia Mostra CC/BCC Aggiungi allegato - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Mittente mancante Destinatario mancante Allegati ancora in fase di caricamento diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 99ded4c5..df8eb9e5 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -86,9 +86,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -155,10 +155,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index c52e74a6..ff346bc2 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -74,9 +74,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -143,10 +143,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index c52e74a6..ff346bc2 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -74,9 +74,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -143,10 +143,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f7bd122a..6ca2e1d3 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -78,9 +78,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -147,10 +147,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index f7bd122a..6ca2e1d3 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -78,9 +78,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -147,10 +147,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index f7bd122a..6ca2e1d3 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -78,9 +78,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -147,10 +147,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f21fdc82..05c02ff9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -86,9 +86,9 @@ Nazwa użytkownika Hasło Wybierz konto - Instrukcje + Authorizing account … + Advanced Zachowuj wysłane wiadomości (włącz tylko gdy potrzebne) - Interwał utrzymywania aktywności (minuty) Synchronizuj (odbierz wiadomości) Synchronizuj (wyślij wiadomości) Podstawowe (domyślne konto) @@ -155,10 +155,6 @@ Wyślij Pokaż DW/UDW Dodaj załącznik - OpenPGP nie dostępne - Nie znaleziono zaszyfrowanej wiadomości - Zaszyfruj - Odszyfruj Brak nadawcy Brak adresata Załączniki są wciąż ładowane diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index b37bd1bc..d770076a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -78,9 +78,9 @@ Nome de usuário Senha Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Sincronizar (receber mensagens) Sincronizar (enviar mensagens) Primary (default account) @@ -147,10 +147,6 @@ Enviar Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Remetente faltante Destinatário faltante Attachments still loading diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index f7bd122a..6ca2e1d3 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -78,9 +78,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -147,10 +147,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index d2612dc5..fdecd832 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -49,10 +49,10 @@ Pentru a primi e-mail Gestionarea identităţilor Pentru a trimite e-mail - Disable battery optimizations - To continuously receive email (optional) - In the next dialog, select \"All apps\" at the top, select this app and select and confirm \"Don\'t optimize\" - Disable data saving + Dezactivează optimizarea bateriei + Pentru a primi în mod continuu e-mail (opțional) + În fereastra următoare, selectați \"Toate aplicațiile\" din partea de sus, selectați acestă aplicație și selectați și confirmați \"Nu optimiza\" + Dezactivează salvarea datelor Acordă permisiuni Pentru completarea automată a adreselor (opţional) De făcut @@ -82,9 +82,9 @@ Nume utilizator Parolă Selectare cont - Instrucțiuni + Autorizare cont … + Advanced Stochează mesajele trimise (activați doar la nevoie) - Interval menținere conexiune (minute) Sincronizare (primire mesaje) Sincronizare (trimitere mesaje) Primară (identitatea implicită) @@ -103,7 +103,7 @@ Ștergeți definitiv acest cont? Ștergeți definitiv această identitate? Sincronizare (primire mesaje) - Show in unified inbox + Arată în căsuța poștală comună Sincronizare (zile) Căsuță poștală comună Mesaje primite @@ -127,7 +127,7 @@ Marcare ca necitit Redirecționează Răspunde tuturor - Show headers + Arată antetul Arată original Gunoi Spam @@ -151,10 +151,6 @@ Trimite Arată CC/BCC Adaugă ataşament - OpenPGP nu este disponibil - Mesajul criptat nu a fost găsit - Criptare - Decriptare Expeditor lipsă Destinatar lipsă Atașamentele încă se încarcă @@ -172,7 +168,7 @@ Conversație Sincronizare Primar - Unified inbox + Căsuță poștală comună Deconectat Conectare Conectat diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5fa9360e..03caad09 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -86,9 +86,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -155,10 +155,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 7c4550bf..de5c5654 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -82,9 +82,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -151,10 +151,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index f7bd122a..6ca2e1d3 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -78,9 +78,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -147,10 +147,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 8181bafe..26ab5553 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -78,9 +78,9 @@ Kullanıcı adı Şifre Hesap seç - Talimatlar + Authorizing account … + Advanced Gönderilen iletileri kaydet (yalnızca gerekliyse etkinleştir) - Canlı tutma aralığı (dakika) Senkronize et (iletileri al) Senkronize et (iletileri gönder) Birincil (varsayılan hesap) @@ -147,10 +147,6 @@ Gönder CC/BCC göster Ek ekle - OpenPGP mevcut değil - Şifreli ileti bulunamadı - Şifrele - Şifre çöz Gönderici Eksik Alıcı eksik Ekler hala yükleniyor diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5fa9360e..03caad09 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -86,9 +86,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -155,10 +155,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index c52e74a6..ff346bc2 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -74,9 +74,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -143,10 +143,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 09c2b2f7..fc83b10f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -74,9 +74,9 @@ 用户名 密码 选择账户 - 说明 + Authorizing account … + Advanced 存储已发送的邮件（请只在需要时启用） - 间隔（分钟） 同步（接收） 同步（发送） 默认账户 @@ -143,10 +143,6 @@ 发送 显示抄送和密送 添加附件 - OpenPGP 不可用 - 未找到加密邮件 - 加密 - 解密 缺少发件人 缺少收件人 附件加载中 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c52e74a6..ff346bc2 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -74,9 +74,9 @@ User name Password Select account - Instructions + Authorizing account … + Advanced Store sent messages (enable if needed only) - Keep-alive interval (minutes) Synchronize (receive messages) Synchronize (send messages) Primary (default account) @@ -143,10 +143,6 @@ Send Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt Sender missing Recipient missing Attachments still loading diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aa97aaf4..1f3ebc44 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -173,11 +173,6 @@ Show CC/BCC Add attachment - OpenPGP not available - Encrypted message not found - Encrypt - Decrypt - Sender missing Recipient missing Attachments still loading