diff --git a/FAQ.md b/FAQ.md index 7ea409d7..4974de3d 100644 --- a/FAQ.md +++ b/FAQ.md @@ -5,8 +5,7 @@ At the bottom you can find how to ask other questions, request features and repo ## Frequently Asked Questions - -**(1) Which permissions are needed and why?** +**Which permissions are needed and why?** * have full network access (INTERNET): to send and receive email * view network connections (ACCESS_NETWORK_STATE): to monitor internet connectivity changes @@ -16,8 +15,7 @@ At the bottom you can find how to ask other questions, request features and repo * Optional: read your contacts (READ_CONTACTS): to autocomplete addresses and to show photos * Optional: find accounts on the device (GET_ACCOUNTS): to use [OAuth](https://en.wikipedia.org/wiki/OAuth) instead of passwords - -**(2) Why is there a permanent notification shown?** +**Why is there a permanent notification shown?** A permanent status bar notification with the number of accounts being synchronized and the number of operations pending is shown to prevent Android from killing the service that takes care of receiving and sending email. @@ -26,8 +24,7 @@ Most, if not all, other email apps don't show a notification with the "side effe Background: this is because of the introduction of [doze mode](https://developer.android.com/training/monitoring-device-state/doze-standby) in Android 6 Marshmallow. - -**(3) What are operations and why are they pending?** +**What are operations and why are they pending?** The low priority status bar notification shows the number of pending operations, which can be: @@ -44,13 +41,11 @@ The low priority status bar notification shows the number of pending operations, Operations are processed only when there is a connection to the email server or when manually synchronizing. See also [this FAQ](#FAQ16). - -**(4) What is a valid security certificate?** +**What is a valid security certificate?** Valid security certificates are officially signed (not self signed) and have matching a host name. - -~~**(5) What does 'no IDLE support' mean?**~~ +~~**What does 'no IDLE support' mean?**~~ ~~Without [IMAP IDLE](https://en.wikipedia.org/wiki/IMAP_IDLE) emails need to be periodically fetched,~~ ~~which is a waste of battery power and internet bandwidth and will delay notification of new emails.~~ @@ -58,8 +53,7 @@ Valid security certificates are officially signed (not self signed) and have mat ~~You should consider this a problem of the provider, not of the app.~~ ~~Almost all email providers offer IMAP IDLE, with as notable exception Yahoo!~~ - -**(6) How can I login to Gmail / G suite?** +**How can I login to Gmail / G suite?** Preferably select Gmail as provider and select an account on your device. @@ -68,38 +62,33 @@ See here for instructions: [https://support.google.com/accounts/answer/185833](h If this doesn't work, see here for more solutions: [https://support.google.com/mail/accounts/answer/78754](https://support.google.com/mail/accounts/answer/78754) - -**(7) Why are messages in the outbox not moved to the sent folder?** +**Why are messages in the outbox not moved to the sent folder?** Messages in the outbox are moved to the sent folder as soon as your provider adds the message to the sent folder. If this doesn't happen, your provider might not keep track of sent messages or you might be using an SMTP server not related to the provider. In these cases you can enable the account option *Store sent messages* to let the app move messages from the outbox to the sent folder after sending. There is a menu to move sent messages to the sent folder after enabling this option. - -**(8) Can I use a Microsoft Exchange account?** +**Can I use a Microsoft Exchange account?** You can use a Microsoft Exchange account if it is accessible via IMAP. ActiveSync is not supported at this moment. See here for more information: [https://support.office.com/en-us/article/what-is-a-microsoft-exchange-account-47f000aa-c2bf-48ac-9bc2-83e5c6036793](https://support.office.com/en-us/article/what-is-a-microsoft-exchange-account-47f000aa-c2bf-48ac-9bc2-83e5c6036793) - -**(9) What are identities?** +**What are identities?** Identities represent email addresses you are sending *from*. Some providers allow you to have multiple email aliases. You can configure these by setting the email address field to the alias address and setting the user name field to your main email address. - -**(10) What does 'UIDPLUS not supported' mean?** +**What does 'UIDPLUS not supported' mean?** The error message *UIDPLUS not supported* means that your email provider does not provide the IMAP [UIDPLUS extension](https://tools.ietf.org/html/rfc4315). This IMAP extension is required to implement two way synchronization, which is not an optional feature. So, unless your provider can enable this extension, you cannot use SimpleEmail for this provider. - -~~**(11) Why is STARTTLS for IMAP not supported?**~~ +~~**Why is STARTTLS for IMAP not supported?**~~ ~~STARTTLS starts with a not encrypted connection and is therefore not secure.~~ ~~All well known IMAP servers support IMAP with a plain SSL connection, so there is no need to support STARTTLS for IMAP.~~ @@ -109,35 +98,30 @@ So, unless your provider can enable this extension, you cannot use SimpleEmail f ~~tl;dr; "*Additionally, even if you configure STARTTLS perfectly and use a valid certificate, there’s still no guarantee your communication will be encrypted.*"~~ - -**(12) How does encryption/decryption work?** +**How does encryption/decryption work?** First of all you need to install and configure [OpenKeychain](https://f-droid.org/en/packages/org.sufficientlysecure.keychain/). To encrypt a message before sending, just select the menu *Encrypt*. Similarly, to decrypt a received message, just select the menu *Decrypt*. - -**(13) How does search on server work?** +**How does search on server work?** You can start searching for messages on sender, recipient, subject or message text by using the magnify glass in the action bar of a folder (not in the unified inbox because it could be a collection of folders). The server executes the search. Scrolling down will fetch more messages from the server. Searching by the server might be case sensitive or case insensitive and might be on partial text or whole words, depending on the provider. Search on server is a pro feature. - -**(14) How can I setup Outlook with 2FA?** +**How can I setup Outlook with 2FA?** To use Outlook with two factor authentication enabled, you need to create an app password. See [here](https://support.microsoft.com/en-us/help/12409/microsoft-account-app-passwords-two-step-verification) for the details. - -**(15) Can you add ... ?** +**Can you add ... ?** * More themes/black theme: the goal is to keep the app as simple as possible, so no more themes will not be added. * Previewing message text in notification/widget: this is not always possible because the message text is initially not downloaded for larger messages. * Executing filter rules: filter rules should be executed on the server because a battery powered device with possibly an unstable internet connection is not suitable for this. - -**(16) Why are messages not being synchronized?** +**Why are messages not being synchronized?** Possible causes of messages not being synchronized (sent or received) are: @@ -155,22 +139,19 @@ in particular of Huawei (see [here](https://www.forbes.com/sites/bensin/2016/07/ or Xiaomi (see [here](https://www.forbes.com/sites/bensin/2016/11/17/how-to-fix-push-notifications-on-xiaomis-miui-8-for-real/) for a fix) stop apps and services too aggressively. - -**(17) Why does manual synchronize not work?** +**Why does manual synchronize not work?** If the *Synchronize now* menu is dimmed, there is no connection to the account. See the previous question for more information. - -**(21) How do I enable the notification light?** +**How do I enable the notification light?** Before Android 8 Oreo: there is an advanced option in the setup for this. Android 8 Oreo and later: see [here](https://developer.android.com/training/notify-user/channels) about how to configure notification channels. - -**(22) Why do I get 'Couldn't connect to host' ?** +**Why do I get 'Couldn't connect to host' ?** The message *Couldn't connect to host ...* means that SimpleEmail was not able to connect to the email server. @@ -183,8 +164,7 @@ Possible causes are: If you are using a VPN, the VPN provider might block the connection because it is too aggressively trying to prevent spam. - -**(23) Why do I get 'Too many simultaneous connections' ?** +**Why do I get 'Too many simultaneous connections' ?** The message *Too many simultaneous connections* is sent by the email server when there are too many connections to the same email account at the same time. @@ -194,15 +174,13 @@ Possible causes are: * The same email client is connected multiple times to the same account * The previous connection was terminated abruptly for example by losing internet connectivity - -**(24) What is browse messages on the server?** +**What is browse messages on the server?** Browse messages on the server will fetch messages from the email server in real time when you reach the end of the list of synchronized messages, even when the folder is set to not synchronize. You can disable this feature under *Setup* > *Advanced options* > *Browse messages on the server*. - -**(25) Why can't I select an image, attachment or a file to export/import?** +**Why can't I select an image, attachment or a file to export/import?** If a menu item to select a file is disabled (dimmed), likely the [storage access framework](https://developer.android.com/guide/topics/providers/document-provider), @@ -211,12 +189,14 @@ for example because your custom ROM does not include it or because it was remove SimpleEmail does not request storage permissions, so this framework is required to select files and folders. No app, except maybe file managers, targetting Android 4.4 KitKat or later should ask for storage permissions because it would allow access to *all* files. - -**(26) Can I help to translate SimpleEmail in my own language?** +**Can I help to translate SimpleEmail in my own language?** -Yes, you can translate the texts of SimpleEmail in your own language [here](https://crowdin.com/project/open-source-email). -Registration is free. +Yes, you can translate the texts of SimpleEmail in your own language, please open a [pull requests][pull-requests] with the changes, +we are looking for web service to automated the process.
-If you have another question, want to request a feature or report a bug, you can send a [email](distopico@riseup.net) or open PR. +If you have another question, want to request a feature or report a bug, please open a [issue][], send a [email](distopico@riseup.net) or open [PR][pull-requests]. + + [issue]: https://framagit.org/dystopia-project/simple-email/issues + [pull-requests]: https://framagit.org/dystopia-project/simple-email/merge_requests diff --git a/README.md b/README.md index 12b64ad9..e78637d3 100644 --- a/README.md +++ b/README.md @@ -92,27 +92,27 @@ See [here](https://framagit.org/dystopia-project/simple-email/blob/master/FAQ.md ## Support -* For support on SimpleEmail, please open a [issue](https://framagit.org/dystopia-project/simple-email/issues) +* For support on SimpleEmail, please open a [issue][] -For support on authorizing accounts you should contact your provider. +* For support on authorizing accounts you should contact your provider. ## Contributing *Documentation* Contributions to this document and the frequently asked questions -are preferred in the form of [pull requests](https://framagit.org/dystopia-project/simple-email/merge_requests). +are preferred in the form of [pull requests][pull-requests]). *Translations* -* You can translate the in-app texts of SimpleEmail [here](https://crowdin.com/project/open-source-email) -* If your language is not listed, please open a issue or send a message through [email](distopico@riseup.net) +* You can translate the in-app texts of SimpleEmail please open a [pull requests][pull-requests] (looking for a web service). +* If your language is not listed, please open a [issue][] or send a message through [email](distopico@riseup.net) *Source code* Building SimpleEmail from source code is straightforward with [Android Studio](http://developer.android.com/sdk/). -Source code contributions are welcome, please open a [pull requests](https://framagit.org/dystopia-project/simple-email/merge_requests). +Source code contributions are welcome, please open a [pull requests][pull-requests]. Please note that you agree to the license below by contributing. @@ -151,3 +151,5 @@ SimpleEmail uses: [free-software]: https://www.gnu.org/philosophy/free-sw.html + [issue]: https://framagit.org/dystopia-project/simple-email/issues + [pull-requests]: https://framagit.org/dystopia-project/simple-email/merge_requests diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index 4a52f5eb..8f6ce8bd 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml index 8a4a922a..9dee770c 100644 --- a/app/src/main/res/values-ar-rBH/strings.xml +++ b/app/src/main/res/values-ar-rBH/strings.xml @@ -1,5 +1,5 @@ - + حقوق النشر بواسطه M. Bokhorst خدمة diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml index 8a4a922a..9dee770c 100644 --- a/app/src/main/res/values-ar-rEG/strings.xml +++ b/app/src/main/res/values-ar-rEG/strings.xml @@ -1,5 +1,5 @@ - + حقوق النشر بواسطه M. Bokhorst خدمة diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index 8a4a922a..9dee770c 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -1,5 +1,5 @@ - + حقوق النشر بواسطه M. Bokhorst خدمة diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml index 8a4a922a..9dee770c 100644 --- a/app/src/main/res/values-ar-rYE/strings.xml +++ b/app/src/main/res/values-ar-rYE/strings.xml @@ -1,5 +1,5 @@ - + حقوق النشر بواسطه M. Bokhorst خدمة diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 8a4a922a..9dee770c 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1,5 +1,5 @@ - + حقوق النشر بواسطه M. Bokhorst خدمة diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index c1c66a2c..5a5afaa1 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -1,5 +1,5 @@ - + Müəllif hüquqları Ⓒ 2018 M. Bokhorst-a məxsusdur Xidmət diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 5d245892..0fbd2f18 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 de M. Bokhorst Servei diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e8194841..9d4b0f82 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 3e515430..887ef913 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 af M. Bokhorst Service diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index fceae176..ebebeaf8 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Dienst diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 4a52f5eb..8f6ce8bd 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 9854224d..2bb162b1 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 1cc07e38..fe3d3cdf 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 por M. Bokhorst Servicio diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 9dff8d74..1b2290ca 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors سرویس diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 4a52f5eb..8f6ce8bd 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 7b370b9c..14356943 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 par M. Bokhorst Service diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 08f737a9..da3da1e0 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 72012bb3..529cdacd 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Szolgáltatás diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 1032e834..3f96f38d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 di M. Bokhorst Servizio diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 08f737a9..da3da1e0 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index bd329ba9..c71bd098 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index bd329ba9..c71bd098 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 4a52f5eb..8f6ce8bd 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 7ec7b1a8..53792b2a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 door M. Bokhorst Service diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 4a52f5eb..8f6ce8bd 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index bfa3be9d..d0d6a08b 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1,5 +1,5 @@ - + Prawa autorskie Ⓒ 2018 przez M. Bokhorst Usługa diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index f9807ccf..8abe480b 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 por M. Bokhorst Serviço diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 4a52f5eb..8f6ce8bd 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index e5f27d97..c04a66d8 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -1,5 +1,5 @@ - + Drepturi de autor Ⓒ 2018 de M. Bokhorst Serviciu diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index e8194841..9d4b0f82 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 7090dcef..ce1f0c8e 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 356553b0..b4c01c39 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 av M. Bokhorst Tjänst diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index d5134d03..58ff85f9 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,5 +1,5 @@ - + Telif hakkı Ⓒ 2018 M. Bokhorst \'a aittir Hizmet diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index e8194841..9d4b0f82 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index bd329ba9..c71bd098 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4917dee9..4ea3baf2 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1,5 +1,5 @@ - + 版权所有 Ⓒ 2018,M. Bokhorst 服务 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index bd329ba9..c71bd098 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1,5 +1,5 @@ - + Copyright Ⓒ 2018 by M. Bokhorst\nCopyright Ⓒ 2018 by Distopico (dystopia project) and contributors Service diff --git a/tools/Crowdin-Android-Importer.patch b/tools/Crowdin-Android-Importer.patch deleted file mode 100644 index e0eeebd3..00000000 --- a/tools/Crowdin-Android-Importer.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/crowdin.py b/crowdin.py -old mode 100755 -new mode 100644 -diff --git a/helper.py b/helper.py -index d3a57c9..7ef7d14 100644 ---- a/helper.py -+++ b/helper.py -@@ -109,8 +109,12 @@ def GetResDirectory(path): - - - def GetTargetStringsXml(targetResDirectory, langCode): -- country = langCode[0:2] -- variant = langCode[3:] -+ if langCode == 'fil': -+ country = 'fil' -+ variant = '' -+ else: -+ country = langCode[0:2] -+ variant = langCode[3:] - if variant is not None and len(variant) > 0: - variant = "-r" + variant - -@@ -127,4 +131,4 @@ def IsSingleFolderUpdate(path): - def IsDefaultStringsXml(path): - if "res/values/strings.xml" in path: - return True -- return False -\ No newline at end of file -+ return False diff --git a/tools/crowdin.sh b/tools/crowdin.sh deleted file mode 100644 index b5432d25..00000000 --- a/tools/crowdin.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -. tools/config.sh - -#https://github.com/mendhak/Crowdin-Android-Importer -#git clone https://github.com/mendhak/Crowdin-Android-Importer.git -#sudo apt-get install python python-pip -#sudo apt-get install libssl-dev libcurl4-openssl-dev -#pip install pycurl - -rm -R ${project_dir}/app/src/main/res/values-iw/ -rm -R ${project_dir}/app/src/main/res/values-ar-rBH/ -rm -R ${project_dir}/app/src/main/res/values-ar-rEG/ -rm -R ${project_dir}/app/src/main/res/values-ar-rSA/ -rm -R ${project_dir}/app/src/main/res/values-ar-rYE/ -rm -R ${project_dir}/app/src/main/res/values-fi* -rm -R ${project_dir}/app/src/main/res/values-nb/ - -python ${importer_dir}/crowdin.py --p=app/src/main -a=get -i open-source-email -k ${api_key} - -mkdir -p ${project_dir}/app/src/main/res/values-iw/ -mkdir -p ${project_dir}/app/src/main/res/values-ar-rBH/ -mkdir -p ${project_dir}/app/src/main/res/values-ar-rEG/ -mkdir -p ${project_dir}/app/src/main/res/values-ar-rSA/ -mkdir -p ${project_dir}/app/src/main/res/values-ar-rYE/ -mkdir -p ${project_dir}/app/src/main/res/values-nb/ - -cp -R ${project_dir}/app/src/main/res/values-he/* ${project_dir}/app/src/main/res/values-iw/ -cp -R ${project_dir}/app/src/main/res/values-ar/* ${project_dir}/app/src/main/res/values-ar-rBH/ -cp -R ${project_dir}/app/src/main/res/values-ar/* ${project_dir}/app/src/main/res/values-ar-rEG/ -cp -R ${project_dir}/app/src/main/res/values-ar/* ${project_dir}/app/src/main/res/values-ar-rSA/ -cp -R ${project_dir}/app/src/main/res/values-ar/* ${project_dir}/app/src/main/res/values-ar-rYE/ -cp -R ${project_dir}/app/src/main/res/values-no/* ${project_dir}/app/src/main/res/values-nb/ - -sed -i s/-2016/–2018/ ${project_dir}/app/src/main/res/values*/strings.xml -sed -i s/–2016/–2018/ ${project_dir}/app/src/main/res/values*/strings.xml -sed -i s/-2017/–2018/ ${project_dir}/app/src/main/res/values*/strings.xml -sed -i s/–2017/–2018/ ${project_dir}/app/src/main/res/values*/strings.xml