Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 028d07e5 authored by Jesse Vincent's avatar Jesse Vincent
Browse files

Revert "Better explain what "recreate an account" means and that it now 

resets" now that Dan has added a cache of these settings into the user's
preferences database

This reverts commit 203f9fba.

Conflicts:

	res/values-fi/strings.xml
	res/values-zh-rCN/strings.xml
parent 7cd99bdf

res/values-cs/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ Vítejte v nastavení pošty K-9 Mail. K-9 je open source poštovní klient pro 
    <string name="account_delete_dlg_instructions_fmt">Účet \"<xliff:g id="account">%s</xliff:g>\" bude odstraněn z pošty K-9 Mail.</string>



    <string name="account_recreate_dlg_title">Obnovit účet</string>

    <string name="account_recreate_dlg_instructions_fmt">Všechny zpráv, příloh, složek a jejich nastavení složek \"<xliff:g id="account">%s</xliff:g>\" budou z pošty K-9 Mail odstraněna, ale nastavení účtu bude zachováno.</string>

    <string name="account_recreate_dlg_instructions_fmt">Všechna data účtu \"<xliff:g id="account">%s</xliff:g>\" budou z pošty K-9 Mail odstraněna, ale nastavení účtu bude zachováno.</string>



    <string name="account_clear_dlg_title">Vyčistit účet</string>

    <string name="account_clear_dlg_instructions_fmt">Všechny zprávy v účtu \"<xliff:g id="account">%s</xliff:g>\" budou z pošty K-9 Mail odstraněny, ale nastavení účtu bude zachováno.</string>

res/values-de/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ Willkommen zum \"K-9 Mail\"-Setup. K-9 ist eine quelloffene E-Mail-Anwendung fü 
    <string name="account_delete_dlg_instructions_fmt">Das Konto \"<xliff:g id="account">%s</xliff:g>\" wird gelöscht.</string>



    <string name="account_recreate_dlg_title">Konto wiederherstellen</string>

    <string name="account_recreate_dlg_instructions_fmt">Alle Nachrichten, Anhänge, Ordner und Ordner-Einstellungen \"<xliff:g id="account">%s</xliff:g>\" werden von K-9 Mail entfernt. Kontoeinstellungen werden beibehalten.</string>

    <string name="account_recreate_dlg_instructions_fmt">Alle Daten des Kontos \"<xliff:g id="account">%s</xliff:g>\" werden von K-9 Mail entfernt. Kontoeinstellungen werden beibehalten.</string>



    <string name="account_clear_dlg_title">Nachrichten löschen</string>

    <string name="account_clear_dlg_instructions_fmt">Alle Nachrichten des Kontos \"<xliff:g id="account">%s</xliff:g>\" werden von K-9 Mail entfernt. Kontoeinstellungen werden beibehalten.</string>

res/values-es/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ Bienvenido a la Configuración de K-9. K-9 es un cliente de correo OpenSource pa 
    <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_title">Recrear cuenta</string>

    <string name="account_recreate_dlg_instructions_fmt">Todos los mensajes, archivos adjuntos, carpetas y configuración de las carpetas 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_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_title">Limpiar cuenta</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>

res/values-fr/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ 
  <string name="account_delete_dlg_title">Supprimer</string>

  <string name="account_delete_dlg_instructions_fmt">Le compte «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» sera supprimé de K-9 Mail.</string>

  <string name="account_recreate_dlg_title">Recréer compte</string>

  <string name="account_recreate_dlg_instructions_fmt">Tous les messages, pièces jointes, dossiers et paramètres de dossier de «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» vont être effacées de K-9 Mail, mais les paramètres du compte seront sauvegardés.</string>

  <string name="account_recreate_dlg_instructions_fmt">Toutes les données de «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» vont être effacées de K-9 Mail, mais les paramètres du compte seront sauvegardés.</string>

  <string name="account_clear_dlg_title">Vider le compte</string>

  <string name="account_clear_dlg_instructions_fmt">Tous les messages de «\u00A0<xliff:g id="account">%s</xliff:g>\u00A0» vont être effacés de K-9 Mail, mais les paramàtres du compte seront sauvegardés</string>

  <string name="provider_note_live">Seuls certains comptes «\u00A0Plus\u00A0» autorisent l\'accès POP

res/values-it/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ Benvenuto nella configurazione della posta di K-9. K-9 è un client di posta ope 
    <string name="account_delete_dlg_instructions_fmt">L\'account \"<xliff:g id="account">%s</xliff:g>\" sarà rimosso da K-9 Mail.</string>



    <string name="account_recreate_dlg_title">Ricrea Account</string>

    <string name="account_recreate_dlg_instructions_fmt">Tutti i messaggi, allegati, cartelle e impostazioni della cartella per \"<xliff:g id="account">%s</xliff:g>\" saranno rimossi da K-9 Mail, ma le impostazioni dell\'account saranno conservate.</string>

    <string name="account_recreate_dlg_instructions_fmt">Tutti i dati per \"<xliff:g id="account">%s</xliff:g>\" saranno rimossi da K-9 Mail, ma le impostazioni dell\'account saranno conservate.</string>



    <string name="account_clear_dlg_title">Cancella Account</string>

    <string name="account_clear_dlg_instructions_fmt">Tutti i messaggi in \"<xliff:g id="account">%s</xliff:g>\" saranno rimossi da K-9 Mail, ma le impostazioni dell\'account saranno conservate.</string>