1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-25 15:32:52 +00:00

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

This commit is contained in:
M66B 2020-05-08 16:54:39 +02:00
commit de84de2a42
2 changed files with 2 additions and 1 deletions

View file

@ -170,7 +170,7 @@
<string name="title_setup_no_settings">No settings found for domain \'%1$s\'</string> <string name="title_setup_no_settings">No settings found for domain \'%1$s\'</string>
<string name="title_setup_no_settings_hint">Please try setting up an account and identity in setup steps 1 and 2 using the settings provided by your email provider</string> <string name="title_setup_no_settings_hint">Please try setting up an account and identity in setup steps 1 and 2 using the settings provided by your email provider</string>
<string name="title_setup_no_auth_hint">Please double check your email address and password and make sure external access (IMAP/SMTP) is enabled for your account</string> <string name="title_setup_no_auth_hint">Please double check your email address and password and make sure external access (IMAP/SMTP) is enabled for your account</string>
<string name="title_setup_app_password_hint">This provider requires an app password instead of the account password</string> <string name="title_setup_app_password_hint">This provider requires an app password instead of the account password, please check the instructions of your provider</string>
<string name="title_setup_no_system_folders">Inbox or draft folder not found</string> <string name="title_setup_no_system_folders">Inbox or draft folder not found</string>
<string name="title_setup_quick_success">An account and an identity have successfully been added</string> <string name="title_setup_quick_success">An account and an identity have successfully been added</string>
<string name="title_setup_quick_failed">You can try to configure an account and an identity below too</string> <string name="title_setup_quick_failed">You can try to configure an account and an identity below too</string>

View file

@ -340,6 +340,7 @@
</provider> </provider>
<provider <provider
name="Apple iCloud" name="Apple iCloud"
appPassword="true"
domain="icloud\\.com" domain="icloud\\.com"
link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq148" link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq148"
user="local"> user="local">