From b1ad9a542fd13c2836d01961f35c5302b4fbed3d Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 20 Jul 2020 13:41:22 +0200 Subject: [PATCH] Crowdin sync --- app/build.gradle | 21 ---------- .../assets/{SETUP-af.md => SETUP-af-rZA.md} | 0 .../{SETUP-ar-BH.md => SETUP-ar-rBH.md} | 0 .../{SETUP-ar-EG.md => SETUP-ar-rEG.md} | 0 .../{SETUP-ar-SA.md => SETUP-ar-rYE.md} | 0 .../{SETUP-ar-YE.md => SETUP-az-rAZ.md} | 0 .../assets/{SETUP-bg.md => SETUP-bg-rBG.md} | 0 .../{SETUP-pt-PT.md => SETUP-bn-rBD.md} | 6 +-- .../assets/{SETUP-sk.md => SETUP-bn-rIN.md} | 6 +-- .../assets/{SETUP-ca.md => SETUP-ca-rES.md} | 0 .../assets/{SETUP-cs.md => SETUP-cs-rCZ.md} | 0 .../assets/{SETUP-da.md => SETUP-da-rDK.md} | 0 .../assets/{SETUP-de.md => SETUP-de-rDE.md} | 6 +-- .../assets/{SETUP-ro.md => SETUP-el-rGR.md} | 16 ++++---- .../assets/{SETUP-ar.md => SETUP-en-rGB.md} | 0 .../{SETUP-es-ES.md => SETUP-es-rES.md} | 0 .../assets/{SETUP-eu.md => SETUP-eu-rES.md} | 0 app/src/main/assets/SETUP-fa-rIR.md | 41 +++++++++++++++++++ app/src/main/assets/SETUP-fa.md | 41 ------------------- .../assets/{SETUP-fi.md => SETUP-fi-rFI.md} | 0 .../{SETUP-fr-CA.md => SETUP-fr-rCA.md} | 0 .../assets/{SETUP-fr.md => SETUP-fr-rFR.md} | 0 .../{SETUP-fy-NL.md => SETUP-fy-rNL.md} | 0 .../assets/{SETUP-az.md => SETUP-gl-rES.md} | 0 .../assets/{SETUP-hr.md => SETUP-hr-rHR.md} | 0 .../assets/{SETUP-hu.md => SETUP-hu-rHU.md} | 0 .../assets/{SETUP-it.md => SETUP-it-rIT.md} | 0 .../{SETUP-bn-IN.md => SETUP-iw-rIL.md} | 0 .../assets/{SETUP-ja.md => SETUP-ja-rJP.md} | 0 .../assets/{SETUP-bn.md => SETUP-ko-rKR.md} | 0 .../assets/{SETUP-el.md => SETUP-lt-rLT.md} | 0 .../assets/{SETUP-nl.md => SETUP-nl-rNL.md} | 2 +- .../{SETUP-nn-NO.md => SETUP-nn-rNO.md} | 0 .../assets/{SETUP-no.md => SETUP-no-rNO.md} | 0 .../assets/{SETUP-pl.md => SETUP-pl-rPL.md} | 0 .../{SETUP-pt-BR.md => SETUP-pt-rBR.md} | 0 .../{SETUP-en-GB.md => SETUP-pt-rPT.md} | 0 .../assets/{SETUP-gl.md => SETUP-ro-rRO.md} | 0 .../assets/{SETUP-ru.md => SETUP-ru-rRU.md} | 8 ++-- app/src/main/assets/SETUP-sk-rSK.md | 41 +++++++++++++++++++ .../assets/{SETUP-sl.md => SETUP-sl-rSI.md} | 0 .../assets/{SETUP-sr.md => SETUP-sr-rSP.md} | 0 .../{SETUP-sv-SE.md => SETUP-sv-rSE.md} | 0 .../assets/{SETUP-tr.md => SETUP-tr-rTR.md} | 0 .../assets/{SETUP-he.md => SETUP-uk-rUA.md} | 0 app/src/main/assets/SETUP-uk.md | 41 ------------------- .../assets/{SETUP-ko.md => SETUP-vi-rVN.md} | 0 app/src/main/assets/SETUP-vi.md | 41 ------------------- app/src/main/assets/SETUP-zh-TW.md | 41 ------------------- .../{SETUP-zh-CN.md => SETUP-zh-rCN.md} | 0 .../assets/{SETUP-lt.md => SETUP-zh-rTW.md} | 24 +++++------ .../email/FragmentDialogMarkdown.java | 12 +++--- app/src/main/res/values-es-rES/strings.xml | 4 ++ app/src/main/res/values-ru-rRU/strings.xml | 2 + 54 files changed, 129 insertions(+), 224 deletions(-) rename app/src/main/assets/{SETUP-af.md => SETUP-af-rZA.md} (100%) rename app/src/main/assets/{SETUP-ar-BH.md => SETUP-ar-rBH.md} (100%) rename app/src/main/assets/{SETUP-ar-EG.md => SETUP-ar-rEG.md} (100%) rename app/src/main/assets/{SETUP-ar-SA.md => SETUP-ar-rYE.md} (100%) rename app/src/main/assets/{SETUP-ar-YE.md => SETUP-az-rAZ.md} (100%) rename app/src/main/assets/{SETUP-bg.md => SETUP-bg-rBG.md} (100%) rename app/src/main/assets/{SETUP-pt-PT.md => SETUP-bn-rBD.md} (78%) rename app/src/main/assets/{SETUP-sk.md => SETUP-bn-rIN.md} (78%) rename app/src/main/assets/{SETUP-ca.md => SETUP-ca-rES.md} (100%) rename app/src/main/assets/{SETUP-cs.md => SETUP-cs-rCZ.md} (100%) rename app/src/main/assets/{SETUP-da.md => SETUP-da-rDK.md} (100%) rename app/src/main/assets/{SETUP-de.md => SETUP-de-rDE.md} (94%) rename app/src/main/assets/{SETUP-ro.md => SETUP-el-rGR.md} (61%) rename app/src/main/assets/{SETUP-ar.md => SETUP-en-rGB.md} (100%) rename app/src/main/assets/{SETUP-es-ES.md => SETUP-es-rES.md} (100%) rename app/src/main/assets/{SETUP-eu.md => SETUP-eu-rES.md} (100%) create mode 100644 app/src/main/assets/SETUP-fa-rIR.md delete mode 100644 app/src/main/assets/SETUP-fa.md rename app/src/main/assets/{SETUP-fi.md => SETUP-fi-rFI.md} (100%) rename app/src/main/assets/{SETUP-fr-CA.md => SETUP-fr-rCA.md} (100%) rename app/src/main/assets/{SETUP-fr.md => SETUP-fr-rFR.md} (100%) rename app/src/main/assets/{SETUP-fy-NL.md => SETUP-fy-rNL.md} (100%) rename app/src/main/assets/{SETUP-az.md => SETUP-gl-rES.md} (100%) rename app/src/main/assets/{SETUP-hr.md => SETUP-hr-rHR.md} (100%) rename app/src/main/assets/{SETUP-hu.md => SETUP-hu-rHU.md} (100%) rename app/src/main/assets/{SETUP-it.md => SETUP-it-rIT.md} (100%) rename app/src/main/assets/{SETUP-bn-IN.md => SETUP-iw-rIL.md} (100%) rename app/src/main/assets/{SETUP-ja.md => SETUP-ja-rJP.md} (100%) rename app/src/main/assets/{SETUP-bn.md => SETUP-ko-rKR.md} (100%) rename app/src/main/assets/{SETUP-el.md => SETUP-lt-rLT.md} (100%) rename app/src/main/assets/{SETUP-nl.md => SETUP-nl-rNL.md} (98%) rename app/src/main/assets/{SETUP-nn-NO.md => SETUP-nn-rNO.md} (100%) rename app/src/main/assets/{SETUP-no.md => SETUP-no-rNO.md} (100%) rename app/src/main/assets/{SETUP-pl.md => SETUP-pl-rPL.md} (100%) rename app/src/main/assets/{SETUP-pt-BR.md => SETUP-pt-rBR.md} (100%) rename app/src/main/assets/{SETUP-en-GB.md => SETUP-pt-rPT.md} (100%) rename app/src/main/assets/{SETUP-gl.md => SETUP-ro-rRO.md} (100%) rename app/src/main/assets/{SETUP-ru.md => SETUP-ru-rRU.md} (91%) create mode 100644 app/src/main/assets/SETUP-sk-rSK.md rename app/src/main/assets/{SETUP-sl.md => SETUP-sl-rSI.md} (100%) rename app/src/main/assets/{SETUP-sr.md => SETUP-sr-rSP.md} (100%) rename app/src/main/assets/{SETUP-sv-SE.md => SETUP-sv-rSE.md} (100%) rename app/src/main/assets/{SETUP-tr.md => SETUP-tr-rTR.md} (100%) rename app/src/main/assets/{SETUP-he.md => SETUP-uk-rUA.md} (100%) delete mode 100644 app/src/main/assets/SETUP-uk.md rename app/src/main/assets/{SETUP-ko.md => SETUP-vi-rVN.md} (100%) delete mode 100644 app/src/main/assets/SETUP-vi.md delete mode 100644 app/src/main/assets/SETUP-zh-TW.md rename app/src/main/assets/{SETUP-zh-CN.md => SETUP-zh-rCN.md} (100%) rename app/src/main/assets/{SETUP-lt.md => SETUP-zh-rTW.md} (62%) diff --git a/app/build.gradle b/app/build.gradle index ad0f6d1d7e..5d01592e19 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -185,26 +185,6 @@ task copyMarkdown(type: Copy) { } preBuild.dependsOn copyMarkdown -task copySetup(type: Copy) { - from "src/main/res" - include '**/SETUP.md' - into "src/main/assets" - eachFile { file -> - file.relativePath = new RelativePath(true, "SETUP-${file.file.parentFile.name}.md") - } - includeEmptyDirs = false -} -preBuild.dependsOn copySetup - -task cleanCrowdin(type: Delete) { - delete fileTree("src/main/res").matching { - include "**/SETUP.md" - include "**/PLAYSTORE.txt" - } -} -preBuild.dependsOn cleanCrowdin -cleanCrowdin.shouldRunAfter copySetup - repositories { google() jcenter() @@ -260,7 +240,6 @@ dependencies { def badge_version = "1.1.22" def bugsnag_version = "5.0.0" def biweekly_version = "0.6.3" - def photoview_version = "2.3.0" def relinker_version = "1.3.1" def markwon_version = "4.4.0" def bouncycastle_version = "1.66" diff --git a/app/src/main/assets/SETUP-af.md b/app/src/main/assets/SETUP-af-rZA.md similarity index 100% rename from app/src/main/assets/SETUP-af.md rename to app/src/main/assets/SETUP-af-rZA.md diff --git a/app/src/main/assets/SETUP-ar-BH.md b/app/src/main/assets/SETUP-ar-rBH.md similarity index 100% rename from app/src/main/assets/SETUP-ar-BH.md rename to app/src/main/assets/SETUP-ar-rBH.md diff --git a/app/src/main/assets/SETUP-ar-EG.md b/app/src/main/assets/SETUP-ar-rEG.md similarity index 100% rename from app/src/main/assets/SETUP-ar-EG.md rename to app/src/main/assets/SETUP-ar-rEG.md diff --git a/app/src/main/assets/SETUP-ar-SA.md b/app/src/main/assets/SETUP-ar-rYE.md similarity index 100% rename from app/src/main/assets/SETUP-ar-SA.md rename to app/src/main/assets/SETUP-ar-rYE.md diff --git a/app/src/main/assets/SETUP-ar-YE.md b/app/src/main/assets/SETUP-az-rAZ.md similarity index 100% rename from app/src/main/assets/SETUP-ar-YE.md rename to app/src/main/assets/SETUP-az-rAZ.md diff --git a/app/src/main/assets/SETUP-bg.md b/app/src/main/assets/SETUP-bg-rBG.md similarity index 100% rename from app/src/main/assets/SETUP-bg.md rename to app/src/main/assets/SETUP-bg-rBG.md diff --git a/app/src/main/assets/SETUP-pt-PT.md b/app/src/main/assets/SETUP-bn-rBD.md similarity index 78% rename from app/src/main/assets/SETUP-pt-PT.md rename to app/src/main/assets/SETUP-bn-rBD.md index 6f32ebfc5e..d6e0fc2da8 100644 --- a/app/src/main/assets/SETUP-pt-PT.md +++ b/app/src/main/assets/SETUP-bn-rBD.md @@ -1,8 +1,8 @@ -# Setup help +# সেটআপের সাহায্য -Setting up FairEmail is fairly simple. You'll need to add at least one account to receive email and at least one identity if you want to send email. The quick setup will add an account and an identity in one go for most major providers. +ফেয়ারমেল ঠিক করা বেশ সহজ। তোমার অন্ততপক্ষে একটা অ্যাকাউন্ট লাগবে ইমেইল পেতে এবং একটা পরিচয় যদি তুমি ইমেইল পাঠাতে চাও। এই দ্রুত সেটআপ অংশ তোমাকে বেশিরভাগ বড় প্রোভাইডারের একটা অ্যাকাউন্ট এবং একটা পরিচয় যোগ করতে সাহায্য করবে। -## Requirements +## প্রয়োজনসমূহ An internet connection is required to set up accounts and identities. diff --git a/app/src/main/assets/SETUP-sk.md b/app/src/main/assets/SETUP-bn-rIN.md similarity index 78% rename from app/src/main/assets/SETUP-sk.md rename to app/src/main/assets/SETUP-bn-rIN.md index 6f32ebfc5e..d6e0fc2da8 100644 --- a/app/src/main/assets/SETUP-sk.md +++ b/app/src/main/assets/SETUP-bn-rIN.md @@ -1,8 +1,8 @@ -# Setup help +# সেটআপের সাহায্য -Setting up FairEmail is fairly simple. You'll need to add at least one account to receive email and at least one identity if you want to send email. The quick setup will add an account and an identity in one go for most major providers. +ফেয়ারমেল ঠিক করা বেশ সহজ। তোমার অন্ততপক্ষে একটা অ্যাকাউন্ট লাগবে ইমেইল পেতে এবং একটা পরিচয় যদি তুমি ইমেইল পাঠাতে চাও। এই দ্রুত সেটআপ অংশ তোমাকে বেশিরভাগ বড় প্রোভাইডারের একটা অ্যাকাউন্ট এবং একটা পরিচয় যোগ করতে সাহায্য করবে। -## Requirements +## প্রয়োজনসমূহ An internet connection is required to set up accounts and identities. diff --git a/app/src/main/assets/SETUP-ca.md b/app/src/main/assets/SETUP-ca-rES.md similarity index 100% rename from app/src/main/assets/SETUP-ca.md rename to app/src/main/assets/SETUP-ca-rES.md diff --git a/app/src/main/assets/SETUP-cs.md b/app/src/main/assets/SETUP-cs-rCZ.md similarity index 100% rename from app/src/main/assets/SETUP-cs.md rename to app/src/main/assets/SETUP-cs-rCZ.md diff --git a/app/src/main/assets/SETUP-da.md b/app/src/main/assets/SETUP-da-rDK.md similarity index 100% rename from app/src/main/assets/SETUP-da.md rename to app/src/main/assets/SETUP-da-rDK.md diff --git a/app/src/main/assets/SETUP-de.md b/app/src/main/assets/SETUP-de-rDE.md similarity index 94% rename from app/src/main/assets/SETUP-de.md rename to app/src/main/assets/SETUP-de-rDE.md index 6a7a1e22aa..267251bf4e 100644 --- a/app/src/main/assets/SETUP-de.md +++ b/app/src/main/assets/SETUP-de-rDE.md @@ -10,7 +10,7 @@ Für die Einrichtung von Konten und Identitäten ist eine Internetverbindung erf Geben Sie Ihren Namen, E-Mail-Adresse und Passwort ein und tippen Sie auf *prüfen*. -Dies funktioniert für die meisten großen E-Mail-Anbieter. +Das funktioniert für die meisten großen E-Mail-Anbieter. Wenn die Schnelleinrichtung nicht funktioniert, müssen Sie Konto und Identität manuell einrichten, siehe Anweisungen unten. @@ -20,13 +20,13 @@ Um ein Konto hinzuzufügen, tippen Sie unter 'Konten einrichten' auf *Verwalten* Wenn Ihr Provider nicht in der Liste der Anbieter ist, wählen Sie *Benutzerdefiniert*. Geben Sie den Domain-Namen ein, zum Beispiel *gmail.com*, und tippen Sie auf *Einstellungen abrufen*. Wenn Ihr Provider [Auto-discovery](https://tools.ietf.org/html/rfc6186) unterstützt, wird FairEmail den Hostnamen und die Portnummer ausfüllen, so dass Sie die Angaben Ihres Providers für den richtigen IMAP-Hostnamen, Port-Nummer und Protokoll (SSL/TLS oder STARTTLS) nur noch überprüfen müssen. Weitere Informationen dazu finden Sie [hier](https://github.com/M66B/FairEmail/blob/master/FAQ.md#authorizing-accounts). -## Identität einrichten - um E-Mail zu senden +## Identität einrichten – um E-Mail zu senden Vergleichbar mit der Konto-Einrichtung tippen Sie unter 'Identitäten einrichten' auf *Verwalten* und tippen Sie dann auf den orange-farbenen Button mit dem *Plus-Zeichen* unten. Geben Sie den Namen ein, der in E-Mails, die Sie von dieser Absender-Adresse senden, erscheinen soll, und wählen Sie ein verknüpftes Konto. Tippen Sie auf *Speichern*, um die Identität hinzuzufügen. Wenn das Konto manuell konfiguriert wurde, müssen Sie wahrscheinlich auch die Identität manuell konfigurieren. Geben Sie den Domain-Namen ein, zum Beispiel *gmail.com*, und tippen Sie auf *Einstellungen abrufen*. Wenn Ihr Provider [Auto-discovery](https://tools.ietf.org/html/rfc6186) unterstützt, wird FairEmail den Hostnamen und die Portnummer ausfüllen, so dass Sie die Angaben Ihres Providers für den richtigen IMAP-Hostnamen, Port-Nummer und Protokoll (SSL/TLS oder STARTTLS) nur noch überprüfen müssen. -Siehe [diese FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ9) zur Verwendung von Alias-Adressen. +Zur Verwendung von Alias-Adressen bitte [diese F&A](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ9) beachten. ## Berechtigungen gewähren - Zugriff auf Kontaktinformationen diff --git a/app/src/main/assets/SETUP-ro.md b/app/src/main/assets/SETUP-el-rGR.md similarity index 61% rename from app/src/main/assets/SETUP-ro.md rename to app/src/main/assets/SETUP-el-rGR.md index 6f32ebfc5e..eb00cd6488 100644 --- a/app/src/main/assets/SETUP-ro.md +++ b/app/src/main/assets/SETUP-el-rGR.md @@ -1,18 +1,18 @@ -# Setup help +# Βοήθεια για τη ρύθμιση -Setting up FairEmail is fairly simple. You'll need to add at least one account to receive email and at least one identity if you want to send email. The quick setup will add an account and an identity in one go for most major providers. +Η ρύθμιση του FairEmail είναι αρκετά απλή. Θα χρειαστεί να προσθέσετε τουλάχιστον έναν λογαριασμό για να λάβετε email και τουλάχιστον μία ταυτότητα χρήστη εάν θέλετε να στείλετε email. Αυτός ο γρήγορος οδηγός ρύθμισης θα προσθέσει έναν λογαριασμό και μία ταυτότητα χρήστη ταυτόχρονα, τουλάχιστον για τους περισσότερους γνωστούς παρόχους υπηρεσιών email. -## Requirements +## Απαιτήσεις -An internet connection is required to set up accounts and identities. +Απαιτείται σύνδεση στο internet για να ρυθμιστούν νέοι λογαριασμοί και ταυτότητες χρήστη. -## Quick setup +## Γρήγορη ρύθμιση -Just enter your name, email address and password and tap *Go*. +Απλώς εισαγάγετε το όνομά σας, τη διεύθυνση email σας, και τον κωδικό σας, και πατήστε *Πάμε*. -This will work for most major email providers. +Αυτό θα λειτουργήσει με επιτυχία για τους περισσότερους γνωστούς παρόχους υπηρεσιών email. -If the quick setup doesn't work, you'll need to setup an account and an identity in another way, see below for instructions. +Εάν η γρήγορη ρύθμιση αποτύχει, θα χρειαστεί να ρυθμίσετε έναν λογαριασμό και μία ταυτότητα χρήστη με διαφορετικό τρόπο, δείτε παρακάτω για λεπτομέρειες. ## Set up account - to receive email diff --git a/app/src/main/assets/SETUP-ar.md b/app/src/main/assets/SETUP-en-rGB.md similarity index 100% rename from app/src/main/assets/SETUP-ar.md rename to app/src/main/assets/SETUP-en-rGB.md diff --git a/app/src/main/assets/SETUP-es-ES.md b/app/src/main/assets/SETUP-es-rES.md similarity index 100% rename from app/src/main/assets/SETUP-es-ES.md rename to app/src/main/assets/SETUP-es-rES.md diff --git a/app/src/main/assets/SETUP-eu.md b/app/src/main/assets/SETUP-eu-rES.md similarity index 100% rename from app/src/main/assets/SETUP-eu.md rename to app/src/main/assets/SETUP-eu-rES.md diff --git a/app/src/main/assets/SETUP-fa-rIR.md b/app/src/main/assets/SETUP-fa-rIR.md new file mode 100644 index 0000000000..59ea421e02 --- /dev/null +++ b/app/src/main/assets/SETUP-fa-rIR.md @@ -0,0 +1,41 @@ +# راهنمای راه‌اندازی + +راه‌اندازی FairEmail بسیار آسان است. شما برای دریافت ایمیل حداقل به یک حساب و برای ارسال ایمیل حداقل به یک هویت نیاز دارید. راه‌اندازی سریع یک حساب و یک هویت را برای بیشتر فراهم‌کنندگان عمده خواهد افزود. + +## پیش‌نیاز‌ها + +یک اتصال اینترنت برای راه‌اندازی حساب‌ها و هویت‌ها مورد نیاز است. + +## راه اندازی سریع + +تنها نام، نشانی ایمیل و گذرواژه خود را وارد کنید و روی * برو* بزنید. + +این برای بیشتر فراهم‌کنندگان ایمیل کار خواهد کرد. + +اگر راه‌اندازی سریع کار نکرد، شما باید یک حساب و یک هویت با روشی دیگر راه‌اندازی کنید، دستورات زیر را ببینید. + +## راه‌اندازی حساب برای دریافت ایمیل + +برای افزودن یک حساب، روی *مدیریت حساب‌ها* و دکمه نارنجی *افزودن* در زیر، بزنید. یک فراهم‌کننده از فهرست انتخاب کنید، نام کاربری را وارد کرده، که در بیشتر موارد نشانی ایمیل شماست، سپس گذرواژه خود را وارد کنید. روی *بررسی* بزنید تا FairEmail بتواند به سرورهای ایمیل متصل شود و فهرستی از پوشه‌های سیستم را واکشی کند. پس از بازبینی پوشه سیستم، شما می‌توانید حساب را با زدن روی *ذخیره* بیفزایید. + +اگر فراهم‌کننده شما در فهرست فراهم‌کنندگان نیست، *سفارشی* را انتخاب کنید. نام دامنه را وارد کنید، برای مثال *gmail.com* و روی *دریافت تنظیمات* بزنید. اگر فراهم‌کننده شما از [کشف-خودکار](https://tools.ietf.org/html/rfc6186) پشتیبانی می‌کند، FairEmail نام هاست و شماره درگاه را پر خواهد کرد، در غیر این صورت برای نام هاست IMAP، شماره درگاه و پروتکل(SSL/TLS یا STARTTLS) درست، دستورات راه‌اندازی فراهم‌کنندتان را بررسی کنید. برای آگاهی بیشتر [اینجا](https://github.com/M66B/FairEmail/blob/master/FAQ.md#authorizing-accounts) را ببینید. + +## راه‌اندازی هویت برای ارسال ایمیل + +مشابه، افزودن یک حساب، روی *مدیریت هویت* زده و سپس روی دکمه نارنجی *افزودن* در زیر بزنید. نامی که می‌خواهید در نشانی‌های ایمیل‌هایی که می‌فرستید نمایش داده شود، را وارد کنید و یک حساب متصل را انتخاب کنید. برای افزودن هویت روی *ذخیره* بزنید. + +اگر حساب، دستی پیکربندی شده باشد، شما به احتمال زیاد باید هویت را نیز دستی پیکربندی کنید. نام دامنه را وارد کنید، برای مثال *gmail.com* و روی *دریافت تنظیمات* بزنید. اگر فراهم‌کننده شما از [کشف-خودکار](https://tools.ietf.org/html/rfc6186) پشتیبانی می‌کند، FairEmail نام هاست و شماره درگاه را پر خواهد کرد، در غیر این صورت برای نام هاست SMTP، شماره درگاه و پروتکل(SSL/TLS یا STARTTLS) درست، دستورات راه‌اندازی فراهم‌کنندتان را بررسی کنید. + +به [سوالات متداول](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ9) درباره بکارگیری نام‌های مستعار مراجعه کنید. + +## اجازه دسترسی به اطلاعات مخاطبین را بدهید + +اگر می‌خواهید نشانی ایمیل را جستجو کنید، عکس مخاطبین برایتان نمایش داده شود، و دیگر چیزها، باید مجوز خواندن مخاطبین را به FairEmail بدهید. تنها روی *اعطای دسترسی* بزنید و *اجازه دادن* را انتخاب کنید. + +## بهینه‌سازی باتری را تنظیم کنید تا به طور مداوم ایمیل‌ها را دریافت کنید + +در نگارش‌های اخیر اندروید، اندروید برنامه‌ها را برای مدتی هنگامی که صفحه نمایش خاموش می‌شود به‌خاطر کاهش مصرف باتری در حالت خواب قرار خواهد داد. اگر می‌خواهید ایمیل‌های جدید را بدون درنگ دریافت کنید، باید بهینه‌سازی باتری را برای FairEmail غیرفعال کنید. روی *غیر فعال‌سازی بهینه‌سازی باتری* بزنید و دستورات را دنبال کنید. + +## پرسش‌ها یا مشکلات + +اگر پرسش یا مشکلی دارید، خواهشمند است برای کمک [اینجا را ببینید](https://github.com/M66B/FairEmail/blob/master/FAQ.md). \ No newline at end of file diff --git a/app/src/main/assets/SETUP-fa.md b/app/src/main/assets/SETUP-fa.md deleted file mode 100644 index 0504dc55bd..0000000000 --- a/app/src/main/assets/SETUP-fa.md +++ /dev/null @@ -1,41 +0,0 @@ -# راهنمای راه‌اندازی - -راه‌اندازی FairEmail بسیار آسان است. شما برای دریافت ایمیل به حداقل یک حساب و برای ارسال ایمیل حداقل به یک هویت نیاز دارید. راه‌اندازی سریع یک حساب و یک هویت را برای بیشتر ارائه دهندگان عمده خواهد افزود. - -## پیش‌نیاز‌ها - -یک اتصال اینترنت برای راه‌اندازی حساب‌ها و هویت‌ها مورد نیاز است. - -## راه اندازی سریع - -Just enter your name, email address and password and tap *Go*. - -This will work for most major email providers. - -If the quick setup doesn't work, you'll need to setup an account and an identity in another way, see below for instructions. - -## راه‌اندازی حساب برای دریافت ایمیل - -To add an account, tap *Manage accounts* and tap the orange *add* button at the bottom. Select a provider from the list, enter the username, which is mostly your email address and enter your password. Tap *Check* to let FairEmail connect to the email server and fetch a list of system folders. After reviewing the system folder selection you can add the account by tapping *Save*. - -If your provider is not in the list of providers, select *Custom*. Enter the domain name, for example *gmail.com* and tap *Get settings*. If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number, else check the setup instructions of your provider for the right IMAP hostname, port number and protocol (SSL/TLS or STARTTLS). For more about this, please see [here](https://github.com/M66B/FairEmail/blob/master/FAQ.md#authorizing-accounts). - -## راه‌اندازی هویت برای ارسال ایمیل - -Similarly, to add an identity, tap *Manage identity* and tap the orange *add* button at the bottom. Enter the name you want to appear in the from address of the emails you send and select a linked account. Tap *Save* to add the identity. - -If the account was configured manually, you likely need to configure the identity manually too. Enter the domain name, for example *gmail.com* and tap *Get settings*. If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number, else check the setup instructions of your provider for the right SMTP hostname, port number and protocol (SSL/TLS or STARTTLS). - -See [this FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ9) about using aliases. - -## اجازه دسترسی به اطلاعات مخاطبین را بدهید - -If you want to lookup email addresses, have contact photos shown, etc, you'll need to grant read contacts permission to FairEmail. Just tap *Grant permissions* and select *Allow*. - -## بهینه‌سازی باتری را تنظیم کنید تا به طور مداوم ایمیل‌ها را دریافت کنید - -On recent Android versions, Android will put apps to sleep when the screen is off for some time to reduce battery usage. If you want to receive new emails without delays, you should disable battery optimizations for FairEmail. Tap *Disable battery optimizations* and follow the instructions. - -## سوالات یا مشکلات - -If you have a question or problem, please [see here](https://github.com/M66B/FairEmail/blob/master/FAQ.md) for help. \ No newline at end of file diff --git a/app/src/main/assets/SETUP-fi.md b/app/src/main/assets/SETUP-fi-rFI.md similarity index 100% rename from app/src/main/assets/SETUP-fi.md rename to app/src/main/assets/SETUP-fi-rFI.md diff --git a/app/src/main/assets/SETUP-fr-CA.md b/app/src/main/assets/SETUP-fr-rCA.md similarity index 100% rename from app/src/main/assets/SETUP-fr-CA.md rename to app/src/main/assets/SETUP-fr-rCA.md diff --git a/app/src/main/assets/SETUP-fr.md b/app/src/main/assets/SETUP-fr-rFR.md similarity index 100% rename from app/src/main/assets/SETUP-fr.md rename to app/src/main/assets/SETUP-fr-rFR.md diff --git a/app/src/main/assets/SETUP-fy-NL.md b/app/src/main/assets/SETUP-fy-rNL.md similarity index 100% rename from app/src/main/assets/SETUP-fy-NL.md rename to app/src/main/assets/SETUP-fy-rNL.md diff --git a/app/src/main/assets/SETUP-az.md b/app/src/main/assets/SETUP-gl-rES.md similarity index 100% rename from app/src/main/assets/SETUP-az.md rename to app/src/main/assets/SETUP-gl-rES.md diff --git a/app/src/main/assets/SETUP-hr.md b/app/src/main/assets/SETUP-hr-rHR.md similarity index 100% rename from app/src/main/assets/SETUP-hr.md rename to app/src/main/assets/SETUP-hr-rHR.md diff --git a/app/src/main/assets/SETUP-hu.md b/app/src/main/assets/SETUP-hu-rHU.md similarity index 100% rename from app/src/main/assets/SETUP-hu.md rename to app/src/main/assets/SETUP-hu-rHU.md diff --git a/app/src/main/assets/SETUP-it.md b/app/src/main/assets/SETUP-it-rIT.md similarity index 100% rename from app/src/main/assets/SETUP-it.md rename to app/src/main/assets/SETUP-it-rIT.md diff --git a/app/src/main/assets/SETUP-bn-IN.md b/app/src/main/assets/SETUP-iw-rIL.md similarity index 100% rename from app/src/main/assets/SETUP-bn-IN.md rename to app/src/main/assets/SETUP-iw-rIL.md diff --git a/app/src/main/assets/SETUP-ja.md b/app/src/main/assets/SETUP-ja-rJP.md similarity index 100% rename from app/src/main/assets/SETUP-ja.md rename to app/src/main/assets/SETUP-ja-rJP.md diff --git a/app/src/main/assets/SETUP-bn.md b/app/src/main/assets/SETUP-ko-rKR.md similarity index 100% rename from app/src/main/assets/SETUP-bn.md rename to app/src/main/assets/SETUP-ko-rKR.md diff --git a/app/src/main/assets/SETUP-el.md b/app/src/main/assets/SETUP-lt-rLT.md similarity index 100% rename from app/src/main/assets/SETUP-el.md rename to app/src/main/assets/SETUP-lt-rLT.md diff --git a/app/src/main/assets/SETUP-nl.md b/app/src/main/assets/SETUP-nl-rNL.md similarity index 98% rename from app/src/main/assets/SETUP-nl.md rename to app/src/main/assets/SETUP-nl-rNL.md index d5018c1571..366bff1519 100644 --- a/app/src/main/assets/SETUP-nl.md +++ b/app/src/main/assets/SETUP-nl-rNL.md @@ -1,4 +1,4 @@ -# Help bij instellen +# Hulp bij instellen Het instellen van FairEmail is vrij eenvoudig. U moet ten minste één account toevoegen om e-mail te ontvangen en ten minste één identiteit om e-mail te verzenden. Snel instellen zal in één keer een account en een identiteit toevoegen voor de meeste grote providers. diff --git a/app/src/main/assets/SETUP-nn-NO.md b/app/src/main/assets/SETUP-nn-rNO.md similarity index 100% rename from app/src/main/assets/SETUP-nn-NO.md rename to app/src/main/assets/SETUP-nn-rNO.md diff --git a/app/src/main/assets/SETUP-no.md b/app/src/main/assets/SETUP-no-rNO.md similarity index 100% rename from app/src/main/assets/SETUP-no.md rename to app/src/main/assets/SETUP-no-rNO.md diff --git a/app/src/main/assets/SETUP-pl.md b/app/src/main/assets/SETUP-pl-rPL.md similarity index 100% rename from app/src/main/assets/SETUP-pl.md rename to app/src/main/assets/SETUP-pl-rPL.md diff --git a/app/src/main/assets/SETUP-pt-BR.md b/app/src/main/assets/SETUP-pt-rBR.md similarity index 100% rename from app/src/main/assets/SETUP-pt-BR.md rename to app/src/main/assets/SETUP-pt-rBR.md diff --git a/app/src/main/assets/SETUP-en-GB.md b/app/src/main/assets/SETUP-pt-rPT.md similarity index 100% rename from app/src/main/assets/SETUP-en-GB.md rename to app/src/main/assets/SETUP-pt-rPT.md diff --git a/app/src/main/assets/SETUP-gl.md b/app/src/main/assets/SETUP-ro-rRO.md similarity index 100% rename from app/src/main/assets/SETUP-gl.md rename to app/src/main/assets/SETUP-ro-rRO.md diff --git a/app/src/main/assets/SETUP-ru.md b/app/src/main/assets/SETUP-ru-rRU.md similarity index 91% rename from app/src/main/assets/SETUP-ru.md rename to app/src/main/assets/SETUP-ru-rRU.md index 6a5655fad5..185ee77c96 100644 --- a/app/src/main/assets/SETUP-ru.md +++ b/app/src/main/assets/SETUP-ru-rRU.md @@ -14,13 +14,13 @@ Если быстрая настройка не работает, вам нужно будет настроить учётную запись и идентификатор другим способом, см. инструкции ниже. -## Настройка учётной записи - для получения электронной почты +## Настройка учётной записи — для получения электронной почты Чтобы добавить учётную запись, нажмите *Управление учётными записями* и нажмите на оранжевую кнопку *добавить* внизу. Выберите провайдера из списка, введите имя пользователя (в большинстве случаев это ваш адрес электронной почты) и пароль. Нажмите *Проверить*, чтобы FairEmail подключился к почтовому серверу и получил список системных папок. После просмотра списка системных папок можно добавить учётную запись, нажав *Сохранить*. Если ваш провайдер не входит в список провайдеров, выберите *Пользовательский*. Введите имя домена, например, *gmail.com* и нажмите *Получить настройки*. Если ваш провайдер поддерживает [автонастройку](https://tools.ietf.org/html/rfc6186), FairEmail заполнит имя хоста и номер порта, иначе прочтите инструкции по настройке вашего провайдера для правильного указания имени хоста IMAP, номера порта и протокола (SSL/TLS или STARTTLS). Подробнее об этом смотрите [здесь](https://github.com/M66B/FairEmail/blob/master/FAQ.md#authorizing-accounts). -## Настройка идентификатора - чтобы отправлять почту +## Настройка идентификатора — чтобы отправлять почту Аналогичным образом, чтобы добавить идентификатор, нажмите *Управление идентификаторами* и нажмите на оранжевую кнопку *добавить* внизу. Введите имя, которое вы хотите вставлять в поле адреса "От:" отправляемых вами писем и выберите связанную учётную запись. Нажмите *Сохранить* для добавления идентификатора. @@ -28,11 +28,11 @@ Смотрите [этот FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ9) об использовании псевдонимов. -## Предоставление разрешений - доступ к контактной информации +## Предоставление разрешений — доступ к контактной информации Если вы хотите находить адреса электронной почты, видеть фотографии контактов, и т. д., вам нужно предоставить FairEmail разрешение на чтение контактов. Просто нажмите *Предоставить разрешения* и выберите *Разрешить*. -## Настройка оптимизации батареи - для непрерывного получения электронной почты +## Настройка оптимизации батареи — для непрерывного получения электронной почты Android последних версий будет помещать приложения в спящий режим, когда экран выключен в течение некоторого времени, чтобы уменьшить потребление батареи. Если вы хотите получать новые письма без задержек, то вам следует отключить оптимизацию батареи для FairEmail. Нажмите *Отключить оптимизацию батареи* и следуйте инструкциям. diff --git a/app/src/main/assets/SETUP-sk-rSK.md b/app/src/main/assets/SETUP-sk-rSK.md new file mode 100644 index 0000000000..965e7c8815 --- /dev/null +++ b/app/src/main/assets/SETUP-sk-rSK.md @@ -0,0 +1,41 @@ +# Pomoc s nastavením + +Nastavenie FairEmail je veľmi jednoduché. Potrebujete pridať aspoň jeden účet pre príjem e-mailov a aspoň jednu identitu ak chcete odosielať e-maily. "Rýchle nastavenie" pridá účet a identitu naraz pre väčšinu známych poskytovateľov. + +## Požiadavky + +Internetové pripojenie je potrebné pre nastavenie účtov a identít. + +## Rýchle nastavenie + +Len vložte vaše meno, e-mailovú adresu a heslo a stlačte *Pokračovať*. + +Toto bude fungovať pre väčšinu známych e-mailových poskytovateľov. + +Ak rýchle nastavenie nefunguje, budete potrebovať nastaviť účet a identitu iným spôsobom, viď nižšie pre postup. + +## Nastaviť účet - pre príjem e-mailov + +Pre pridanie účtu, klepnite na *Spravovať účty* a klepnite na oranžové tlačidlo *Pridať* v dolnej časti. Zvoľte si poskytovateľa zo zoznamu, vložte používateľské meno, ktoré je väčšinou vaša e-mailová adresa a zadajte heslo. Klepnite na *Skontrolovať* aby sa mohol FairEmail pripojiť do e-mailového serveru a vyzdvihnúť zoznam systémových priečinkov. Po skontrolovaní voľby systémového priečinka môžete pridať účet klepnutím na *Uložiť*. + +Ak váš poskytovateľ nie je na zozname poskytovateľov, zvoľte *Vlastný*. Vložte názov domény, napríklad *gmail.com* a klepnite na *Získať nastavenia*. Ak váš poskytovateľ podporuje [automatické objavenie](https://tools.ietf.org/html/rfc6186), FairEmail vyplní názov hostiteľa a číslo portu, inak skontrolujte návod na nastavenie vášho poskytovateľa pre správny názov hostiteľa IMAP, číslo portu a protokol (SSL/TLS alebo STARTTLS). Pre viac informácií, pozrite [tu](https://github.com/M66B/FairEmail/blob/master/FAQ.md#authorizing-accounts). + +## Nastaviť identitu - pre odosielanie e-mailov + +Podobne, pre pridanie identity, klepnite na *Spravovať účty* a klepnite na oranžové tlačidlo *Pridať* v dolnej časti. Vložte meno, ktoré sa má zobrazovať v adresnom poli "Od:" v e-mailoch, ktoré pošlete a zvoľte si pripojený účet. Klepnite na *Uložiť* pre uloženie identity. + +Ak bol účet nastavovaný ručne, pravdepodobne budete tiež musieť nastaviť identitu manuálne. Vložte názov domény, napríklad *gmail.com* a klepnite na *Získať nastavenia*. Ak váš poskytovateľ podporuje [automatické objavenie](https://tools.ietf.org/html/rfc6186), FairEmail vyplní názov hostiteľa a číslo portu, inak skontrolujte návod na nastavenie vášho poskytovateľa pre správny názov hostiteľa IMAP, číslo portu a protokol (SSL/TLS alebo STARTTLS). + +Viď [tieto často kladené otázky](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ9) o používaní aliasov. + +## Udeliť povolenia - pre prístup ku kontaktným informáciám + +Pre hľadanie e-mailových adries, zobrazenie fotografií kontaktov, atď., musíte FairEmailu udeliť oprávnenie pre čítanie kontaktov. Len klepnite na *Udeliť povolenia* a vyberte *Povoliť*. + +## Nastaviť optimalizáciu batérie - pre neustály príjem e-mailov + +Na nedávnych verziách Androidu, systém uspí aplikácie pri zhasnutí obrazovky na dlhšiu dobu pre zníženie spotreby batérie. Ak chcete prijímať nové e-maily bez oneskorenia, mali by ste zakázať optimalizáciu batérie pre FairEmail. Klepnite na *Zakázať optimalizáciu batérie* a nasledujte postup. + +## Otázky alebo problémy + +Ak máte otázku alebo problém, [pozrite sem](https://github.com/M66B/FairEmail/blob/master/FAQ.md) pre pomoc. \ No newline at end of file diff --git a/app/src/main/assets/SETUP-sl.md b/app/src/main/assets/SETUP-sl-rSI.md similarity index 100% rename from app/src/main/assets/SETUP-sl.md rename to app/src/main/assets/SETUP-sl-rSI.md diff --git a/app/src/main/assets/SETUP-sr.md b/app/src/main/assets/SETUP-sr-rSP.md similarity index 100% rename from app/src/main/assets/SETUP-sr.md rename to app/src/main/assets/SETUP-sr-rSP.md diff --git a/app/src/main/assets/SETUP-sv-SE.md b/app/src/main/assets/SETUP-sv-rSE.md similarity index 100% rename from app/src/main/assets/SETUP-sv-SE.md rename to app/src/main/assets/SETUP-sv-rSE.md diff --git a/app/src/main/assets/SETUP-tr.md b/app/src/main/assets/SETUP-tr-rTR.md similarity index 100% rename from app/src/main/assets/SETUP-tr.md rename to app/src/main/assets/SETUP-tr-rTR.md diff --git a/app/src/main/assets/SETUP-he.md b/app/src/main/assets/SETUP-uk-rUA.md similarity index 100% rename from app/src/main/assets/SETUP-he.md rename to app/src/main/assets/SETUP-uk-rUA.md diff --git a/app/src/main/assets/SETUP-uk.md b/app/src/main/assets/SETUP-uk.md deleted file mode 100644 index 6f32ebfc5e..0000000000 --- a/app/src/main/assets/SETUP-uk.md +++ /dev/null @@ -1,41 +0,0 @@ -# Setup help - -Setting up FairEmail is fairly simple. You'll need to add at least one account to receive email and at least one identity if you want to send email. The quick setup will add an account and an identity in one go for most major providers. - -## Requirements - -An internet connection is required to set up accounts and identities. - -## Quick setup - -Just enter your name, email address and password and tap *Go*. - -This will work for most major email providers. - -If the quick setup doesn't work, you'll need to setup an account and an identity in another way, see below for instructions. - -## Set up account - to receive email - -To add an account, tap *Manage accounts* and tap the orange *add* button at the bottom. Select a provider from the list, enter the username, which is mostly your email address and enter your password. Tap *Check* to let FairEmail connect to the email server and fetch a list of system folders. After reviewing the system folder selection you can add the account by tapping *Save*. - -If your provider is not in the list of providers, select *Custom*. Enter the domain name, for example *gmail.com* and tap *Get settings*. If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number, else check the setup instructions of your provider for the right IMAP hostname, port number and protocol (SSL/TLS or STARTTLS). For more about this, please see [here](https://github.com/M66B/FairEmail/blob/master/FAQ.md#authorizing-accounts). - -## Set up identity - to send email - -Similarly, to add an identity, tap *Manage identity* and tap the orange *add* button at the bottom. Enter the name you want to appear in the from address of the emails you send and select a linked account. Tap *Save* to add the identity. - -If the account was configured manually, you likely need to configure the identity manually too. Enter the domain name, for example *gmail.com* and tap *Get settings*. If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number, else check the setup instructions of your provider for the right SMTP hostname, port number and protocol (SSL/TLS or STARTTLS). - -See [this FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ9) about using aliases. - -## Grant permissions - to access contact information - -If you want to lookup email addresses, have contact photos shown, etc, you'll need to grant read contacts permission to FairEmail. Just tap *Grant permissions* and select *Allow*. - -## Setup battery optimizations - to continuously receive emails - -On recent Android versions, Android will put apps to sleep when the screen is off for some time to reduce battery usage. If you want to receive new emails without delays, you should disable battery optimizations for FairEmail. Tap *Disable battery optimizations* and follow the instructions. - -## Questions or problems - -If you have a question or problem, please [see here](https://github.com/M66B/FairEmail/blob/master/FAQ.md) for help. \ No newline at end of file diff --git a/app/src/main/assets/SETUP-ko.md b/app/src/main/assets/SETUP-vi-rVN.md similarity index 100% rename from app/src/main/assets/SETUP-ko.md rename to app/src/main/assets/SETUP-vi-rVN.md diff --git a/app/src/main/assets/SETUP-vi.md b/app/src/main/assets/SETUP-vi.md deleted file mode 100644 index 6f32ebfc5e..0000000000 --- a/app/src/main/assets/SETUP-vi.md +++ /dev/null @@ -1,41 +0,0 @@ -# Setup help - -Setting up FairEmail is fairly simple. You'll need to add at least one account to receive email and at least one identity if you want to send email. The quick setup will add an account and an identity in one go for most major providers. - -## Requirements - -An internet connection is required to set up accounts and identities. - -## Quick setup - -Just enter your name, email address and password and tap *Go*. - -This will work for most major email providers. - -If the quick setup doesn't work, you'll need to setup an account and an identity in another way, see below for instructions. - -## Set up account - to receive email - -To add an account, tap *Manage accounts* and tap the orange *add* button at the bottom. Select a provider from the list, enter the username, which is mostly your email address and enter your password. Tap *Check* to let FairEmail connect to the email server and fetch a list of system folders. After reviewing the system folder selection you can add the account by tapping *Save*. - -If your provider is not in the list of providers, select *Custom*. Enter the domain name, for example *gmail.com* and tap *Get settings*. If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number, else check the setup instructions of your provider for the right IMAP hostname, port number and protocol (SSL/TLS or STARTTLS). For more about this, please see [here](https://github.com/M66B/FairEmail/blob/master/FAQ.md#authorizing-accounts). - -## Set up identity - to send email - -Similarly, to add an identity, tap *Manage identity* and tap the orange *add* button at the bottom. Enter the name you want to appear in the from address of the emails you send and select a linked account. Tap *Save* to add the identity. - -If the account was configured manually, you likely need to configure the identity manually too. Enter the domain name, for example *gmail.com* and tap *Get settings*. If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number, else check the setup instructions of your provider for the right SMTP hostname, port number and protocol (SSL/TLS or STARTTLS). - -See [this FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ9) about using aliases. - -## Grant permissions - to access contact information - -If you want to lookup email addresses, have contact photos shown, etc, you'll need to grant read contacts permission to FairEmail. Just tap *Grant permissions* and select *Allow*. - -## Setup battery optimizations - to continuously receive emails - -On recent Android versions, Android will put apps to sleep when the screen is off for some time to reduce battery usage. If you want to receive new emails without delays, you should disable battery optimizations for FairEmail. Tap *Disable battery optimizations* and follow the instructions. - -## Questions or problems - -If you have a question or problem, please [see here](https://github.com/M66B/FairEmail/blob/master/FAQ.md) for help. \ No newline at end of file diff --git a/app/src/main/assets/SETUP-zh-TW.md b/app/src/main/assets/SETUP-zh-TW.md deleted file mode 100644 index 6f32ebfc5e..0000000000 --- a/app/src/main/assets/SETUP-zh-TW.md +++ /dev/null @@ -1,41 +0,0 @@ -# Setup help - -Setting up FairEmail is fairly simple. You'll need to add at least one account to receive email and at least one identity if you want to send email. The quick setup will add an account and an identity in one go for most major providers. - -## Requirements - -An internet connection is required to set up accounts and identities. - -## Quick setup - -Just enter your name, email address and password and tap *Go*. - -This will work for most major email providers. - -If the quick setup doesn't work, you'll need to setup an account and an identity in another way, see below for instructions. - -## Set up account - to receive email - -To add an account, tap *Manage accounts* and tap the orange *add* button at the bottom. Select a provider from the list, enter the username, which is mostly your email address and enter your password. Tap *Check* to let FairEmail connect to the email server and fetch a list of system folders. After reviewing the system folder selection you can add the account by tapping *Save*. - -If your provider is not in the list of providers, select *Custom*. Enter the domain name, for example *gmail.com* and tap *Get settings*. If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number, else check the setup instructions of your provider for the right IMAP hostname, port number and protocol (SSL/TLS or STARTTLS). For more about this, please see [here](https://github.com/M66B/FairEmail/blob/master/FAQ.md#authorizing-accounts). - -## Set up identity - to send email - -Similarly, to add an identity, tap *Manage identity* and tap the orange *add* button at the bottom. Enter the name you want to appear in the from address of the emails you send and select a linked account. Tap *Save* to add the identity. - -If the account was configured manually, you likely need to configure the identity manually too. Enter the domain name, for example *gmail.com* and tap *Get settings*. If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number, else check the setup instructions of your provider for the right SMTP hostname, port number and protocol (SSL/TLS or STARTTLS). - -See [this FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#FAQ9) about using aliases. - -## Grant permissions - to access contact information - -If you want to lookup email addresses, have contact photos shown, etc, you'll need to grant read contacts permission to FairEmail. Just tap *Grant permissions* and select *Allow*. - -## Setup battery optimizations - to continuously receive emails - -On recent Android versions, Android will put apps to sleep when the screen is off for some time to reduce battery usage. If you want to receive new emails without delays, you should disable battery optimizations for FairEmail. Tap *Disable battery optimizations* and follow the instructions. - -## Questions or problems - -If you have a question or problem, please [see here](https://github.com/M66B/FairEmail/blob/master/FAQ.md) for help. \ No newline at end of file diff --git a/app/src/main/assets/SETUP-zh-CN.md b/app/src/main/assets/SETUP-zh-rCN.md similarity index 100% rename from app/src/main/assets/SETUP-zh-CN.md rename to app/src/main/assets/SETUP-zh-rCN.md diff --git a/app/src/main/assets/SETUP-lt.md b/app/src/main/assets/SETUP-zh-rTW.md similarity index 62% rename from app/src/main/assets/SETUP-lt.md rename to app/src/main/assets/SETUP-zh-rTW.md index 6f32ebfc5e..ff30259a5c 100644 --- a/app/src/main/assets/SETUP-lt.md +++ b/app/src/main/assets/SETUP-zh-rTW.md @@ -1,22 +1,22 @@ -# Setup help +# 設定說明 -Setting up FairEmail is fairly simple. You'll need to add at least one account to receive email and at least one identity if you want to send email. The quick setup will add an account and an identity in one go for most major providers. +設定FairEmail相當簡單。 你需要新增至少一個帳號來接收電子郵件，如果想要寄電子郵件則需要新增至少一個身分。 這個快速設定將會新增一個適用於大部分電子郵件服務商的帳戶和身分。 -## Requirements +## 需求 -An internet connection is required to set up accounts and identities. +需要一個網際網路連線來設定帳戶和身分。 -## Quick setup +## 快速設定 -Just enter your name, email address and password and tap *Go*. +只需要輸入你的名字、電子郵件地址和密碼然後按一下*Go*。 -This will work for most major email providers. +這將適用於大部分的電子郵件服務商。 -If the quick setup doesn't work, you'll need to setup an account and an identity in another way, see below for instructions. +如果快速設定失敗，你則需要用其他方法來設定帳戶和身分，請看以下說明。 -## Set up account - to receive email +## 設定帳戶以接收電子郵件 -To add an account, tap *Manage accounts* and tap the orange *add* button at the bottom. Select a provider from the list, enter the username, which is mostly your email address and enter your password. Tap *Check* to let FairEmail connect to the email server and fetch a list of system folders. After reviewing the system folder selection you can add the account by tapping *Save*. +若要增加一個帳戶，按一下*帳戶管理*然後點一下位於下方的橘色*新增*按鈕。 Select a provider from the list, enter the username, which is mostly your email address and enter your password. Tap *Check* to let FairEmail connect to the email server and fetch a list of system folders. After reviewing the system folder selection you can add the account by tapping *Save*. If your provider is not in the list of providers, select *Custom*. Enter the domain name, for example *gmail.com* and tap *Get settings*. If your provider supports [auto-discovery](https://tools.ietf.org/html/rfc6186), FairEmail will fill in the hostname and port number, else check the setup instructions of your provider for the right IMAP hostname, port number and protocol (SSL/TLS or STARTTLS). For more about this, please see [here](https://github.com/M66B/FairEmail/blob/master/FAQ.md#authorizing-accounts). @@ -36,6 +36,6 @@ If you want to lookup email addresses, have contact photos shown, etc, you'll ne On recent Android versions, Android will put apps to sleep when the screen is off for some time to reduce battery usage. If you want to receive new emails without delays, you should disable battery optimizations for FairEmail. Tap *Disable battery optimizations* and follow the instructions. -## Questions or problems +## 問題 -If you have a question or problem, please [see here](https://github.com/M66B/FairEmail/blob/master/FAQ.md) for help. \ No newline at end of file +如果你有任何問題，請見[這裡](https://github.com/M66B/FairEmail/blob/master/FAQ.md)來尋求幫助。 \ No newline at end of file diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java b/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java index fb2ab93c98..a0e04be92e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java +++ b/app/src/main/java/eu/faircode/email/FragmentDialogMarkdown.java @@ -79,15 +79,17 @@ public class FragmentDialogMarkdown extends FragmentDialogBase { String country = Locale.getDefault().getCountry(); String language = Locale.getDefault().getLanguage(); - String localized = c[0] + "-" + language + "-" + country + "." + c[1]; + String localized = c[0] + "-" + language + "-r" + country + "." + c[1]; Log.i("Checking " + localized); if (assets.contains(localized)) name = localized; else { - localized = c[0] + "-" + language + "." + c[1]; - Log.i("Checking " + localized); - if (assets.contains(localized)) - name = localized; + String prefix = c[0] + "-" + language; + for (String asset : assets) + if (asset.startsWith(prefix)) { + name = asset; + break; + } } Log.i("Using " + name); diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 5d3e7ca696..4288dd075c 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -387,6 +387,8 @@ Ocultar de la pantalla de aplicaciones recientes e impedir capturas de pantallas PIN Límite de tiempo para autenticación biométrica + Usar listas para advertir sobre enlaces de seguimiento + Usar listas para reconocer imágenes de rastreo Firmar por defecto Cifrar por defecto Descifrar automáticamente los mensajes @@ -1108,6 +1110,7 @@ Este es un resumen del contenido de un archivo de mensaje crudo. Guarde el mensaje raw con el icono guardar en la barra de acción para ver todo el contenido. Abrir enlace El título y la dirección del enlace son diferentes + Este sitio web podría rastrearle El tráfico no será cifrado El tráfico será cifrado Eliminar parámetros de rastreo @@ -1126,6 +1129,7 @@ Agregar Abrir con Información + Descargar Reportar Reparar Activar diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index a85290f01a..56d3387271 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -408,6 +408,8 @@ Скрыть с экрана недавних приложений и запретить создание снимков экрана PIN-код Время до включения биометрической аутентификации + Использовать списки для предупреждения об отслеживающих ссылках + Использовать списки для распознавания отслеживающих изображений Подписать по умолчанию Шифровать по умолчанию Автоматически расшифровывать сообщения