msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:M66B/FairEmail

Browse Source
pull/199/head
M66B 4 years ago
parent 8c9a58e299 b1ce8e18e5
commit 909f87b63a
51 changed files with 258192 additions and 75 deletions
Show Stats Download Patch File Download Diff File

2
app/build.gradle
Unescape View File

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
apply plugin: 'com.bugsnag.android.gradle'
apply plugin: 'kotlin-android'
def getVersionCode = { -> return 1620 }
def getVersionCode = { -> return 1621 }
def getReleaseName = { -> return "\"Rahiolisaurus\"" }
// https://en.wikipedia.org/wiki/List_of_dinosaur_genera

129036
app/schemas/mapping/FairEmail-v1.1621-github-release-mapping.txt
View File

File diff suppressed because it is too large Load Diff

129036
app/schemas/mapping/FairEmail-v1.1621-play-release-mapping.txt
View File

File diff suppressed because it is too large Load Diff

4
app/src/main/java/eu/faircode/email/ActivitySetup.java
Unescape View File

@ -725,7 +725,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
ex instanceof SecurityException);
Log.unexpectedError(getSupportFragmentManager(), ex, !expected);
}
}.execute(this, args, "setup:export");
}.setInterruptable(false).execute(this, args, "setup:export");
}
private void handleImport(Intent data, String password) {
@ -1115,7 +1115,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
Log.unexpectedError(getSupportFragmentManager(), ex, !expected);
}
}
}.execute(this, args, "setup:import");
}.setInterruptable(false).execute(this, args, "setup:import");
}
private void handleImportCertificate(Intent data) {

5
app/src/main/java/eu/faircode/email/ActivityView.java
Unescape View File

@ -1348,6 +1348,11 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
private void onDebugInfo() {
new SimpleTask<Long>() {
@Override
protected void onPreExecute(Bundle args) {
ToastEx.makeText(ActivityView.this, "Debug info ...", Toast.LENGTH_LONG).show();
}
@Override
protected Long onExecute(Context context, Bundle args) throws IOException, JSONException {
return Log.getDebugInfo(context, R.string.title_debug_info_remark, null, null).id;

5
app/src/main/java/eu/faircode/email/EmailProvider.java
Unescape View File

@ -32,6 +32,7 @@ import org.xmlpull.v1.XmlPullParserFactory;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Serializable;
import java.net.HttpURLConnection;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@ -50,7 +51,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
public class EmailProvider {
public class EmailProvider implements Serializable {
public String id;
public String name;
public String description;
@ -723,7 +724,7 @@ public class EmailProvider {
@NonNull
@Override
public String toString() {
return host + ":" + port;
return host + ":" + port + (starttls ? " starttls" : " ssl/tls");
}
}

14
app/src/main/java/eu/faircode/email/FragmentDialogAccount.java
Unescape View File

@ -48,6 +48,7 @@ public class FragmentDialogAccount extends FragmentDialogBase {
final Context context = getContext();
final View dview = LayoutInflater.from(context).inflate(R.layout.dialog_review_account, null);
final TextView tvName = dview.findViewById(R.id.tvName);
final TextView tvInbox = dview.findViewById(R.id.tvInbox);
final TextView tvDrafts = dview.findViewById(R.id.tvDrafts);
final TextView tvSent = dview.findViewById(R.id.tvSent);
@ -71,8 +72,9 @@ public class FragmentDialogAccount extends FragmentDialogBase {
tvJunk.setCompoundDrawablesRelative(null, null, null, null);
tvArchive.setCompoundDrawablesRelative(null, null, null, null);
tvLeft.setText("");
tvRight.setText("");
tvName.setText(null);
tvLeft.setText(null);
tvRight.setText(null);
Bundle args = getArguments();
final long account = args.getLong("account");
@ -90,6 +92,14 @@ public class FragmentDialogAccount extends FragmentDialogBase {
});
DB db = DB.getInstance(context);
db.account().liveAccount(account).observe(this, new Observer<EntityAccount>() {
@Override
public void onChanged(EntityAccount account) {
tvName.setText(account.name);
}
});
db.account().liveAccountSwipes(account).observe(this, new Observer<List<TupleAccountSwipes>>() {
@Override
public void onChanged(List<TupleAccountSwipes> swipes) {

2
app/src/main/java/eu/faircode/email/FragmentFolders.java
Unescape View File

@ -1005,7 +1005,7 @@ public class FragmentFolders extends FragmentBase {
}
}.execute(this, args, "folder:export");
}.setInterruptable(false).execute(this, args, "folder:export");
}
public static class FragmentDialogApply extends FragmentDialogBase {

41
app/src/main/java/eu/faircode/email/FragmentQuickSetup.java
Unescape View File

@ -191,6 +191,7 @@ public class FragmentQuickSetup extends FragmentBase {
btnHelp.setVisibility(View.GONE);
tvInstructions.setVisibility(View.GONE);
tvInstructions.setMovementMethod(LinkMovementMethod.getInstance());
btnSave.setVisibility(View.GONE);
grpSetup.setVisibility(View.GONE);
grpError.setVisibility(View.GONE);
@ -241,6 +242,7 @@ public class FragmentQuickSetup extends FragmentBase {
grpError.setVisibility(View.GONE);
btnHelp.setVisibility(View.GONE);
tvInstructions.setVisibility(View.GONE);
btnSave.setVisibility(check ? View.GONE : View.VISIBLE);
grpSetup.setVisibility(check ? View.GONE : View.VISIBLE);
}
@ -279,12 +281,7 @@ public class FragmentQuickSetup extends FragmentBase {
throw new IllegalArgumentException(context.getString(R.string.title_no_internet));
EmailProvider provider = EmailProvider.fromEmail(context, email, EmailProvider.Discover.ALL);
args.putBoolean("appPassword", provider.appPassword);
if (provider.link != null)
args.putString("link", provider.link);
if (provider.documentation != null)
args.putString("documentation", provider.documentation.toString());
args.putSerializable("provider", provider);
int at = email.indexOf('@');
String username = email.substring(0, at);
@ -459,12 +456,11 @@ public class FragmentQuickSetup extends FragmentBase {
protected void onExecuted(Bundle args, EmailProvider result) {
boolean check = args.getBoolean("check");
if (check) {
tvImap.setText(result == null ? null
: result.imap.host + ":" + result.imap.port + (result.imap.starttls ? " starttls" : " ssl"));
tvImap.setText(result == null ? null : result.imap.toString());
tvImapFingerprint.setText(args.getString("imap_fingerprint"));
tvSmtp.setText(result == null ? null
: result.smtp.host + ":" + result.smtp.port + (result.smtp.starttls ? " starttls" : " ssl"));
tvSmtp.setText(result == null ? null : result.smtp.toString());
tvSmtpFingerprint.setText(args.getString("smtp_fingerprint"));
btnSave.setVisibility(result == null ? View.GONE : View.VISIBLE);
grpSetup.setVisibility(result == null ? View.GONE : View.VISIBLE);
} else {
FragmentDialogAccount fragment = new FragmentDialogAccount();
@ -477,12 +473,12 @@ public class FragmentQuickSetup extends FragmentBase {
@Override
protected void onException(final Bundle args, Throwable ex) {
Log.e(ex);
EmailProvider provider = (EmailProvider) args.getSerializable("provider");
if (ex instanceof AuthenticationFailedException) {
boolean appPassword = args.getBoolean("appPassword");
String message = getString(R.string.title_setup_no_auth_hint);
if (appPassword)
message += "\n" + getString(R.string.title_setup_app_password_hint);
if (provider != null && provider.appPassword)
message += "\n\n" + getString(R.string.title_setup_app_password_hint);
tvErrorHint.setText(message);
} else
tvErrorHint.setText(R.string.title_setup_no_settings_hint);
@ -501,21 +497,30 @@ public class FragmentQuickSetup extends FragmentBase {
tvError.setText(Log.formatThrowable(ex, false));
grpError.setVisibility(View.VISIBLE);
if (args.containsKey("link")) {
Uri uri = Uri.parse(args.getString("link"));
if (provider != null && provider.link != null) {
Uri uri = Uri.parse(provider.link);
btnHelp.setTag(uri);
btnHelp.setVisibility(View.VISIBLE);
}
if (args.containsKey("documentation")) {
tvInstructions.setText(HtmlHelper.fromHtml(args.getString("documentation"), getContext()));
if (provider != null && provider.documentation != null) {
tvInstructions.setText(HtmlHelper.fromHtml(provider.documentation.toString(), getContext()));
tvInstructions.setVisibility(View.VISIBLE);
}
if (provider != null &&
provider.imap != null && provider.smtp != null) {
tvImap.setText(provider.imap.toString());
tvImapFingerprint.setText(null);
tvSmtp.setText(provider.smtp.toString());
tvSmtpFingerprint.setText(null);
grpSetup.setVisibility(View.VISIBLE);
}
getMainHandler().post(new Runnable() {
@Override
public void run() {
if (args.containsKey("documentation"))
if (provider != null && provider.documentation != null)
scroll.smoothScrollTo(0, tvInstructions.getBottom());
else
scroll.smoothScrollTo(0, btnSupport.getBottom());

24
app/src/main/java/eu/faircode/email/Log.java
Unescape View File

@ -90,6 +90,9 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.Array;
import java.net.InetAddress;
import java.net.InterfaceAddress;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.nio.charset.StandardCharsets;
import java.security.cert.CertPathValidatorException;
@ -100,6 +103,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@ -1981,6 +1985,26 @@ public class Log {
size += write(os, "\r\n");
}
try {
Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
while (interfaces != null && interfaces.hasMoreElements()) {
NetworkInterface ni = interfaces.nextElement();
size += write(os, "Interface=" + ni + "\r\n");
for (InterfaceAddress iaddr : ni.getInterfaceAddresses()) {
InetAddress addr = iaddr.getAddress();
size += write(os, " addr=" + addr +
(addr.isLoopbackAddress() ? " loopback" : "") +
(addr.isSiteLocalAddress() ? " site local (LAN)" : "") +
(addr.isLinkLocalAddress() ? " link local (device)" : "") +
(addr.isAnyLocalAddress() ? " any local" : "") +
(addr.isMulticastAddress() ? " multicast" : "") + "\r\n");
}
size += write(os, "\r\n");
}
} catch (Throwable ex) {
size += write(os, ex.getMessage() + "\r\n");
}
size += write(os, "VPN active=" + ConnectionHelper.vpnActive(context) + "\r\n\r\n");
ConnectionHelper.NetworkState state = ConnectionHelper.getNetworkState(context);

16
app/src/main/java/eu/faircode/email/SimpleTask.java
Unescape View File

@ -51,6 +51,7 @@ import java.util.concurrent.Future;
public abstract class SimpleTask<T> implements LifecycleObserver {
private boolean log = true;
private boolean count = true;
private boolean interruptable = true;
private String name;
private long started;
@ -82,6 +83,11 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
return this;
}
public SimpleTask<T> setInterruptable(boolean interruptable) {
this.interruptable = interruptable;
return this;
}
public SimpleTask<T> setExecutor(ExecutorService executor) {
this.localExecutor = executor;
return this;
@ -139,8 +145,6 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
tasks.add(this);
}
updateTaskCount(context);
try {
onPreExecute(args);
} catch (Throwable ex) {
@ -253,6 +257,8 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
});
}
});
updateTaskCount(context);
}
void cancel(Context context) {
@ -280,12 +286,12 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
long now = new Date().getTime();
synchronized (tasks) {
for (SimpleTask task : tasks)
if (!BuildConfig.PLAY_STORE_RELEASE ||
(task.future != null && !task.future.isDone())) {
if (task.future != null && !task.future.isDone()) {
long elapsed = now - task.started;
if (elapsed > CANCEL_AFTER && !task.interrupted) {
task.interrupted = true;
if (task.future != null && !task.future.isDone()) {
if (task.interruptable &&
task.future != null && !task.future.isDone()) {
Log.e("Interrupting task " + task +
" tasks=" + getCountLocked() + "/" + tasks.size());
task.future.cancel(true);

12
app/src/main/res/layout/dialog_review_account.xml
Unescape View File

@ -10,15 +10,25 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<eu.faircode.email.FixedTextView
android:id="@+id/tvName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Name"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvSuccess"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="@string/title_setup_quick_success"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?android:attr/textColorPrimary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/tvName" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvInbox"

9
app/src/main/res/layout/fragment_quick_setup.xml
Unescape View File

@ -78,6 +78,7 @@
android:layout_marginTop="12dp"
android:text="@string/title_case_sensitive"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvCharacters" />
@ -157,6 +158,7 @@
android:layout_marginTop="6dp"
android:text="@string/title_setup_quick_support"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?android:attr/textColorPrimary"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvErrorHint" />
@ -212,6 +214,7 @@
android:text="imap.domain.tld:993"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?android:attr/textColorPrimary"
android:textIsSelectable="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvImapTitle" />
@ -222,6 +225,7 @@
android:text="fingerprint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?attr/colorWarning"
android:textIsSelectable="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvImap" />
@ -242,6 +246,7 @@
android:text="smtp.domain.tld:993"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?android:attr/textColorPrimary"
android:textIsSelectable="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSmtpTitle" />
@ -252,6 +257,7 @@
android:text="fingerprint"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textColor="?attr/colorWarning"
android:textIsSelectable="true"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvSmtp" />
@ -282,8 +288,7 @@
android:layout_height="0dp"
app:constraint_referenced_ids="
tvImapTitle,tvImap,tvImapFingerprint,tvSmtpTitle,
tvSmtp,tvSmtpFingerprint,
btnSave" />
tvSmtp,tvSmtpFingerprint" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpError"

1
app/src/main/res/values-bg-rBG/strings.xml
Unescape View File

@ -721,7 +721,6 @@
<string name="title_style_size_small">Малък</string>
<string name="title_style_size_medium">Среден</string>
<string name="title_style_size_large">Голям</string>
<string name="title_style_color">Цвят &#8230;</string>
<string name="title_style_list">Списък</string>
<string name="title_style_list_numbered">Номерирано</string>
<string name="title_style_font">Шрифт</string>

1
app/src/main/res/values-ca-rES/strings.xml
Unescape View File

@ -733,7 +733,6 @@ La creació i l\'ús de regles és una característica professional. </string
<string name="title_style_size_small">Petit</string>
<string name="title_style_size_medium">Mitjà</string>
<string name="title_style_size_large">Gran</string>
<string name="title_style_color">Color &#8230;</string>
<string name="title_style_align">Alineació</string>
<string name="title_style_align_start">Comença</string>
<string name="title_style_align_center">Centre</string>

1
app/src/main/res/values-cs-rCZ/strings.xml
Unescape View File

@ -956,7 +956,6 @@
<string name="title_style_size_small">Malý</string>
<string name="title_style_size_medium">Střední</string>
<string name="title_style_size_large">Velký</string>
<string name="title_style_color">Barva &#8230;</string>
<string name="title_style_align">Zarovnání</string>
<string name="title_style_align_start">Na začátek</string>
<string name="title_style_align_center">Na střed</string>

1
app/src/main/res/values-da-rDK/strings.xml
Unescape View File

@ -915,7 +915,6 @@
<string name="title_style_size_small">Lille</string>
<string name="title_style_size_medium">Mellem</string>
<string name="title_style_size_large">Stor</string>
<string name="title_style_color">Farve &#8230;</string>
<string name="title_style_align">Justér</string>
<string name="title_style_align_start">Start</string>
<string name="title_style_align_center">Centrér</string>

4
app/src/main/res/values-de-rAT/strings.xml
Unescape View File

@ -155,6 +155,7 @@
<string name="title_setup_no_inbox">Posteingang nicht gefunden</string>
<string name="title_setup_advanced_protection">Wenn Sie sich in das erweiterte Schutzprogramm eingeschrieben haben, ist es nicht möglich, eine andere E-Mail-Anwendung von Dritten zu verwenden. Dies ist eine von Google auferlegte Einschränkung.</string>
<string name="title_setup_quick_success">Ein Konto wurde erfolgreich hinzugefügt</string>
<string name="title_setup_quick_configure">Um den Namen, die Farbe, die Wisch-Aktionen usw. zu bearbeiten</string>
<string name="title_setup_manage">Verwalten</string>
<string name="title_setup_grant">Zulassen</string>
<string name="title_setup_grant_again">Benötigte Rechte erteilen</string>
@ -516,7 +517,7 @@
<string name="title_advanced_timeout_hint">Die Zeitüberschreitung beim Lesen oder Schreiben wird auf das Doppelte der Verbindungszeitüberschreitung festgelegt. Höhere Werte führen zu einem höheren Akkuverbrauch.</string>
<string name="title_advanced_ssl_harden_hint">Wenn dies eingeschaltet ist, werden schwache SSL-Protokolle und Chiffren deaktiviert, was zu Verbindungsproblemen führen kann</string>
<string name="title_advanced_roaming_hint">Die Kopfzeilen der Nachrichten werden beim Roaming immer abgerufen. Sie können die Roaming-Einstellung des Gerätes verwenden, um das Internet während des Roamings zu deaktivieren.</string>
<string name="title_advanced_browse_hint">Durch Herunterscrollen weitere E-Mails laden</string>
<string name="title_advanced_browse_hint">Durch Herunterziehen weitere Nachrichten abholen</string>
<string name="title_advanced_layout_hint">Das Wechseln zu einer kompakteren Darstellung und Ändern der Nachrichtentextgröße kann im oberen Aktionsleistenmenü in der Nachrichtenansicht vorgenommen werden.</string>
<string name="title_advanced_startup_hint">Einen beliebigen Ordner in der Ordnerliste lange gedrückt halten, um ihn der Liste der Sammelordner hinzuzufügen oder ihn daraus zu entfernen</string>
<string name="title_advanced_beige_hint">Nur helle Designs</string>
@ -940,7 +941,6 @@
<string name="title_style_size_small">Klein</string>
<string name="title_style_size_medium">Mittel</string>
<string name="title_style_size_large">Groß</string>
<string name="title_style_color">Farbe &#8230;</string>
<string name="title_style_align">Ausrichtung</string>
<string name="title_style_align_start">Anfang</string>
<string name="title_style_align_center">Zentriert</string>

4
app/src/main/res/values-de-rDE/strings.xml
Unescape View File

@ -155,6 +155,7 @@
<string name="title_setup_no_inbox">Posteingang nicht gefunden</string>
<string name="title_setup_advanced_protection">Wenn Sie sich in das erweiterte Schutzprogramm eingeschrieben haben, ist es nicht möglich, eine andere E-Mail-Anwendung von Dritten zu verwenden. Dies ist eine von Google auferlegte Einschränkung.</string>
<string name="title_setup_quick_success">Ein Konto wurde erfolgreich hinzugefügt</string>
<string name="title_setup_quick_configure">Um den Namen, die Farbe, die Wisch-Aktionen usw. zu bearbeiten</string>
<string name="title_setup_manage">Verwalten</string>
<string name="title_setup_grant">Zulassen</string>
<string name="title_setup_grant_again">Benötigte Rechte erteilen</string>
@ -516,7 +517,7 @@
<string name="title_advanced_timeout_hint">Die Zeitüberschreitung beim Lesen oder Schreiben wird auf das Doppelte der Verbindungszeitüberschreitung festgelegt. Höhere Werte führen zu einem höheren Akkuverbrauch.</string>
<string name="title_advanced_ssl_harden_hint">Wenn dies eingeschaltet ist, werden schwache SSL-Protokolle und Chiffren deaktiviert, was zu Verbindungsproblemen führen kann</string>
<string name="title_advanced_roaming_hint">Die Kopfzeilen der Nachrichten werden beim Roaming immer abgerufen. Sie können die Roaming-Einstellung des Gerätes verwenden, um das Internet während des Roamings zu deaktivieren.</string>
<string name="title_advanced_browse_hint">Durch Herunterscrollen weitere E-Mails laden</string>
<string name="title_advanced_browse_hint">Durch Herunterziehen weitere Nachrichten abholen</string>
<string name="title_advanced_layout_hint">Das Wechseln zu einer kompakteren Darstellung und Ändern der Nachrichtentextgröße kann im oberen Aktionsleistenmenü in der Nachrichtenansicht vorgenommen werden.</string>
<string name="title_advanced_startup_hint">Einen beliebigen Ordner in der Ordnerliste lange gedrückt halten, um ihn der Liste der Sammelordner hinzuzufügen oder ihn daraus zu entfernen</string>
<string name="title_advanced_beige_hint">Nur helle Designs</string>
@ -940,7 +941,6 @@
<string name="title_style_size_small">Klein</string>
<string name="title_style_size_medium">Mittel</string>
<string name="title_style_size_large">Groß</string>
<string name="title_style_color">Farbe &#8230;</string>
<string name="title_style_align">Ausrichtung</string>
<string name="title_style_align_start">Anfang</string>
<string name="title_style_align_center">Zentriert</string>

4
app/src/main/res/values-de-rLI/strings.xml
Unescape View File

@ -155,6 +155,7 @@
<string name="title_setup_no_inbox">Posteingang nicht gefunden</string>
<string name="title_setup_advanced_protection">Wenn Sie sich in das erweiterte Schutzprogramm eingeschrieben haben, ist es nicht möglich, eine andere E-Mail-Anwendung von Dritten zu verwenden. Dies ist eine von Google auferlegte Einschränkung.</string>
<string name="title_setup_quick_success">Ein Konto wurde erfolgreich hinzugefügt</string>
<string name="title_setup_quick_configure">Um den Namen, die Farbe, die Wisch-Aktionen usw. zu bearbeiten</string>
<string name="title_setup_manage">Verwalten</string>
<string name="title_setup_grant">Zulassen</string>
<string name="title_setup_grant_again">Benötigte Rechte erteilen</string>
@ -516,7 +517,7 @@
<string name="title_advanced_timeout_hint">Die Zeitüberschreitung beim Lesen oder Schreiben wird auf das Doppelte der Verbindungszeitüberschreitung festgelegt. Höhere Werte führen zu einem höheren Akkuverbrauch.</string>
<string name="title_advanced_ssl_harden_hint">Wenn dies eingeschaltet ist, werden schwache SSL-Protokolle und Chiffren deaktiviert, was zu Verbindungsproblemen führen kann</string>
<string name="title_advanced_roaming_hint">Die Kopfzeilen der Nachrichten werden beim Roaming immer abgerufen. Sie können die Roaming-Einstellung des Gerätes verwenden, um das Internet während des Roamings zu deaktivieren.</string>
<string name="title_advanced_browse_hint">Durch Herunterscrollen weitere E-Mails laden</string>
<string name="title_advanced_browse_hint">Durch Herunterziehen weitere Nachrichten abholen</string>
<string name="title_advanced_layout_hint">Das Wechseln zu einer kompakteren Darstellung und Ändern der Nachrichtentextgröße kann im oberen Aktionsleistenmenü in der Nachrichtenansicht vorgenommen werden.</string>
<string name="title_advanced_startup_hint">Einen beliebigen Ordner in der Ordnerliste lange gedrückt halten, um ihn der Liste der Sammelordner hinzuzufügen oder ihn daraus zu entfernen</string>
<string name="title_advanced_beige_hint">Nur helle Designs</string>
@ -940,7 +941,6 @@
<string name="title_style_size_small">Klein</string>
<string name="title_style_size_medium">Mittel</string>
<string name="title_style_size_large">Groß</string>
<string name="title_style_color">Farbe &#8230;</string>
<string name="title_style_align">Ausrichtung</string>
<string name="title_style_align_start">Anfang</string>
<string name="title_style_align_center">Zentriert</string>

2
app/src/main/res/values-el-rGR/strings.xml
Unescape View File

@ -154,6 +154,7 @@
<string name="title_setup_no_inbox">Δεν βρέθηκαν εισερχόμενα</string>
<string name="title_setup_advanced_protection">Δεν επιτρέπεται η χρήση ανεξάρτητων εφαρμογών ηλεκτρονικού ταχυδρομείου σε χρήστες εγγεγραμμένους/-ες σε πρόγραμμα αυξημένης ασφάλειας. Ο περιορισμός αυτός έχει επιβληθεί από την Google.</string>
<string name="title_setup_quick_success">Ένας λογαριασμός έχει προστεθεί με επιτυχία</string>
<string name="title_setup_quick_configure">Για να επεξεργαστείτε το όνομα, το χρώμα, τις ενέργειες σάρωσης κλπ</string>
<string name="title_setup_manage">Διαχείριση</string>
<string name="title_setup_grant">Παραχώρηση δικαιώματος</string>
<string name="title_setup_grant_again">Παραχώρηση απαιτούμενων δικαιωμάτων</string>
@ -937,7 +938,6 @@
<string name="title_style_size_small">Μικρά</string>
<string name="title_style_size_medium">Μεσαία</string>
<string name="title_style_size_large">Μεγάλα</string>
<string name="title_style_color">Χρώμα &#8230;</string>
<string name="title_style_align">Στοίχιση</string>
<string name="title_style_align_start">Αρχή</string>
<string name="title_style_align_center">Κέντρο</string>

1
app/src/main/res/values-en-rGB/strings.xml
Unescape View File

@ -47,7 +47,6 @@
<string name="title_trash">Delete</string>
<string name="title_compose">Compose</string>
<string name="title_send">Send</string>
<string name="title_style_color">Colour &#8230;</string>
<string name="title_legend_section_synchronize">Synchronise</string>
<string name="title_legend_section_folders">Folders</string>
<string name="title_legend_section_messages">Messages</string>

1
app/src/main/res/values-es-rES/strings.xml
Unescape View File

@ -937,7 +937,6 @@
<string name="title_style_size_small">Pequeño</string>
<string name="title_style_size_medium">Mediano</string>
<string name="title_style_size_large">Grande</string>
<string name="title_style_color">Color &#8230;</string>
<string name="title_style_align">Alinear</string>
<string name="title_style_align_start">Comienzo</string>
<string name="title_style_align_center">Centro</string>

1
app/src/main/res/values-fa-rIR/strings.xml
Unescape View File

@ -629,7 +629,6 @@
<string name="title_style_size_small">کوچک</string>
<string name="title_style_size_medium">متوسط</string>
<string name="title_style_size_large">بزرگ</string>
<string name="title_style_color">رنگ &#8230;</string>
<string name="title_style_align_start">آغاز</string>
<string name="title_style_list">فهرست</string>
<string name="title_style_font">فونت</string>

1
app/src/main/res/values-fi-rFI/strings.xml
Unescape View File

@ -930,7 +930,6 @@
<string name="title_style_size_small">Pieni</string>
<string name="title_style_size_medium">Keskikokoinen</string>
<string name="title_style_size_large">Suuri</string>
<string name="title_style_color">Väri &#8230;</string>
<string name="title_style_align">Tasaus</string>
<string name="title_style_align_start">Alku</string>
<string name="title_style_align_center">Keskikohta</string>

2
app/src/main/res/values-fr-rCA/strings.xml
Unescape View File

@ -154,6 +154,7 @@
<string name="title_setup_no_inbox">Boîte de réception introuvable</string>
<string name="title_setup_advanced_protection">Quand on est inscrit au programme de protection avancée, il n\'est pas possible d\'utiliser une application de messagerie tierce. Il s\'agit d\'une restriction imposée par Google.</string>
<string name="title_setup_quick_success">Un compte a été ajouté avec succès</string>
<string name="title_setup_quick_configure">Pour modifier le nom, la couleur, les actions de balayage, etc.</string>
<string name="title_setup_manage">Gérer</string>
<string name="title_setup_grant">Autoriser</string>
<string name="title_setup_grant_again">Accorder les autorisations requises</string>
@ -940,7 +941,6 @@
<string name="title_style_size_small">Petit</string>
<string name="title_style_size_medium">Moyen</string>
<string name="title_style_size_large">Grand</string>
<string name="title_style_color">Couleur&#8230;</string>
<string name="title_style_align">Aligner</string>
<string name="title_style_align_start">A gauche</string>
<string name="title_style_align_center">Centré</string>

2
app/src/main/res/values-fr-rFR/strings.xml
Unescape View File

@ -154,6 +154,7 @@
<string name="title_setup_no_inbox">Boîte de réception introuvable</string>
<string name="title_setup_advanced_protection">Une fois inscrit au programme de protection avancée, il n’est plus possible d’utiliser une application de messagerie tierce. Il s’agit d’une restriction imposée par Google.</string>
<string name="title_setup_quick_success">Un compte a été ajouté avec succès</string>
<string name="title_setup_quick_configure">Pour modifier le nom, la couleur, les actions de balayage, etc.</string>
<string name="title_setup_manage">Gérer</string>
<string name="title_setup_grant">Autoriser</string>
<string name="title_setup_grant_again">Accorder les autorisations requises</string>
@ -940,7 +941,6 @@
<string name="title_style_size_small">Petit</string>
<string name="title_style_size_medium">Moyen</string>
<string name="title_style_size_large">Grand</string>
<string name="title_style_color">Couleur&#8230;</string>
<string name="title_style_align">Aligner</string>
<string name="title_style_align_start">A gauche</string>
<string name="title_style_align_center">Centré</string>

1
app/src/main/res/values-fy-rNL/strings.xml
Unescape View File

@ -922,7 +922,6 @@
<string name="title_style_size_small">Lyts</string>
<string name="title_style_size_medium">Medium</string>
<string name="title_style_size_large">Grutte</string>
<string name="title_style_color">Kleur &#8230;</string>
<string name="title_style_align">Rjochtsje</string>
<string name="title_style_align_start">Start</string>
<string name="title_style_align_center">Sintrum</string>

1
app/src/main/res/values-gl-rES/strings.xml
Unescape View File

@ -922,7 +922,6 @@
<string name="title_style_size_small">Pequeno</string>
<string name="title_style_size_medium">Mediano</string>
<string name="title_style_size_large">Grande</string>
<string name="title_style_color">Color &#8230;</string>
<string name="title_style_align">Aliñar</string>
<string name="title_style_align_start">Inicio</string>
<string name="title_style_align_center">Centro</string>

1
app/src/main/res/values-hu-rHU/strings.xml
Unescape View File

@ -884,7 +884,6 @@
<string name="title_style_size_small">Kicsi</string>
<string name="title_style_size_medium">Közepes</string>
<string name="title_style_size_large">Nagy</string>
<string name="title_style_color">Szín &#8230;</string>
<string name="title_style_align">Igazítás</string>
<string name="title_style_align_start">Kezdet</string>
<string name="title_style_align_center">Középre</string>

1
app/src/main/res/values-in-rID/strings.xml
Unescape View File

@ -910,7 +910,6 @@
<string name="title_style_size_small">Kecil</string>
<string name="title_style_size_medium">Sedang</string>
<string name="title_style_size_large">Besar</string>
<string name="title_style_color">Warna &#8230;</string>
<string name="title_style_align">Format Perataan</string>
<string name="title_style_align_start">Mulai</string>
<string name="title_style_align_center">Tengah</string>

1
app/src/main/res/values-it-rIT/strings.xml
Unescape View File

@ -937,7 +937,6 @@
<string name="title_style_size_small">Piccolo</string>
<string name="title_style_size_medium">Medio</string>
<string name="title_style_size_large">Grande</string>
<string name="title_style_color">Colore&#8230;</string>
<string name="title_style_align">Allinea</string>
<string name="title_style_align_start">A sinistra</string>
<string name="title_style_align_center">Centrato</string>

4
app/src/main/res/values-ja-rJP/strings.xml
Unescape View File

@ -67,6 +67,7 @@
ルールの作成と使用はプロ機能です。</string>
<string name="title_junk_filter">ローカルのスパムフィルターを使用</string>
<string name="title_junk_filter_hint">これにより、バッテリー使用量が増加、そしてメッセージをスパムとして誤ってマークする可能性があります。</string>
<string name="title_junk_blocklist">迷惑メールブロックリストを使用する</string>
<string name="title_notification_sending">メールを送信中</string>
<string name="title_notification_waiting">接続を待機中</string>
<string name="title_notification_idle">待機</string>
@ -142,6 +143,7 @@
<string name="title_setup_no_inbox">受信トレイが見つかりません</string>
<string name="title_setup_advanced_protection">強度な保護機能を利用している場合、サードパーティのメールクライアントを使用することはできません。これはGoogleによって課せられている制限です。</string>
<string name="title_setup_quick_success">アカウントが追加されました</string>
<string name="title_setup_quick_configure">名前、色、スワイプアクションなどを編集する</string>
<string name="title_setup_manage">管理する</string>
<string name="title_setup_grant">付与</string>
<string name="title_setup_grant_again">必要な権限を付与する</string>
@ -833,6 +835,7 @@
<string name="title_move_undo">%1$s に移動中 (%2$d)</string>
<string name="title_open_with">開く</string>
<string name="title_authentication_failed">%1$sの認証に失敗しました</string>
<string name="title_on_blocklist">迷惑メールブロックリストにあります</string>
<string name="title_receipt_subject">開封確認: %1$s</string>
<string name="title_receipt_text">この開封確認メッセージはメッセージが表示されたことをお知らせするものです。受信者がメッセージの内容を読んだという保証はありません</string>
<string name="title_no_answers">返信テンプレートが定義されていません</string>
@ -926,7 +929,6 @@
<string name="title_style_size_small">小</string>
<string name="title_style_size_medium">標準</string>
<string name="title_style_size_large">大</string>
<string name="title_style_color">カラー &#8230;</string>
<string name="title_style_align">配置</string>
<string name="title_style_align_start">先頭</string>
<string name="title_style_align_center">中央</string>

1
app/src/main/res/values-ko-rKR/strings.xml
Unescape View File

@ -426,7 +426,6 @@
<string name="title_style_size_small">작게</string>
<string name="title_style_size_medium">보통</string>
<string name="title_style_size_large">크게</string>
<string name="title_style_color">색 &#8230;</string>
<string name="title_style_align">정렬</string>
<string name="title_style_align_start">시작</string>
<string name="title_style_align_center">가운데</string>

2
app/src/main/res/values-nl-rNL/strings.xml
Unescape View File

@ -154,6 +154,7 @@
<string name="title_setup_no_inbox">Postvak in niet gevonden</string>
<string name="title_setup_advanced_protection">Wanneer u bent ingeschreven voor het geavanceerde beveiligingsprogramma, is het niet mogelijk om een e-mailapp van derden te gebruiken. Dit is een door Google opgelegde beperking.</string>
<string name="title_setup_quick_success">Een account is succesvol toegevoegd</string>
<string name="title_setup_quick_configure">Om de naam, kleur, veeg acties, etc te bewerken</string>
<string name="title_setup_manage">Beheer</string>
<string name="title_setup_grant">Verlenen</string>
<string name="title_setup_grant_again">Verleen de vereiste machtigingen</string>
@ -940,7 +941,6 @@
<string name="title_style_size_small">Klein</string>
<string name="title_style_size_medium">Middelgroot</string>
<string name="title_style_size_large">Groot</string>
<string name="title_style_color">Kleur &#8230;</string>
<string name="title_style_align">Uitlijnen</string>
<string name="title_style_align_start">Begin</string>
<string name="title_style_align_center">Midden</string>

1
app/src/main/res/values-nn-rNO/strings.xml
Unescape View File

@ -814,7 +814,6 @@
<string name="title_style_size_small">Liten</string>
<string name="title_style_size_medium">Middels</string>
<string name="title_style_size_large">Stor</string>
<string name="title_style_color">Farge &#8230;</string>
<string name="title_style_align">Justering</string>
<string name="title_style_align_start">Start</string>
<string name="title_style_align_center">Midtstilt</string>

1
app/src/main/res/values-no-rNO/strings.xml
Unescape View File

@ -814,7 +814,6 @@
<string name="title_style_size_small">Liten</string>
<string name="title_style_size_medium">Middels</string>
<string name="title_style_size_large">Stor</string>
<string name="title_style_color">Farge &#8230;</string>
<string name="title_style_align">Justering</string>
<string name="title_style_align_start">Start</string>
<string name="title_style_align_center">Midtstilt</string>

1
app/src/main/res/values-pl-rPL/strings.xml
Unescape View File

@ -957,7 +957,6 @@
<string name="title_style_size_small">Mały</string>
<string name="title_style_size_medium">Średni</string>
<string name="title_style_size_large">Duży</string>
<string name="title_style_color">Kolor &#8230;</string>
<string name="title_style_align">Wyrównanie</string>
<string name="title_style_align_start">Na początku</string>
<string name="title_style_align_center">Wyśrodkowane</string>

1
app/src/main/res/values-pt-rBR/strings.xml
Unescape View File

@ -917,7 +917,6 @@
<string name="title_style_size_small">Pequeno</string>
<string name="title_style_size_medium">Médio</string>
<string name="title_style_size_large">Grande</string>
<string name="title_style_color">Cor &#8230;</string>
<string name="title_style_align">Alinhar</string>
<string name="title_style_align_start">Início</string>
<string name="title_style_align_center">Meio</string>

4
app/src/main/res/values-ro-rRO/strings.xml
Unescape View File

@ -88,6 +88,7 @@
</string>
<string name="title_junk_filter">Utilizați filtrul de spam local</string>
<string name="title_junk_filter_hint">Acest lucru poate crește utilizarea bateriei și marchează incorect mesajele ca spam</string>
<string name="title_junk_blocklist">Utilizați listele de blocare a spam-ului</string>
<string name="title_notification_sending">Se trimit mesaje</string>
<string name="title_notification_waiting">Se așteaptă o conexiune adecvată</string>
<string name="title_notification_idle">Inactiv</string>
@ -163,6 +164,7 @@
<string name="title_setup_no_inbox">Dosarul Primite nu a fost găsit</string>
<string name="title_setup_advanced_protection">Când sunteți înscris în programul avansat de protecție, nu este posibilă utilizarea unei aplicații de e-mail a unei terțe părți. Aceasta este o restricție impusă de Google.</string>
<string name="title_setup_quick_success">Un cont a fost adăugat cu succes</string>
<string name="title_setup_quick_configure">Pentru a edita numele, culoarea, acțiunile de glisare, etc</string>
<string name="title_setup_manage">Gestionează</string>
<string name="title_setup_grant">Acordă</string>
<string name="title_setup_grant_again">Acordați permisiunile necesare</string>
@ -854,6 +856,7 @@
<string name="title_move_undo">Se mută la %1$s (%2$d)</string>
<string name="title_open_with">Deschide cu</string>
<string name="title_authentication_failed">Autentificare %1$s eșuată</string>
<string name="title_on_blocklist">Pe lista de blocare spam</string>
<string name="title_receipt_subject">Confirmare de citire: %1$s</string>
<string name="title_receipt_text">Confirmarea de citire doar arată că mesajul a fost afișat. Nu există garanția că destinatarul a citit conținutul mesajului.</string>
<string name="title_no_answers">Nici un șablon de răspuns definit</string>
@ -947,7 +950,6 @@
<string name="title_style_size_small">Mic</string>
<string name="title_style_size_medium">Mediu</string>
<string name="title_style_size_large">Mare</string>
<string name="title_style_color">Culoare &#8230;</string>
<string name="title_style_align">Aliniere</string>
<string name="title_style_align_start">Start</string>
<string name="title_style_align_center">Centru</string>

1
app/src/main/res/values-ru-rRU/strings.xml
Unescape View File

@ -960,7 +960,6 @@
<string name="title_style_size_small">Маленький</string>
<string name="title_style_size_medium">Средний</string>
<string name="title_style_size_large">Большой</string>
<string name="title_style_color">Цвет&#8230;</string>
<string name="title_style_align">Выравнивание</string>
<string name="title_style_align_start">Слева</string>
<string name="title_style_align_center">По центру</string>

1
app/src/main/res/values-sk-rSK/strings.xml
Unescape View File

@ -954,7 +954,6 @@ Nastavenie vždy toto kompenzuje neustálym sledovaním zmien.</string>
<string name="title_style_size_small">Malé</string>
<string name="title_style_size_medium">Stredná</string>
<string name="title_style_size_large">Veľká</string>
<string name="title_style_color">Farba &#8230;</string>
<string name="title_style_align">Zarovnať</string>
<string name="title_style_align_start">Začiatok</string>
<string name="title_style_align_center">Stred</string>

1
app/src/main/res/values-sv-rSE/strings.xml
Unescape View File

@ -912,7 +912,6 @@
<string name="title_style_size_small">Liten</string>
<string name="title_style_size_medium">Medel</string>
<string name="title_style_size_large">Stor</string>
<string name="title_style_color">Färg &#8230;</string>
<string name="title_style_align">Justera</string>
<string name="title_style_align_start">Start</string>
<string name="title_style_align_center">Centrera</string>

1
app/src/main/res/values-tr-rTR/strings.xml
Unescape View File

@ -914,7 +914,6 @@
<string name="title_style_size_small">Küçük</string>
<string name="title_style_size_medium">Orta</string>
<string name="title_style_size_large">Büyük</string>
<string name="title_style_color">Renk &#8230;</string>
<string name="title_style_align">Hizala</string>
<string name="title_style_align_start">Başlat</string>
<string name="title_style_align_center">Merkez</string>

1
app/src/main/res/values-uk-rUA/strings.xml
Unescape View File

@ -944,7 +944,6 @@
<string name="title_style_size_small">Малий</string>
<string name="title_style_size_medium">Середній</string>
<string name="title_style_size_large">Великий</string>
<string name="title_style_color">Колір &#8230;</string>
<string name="title_style_align">Вирівнювання</string>
<string name="title_style_align_start">Початок</string>
<string name="title_style_align_center">По центру</string>

2
app/src/main/res/values-vi-rVN/strings.xml
Unescape View File

@ -144,6 +144,7 @@
<string name="title_setup_no_inbox">Không tìm thấy hộp thư đến</string>
<string name="title_setup_advanced_protection">Khi đã tham gia vào chương trình bảo vệ nâng cao, không thể dùng ứng dụng email bên thứ ba. Đây là sự hạn chế bị áp đặt bởi Google.</string>
<string name="title_setup_quick_success">Một tài khoản đã được thêm thành công</string>
<string name="title_setup_quick_configure">Để chỉnh sửa tên, màu sắc, hành động vuốt, v.v.</string>
<string name="title_setup_manage">Quản lý</string>
<string name="title_setup_grant">Cấp</string>
<string name="title_setup_grant_again">Cấp các quyền được yêu cầu</string>
@ -929,7 +930,6 @@
<string name="title_style_size_small">Nhỏ</string>
<string name="title_style_size_medium">Vừa</string>
<string name="title_style_size_large">Lớn</string>
<string name="title_style_color">Màu &#8230;</string>
<string name="title_style_align">Căn chỉnh</string>
<string name="title_style_align_start">Bắt đầu</string>
<string name="title_style_align_center">Chính giữa</string>

1
app/src/main/res/values-zh-rCN/strings.xml
Unescape View File

@ -926,7 +926,6 @@
<string name="title_style_size_small">小</string>
<string name="title_style_size_medium">中等</string>
<string name="title_style_size_large">大</string>
<string name="title_style_color">颜色 &#8230;</string>
<string name="title_style_align">对齐</string>
<string name="title_style_align_start">起始</string>
<string name="title_style_align_center">居中</string>

1
app/src/main/res/values-zh-rTW/strings.xml
Unescape View File

@ -842,7 +842,6 @@
<string name="title_style_size_small">小</string>
<string name="title_style_size_medium">中</string>
<string name="title_style_size_large">大</string>
<string name="title_style_color">顏色 &#8230;</string>
<string name="title_style_align">對齊</string>
<string name="title_style_align_start">置頭</string>
<string name="title_style_align_center">置中</string>

2
docs/FAQ-de-rAT.md
Unescape View File

@ -3038,7 +3038,7 @@ Angefragte Funktionen sollten:
* für die meisten Menschen nützlich sein
* die Nutzung von FairEmail nicht verkomplizieren
* zur Philosophie von FairEmail passen (privatsphären- und sicherheitsorientiert)
* den gängigen Standards entsprechen (IMAP, SMTP, etc)
* den gängigen Standards entsprechen (IMAP, SMTP usw.)
Funktionen, die diese Anforderungen nicht erfüllen, werden wahrscheinlich abgelehnt. Das soll auch langfristig die Wartung und Unterstützung ermöglichen.

2
docs/FAQ-de-rDE.md
Unescape View File

@ -3038,7 +3038,7 @@ Angefragte Funktionen sollten:
* für die meisten Menschen nützlich sein
* die Nutzung von FairEmail nicht verkomplizieren
* zur Philosophie von FairEmail passen (privatsphären- und sicherheitsorientiert)
* den gängigen Standards entsprechen (IMAP, SMTP, etc)
* den gängigen Standards entsprechen (IMAP, SMTP usw.)
Funktionen, die diese Anforderungen nicht erfüllen, werden wahrscheinlich abgelehnt. Das soll auch langfristig die Wartung und Unterstützung ermöglichen.

2
docs/FAQ-de-rLI.md
Unescape View File

@ -3038,7 +3038,7 @@ Angefragte Funktionen sollten:
* für die meisten Menschen nützlich sein
* die Nutzung von FairEmail nicht verkomplizieren
* zur Philosophie von FairEmail passen (privatsphären- und sicherheitsorientiert)
* den gängigen Standards entsprechen (IMAP, SMTP, etc)
* den gängigen Standards entsprechen (IMAP, SMTP usw.)
Funktionen, die diese Anforderungen nicht erfüllen, werden wahrscheinlich abgelehnt. Das soll auch langfristig die Wartung und Unterstützung ermöglichen.

Write Preview
Loading…
Cancel
Save