Commit 72cfb0e2 authored by Hussein's avatar Hussein

Merge branch 'task/P4A-1012' into release/v1.1.000

parents 73caa233 27f32b0d
......@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
Pretty easy privacy email client for Android
Copyright (C) 2020 p≡p Security SA
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
p≡p for Android Copyright (C) 2020 p≡p Security SA
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
......
......@@ -182,25 +182,32 @@ android {
javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true
}
flavorDimensions "playStore", "none"
flavorDimensions "sync", "store"
productFlavors {
withkeysync {
buildConfigField "boolean", "WITH_KEY_SYNC", "true"
versionName "${buildConfig.versionName}"
dimension "playStore"
dimension "sync"
}
withoutkeysync {
buildConfigField "boolean", "WITH_KEY_SYNC", "false"
versionName "${buildConfig.versionName}" + ".withoutKeysync"
dimension "playStore"
dimension "sync"
}
playStore {
dimension "none"
dimension "store"
}
fDroid {
dimension "store"
}
}
signingConfigs {
release
}
......
package security.pEp.ui.about
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.view.MenuItem
import androidx.core.content.ContextCompat
import com.fsck.k9.R
import com.fsck.k9.pEp.PepActivity
import com.fsck.k9.view.MessageWebView
import security.pEp.ui.toolbar.ToolBarCustomizer
import javax.inject.Inject
const val GPL_LICENSE = "https://pep-security.lu/gitlab/android/pep/-/raw/develop/LICENSE"
class LicenseActivity : PepActivity() {
@Inject
lateinit var toolbarCustomizer: ToolBarCustomizer
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
bindViews(R.layout.activity_license)
setUpToolbar(true)
toolbarCustomizer.setToolbarColor(ContextCompat.getColor(this, R.color.colorPrimary))
initializeToolbar(true, getString(R.string.license))
findViewById<MessageWebView>(R.id.license_webview).blockNetworkData(false)
findViewById<MessageWebView>(R.id.license_webview).loadUrl(GPL_LICENSE)
}
override fun inject() {
getpEpComponent().inject(this)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
android.R.id.home -> {
finish()
}
}
return true
}
}
fun openLicenseActivity(context: Context) {
context.startActivity(Intent(context, LicenseActivity::class.java))
}
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical">
<include layout="@layout/simple_toolbar_layout" />
<com.fsck.k9.view.MessageWebView
android:id="@+id/license_webview"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pep_app_license">Llicenciat sota GPLv3</string>
</resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pep_app_license">Lizenziert unter der pEp Security GPLv3</string>
</resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pep_app_license">Licenciado bajo pEp security GPLv3</string>
</resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pep_app_license">Sous licence pEp security GPLv3</string>
</resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pep_app_license">Gelicentieerd onder pEp security GPLv3</string>
</resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pep_app_license">Licencované pod licenciou pEp security GPLv3</string>
</resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pep_app_license">GPLv3 altında Lisanslı</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="pep_app_license">Licensed under p≡p security GPLv3</string>
</resources>
......@@ -2,7 +2,6 @@ package security.pEp.ui.about
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.graphics.Paint
import android.os.Bundle
import android.text.method.LinkMovementMethod
......
......@@ -32,7 +32,6 @@
<string name="pep_enable_privacy_protection">Protegir privacitat</string>
<string name="pep_explanation">Explicació</string>
<string name="pep_suggestion">Sugerencia</string>
<string name="pep_app_license">Llicenciat sota GNU General Public License v3</string>
<string name="pep_trust_server_description">Desa els correus al servidor de forma segura.</string>
<string name="pep_account_privacy_protection_explanation">Protegeix la privacitat d\'aquest compte</string>
<string name="pep_account_setup_generating_keys">Configurant la seva privacitat</string>
......
......@@ -4,20 +4,20 @@
<!--This should make it easier for forks to change the branding-->
<!--Used in AndroidManifest.xml-->
<!--<string name="app_name">K-9 Mail/pEp</string>-->
<!--<string name="remote_control_label">Control remot del Correu K-9 Mail</string>-->
<!--<string name="remote_control_desc">Permet a aquesta aplicació controlar les activitats i la configuració de K-9 Mail.</string>-->
<string name="remote_control_label">Control remot del Correu p≡p</string>
<string name="remote_control_desc">Permet a aquesta aplicació controlar les activitats i la configuració de p≡p.</string>
<!--Used in the about dialog-->
<!--<string name="app_authors">Google, The K-9 Dog Walkers.</string>-->
<!--<string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Porcions de Copyright 2006-<xliff:g>%s</xliff:g> Projecte de codi obert d\'Android.</string>-->
<!--<string name="app_license">Llicenciat sota Llicència Apache, Versió 2.0.</string>-->
<!--Welcome message-->
<!--<string name="welcome_message_title">Us donem la benvinguda a K-9 Mail</string>-->
<string name="welcome_message_title">Us donem la benvinguda a p≡p</string>
<!--Default signature-->
<string name="default_signature">"-- Enviat des del meu p≡p per Android. "</string>
<!--General strings that include the app name-->
<!--<string name="account_delete_dlg_instructions_fmt">El compte \"<xliff:g id="account">%s</xliff:g>\" serà esborrat de K-9 Mail.</string>-->
<!--<string name="account_recreate_dlg_instructions_fmt">Totes les dades de \"<xliff:g id="account">%s</xliff:g>\" seran esborrades de K-9 Mail, però la configuració del compte romandrà.</string>-->
<!--<string name="account_clear_dlg_instructions_fmt">Tots els missatges a \"<xliff:g id="account">%s</xliff:g>\" seran esborrats de K-9 Mail, però la configuració del compte romandrà.</string>-->
<!--=== App Store-specific strings =======================================================-->
<string name="account_delete_dlg_instructions_fmt">El compte \"<xliff:g id="account">%s</xliff:g>\" serà esborrat de p≡p.</string>
<string name="account_recreate_dlg_instructions_fmt">S\'eliminaran totes les dades locals de \"<xliff:g id="account">%s</xliff:g>\". La configuració del compte es conservarà.</string>
<string name="account_clear_dlg_instructions_fmt">S\'eliminaran còpies locals de missatges a \"<xliff:g id="account">%s</xliff:g>\". La configuració del compte es conservarà.</string> <!--=== App Store-specific strings =======================================================-->
<string name="import_dialog_error_message">No s\'a trobat cap aplicació per realitzar la importació. Instal·leu un gestor d\'arxius des de Google Play Store.</string>
<string name="open_market">Obre la Play Store</string>
<!--=== General strings ==================================================================-->
......@@ -835,9 +835,6 @@
<string name="openpgp_enabled_error_back">Back</string>
<string name="openpgp_sign_only_disable">Disable</string>
<string name="openpgp_inline_disable">Disable</string>
<string name="app_name">p≡p</string>
<string name="account_recreate_dlg_instructions_fmt">S\'eliminaran totes les dades locals de \"<xliff:g id="account">%s</xliff:g>\". La configuració del compte es conservarà.</string>
<string name="account_clear_dlg_instructions_fmt">S\'eliminaran còpies locals de missatges a \"<xliff:g id="account">%s</xliff:g>\". La configuració del compte es conservarà.</string>
<string name="status_no_network">Sincronització desactivada: sense xarxa</string>
<string name="status_no_background">Sincronització desactivada: no hi ha cap activitat de fons</string>
<string name="status_poll_and_push_disabled">Polling i empenta discapacitats</string>
......
......@@ -34,7 +34,6 @@
<string name="pep_enable_privacy_protection">p≡p-Datenschutz</string>
<string name="pep_explanation">Erklärung</string>
<string name="pep_suggestion">Vorschlag</string>
<string name="pep_app_license">Lizenziert unter der pEp Security EULA</string>
<string name="pep_trust_server_description">Nachrichten auf dem Server geschützt speichern.</string>
<string name="pep_account_privacy_protection_explanation">p≡p-Datenschutz für dieses Konto aktivieren</string>
<string name="key_list_title">Verfügbare Schlüssel</string>
......
......@@ -4,18 +4,13 @@
<!--This should make it easier for forks to change the branding-->
<!--Used in AndroidManifest.xml-->
<!--<string name="app_name">K-9 Mail/pEp</string>-->
<!--<string name="shortcuts_title">K-9 Konten</string>
<string name="unread_widget_label">K-9 Ungelesen</string>
<string name="remote_control_label">K-9 Mail Fernsteuerung</string>
<string name="remote_control_desc">Erlaubt dieser Anwendung den Ablauf und die Einstellungen von K-9 Mail zu kontrollieren.</string>
&lt;!&ndash;Used in the about dialog&ndash;&gt;
<string name="app_authors">Google, das K-9-Team und viele Weitere.</string>
<string name="app_copyright_fmt">\u00a9 2008-<xliff:g>%1$s</xliff:g> The K-9 Dog Walkers.
Teile \u00a9 2006-<xliff:g>%2$s</xliff:g> Android Open Source Project.</string>
<string name="app_license">Lizenziert unter der Apache-Lizenz, Version 2.0.</string>
&lt;!&ndash;Welcome message&ndash;&gt;
<string name="welcome_message_title">Willkommen bei K-9 Mail</string>
<string name="accounts_welcome"><![CDATA[
<string name="shortcuts_title">p≡p Konten</string>
<string name="unread_widget_label">p≡p Ungelesen</string>
<string name="remote_control_label">p≡p Fernsteuerung</string>
<string name="remote_control_desc">Erlaubt dieser Anwendung den Ablauf und die Einstellungen von p≡p zu kontrollieren.</string>
<!--Welcome message-->
<string name="welcome_message_title">Willkommen bei p≡p</string>
<!--string name="accounts_welcome"><![CDATA[
<p>
K-9 Mail ist ein leistungsstarker, freier E-Mail-Client für Android.
</p><p>
......@@ -44,12 +39,13 @@ Bitte senden Sie Fehlerberichte, Ideen für neue Funktionen und stellen Sie Frag
<a href=\"https://github.com/k9mail/k-9/\">https://github.com/k9mail/k-9/</a>.
</p>
]]></string>
&lt;!&ndash;Default signature&ndash;&gt;
<string name="default_signature">&#45;&#45; \nGesendet mit pEp für Android.</string>
&lt;!&ndash;General strings that include the app name&ndash;&gt;
<string name="account_delete_dlg_instructions_fmt">Das Konto \"<xliff:g id="account">%s</xliff:g>\" wird aus K-9 Mail entfernt.</string>
<string name="account_recreate_dlg_instructions_fmt">Alle lokalen Daten des Kontos \"<xliff:g id="account">%s</xliff:g>\" werden entfernt. Kontoeinstellungen werden beibehalten.</string>
<string name="account_clear_dlg_instructions_fmt">Lokale Kopien von Nachrichten in \"<xliff:g id="account">%s</xliff:g>\" werden entfernt. Kontoeinstellungen werden beibehalten.</string>-->
&lt;!&ndash;Default signature&ndash;&gt; -->
<string name="default_signature">-- \nGesendet mit pEp für Android.</string>
<!--General strings that include the app name-->
<string name="account_delete_dlg_instructions_fmt">Das Konto \"<xliff:g id="account">%s</xliff:g>\" wird aus p≡p entfernt.</string>
<!--<string name="account_delete_dlg_instructions_fmt">Das Konto \"<xliff:g id="account">%s</xliff:g>\" wird aus K-9 Mail entfernt.</string>
<string name="account_recreate_dlg_instructions_fmt">Alle lokalen Daten des Kontos \"<xliff:g id="account">%s</xliff:g>\" werden entfernt. Kontoeinstellungen werden beibehalten.</string>
<string name="account_clear_dlg_instructions_fmt">Lokale Kopien von Nachrichten in \"<xliff:g id="account">%s</xliff:g>\" werden entfernt. Kontoeinstellungen werden beibehalten.</string>-->
<!--=== App Store-specific strings =======================================================-->
<string name="import_dialog_error_message">Es wurde keine geeignete Anwendung gefunden, um den Import durchzuführen. Bitte installieren Sie einen Dateimanager aus dem Play Store.</string>
<string name="open_market">Play Store öffnen</string>
......
......@@ -35,7 +35,6 @@
<string name="pep_enable_privacy_protection">p≡p protección de privacidad</string>
<string name="pep_explanation">Explicación</string>
<string name="pep_suggestion">Sugerencia</string>
<string name="pep_app_license">Licenciado bajo pEp security EULA</string>
<string name="pep_trust_server_description">Guardar los correos en el servidor de forma segura.</string>
<string name="pep_account_privacy_protection_explanation">Habilitar p≡p protección de privacidad para esta cuenta</string>
<string name="configure_account_action">Administrar cuentas</string>
......
......@@ -4,16 +4,16 @@
<!--This should make it easier for forks to change the branding-->
<!--Used in AndroidManifest.xml-->
<!--<string name="app_name">K-9 Mail/pEp</string>-->
<!--<string name="shortcuts_title">Cuentas K-9</string>-->
<!--<string name="unread_widget_label">Mensaje K-9 no leído</string>-->
<!--<string name="remote_control_label">Control remoto K-9 Mail</string>-->
<!--<string name="remote_control_desc">Permite a esta aplicación controlar las actividades y configuración de K-9 Mail</string>-->
<string name="shortcuts_title">Cuentas p≡p</string>
<string name="unread_widget_label">Mensaje p≡p no leído</string>
<string name="remote_control_label">Control remoto p≡p</string>
<string name="remote_control_desc">Permite a esta aplicación controlar las actividades y configuración de p≡p</string>
<!--&lt;!&ndash;Used in the about dialog&ndash;&gt;-->
<!--<string name="app_authors">Google, The K-9 Dog Walkers.</string>-->
<!--<string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Partes del Copyright 2006-<xliff:g>%s</xliff:g> Android Open Source Project.</string>-->
<!--<string name="app_license">Licenciado con Licencia Apache, Versión 2.0.</string>-->
<!--&lt;!&ndash;Welcome message&ndash;&gt;-->
<!--<string name="welcome_message_title">Bienvenido a K-9 Mail</string>-->
<string name="welcome_message_title">Bienvenido a p≡p</string>
<!--<string name="accounts_welcome"><![CDATA[-->
<!--<p>-->
<!--K-9 Mail es un cliente de correo potente para Android.-->
......@@ -43,12 +43,12 @@
<!--<a href=\"https://github.com/k9mail/k-9/\">https://github.com/k9mail/k-9/</a>.-->
<!--</p>-->
<!--]]></string>-->
<!--&lt;!&ndash;Default signature&ndash;&gt;-->
<!--<string name="default_signature">&#45;&#45; \nEnviado desde mi dispositivo Android con K-9 Mail/p≡p. Por favor disculpa mi brevedad.</string>-->
<!--&lt;!&ndash;General strings that include the app name&ndash;&gt;-->
<!--<string name="account_delete_dlg_instructions_fmt">La cuenta \"<xliff:g id="account">%s</xliff:g>\" será eliminada de K-9 Mail.</string>-->
<!--<string name="account_recreate_dlg_instructions_fmt">Los datos de \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero se mantendrá su configuración.</string>-->
<!--<string name="account_clear_dlg_instructions_fmt">Todos los mensajes en \"<xliff:g id="account">%s</xliff:g>\" serán eliminados de K-9 Mail, pero la configuración de la cuenta se mantendrá.</string>-->
<!--Default signature-->
<string name="default_signature">"-- Enviado desde mi p≡p para Android. "</string>
<!--General strings that include the app name-->
<string name="account_delete_dlg_instructions_fmt">La cuenta \"<xliff:g id="account">%s</xliff:g>\" será eliminada de p≡p.</string>
<string name="account_recreate_dlg_instructions_fmt">Todos los datos locales para \"<xliff:g id="account">%s</xliff:g>\" van a ser borrados. La configuración de la cuenta será conservada.</string>
<string name="account_clear_dlg_instructions_fmt">Las copias locales de mensajes en \"<xliff:g id="account">%s</xliff:g>\" van a ser borradas. La configuración de la cuenta será conservada.</string>
<!--=== App Store-specific strings =======================================================-->
<string name="import_dialog_error_message">Por favor, instale un gestor de archivos para continuar con la importación.</string>
<string name="open_market">Abrir Google Play Store</string>
......@@ -999,8 +999,6 @@
<string name="status_poll_and_push_disabled">Sondeo y envío deshabilitados</string>
<string name="status_no_background">Sincronización desactivada - No hay actividad en segundo plano</string>
<string name="status_no_network">Sincronización desactivada - Sin red</string>
<string name="account_clear_dlg_instructions_fmt">Las copias locales de mensajes en \"<xliff:g id="account">%s</xliff:g>\" van a ser borradas. La configuración de la cuenta será conservada.</string>
<string name="account_recreate_dlg_instructions_fmt">Todos los datos locales para \"<xliff:g id="account">%s</xliff:g>\" van a ser borrados. La configuración de la cuenta será conservada.</string>
<string name="app_copyright_fmt">Copyright 2020 p≡p Security S.A. Copyright 2008-<xliff:g>%1$s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%2$s</xliff:g> el Proyecto de Código Abierto de Android.</string>
<string name="ac_transfer_generating">Generando mensaje de configuración…</string>
<string name="mail_list_widget_loading">Cargando mensajes…</string>
......
......@@ -116,7 +116,6 @@
<string name="pep_trust_server_and_store_mails_unprotected">p≡p - Faire confiance au serveur et stocker les messages sans protection</string>
<string name="pep_mistrust_server_and_store_mails_encrypted">Protéger les messages stockés</string>
<string name="pep_enable_privacy_protection">protection de la vie privée p≡p</string>
<string name="pep_app_license">Sous licence pEp security EULA</string>
<string name="pep_trust_server_description">Stocker les messages de façon sûr coté serveur.</string>
<string name="pep_account_privacy_protection_explanation">Activer la protection de vie privée p≡p pour ce compte</string>
<string name="pep_forward_warning">Avertissement de réponse non sécurisée</string>
......
......@@ -4,50 +4,21 @@
<!--This should make it easier for forks to change the branding-->
<!--Used in AndroidManifest.xml-->
<!--<string name="app_name">K-9 Mail/pEp</string>-->
<!--<string name="shortcuts_title">Comptes K-9</string>-->
<!--<string name="unread_widget_label">K-9 non lus</string>-->
<!--<string name="remote_control_label">Contrôle à distance de Courriel K-9 Mail</string>-->
<!--<string name="remote_control_desc">Permet à cette application de contrôler les activités et les paramètres de Courriel K-9 Mail</string>-->
<string name="shortcuts_title">Comptes p≡p</string>
<string name="unread_widget_label">p≡p non lus</string>
<string name="remote_control_label">Contrôle à distance de Courriel p≡p</string>
<string name="remote_control_desc">Permet à cette application de contrôler les activités et les paramètres de Courriel p≡p</string>
<!--&lt;!&ndash;Used in the about dialog&ndash;&gt;-->
<!--<string name="app_authors">Google, The K-9 Dog Walkers.</string>-->
<!--<string name="app_copyright_fmt">Tous droits réservés 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Parties protégées par droits d\'auteur 2006-<xliff:g>%s</xliff:g> le projet libre Android.</string>-->
<!--<string name="app_license">Sous licence Apache, version 2.0.</string>-->
<!--&lt;!&ndash;Welcome message&ndash;&gt;-->
<!--<string name="welcome_message_title">Bienvenue sur Courriel K-9 Mail</string>-->
<!--<string name="accounts_welcome"><![CDATA[-->
<!--<p>-->
<!--Courriel K-9 Mail est un client de courriel puissant et ouvert pour Android.-->
<!--</p><p>-->
<!--Ses fonctions améliorées incluent :-->
<!--</p>-->
<!--<ul>-->
<!--<li>Courriel poussé utilisant IMAP IDLE</li>-->
<!--<li>Meilleures performances</li>-->
<!--<li>Réarchivage des messages</li>-->
<!--<li>Signatures des courriels</li>-->
<!--<li>Cci-à-soi</li>-->
<!--<li>Abonnement aux dossiers</li>-->
<!--<li>Synchronisation de tous les dossiers </li>-->
<!--<li>Configuration de l\'adresse de retour</li>-->
<!--<li>Raccourcis clavier</li>-->
<!--<li>Meilleure prise en charge IMAP</li>-->
<!--<li>Enregistrements des pièces jointes sur la carte SD</li>-->
<!--<li>Vidage de la corbeille</li>-->
<!--<li>Tri des messages</li>-->
<!--<li>et plus…</li>-->
<!--</ul>-->
<!--<p>-->
<!--Veuillez noter que K-9 ne prend pas en charge la plupart des comptes-->
<!--Hotmail gratuits et que, comme pour beaucoup de clients de courriel, la communication avec Microsoft Exchange est capricieuse.-->
<!--</p><p>-->
<!--Veuillez rapporter les bogues, recommander de nouvelles fonctions et poser vos questions sur-->
<!--<a href=\"https://github.com/k9mail/k-9/\">https://github.com/k9mail/k-9/</a>.-->
<!--</p>-->
<!--]]></string>-->
<!--&lt;!&ndash;Default signature&ndash;&gt;-->
<!--<string name="default_signature">&#45;&#45; \nEnvoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</string>-->
<!--&lt;!&ndash;General strings that include the app name&ndash;&gt;-->
<!--<string name="account_delete_dlg_instructions_fmt">Le compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» sera enlevé de Courriel K-9 Mail.</string>-->
<!--Welcome message-->
<string name="welcome_message_title">Bienvenue sur Courriel p≡p</string>
<!--Default signature-->
<string name="default_signature">-- \nEnvoyé de mon p≡p pour Android.\n</string>
<!--General strings that include the app name-->
<string name="account_delete_dlg_instructions_fmt">Le compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» sera enlevé de Courriel p≡p.</string>
<string name="account_recreate_dlg_instructions_fmt">Toutes les données de «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» seront enlevées. Les paramètres du compte seront conservés.</string>
<string name="account_clear_dlg_instructions_fmt">Les copies locales des messages de «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» seront enlevées. Les paramètres du compte seront conservés.</string>
<!--=== App Store-specific strings =======================================================-->
......
......@@ -79,7 +79,6 @@
<string name="pep_enable_privacy_protection">p≡p privacybescherming</string>
<string name="pep_explanation">Uitleg</string>
<string name="pep_suggestion">Suggestie</string>
<string name="pep_app_license">Gelicentieerd onder pEp security EULA</string>
<string name="pep_trust_server_description">Bewaar mails aan de serverzijde in een veilige vorm.</string>
<string name="pep_account_privacy_protection_explanation">Schakel p≡p-privacybescherming in voor dit account</string>
<string name="pep_forward_warning">Onveilige antwoordwaarschuwing</string>
......
......@@ -4,16 +4,16 @@
<!--This should make it easier for forks to change the branding-->
<!--Used in AndroidManifest.xml-->
<!--<string name="app_name">K-9 Mail/pEp</string>-->
<!--<string name="shortcuts_title">K-9 Accounts</string>-->
<!--<string name="unread_widget_label">K-9 Ongelezen</string>-->
<!--<string name="remote_control_label">K-9 Mail bediening op afstand</string>-->
<!--<string name="remote_control_desc">Sta deze applicatie toe om activiteiten en instellingen van K-9 Mail aan te passen.</string>-->
<string name="shortcuts_title">p≡p Accounts</string>
<string name="unread_widget_label">p≡p Ongelezen</string>
<string name="remote_control_label">p≡p bediening op afstand</string>
<string name="remote_control_desc">Sta deze applicatie toe om activiteiten en instellingen van p≡p aan te passen.</string>
<!--&lt;!&ndash;Used in the about dialog&ndash;&gt;-->
<!--<string name="app_authors">Google, The K-9 Dog Walkers.</string>-->
<!--<string name="app_copyright_fmt">Copyright 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%s</xliff:g> the Android Open Source Project.</string>-->
<!--<string name="app_license">Licensed under the Apache License, Version 2.0.</string>-->
<!--&lt;!&ndash;Welcome message&ndash;&gt;-->
<!--<string name="welcome_message_title">Welkom bij K-9 Mail</string>-->
<!--Welcome message-->
<string name="welcome_message_title">Welkom bij p≡p</string>
<!--<string name="accounts_welcome"><![CDATA[ <p> K-9 Mail is een krachtige e-mail cliënt voor Android. </p><p> De verbeterde mogelijkheden bestaan uit ondermeer:-->
<!--</p>-->
<!--<ul>-->
......@@ -39,11 +39,11 @@
<!--<a href=\"https://github.com/k9mail/k-9/\">https://github.com/k9mail/k-9/</a>. -->
<!--</p> -->
<!--]]></string>-->
<!--&lt;!&ndash;Default signature&ndash;&gt;-->
<!--<string name="default_signature">&#45;&#45; \nVerstuurd vanaf mijn Android apparaat met K-9 Mail. Excuseer mijn beknoptheid.</string>-->
<!--&lt;!&ndash;General strings that include the app name&ndash;&gt;-->
<!--<string name="account_delete_dlg_instructions_fmt">De account \"<xliff:g id="account">%s</xliff:g>\" wordt verwijderd van K-9 Mail.</string>-->
<!--<string name="account_recreate_dlg_instructions_fmt">Alle data voor \"<xliff:g id="account">%s</xliff:g>\" wordt verwijderd van K-9 Mail, maar account instellingen blijven behouden.</string>-->
<!--Default signature-->
<string name="default_signature">-- \nVerstuurd vanaf mijn Android apparaat met p≡p. Excuseer mijn beknoptheid.</string>
<!--General strings that include the app name-->
<string name="account_delete_dlg_instructions_fmt">De account \"<xliff:g id="account">%s</xliff:g>\" wordt verwijderd vanp≡p.</string>
<string name="account_recreate_dlg_instructions_fmt">Alle lokale gegevens voor \"<xliff:g id="account">%s</xliff:g>\" worden verwijderd. Accountinstellingen blijven behouden.<xliff:g id="account">%s</xliff:g>\" will be removed. Account settings will be retained.</string>
<!--<string name="account_clear_dlg_instructions_fmt">Alle berichten in \"<xliff:g id="account">%s</xliff:g>\" wordt verwijderd van K-9 Mail, maar account instellingen blijven behouden.</string>-->
<!--=== App Store-specific strings =======================================================-->
<string name="import_dialog_error_message">Installeer een bestandsbeheer-app om verder te gaan met deze import.</string>
......@@ -950,7 +950,6 @@
<string name="status_syncing_blocked">Synchroniseren geblokkeerd</string>
<string name="status_poll_and_push_disabled">Polling en pushing uitgeschakeld</string>
<string name="status_no_network">Sync uitgeschakeld - Geen netwerk</string>
<string name="account_recreate_dlg_instructions_fmt">Alle lokale gegevens voor \"<xliff:g id="account">%s</xliff:g>\" worden verwijderd. Accountinstellingen blijven behouden.<xliff:g id="account">%s</xliff:g>\" will be removed. Account settings will be retained.</string>
<string name="app_copyright_fmt">Copyright 2020 p≡p Security S.A. Copyright 2008-<xliff:g>%1$s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%2$s</xliff:g> the Android Open Source Project.</string>
<string name="app_authors">The K-9 Dog Walkers, p≡p Security S.A.</string>
<string name="switch_off">Uit</string>
......
......@@ -79,7 +79,6 @@
<string name="pep_enable_privacy_protection">p≡p ochrana súkromia</string>
<string name="pep_explanation">Vysvetlenie</string>
<string name="pep_suggestion">Návrh</string>
<string name="pep_app_license">Licencované pod licenciou pEp security EULA</string>
<string name="pep_trust_server_description">Uchovávajte e-maily na serveri v bezpečnej forme.</string>
<string name="pep_account_privacy_protection_explanation">Povoľte p≡p ochrana súkromia pre tento účet</string>
<string name="pep_forward_warning">Varovanie nezabezpečenej odpovede</string>
......
......@@ -4,16 +4,16 @@
<!--This should make it easier for forks to change the branding-->
<!--Used in AndroidManifest.xml-->
<!--&lt;!&ndash;<string name="app_name">K-9 Mail/pEp</string>&ndash;&gt;-->
<!--<string name="shortcuts_title">K-9 Účty</string>-->
<!--<string name="unread_widget_label">K-9 Neprečítaná</string>-->
<!--<string name="remote_control_label">diaľkové ovládanie K-9 Mail</string>-->
<!--<string name="remote_control_desc">Umožňuje tejto aplikácii ovládať aktivity a nastavenia K-9 Mail.</string>-->
<string name="shortcuts_title">p≡p Účty</string>
<string name="unread_widget_label">p≡p Neprečítaná</string>
<string name="remote_control_label">diaľkové ovládanie p≡p</string>
<string name="remote_control_desc">Umožňuje tejto aplikácii ovládať aktivity a nastavenia p≡p.</string>
<!--&lt;!&ndash;Used in the about dialog&ndash;&gt;-->
<!--<string name="app_authors">Google, The K-9 Dog Walkers.</string>-->
<string name="app_copyright_fmt">Copyright 2020 p≡p Security S.A. Copyright 2008-<xliff:g>%1$s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%2$s</xliff:g> the Android Open Source Project.</string>
<!--<string name="app_license">Licenciované pod licenciou Apache 2.0.</string>-->
<!--&lt;!&ndash;Welcome message&ndash;&gt;-->
<!--<string name="welcome_message_title">Vitajte v K-9 Mail</string>-->
<!--Welcome message-->
<string name="welcome_message_title">Vitajte v p≡p</string>
<!--<string name="accounts_welcome"><![CDATA[-->
<!--<p>-->
<!--K-9 Mail je výkonný a slobodný e-mailový klient pre Android.-->
......@@ -44,10 +44,10 @@
<!--<a href=\"https://github.com/k9mail/k-9/\">https://github.com/k9mail/k-9/</a>.-->
<!--</p>-->
<!--]]></string>-->
<!--&lt;!&ndash;Default signature&ndash;&gt;-->
<!--<string name="default_signature">&#45;&#45; \nOdoslané z môjho Android zariadenia prostredníctvom K-9 Mail. Prosím, ospravedlňte moju statočnosť.</string>-->
<!--&lt;!&ndash;General strings that include the app name&ndash;&gt;-->
<!--<string name="account_delete_dlg_instructions_fmt">Účet \"<xliff:g id="account">%s</xliff:g>\" bude odstránený z K-9 Mail.</string>-->
<!--Default signature-->
<string name="default_signature">-- \nOdoslané z môjho Android zariadenia prostredníctvom p≡p. Prosím, ospravedlňte moju statočnosť.</string>
<!--General strings that include the app name-->
<string name="account_delete_dlg_instructions_fmt">Účet \"<xliff:g id="account">%s</xliff:g>\" bude odstránený z p≡p.</string>
<string name="account_recreate_dlg_instructions_fmt">Všetky lokálne údaje pre účet \"<xliff:g id="account">%s</xliff:g>\" budú odstránené. Nastavenia účtu budú zachované.</string>
<string name="account_clear_dlg_instructions_fmt">Všetky správy pre účet \"<xliff:g id="account">%s</xliff:g>\" budú odstránené. Nastavenia účtu budú však zachované.</string>
<!--=== App Store-specific strings =======================================================-->
......
......@@ -34,7 +34,6 @@
<string name="pep_enable_privacy_protection">Gizlilik koruması</string>
<string name="pep_explanation">Açıklama</string>
<string name="pep_suggestion">Öneri</string>
<string name="pep_app_license">GNU Genel Kamu Lisansı v3 altında Lisanslı</string>
<string name="pep_trust_server_description">Server tarafındaki e-postaları güvenli bir biçimde saklayın.</string>
<string name="pep_account_privacy_protection_explanation">Bu hesap için gizlilik korumasını etkinleştir </string>
<string name="key_list_title">Available keys</string>
......
......@@ -4,21 +4,21 @@
<!--This should make it easier for forks to change the branding-->
<!--Used in AndroidManifest.xml-->
<!--<string name="app_name">K-9 Posta</string>-->
<!--<string name="shortcuts_title">K-9 Hesaplar</string>-->
<!--<string name="unread_widget_label">K-9 Okunmamış</string>-->
<!--<string name="remote_control_label">K-9 Posta\'ya uzaktan erişim</string>-->
<!--<string name="remote_control_desc">Bu programın K-9 Mail aktiviteleri ve ayarlarını kontrol edebilmesine izin ver.</string>-->
<string name="shortcuts_title">p≡p Hesaplar</string>
<string name="unread_widget_label">p≡p Okunmamış</string>
<string name="remote_control_label">p≡p Posta\'ya uzaktan erişim</string>
<string name="remote_control_desc">Bu programın p≡p aktiviteleri ve ayarlarını kontrol edebilmesine izin ver.</string>
<!--&lt;!&ndash;Used in the about dialog&ndash;&gt;-->
<!--<string name="app_authors">Google, The K-9 Dog Walkers.</string>-->
<!--<string name="app_copyright_fmt">Telif Hakkı 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Portions Telif hakkı 2006-<xliff:g>%s</xliff:g> Android Açık Kaynak Projesi.</string>-->
<!--<string name="app_license">Apache License, Sürüm 2.0 altında lisanslanmıştır.</string>-->
<!--&lt;!&ndash;Welcome message&ndash;&gt;-->
<!--<string name="welcome_message_title">K-9 Mail\'e Hoşgeldiniz</string>-->
<!--Welcome message-->
<string name="welcome_message_title">p≡p\'e Hoşgeldiniz</string>
<!--&lt;!&ndash;Default signature&ndash;&gt;-->
<!--<string name="default_signature">&#45;&#45; \nAndroid için K-9 Posta\'dan gönderildi. Lütfen bu kısa notumu mazur görün.</string>-->
<!--&lt;!&ndash;General strings that include the app name&ndash;&gt;-->
<!--<string name="account_delete_dlg_instructions_fmt">Hesap \"<xliff:g id="account">%s</xliff:g>\" K-9 Mail\'den kaldırılacak.</string>-->
<!--<string name="account_recreate_dlg_instructions_fmt">Bütün bilgi \"<xliff:g id="account">%s</xliff:g>\" için K-9 Mail\'den kaldırılacak, fakat hesap ayarları korunacak.</string>-->
<string name="default_signature">-- \nAndroid için p≡p Posta\'dan gönderildi. Lütfen bu kısa notumu mazur görün.</string>
<!--General strings that include the app name-->
<string name="account_delete_dlg_instructions_fmt">Hesap \"<xliff:g id="account">%s</xliff:g>\" p≡p\'den kaldırılacak.</string>
<string name="account_recreate_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\" için tüm yerel veriler kaldırılacak. Hesap ayarları korunur.</string>
<!--<string name="account_clear_dlg_instructions_fmt">Bütün mesajlar \"<xliff:g id="account">%s</xliff:g>\" içinden ve K-9 Mail\'den kaldırılacak, fakat hesap ayarları korunacak.</string>-->
<!--=== App Store-specific strings =======================================================-->
<string name="import_dialog_error_message">İçeri aktarma işlemini gerçekleştirebilecek uygun bir uygulama bulunamadı. Lütfen Google Play Store\'dan bir dosya yönetici uygulaması edinin.</string>
......@@ -911,7 +911,6 @@
<string name="openpgp_enabled_error_back">Back</string>
<string name="app_name">p≡p</string>
<string name="app_copyright_fmt">Copyright 2020 p≡p Security SA Telif Hakkı 2008- <xliff:g>%1$s</xliff:g> K-9 Köpek Gezdiricileri . Bölümler Telif Hakkı 2006- <xliff:g>%2$s</xliff:g> Android Açık Kaynak Projesi.</string>
<string name="account_recreate_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\" için tüm yerel veriler kaldırılacak. Hesap ayarları korunur.</string>
<string name="account_clear_dlg_instructions_fmt">\"<xliff:g id="account">%s</xliff:g>\" içindeki iletilerin yerel kopyaları kaldırılacak. Hesap ayarları korunur.</string>
<string name="status_no_network">Senkronizasyon devre dışı - Ağ yok</string>
<string name="status_no_background">Senkronizasyon devre dışı - Arka plan etkinliği yok</string>
......
......@@ -76,7 +76,6 @@
<string name="pep_enable_privacy_protection">Enable p≡p privacy protection</string>
<string name="pep_explanation">Explanation</string>
<string name="pep_suggestion">Suggestion</string>
<string name="pep_app_license">Licenced under pEp security EULA</string>
<string name="pep_trust_server_description">Store serverside mails in a safe form.</string>
<string name="pep_account_privacy_protection_explanation">Enable p≡p privacy protection for this account </string>
<string name="pep_forward_warning">Unsecure reply warning</string>
......
......@@ -4,15 +4,15 @@
<!-- This should make it easier for forks to change the branding -->
<!-- Used in AndroidManifest.xml -->
<string name="app_name" translatable="false">p≡p</string>
<!--<string name="shortcuts_title">K-9 Accounts</string>-->
<!--<string name="unread_widget_label">K-9 Unread</string>-->
<!--<string name="remote_control_label">K-9 Mail remote control</string>-->
<!--<string name="remote_control_desc">Allows this application to control K-9 Mail activities and settings.</string>-->
<string name="shortcuts_title">p≡p Accounts</string>
<string name="unread_widget_label">p≡p Unread</string>
<string name="remote_control_label">p≡p remote control</string>
<string name="remote_control_desc">Allows this application to control p≡p activities and settings.</string>
<!-- Used in the about dialog -->
<string name="app_authors" translatable="false">The K-9 Dog Walkers, p≡p Security S.A.</string>
<string name="app_copyright_fmt">Copyright 2020 p≡p Security S.A. Copyright 2008-<xliff:g>%1$s</xliff:g> The K-9 Dog Walkers. Portions Copyright 2006-<xliff:g>%2$s</xliff:g> the Android Open Source Project.</string>
<!-- Welcome message -->
<!--<string name="welcome_message_title">Welcome to K-9 Mail</string>-->
<string name="welcome_message_title">Welcome to p≡p</string>
<!--<string name="accounts_welcome"><![CDATA[-->
<!--<p>-->
<!--K-9 Mail is a powerful free email client for Android.-->
......@@ -44,10 +44,10 @@
<!--</p>-->
<!--]]></string>-->
<!-- Default signature -->
<!--<string name="default_signature">&#45;&#45; \nSent from my K-9 Mail/p≡p on Android.\n</string>-->
<string name="default_signature">"-- Sent from my p≡p for Android. "</string>
<!-- General strings that include the app name -->
<!--<string name="account_delete_dlg_instructions_fmt">The account \"<xliff:g id="account">%s</xliff:g>\" will be removed from K-9 Mail.</string>-->
<string name="account_recreate_dlg_instructions_fmt">All local data for \"<xliff:g id="account">%s</xliff:g>\" will be removed. Account settings will be retained.</string>
<string name="account_delete_dlg_instructions_fmt">The account \"<xliff:g id="account">%s</xliff:g>\" will be removed from p≡p.</string>
<string name="account_recreate_dlg_instructions_fmt">All local data for \\\"<xliff:g id="account">%s</xliff:g>\\\" will be removed. Account settings will be retained.</string>
<string name="account_clear_dlg_instructions_fmt">Local copies of messages in \"<xliff:g id="account">%s</xliff:g>\" will be removed. Account settings will be retained.</string>
<!-- === App Store-specific strings ======================================================= -->
<string name="import_dialog_error_message">Please install a file manager to continue with this import.</string>
......
......@@ -6,11 +6,11 @@ import android.os.Build
import android.os.Bundle
import android.text.Layout.JUSTIFICATION_MODE_INTER_WORD
import android.view.MenuItem
import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.core.text.HtmlCompat
import com.fsck.k9.R
import com.fsck.k9.pEp.PepActivity
import kotlinx.android.synthetic.main.activity_license.*
import security.pEp.ui.toolbar.ToolBarCustomizer
import javax.inject.Inject
......@@ -27,9 +27,10 @@ class LicenseActivity : PepActivity() {
toolbarCustomizer.setToolbarColor(ContextCompat.getColor(this, R.color.colorPrimary))
initializeToolbar(true, getString(R.string.license))
licenseText.text = HtmlCompat.fromHtml(getString(R.string.gpl_license), HtmlCompat.FROM_HTML_MODE_LEGACY)
findViewById<TextView>(R.id.licenseText).text = HtmlCompat.fromHtml(getString(R.string.eula_license), HtmlCompat.FROM_HTML_MODE_LEGACY)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
licenseText.justificationMode = JUSTIFICATION_MODE_INTER_WORD
findViewById<TextView>(R.id.licenseText).justificationMode = JUSTIFICATION_MODE_INTER_WORD
}
}
......
......@@ -20,7 +20,6 @@
android:layout_width="match_parent"
android:padding="16dp"
android:layout_height="wrap_content"
android:text="@string/gpl_license"
android:textSize="12sp" />
</ScrollView>
</LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="remote_control_label">Control remot del Correu p≡p</string>
<string name="remote_control_desc">Permet a aquesta aplicació controlar les activitats i la configuració de p≡p.</string>
<string name="welcome_message_title">Us donem la benvinguda a p≡p</string>
<string name="account_delete_dlg_instructions_fmt">El compte \"<xliff:g id="account">%s</xliff:g>\" serà esborrat de p≡p.</string>
<string name="account_recreate_dlg_instructions_fmt">Totes les dades de \"<xliff:g id="account">%s</xliff:g>\" seran esborrades de p≡p, però la configuració del compte romandrà.</string>
<string name="default_signature">"-- Enviat des del meu p≡p per Android. "</string>
<string name="pep_app_license">Llicenciat sota l\'EULA de p≡p Security</string>
</resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!--=== App-specific strings =============================================================-->
<!--This should make it easier for forks to change the branding-->
<!--Used in AndroidManifest.xml-->
<!--<string name="app_name">K-9 Mail/pEp</string>-->
<string name="shortcuts_title">p≡p Konten</string>
<string name="unread_widget_label">p≡p Ungelesen</string>
<string name="remote_control_label">p≡p Fernsteuerung</string>
<string name="remote_control_desc">Erlaubt dieser Anwendung den Ablauf und die Einstellungen von p≡p zu kontrollieren.</string>
<!--Welcome message-->
<string name="welcome_message_title">Willkommen bei p≡p</string>
<string name="default_signature">-- \nGesendet mit pEp für Android.</string>
<!--General strings that include the app name-->
<string name="account_delete_dlg_instructions_fmt">Das Konto \"<xliff:g id="account">%s</xliff:g>\" wird aus p≡p entfernt.</string>
<string name="pep_app_license">Lizenziert unter der pEp Security EULA</string>
</resources>
<?xml version='1.0' encoding='UTF-8'?>
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!--=== App-specific strings =============================================================-->