diff --git a/lang/da/LC_MESSAGES/flectar-mail.po b/lang/da/LC_MESSAGES/flectar-mail.po index 396157dd..6fa8dbc1 100644 --- a/lang/da/LC_MESSAGES/flectar-mail.po +++ b/lang/da/LC_MESSAGES/flectar-mail.po @@ -902,7 +902,7 @@ msgstr "" msgid "Flectar Mail backup" msgstr "" -#: ui/app.slint:358 ui/dialogs/import-dialog.slint:401 +#: ui/app.slint:358 ui/dialogs/import-dialog.slint:407 #: ui/views/onboarding-view.slint:222 msgid "Import accounts and mail" msgstr "" @@ -3373,158 +3373,158 @@ msgstr "" msgid "Create folder" msgstr "" -#: ui/dialogs/import-dialog.slint:125 +#: ui/dialogs/import-dialog.slint:130 msgid "No valid email address was found." msgstr "" -#: ui/dialogs/import-dialog.slint:126 +#: ui/dialogs/import-dialog.slint:131 msgid "No incoming mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:127 +#: ui/dialogs/import-dialog.slint:132 msgid "The incoming server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:128 +#: ui/dialogs/import-dialog.slint:133 msgid "No outgoing mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:129 +#: ui/dialogs/import-dialog.slint:134 msgid "The outgoing server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:130 +#: ui/dialogs/import-dialog.slint:135 msgid "" "The incoming server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:131 +#: ui/dialogs/import-dialog.slint:136 msgid "" "The outgoing server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:132 +#: ui/dialogs/import-dialog.slint:137 msgid "" "{} keeps your password off its unencrypted connection, but Flectar Mail " "would send it in the clear. Turn on SSL/TLS or STARTTLS for this server " "first." msgstr "" -#: ui/dialogs/import-dialog.slint:134 +#: ui/dialogs/import-dialog.slint:139 msgid "" "The incoming server connects without signing in, which Flectar Mail does not " "support." msgstr "" -#: ui/dialogs/import-dialog.slint:135 +#: ui/dialogs/import-dialog.slint:140 msgid "" "The incoming server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:136 +#: ui/dialogs/import-dialog.slint:141 msgid "" "The incoming server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:137 +#: ui/dialogs/import-dialog.slint:142 msgid "" "The outgoing server sends mail without signing in, which Flectar Mail does " "not support." msgstr "" -#: ui/dialogs/import-dialog.slint:138 +#: ui/dialogs/import-dialog.slint:143 msgid "" "The outgoing server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:139 +#: ui/dialogs/import-dialog.slint:144 msgid "" "The outgoing server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:140 +#: ui/dialogs/import-dialog.slint:145 msgid "" "The outgoing server signs in as {}. Flectar Mail uses one sign-in for both " "servers." msgstr "" -#: ui/dialogs/import-dialog.slint:141 +#: ui/dialogs/import-dialog.slint:146 msgid "The incoming server has no user name." msgstr "" -#: ui/dialogs/import-dialog.slint:142 +#: ui/dialogs/import-dialog.slint:147 msgid "The server settings for {} are not valid." msgstr "" -#: ui/dialogs/import-dialog.slint:143 +#: ui/dialogs/import-dialog.slint:148 msgid "This address appears earlier in the file." msgstr "" -#: ui/dialogs/import-dialog.slint:144 +#: ui/dialogs/import-dialog.slint:149 msgid "" "Your password will be sent over the encrypted connection instead of with " "CRAM-MD5." msgstr "" -#: ui/dialogs/import-dialog.slint:145 +#: ui/dialogs/import-dialog.slint:150 msgid "You will sign in with Microsoft instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:146 +#: ui/dialogs/import-dialog.slint:151 msgid "You will sign in with Google instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:147 +#: ui/dialogs/import-dialog.slint:152 msgid "" "The account signs in as {}, which is not an email address. Add it with its " "own address instead." msgstr "" -#: ui/dialogs/import-dialog.slint:148 +#: ui/dialogs/import-dialog.slint:153 msgid "" "Flectar Mail cannot use browser sign-in for {}. Sign in with an app password." msgstr "" -#: ui/dialogs/import-dialog.slint:149 +#: ui/dialogs/import-dialog.slint:154 msgid "The provider's standard outgoing server replaces {}." msgstr "" -#: ui/dialogs/import-dialog.slint:150 +#: ui/dialogs/import-dialog.slint:155 msgid "This account syncs with {} instead of downloading mail with POP3." msgstr "" -#: ui/dialogs/import-dialog.slint:151 ui/dialogs/settings-dialog.slint:1983 +#: ui/dialogs/import-dialog.slint:156 ui/dialogs/settings-dialog.slint:1983 msgid "Mail is removed from the server once it's on this device." msgstr "" -#: ui/dialogs/import-dialog.slint:152 ui/dialogs/settings-dialog.slint:1982 +#: ui/dialogs/import-dialog.slint:157 ui/dialogs/settings-dialog.slint:1982 msgid "Mail you delete here is removed from the server too." msgstr "" -#: ui/dialogs/import-dialog.slint:153 +#: ui/dialogs/import-dialog.slint:158 msgid "" "Mail is removed from the server {} days after it's downloaded, or once " "deleted here." msgstr "" -#: ui/dialogs/import-dialog.slint:154 +#: ui/dialogs/import-dialog.slint:159 msgid "" "No choice here matches how long the account kept mail on the server, so the " "closest one is used." msgstr "" -#: ui/dialogs/import-dialog.slint:155 +#: ui/dialogs/import-dialog.slint:160 msgid "One other address is managed by Gmail and appears after you sign in." msgid_plural "" "{n} other addresses are managed by Gmail and appear after you sign in." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:156 +#: ui/dialogs/import-dialog.slint:161 msgid "" "One sending address was not imported because it is invalid or uses another " "outgoing server." @@ -3534,209 +3534,213 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:157 +#: ui/dialogs/import-dialog.slint:162 msgid "A signature stored in a file outside the profile was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:158 +#: ui/dialogs/import-dialog.slint:163 msgid "A signature larger than 32 KB was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:163 +#: ui/dialogs/import-dialog.slint:168 msgid "The file could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:164 +#: ui/dialogs/import-dialog.slint:169 msgid "The settings file is too large." msgstr "" -#: ui/dialogs/import-dialog.slint:165 +#: ui/dialogs/import-dialog.slint:170 msgid "" "This is not a supported settings export or mail file. Choose a .k9s file, a " "Thunderbird profile export or prefs.js, a Flectar Mail backup, or mail saved " "as .mbox or .eml files." msgstr "" -#: ui/dialogs/import-dialog.slint:166 +#: ui/dialogs/import-dialog.slint:171 msgid "The file is damaged: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:167 +#: ui/dialogs/import-dialog.slint:172 msgid "This settings format (version {}) is not supported." msgstr "" -#: ui/dialogs/import-dialog.slint:168 +#: ui/dialogs/import-dialog.slint:173 msgid "The settings contain no mail accounts." msgstr "" -#: ui/dialogs/import-dialog.slint:169 +#: ui/dialogs/import-dialog.slint:174 msgid "No mail was found in this folder." msgstr "" -#: ui/dialogs/import-dialog.slint:170 +#: ui/dialogs/import-dialog.slint:175 msgid "" "This folder contains several Thunderbird profiles. Choose the profile folder " "inside it that you want to import." msgstr "" -#: ui/dialogs/import-dialog.slint:171 +#: ui/dialogs/import-dialog.slint:176 msgid "" "This folder is not a Thunderbird profile. Choose the folder that contains " "prefs.js." msgstr "" -#: ui/dialogs/import-dialog.slint:172 +#: ui/dialogs/import-dialog.slint:177 msgid "" "This Thunderbird profile is on a network location. Choose the profile folder " "itself to import it." msgstr "" -#: ui/dialogs/import-dialog.slint:173 +#: ui/dialogs/import-dialog.slint:178 msgid "The backup could not be restored: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:174 +#: ui/dialogs/import-dialog.slint:179 msgid "" "The import stopped: {}. The mail imported until then was kept, and importing " "the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:175 +#: ui/dialogs/import-dialog.slint:180 msgid "Import failed: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:180 +#: ui/dialogs/import-dialog.slint:185 msgid "Could not import accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:181 +#: ui/dialogs/import-dialog.slint:186 msgid "Could not import all the mail" msgstr "" -#: ui/dialogs/import-dialog.slint:182 +#: ui/dialogs/import-dialog.slint:187 msgid "No mail found" msgstr "" -#: ui/dialogs/import-dialog.slint:183 +#: ui/dialogs/import-dialog.slint:188 msgid "Could not read your selection" msgstr "" -#: ui/dialogs/import-dialog.slint:189 +#: ui/dialogs/import-dialog.slint:193 +msgid "Uploaded to the account’s server, into the folder “{}”" +msgstr "" + +#: ui/dialogs/import-dialog.slint:195 msgid "In the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:191 +#: ui/dialogs/import-dialog.slint:197 msgid "Kept on this device, in the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:192 +#: ui/dialogs/import-dialog.slint:198 msgid "Kept on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:223 +#: ui/dialogs/import-dialog.slint:229 msgid "" "Local Folders kept outside the profile were not found. Choose their folder " "to import them." msgstr "" -#: ui/dialogs/import-dialog.slint:224 +#: ui/dialogs/import-dialog.slint:230 msgid "Local Folders kept outside the profile were not found." msgstr "" -#: ui/dialogs/import-dialog.slint:230 +#: ui/dialogs/import-dialog.slint:236 msgid "Feeds and newsgroups are not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:254 ui/dialogs/import-dialog.slint:667 +#: ui/dialogs/import-dialog.slint:260 ui/dialogs/import-dialog.slint:673 msgid "Import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:295 +#: ui/dialogs/import-dialog.slint:301 msgid "Where to import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stopping…" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stop" msgstr "" -#: ui/dialogs/import-dialog.slint:322 +#: ui/dialogs/import-dialog.slint:328 msgid "Continue in background" msgstr "" -#: ui/dialogs/import-dialog.slint:327 ui/views/files-view.slint:324 +#: ui/dialogs/import-dialog.slint:333 ui/views/files-view.slint:324 msgid "Back" msgstr "" -#: ui/dialogs/import-dialog.slint:332 +#: ui/dialogs/import-dialog.slint:338 msgid "Choose folder…" msgstr "" -#: ui/dialogs/import-dialog.slint:345 +#: ui/dialogs/import-dialog.slint:351 msgid "Choose file…" msgstr "" -#: ui/dialogs/import-dialog.slint:353 +#: ui/dialogs/import-dialog.slint:359 msgid "Next" msgstr "" -#: ui/dialogs/import-dialog.slint:359 ui/dialogs/import-dialog.slint:368 +#: ui/dialogs/import-dialog.slint:365 ui/dialogs/import-dialog.slint:374 msgid "Import one account" msgid_plural "Import {n} accounts" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:369 ui/dialogs/settings-dialog.slint:2186 +#: ui/dialogs/import-dialog.slint:375 ui/dialogs/settings-dialog.slint:2186 msgid "Import" msgstr "" -#: ui/dialogs/import-dialog.slint:376 +#: ui/dialogs/import-dialog.slint:382 msgid "Open accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:385 +#: ui/dialogs/import-dialog.slint:391 msgid "Show mail" msgstr "" -#: ui/dialogs/import-dialog.slint:468 +#: ui/dialogs/import-dialog.slint:474 msgid "Choose accounts to import" msgstr "" -#: ui/dialogs/import-dialog.slint:469 +#: ui/dialogs/import-dialog.slint:475 msgid "Choose mail to import" msgstr "" -#: ui/dialogs/import-dialog.slint:470 ui/dialogs/import-dialog.slint:873 +#: ui/dialogs/import-dialog.slint:476 ui/dialogs/import-dialog.slint:887 msgid "Import stopped" msgstr "" -#: ui/dialogs/import-dialog.slint:471 ui/dialogs/import-dialog.slint:874 +#: ui/dialogs/import-dialog.slint:477 ui/dialogs/import-dialog.slint:888 msgid "Import complete" msgstr "" -#: ui/dialogs/import-dialog.slint:486 +#: ui/dialogs/import-dialog.slint:492 msgid "" "Bring your accounts from Thunderbird, Thunderbird for Android, K-9 Mail, or " "a Flectar Mail backup, and mail from Thunderbird or saved mail files. " "Passwords are never imported: you sign in to each account afterward." msgstr "" -#: ui/dialogs/import-dialog.slint:492 +#: ui/dialogs/import-dialog.slint:498 msgid "Thunderbird on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:506 +#: ui/dialogs/import-dialog.slint:512 msgid "Import from Thunderbird profile {}" msgstr "" -#: ui/dialogs/import-dialog.slint:534 +#: ui/dialogs/import-dialog.slint:540 msgid "{} (default profile)" msgstr "" -#: ui/dialogs/import-dialog.slint:569 +#: ui/dialogs/import-dialog.slint:575 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip), profile folders and prefs.js, Flectar Mail backups (." @@ -3744,146 +3748,158 @@ msgid "" "archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:570 +#: ui/dialogs/import-dialog.slint:576 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip) and prefs.js, Flectar Mail backups (.json), and mail " "saved as .mbox or .eml files or in ZIP archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:583 +#: ui/dialogs/import-dialog.slint:589 msgid "Looking for accounts and mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:584 ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:590 ui/dialogs/import-dialog.slint:885 msgid "Importing accounts…" msgstr "" -#: ui/dialogs/import-dialog.slint:585 ui/dialogs/import-dialog.slint:604 +#: ui/dialogs/import-dialog.slint:591 ui/dialogs/import-dialog.slint:610 msgid "Importing mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:616 +#: ui/dialogs/import-dialog.slint:622 msgid "One message · {1} of {2}" msgid_plural "{0} messages · {1} of {2}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:643 +#: ui/dialogs/import-dialog.slint:649 msgid "" "From Thunderbird for Android or K-9 Mail. Existing accounts are never " "changed." msgstr "" -#: ui/dialogs/import-dialog.slint:644 +#: ui/dialogs/import-dialog.slint:650 msgid "From Thunderbird. Existing accounts are never changed." msgstr "" -#: ui/dialogs/import-dialog.slint:682 +#: ui/dialogs/import-dialog.slint:688 msgid "Already in Flectar Mail" msgstr "" -#: ui/dialogs/import-dialog.slint:683 +#: ui/dialogs/import-dialog.slint:689 msgid "Cannot be imported" msgstr "" -#: ui/dialogs/import-dialog.slint:684 +#: ui/dialogs/import-dialog.slint:690 msgid "Sign in with Google after import" msgstr "" -#: ui/dialogs/import-dialog.slint:685 +#: ui/dialogs/import-dialog.slint:691 msgid "Sign in with Microsoft after import" msgstr "" -#: ui/dialogs/import-dialog.slint:686 +#: ui/dialogs/import-dialog.slint:692 msgid "{} · enter your password after import" msgstr "" -#: ui/dialogs/import-dialog.slint:692 +#: ui/dialogs/import-dialog.slint:698 msgid "Named “{}” in the other app" msgstr "" -#: ui/dialogs/import-dialog.slint:711 +#: ui/dialogs/import-dialog.slint:718 +msgid "" +"Mail stays on this device unless you choose an account for it. Messages " +"already there are skipped, so an import can be repeated." +msgstr "" + +#: ui/dialogs/import-dialog.slint:719 msgid "" "Imported mail is kept only on this device. Messages already here are " "skipped, so an import can be repeated." msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "No folders chosen" msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "One folder chosen, {}" msgid_plural "{n} folders chosen, {}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:742 +#: ui/dialogs/import-dialog.slint:750 msgid "Imported one account. Sign in to it to start syncing." msgid_plural "Imported {n} accounts. Sign in to each one to start syncing." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:748 +#: ui/dialogs/import-dialog.slint:756 msgid "No accounts were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:754 +#: ui/dialogs/import-dialog.slint:762 msgid "One account was already in Flectar Mail and was left unchanged." msgid_plural "" "{n} accounts were already in Flectar Mail and were left unchanged." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:760 +#: ui/dialogs/import-dialog.slint:768 msgid "" "The theme, language, and other preferences from the backup were applied." msgstr "" -#: ui/dialogs/import-dialog.slint:767 +#: ui/dialogs/import-dialog.slint:775 msgid "Imported one message." msgid_plural "Imported {} messages." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:768 +#: ui/dialogs/import-dialog.slint:776 msgid "No new messages were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:774 +#: ui/dialogs/import-dialog.slint:782 msgid "One message was already here and was skipped." msgid_plural "{} messages were already here and were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:780 +#: ui/dialogs/import-dialog.slint:788 msgid "One message larger than 128 MB was skipped." msgid_plural "{} messages larger than 128 MB were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:786 +#: ui/dialogs/import-dialog.slint:794 +msgid "The server refused one message: {1}" +msgid_plural "The server refused {0} messages: {1}" +msgstr[0] "" +msgstr[1] "" + +#: ui/dialogs/import-dialog.slint:800 msgid "The import was stopped. Importing the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:798 +#: ui/dialogs/import-dialog.slint:812 msgid "{} could not be imported: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:804 +#: ui/dialogs/import-dialog.slint:818 msgid "Some mail in {} could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:885 msgid "Importing mail… {}%" msgstr "" -#: ui/dialogs/import-dialog.slint:929 +#: ui/dialogs/import-dialog.slint:943 msgid "Show" msgstr "" -#: ui/dialogs/import-dialog.slint:939 ui/views/files-view.slint:696 +#: ui/dialogs/import-dialog.slint:953 ui/views/files-view.slint:696 msgid "Dismiss" msgstr "" diff --git a/lang/de/LC_MESSAGES/flectar-mail.po b/lang/de/LC_MESSAGES/flectar-mail.po index 269a9f02..dface1d0 100644 --- a/lang/de/LC_MESSAGES/flectar-mail.po +++ b/lang/de/LC_MESSAGES/flectar-mail.po @@ -904,7 +904,7 @@ msgstr "" msgid "Flectar Mail backup" msgstr "" -#: ui/app.slint:358 ui/dialogs/import-dialog.slint:401 +#: ui/app.slint:358 ui/dialogs/import-dialog.slint:407 #: ui/views/onboarding-view.slint:222 msgid "Import accounts and mail" msgstr "" @@ -3380,158 +3380,158 @@ msgstr "" msgid "Create folder" msgstr "" -#: ui/dialogs/import-dialog.slint:125 +#: ui/dialogs/import-dialog.slint:130 msgid "No valid email address was found." msgstr "" -#: ui/dialogs/import-dialog.slint:126 +#: ui/dialogs/import-dialog.slint:131 msgid "No incoming mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:127 +#: ui/dialogs/import-dialog.slint:132 msgid "The incoming server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:128 +#: ui/dialogs/import-dialog.slint:133 msgid "No outgoing mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:129 +#: ui/dialogs/import-dialog.slint:134 msgid "The outgoing server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:130 +#: ui/dialogs/import-dialog.slint:135 msgid "" "The incoming server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:131 +#: ui/dialogs/import-dialog.slint:136 msgid "" "The outgoing server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:132 +#: ui/dialogs/import-dialog.slint:137 msgid "" "{} keeps your password off its unencrypted connection, but Flectar Mail " "would send it in the clear. Turn on SSL/TLS or STARTTLS for this server " "first." msgstr "" -#: ui/dialogs/import-dialog.slint:134 +#: ui/dialogs/import-dialog.slint:139 msgid "" "The incoming server connects without signing in, which Flectar Mail does not " "support." msgstr "" -#: ui/dialogs/import-dialog.slint:135 +#: ui/dialogs/import-dialog.slint:140 msgid "" "The incoming server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:136 +#: ui/dialogs/import-dialog.slint:141 msgid "" "The incoming server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:137 +#: ui/dialogs/import-dialog.slint:142 msgid "" "The outgoing server sends mail without signing in, which Flectar Mail does " "not support." msgstr "" -#: ui/dialogs/import-dialog.slint:138 +#: ui/dialogs/import-dialog.slint:143 msgid "" "The outgoing server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:139 +#: ui/dialogs/import-dialog.slint:144 msgid "" "The outgoing server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:140 +#: ui/dialogs/import-dialog.slint:145 msgid "" "The outgoing server signs in as {}. Flectar Mail uses one sign-in for both " "servers." msgstr "" -#: ui/dialogs/import-dialog.slint:141 +#: ui/dialogs/import-dialog.slint:146 msgid "The incoming server has no user name." msgstr "" -#: ui/dialogs/import-dialog.slint:142 +#: ui/dialogs/import-dialog.slint:147 msgid "The server settings for {} are not valid." msgstr "" -#: ui/dialogs/import-dialog.slint:143 +#: ui/dialogs/import-dialog.slint:148 msgid "This address appears earlier in the file." msgstr "" -#: ui/dialogs/import-dialog.slint:144 +#: ui/dialogs/import-dialog.slint:149 msgid "" "Your password will be sent over the encrypted connection instead of with " "CRAM-MD5." msgstr "" -#: ui/dialogs/import-dialog.slint:145 +#: ui/dialogs/import-dialog.slint:150 msgid "You will sign in with Microsoft instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:146 +#: ui/dialogs/import-dialog.slint:151 msgid "You will sign in with Google instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:147 +#: ui/dialogs/import-dialog.slint:152 msgid "" "The account signs in as {}, which is not an email address. Add it with its " "own address instead." msgstr "" -#: ui/dialogs/import-dialog.slint:148 +#: ui/dialogs/import-dialog.slint:153 msgid "" "Flectar Mail cannot use browser sign-in for {}. Sign in with an app password." msgstr "" -#: ui/dialogs/import-dialog.slint:149 +#: ui/dialogs/import-dialog.slint:154 msgid "The provider's standard outgoing server replaces {}." msgstr "" -#: ui/dialogs/import-dialog.slint:150 +#: ui/dialogs/import-dialog.slint:155 msgid "This account syncs with {} instead of downloading mail with POP3." msgstr "" -#: ui/dialogs/import-dialog.slint:151 ui/dialogs/settings-dialog.slint:1983 +#: ui/dialogs/import-dialog.slint:156 ui/dialogs/settings-dialog.slint:1983 msgid "Mail is removed from the server once it's on this device." msgstr "" -#: ui/dialogs/import-dialog.slint:152 ui/dialogs/settings-dialog.slint:1982 +#: ui/dialogs/import-dialog.slint:157 ui/dialogs/settings-dialog.slint:1982 msgid "Mail you delete here is removed from the server too." msgstr "" -#: ui/dialogs/import-dialog.slint:153 +#: ui/dialogs/import-dialog.slint:158 msgid "" "Mail is removed from the server {} days after it's downloaded, or once " "deleted here." msgstr "" -#: ui/dialogs/import-dialog.slint:154 +#: ui/dialogs/import-dialog.slint:159 msgid "" "No choice here matches how long the account kept mail on the server, so the " "closest one is used." msgstr "" -#: ui/dialogs/import-dialog.slint:155 +#: ui/dialogs/import-dialog.slint:160 msgid "One other address is managed by Gmail and appears after you sign in." msgid_plural "" "{n} other addresses are managed by Gmail and appear after you sign in." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:156 +#: ui/dialogs/import-dialog.slint:161 msgid "" "One sending address was not imported because it is invalid or uses another " "outgoing server." @@ -3541,209 +3541,213 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:157 +#: ui/dialogs/import-dialog.slint:162 msgid "A signature stored in a file outside the profile was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:158 +#: ui/dialogs/import-dialog.slint:163 msgid "A signature larger than 32 KB was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:163 +#: ui/dialogs/import-dialog.slint:168 msgid "The file could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:164 +#: ui/dialogs/import-dialog.slint:169 msgid "The settings file is too large." msgstr "" -#: ui/dialogs/import-dialog.slint:165 +#: ui/dialogs/import-dialog.slint:170 msgid "" "This is not a supported settings export or mail file. Choose a .k9s file, a " "Thunderbird profile export or prefs.js, a Flectar Mail backup, or mail saved " "as .mbox or .eml files." msgstr "" -#: ui/dialogs/import-dialog.slint:166 +#: ui/dialogs/import-dialog.slint:171 msgid "The file is damaged: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:167 +#: ui/dialogs/import-dialog.slint:172 msgid "This settings format (version {}) is not supported." msgstr "" -#: ui/dialogs/import-dialog.slint:168 +#: ui/dialogs/import-dialog.slint:173 msgid "The settings contain no mail accounts." msgstr "" -#: ui/dialogs/import-dialog.slint:169 +#: ui/dialogs/import-dialog.slint:174 msgid "No mail was found in this folder." msgstr "" -#: ui/dialogs/import-dialog.slint:170 +#: ui/dialogs/import-dialog.slint:175 msgid "" "This folder contains several Thunderbird profiles. Choose the profile folder " "inside it that you want to import." msgstr "" -#: ui/dialogs/import-dialog.slint:171 +#: ui/dialogs/import-dialog.slint:176 msgid "" "This folder is not a Thunderbird profile. Choose the folder that contains " "prefs.js." msgstr "" -#: ui/dialogs/import-dialog.slint:172 +#: ui/dialogs/import-dialog.slint:177 msgid "" "This Thunderbird profile is on a network location. Choose the profile folder " "itself to import it." msgstr "" -#: ui/dialogs/import-dialog.slint:173 +#: ui/dialogs/import-dialog.slint:178 msgid "The backup could not be restored: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:174 +#: ui/dialogs/import-dialog.slint:179 msgid "" "The import stopped: {}. The mail imported until then was kept, and importing " "the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:175 +#: ui/dialogs/import-dialog.slint:180 msgid "Import failed: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:180 +#: ui/dialogs/import-dialog.slint:185 msgid "Could not import accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:181 +#: ui/dialogs/import-dialog.slint:186 msgid "Could not import all the mail" msgstr "" -#: ui/dialogs/import-dialog.slint:182 +#: ui/dialogs/import-dialog.slint:187 msgid "No mail found" msgstr "" -#: ui/dialogs/import-dialog.slint:183 +#: ui/dialogs/import-dialog.slint:188 msgid "Could not read your selection" msgstr "" -#: ui/dialogs/import-dialog.slint:189 +#: ui/dialogs/import-dialog.slint:193 +msgid "Uploaded to the account’s server, into the folder “{}”" +msgstr "" + +#: ui/dialogs/import-dialog.slint:195 msgid "In the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:191 +#: ui/dialogs/import-dialog.slint:197 msgid "Kept on this device, in the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:192 +#: ui/dialogs/import-dialog.slint:198 msgid "Kept on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:223 +#: ui/dialogs/import-dialog.slint:229 msgid "" "Local Folders kept outside the profile were not found. Choose their folder " "to import them." msgstr "" -#: ui/dialogs/import-dialog.slint:224 +#: ui/dialogs/import-dialog.slint:230 msgid "Local Folders kept outside the profile were not found." msgstr "" -#: ui/dialogs/import-dialog.slint:230 +#: ui/dialogs/import-dialog.slint:236 msgid "Feeds and newsgroups are not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:254 ui/dialogs/import-dialog.slint:667 +#: ui/dialogs/import-dialog.slint:260 ui/dialogs/import-dialog.slint:673 msgid "Import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:295 +#: ui/dialogs/import-dialog.slint:301 msgid "Where to import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stopping…" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stop" msgstr "" -#: ui/dialogs/import-dialog.slint:322 +#: ui/dialogs/import-dialog.slint:328 msgid "Continue in background" msgstr "" -#: ui/dialogs/import-dialog.slint:327 ui/views/files-view.slint:324 +#: ui/dialogs/import-dialog.slint:333 ui/views/files-view.slint:324 msgid "Back" msgstr "" -#: ui/dialogs/import-dialog.slint:332 +#: ui/dialogs/import-dialog.slint:338 msgid "Choose folder…" msgstr "" -#: ui/dialogs/import-dialog.slint:345 +#: ui/dialogs/import-dialog.slint:351 msgid "Choose file…" msgstr "" -#: ui/dialogs/import-dialog.slint:353 +#: ui/dialogs/import-dialog.slint:359 msgid "Next" msgstr "" -#: ui/dialogs/import-dialog.slint:359 ui/dialogs/import-dialog.slint:368 +#: ui/dialogs/import-dialog.slint:365 ui/dialogs/import-dialog.slint:374 msgid "Import one account" msgid_plural "Import {n} accounts" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:369 ui/dialogs/settings-dialog.slint:2186 +#: ui/dialogs/import-dialog.slint:375 ui/dialogs/settings-dialog.slint:2186 msgid "Import" msgstr "" -#: ui/dialogs/import-dialog.slint:376 +#: ui/dialogs/import-dialog.slint:382 msgid "Open accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:385 +#: ui/dialogs/import-dialog.slint:391 msgid "Show mail" msgstr "" -#: ui/dialogs/import-dialog.slint:468 +#: ui/dialogs/import-dialog.slint:474 msgid "Choose accounts to import" msgstr "" -#: ui/dialogs/import-dialog.slint:469 +#: ui/dialogs/import-dialog.slint:475 msgid "Choose mail to import" msgstr "" -#: ui/dialogs/import-dialog.slint:470 ui/dialogs/import-dialog.slint:873 +#: ui/dialogs/import-dialog.slint:476 ui/dialogs/import-dialog.slint:887 msgid "Import stopped" msgstr "" -#: ui/dialogs/import-dialog.slint:471 ui/dialogs/import-dialog.slint:874 +#: ui/dialogs/import-dialog.slint:477 ui/dialogs/import-dialog.slint:888 msgid "Import complete" msgstr "" -#: ui/dialogs/import-dialog.slint:486 +#: ui/dialogs/import-dialog.slint:492 msgid "" "Bring your accounts from Thunderbird, Thunderbird for Android, K-9 Mail, or " "a Flectar Mail backup, and mail from Thunderbird or saved mail files. " "Passwords are never imported: you sign in to each account afterward." msgstr "" -#: ui/dialogs/import-dialog.slint:492 +#: ui/dialogs/import-dialog.slint:498 msgid "Thunderbird on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:506 +#: ui/dialogs/import-dialog.slint:512 msgid "Import from Thunderbird profile {}" msgstr "" -#: ui/dialogs/import-dialog.slint:534 +#: ui/dialogs/import-dialog.slint:540 msgid "{} (default profile)" msgstr "" -#: ui/dialogs/import-dialog.slint:569 +#: ui/dialogs/import-dialog.slint:575 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip), profile folders and prefs.js, Flectar Mail backups (." @@ -3751,146 +3755,158 @@ msgid "" "archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:570 +#: ui/dialogs/import-dialog.slint:576 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip) and prefs.js, Flectar Mail backups (.json), and mail " "saved as .mbox or .eml files or in ZIP archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:583 +#: ui/dialogs/import-dialog.slint:589 msgid "Looking for accounts and mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:584 ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:590 ui/dialogs/import-dialog.slint:885 msgid "Importing accounts…" msgstr "" -#: ui/dialogs/import-dialog.slint:585 ui/dialogs/import-dialog.slint:604 +#: ui/dialogs/import-dialog.slint:591 ui/dialogs/import-dialog.slint:610 msgid "Importing mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:616 +#: ui/dialogs/import-dialog.slint:622 msgid "One message · {1} of {2}" msgid_plural "{0} messages · {1} of {2}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:643 +#: ui/dialogs/import-dialog.slint:649 msgid "" "From Thunderbird for Android or K-9 Mail. Existing accounts are never " "changed." msgstr "" -#: ui/dialogs/import-dialog.slint:644 +#: ui/dialogs/import-dialog.slint:650 msgid "From Thunderbird. Existing accounts are never changed." msgstr "" -#: ui/dialogs/import-dialog.slint:682 +#: ui/dialogs/import-dialog.slint:688 msgid "Already in Flectar Mail" msgstr "" -#: ui/dialogs/import-dialog.slint:683 +#: ui/dialogs/import-dialog.slint:689 msgid "Cannot be imported" msgstr "" -#: ui/dialogs/import-dialog.slint:684 +#: ui/dialogs/import-dialog.slint:690 msgid "Sign in with Google after import" msgstr "" -#: ui/dialogs/import-dialog.slint:685 +#: ui/dialogs/import-dialog.slint:691 msgid "Sign in with Microsoft after import" msgstr "" -#: ui/dialogs/import-dialog.slint:686 +#: ui/dialogs/import-dialog.slint:692 msgid "{} · enter your password after import" msgstr "" -#: ui/dialogs/import-dialog.slint:692 +#: ui/dialogs/import-dialog.slint:698 msgid "Named “{}” in the other app" msgstr "" -#: ui/dialogs/import-dialog.slint:711 +#: ui/dialogs/import-dialog.slint:718 +msgid "" +"Mail stays on this device unless you choose an account for it. Messages " +"already there are skipped, so an import can be repeated." +msgstr "" + +#: ui/dialogs/import-dialog.slint:719 msgid "" "Imported mail is kept only on this device. Messages already here are " "skipped, so an import can be repeated." msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "No folders chosen" msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "One folder chosen, {}" msgid_plural "{n} folders chosen, {}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:742 +#: ui/dialogs/import-dialog.slint:750 msgid "Imported one account. Sign in to it to start syncing." msgid_plural "Imported {n} accounts. Sign in to each one to start syncing." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:748 +#: ui/dialogs/import-dialog.slint:756 msgid "No accounts were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:754 +#: ui/dialogs/import-dialog.slint:762 msgid "One account was already in Flectar Mail and was left unchanged." msgid_plural "" "{n} accounts were already in Flectar Mail and were left unchanged." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:760 +#: ui/dialogs/import-dialog.slint:768 msgid "" "The theme, language, and other preferences from the backup were applied." msgstr "" -#: ui/dialogs/import-dialog.slint:767 +#: ui/dialogs/import-dialog.slint:775 msgid "Imported one message." msgid_plural "Imported {} messages." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:768 +#: ui/dialogs/import-dialog.slint:776 msgid "No new messages were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:774 +#: ui/dialogs/import-dialog.slint:782 msgid "One message was already here and was skipped." msgid_plural "{} messages were already here and were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:780 +#: ui/dialogs/import-dialog.slint:788 msgid "One message larger than 128 MB was skipped." msgid_plural "{} messages larger than 128 MB were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:786 +#: ui/dialogs/import-dialog.slint:794 +msgid "The server refused one message: {1}" +msgid_plural "The server refused {0} messages: {1}" +msgstr[0] "" +msgstr[1] "" + +#: ui/dialogs/import-dialog.slint:800 msgid "The import was stopped. Importing the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:798 +#: ui/dialogs/import-dialog.slint:812 msgid "{} could not be imported: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:804 +#: ui/dialogs/import-dialog.slint:818 msgid "Some mail in {} could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:885 msgid "Importing mail… {}%" msgstr "" -#: ui/dialogs/import-dialog.slint:929 +#: ui/dialogs/import-dialog.slint:943 msgid "Show" msgstr "" -#: ui/dialogs/import-dialog.slint:939 ui/views/files-view.slint:696 +#: ui/dialogs/import-dialog.slint:953 ui/views/files-view.slint:696 msgid "Dismiss" msgstr "" diff --git a/lang/es/LC_MESSAGES/flectar-mail.po b/lang/es/LC_MESSAGES/flectar-mail.po index 48516fc0..6579ea76 100644 --- a/lang/es/LC_MESSAGES/flectar-mail.po +++ b/lang/es/LC_MESSAGES/flectar-mail.po @@ -926,7 +926,7 @@ msgstr "Exportar copia de seguridad de cuentas de Flectar Mail" msgid "Flectar Mail backup" msgstr "Copia de seguridad de Flectar Mail" -#: ui/app.slint:358 ui/dialogs/import-dialog.slint:401 +#: ui/app.slint:358 ui/dialogs/import-dialog.slint:407 #: ui/views/onboarding-view.slint:222 msgid "Import accounts and mail" msgstr "Importar cuentas y correo" @@ -3491,27 +3491,27 @@ msgstr "Crear etiqueta" msgid "Create folder" msgstr "Crear carpeta" -#: ui/dialogs/import-dialog.slint:125 +#: ui/dialogs/import-dialog.slint:130 msgid "No valid email address was found." msgstr "No se encontró ninguna dirección de correo válida." -#: ui/dialogs/import-dialog.slint:126 +#: ui/dialogs/import-dialog.slint:131 msgid "No incoming mail server is configured." msgstr "No hay ningún servidor de correo entrante configurado." -#: ui/dialogs/import-dialog.slint:127 +#: ui/dialogs/import-dialog.slint:132 msgid "The incoming server {} uses a protocol Flectar Mail does not support." msgstr "El servidor entrante {} usa un protocolo que Flectar Mail no admite." -#: ui/dialogs/import-dialog.slint:128 +#: ui/dialogs/import-dialog.slint:133 msgid "No outgoing mail server is configured." msgstr "No hay ningún servidor de correo saliente configurado." -#: ui/dialogs/import-dialog.slint:129 +#: ui/dialogs/import-dialog.slint:134 msgid "The outgoing server {} uses a protocol Flectar Mail does not support." msgstr "El servidor saliente {} usa un protocolo que Flectar Mail no admite." -#: ui/dialogs/import-dialog.slint:130 +#: ui/dialogs/import-dialog.slint:135 msgid "" "The incoming server {} is not encrypted, so your password and mail cross the " "network unprotected." @@ -3519,7 +3519,7 @@ msgstr "" "El servidor de entrada {} no está cifrado, así que tu contraseña y tu correo " "viajan por la red sin protección." -#: ui/dialogs/import-dialog.slint:131 +#: ui/dialogs/import-dialog.slint:136 msgid "" "The outgoing server {} is not encrypted, so your password and mail cross the " "network unprotected." @@ -3527,7 +3527,7 @@ msgstr "" "El servidor de salida {} no está cifrado, así que tu contraseña y tu correo " "viajan por la red sin protección." -#: ui/dialogs/import-dialog.slint:132 +#: ui/dialogs/import-dialog.slint:137 msgid "" "{} keeps your password off its unencrypted connection, but Flectar Mail " "would send it in the clear. Turn on SSL/TLS or STARTTLS for this server " @@ -3536,7 +3536,7 @@ msgstr "" "{} no envía tu contraseña por su conexión sin cifrar, pero Flectar Mail la " "enviaría en texto claro. Activa primero SSL/TLS o STARTTLS en este servidor." -#: ui/dialogs/import-dialog.slint:134 +#: ui/dialogs/import-dialog.slint:139 msgid "" "The incoming server connects without signing in, which Flectar Mail does not " "support." @@ -3544,7 +3544,7 @@ msgstr "" "El servidor entrante se conecta sin iniciar sesión, algo que Flectar Mail no " "admite." -#: ui/dialogs/import-dialog.slint:135 +#: ui/dialogs/import-dialog.slint:140 msgid "" "The incoming server signs in with a client certificate, which Flectar Mail " "does not support." @@ -3552,12 +3552,12 @@ msgstr "" "El servidor entrante inicia sesión con un certificado de cliente, algo que " "Flectar Mail no admite." -#: ui/dialogs/import-dialog.slint:136 +#: ui/dialogs/import-dialog.slint:141 msgid "" "The incoming server signs in with {}, which Flectar Mail does not support." msgstr "El servidor entrante inicia sesión con {}, que Flectar Mail no admite." -#: ui/dialogs/import-dialog.slint:137 +#: ui/dialogs/import-dialog.slint:142 msgid "" "The outgoing server sends mail without signing in, which Flectar Mail does " "not support." @@ -3565,7 +3565,7 @@ msgstr "" "El servidor saliente envía el correo sin iniciar sesión, algo que Flectar " "Mail no admite." -#: ui/dialogs/import-dialog.slint:138 +#: ui/dialogs/import-dialog.slint:143 msgid "" "The outgoing server signs in with a client certificate, which Flectar Mail " "does not support." @@ -3573,12 +3573,12 @@ msgstr "" "El servidor saliente inicia sesión con un certificado de cliente, algo que " "Flectar Mail no admite." -#: ui/dialogs/import-dialog.slint:139 +#: ui/dialogs/import-dialog.slint:144 msgid "" "The outgoing server signs in with {}, which Flectar Mail does not support." msgstr "El servidor saliente inicia sesión con {}, que Flectar Mail no admite." -#: ui/dialogs/import-dialog.slint:140 +#: ui/dialogs/import-dialog.slint:145 msgid "" "The outgoing server signs in as {}. Flectar Mail uses one sign-in for both " "servers." @@ -3586,34 +3586,34 @@ msgstr "" "El servidor saliente inicia sesión como {}. Flectar Mail usa un mismo inicio " "de sesión para ambos servidores." -#: ui/dialogs/import-dialog.slint:141 +#: ui/dialogs/import-dialog.slint:146 msgid "The incoming server has no user name." msgstr "El servidor entrante no tiene nombre de usuario." -#: ui/dialogs/import-dialog.slint:142 +#: ui/dialogs/import-dialog.slint:147 msgid "The server settings for {} are not valid." msgstr "La configuración del servidor {} no es válida." -#: ui/dialogs/import-dialog.slint:143 +#: ui/dialogs/import-dialog.slint:148 msgid "This address appears earlier in the file." msgstr "Esta dirección ya aparece antes en el archivo." -#: ui/dialogs/import-dialog.slint:144 +#: ui/dialogs/import-dialog.slint:149 msgid "" "Your password will be sent over the encrypted connection instead of with " "CRAM-MD5." msgstr "" "Tu contraseña se enviará por la conexión cifrada en lugar de con CRAM-MD5." -#: ui/dialogs/import-dialog.slint:145 +#: ui/dialogs/import-dialog.slint:150 msgid "You will sign in with Microsoft instead of a password." msgstr "Iniciarás sesión con Microsoft en lugar de con una contraseña." -#: ui/dialogs/import-dialog.slint:146 +#: ui/dialogs/import-dialog.slint:151 msgid "You will sign in with Google instead of a password." msgstr "Iniciarás sesión con Google en lugar de con una contraseña." -#: ui/dialogs/import-dialog.slint:147 +#: ui/dialogs/import-dialog.slint:152 msgid "" "The account signs in as {}, which is not an email address. Add it with its " "own address instead." @@ -3621,31 +3621,31 @@ msgstr "" "La cuenta inicia sesión como {}, que no es una dirección de correo. Añádela " "con su propia dirección." -#: ui/dialogs/import-dialog.slint:148 +#: ui/dialogs/import-dialog.slint:153 msgid "" "Flectar Mail cannot use browser sign-in for {}. Sign in with an app password." msgstr "" "Flectar Mail no puede usar el inicio de sesión en el navegador para {}. " "Inicia sesión con una contraseña de aplicación." -#: ui/dialogs/import-dialog.slint:149 +#: ui/dialogs/import-dialog.slint:154 msgid "The provider's standard outgoing server replaces {}." msgstr "El servidor saliente estándar del proveedor sustituye a {}." -#: ui/dialogs/import-dialog.slint:150 +#: ui/dialogs/import-dialog.slint:155 msgid "This account syncs with {} instead of downloading mail with POP3." msgstr "" "Esta cuenta se sincroniza con {} en lugar de descargar el correo con POP3." -#: ui/dialogs/import-dialog.slint:151 ui/dialogs/settings-dialog.slint:1983 +#: ui/dialogs/import-dialog.slint:156 ui/dialogs/settings-dialog.slint:1983 msgid "Mail is removed from the server once it's on this device." msgstr "El correo se elimina del servidor en cuanto está en este dispositivo." -#: ui/dialogs/import-dialog.slint:152 ui/dialogs/settings-dialog.slint:1982 +#: ui/dialogs/import-dialog.slint:157 ui/dialogs/settings-dialog.slint:1982 msgid "Mail you delete here is removed from the server too." msgstr "El correo que elimines aquí también se elimina del servidor." -#: ui/dialogs/import-dialog.slint:153 +#: ui/dialogs/import-dialog.slint:158 msgid "" "Mail is removed from the server {} days after it's downloaded, or once " "deleted here." @@ -3653,7 +3653,7 @@ msgstr "" "El correo se elimina del servidor {} días después de descargarlo, o al " "eliminarlo aquí." -#: ui/dialogs/import-dialog.slint:154 +#: ui/dialogs/import-dialog.slint:159 msgid "" "No choice here matches how long the account kept mail on the server, so the " "closest one is used." @@ -3661,7 +3661,7 @@ msgstr "" "Ninguna opción coincide con el tiempo que la cuenta conservaba el correo en " "el servidor, así que se usa la más parecida." -#: ui/dialogs/import-dialog.slint:155 +#: ui/dialogs/import-dialog.slint:160 msgid "One other address is managed by Gmail and appears after you sign in." msgid_plural "" "{n} other addresses are managed by Gmail and appear after you sign in." @@ -3669,7 +3669,7 @@ msgstr[0] "Gmail gestiona otra dirección, que aparecerá cuando inicies sesión msgstr[1] "" "Gmail gestiona {n} direcciones más, que aparecerán cuando inicies sesión." -#: ui/dialogs/import-dialog.slint:156 +#: ui/dialogs/import-dialog.slint:161 msgid "" "One sending address was not imported because it is invalid or uses another " "outgoing server." @@ -3683,23 +3683,23 @@ msgstr[1] "" "No se importaron {n} direcciones de envío porque no son válidas o usan otro " "servidor saliente." -#: ui/dialogs/import-dialog.slint:157 +#: ui/dialogs/import-dialog.slint:162 msgid "A signature stored in a file outside the profile was not imported." msgstr "No se importó una firma guardada en un archivo fuera del perfil." -#: ui/dialogs/import-dialog.slint:158 +#: ui/dialogs/import-dialog.slint:163 msgid "A signature larger than 32 KB was not imported." msgstr "No se importó una firma de más de 32 KB." -#: ui/dialogs/import-dialog.slint:163 +#: ui/dialogs/import-dialog.slint:168 msgid "The file could not be read: {}" msgstr "No se pudo leer el archivo: {}" -#: ui/dialogs/import-dialog.slint:164 +#: ui/dialogs/import-dialog.slint:169 msgid "The settings file is too large." msgstr "El archivo de configuración es demasiado grande." -#: ui/dialogs/import-dialog.slint:165 +#: ui/dialogs/import-dialog.slint:170 msgid "" "This is not a supported settings export or mail file. Choose a .k9s file, a " "Thunderbird profile export or prefs.js, a Flectar Mail backup, or mail saved " @@ -3710,23 +3710,23 @@ msgstr "" "una copia de seguridad de Flectar Mail, o correo guardado en archivos .mbox " "o .eml." -#: ui/dialogs/import-dialog.slint:166 +#: ui/dialogs/import-dialog.slint:171 msgid "The file is damaged: {}" msgstr "El archivo está dañado: {}" -#: ui/dialogs/import-dialog.slint:167 +#: ui/dialogs/import-dialog.slint:172 msgid "This settings format (version {}) is not supported." msgstr "Este formato de configuración (versión {}) no es compatible." -#: ui/dialogs/import-dialog.slint:168 +#: ui/dialogs/import-dialog.slint:173 msgid "The settings contain no mail accounts." msgstr "La configuración no contiene cuentas de correo." -#: ui/dialogs/import-dialog.slint:169 +#: ui/dialogs/import-dialog.slint:174 msgid "No mail was found in this folder." msgstr "No se encontró correo en esta carpeta." -#: ui/dialogs/import-dialog.slint:170 +#: ui/dialogs/import-dialog.slint:175 msgid "" "This folder contains several Thunderbird profiles. Choose the profile folder " "inside it that you want to import." @@ -3734,7 +3734,7 @@ msgstr "" "Esta carpeta contiene varios perfiles de Thunderbird. Elige dentro de ella " "la carpeta del perfil que quieres importar." -#: ui/dialogs/import-dialog.slint:171 +#: ui/dialogs/import-dialog.slint:176 msgid "" "This folder is not a Thunderbird profile. Choose the folder that contains " "prefs.js." @@ -3742,7 +3742,7 @@ msgstr "" "Esta carpeta no es un perfil de Thunderbird. Elige la carpeta que contiene " "prefs.js." -#: ui/dialogs/import-dialog.slint:172 +#: ui/dialogs/import-dialog.slint:177 msgid "" "This Thunderbird profile is on a network location. Choose the profile folder " "itself to import it." @@ -3750,11 +3750,11 @@ msgstr "" "Este perfil de Thunderbird está en una ubicación de red. Para importarlo, " "elige directamente la carpeta del perfil." -#: ui/dialogs/import-dialog.slint:173 +#: ui/dialogs/import-dialog.slint:178 msgid "The backup could not be restored: {}" msgstr "No se pudo restaurar la copia de seguridad: {}" -#: ui/dialogs/import-dialog.slint:174 +#: ui/dialogs/import-dialog.slint:179 msgid "" "The import stopped: {}. The mail imported until then was kept, and importing " "the same mail again adds the rest." @@ -3762,39 +3762,43 @@ msgstr "" "La importación se detuvo: {}. Se conservó el correo importado hasta " "entonces, y si vuelves a importar el mismo correo se añadirá el resto." -#: ui/dialogs/import-dialog.slint:175 +#: ui/dialogs/import-dialog.slint:180 msgid "Import failed: {}" msgstr "Error al importar: {}" -#: ui/dialogs/import-dialog.slint:180 +#: ui/dialogs/import-dialog.slint:185 msgid "Could not import accounts" msgstr "No se pudieron importar las cuentas" -#: ui/dialogs/import-dialog.slint:181 +#: ui/dialogs/import-dialog.slint:186 msgid "Could not import all the mail" msgstr "No se pudo importar todo el correo" -#: ui/dialogs/import-dialog.slint:182 +#: ui/dialogs/import-dialog.slint:187 msgid "No mail found" msgstr "No se encontró correo" -#: ui/dialogs/import-dialog.slint:183 +#: ui/dialogs/import-dialog.slint:188 msgid "Could not read your selection" msgstr "No se pudo leer lo que elegiste" -#: ui/dialogs/import-dialog.slint:189 +#: ui/dialogs/import-dialog.slint:193 +msgid "Uploaded to the account’s server, into the folder “{}”" +msgstr "Se sube al servidor de la cuenta, a la carpeta «{}»" + +#: ui/dialogs/import-dialog.slint:195 msgid "In the folder “{}”" msgstr "En la carpeta «{}»" -#: ui/dialogs/import-dialog.slint:191 +#: ui/dialogs/import-dialog.slint:197 msgid "Kept on this device, in the folder “{}”" msgstr "Se guarda en este dispositivo, en la carpeta «{}»" -#: ui/dialogs/import-dialog.slint:192 +#: ui/dialogs/import-dialog.slint:198 msgid "Kept on this device" msgstr "Se guarda en este dispositivo" -#: ui/dialogs/import-dialog.slint:223 +#: ui/dialogs/import-dialog.slint:229 msgid "" "Local Folders kept outside the profile were not found. Choose their folder " "to import them." @@ -3802,85 +3806,85 @@ msgstr "" "No se encontraron las Carpetas locales guardadas fuera del perfil. Elige su " "carpeta para importarlas." -#: ui/dialogs/import-dialog.slint:224 +#: ui/dialogs/import-dialog.slint:230 msgid "Local Folders kept outside the profile were not found." msgstr "No se encontraron las Carpetas locales guardadas fuera del perfil." -#: ui/dialogs/import-dialog.slint:230 +#: ui/dialogs/import-dialog.slint:236 msgid "Feeds and newsgroups are not imported." msgstr "No se importan los canales ni los grupos de noticias." -#: ui/dialogs/import-dialog.slint:254 ui/dialogs/import-dialog.slint:667 +#: ui/dialogs/import-dialog.slint:260 ui/dialogs/import-dialog.slint:673 msgid "Import {}" msgstr "Importar {}" -#: ui/dialogs/import-dialog.slint:295 +#: ui/dialogs/import-dialog.slint:301 msgid "Where to import {}" msgstr "Dónde importar {}" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stopping…" msgstr "Deteniendo…" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stop" msgstr "Detener" -#: ui/dialogs/import-dialog.slint:322 +#: ui/dialogs/import-dialog.slint:328 msgid "Continue in background" msgstr "Continuar en segundo plano" -#: ui/dialogs/import-dialog.slint:327 ui/views/files-view.slint:324 +#: ui/dialogs/import-dialog.slint:333 ui/views/files-view.slint:324 msgid "Back" msgstr "Atrás" -#: ui/dialogs/import-dialog.slint:332 +#: ui/dialogs/import-dialog.slint:338 msgid "Choose folder…" msgstr "Elegir carpeta…" -#: ui/dialogs/import-dialog.slint:345 +#: ui/dialogs/import-dialog.slint:351 msgid "Choose file…" msgstr "Elegir archivo…" -#: ui/dialogs/import-dialog.slint:353 +#: ui/dialogs/import-dialog.slint:359 msgid "Next" msgstr "Siguiente" -#: ui/dialogs/import-dialog.slint:359 ui/dialogs/import-dialog.slint:368 +#: ui/dialogs/import-dialog.slint:365 ui/dialogs/import-dialog.slint:374 msgid "Import one account" msgid_plural "Import {n} accounts" msgstr[0] "Importar una cuenta" msgstr[1] "Importar {n} cuentas" -#: ui/dialogs/import-dialog.slint:369 ui/dialogs/settings-dialog.slint:2186 +#: ui/dialogs/import-dialog.slint:375 ui/dialogs/settings-dialog.slint:2186 msgid "Import" msgstr "Importar" -#: ui/dialogs/import-dialog.slint:376 +#: ui/dialogs/import-dialog.slint:382 msgid "Open accounts" msgstr "Abrir cuentas" -#: ui/dialogs/import-dialog.slint:385 +#: ui/dialogs/import-dialog.slint:391 msgid "Show mail" msgstr "Ver el correo" -#: ui/dialogs/import-dialog.slint:468 +#: ui/dialogs/import-dialog.slint:474 msgid "Choose accounts to import" msgstr "Elige las cuentas que quieres importar" -#: ui/dialogs/import-dialog.slint:469 +#: ui/dialogs/import-dialog.slint:475 msgid "Choose mail to import" msgstr "Elige el correo que quieres importar" -#: ui/dialogs/import-dialog.slint:470 ui/dialogs/import-dialog.slint:873 +#: ui/dialogs/import-dialog.slint:476 ui/dialogs/import-dialog.slint:887 msgid "Import stopped" msgstr "Importación detenida" -#: ui/dialogs/import-dialog.slint:471 ui/dialogs/import-dialog.slint:874 +#: ui/dialogs/import-dialog.slint:477 ui/dialogs/import-dialog.slint:888 msgid "Import complete" msgstr "Importación completada" -#: ui/dialogs/import-dialog.slint:486 +#: ui/dialogs/import-dialog.slint:492 msgid "" "Bring your accounts from Thunderbird, Thunderbird for Android, K-9 Mail, or " "a Flectar Mail backup, and mail from Thunderbird or saved mail files. " @@ -3891,19 +3895,19 @@ msgstr "" "de correo guardados. Las contraseñas nunca se importan: después inicias " "sesión en cada cuenta." -#: ui/dialogs/import-dialog.slint:492 +#: ui/dialogs/import-dialog.slint:498 msgid "Thunderbird on this device" msgstr "Thunderbird en este dispositivo" -#: ui/dialogs/import-dialog.slint:506 +#: ui/dialogs/import-dialog.slint:512 msgid "Import from Thunderbird profile {}" msgstr "Importar desde el perfil de Thunderbird {}" -#: ui/dialogs/import-dialog.slint:534 +#: ui/dialogs/import-dialog.slint:540 msgid "{} (default profile)" msgstr "{} (perfil predeterminado)" -#: ui/dialogs/import-dialog.slint:569 +#: ui/dialogs/import-dialog.slint:575 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip), profile folders and prefs.js, Flectar Mail backups (." @@ -3916,7 +3920,7 @@ msgstr "" "archivos .mbox o .eml, en carpetas maildir o en archivos ZIP que los " "contengan." -#: ui/dialogs/import-dialog.slint:570 +#: ui/dialogs/import-dialog.slint:576 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip) and prefs.js, Flectar Mail backups (.json), and mail " @@ -3927,25 +3931,25 @@ msgstr "" "seguridad de Flectar Mail (.json), y correo guardado en archivos .mbox o ." "eml o en archivos ZIP que los contengan." -#: ui/dialogs/import-dialog.slint:583 +#: ui/dialogs/import-dialog.slint:589 msgid "Looking for accounts and mail…" msgstr "Buscando cuentas y correo…" -#: ui/dialogs/import-dialog.slint:584 ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:590 ui/dialogs/import-dialog.slint:885 msgid "Importing accounts…" msgstr "Importando cuentas…" -#: ui/dialogs/import-dialog.slint:585 ui/dialogs/import-dialog.slint:604 +#: ui/dialogs/import-dialog.slint:591 ui/dialogs/import-dialog.slint:610 msgid "Importing mail…" msgstr "Importando el correo…" -#: ui/dialogs/import-dialog.slint:616 +#: ui/dialogs/import-dialog.slint:622 msgid "One message · {1} of {2}" msgid_plural "{0} messages · {1} of {2}" msgstr[0] "Un mensaje · {1} de {2}" msgstr[1] "{0} mensajes · {1} de {2}" -#: ui/dialogs/import-dialog.slint:643 +#: ui/dialogs/import-dialog.slint:649 msgid "" "From Thunderbird for Android or K-9 Mail. Existing accounts are never " "changed." @@ -3953,35 +3957,44 @@ msgstr "" "Desde Thunderbird para Android o K-9 Mail. Las cuentas existentes nunca se " "modifican." -#: ui/dialogs/import-dialog.slint:644 +#: ui/dialogs/import-dialog.slint:650 msgid "From Thunderbird. Existing accounts are never changed." msgstr "Desde Thunderbird. Las cuentas existentes nunca se modifican." -#: ui/dialogs/import-dialog.slint:682 +#: ui/dialogs/import-dialog.slint:688 msgid "Already in Flectar Mail" msgstr "Ya está en Flectar Mail" -#: ui/dialogs/import-dialog.slint:683 +#: ui/dialogs/import-dialog.slint:689 msgid "Cannot be imported" msgstr "No se puede importar" -#: ui/dialogs/import-dialog.slint:684 +#: ui/dialogs/import-dialog.slint:690 msgid "Sign in with Google after import" msgstr "Inicia sesión con Google después de importar" -#: ui/dialogs/import-dialog.slint:685 +#: ui/dialogs/import-dialog.slint:691 msgid "Sign in with Microsoft after import" msgstr "Inicia sesión con Microsoft después de importar" -#: ui/dialogs/import-dialog.slint:686 +#: ui/dialogs/import-dialog.slint:692 msgid "{} · enter your password after import" msgstr "{} · introduce tu contraseña después de importar" -#: ui/dialogs/import-dialog.slint:692 +#: ui/dialogs/import-dialog.slint:698 msgid "Named “{}” in the other app" msgstr "Llamada «{}» en la otra aplicación" -#: ui/dialogs/import-dialog.slint:711 +#: ui/dialogs/import-dialog.slint:718 +msgid "" +"Mail stays on this device unless you choose an account for it. Messages " +"already there are skipped, so an import can be repeated." +msgstr "" +"El correo se queda en este dispositivo salvo que elijas una cuenta para él. " +"Los mensajes que ya están allí se omiten, así que la importación se puede " +"repetir." + +#: ui/dialogs/import-dialog.slint:719 msgid "" "Imported mail is kept only on this device. Messages already here are " "skipped, so an import can be repeated." @@ -3989,17 +4002,17 @@ msgstr "" "El correo importado solo se guarda en este dispositivo. Los mensajes que ya " "están aquí se omiten, así que puedes repetir una importación." -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "No folders chosen" msgstr "No hay ninguna carpeta elegida" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "One folder chosen, {}" msgid_plural "{n} folders chosen, {}" msgstr[0] "Una carpeta elegida, {}" msgstr[1] "{n} carpetas elegidas, {}" -#: ui/dialogs/import-dialog.slint:742 +#: ui/dialogs/import-dialog.slint:750 msgid "Imported one account. Sign in to it to start syncing." msgid_plural "Imported {n} accounts. Sign in to each one to start syncing." msgstr[0] "" @@ -4008,69 +4021,75 @@ msgstr[1] "" "Se importaron {n} cuentas. Inicia sesión en cada una para empezar a " "sincronizar." -#: ui/dialogs/import-dialog.slint:748 +#: ui/dialogs/import-dialog.slint:756 msgid "No accounts were imported." msgstr "No se importó ninguna cuenta." -#: ui/dialogs/import-dialog.slint:754 +#: ui/dialogs/import-dialog.slint:762 msgid "One account was already in Flectar Mail and was left unchanged." msgid_plural "" "{n} accounts were already in Flectar Mail and were left unchanged." msgstr[0] "Una cuenta ya estaba en Flectar Mail y no se modificó." msgstr[1] "{n} cuentas ya estaban en Flectar Mail y no se modificaron." -#: ui/dialogs/import-dialog.slint:760 +#: ui/dialogs/import-dialog.slint:768 msgid "" "The theme, language, and other preferences from the backup were applied." msgstr "" "Se aplicaron el tema, el idioma y las demás preferencias de la copia de " "seguridad." -#: ui/dialogs/import-dialog.slint:767 +#: ui/dialogs/import-dialog.slint:775 msgid "Imported one message." msgid_plural "Imported {} messages." msgstr[0] "Se importó un mensaje." msgstr[1] "Se importaron {} mensajes." -#: ui/dialogs/import-dialog.slint:768 +#: ui/dialogs/import-dialog.slint:776 msgid "No new messages were imported." msgstr "No se importó ningún mensaje nuevo." -#: ui/dialogs/import-dialog.slint:774 +#: ui/dialogs/import-dialog.slint:782 msgid "One message was already here and was skipped." msgid_plural "{} messages were already here and were skipped." msgstr[0] "Un mensaje ya estaba aquí y se omitió." msgstr[1] "{} mensajes ya estaban aquí y se omitieron." -#: ui/dialogs/import-dialog.slint:780 +#: ui/dialogs/import-dialog.slint:788 msgid "One message larger than 128 MB was skipped." msgid_plural "{} messages larger than 128 MB were skipped." msgstr[0] "Se omitió un mensaje de más de 128 MB." msgstr[1] "Se omitieron {} mensajes de más de 128 MB." -#: ui/dialogs/import-dialog.slint:786 +#: ui/dialogs/import-dialog.slint:794 +msgid "The server refused one message: {1}" +msgid_plural "The server refused {0} messages: {1}" +msgstr[0] "El servidor rechazó un mensaje: {1}" +msgstr[1] "El servidor rechazó {0} mensajes: {1}" + +#: ui/dialogs/import-dialog.slint:800 msgid "The import was stopped. Importing the same mail again adds the rest." msgstr "" "La importación se detuvo. Si vuelves a importar el mismo correo, se añadirá " "el resto." -#: ui/dialogs/import-dialog.slint:798 +#: ui/dialogs/import-dialog.slint:812 msgid "{} could not be imported: {}" msgstr "No se pudo importar {}: {}" -#: ui/dialogs/import-dialog.slint:804 +#: ui/dialogs/import-dialog.slint:818 msgid "Some mail in {} could not be read: {}" msgstr "No se pudo leer parte del correo de {}: {}" -#: ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:885 msgid "Importing mail… {}%" msgstr "Importando el correo… {}%" -#: ui/dialogs/import-dialog.slint:929 +#: ui/dialogs/import-dialog.slint:943 msgid "Show" msgstr "Mostrar" -#: ui/dialogs/import-dialog.slint:939 ui/views/files-view.slint:696 +#: ui/dialogs/import-dialog.slint:953 ui/views/files-view.slint:696 msgid "Dismiss" msgstr "Descartar" diff --git a/lang/flectar-mail.pot b/lang/flectar-mail.pot index 77ee4089..693a2ca6 100644 --- a/lang/flectar-mail.pot +++ b/lang/flectar-mail.pot @@ -902,8 +902,8 @@ msgstr "" msgid "Flectar Mail backup" msgstr "" -#: ui/app.slint:358 ui/dialogs/import-dialog.slint:401 -#: ui/app.slint:358 ui/dialogs/import-dialog.slint:401 ui/views/onboarding-view.slint:222 +#: ui/app.slint:358 ui/dialogs/import-dialog.slint:407 +#: ui/app.slint:358 ui/dialogs/import-dialog.slint:407 ui/views/onboarding-view.slint:222 msgid "Import accounts and mail" msgstr "" @@ -3488,158 +3488,158 @@ msgstr "" msgid "Create folder" msgstr "" -#: ui/dialogs/import-dialog.slint:125 +#: ui/dialogs/import-dialog.slint:130 msgid "No valid email address was found." msgstr "" -#: ui/dialogs/import-dialog.slint:126 +#: ui/dialogs/import-dialog.slint:131 msgid "No incoming mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:127 +#: ui/dialogs/import-dialog.slint:132 msgid "The incoming server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:128 +#: ui/dialogs/import-dialog.slint:133 msgid "No outgoing mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:129 +#: ui/dialogs/import-dialog.slint:134 msgid "The outgoing server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:130 +#: ui/dialogs/import-dialog.slint:135 msgid "" "The incoming server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:131 +#: ui/dialogs/import-dialog.slint:136 msgid "" "The outgoing server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:132 +#: ui/dialogs/import-dialog.slint:137 msgid "" "{} keeps your password off its unencrypted connection, but Flectar Mail " "would send it in the clear. Turn on SSL/TLS or STARTTLS for this server " "first." msgstr "" -#: ui/dialogs/import-dialog.slint:134 +#: ui/dialogs/import-dialog.slint:139 msgid "" "The incoming server connects without signing in, which Flectar Mail does not " "support." msgstr "" -#: ui/dialogs/import-dialog.slint:135 +#: ui/dialogs/import-dialog.slint:140 msgid "" "The incoming server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:136 +#: ui/dialogs/import-dialog.slint:141 msgid "" "The incoming server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:137 +#: ui/dialogs/import-dialog.slint:142 msgid "" "The outgoing server sends mail without signing in, which Flectar Mail does " "not support." msgstr "" -#: ui/dialogs/import-dialog.slint:138 +#: ui/dialogs/import-dialog.slint:143 msgid "" "The outgoing server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:139 +#: ui/dialogs/import-dialog.slint:144 msgid "" "The outgoing server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:140 +#: ui/dialogs/import-dialog.slint:145 msgid "" "The outgoing server signs in as {}. Flectar Mail uses one sign-in for both " "servers." msgstr "" -#: ui/dialogs/import-dialog.slint:141 +#: ui/dialogs/import-dialog.slint:146 msgid "The incoming server has no user name." msgstr "" -#: ui/dialogs/import-dialog.slint:142 +#: ui/dialogs/import-dialog.slint:147 msgid "The server settings for {} are not valid." msgstr "" -#: ui/dialogs/import-dialog.slint:143 +#: ui/dialogs/import-dialog.slint:148 msgid "This address appears earlier in the file." msgstr "" -#: ui/dialogs/import-dialog.slint:144 +#: ui/dialogs/import-dialog.slint:149 msgid "" "Your password will be sent over the encrypted connection instead of with " "CRAM-MD5." msgstr "" -#: ui/dialogs/import-dialog.slint:145 +#: ui/dialogs/import-dialog.slint:150 msgid "You will sign in with Microsoft instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:146 +#: ui/dialogs/import-dialog.slint:151 msgid "You will sign in with Google instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:147 +#: ui/dialogs/import-dialog.slint:152 msgid "" "The account signs in as {}, which is not an email address. Add it with its " "own address instead." msgstr "" -#: ui/dialogs/import-dialog.slint:148 +#: ui/dialogs/import-dialog.slint:153 msgid "" "Flectar Mail cannot use browser sign-in for {}. Sign in with an app password." msgstr "" -#: ui/dialogs/import-dialog.slint:149 +#: ui/dialogs/import-dialog.slint:154 msgid "The provider's standard outgoing server replaces {}." msgstr "" -#: ui/dialogs/import-dialog.slint:150 +#: ui/dialogs/import-dialog.slint:155 msgid "This account syncs with {} instead of downloading mail with POP3." msgstr "" -#: ui/dialogs/import-dialog.slint:151 ui/dialogs/settings-dialog.slint:1983 +#: ui/dialogs/import-dialog.slint:156 ui/dialogs/settings-dialog.slint:1983 msgid "Mail is removed from the server once it's on this device." msgstr "" -#: ui/dialogs/import-dialog.slint:152 ui/dialogs/settings-dialog.slint:1982 +#: ui/dialogs/import-dialog.slint:157 ui/dialogs/settings-dialog.slint:1982 msgid "Mail you delete here is removed from the server too." msgstr "" -#: ui/dialogs/import-dialog.slint:153 +#: ui/dialogs/import-dialog.slint:158 msgid "" "Mail is removed from the server {} days after it's downloaded, or once " "deleted here." msgstr "" -#: ui/dialogs/import-dialog.slint:154 +#: ui/dialogs/import-dialog.slint:159 msgid "" "No choice here matches how long the account kept mail on the server, so the " "closest one is used." msgstr "" -#: ui/dialogs/import-dialog.slint:155 +#: ui/dialogs/import-dialog.slint:160 msgid "One other address is managed by Gmail and appears after you sign in." msgid_plural "" "{n} other addresses are managed by Gmail and appear after you sign in." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:156 +#: ui/dialogs/import-dialog.slint:161 msgid "" "One sending address was not imported because it is invalid or uses another " "outgoing server." @@ -3649,210 +3649,214 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:157 +#: ui/dialogs/import-dialog.slint:162 msgid "A signature stored in a file outside the profile was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:158 +#: ui/dialogs/import-dialog.slint:163 msgid "A signature larger than 32 KB was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:163 +#: ui/dialogs/import-dialog.slint:168 msgid "The file could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:164 +#: ui/dialogs/import-dialog.slint:169 msgid "The settings file is too large." msgstr "" -#: ui/dialogs/import-dialog.slint:165 +#: ui/dialogs/import-dialog.slint:170 msgid "" "This is not a supported settings export or mail file. Choose a .k9s file, a " "Thunderbird profile export or prefs.js, a Flectar Mail backup, or mail saved " "as .mbox or .eml files." msgstr "" -#: ui/dialogs/import-dialog.slint:166 +#: ui/dialogs/import-dialog.slint:171 msgid "The file is damaged: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:167 +#: ui/dialogs/import-dialog.slint:172 msgid "This settings format (version {}) is not supported." msgstr "" -#: ui/dialogs/import-dialog.slint:168 +#: ui/dialogs/import-dialog.slint:173 msgid "The settings contain no mail accounts." msgstr "" -#: ui/dialogs/import-dialog.slint:169 +#: ui/dialogs/import-dialog.slint:174 msgid "No mail was found in this folder." msgstr "" -#: ui/dialogs/import-dialog.slint:170 +#: ui/dialogs/import-dialog.slint:175 msgid "" "This folder contains several Thunderbird profiles. Choose the profile folder " "inside it that you want to import." msgstr "" -#: ui/dialogs/import-dialog.slint:171 +#: ui/dialogs/import-dialog.slint:176 msgid "" "This folder is not a Thunderbird profile. Choose the folder that contains " "prefs.js." msgstr "" -#: ui/dialogs/import-dialog.slint:172 +#: ui/dialogs/import-dialog.slint:177 msgid "" "This Thunderbird profile is on a network location. Choose the profile folder " "itself to import it." msgstr "" -#: ui/dialogs/import-dialog.slint:173 +#: ui/dialogs/import-dialog.slint:178 msgid "The backup could not be restored: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:174 +#: ui/dialogs/import-dialog.slint:179 msgid "" "The import stopped: {}. The mail imported until then was kept, and importing " "the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:175 +#: ui/dialogs/import-dialog.slint:180 msgid "Import failed: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:180 +#: ui/dialogs/import-dialog.slint:185 msgid "Could not import accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:181 +#: ui/dialogs/import-dialog.slint:186 msgid "Could not import all the mail" msgstr "" -#: ui/dialogs/import-dialog.slint:182 +#: ui/dialogs/import-dialog.slint:187 msgid "No mail found" msgstr "" -#: ui/dialogs/import-dialog.slint:183 +#: ui/dialogs/import-dialog.slint:188 msgid "Could not read your selection" msgstr "" -#: ui/dialogs/import-dialog.slint:189 +#: ui/dialogs/import-dialog.slint:193 +msgid "Uploaded to the account’s server, into the folder “{}”" +msgstr "" + +#: ui/dialogs/import-dialog.slint:195 msgid "In the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:191 +#: ui/dialogs/import-dialog.slint:197 msgid "Kept on this device, in the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:192 +#: ui/dialogs/import-dialog.slint:198 msgid "Kept on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:223 +#: ui/dialogs/import-dialog.slint:229 msgid "" "Local Folders kept outside the profile were not found. Choose their folder " "to import them." msgstr "" -#: ui/dialogs/import-dialog.slint:224 +#: ui/dialogs/import-dialog.slint:230 msgid "Local Folders kept outside the profile were not found." msgstr "" -#: ui/dialogs/import-dialog.slint:230 +#: ui/dialogs/import-dialog.slint:236 msgid "Feeds and newsgroups are not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:254 ui/dialogs/import-dialog.slint:667 +#: ui/dialogs/import-dialog.slint:260 ui/dialogs/import-dialog.slint:673 msgid "Import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:295 +#: ui/dialogs/import-dialog.slint:301 msgid "Where to import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stopping…" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stop" msgstr "" -#: ui/dialogs/import-dialog.slint:322 +#: ui/dialogs/import-dialog.slint:328 msgid "Continue in background" msgstr "" -#: ui/dialogs/import-dialog.slint:327 ui/views/files-view.slint:324 -#: ui/dialogs/import-dialog.slint:327 ui/views/files-view.slint:324 +#: ui/dialogs/import-dialog.slint:333 ui/views/files-view.slint:324 +#: ui/dialogs/import-dialog.slint:333 ui/views/files-view.slint:324 msgid "Back" msgstr "" -#: ui/dialogs/import-dialog.slint:332 +#: ui/dialogs/import-dialog.slint:338 msgid "Choose folder…" msgstr "" -#: ui/dialogs/import-dialog.slint:345 +#: ui/dialogs/import-dialog.slint:351 msgid "Choose file…" msgstr "" -#: ui/dialogs/import-dialog.slint:353 +#: ui/dialogs/import-dialog.slint:359 msgid "Next" msgstr "" -#: ui/dialogs/import-dialog.slint:359 ui/dialogs/import-dialog.slint:368 +#: ui/dialogs/import-dialog.slint:365 ui/dialogs/import-dialog.slint:374 msgid "Import one account" msgid_plural "Import {n} accounts" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:369 ui/dialogs/settings-dialog.slint:2186 +#: ui/dialogs/import-dialog.slint:375 ui/dialogs/settings-dialog.slint:2186 msgid "Import" msgstr "" -#: ui/dialogs/import-dialog.slint:376 +#: ui/dialogs/import-dialog.slint:382 msgid "Open accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:385 +#: ui/dialogs/import-dialog.slint:391 msgid "Show mail" msgstr "" -#: ui/dialogs/import-dialog.slint:468 +#: ui/dialogs/import-dialog.slint:474 msgid "Choose accounts to import" msgstr "" -#: ui/dialogs/import-dialog.slint:469 +#: ui/dialogs/import-dialog.slint:475 msgid "Choose mail to import" msgstr "" -#: ui/dialogs/import-dialog.slint:470 ui/dialogs/import-dialog.slint:873 +#: ui/dialogs/import-dialog.slint:476 ui/dialogs/import-dialog.slint:887 msgid "Import stopped" msgstr "" -#: ui/dialogs/import-dialog.slint:471 ui/dialogs/import-dialog.slint:874 +#: ui/dialogs/import-dialog.slint:477 ui/dialogs/import-dialog.slint:888 msgid "Import complete" msgstr "" -#: ui/dialogs/import-dialog.slint:486 +#: ui/dialogs/import-dialog.slint:492 msgid "" "Bring your accounts from Thunderbird, Thunderbird for Android, K-9 Mail, or " "a Flectar Mail backup, and mail from Thunderbird or saved mail files. " "Passwords are never imported: you sign in to each account afterward." msgstr "" -#: ui/dialogs/import-dialog.slint:492 +#: ui/dialogs/import-dialog.slint:498 msgid "Thunderbird on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:506 +#: ui/dialogs/import-dialog.slint:512 msgid "Import from Thunderbird profile {}" msgstr "" -#: ui/dialogs/import-dialog.slint:534 +#: ui/dialogs/import-dialog.slint:540 msgid "{} (default profile)" msgstr "" -#: ui/dialogs/import-dialog.slint:569 +#: ui/dialogs/import-dialog.slint:575 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip), profile folders and prefs.js, Flectar Mail backups " @@ -3860,145 +3864,157 @@ msgid "" "ZIP archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:570 +#: ui/dialogs/import-dialog.slint:576 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip) and prefs.js, Flectar Mail backups (.json), and mail " "saved as .mbox or .eml files or in ZIP archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:583 +#: ui/dialogs/import-dialog.slint:589 msgid "Looking for accounts and mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:584 ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:590 ui/dialogs/import-dialog.slint:885 msgid "Importing accounts…" msgstr "" -#: ui/dialogs/import-dialog.slint:585 ui/dialogs/import-dialog.slint:604 +#: ui/dialogs/import-dialog.slint:591 ui/dialogs/import-dialog.slint:610 msgid "Importing mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:616 +#: ui/dialogs/import-dialog.slint:622 msgid "One message · {1} of {2}" msgid_plural "{0} messages · {1} of {2}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:643 +#: ui/dialogs/import-dialog.slint:649 msgid "" "From Thunderbird for Android or K-9 Mail. Existing accounts are never " "changed." msgstr "" -#: ui/dialogs/import-dialog.slint:644 +#: ui/dialogs/import-dialog.slint:650 msgid "From Thunderbird. Existing accounts are never changed." msgstr "" -#: ui/dialogs/import-dialog.slint:682 +#: ui/dialogs/import-dialog.slint:688 msgid "Already in Flectar Mail" msgstr "" -#: ui/dialogs/import-dialog.slint:683 +#: ui/dialogs/import-dialog.slint:689 msgid "Cannot be imported" msgstr "" -#: ui/dialogs/import-dialog.slint:684 +#: ui/dialogs/import-dialog.slint:690 msgid "Sign in with Google after import" msgstr "" -#: ui/dialogs/import-dialog.slint:685 +#: ui/dialogs/import-dialog.slint:691 msgid "Sign in with Microsoft after import" msgstr "" -#: ui/dialogs/import-dialog.slint:686 +#: ui/dialogs/import-dialog.slint:692 msgid "{} · enter your password after import" msgstr "" -#: ui/dialogs/import-dialog.slint:692 +#: ui/dialogs/import-dialog.slint:698 msgid "Named “{}” in the other app" msgstr "" -#: ui/dialogs/import-dialog.slint:711 +#: ui/dialogs/import-dialog.slint:718 +msgid "" +"Mail stays on this device unless you choose an account for it. Messages " +"already there are skipped, so an import can be repeated." +msgstr "" + +#: ui/dialogs/import-dialog.slint:719 msgid "" "Imported mail is kept only on this device. Messages already here are " "skipped, so an import can be repeated." msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "No folders chosen" msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "One folder chosen, {}" msgid_plural "{n} folders chosen, {}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:742 +#: ui/dialogs/import-dialog.slint:750 msgid "Imported one account. Sign in to it to start syncing." msgid_plural "Imported {n} accounts. Sign in to each one to start syncing." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:748 +#: ui/dialogs/import-dialog.slint:756 msgid "No accounts were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:754 +#: ui/dialogs/import-dialog.slint:762 msgid "One account was already in Flectar Mail and was left unchanged." msgid_plural "" "{n} accounts were already in Flectar Mail and were left unchanged." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:760 +#: ui/dialogs/import-dialog.slint:768 msgid "The theme, language, and other preferences from the backup were applied." msgstr "" -#: ui/dialogs/import-dialog.slint:767 +#: ui/dialogs/import-dialog.slint:775 msgid "Imported one message." msgid_plural "Imported {} messages." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:768 +#: ui/dialogs/import-dialog.slint:776 msgid "No new messages were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:774 +#: ui/dialogs/import-dialog.slint:782 msgid "One message was already here and was skipped." msgid_plural "{} messages were already here and were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:780 +#: ui/dialogs/import-dialog.slint:788 msgid "One message larger than 128 MB was skipped." msgid_plural "{} messages larger than 128 MB were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:786 +#: ui/dialogs/import-dialog.slint:794 +msgid "The server refused one message: {1}" +msgid_plural "The server refused {0} messages: {1}" +msgstr[0] "" +msgstr[1] "" + +#: ui/dialogs/import-dialog.slint:800 msgid "The import was stopped. Importing the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:798 +#: ui/dialogs/import-dialog.slint:812 msgid "{} could not be imported: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:804 +#: ui/dialogs/import-dialog.slint:818 msgid "Some mail in {} could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:885 msgid "Importing mail… {}%" msgstr "" -#: ui/dialogs/import-dialog.slint:929 +#: ui/dialogs/import-dialog.slint:943 msgid "Show" msgstr "" -#: ui/dialogs/import-dialog.slint:939 ui/views/files-view.slint:696 +#: ui/dialogs/import-dialog.slint:953 ui/views/files-view.slint:696 msgid "Dismiss" msgstr "" diff --git a/lang/fr/LC_MESSAGES/flectar-mail.po b/lang/fr/LC_MESSAGES/flectar-mail.po index cd3eb1d4..6ef3f455 100644 --- a/lang/fr/LC_MESSAGES/flectar-mail.po +++ b/lang/fr/LC_MESSAGES/flectar-mail.po @@ -1008,7 +1008,7 @@ msgstr "Exporter une sauvegarde des comptes Flectar Mail" msgid "Flectar Mail backup" msgstr "Sauvegarde Flectar Mail" -#: ui/app.slint:358 ui/dialogs/import-dialog.slint:401 +#: ui/app.slint:358 ui/dialogs/import-dialog.slint:407 #: ui/views/onboarding-view.slint:222 msgid "Import accounts and mail" msgstr "" @@ -4099,158 +4099,158 @@ msgstr "Créer une étiquette" msgid "Create folder" msgstr "Créer un dossier" -#: ui/dialogs/import-dialog.slint:125 +#: ui/dialogs/import-dialog.slint:130 msgid "No valid email address was found." msgstr "" -#: ui/dialogs/import-dialog.slint:126 +#: ui/dialogs/import-dialog.slint:131 msgid "No incoming mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:127 +#: ui/dialogs/import-dialog.slint:132 msgid "The incoming server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:128 +#: ui/dialogs/import-dialog.slint:133 msgid "No outgoing mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:129 +#: ui/dialogs/import-dialog.slint:134 msgid "The outgoing server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:130 +#: ui/dialogs/import-dialog.slint:135 msgid "" "The incoming server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:131 +#: ui/dialogs/import-dialog.slint:136 msgid "" "The outgoing server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:132 +#: ui/dialogs/import-dialog.slint:137 msgid "" "{} keeps your password off its unencrypted connection, but Flectar Mail " "would send it in the clear. Turn on SSL/TLS or STARTTLS for this server " "first." msgstr "" -#: ui/dialogs/import-dialog.slint:134 +#: ui/dialogs/import-dialog.slint:139 msgid "" "The incoming server connects without signing in, which Flectar Mail does not " "support." msgstr "" -#: ui/dialogs/import-dialog.slint:135 +#: ui/dialogs/import-dialog.slint:140 msgid "" "The incoming server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:136 +#: ui/dialogs/import-dialog.slint:141 msgid "" "The incoming server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:137 +#: ui/dialogs/import-dialog.slint:142 msgid "" "The outgoing server sends mail without signing in, which Flectar Mail does " "not support." msgstr "" -#: ui/dialogs/import-dialog.slint:138 +#: ui/dialogs/import-dialog.slint:143 msgid "" "The outgoing server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:139 +#: ui/dialogs/import-dialog.slint:144 msgid "" "The outgoing server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:140 +#: ui/dialogs/import-dialog.slint:145 msgid "" "The outgoing server signs in as {}. Flectar Mail uses one sign-in for both " "servers." msgstr "" -#: ui/dialogs/import-dialog.slint:141 +#: ui/dialogs/import-dialog.slint:146 msgid "The incoming server has no user name." msgstr "" -#: ui/dialogs/import-dialog.slint:142 +#: ui/dialogs/import-dialog.slint:147 msgid "The server settings for {} are not valid." msgstr "" -#: ui/dialogs/import-dialog.slint:143 +#: ui/dialogs/import-dialog.slint:148 msgid "This address appears earlier in the file." msgstr "" -#: ui/dialogs/import-dialog.slint:144 +#: ui/dialogs/import-dialog.slint:149 msgid "" "Your password will be sent over the encrypted connection instead of with " "CRAM-MD5." msgstr "" -#: ui/dialogs/import-dialog.slint:145 +#: ui/dialogs/import-dialog.slint:150 msgid "You will sign in with Microsoft instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:146 +#: ui/dialogs/import-dialog.slint:151 msgid "You will sign in with Google instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:147 +#: ui/dialogs/import-dialog.slint:152 msgid "" "The account signs in as {}, which is not an email address. Add it with its " "own address instead." msgstr "" -#: ui/dialogs/import-dialog.slint:148 +#: ui/dialogs/import-dialog.slint:153 msgid "" "Flectar Mail cannot use browser sign-in for {}. Sign in with an app password." msgstr "" -#: ui/dialogs/import-dialog.slint:149 +#: ui/dialogs/import-dialog.slint:154 msgid "The provider's standard outgoing server replaces {}." msgstr "" -#: ui/dialogs/import-dialog.slint:150 +#: ui/dialogs/import-dialog.slint:155 msgid "This account syncs with {} instead of downloading mail with POP3." msgstr "" -#: ui/dialogs/import-dialog.slint:151 ui/dialogs/settings-dialog.slint:1983 +#: ui/dialogs/import-dialog.slint:156 ui/dialogs/settings-dialog.slint:1983 msgid "Mail is removed from the server once it's on this device." msgstr "" -#: ui/dialogs/import-dialog.slint:152 ui/dialogs/settings-dialog.slint:1982 +#: ui/dialogs/import-dialog.slint:157 ui/dialogs/settings-dialog.slint:1982 msgid "Mail you delete here is removed from the server too." msgstr "" -#: ui/dialogs/import-dialog.slint:153 +#: ui/dialogs/import-dialog.slint:158 msgid "" "Mail is removed from the server {} days after it's downloaded, or once " "deleted here." msgstr "" -#: ui/dialogs/import-dialog.slint:154 +#: ui/dialogs/import-dialog.slint:159 msgid "" "No choice here matches how long the account kept mail on the server, so the " "closest one is used." msgstr "" -#: ui/dialogs/import-dialog.slint:155 +#: ui/dialogs/import-dialog.slint:160 msgid "One other address is managed by Gmail and appears after you sign in." msgid_plural "" "{n} other addresses are managed by Gmail and appear after you sign in." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:156 +#: ui/dialogs/import-dialog.slint:161 msgid "" "One sending address was not imported because it is invalid or uses another " "outgoing server." @@ -4260,211 +4260,215 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:157 +#: ui/dialogs/import-dialog.slint:162 msgid "A signature stored in a file outside the profile was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:158 +#: ui/dialogs/import-dialog.slint:163 msgid "A signature larger than 32 KB was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:163 +#: ui/dialogs/import-dialog.slint:168 msgid "The file could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:164 +#: ui/dialogs/import-dialog.slint:169 msgid "The settings file is too large." msgstr "" -#: ui/dialogs/import-dialog.slint:165 +#: ui/dialogs/import-dialog.slint:170 msgid "" "This is not a supported settings export or mail file. Choose a .k9s file, a " "Thunderbird profile export or prefs.js, a Flectar Mail backup, or mail saved " "as .mbox or .eml files." msgstr "" -#: ui/dialogs/import-dialog.slint:166 +#: ui/dialogs/import-dialog.slint:171 msgid "The file is damaged: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:167 +#: ui/dialogs/import-dialog.slint:172 msgid "This settings format (version {}) is not supported." msgstr "" -#: ui/dialogs/import-dialog.slint:168 +#: ui/dialogs/import-dialog.slint:173 msgid "The settings contain no mail accounts." msgstr "" -#: ui/dialogs/import-dialog.slint:169 +#: ui/dialogs/import-dialog.slint:174 msgid "No mail was found in this folder." msgstr "" -#: ui/dialogs/import-dialog.slint:170 +#: ui/dialogs/import-dialog.slint:175 msgid "" "This folder contains several Thunderbird profiles. Choose the profile folder " "inside it that you want to import." msgstr "" -#: ui/dialogs/import-dialog.slint:171 +#: ui/dialogs/import-dialog.slint:176 msgid "" "This folder is not a Thunderbird profile. Choose the folder that contains " "prefs.js." msgstr "" -#: ui/dialogs/import-dialog.slint:172 +#: ui/dialogs/import-dialog.slint:177 msgid "" "This Thunderbird profile is on a network location. Choose the profile folder " "itself to import it." msgstr "" -#: ui/dialogs/import-dialog.slint:173 +#: ui/dialogs/import-dialog.slint:178 msgid "The backup could not be restored: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:174 +#: ui/dialogs/import-dialog.slint:179 msgid "" "The import stopped: {}. The mail imported until then was kept, and importing " "the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:175 +#: ui/dialogs/import-dialog.slint:180 msgid "Import failed: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:180 +#: ui/dialogs/import-dialog.slint:185 msgid "Could not import accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:181 +#: ui/dialogs/import-dialog.slint:186 msgid "Could not import all the mail" msgstr "" -#: ui/dialogs/import-dialog.slint:182 +#: ui/dialogs/import-dialog.slint:187 msgid "No mail found" msgstr "" -#: ui/dialogs/import-dialog.slint:183 +#: ui/dialogs/import-dialog.slint:188 msgid "Could not read your selection" msgstr "" -#: ui/dialogs/import-dialog.slint:189 +#: ui/dialogs/import-dialog.slint:193 +msgid "Uploaded to the account’s server, into the folder “{}”" +msgstr "" + +#: ui/dialogs/import-dialog.slint:195 msgid "In the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:191 +#: ui/dialogs/import-dialog.slint:197 msgid "Kept on this device, in the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:192 +#: ui/dialogs/import-dialog.slint:198 msgid "Kept on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:223 +#: ui/dialogs/import-dialog.slint:229 msgid "" "Local Folders kept outside the profile were not found. Choose their folder " "to import them." msgstr "" -#: ui/dialogs/import-dialog.slint:224 +#: ui/dialogs/import-dialog.slint:230 msgid "Local Folders kept outside the profile were not found." msgstr "" -#: ui/dialogs/import-dialog.slint:230 +#: ui/dialogs/import-dialog.slint:236 msgid "Feeds and newsgroups are not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:254 ui/dialogs/import-dialog.slint:667 +#: ui/dialogs/import-dialog.slint:260 ui/dialogs/import-dialog.slint:673 msgid "Import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:295 +#: ui/dialogs/import-dialog.slint:301 msgid "Where to import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stopping…" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stop" msgstr "" -#: ui/dialogs/import-dialog.slint:322 +#: ui/dialogs/import-dialog.slint:328 msgid "Continue in background" msgstr "" -#: ui/dialogs/import-dialog.slint:327 ui/views/files-view.slint:324 +#: ui/dialogs/import-dialog.slint:333 ui/views/files-view.slint:324 #, fuzzy msgid "Back" msgstr "Retour" -#: ui/dialogs/import-dialog.slint:332 +#: ui/dialogs/import-dialog.slint:338 msgid "Choose folder…" msgstr "" -#: ui/dialogs/import-dialog.slint:345 +#: ui/dialogs/import-dialog.slint:351 msgid "Choose file…" msgstr "" -#: ui/dialogs/import-dialog.slint:353 +#: ui/dialogs/import-dialog.slint:359 msgid "Next" msgstr "" -#: ui/dialogs/import-dialog.slint:359 ui/dialogs/import-dialog.slint:368 +#: ui/dialogs/import-dialog.slint:365 ui/dialogs/import-dialog.slint:374 msgid "Import one account" msgid_plural "Import {n} accounts" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:369 ui/dialogs/settings-dialog.slint:2186 +#: ui/dialogs/import-dialog.slint:375 ui/dialogs/settings-dialog.slint:2186 #, fuzzy msgid "Import" msgstr "Importer" -#: ui/dialogs/import-dialog.slint:376 +#: ui/dialogs/import-dialog.slint:382 msgid "Open accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:385 +#: ui/dialogs/import-dialog.slint:391 msgid "Show mail" msgstr "" -#: ui/dialogs/import-dialog.slint:468 +#: ui/dialogs/import-dialog.slint:474 msgid "Choose accounts to import" msgstr "" -#: ui/dialogs/import-dialog.slint:469 +#: ui/dialogs/import-dialog.slint:475 msgid "Choose mail to import" msgstr "" -#: ui/dialogs/import-dialog.slint:470 ui/dialogs/import-dialog.slint:873 +#: ui/dialogs/import-dialog.slint:476 ui/dialogs/import-dialog.slint:887 msgid "Import stopped" msgstr "" -#: ui/dialogs/import-dialog.slint:471 ui/dialogs/import-dialog.slint:874 +#: ui/dialogs/import-dialog.slint:477 ui/dialogs/import-dialog.slint:888 msgid "Import complete" msgstr "" -#: ui/dialogs/import-dialog.slint:486 +#: ui/dialogs/import-dialog.slint:492 msgid "" "Bring your accounts from Thunderbird, Thunderbird for Android, K-9 Mail, or " "a Flectar Mail backup, and mail from Thunderbird or saved mail files. " "Passwords are never imported: you sign in to each account afterward." msgstr "" -#: ui/dialogs/import-dialog.slint:492 +#: ui/dialogs/import-dialog.slint:498 msgid "Thunderbird on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:506 +#: ui/dialogs/import-dialog.slint:512 msgid "Import from Thunderbird profile {}" msgstr "" -#: ui/dialogs/import-dialog.slint:534 +#: ui/dialogs/import-dialog.slint:540 msgid "{} (default profile)" msgstr "" -#: ui/dialogs/import-dialog.slint:569 +#: ui/dialogs/import-dialog.slint:575 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip), profile folders and prefs.js, Flectar Mail backups (." @@ -4472,146 +4476,158 @@ msgid "" "archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:570 +#: ui/dialogs/import-dialog.slint:576 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip) and prefs.js, Flectar Mail backups (.json), and mail " "saved as .mbox or .eml files or in ZIP archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:583 +#: ui/dialogs/import-dialog.slint:589 msgid "Looking for accounts and mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:584 ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:590 ui/dialogs/import-dialog.slint:885 msgid "Importing accounts…" msgstr "" -#: ui/dialogs/import-dialog.slint:585 ui/dialogs/import-dialog.slint:604 +#: ui/dialogs/import-dialog.slint:591 ui/dialogs/import-dialog.slint:610 msgid "Importing mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:616 +#: ui/dialogs/import-dialog.slint:622 msgid "One message · {1} of {2}" msgid_plural "{0} messages · {1} of {2}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:643 +#: ui/dialogs/import-dialog.slint:649 msgid "" "From Thunderbird for Android or K-9 Mail. Existing accounts are never " "changed." msgstr "" -#: ui/dialogs/import-dialog.slint:644 +#: ui/dialogs/import-dialog.slint:650 msgid "From Thunderbird. Existing accounts are never changed." msgstr "" -#: ui/dialogs/import-dialog.slint:682 +#: ui/dialogs/import-dialog.slint:688 msgid "Already in Flectar Mail" msgstr "" -#: ui/dialogs/import-dialog.slint:683 +#: ui/dialogs/import-dialog.slint:689 msgid "Cannot be imported" msgstr "" -#: ui/dialogs/import-dialog.slint:684 +#: ui/dialogs/import-dialog.slint:690 msgid "Sign in with Google after import" msgstr "" -#: ui/dialogs/import-dialog.slint:685 +#: ui/dialogs/import-dialog.slint:691 msgid "Sign in with Microsoft after import" msgstr "" -#: ui/dialogs/import-dialog.slint:686 +#: ui/dialogs/import-dialog.slint:692 msgid "{} · enter your password after import" msgstr "" -#: ui/dialogs/import-dialog.slint:692 +#: ui/dialogs/import-dialog.slint:698 msgid "Named “{}” in the other app" msgstr "" -#: ui/dialogs/import-dialog.slint:711 +#: ui/dialogs/import-dialog.slint:718 +msgid "" +"Mail stays on this device unless you choose an account for it. Messages " +"already there are skipped, so an import can be repeated." +msgstr "" + +#: ui/dialogs/import-dialog.slint:719 msgid "" "Imported mail is kept only on this device. Messages already here are " "skipped, so an import can be repeated." msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "No folders chosen" msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "One folder chosen, {}" msgid_plural "{n} folders chosen, {}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:742 +#: ui/dialogs/import-dialog.slint:750 msgid "Imported one account. Sign in to it to start syncing." msgid_plural "Imported {n} accounts. Sign in to each one to start syncing." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:748 +#: ui/dialogs/import-dialog.slint:756 msgid "No accounts were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:754 +#: ui/dialogs/import-dialog.slint:762 msgid "One account was already in Flectar Mail and was left unchanged." msgid_plural "" "{n} accounts were already in Flectar Mail and were left unchanged." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:760 +#: ui/dialogs/import-dialog.slint:768 msgid "" "The theme, language, and other preferences from the backup were applied." msgstr "" -#: ui/dialogs/import-dialog.slint:767 +#: ui/dialogs/import-dialog.slint:775 msgid "Imported one message." msgid_plural "Imported {} messages." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:768 +#: ui/dialogs/import-dialog.slint:776 msgid "No new messages were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:774 +#: ui/dialogs/import-dialog.slint:782 msgid "One message was already here and was skipped." msgid_plural "{} messages were already here and were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:780 +#: ui/dialogs/import-dialog.slint:788 msgid "One message larger than 128 MB was skipped." msgid_plural "{} messages larger than 128 MB were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:786 +#: ui/dialogs/import-dialog.slint:794 +msgid "The server refused one message: {1}" +msgid_plural "The server refused {0} messages: {1}" +msgstr[0] "" +msgstr[1] "" + +#: ui/dialogs/import-dialog.slint:800 msgid "The import was stopped. Importing the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:798 +#: ui/dialogs/import-dialog.slint:812 msgid "{} could not be imported: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:804 +#: ui/dialogs/import-dialog.slint:818 msgid "Some mail in {} could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:885 msgid "Importing mail… {}%" msgstr "" -#: ui/dialogs/import-dialog.slint:929 +#: ui/dialogs/import-dialog.slint:943 msgid "Show" msgstr "" -#: ui/dialogs/import-dialog.slint:939 ui/views/files-view.slint:696 +#: ui/dialogs/import-dialog.slint:953 ui/views/files-view.slint:696 #, fuzzy msgid "Dismiss" msgstr "Ignorer" diff --git a/lang/it/LC_MESSAGES/flectar-mail.po b/lang/it/LC_MESSAGES/flectar-mail.po index f9977bd1..3275ece4 100644 --- a/lang/it/LC_MESSAGES/flectar-mail.po +++ b/lang/it/LC_MESSAGES/flectar-mail.po @@ -902,7 +902,7 @@ msgstr "" msgid "Flectar Mail backup" msgstr "" -#: ui/app.slint:358 ui/dialogs/import-dialog.slint:401 +#: ui/app.slint:358 ui/dialogs/import-dialog.slint:407 #: ui/views/onboarding-view.slint:222 msgid "Import accounts and mail" msgstr "" @@ -3373,158 +3373,158 @@ msgstr "" msgid "Create folder" msgstr "" -#: ui/dialogs/import-dialog.slint:125 +#: ui/dialogs/import-dialog.slint:130 msgid "No valid email address was found." msgstr "" -#: ui/dialogs/import-dialog.slint:126 +#: ui/dialogs/import-dialog.slint:131 msgid "No incoming mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:127 +#: ui/dialogs/import-dialog.slint:132 msgid "The incoming server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:128 +#: ui/dialogs/import-dialog.slint:133 msgid "No outgoing mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:129 +#: ui/dialogs/import-dialog.slint:134 msgid "The outgoing server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:130 +#: ui/dialogs/import-dialog.slint:135 msgid "" "The incoming server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:131 +#: ui/dialogs/import-dialog.slint:136 msgid "" "The outgoing server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:132 +#: ui/dialogs/import-dialog.slint:137 msgid "" "{} keeps your password off its unencrypted connection, but Flectar Mail " "would send it in the clear. Turn on SSL/TLS or STARTTLS for this server " "first." msgstr "" -#: ui/dialogs/import-dialog.slint:134 +#: ui/dialogs/import-dialog.slint:139 msgid "" "The incoming server connects without signing in, which Flectar Mail does not " "support." msgstr "" -#: ui/dialogs/import-dialog.slint:135 +#: ui/dialogs/import-dialog.slint:140 msgid "" "The incoming server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:136 +#: ui/dialogs/import-dialog.slint:141 msgid "" "The incoming server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:137 +#: ui/dialogs/import-dialog.slint:142 msgid "" "The outgoing server sends mail without signing in, which Flectar Mail does " "not support." msgstr "" -#: ui/dialogs/import-dialog.slint:138 +#: ui/dialogs/import-dialog.slint:143 msgid "" "The outgoing server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:139 +#: ui/dialogs/import-dialog.slint:144 msgid "" "The outgoing server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:140 +#: ui/dialogs/import-dialog.slint:145 msgid "" "The outgoing server signs in as {}. Flectar Mail uses one sign-in for both " "servers." msgstr "" -#: ui/dialogs/import-dialog.slint:141 +#: ui/dialogs/import-dialog.slint:146 msgid "The incoming server has no user name." msgstr "" -#: ui/dialogs/import-dialog.slint:142 +#: ui/dialogs/import-dialog.slint:147 msgid "The server settings for {} are not valid." msgstr "" -#: ui/dialogs/import-dialog.slint:143 +#: ui/dialogs/import-dialog.slint:148 msgid "This address appears earlier in the file." msgstr "" -#: ui/dialogs/import-dialog.slint:144 +#: ui/dialogs/import-dialog.slint:149 msgid "" "Your password will be sent over the encrypted connection instead of with " "CRAM-MD5." msgstr "" -#: ui/dialogs/import-dialog.slint:145 +#: ui/dialogs/import-dialog.slint:150 msgid "You will sign in with Microsoft instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:146 +#: ui/dialogs/import-dialog.slint:151 msgid "You will sign in with Google instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:147 +#: ui/dialogs/import-dialog.slint:152 msgid "" "The account signs in as {}, which is not an email address. Add it with its " "own address instead." msgstr "" -#: ui/dialogs/import-dialog.slint:148 +#: ui/dialogs/import-dialog.slint:153 msgid "" "Flectar Mail cannot use browser sign-in for {}. Sign in with an app password." msgstr "" -#: ui/dialogs/import-dialog.slint:149 +#: ui/dialogs/import-dialog.slint:154 msgid "The provider's standard outgoing server replaces {}." msgstr "" -#: ui/dialogs/import-dialog.slint:150 +#: ui/dialogs/import-dialog.slint:155 msgid "This account syncs with {} instead of downloading mail with POP3." msgstr "" -#: ui/dialogs/import-dialog.slint:151 ui/dialogs/settings-dialog.slint:1983 +#: ui/dialogs/import-dialog.slint:156 ui/dialogs/settings-dialog.slint:1983 msgid "Mail is removed from the server once it's on this device." msgstr "" -#: ui/dialogs/import-dialog.slint:152 ui/dialogs/settings-dialog.slint:1982 +#: ui/dialogs/import-dialog.slint:157 ui/dialogs/settings-dialog.slint:1982 msgid "Mail you delete here is removed from the server too." msgstr "" -#: ui/dialogs/import-dialog.slint:153 +#: ui/dialogs/import-dialog.slint:158 msgid "" "Mail is removed from the server {} days after it's downloaded, or once " "deleted here." msgstr "" -#: ui/dialogs/import-dialog.slint:154 +#: ui/dialogs/import-dialog.slint:159 msgid "" "No choice here matches how long the account kept mail on the server, so the " "closest one is used." msgstr "" -#: ui/dialogs/import-dialog.slint:155 +#: ui/dialogs/import-dialog.slint:160 msgid "One other address is managed by Gmail and appears after you sign in." msgid_plural "" "{n} other addresses are managed by Gmail and appear after you sign in." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:156 +#: ui/dialogs/import-dialog.slint:161 msgid "" "One sending address was not imported because it is invalid or uses another " "outgoing server." @@ -3534,209 +3534,213 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:157 +#: ui/dialogs/import-dialog.slint:162 msgid "A signature stored in a file outside the profile was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:158 +#: ui/dialogs/import-dialog.slint:163 msgid "A signature larger than 32 KB was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:163 +#: ui/dialogs/import-dialog.slint:168 msgid "The file could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:164 +#: ui/dialogs/import-dialog.slint:169 msgid "The settings file is too large." msgstr "" -#: ui/dialogs/import-dialog.slint:165 +#: ui/dialogs/import-dialog.slint:170 msgid "" "This is not a supported settings export or mail file. Choose a .k9s file, a " "Thunderbird profile export or prefs.js, a Flectar Mail backup, or mail saved " "as .mbox or .eml files." msgstr "" -#: ui/dialogs/import-dialog.slint:166 +#: ui/dialogs/import-dialog.slint:171 msgid "The file is damaged: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:167 +#: ui/dialogs/import-dialog.slint:172 msgid "This settings format (version {}) is not supported." msgstr "" -#: ui/dialogs/import-dialog.slint:168 +#: ui/dialogs/import-dialog.slint:173 msgid "The settings contain no mail accounts." msgstr "" -#: ui/dialogs/import-dialog.slint:169 +#: ui/dialogs/import-dialog.slint:174 msgid "No mail was found in this folder." msgstr "" -#: ui/dialogs/import-dialog.slint:170 +#: ui/dialogs/import-dialog.slint:175 msgid "" "This folder contains several Thunderbird profiles. Choose the profile folder " "inside it that you want to import." msgstr "" -#: ui/dialogs/import-dialog.slint:171 +#: ui/dialogs/import-dialog.slint:176 msgid "" "This folder is not a Thunderbird profile. Choose the folder that contains " "prefs.js." msgstr "" -#: ui/dialogs/import-dialog.slint:172 +#: ui/dialogs/import-dialog.slint:177 msgid "" "This Thunderbird profile is on a network location. Choose the profile folder " "itself to import it." msgstr "" -#: ui/dialogs/import-dialog.slint:173 +#: ui/dialogs/import-dialog.slint:178 msgid "The backup could not be restored: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:174 +#: ui/dialogs/import-dialog.slint:179 msgid "" "The import stopped: {}. The mail imported until then was kept, and importing " "the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:175 +#: ui/dialogs/import-dialog.slint:180 msgid "Import failed: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:180 +#: ui/dialogs/import-dialog.slint:185 msgid "Could not import accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:181 +#: ui/dialogs/import-dialog.slint:186 msgid "Could not import all the mail" msgstr "" -#: ui/dialogs/import-dialog.slint:182 +#: ui/dialogs/import-dialog.slint:187 msgid "No mail found" msgstr "" -#: ui/dialogs/import-dialog.slint:183 +#: ui/dialogs/import-dialog.slint:188 msgid "Could not read your selection" msgstr "" -#: ui/dialogs/import-dialog.slint:189 +#: ui/dialogs/import-dialog.slint:193 +msgid "Uploaded to the account’s server, into the folder “{}”" +msgstr "" + +#: ui/dialogs/import-dialog.slint:195 msgid "In the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:191 +#: ui/dialogs/import-dialog.slint:197 msgid "Kept on this device, in the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:192 +#: ui/dialogs/import-dialog.slint:198 msgid "Kept on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:223 +#: ui/dialogs/import-dialog.slint:229 msgid "" "Local Folders kept outside the profile were not found. Choose their folder " "to import them." msgstr "" -#: ui/dialogs/import-dialog.slint:224 +#: ui/dialogs/import-dialog.slint:230 msgid "Local Folders kept outside the profile were not found." msgstr "" -#: ui/dialogs/import-dialog.slint:230 +#: ui/dialogs/import-dialog.slint:236 msgid "Feeds and newsgroups are not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:254 ui/dialogs/import-dialog.slint:667 +#: ui/dialogs/import-dialog.slint:260 ui/dialogs/import-dialog.slint:673 msgid "Import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:295 +#: ui/dialogs/import-dialog.slint:301 msgid "Where to import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stopping…" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stop" msgstr "" -#: ui/dialogs/import-dialog.slint:322 +#: ui/dialogs/import-dialog.slint:328 msgid "Continue in background" msgstr "" -#: ui/dialogs/import-dialog.slint:327 ui/views/files-view.slint:324 +#: ui/dialogs/import-dialog.slint:333 ui/views/files-view.slint:324 msgid "Back" msgstr "" -#: ui/dialogs/import-dialog.slint:332 +#: ui/dialogs/import-dialog.slint:338 msgid "Choose folder…" msgstr "" -#: ui/dialogs/import-dialog.slint:345 +#: ui/dialogs/import-dialog.slint:351 msgid "Choose file…" msgstr "" -#: ui/dialogs/import-dialog.slint:353 +#: ui/dialogs/import-dialog.slint:359 msgid "Next" msgstr "" -#: ui/dialogs/import-dialog.slint:359 ui/dialogs/import-dialog.slint:368 +#: ui/dialogs/import-dialog.slint:365 ui/dialogs/import-dialog.slint:374 msgid "Import one account" msgid_plural "Import {n} accounts" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:369 ui/dialogs/settings-dialog.slint:2186 +#: ui/dialogs/import-dialog.slint:375 ui/dialogs/settings-dialog.slint:2186 msgid "Import" msgstr "" -#: ui/dialogs/import-dialog.slint:376 +#: ui/dialogs/import-dialog.slint:382 msgid "Open accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:385 +#: ui/dialogs/import-dialog.slint:391 msgid "Show mail" msgstr "" -#: ui/dialogs/import-dialog.slint:468 +#: ui/dialogs/import-dialog.slint:474 msgid "Choose accounts to import" msgstr "" -#: ui/dialogs/import-dialog.slint:469 +#: ui/dialogs/import-dialog.slint:475 msgid "Choose mail to import" msgstr "" -#: ui/dialogs/import-dialog.slint:470 ui/dialogs/import-dialog.slint:873 +#: ui/dialogs/import-dialog.slint:476 ui/dialogs/import-dialog.slint:887 msgid "Import stopped" msgstr "" -#: ui/dialogs/import-dialog.slint:471 ui/dialogs/import-dialog.slint:874 +#: ui/dialogs/import-dialog.slint:477 ui/dialogs/import-dialog.slint:888 msgid "Import complete" msgstr "" -#: ui/dialogs/import-dialog.slint:486 +#: ui/dialogs/import-dialog.slint:492 msgid "" "Bring your accounts from Thunderbird, Thunderbird for Android, K-9 Mail, or " "a Flectar Mail backup, and mail from Thunderbird or saved mail files. " "Passwords are never imported: you sign in to each account afterward." msgstr "" -#: ui/dialogs/import-dialog.slint:492 +#: ui/dialogs/import-dialog.slint:498 msgid "Thunderbird on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:506 +#: ui/dialogs/import-dialog.slint:512 msgid "Import from Thunderbird profile {}" msgstr "" -#: ui/dialogs/import-dialog.slint:534 +#: ui/dialogs/import-dialog.slint:540 msgid "{} (default profile)" msgstr "" -#: ui/dialogs/import-dialog.slint:569 +#: ui/dialogs/import-dialog.slint:575 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip), profile folders and prefs.js, Flectar Mail backups (." @@ -3744,146 +3748,158 @@ msgid "" "archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:570 +#: ui/dialogs/import-dialog.slint:576 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip) and prefs.js, Flectar Mail backups (.json), and mail " "saved as .mbox or .eml files or in ZIP archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:583 +#: ui/dialogs/import-dialog.slint:589 msgid "Looking for accounts and mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:584 ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:590 ui/dialogs/import-dialog.slint:885 msgid "Importing accounts…" msgstr "" -#: ui/dialogs/import-dialog.slint:585 ui/dialogs/import-dialog.slint:604 +#: ui/dialogs/import-dialog.slint:591 ui/dialogs/import-dialog.slint:610 msgid "Importing mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:616 +#: ui/dialogs/import-dialog.slint:622 msgid "One message · {1} of {2}" msgid_plural "{0} messages · {1} of {2}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:643 +#: ui/dialogs/import-dialog.slint:649 msgid "" "From Thunderbird for Android or K-9 Mail. Existing accounts are never " "changed." msgstr "" -#: ui/dialogs/import-dialog.slint:644 +#: ui/dialogs/import-dialog.slint:650 msgid "From Thunderbird. Existing accounts are never changed." msgstr "" -#: ui/dialogs/import-dialog.slint:682 +#: ui/dialogs/import-dialog.slint:688 msgid "Already in Flectar Mail" msgstr "" -#: ui/dialogs/import-dialog.slint:683 +#: ui/dialogs/import-dialog.slint:689 msgid "Cannot be imported" msgstr "" -#: ui/dialogs/import-dialog.slint:684 +#: ui/dialogs/import-dialog.slint:690 msgid "Sign in with Google after import" msgstr "" -#: ui/dialogs/import-dialog.slint:685 +#: ui/dialogs/import-dialog.slint:691 msgid "Sign in with Microsoft after import" msgstr "" -#: ui/dialogs/import-dialog.slint:686 +#: ui/dialogs/import-dialog.slint:692 msgid "{} · enter your password after import" msgstr "" -#: ui/dialogs/import-dialog.slint:692 +#: ui/dialogs/import-dialog.slint:698 msgid "Named “{}” in the other app" msgstr "" -#: ui/dialogs/import-dialog.slint:711 +#: ui/dialogs/import-dialog.slint:718 +msgid "" +"Mail stays on this device unless you choose an account for it. Messages " +"already there are skipped, so an import can be repeated." +msgstr "" + +#: ui/dialogs/import-dialog.slint:719 msgid "" "Imported mail is kept only on this device. Messages already here are " "skipped, so an import can be repeated." msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "No folders chosen" msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "One folder chosen, {}" msgid_plural "{n} folders chosen, {}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:742 +#: ui/dialogs/import-dialog.slint:750 msgid "Imported one account. Sign in to it to start syncing." msgid_plural "Imported {n} accounts. Sign in to each one to start syncing." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:748 +#: ui/dialogs/import-dialog.slint:756 msgid "No accounts were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:754 +#: ui/dialogs/import-dialog.slint:762 msgid "One account was already in Flectar Mail and was left unchanged." msgid_plural "" "{n} accounts were already in Flectar Mail and were left unchanged." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:760 +#: ui/dialogs/import-dialog.slint:768 msgid "" "The theme, language, and other preferences from the backup were applied." msgstr "" -#: ui/dialogs/import-dialog.slint:767 +#: ui/dialogs/import-dialog.slint:775 msgid "Imported one message." msgid_plural "Imported {} messages." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:768 +#: ui/dialogs/import-dialog.slint:776 msgid "No new messages were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:774 +#: ui/dialogs/import-dialog.slint:782 msgid "One message was already here and was skipped." msgid_plural "{} messages were already here and were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:780 +#: ui/dialogs/import-dialog.slint:788 msgid "One message larger than 128 MB was skipped." msgid_plural "{} messages larger than 128 MB were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:786 +#: ui/dialogs/import-dialog.slint:794 +msgid "The server refused one message: {1}" +msgid_plural "The server refused {0} messages: {1}" +msgstr[0] "" +msgstr[1] "" + +#: ui/dialogs/import-dialog.slint:800 msgid "The import was stopped. Importing the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:798 +#: ui/dialogs/import-dialog.slint:812 msgid "{} could not be imported: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:804 +#: ui/dialogs/import-dialog.slint:818 msgid "Some mail in {} could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:885 msgid "Importing mail… {}%" msgstr "" -#: ui/dialogs/import-dialog.slint:929 +#: ui/dialogs/import-dialog.slint:943 msgid "Show" msgstr "" -#: ui/dialogs/import-dialog.slint:939 ui/views/files-view.slint:696 +#: ui/dialogs/import-dialog.slint:953 ui/views/files-view.slint:696 msgid "Dismiss" msgstr "" diff --git a/lang/ja/LC_MESSAGES/flectar-mail.po b/lang/ja/LC_MESSAGES/flectar-mail.po index 4d9a44c2..b2a5d22f 100644 --- a/lang/ja/LC_MESSAGES/flectar-mail.po +++ b/lang/ja/LC_MESSAGES/flectar-mail.po @@ -902,7 +902,7 @@ msgstr "" msgid "Flectar Mail backup" msgstr "" -#: ui/app.slint:358 ui/dialogs/import-dialog.slint:401 +#: ui/app.slint:358 ui/dialogs/import-dialog.slint:407 #: ui/views/onboarding-view.slint:222 msgid "Import accounts and mail" msgstr "" @@ -3373,157 +3373,157 @@ msgstr "" msgid "Create folder" msgstr "" -#: ui/dialogs/import-dialog.slint:125 +#: ui/dialogs/import-dialog.slint:130 msgid "No valid email address was found." msgstr "" -#: ui/dialogs/import-dialog.slint:126 +#: ui/dialogs/import-dialog.slint:131 msgid "No incoming mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:127 +#: ui/dialogs/import-dialog.slint:132 msgid "The incoming server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:128 +#: ui/dialogs/import-dialog.slint:133 msgid "No outgoing mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:129 +#: ui/dialogs/import-dialog.slint:134 msgid "The outgoing server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:130 +#: ui/dialogs/import-dialog.slint:135 msgid "" "The incoming server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:131 +#: ui/dialogs/import-dialog.slint:136 msgid "" "The outgoing server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:132 +#: ui/dialogs/import-dialog.slint:137 msgid "" "{} keeps your password off its unencrypted connection, but Flectar Mail " "would send it in the clear. Turn on SSL/TLS or STARTTLS for this server " "first." msgstr "" -#: ui/dialogs/import-dialog.slint:134 +#: ui/dialogs/import-dialog.slint:139 msgid "" "The incoming server connects without signing in, which Flectar Mail does not " "support." msgstr "" -#: ui/dialogs/import-dialog.slint:135 +#: ui/dialogs/import-dialog.slint:140 msgid "" "The incoming server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:136 +#: ui/dialogs/import-dialog.slint:141 msgid "" "The incoming server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:137 +#: ui/dialogs/import-dialog.slint:142 msgid "" "The outgoing server sends mail without signing in, which Flectar Mail does " "not support." msgstr "" -#: ui/dialogs/import-dialog.slint:138 +#: ui/dialogs/import-dialog.slint:143 msgid "" "The outgoing server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:139 +#: ui/dialogs/import-dialog.slint:144 msgid "" "The outgoing server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:140 +#: ui/dialogs/import-dialog.slint:145 msgid "" "The outgoing server signs in as {}. Flectar Mail uses one sign-in for both " "servers." msgstr "" -#: ui/dialogs/import-dialog.slint:141 +#: ui/dialogs/import-dialog.slint:146 msgid "The incoming server has no user name." msgstr "" -#: ui/dialogs/import-dialog.slint:142 +#: ui/dialogs/import-dialog.slint:147 msgid "The server settings for {} are not valid." msgstr "" -#: ui/dialogs/import-dialog.slint:143 +#: ui/dialogs/import-dialog.slint:148 msgid "This address appears earlier in the file." msgstr "" -#: ui/dialogs/import-dialog.slint:144 +#: ui/dialogs/import-dialog.slint:149 msgid "" "Your password will be sent over the encrypted connection instead of with " "CRAM-MD5." msgstr "" -#: ui/dialogs/import-dialog.slint:145 +#: ui/dialogs/import-dialog.slint:150 msgid "You will sign in with Microsoft instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:146 +#: ui/dialogs/import-dialog.slint:151 msgid "You will sign in with Google instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:147 +#: ui/dialogs/import-dialog.slint:152 msgid "" "The account signs in as {}, which is not an email address. Add it with its " "own address instead." msgstr "" -#: ui/dialogs/import-dialog.slint:148 +#: ui/dialogs/import-dialog.slint:153 msgid "" "Flectar Mail cannot use browser sign-in for {}. Sign in with an app password." msgstr "" -#: ui/dialogs/import-dialog.slint:149 +#: ui/dialogs/import-dialog.slint:154 msgid "The provider's standard outgoing server replaces {}." msgstr "" -#: ui/dialogs/import-dialog.slint:150 +#: ui/dialogs/import-dialog.slint:155 msgid "This account syncs with {} instead of downloading mail with POP3." msgstr "" -#: ui/dialogs/import-dialog.slint:151 ui/dialogs/settings-dialog.slint:1983 +#: ui/dialogs/import-dialog.slint:156 ui/dialogs/settings-dialog.slint:1983 msgid "Mail is removed from the server once it's on this device." msgstr "" -#: ui/dialogs/import-dialog.slint:152 ui/dialogs/settings-dialog.slint:1982 +#: ui/dialogs/import-dialog.slint:157 ui/dialogs/settings-dialog.slint:1982 msgid "Mail you delete here is removed from the server too." msgstr "" -#: ui/dialogs/import-dialog.slint:153 +#: ui/dialogs/import-dialog.slint:158 msgid "" "Mail is removed from the server {} days after it's downloaded, or once " "deleted here." msgstr "" -#: ui/dialogs/import-dialog.slint:154 +#: ui/dialogs/import-dialog.slint:159 msgid "" "No choice here matches how long the account kept mail on the server, so the " "closest one is used." msgstr "" -#: ui/dialogs/import-dialog.slint:155 +#: ui/dialogs/import-dialog.slint:160 msgid "One other address is managed by Gmail and appears after you sign in." msgid_plural "" "{n} other addresses are managed by Gmail and appear after you sign in." msgstr[0] "" -#: ui/dialogs/import-dialog.slint:156 +#: ui/dialogs/import-dialog.slint:161 msgid "" "One sending address was not imported because it is invalid or uses another " "outgoing server." @@ -3532,208 +3532,212 @@ msgid_plural "" "another outgoing server." msgstr[0] "" -#: ui/dialogs/import-dialog.slint:157 +#: ui/dialogs/import-dialog.slint:162 msgid "A signature stored in a file outside the profile was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:158 +#: ui/dialogs/import-dialog.slint:163 msgid "A signature larger than 32 KB was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:163 +#: ui/dialogs/import-dialog.slint:168 msgid "The file could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:164 +#: ui/dialogs/import-dialog.slint:169 msgid "The settings file is too large." msgstr "" -#: ui/dialogs/import-dialog.slint:165 +#: ui/dialogs/import-dialog.slint:170 msgid "" "This is not a supported settings export or mail file. Choose a .k9s file, a " "Thunderbird profile export or prefs.js, a Flectar Mail backup, or mail saved " "as .mbox or .eml files." msgstr "" -#: ui/dialogs/import-dialog.slint:166 +#: ui/dialogs/import-dialog.slint:171 msgid "The file is damaged: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:167 +#: ui/dialogs/import-dialog.slint:172 msgid "This settings format (version {}) is not supported." msgstr "" -#: ui/dialogs/import-dialog.slint:168 +#: ui/dialogs/import-dialog.slint:173 msgid "The settings contain no mail accounts." msgstr "" -#: ui/dialogs/import-dialog.slint:169 +#: ui/dialogs/import-dialog.slint:174 msgid "No mail was found in this folder." msgstr "" -#: ui/dialogs/import-dialog.slint:170 +#: ui/dialogs/import-dialog.slint:175 msgid "" "This folder contains several Thunderbird profiles. Choose the profile folder " "inside it that you want to import." msgstr "" -#: ui/dialogs/import-dialog.slint:171 +#: ui/dialogs/import-dialog.slint:176 msgid "" "This folder is not a Thunderbird profile. Choose the folder that contains " "prefs.js." msgstr "" -#: ui/dialogs/import-dialog.slint:172 +#: ui/dialogs/import-dialog.slint:177 msgid "" "This Thunderbird profile is on a network location. Choose the profile folder " "itself to import it." msgstr "" -#: ui/dialogs/import-dialog.slint:173 +#: ui/dialogs/import-dialog.slint:178 msgid "The backup could not be restored: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:174 +#: ui/dialogs/import-dialog.slint:179 msgid "" "The import stopped: {}. The mail imported until then was kept, and importing " "the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:175 +#: ui/dialogs/import-dialog.slint:180 msgid "Import failed: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:180 +#: ui/dialogs/import-dialog.slint:185 msgid "Could not import accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:181 +#: ui/dialogs/import-dialog.slint:186 msgid "Could not import all the mail" msgstr "" -#: ui/dialogs/import-dialog.slint:182 +#: ui/dialogs/import-dialog.slint:187 msgid "No mail found" msgstr "" -#: ui/dialogs/import-dialog.slint:183 +#: ui/dialogs/import-dialog.slint:188 msgid "Could not read your selection" msgstr "" -#: ui/dialogs/import-dialog.slint:189 +#: ui/dialogs/import-dialog.slint:193 +msgid "Uploaded to the account’s server, into the folder “{}”" +msgstr "" + +#: ui/dialogs/import-dialog.slint:195 msgid "In the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:191 +#: ui/dialogs/import-dialog.slint:197 msgid "Kept on this device, in the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:192 +#: ui/dialogs/import-dialog.slint:198 msgid "Kept on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:223 +#: ui/dialogs/import-dialog.slint:229 msgid "" "Local Folders kept outside the profile were not found. Choose their folder " "to import them." msgstr "" -#: ui/dialogs/import-dialog.slint:224 +#: ui/dialogs/import-dialog.slint:230 msgid "Local Folders kept outside the profile were not found." msgstr "" -#: ui/dialogs/import-dialog.slint:230 +#: ui/dialogs/import-dialog.slint:236 msgid "Feeds and newsgroups are not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:254 ui/dialogs/import-dialog.slint:667 +#: ui/dialogs/import-dialog.slint:260 ui/dialogs/import-dialog.slint:673 msgid "Import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:295 +#: ui/dialogs/import-dialog.slint:301 msgid "Where to import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stopping…" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stop" msgstr "" -#: ui/dialogs/import-dialog.slint:322 +#: ui/dialogs/import-dialog.slint:328 msgid "Continue in background" msgstr "" -#: ui/dialogs/import-dialog.slint:327 ui/views/files-view.slint:324 +#: ui/dialogs/import-dialog.slint:333 ui/views/files-view.slint:324 msgid "Back" msgstr "" -#: ui/dialogs/import-dialog.slint:332 +#: ui/dialogs/import-dialog.slint:338 msgid "Choose folder…" msgstr "" -#: ui/dialogs/import-dialog.slint:345 +#: ui/dialogs/import-dialog.slint:351 msgid "Choose file…" msgstr "" -#: ui/dialogs/import-dialog.slint:353 +#: ui/dialogs/import-dialog.slint:359 msgid "Next" msgstr "" -#: ui/dialogs/import-dialog.slint:359 ui/dialogs/import-dialog.slint:368 +#: ui/dialogs/import-dialog.slint:365 ui/dialogs/import-dialog.slint:374 msgid "Import one account" msgid_plural "Import {n} accounts" msgstr[0] "" -#: ui/dialogs/import-dialog.slint:369 ui/dialogs/settings-dialog.slint:2186 +#: ui/dialogs/import-dialog.slint:375 ui/dialogs/settings-dialog.slint:2186 msgid "Import" msgstr "" -#: ui/dialogs/import-dialog.slint:376 +#: ui/dialogs/import-dialog.slint:382 msgid "Open accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:385 +#: ui/dialogs/import-dialog.slint:391 msgid "Show mail" msgstr "" -#: ui/dialogs/import-dialog.slint:468 +#: ui/dialogs/import-dialog.slint:474 msgid "Choose accounts to import" msgstr "" -#: ui/dialogs/import-dialog.slint:469 +#: ui/dialogs/import-dialog.slint:475 msgid "Choose mail to import" msgstr "" -#: ui/dialogs/import-dialog.slint:470 ui/dialogs/import-dialog.slint:873 +#: ui/dialogs/import-dialog.slint:476 ui/dialogs/import-dialog.slint:887 msgid "Import stopped" msgstr "" -#: ui/dialogs/import-dialog.slint:471 ui/dialogs/import-dialog.slint:874 +#: ui/dialogs/import-dialog.slint:477 ui/dialogs/import-dialog.slint:888 msgid "Import complete" msgstr "" -#: ui/dialogs/import-dialog.slint:486 +#: ui/dialogs/import-dialog.slint:492 msgid "" "Bring your accounts from Thunderbird, Thunderbird for Android, K-9 Mail, or " "a Flectar Mail backup, and mail from Thunderbird or saved mail files. " "Passwords are never imported: you sign in to each account afterward." msgstr "" -#: ui/dialogs/import-dialog.slint:492 +#: ui/dialogs/import-dialog.slint:498 msgid "Thunderbird on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:506 +#: ui/dialogs/import-dialog.slint:512 msgid "Import from Thunderbird profile {}" msgstr "" -#: ui/dialogs/import-dialog.slint:534 +#: ui/dialogs/import-dialog.slint:540 msgid "{} (default profile)" msgstr "" -#: ui/dialogs/import-dialog.slint:569 +#: ui/dialogs/import-dialog.slint:575 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip), profile folders and prefs.js, Flectar Mail backups (." @@ -3741,139 +3745,150 @@ msgid "" "archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:570 +#: ui/dialogs/import-dialog.slint:576 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip) and prefs.js, Flectar Mail backups (.json), and mail " "saved as .mbox or .eml files or in ZIP archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:583 +#: ui/dialogs/import-dialog.slint:589 msgid "Looking for accounts and mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:584 ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:590 ui/dialogs/import-dialog.slint:885 msgid "Importing accounts…" msgstr "" -#: ui/dialogs/import-dialog.slint:585 ui/dialogs/import-dialog.slint:604 +#: ui/dialogs/import-dialog.slint:591 ui/dialogs/import-dialog.slint:610 msgid "Importing mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:616 +#: ui/dialogs/import-dialog.slint:622 msgid "One message · {1} of {2}" msgid_plural "{0} messages · {1} of {2}" msgstr[0] "" -#: ui/dialogs/import-dialog.slint:643 +#: ui/dialogs/import-dialog.slint:649 msgid "" "From Thunderbird for Android or K-9 Mail. Existing accounts are never " "changed." msgstr "" -#: ui/dialogs/import-dialog.slint:644 +#: ui/dialogs/import-dialog.slint:650 msgid "From Thunderbird. Existing accounts are never changed." msgstr "" -#: ui/dialogs/import-dialog.slint:682 +#: ui/dialogs/import-dialog.slint:688 msgid "Already in Flectar Mail" msgstr "" -#: ui/dialogs/import-dialog.slint:683 +#: ui/dialogs/import-dialog.slint:689 msgid "Cannot be imported" msgstr "" -#: ui/dialogs/import-dialog.slint:684 +#: ui/dialogs/import-dialog.slint:690 msgid "Sign in with Google after import" msgstr "" -#: ui/dialogs/import-dialog.slint:685 +#: ui/dialogs/import-dialog.slint:691 msgid "Sign in with Microsoft after import" msgstr "" -#: ui/dialogs/import-dialog.slint:686 +#: ui/dialogs/import-dialog.slint:692 msgid "{} · enter your password after import" msgstr "" -#: ui/dialogs/import-dialog.slint:692 +#: ui/dialogs/import-dialog.slint:698 msgid "Named “{}” in the other app" msgstr "" -#: ui/dialogs/import-dialog.slint:711 +#: ui/dialogs/import-dialog.slint:718 +msgid "" +"Mail stays on this device unless you choose an account for it. Messages " +"already there are skipped, so an import can be repeated." +msgstr "" + +#: ui/dialogs/import-dialog.slint:719 msgid "" "Imported mail is kept only on this device. Messages already here are " "skipped, so an import can be repeated." msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "No folders chosen" msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "One folder chosen, {}" msgid_plural "{n} folders chosen, {}" msgstr[0] "" -#: ui/dialogs/import-dialog.slint:742 +#: ui/dialogs/import-dialog.slint:750 msgid "Imported one account. Sign in to it to start syncing." msgid_plural "Imported {n} accounts. Sign in to each one to start syncing." msgstr[0] "" -#: ui/dialogs/import-dialog.slint:748 +#: ui/dialogs/import-dialog.slint:756 msgid "No accounts were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:754 +#: ui/dialogs/import-dialog.slint:762 msgid "One account was already in Flectar Mail and was left unchanged." msgid_plural "" "{n} accounts were already in Flectar Mail and were left unchanged." msgstr[0] "" -#: ui/dialogs/import-dialog.slint:760 +#: ui/dialogs/import-dialog.slint:768 msgid "" "The theme, language, and other preferences from the backup were applied." msgstr "" -#: ui/dialogs/import-dialog.slint:767 +#: ui/dialogs/import-dialog.slint:775 msgid "Imported one message." msgid_plural "Imported {} messages." msgstr[0] "" -#: ui/dialogs/import-dialog.slint:768 +#: ui/dialogs/import-dialog.slint:776 msgid "No new messages were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:774 +#: ui/dialogs/import-dialog.slint:782 msgid "One message was already here and was skipped." msgid_plural "{} messages were already here and were skipped." msgstr[0] "" -#: ui/dialogs/import-dialog.slint:780 +#: ui/dialogs/import-dialog.slint:788 msgid "One message larger than 128 MB was skipped." msgid_plural "{} messages larger than 128 MB were skipped." msgstr[0] "" -#: ui/dialogs/import-dialog.slint:786 +#: ui/dialogs/import-dialog.slint:794 +msgid "The server refused one message: {1}" +msgid_plural "The server refused {0} messages: {1}" +msgstr[0] "" + +#: ui/dialogs/import-dialog.slint:800 msgid "The import was stopped. Importing the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:798 +#: ui/dialogs/import-dialog.slint:812 msgid "{} could not be imported: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:804 +#: ui/dialogs/import-dialog.slint:818 msgid "Some mail in {} could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:885 msgid "Importing mail… {}%" msgstr "" -#: ui/dialogs/import-dialog.slint:929 +#: ui/dialogs/import-dialog.slint:943 msgid "Show" msgstr "" -#: ui/dialogs/import-dialog.slint:939 ui/views/files-view.slint:696 +#: ui/dialogs/import-dialog.slint:953 ui/views/files-view.slint:696 msgid "Dismiss" msgstr "" diff --git a/lang/nl/LC_MESSAGES/flectar-mail.po b/lang/nl/LC_MESSAGES/flectar-mail.po index b0adaa32..011a8200 100644 --- a/lang/nl/LC_MESSAGES/flectar-mail.po +++ b/lang/nl/LC_MESSAGES/flectar-mail.po @@ -902,7 +902,7 @@ msgstr "" msgid "Flectar Mail backup" msgstr "" -#: ui/app.slint:358 ui/dialogs/import-dialog.slint:401 +#: ui/app.slint:358 ui/dialogs/import-dialog.slint:407 #: ui/views/onboarding-view.slint:222 msgid "Import accounts and mail" msgstr "" @@ -3373,158 +3373,158 @@ msgstr "" msgid "Create folder" msgstr "" -#: ui/dialogs/import-dialog.slint:125 +#: ui/dialogs/import-dialog.slint:130 msgid "No valid email address was found." msgstr "" -#: ui/dialogs/import-dialog.slint:126 +#: ui/dialogs/import-dialog.slint:131 msgid "No incoming mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:127 +#: ui/dialogs/import-dialog.slint:132 msgid "The incoming server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:128 +#: ui/dialogs/import-dialog.slint:133 msgid "No outgoing mail server is configured." msgstr "" -#: ui/dialogs/import-dialog.slint:129 +#: ui/dialogs/import-dialog.slint:134 msgid "The outgoing server {} uses a protocol Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:130 +#: ui/dialogs/import-dialog.slint:135 msgid "" "The incoming server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:131 +#: ui/dialogs/import-dialog.slint:136 msgid "" "The outgoing server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:132 +#: ui/dialogs/import-dialog.slint:137 msgid "" "{} keeps your password off its unencrypted connection, but Flectar Mail " "would send it in the clear. Turn on SSL/TLS or STARTTLS for this server " "first." msgstr "" -#: ui/dialogs/import-dialog.slint:134 +#: ui/dialogs/import-dialog.slint:139 msgid "" "The incoming server connects without signing in, which Flectar Mail does not " "support." msgstr "" -#: ui/dialogs/import-dialog.slint:135 +#: ui/dialogs/import-dialog.slint:140 msgid "" "The incoming server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:136 +#: ui/dialogs/import-dialog.slint:141 msgid "" "The incoming server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:137 +#: ui/dialogs/import-dialog.slint:142 msgid "" "The outgoing server sends mail without signing in, which Flectar Mail does " "not support." msgstr "" -#: ui/dialogs/import-dialog.slint:138 +#: ui/dialogs/import-dialog.slint:143 msgid "" "The outgoing server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:139 +#: ui/dialogs/import-dialog.slint:144 msgid "" "The outgoing server signs in with {}, which Flectar Mail does not support." msgstr "" -#: ui/dialogs/import-dialog.slint:140 +#: ui/dialogs/import-dialog.slint:145 msgid "" "The outgoing server signs in as {}. Flectar Mail uses one sign-in for both " "servers." msgstr "" -#: ui/dialogs/import-dialog.slint:141 +#: ui/dialogs/import-dialog.slint:146 msgid "The incoming server has no user name." msgstr "" -#: ui/dialogs/import-dialog.slint:142 +#: ui/dialogs/import-dialog.slint:147 msgid "The server settings for {} are not valid." msgstr "" -#: ui/dialogs/import-dialog.slint:143 +#: ui/dialogs/import-dialog.slint:148 msgid "This address appears earlier in the file." msgstr "" -#: ui/dialogs/import-dialog.slint:144 +#: ui/dialogs/import-dialog.slint:149 msgid "" "Your password will be sent over the encrypted connection instead of with " "CRAM-MD5." msgstr "" -#: ui/dialogs/import-dialog.slint:145 +#: ui/dialogs/import-dialog.slint:150 msgid "You will sign in with Microsoft instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:146 +#: ui/dialogs/import-dialog.slint:151 msgid "You will sign in with Google instead of a password." msgstr "" -#: ui/dialogs/import-dialog.slint:147 +#: ui/dialogs/import-dialog.slint:152 msgid "" "The account signs in as {}, which is not an email address. Add it with its " "own address instead." msgstr "" -#: ui/dialogs/import-dialog.slint:148 +#: ui/dialogs/import-dialog.slint:153 msgid "" "Flectar Mail cannot use browser sign-in for {}. Sign in with an app password." msgstr "" -#: ui/dialogs/import-dialog.slint:149 +#: ui/dialogs/import-dialog.slint:154 msgid "The provider's standard outgoing server replaces {}." msgstr "" -#: ui/dialogs/import-dialog.slint:150 +#: ui/dialogs/import-dialog.slint:155 msgid "This account syncs with {} instead of downloading mail with POP3." msgstr "" -#: ui/dialogs/import-dialog.slint:151 ui/dialogs/settings-dialog.slint:1983 +#: ui/dialogs/import-dialog.slint:156 ui/dialogs/settings-dialog.slint:1983 msgid "Mail is removed from the server once it's on this device." msgstr "" -#: ui/dialogs/import-dialog.slint:152 ui/dialogs/settings-dialog.slint:1982 +#: ui/dialogs/import-dialog.slint:157 ui/dialogs/settings-dialog.slint:1982 msgid "Mail you delete here is removed from the server too." msgstr "" -#: ui/dialogs/import-dialog.slint:153 +#: ui/dialogs/import-dialog.slint:158 msgid "" "Mail is removed from the server {} days after it's downloaded, or once " "deleted here." msgstr "" -#: ui/dialogs/import-dialog.slint:154 +#: ui/dialogs/import-dialog.slint:159 msgid "" "No choice here matches how long the account kept mail on the server, so the " "closest one is used." msgstr "" -#: ui/dialogs/import-dialog.slint:155 +#: ui/dialogs/import-dialog.slint:160 msgid "One other address is managed by Gmail and appears after you sign in." msgid_plural "" "{n} other addresses are managed by Gmail and appear after you sign in." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:156 +#: ui/dialogs/import-dialog.slint:161 msgid "" "One sending address was not imported because it is invalid or uses another " "outgoing server." @@ -3534,209 +3534,213 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:157 +#: ui/dialogs/import-dialog.slint:162 msgid "A signature stored in a file outside the profile was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:158 +#: ui/dialogs/import-dialog.slint:163 msgid "A signature larger than 32 KB was not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:163 +#: ui/dialogs/import-dialog.slint:168 msgid "The file could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:164 +#: ui/dialogs/import-dialog.slint:169 msgid "The settings file is too large." msgstr "" -#: ui/dialogs/import-dialog.slint:165 +#: ui/dialogs/import-dialog.slint:170 msgid "" "This is not a supported settings export or mail file. Choose a .k9s file, a " "Thunderbird profile export or prefs.js, a Flectar Mail backup, or mail saved " "as .mbox or .eml files." msgstr "" -#: ui/dialogs/import-dialog.slint:166 +#: ui/dialogs/import-dialog.slint:171 msgid "The file is damaged: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:167 +#: ui/dialogs/import-dialog.slint:172 msgid "This settings format (version {}) is not supported." msgstr "" -#: ui/dialogs/import-dialog.slint:168 +#: ui/dialogs/import-dialog.slint:173 msgid "The settings contain no mail accounts." msgstr "" -#: ui/dialogs/import-dialog.slint:169 +#: ui/dialogs/import-dialog.slint:174 msgid "No mail was found in this folder." msgstr "" -#: ui/dialogs/import-dialog.slint:170 +#: ui/dialogs/import-dialog.slint:175 msgid "" "This folder contains several Thunderbird profiles. Choose the profile folder " "inside it that you want to import." msgstr "" -#: ui/dialogs/import-dialog.slint:171 +#: ui/dialogs/import-dialog.slint:176 msgid "" "This folder is not a Thunderbird profile. Choose the folder that contains " "prefs.js." msgstr "" -#: ui/dialogs/import-dialog.slint:172 +#: ui/dialogs/import-dialog.slint:177 msgid "" "This Thunderbird profile is on a network location. Choose the profile folder " "itself to import it." msgstr "" -#: ui/dialogs/import-dialog.slint:173 +#: ui/dialogs/import-dialog.slint:178 msgid "The backup could not be restored: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:174 +#: ui/dialogs/import-dialog.slint:179 msgid "" "The import stopped: {}. The mail imported until then was kept, and importing " "the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:175 +#: ui/dialogs/import-dialog.slint:180 msgid "Import failed: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:180 +#: ui/dialogs/import-dialog.slint:185 msgid "Could not import accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:181 +#: ui/dialogs/import-dialog.slint:186 msgid "Could not import all the mail" msgstr "" -#: ui/dialogs/import-dialog.slint:182 +#: ui/dialogs/import-dialog.slint:187 msgid "No mail found" msgstr "" -#: ui/dialogs/import-dialog.slint:183 +#: ui/dialogs/import-dialog.slint:188 msgid "Could not read your selection" msgstr "" -#: ui/dialogs/import-dialog.slint:189 +#: ui/dialogs/import-dialog.slint:193 +msgid "Uploaded to the account’s server, into the folder “{}”" +msgstr "" + +#: ui/dialogs/import-dialog.slint:195 msgid "In the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:191 +#: ui/dialogs/import-dialog.slint:197 msgid "Kept on this device, in the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:192 +#: ui/dialogs/import-dialog.slint:198 msgid "Kept on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:223 +#: ui/dialogs/import-dialog.slint:229 msgid "" "Local Folders kept outside the profile were not found. Choose their folder " "to import them." msgstr "" -#: ui/dialogs/import-dialog.slint:224 +#: ui/dialogs/import-dialog.slint:230 msgid "Local Folders kept outside the profile were not found." msgstr "" -#: ui/dialogs/import-dialog.slint:230 +#: ui/dialogs/import-dialog.slint:236 msgid "Feeds and newsgroups are not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:254 ui/dialogs/import-dialog.slint:667 +#: ui/dialogs/import-dialog.slint:260 ui/dialogs/import-dialog.slint:673 msgid "Import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:295 +#: ui/dialogs/import-dialog.slint:301 msgid "Where to import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stopping…" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stop" msgstr "" -#: ui/dialogs/import-dialog.slint:322 +#: ui/dialogs/import-dialog.slint:328 msgid "Continue in background" msgstr "" -#: ui/dialogs/import-dialog.slint:327 ui/views/files-view.slint:324 +#: ui/dialogs/import-dialog.slint:333 ui/views/files-view.slint:324 msgid "Back" msgstr "" -#: ui/dialogs/import-dialog.slint:332 +#: ui/dialogs/import-dialog.slint:338 msgid "Choose folder…" msgstr "" -#: ui/dialogs/import-dialog.slint:345 +#: ui/dialogs/import-dialog.slint:351 msgid "Choose file…" msgstr "" -#: ui/dialogs/import-dialog.slint:353 +#: ui/dialogs/import-dialog.slint:359 msgid "Next" msgstr "" -#: ui/dialogs/import-dialog.slint:359 ui/dialogs/import-dialog.slint:368 +#: ui/dialogs/import-dialog.slint:365 ui/dialogs/import-dialog.slint:374 msgid "Import one account" msgid_plural "Import {n} accounts" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:369 ui/dialogs/settings-dialog.slint:2186 +#: ui/dialogs/import-dialog.slint:375 ui/dialogs/settings-dialog.slint:2186 msgid "Import" msgstr "" -#: ui/dialogs/import-dialog.slint:376 +#: ui/dialogs/import-dialog.slint:382 msgid "Open accounts" msgstr "" -#: ui/dialogs/import-dialog.slint:385 +#: ui/dialogs/import-dialog.slint:391 msgid "Show mail" msgstr "" -#: ui/dialogs/import-dialog.slint:468 +#: ui/dialogs/import-dialog.slint:474 msgid "Choose accounts to import" msgstr "" -#: ui/dialogs/import-dialog.slint:469 +#: ui/dialogs/import-dialog.slint:475 msgid "Choose mail to import" msgstr "" -#: ui/dialogs/import-dialog.slint:470 ui/dialogs/import-dialog.slint:873 +#: ui/dialogs/import-dialog.slint:476 ui/dialogs/import-dialog.slint:887 msgid "Import stopped" msgstr "" -#: ui/dialogs/import-dialog.slint:471 ui/dialogs/import-dialog.slint:874 +#: ui/dialogs/import-dialog.slint:477 ui/dialogs/import-dialog.slint:888 msgid "Import complete" msgstr "" -#: ui/dialogs/import-dialog.slint:486 +#: ui/dialogs/import-dialog.slint:492 msgid "" "Bring your accounts from Thunderbird, Thunderbird for Android, K-9 Mail, or " "a Flectar Mail backup, and mail from Thunderbird or saved mail files. " "Passwords are never imported: you sign in to each account afterward." msgstr "" -#: ui/dialogs/import-dialog.slint:492 +#: ui/dialogs/import-dialog.slint:498 msgid "Thunderbird on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:506 +#: ui/dialogs/import-dialog.slint:512 msgid "Import from Thunderbird profile {}" msgstr "" -#: ui/dialogs/import-dialog.slint:534 +#: ui/dialogs/import-dialog.slint:540 msgid "{} (default profile)" msgstr "" -#: ui/dialogs/import-dialog.slint:569 +#: ui/dialogs/import-dialog.slint:575 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip), profile folders and prefs.js, Flectar Mail backups (." @@ -3744,146 +3748,158 @@ msgid "" "archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:570 +#: ui/dialogs/import-dialog.slint:576 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip) and prefs.js, Flectar Mail backups (.json), and mail " "saved as .mbox or .eml files or in ZIP archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:583 +#: ui/dialogs/import-dialog.slint:589 msgid "Looking for accounts and mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:584 ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:590 ui/dialogs/import-dialog.slint:885 msgid "Importing accounts…" msgstr "" -#: ui/dialogs/import-dialog.slint:585 ui/dialogs/import-dialog.slint:604 +#: ui/dialogs/import-dialog.slint:591 ui/dialogs/import-dialog.slint:610 msgid "Importing mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:616 +#: ui/dialogs/import-dialog.slint:622 msgid "One message · {1} of {2}" msgid_plural "{0} messages · {1} of {2}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:643 +#: ui/dialogs/import-dialog.slint:649 msgid "" "From Thunderbird for Android or K-9 Mail. Existing accounts are never " "changed." msgstr "" -#: ui/dialogs/import-dialog.slint:644 +#: ui/dialogs/import-dialog.slint:650 msgid "From Thunderbird. Existing accounts are never changed." msgstr "" -#: ui/dialogs/import-dialog.slint:682 +#: ui/dialogs/import-dialog.slint:688 msgid "Already in Flectar Mail" msgstr "" -#: ui/dialogs/import-dialog.slint:683 +#: ui/dialogs/import-dialog.slint:689 msgid "Cannot be imported" msgstr "" -#: ui/dialogs/import-dialog.slint:684 +#: ui/dialogs/import-dialog.slint:690 msgid "Sign in with Google after import" msgstr "" -#: ui/dialogs/import-dialog.slint:685 +#: ui/dialogs/import-dialog.slint:691 msgid "Sign in with Microsoft after import" msgstr "" -#: ui/dialogs/import-dialog.slint:686 +#: ui/dialogs/import-dialog.slint:692 msgid "{} · enter your password after import" msgstr "" -#: ui/dialogs/import-dialog.slint:692 +#: ui/dialogs/import-dialog.slint:698 msgid "Named “{}” in the other app" msgstr "" -#: ui/dialogs/import-dialog.slint:711 +#: ui/dialogs/import-dialog.slint:718 +msgid "" +"Mail stays on this device unless you choose an account for it. Messages " +"already there are skipped, so an import can be repeated." +msgstr "" + +#: ui/dialogs/import-dialog.slint:719 msgid "" "Imported mail is kept only on this device. Messages already here are " "skipped, so an import can be repeated." msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "No folders chosen" msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "One folder chosen, {}" msgid_plural "{n} folders chosen, {}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:742 +#: ui/dialogs/import-dialog.slint:750 msgid "Imported one account. Sign in to it to start syncing." msgid_plural "Imported {n} accounts. Sign in to each one to start syncing." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:748 +#: ui/dialogs/import-dialog.slint:756 msgid "No accounts were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:754 +#: ui/dialogs/import-dialog.slint:762 msgid "One account was already in Flectar Mail and was left unchanged." msgid_plural "" "{n} accounts were already in Flectar Mail and were left unchanged." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:760 +#: ui/dialogs/import-dialog.slint:768 msgid "" "The theme, language, and other preferences from the backup were applied." msgstr "" -#: ui/dialogs/import-dialog.slint:767 +#: ui/dialogs/import-dialog.slint:775 msgid "Imported one message." msgid_plural "Imported {} messages." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:768 +#: ui/dialogs/import-dialog.slint:776 msgid "No new messages were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:774 +#: ui/dialogs/import-dialog.slint:782 msgid "One message was already here and was skipped." msgid_plural "{} messages were already here and were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:780 +#: ui/dialogs/import-dialog.slint:788 msgid "One message larger than 128 MB was skipped." msgid_plural "{} messages larger than 128 MB were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:786 +#: ui/dialogs/import-dialog.slint:794 +msgid "The server refused one message: {1}" +msgid_plural "The server refused {0} messages: {1}" +msgstr[0] "" +msgstr[1] "" + +#: ui/dialogs/import-dialog.slint:800 msgid "The import was stopped. Importing the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:798 +#: ui/dialogs/import-dialog.slint:812 msgid "{} could not be imported: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:804 +#: ui/dialogs/import-dialog.slint:818 msgid "Some mail in {} could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:885 msgid "Importing mail… {}%" msgstr "" -#: ui/dialogs/import-dialog.slint:929 +#: ui/dialogs/import-dialog.slint:943 msgid "Show" msgstr "" -#: ui/dialogs/import-dialog.slint:939 ui/views/files-view.slint:696 +#: ui/dialogs/import-dialog.slint:953 ui/views/files-view.slint:696 msgid "Dismiss" msgstr "" diff --git a/lang/ru/LC_MESSAGES/flectar-mail.po b/lang/ru/LC_MESSAGES/flectar-mail.po index e8d55a65..0afb0ebe 100644 --- a/lang/ru/LC_MESSAGES/flectar-mail.po +++ b/lang/ru/LC_MESSAGES/flectar-mail.po @@ -913,7 +913,7 @@ msgstr "Экспорт резервной копии учётных записе msgid "Flectar Mail backup" msgstr "Резервная копия Flectar Mail" -#: ui/app.slint:358 ui/dialogs/import-dialog.slint:401 +#: ui/app.slint:358 ui/dialogs/import-dialog.slint:407 #: ui/views/onboarding-view.slint:222 msgid "Import accounts and mail" msgstr "Импорт учётных записей и почты" @@ -3464,31 +3464,31 @@ msgstr "Создать метку" msgid "Create folder" msgstr "Создать папку" -#: ui/dialogs/import-dialog.slint:125 +#: ui/dialogs/import-dialog.slint:130 msgid "No valid email address was found." msgstr "Не найден действительный адрес электронной почты." -#: ui/dialogs/import-dialog.slint:126 +#: ui/dialogs/import-dialog.slint:131 msgid "No incoming mail server is configured." msgstr "Сервер входящей почты не настроен." -#: ui/dialogs/import-dialog.slint:127 +#: ui/dialogs/import-dialog.slint:132 msgid "The incoming server {} uses a protocol Flectar Mail does not support." msgstr "" "Сервер входящей почты {} использует протокол, который Flectar Mail не " "поддерживает." -#: ui/dialogs/import-dialog.slint:128 +#: ui/dialogs/import-dialog.slint:133 msgid "No outgoing mail server is configured." msgstr "Сервер исходящей почты не настроен." -#: ui/dialogs/import-dialog.slint:129 +#: ui/dialogs/import-dialog.slint:134 msgid "The outgoing server {} uses a protocol Flectar Mail does not support." msgstr "" "Сервер исходящей почты {} использует протокол, который Flectar Mail не " "поддерживает." -#: ui/dialogs/import-dialog.slint:130 +#: ui/dialogs/import-dialog.slint:135 msgid "" "The incoming server {} is not encrypted, so your password and mail cross the " "network unprotected." @@ -3496,7 +3496,7 @@ msgstr "" "Сервер входящей почты {} не использует шифрование, поэтому ваш пароль и " "почта передаются по сети без защиты." -#: ui/dialogs/import-dialog.slint:131 +#: ui/dialogs/import-dialog.slint:136 msgid "" "The outgoing server {} is not encrypted, so your password and mail cross the " "network unprotected." @@ -3504,7 +3504,7 @@ msgstr "" "Сервер исходящей почты {} не использует шифрование, поэтому ваш пароль и " "почта передаются по сети без защиты." -#: ui/dialogs/import-dialog.slint:132 +#: ui/dialogs/import-dialog.slint:137 msgid "" "{} keeps your password off its unencrypted connection, but Flectar Mail " "would send it in the clear. Turn on SSL/TLS or STARTTLS for this server " @@ -3514,7 +3514,7 @@ msgstr "" "отправил бы его открытым текстом. Сначала включите SSL/TLS или STARTTLS для " "этого сервера." -#: ui/dialogs/import-dialog.slint:134 +#: ui/dialogs/import-dialog.slint:139 msgid "" "The incoming server connects without signing in, which Flectar Mail does not " "support." @@ -3522,7 +3522,7 @@ msgstr "" "Сервер входящей почты подключается без входа в систему, что Flectar Mail не " "поддерживает." -#: ui/dialogs/import-dialog.slint:135 +#: ui/dialogs/import-dialog.slint:140 msgid "" "The incoming server signs in with a client certificate, which Flectar Mail " "does not support." @@ -3530,14 +3530,14 @@ msgstr "" "Сервер входящей почты использует вход по сертификату клиента, что Flectar " "Mail не поддерживает." -#: ui/dialogs/import-dialog.slint:136 +#: ui/dialogs/import-dialog.slint:141 msgid "" "The incoming server signs in with {}, which Flectar Mail does not support." msgstr "" "Сервер входящей почты использует вход через {}, который Flectar Mail не " "поддерживает." -#: ui/dialogs/import-dialog.slint:137 +#: ui/dialogs/import-dialog.slint:142 msgid "" "The outgoing server sends mail without signing in, which Flectar Mail does " "not support." @@ -3545,7 +3545,7 @@ msgstr "" "Сервер исходящей почты отправляет письма без входа в систему, что Flectar " "Mail не поддерживает." -#: ui/dialogs/import-dialog.slint:138 +#: ui/dialogs/import-dialog.slint:143 msgid "" "The outgoing server signs in with a client certificate, which Flectar Mail " "does not support." @@ -3553,14 +3553,14 @@ msgstr "" "Сервер исходящей почты использует вход по сертификату клиента, что Flectar " "Mail не поддерживает." -#: ui/dialogs/import-dialog.slint:139 +#: ui/dialogs/import-dialog.slint:144 msgid "" "The outgoing server signs in with {}, which Flectar Mail does not support." msgstr "" "Сервер исходящей почты использует вход через {}, который Flectar Mail не " "поддерживает." -#: ui/dialogs/import-dialog.slint:140 +#: ui/dialogs/import-dialog.slint:145 msgid "" "The outgoing server signs in as {}. Flectar Mail uses one sign-in for both " "servers." @@ -3568,34 +3568,34 @@ msgstr "" "Сервер исходящей почты входит как {}. Flectar Mail использует один вход для " "обоих серверов." -#: ui/dialogs/import-dialog.slint:141 +#: ui/dialogs/import-dialog.slint:146 msgid "The incoming server has no user name." msgstr "Для сервера входящей почты не указано имя пользователя." -#: ui/dialogs/import-dialog.slint:142 +#: ui/dialogs/import-dialog.slint:147 msgid "The server settings for {} are not valid." msgstr "Настройки сервера {} недействительны." -#: ui/dialogs/import-dialog.slint:143 +#: ui/dialogs/import-dialog.slint:148 msgid "This address appears earlier in the file." msgstr "Этот адрес уже встречается выше в файле." -#: ui/dialogs/import-dialog.slint:144 +#: ui/dialogs/import-dialog.slint:149 msgid "" "Your password will be sent over the encrypted connection instead of with " "CRAM-MD5." msgstr "" "Пароль будет передаваться по зашифрованному соединению вместо CRAM-MD5." -#: ui/dialogs/import-dialog.slint:145 +#: ui/dialogs/import-dialog.slint:150 msgid "You will sign in with Microsoft instead of a password." msgstr "Вы будете входить через Microsoft вместо пароля." -#: ui/dialogs/import-dialog.slint:146 +#: ui/dialogs/import-dialog.slint:151 msgid "You will sign in with Google instead of a password." msgstr "Вы будете входить через Google вместо пароля." -#: ui/dialogs/import-dialog.slint:147 +#: ui/dialogs/import-dialog.slint:152 msgid "" "The account signs in as {}, which is not an email address. Add it with its " "own address instead." @@ -3603,31 +3603,31 @@ msgstr "" "Учётная запись входит как {}, а это не адрес электронной почты. Добавьте её " "с её собственным адресом." -#: ui/dialogs/import-dialog.slint:148 +#: ui/dialogs/import-dialog.slint:153 msgid "" "Flectar Mail cannot use browser sign-in for {}. Sign in with an app password." msgstr "" "Flectar Mail не может использовать вход через браузер для {}. Войдите с " "паролем приложения." -#: ui/dialogs/import-dialog.slint:149 +#: ui/dialogs/import-dialog.slint:154 msgid "The provider's standard outgoing server replaces {}." msgstr "Стандартный сервер исходящей почты провайдера заменит {}." -#: ui/dialogs/import-dialog.slint:150 +#: ui/dialogs/import-dialog.slint:155 msgid "This account syncs with {} instead of downloading mail with POP3." msgstr "" "Эта учётная запись синхронизируется с {}, а не загружает почту по POP3." -#: ui/dialogs/import-dialog.slint:151 ui/dialogs/settings-dialog.slint:1983 +#: ui/dialogs/import-dialog.slint:156 ui/dialogs/settings-dialog.slint:1983 msgid "Mail is removed from the server once it's on this device." msgstr "Почта удаляется с сервера, как только она есть на этом устройстве." -#: ui/dialogs/import-dialog.slint:152 ui/dialogs/settings-dialog.slint:1982 +#: ui/dialogs/import-dialog.slint:157 ui/dialogs/settings-dialog.slint:1982 msgid "Mail you delete here is removed from the server too." msgstr "Почта, удалённая здесь, удаляется и с сервера." -#: ui/dialogs/import-dialog.slint:153 +#: ui/dialogs/import-dialog.slint:158 msgid "" "Mail is removed from the server {} days after it's downloaded, or once " "deleted here." @@ -3635,7 +3635,7 @@ msgstr "" "Почта удаляется с сервера через {} дней после загрузки или после удаления " "здесь." -#: ui/dialogs/import-dialog.slint:154 +#: ui/dialogs/import-dialog.slint:159 msgid "" "No choice here matches how long the account kept mail on the server, so the " "closest one is used." @@ -3643,7 +3643,7 @@ msgstr "" "Ни один вариант не совпадает с тем, сколько учётная запись хранила почту на " "сервере, поэтому выбран ближайший." -#: ui/dialogs/import-dialog.slint:155 +#: ui/dialogs/import-dialog.slint:160 msgid "One other address is managed by Gmail and appears after you sign in." msgid_plural "" "{n} other addresses are managed by Gmail and appear after you sign in." @@ -3651,7 +3651,7 @@ msgstr[0] "Gmail управляет ещё {n} адресом; он появит msgstr[1] "Gmail управляет ещё {n} адресами; они появятся после входа." msgstr[2] "Gmail управляет ещё {n} адресами; они появятся после входа." -#: ui/dialogs/import-dialog.slint:156 +#: ui/dialogs/import-dialog.slint:161 msgid "" "One sending address was not imported because it is invalid or uses another " "outgoing server." @@ -3668,23 +3668,23 @@ msgstr[2] "" "{n} адресов отправителя не импортировано: они недействительны или используют " "другой сервер исходящей почты." -#: ui/dialogs/import-dialog.slint:157 +#: ui/dialogs/import-dialog.slint:162 msgid "A signature stored in a file outside the profile was not imported." msgstr "Подпись, хранящаяся в файле вне профиля, не импортирована." -#: ui/dialogs/import-dialog.slint:158 +#: ui/dialogs/import-dialog.slint:163 msgid "A signature larger than 32 KB was not imported." msgstr "Подпись размером более 32 КБ не импортирована." -#: ui/dialogs/import-dialog.slint:163 +#: ui/dialogs/import-dialog.slint:168 msgid "The file could not be read: {}" msgstr "Не удалось прочитать файл: {}" -#: ui/dialogs/import-dialog.slint:164 +#: ui/dialogs/import-dialog.slint:169 msgid "The settings file is too large." msgstr "Файл настроек слишком большой." -#: ui/dialogs/import-dialog.slint:165 +#: ui/dialogs/import-dialog.slint:170 msgid "" "This is not a supported settings export or mail file. Choose a .k9s file, a " "Thunderbird profile export or prefs.js, a Flectar Mail backup, or mail saved " @@ -3694,23 +3694,23 @@ msgstr "" "экспорт профиля Thunderbird или prefs.js, резервную копию Flectar Mail либо " "почту, сохранённую в файлах .mbox или .eml." -#: ui/dialogs/import-dialog.slint:166 +#: ui/dialogs/import-dialog.slint:171 msgid "The file is damaged: {}" msgstr "Файл повреждён: {}" -#: ui/dialogs/import-dialog.slint:167 +#: ui/dialogs/import-dialog.slint:172 msgid "This settings format (version {}) is not supported." msgstr "Этот формат настроек (версия {}) не поддерживается." -#: ui/dialogs/import-dialog.slint:168 +#: ui/dialogs/import-dialog.slint:173 msgid "The settings contain no mail accounts." msgstr "Настройки не содержат почтовых учётных записей." -#: ui/dialogs/import-dialog.slint:169 +#: ui/dialogs/import-dialog.slint:174 msgid "No mail was found in this folder." msgstr "В этой папке не найдено почты." -#: ui/dialogs/import-dialog.slint:170 +#: ui/dialogs/import-dialog.slint:175 msgid "" "This folder contains several Thunderbird profiles. Choose the profile folder " "inside it that you want to import." @@ -3718,7 +3718,7 @@ msgstr "" "Эта папка содержит несколько профилей Thunderbird. Выберите внутри неё папку " "профиля, который нужно импортировать." -#: ui/dialogs/import-dialog.slint:171 +#: ui/dialogs/import-dialog.slint:176 msgid "" "This folder is not a Thunderbird profile. Choose the folder that contains " "prefs.js." @@ -3726,7 +3726,7 @@ msgstr "" "Эта папка не является профилем Thunderbird. Выберите папку, в которой " "находится prefs.js." -#: ui/dialogs/import-dialog.slint:172 +#: ui/dialogs/import-dialog.slint:177 msgid "" "This Thunderbird profile is on a network location. Choose the profile folder " "itself to import it." @@ -3734,11 +3734,11 @@ msgstr "" "Этот профиль Thunderbird находится в сетевом расположении. Чтобы " "импортировать его, выберите непосредственно папку профиля." -#: ui/dialogs/import-dialog.slint:173 +#: ui/dialogs/import-dialog.slint:178 msgid "The backup could not be restored: {}" msgstr "Не удалось восстановить резервную копию: {}" -#: ui/dialogs/import-dialog.slint:174 +#: ui/dialogs/import-dialog.slint:179 msgid "" "The import stopped: {}. The mail imported until then was kept, and importing " "the same mail again adds the rest." @@ -3746,39 +3746,43 @@ msgstr "" "Импорт остановлен: {}. Почта, импортированная до этого, сохранена, а " "повторный импорт той же почты добавит остальное." -#: ui/dialogs/import-dialog.slint:175 +#: ui/dialogs/import-dialog.slint:180 msgid "Import failed: {}" msgstr "Ошибка импорта: {}" -#: ui/dialogs/import-dialog.slint:180 +#: ui/dialogs/import-dialog.slint:185 msgid "Could not import accounts" msgstr "Не удалось импортировать учётные записи" -#: ui/dialogs/import-dialog.slint:181 +#: ui/dialogs/import-dialog.slint:186 msgid "Could not import all the mail" msgstr "Не удалось импортировать всю почту" -#: ui/dialogs/import-dialog.slint:182 +#: ui/dialogs/import-dialog.slint:187 msgid "No mail found" msgstr "Почта не найдена" -#: ui/dialogs/import-dialog.slint:183 +#: ui/dialogs/import-dialog.slint:188 msgid "Could not read your selection" msgstr "Не удалось прочитать выбранное" -#: ui/dialogs/import-dialog.slint:189 +#: ui/dialogs/import-dialog.slint:193 +msgid "Uploaded to the account’s server, into the folder “{}”" +msgstr "Загружается на сервер учётной записи, в папку «{}»" + +#: ui/dialogs/import-dialog.slint:195 msgid "In the folder “{}”" msgstr "В папке «{}»" -#: ui/dialogs/import-dialog.slint:191 +#: ui/dialogs/import-dialog.slint:197 msgid "Kept on this device, in the folder “{}”" msgstr "Хранится на этом устройстве, в папке «{}»" -#: ui/dialogs/import-dialog.slint:192 +#: ui/dialogs/import-dialog.slint:198 msgid "Kept on this device" msgstr "Хранится на этом устройстве" -#: ui/dialogs/import-dialog.slint:223 +#: ui/dialogs/import-dialog.slint:229 msgid "" "Local Folders kept outside the profile were not found. Choose their folder " "to import them." @@ -3786,86 +3790,86 @@ msgstr "" "Локальные папки, хранящиеся вне профиля, не найдены. Выберите их папку, " "чтобы импортировать их." -#: ui/dialogs/import-dialog.slint:224 +#: ui/dialogs/import-dialog.slint:230 msgid "Local Folders kept outside the profile were not found." msgstr "Локальные папки, хранящиеся вне профиля, не найдены." -#: ui/dialogs/import-dialog.slint:230 +#: ui/dialogs/import-dialog.slint:236 msgid "Feeds and newsgroups are not imported." msgstr "Ленты и группы новостей не импортируются." -#: ui/dialogs/import-dialog.slint:254 ui/dialogs/import-dialog.slint:667 +#: ui/dialogs/import-dialog.slint:260 ui/dialogs/import-dialog.slint:673 msgid "Import {}" msgstr "Импортировать {}" -#: ui/dialogs/import-dialog.slint:295 +#: ui/dialogs/import-dialog.slint:301 msgid "Where to import {}" msgstr "Куда импортировать {}" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stopping…" msgstr "Остановка…" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stop" msgstr "Остановить" -#: ui/dialogs/import-dialog.slint:322 +#: ui/dialogs/import-dialog.slint:328 msgid "Continue in background" msgstr "Продолжить в фоне" -#: ui/dialogs/import-dialog.slint:327 ui/views/files-view.slint:324 +#: ui/dialogs/import-dialog.slint:333 ui/views/files-view.slint:324 msgid "Back" msgstr "Назад" -#: ui/dialogs/import-dialog.slint:332 +#: ui/dialogs/import-dialog.slint:338 msgid "Choose folder…" msgstr "Выбрать папку…" -#: ui/dialogs/import-dialog.slint:345 +#: ui/dialogs/import-dialog.slint:351 msgid "Choose file…" msgstr "Выбрать файл…" -#: ui/dialogs/import-dialog.slint:353 +#: ui/dialogs/import-dialog.slint:359 msgid "Next" msgstr "Далее" -#: ui/dialogs/import-dialog.slint:359 ui/dialogs/import-dialog.slint:368 +#: ui/dialogs/import-dialog.slint:365 ui/dialogs/import-dialog.slint:374 msgid "Import one account" msgid_plural "Import {n} accounts" msgstr[0] "Импортировать {n} учётную запись" msgstr[1] "Импортировать {n} учётные записи" msgstr[2] "Импортировать {n} учётных записей" -#: ui/dialogs/import-dialog.slint:369 ui/dialogs/settings-dialog.slint:2186 +#: ui/dialogs/import-dialog.slint:375 ui/dialogs/settings-dialog.slint:2186 msgid "Import" msgstr "Импорт" -#: ui/dialogs/import-dialog.slint:376 +#: ui/dialogs/import-dialog.slint:382 msgid "Open accounts" msgstr "Открыть учётные записи" -#: ui/dialogs/import-dialog.slint:385 +#: ui/dialogs/import-dialog.slint:391 msgid "Show mail" msgstr "Показать почту" -#: ui/dialogs/import-dialog.slint:468 +#: ui/dialogs/import-dialog.slint:474 msgid "Choose accounts to import" msgstr "Выберите учётные записи для импорта" -#: ui/dialogs/import-dialog.slint:469 +#: ui/dialogs/import-dialog.slint:475 msgid "Choose mail to import" msgstr "Выберите почту для импорта" -#: ui/dialogs/import-dialog.slint:470 ui/dialogs/import-dialog.slint:873 +#: ui/dialogs/import-dialog.slint:476 ui/dialogs/import-dialog.slint:887 msgid "Import stopped" msgstr "Импорт остановлен" -#: ui/dialogs/import-dialog.slint:471 ui/dialogs/import-dialog.slint:874 +#: ui/dialogs/import-dialog.slint:477 ui/dialogs/import-dialog.slint:888 msgid "Import complete" msgstr "Импорт завершён" -#: ui/dialogs/import-dialog.slint:486 +#: ui/dialogs/import-dialog.slint:492 msgid "" "Bring your accounts from Thunderbird, Thunderbird for Android, K-9 Mail, or " "a Flectar Mail backup, and mail from Thunderbird or saved mail files. " @@ -3876,19 +3880,19 @@ msgstr "" "файлов почты. Пароли никогда не импортируются: после импорта вы войдёте в " "каждую учётную запись." -#: ui/dialogs/import-dialog.slint:492 +#: ui/dialogs/import-dialog.slint:498 msgid "Thunderbird on this device" msgstr "Thunderbird на этом устройстве" -#: ui/dialogs/import-dialog.slint:506 +#: ui/dialogs/import-dialog.slint:512 msgid "Import from Thunderbird profile {}" msgstr "Импорт из профиля Thunderbird {}" -#: ui/dialogs/import-dialog.slint:534 +#: ui/dialogs/import-dialog.slint:540 msgid "{} (default profile)" msgstr "{} (профиль по умолчанию)" -#: ui/dialogs/import-dialog.slint:569 +#: ui/dialogs/import-dialog.slint:575 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip), profile folders and prefs.js, Flectar Mail backups (." @@ -3900,7 +3904,7 @@ msgstr "" "Flectar Mail (.json), а также почта, сохранённая в файлах .mbox или .eml, в " "папках maildir или в ZIP-архивах с ними." -#: ui/dialogs/import-dialog.slint:570 +#: ui/dialogs/import-dialog.slint:576 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip) and prefs.js, Flectar Mail backups (.json), and mail " @@ -3910,26 +3914,26 @@ msgstr "" "профиля Thunderbird (.zip) и prefs.js, резервные копии Flectar Mail (.json), " "а также почта, сохранённая в файлах .mbox или .eml или в ZIP-архивах с ними." -#: ui/dialogs/import-dialog.slint:583 +#: ui/dialogs/import-dialog.slint:589 msgid "Looking for accounts and mail…" msgstr "Поиск учётных записей и почты…" -#: ui/dialogs/import-dialog.slint:584 ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:590 ui/dialogs/import-dialog.slint:885 msgid "Importing accounts…" msgstr "Импорт учётных записей…" -#: ui/dialogs/import-dialog.slint:585 ui/dialogs/import-dialog.slint:604 +#: ui/dialogs/import-dialog.slint:591 ui/dialogs/import-dialog.slint:610 msgid "Importing mail…" msgstr "Импорт почты…" -#: ui/dialogs/import-dialog.slint:616 +#: ui/dialogs/import-dialog.slint:622 msgid "One message · {1} of {2}" msgid_plural "{0} messages · {1} of {2}" msgstr[0] "{0} письмо · {1} из {2}" msgstr[1] "{0} письма · {1} из {2}" msgstr[2] "{0} писем · {1} из {2}" -#: ui/dialogs/import-dialog.slint:643 +#: ui/dialogs/import-dialog.slint:649 msgid "" "From Thunderbird for Android or K-9 Mail. Existing accounts are never " "changed." @@ -3937,35 +3941,43 @@ msgstr "" "Из Thunderbird для Android или K-9 Mail. Существующие учётные записи не " "изменяются." -#: ui/dialogs/import-dialog.slint:644 +#: ui/dialogs/import-dialog.slint:650 msgid "From Thunderbird. Existing accounts are never changed." msgstr "Из Thunderbird. Существующие учётные записи не изменяются." -#: ui/dialogs/import-dialog.slint:682 +#: ui/dialogs/import-dialog.slint:688 msgid "Already in Flectar Mail" msgstr "Уже есть в Flectar Mail" -#: ui/dialogs/import-dialog.slint:683 +#: ui/dialogs/import-dialog.slint:689 msgid "Cannot be imported" msgstr "Невозможно импортировать" -#: ui/dialogs/import-dialog.slint:684 +#: ui/dialogs/import-dialog.slint:690 msgid "Sign in with Google after import" msgstr "Войдите через Google после импорта" -#: ui/dialogs/import-dialog.slint:685 +#: ui/dialogs/import-dialog.slint:691 msgid "Sign in with Microsoft after import" msgstr "Войдите через Microsoft после импорта" -#: ui/dialogs/import-dialog.slint:686 +#: ui/dialogs/import-dialog.slint:692 msgid "{} · enter your password after import" msgstr "{} · введите пароль после импорта" -#: ui/dialogs/import-dialog.slint:692 +#: ui/dialogs/import-dialog.slint:698 msgid "Named “{}” in the other app" msgstr "Называется «{}» в другом приложении" -#: ui/dialogs/import-dialog.slint:711 +#: ui/dialogs/import-dialog.slint:718 +msgid "" +"Mail stays on this device unless you choose an account for it. Messages " +"already there are skipped, so an import can be repeated." +msgstr "" +"Почта остаётся на этом устройстве, если не выбрать для неё учётную запись. " +"Письма, которые там уже есть, пропускаются, поэтому импорт можно повторить." + +#: ui/dialogs/import-dialog.slint:719 msgid "" "Imported mail is kept only on this device. Messages already here are " "skipped, so an import can be repeated." @@ -3973,18 +3985,18 @@ msgstr "" "Импортированная почта хранится только на этом устройстве. Письма, которые " "уже есть здесь, пропускаются, поэтому импорт можно повторить." -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "No folders chosen" msgstr "Папки не выбраны" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "One folder chosen, {}" msgid_plural "{n} folders chosen, {}" msgstr[0] "Выбрана {n} папка, {}" msgstr[1] "Выбрано {n} папки, {}" msgstr[2] "Выбрано {n} папок, {}" -#: ui/dialogs/import-dialog.slint:742 +#: ui/dialogs/import-dialog.slint:750 msgid "Imported one account. Sign in to it to start syncing." msgid_plural "Imported {n} accounts. Sign in to each one to start syncing." msgstr[0] "" @@ -3996,11 +4008,11 @@ msgstr[2] "" "Импортировано {n} учётных записей. Войдите в каждую, чтобы начать " "синхронизацию." -#: ui/dialogs/import-dialog.slint:748 +#: ui/dialogs/import-dialog.slint:756 msgid "No accounts were imported." msgstr "Учётные записи не импортированы." -#: ui/dialogs/import-dialog.slint:754 +#: ui/dialogs/import-dialog.slint:762 msgid "One account was already in Flectar Mail and was left unchanged." msgid_plural "" "{n} accounts were already in Flectar Mail and were left unchanged." @@ -4011,57 +4023,64 @@ msgstr[1] "" msgstr[2] "" "{n} учётных записей уже были в Flectar Mail и остались без изменений." -#: ui/dialogs/import-dialog.slint:760 +#: ui/dialogs/import-dialog.slint:768 msgid "" "The theme, language, and other preferences from the backup were applied." msgstr "Тема, язык и другие настройки из резервной копии применены." -#: ui/dialogs/import-dialog.slint:767 +#: ui/dialogs/import-dialog.slint:775 msgid "Imported one message." msgid_plural "Imported {} messages." msgstr[0] "Импортировано {} письмо." msgstr[1] "Импортировано {} письма." msgstr[2] "Импортировано {} писем." -#: ui/dialogs/import-dialog.slint:768 +#: ui/dialogs/import-dialog.slint:776 msgid "No new messages were imported." msgstr "Новые письма не импортированы." -#: ui/dialogs/import-dialog.slint:774 +#: ui/dialogs/import-dialog.slint:782 msgid "One message was already here and was skipped." msgid_plural "{} messages were already here and were skipped." msgstr[0] "{} письмо уже было здесь и пропущено." msgstr[1] "{} письма уже были здесь и пропущены." msgstr[2] "{} писем уже были здесь и пропущены." -#: ui/dialogs/import-dialog.slint:780 +#: ui/dialogs/import-dialog.slint:788 msgid "One message larger than 128 MB was skipped." msgid_plural "{} messages larger than 128 MB were skipped." msgstr[0] "Пропущено {} письмо больше 128 МБ." msgstr[1] "Пропущено {} письма больше 128 МБ." msgstr[2] "Пропущено {} писем больше 128 МБ." -#: ui/dialogs/import-dialog.slint:786 +#: ui/dialogs/import-dialog.slint:794 +msgid "The server refused one message: {1}" +msgid_plural "The server refused {0} messages: {1}" +msgstr[0] "Сервер отклонил {0} письмо: {1}" +msgstr[1] "Сервер отклонил {0} письма: {1}" +msgstr[2] "Сервер отклонил {0} писем: {1}" + +#: ui/dialogs/import-dialog.slint:800 msgid "The import was stopped. Importing the same mail again adds the rest." msgstr "Импорт остановлен. Повторный импорт той же почты добавит остальное." -#: ui/dialogs/import-dialog.slint:798 +#: ui/dialogs/import-dialog.slint:812 msgid "{} could not be imported: {}" msgstr "Не удалось импортировать {}: {}" -#: ui/dialogs/import-dialog.slint:804 +#: ui/dialogs/import-dialog.slint:818 msgid "Some mail in {} could not be read: {}" msgstr "Не удалось прочитать часть почты в {}: {}" -#: ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:885 msgid "Importing mail… {}%" msgstr "Импорт почты… {}%" -#: ui/dialogs/import-dialog.slint:929 +#: ui/dialogs/import-dialog.slint:943 msgid "Show" msgstr "Показать" -#: ui/dialogs/import-dialog.slint:939 ui/views/files-view.slint:696 +#: ui/dialogs/import-dialog.slint:953 ui/views/files-view.slint:696 msgid "Dismiss" msgstr "Убрать" diff --git a/lang/tr/LC_MESSAGES/flectar-mail.po b/lang/tr/LC_MESSAGES/flectar-mail.po index ffb8c5ae..76f8b7db 100644 --- a/lang/tr/LC_MESSAGES/flectar-mail.po +++ b/lang/tr/LC_MESSAGES/flectar-mail.po @@ -906,7 +906,7 @@ msgstr "Flectar Mail hesap yedeğini dışa aktar" msgid "Flectar Mail backup" msgstr "Flectar Mail yedeği" -#: ui/app.slint:358 ui/dialogs/import-dialog.slint:401 +#: ui/app.slint:358 ui/dialogs/import-dialog.slint:407 #: ui/views/onboarding-view.slint:222 msgid "Import accounts and mail" msgstr "" @@ -3427,50 +3427,50 @@ msgstr "Etiket oluştur" msgid "Create folder" msgstr "Klasör oluştur" -#: ui/dialogs/import-dialog.slint:125 +#: ui/dialogs/import-dialog.slint:130 msgid "No valid email address was found." msgstr "Geçerli bir e-posta adresi bulunamadı." -#: ui/dialogs/import-dialog.slint:126 +#: ui/dialogs/import-dialog.slint:131 msgid "No incoming mail server is configured." msgstr "Gelen posta sunucusu yapılandırılmamış." -#: ui/dialogs/import-dialog.slint:127 +#: ui/dialogs/import-dialog.slint:132 msgid "The incoming server {} uses a protocol Flectar Mail does not support." msgstr "" "Gelen posta sunucusu {}, Flectar Mail'in desteklemediği bir protokol " "kullanıyor." -#: ui/dialogs/import-dialog.slint:128 +#: ui/dialogs/import-dialog.slint:133 msgid "No outgoing mail server is configured." msgstr "Giden posta sunucusu yapılandırılmamış." -#: ui/dialogs/import-dialog.slint:129 +#: ui/dialogs/import-dialog.slint:134 msgid "The outgoing server {} uses a protocol Flectar Mail does not support." msgstr "" "Giden posta sunucusu {}, Flectar Mail'in desteklemediği bir protokol " "kullanıyor." -#: ui/dialogs/import-dialog.slint:130 +#: ui/dialogs/import-dialog.slint:135 msgid "" "The incoming server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:131 +#: ui/dialogs/import-dialog.slint:136 msgid "" "The outgoing server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:132 +#: ui/dialogs/import-dialog.slint:137 msgid "" "{} keeps your password off its unencrypted connection, but Flectar Mail " "would send it in the clear. Turn on SSL/TLS or STARTTLS for this server " "first." msgstr "" -#: ui/dialogs/import-dialog.slint:134 +#: ui/dialogs/import-dialog.slint:139 msgid "" "The incoming server connects without signing in, which Flectar Mail does not " "support." @@ -3478,7 +3478,7 @@ msgstr "" "Gelen posta sunucusu oturum açmadan bağlanıyor; Flectar Mail bunu " "desteklemiyor." -#: ui/dialogs/import-dialog.slint:135 +#: ui/dialogs/import-dialog.slint:140 msgid "" "The incoming server signs in with a client certificate, which Flectar Mail " "does not support." @@ -3486,13 +3486,13 @@ msgstr "" "Gelen posta sunucusu bir istemci sertifikasıyla oturum açıyor; Flectar Mail " "bunu desteklemiyor." -#: ui/dialogs/import-dialog.slint:136 +#: ui/dialogs/import-dialog.slint:141 msgid "" "The incoming server signs in with {}, which Flectar Mail does not support." msgstr "" "Gelen posta sunucusu, Flectar Mail'in desteklemediği {} ile oturum açıyor." -#: ui/dialogs/import-dialog.slint:137 +#: ui/dialogs/import-dialog.slint:142 msgid "" "The outgoing server sends mail without signing in, which Flectar Mail does " "not support." @@ -3500,7 +3500,7 @@ msgstr "" "Giden posta sunucusu oturum açmadan posta gönderiyor; Flectar Mail bunu " "desteklemiyor." -#: ui/dialogs/import-dialog.slint:138 +#: ui/dialogs/import-dialog.slint:143 msgid "" "The outgoing server signs in with a client certificate, which Flectar Mail " "does not support." @@ -3508,13 +3508,13 @@ msgstr "" "Giden posta sunucusu bir istemci sertifikasıyla oturum açıyor; Flectar Mail " "bunu desteklemiyor." -#: ui/dialogs/import-dialog.slint:139 +#: ui/dialogs/import-dialog.slint:144 msgid "" "The outgoing server signs in with {}, which Flectar Mail does not support." msgstr "" "Giden posta sunucusu, Flectar Mail'in desteklemediği {} ile oturum açıyor." -#: ui/dialogs/import-dialog.slint:140 +#: ui/dialogs/import-dialog.slint:145 msgid "" "The outgoing server signs in as {}. Flectar Mail uses one sign-in for both " "servers." @@ -3522,33 +3522,33 @@ msgstr "" "Giden posta sunucusu {} olarak oturum açıyor. Flectar Mail her iki sunucu " "için tek bir oturum açma kullanır." -#: ui/dialogs/import-dialog.slint:141 +#: ui/dialogs/import-dialog.slint:146 msgid "The incoming server has no user name." msgstr "Gelen posta sunucusunun kullanıcı adı yok." -#: ui/dialogs/import-dialog.slint:142 +#: ui/dialogs/import-dialog.slint:147 msgid "The server settings for {} are not valid." msgstr "{} için sunucu ayarları geçerli değil." -#: ui/dialogs/import-dialog.slint:143 +#: ui/dialogs/import-dialog.slint:148 msgid "This address appears earlier in the file." msgstr "Bu adres dosyada daha önce geçiyor." -#: ui/dialogs/import-dialog.slint:144 +#: ui/dialogs/import-dialog.slint:149 msgid "" "Your password will be sent over the encrypted connection instead of with " "CRAM-MD5." msgstr "Parolanız CRAM-MD5 yerine şifreli bağlantı üzerinden gönderilecek." -#: ui/dialogs/import-dialog.slint:145 +#: ui/dialogs/import-dialog.slint:150 msgid "You will sign in with Microsoft instead of a password." msgstr "Parola yerine Microsoft ile oturum açacaksınız." -#: ui/dialogs/import-dialog.slint:146 +#: ui/dialogs/import-dialog.slint:151 msgid "You will sign in with Google instead of a password." msgstr "Parola yerine Google ile oturum açacaksınız." -#: ui/dialogs/import-dialog.slint:147 +#: ui/dialogs/import-dialog.slint:152 msgid "" "The account signs in as {}, which is not an email address. Add it with its " "own address instead." @@ -3556,42 +3556,42 @@ msgstr "" "Hesap, bir e-posta adresi olmayan {} olarak oturum açıyor. Bunun yerine " "kendi adresiyle ekleyin." -#: ui/dialogs/import-dialog.slint:148 +#: ui/dialogs/import-dialog.slint:153 msgid "" "Flectar Mail cannot use browser sign-in for {}. Sign in with an app password." msgstr "" "Flectar Mail, {} için tarayıcıyla oturum açmayı kullanamaz. Uygulama " "parolasıyla oturum açın." -#: ui/dialogs/import-dialog.slint:149 +#: ui/dialogs/import-dialog.slint:154 msgid "The provider's standard outgoing server replaces {}." msgstr "Sağlayıcının standart giden posta sunucusu {} sunucusunun yerini alır." -#: ui/dialogs/import-dialog.slint:150 +#: ui/dialogs/import-dialog.slint:155 msgid "This account syncs with {} instead of downloading mail with POP3." msgstr "" -#: ui/dialogs/import-dialog.slint:151 ui/dialogs/settings-dialog.slint:1983 +#: ui/dialogs/import-dialog.slint:156 ui/dialogs/settings-dialog.slint:1983 msgid "Mail is removed from the server once it's on this device." msgstr "" -#: ui/dialogs/import-dialog.slint:152 ui/dialogs/settings-dialog.slint:1982 +#: ui/dialogs/import-dialog.slint:157 ui/dialogs/settings-dialog.slint:1982 msgid "Mail you delete here is removed from the server too." msgstr "" -#: ui/dialogs/import-dialog.slint:153 +#: ui/dialogs/import-dialog.slint:158 msgid "" "Mail is removed from the server {} days after it's downloaded, or once " "deleted here." msgstr "" -#: ui/dialogs/import-dialog.slint:154 +#: ui/dialogs/import-dialog.slint:159 msgid "" "No choice here matches how long the account kept mail on the server, so the " "closest one is used." msgstr "" -#: ui/dialogs/import-dialog.slint:155 +#: ui/dialogs/import-dialog.slint:160 msgid "One other address is managed by Gmail and appears after you sign in." msgid_plural "" "{n} other addresses are managed by Gmail and appear after you sign in." @@ -3602,7 +3602,7 @@ msgstr[1] "" "Diğer {n} adres Gmail tarafından yönetiliyor ve oturum açtıktan sonra " "görünür." -#: ui/dialogs/import-dialog.slint:156 +#: ui/dialogs/import-dialog.slint:161 msgid "" "One sending address was not imported because it is invalid or uses another " "outgoing server." @@ -3616,46 +3616,46 @@ msgstr[1] "" "{n} gönderen adresi geçersiz olduğu veya başka bir giden posta sunucusu " "kullandığı için içe aktarılmadı." -#: ui/dialogs/import-dialog.slint:157 +#: ui/dialogs/import-dialog.slint:162 msgid "A signature stored in a file outside the profile was not imported." msgstr "Profil dışındaki bir dosyada saklanan imza içe aktarılmadı." -#: ui/dialogs/import-dialog.slint:158 +#: ui/dialogs/import-dialog.slint:163 msgid "A signature larger than 32 KB was not imported." msgstr "32 KB'tan büyük bir imza içe aktarılmadı." -#: ui/dialogs/import-dialog.slint:163 +#: ui/dialogs/import-dialog.slint:168 msgid "The file could not be read: {}" msgstr "Dosya okunamadı: {}" -#: ui/dialogs/import-dialog.slint:164 +#: ui/dialogs/import-dialog.slint:169 msgid "The settings file is too large." msgstr "Ayar dosyası çok büyük." -#: ui/dialogs/import-dialog.slint:165 +#: ui/dialogs/import-dialog.slint:170 msgid "" "This is not a supported settings export or mail file. Choose a .k9s file, a " "Thunderbird profile export or prefs.js, a Flectar Mail backup, or mail saved " "as .mbox or .eml files." msgstr "" -#: ui/dialogs/import-dialog.slint:166 +#: ui/dialogs/import-dialog.slint:171 msgid "The file is damaged: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:167 +#: ui/dialogs/import-dialog.slint:172 msgid "This settings format (version {}) is not supported." msgstr "Bu ayar biçimi (sürüm {}) desteklenmiyor." -#: ui/dialogs/import-dialog.slint:168 +#: ui/dialogs/import-dialog.slint:173 msgid "The settings contain no mail accounts." msgstr "Ayarlar hiç e-posta hesabı içermiyor." -#: ui/dialogs/import-dialog.slint:169 +#: ui/dialogs/import-dialog.slint:174 msgid "No mail was found in this folder." msgstr "" -#: ui/dialogs/import-dialog.slint:170 +#: ui/dialogs/import-dialog.slint:175 msgid "" "This folder contains several Thunderbird profiles. Choose the profile folder " "inside it that you want to import." @@ -3663,7 +3663,7 @@ msgstr "" "Bu klasör birden fazla Thunderbird profili içeriyor. İçinden içe aktarmak " "istediğiniz profil klasörünü seçin." -#: ui/dialogs/import-dialog.slint:171 +#: ui/dialogs/import-dialog.slint:176 msgid "" "This folder is not a Thunderbird profile. Choose the folder that contains " "prefs.js." @@ -3671,7 +3671,7 @@ msgstr "" "Bu klasör bir Thunderbird profili değil. prefs.js dosyasını içeren klasörü " "seçin." -#: ui/dialogs/import-dialog.slint:172 +#: ui/dialogs/import-dialog.slint:177 msgid "" "This Thunderbird profile is on a network location. Choose the profile folder " "itself to import it." @@ -3679,152 +3679,156 @@ msgstr "" "Bu Thunderbird profili bir ağ konumunda. İçe aktarmak için doğrudan profil " "klasörünü seçin." -#: ui/dialogs/import-dialog.slint:173 +#: ui/dialogs/import-dialog.slint:178 msgid "The backup could not be restored: {}" msgstr "Yedek geri yüklenemedi: {}" -#: ui/dialogs/import-dialog.slint:174 +#: ui/dialogs/import-dialog.slint:179 msgid "" "The import stopped: {}. The mail imported until then was kept, and importing " "the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:175 +#: ui/dialogs/import-dialog.slint:180 msgid "Import failed: {}" msgstr "İçe aktarma başarısız oldu: {}" -#: ui/dialogs/import-dialog.slint:180 +#: ui/dialogs/import-dialog.slint:185 msgid "Could not import accounts" msgstr "Hesaplar içe aktarılamadı" -#: ui/dialogs/import-dialog.slint:181 +#: ui/dialogs/import-dialog.slint:186 msgid "Could not import all the mail" msgstr "" -#: ui/dialogs/import-dialog.slint:182 +#: ui/dialogs/import-dialog.slint:187 msgid "No mail found" msgstr "" -#: ui/dialogs/import-dialog.slint:183 +#: ui/dialogs/import-dialog.slint:188 msgid "Could not read your selection" msgstr "" -#: ui/dialogs/import-dialog.slint:189 +#: ui/dialogs/import-dialog.slint:193 +msgid "Uploaded to the account’s server, into the folder “{}”" +msgstr "" + +#: ui/dialogs/import-dialog.slint:195 msgid "In the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:191 +#: ui/dialogs/import-dialog.slint:197 msgid "Kept on this device, in the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:192 +#: ui/dialogs/import-dialog.slint:198 msgid "Kept on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:223 +#: ui/dialogs/import-dialog.slint:229 msgid "" "Local Folders kept outside the profile were not found. Choose their folder " "to import them." msgstr "" -#: ui/dialogs/import-dialog.slint:224 +#: ui/dialogs/import-dialog.slint:230 msgid "Local Folders kept outside the profile were not found." msgstr "" -#: ui/dialogs/import-dialog.slint:230 +#: ui/dialogs/import-dialog.slint:236 msgid "Feeds and newsgroups are not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:254 ui/dialogs/import-dialog.slint:667 +#: ui/dialogs/import-dialog.slint:260 ui/dialogs/import-dialog.slint:673 msgid "Import {}" msgstr "{} hesabını içe aktar" -#: ui/dialogs/import-dialog.slint:295 +#: ui/dialogs/import-dialog.slint:301 msgid "Where to import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stopping…" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stop" msgstr "" -#: ui/dialogs/import-dialog.slint:322 +#: ui/dialogs/import-dialog.slint:328 msgid "Continue in background" msgstr "" -#: ui/dialogs/import-dialog.slint:327 ui/views/files-view.slint:324 +#: ui/dialogs/import-dialog.slint:333 ui/views/files-view.slint:324 msgid "Back" msgstr "Geri" -#: ui/dialogs/import-dialog.slint:332 +#: ui/dialogs/import-dialog.slint:338 msgid "Choose folder…" msgstr "Klasör seç…" -#: ui/dialogs/import-dialog.slint:345 +#: ui/dialogs/import-dialog.slint:351 msgid "Choose file…" msgstr "Dosya seç…" -#: ui/dialogs/import-dialog.slint:353 +#: ui/dialogs/import-dialog.slint:359 msgid "Next" msgstr "" -#: ui/dialogs/import-dialog.slint:359 ui/dialogs/import-dialog.slint:368 +#: ui/dialogs/import-dialog.slint:365 ui/dialogs/import-dialog.slint:374 msgid "Import one account" msgid_plural "Import {n} accounts" msgstr[0] "Bir hesabı içe aktar" msgstr[1] "{n} hesabı içe aktar" -#: ui/dialogs/import-dialog.slint:369 ui/dialogs/settings-dialog.slint:2186 +#: ui/dialogs/import-dialog.slint:375 ui/dialogs/settings-dialog.slint:2186 msgid "Import" msgstr "İçe aktar" -#: ui/dialogs/import-dialog.slint:376 +#: ui/dialogs/import-dialog.slint:382 msgid "Open accounts" msgstr "Hesapları aç" -#: ui/dialogs/import-dialog.slint:385 +#: ui/dialogs/import-dialog.slint:391 msgid "Show mail" msgstr "" -#: ui/dialogs/import-dialog.slint:468 +#: ui/dialogs/import-dialog.slint:474 msgid "Choose accounts to import" msgstr "İçe aktarılacak hesapları seçin" -#: ui/dialogs/import-dialog.slint:469 +#: ui/dialogs/import-dialog.slint:475 msgid "Choose mail to import" msgstr "" -#: ui/dialogs/import-dialog.slint:470 ui/dialogs/import-dialog.slint:873 +#: ui/dialogs/import-dialog.slint:476 ui/dialogs/import-dialog.slint:887 msgid "Import stopped" msgstr "" -#: ui/dialogs/import-dialog.slint:471 ui/dialogs/import-dialog.slint:874 +#: ui/dialogs/import-dialog.slint:477 ui/dialogs/import-dialog.slint:888 msgid "Import complete" msgstr "İçe aktarma tamamlandı" -#: ui/dialogs/import-dialog.slint:486 +#: ui/dialogs/import-dialog.slint:492 msgid "" "Bring your accounts from Thunderbird, Thunderbird for Android, K-9 Mail, or " "a Flectar Mail backup, and mail from Thunderbird or saved mail files. " "Passwords are never imported: you sign in to each account afterward." msgstr "" -#: ui/dialogs/import-dialog.slint:492 +#: ui/dialogs/import-dialog.slint:498 msgid "Thunderbird on this device" msgstr "Bu cihazdaki Thunderbird" -#: ui/dialogs/import-dialog.slint:506 +#: ui/dialogs/import-dialog.slint:512 msgid "Import from Thunderbird profile {}" msgstr "{} Thunderbird profilinden içe aktar" -#: ui/dialogs/import-dialog.slint:534 +#: ui/dialogs/import-dialog.slint:540 msgid "{} (default profile)" msgstr "{} (varsayılan profil)" -#: ui/dialogs/import-dialog.slint:569 +#: ui/dialogs/import-dialog.slint:575 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip), profile folders and prefs.js, Flectar Mail backups (." @@ -3832,32 +3836,32 @@ msgid "" "archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:570 +#: ui/dialogs/import-dialog.slint:576 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip) and prefs.js, Flectar Mail backups (.json), and mail " "saved as .mbox or .eml files or in ZIP archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:583 +#: ui/dialogs/import-dialog.slint:589 msgid "Looking for accounts and mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:584 ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:590 ui/dialogs/import-dialog.slint:885 msgid "Importing accounts…" msgstr "Hesaplar içe aktarılıyor…" -#: ui/dialogs/import-dialog.slint:585 ui/dialogs/import-dialog.slint:604 +#: ui/dialogs/import-dialog.slint:591 ui/dialogs/import-dialog.slint:610 msgid "Importing mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:616 +#: ui/dialogs/import-dialog.slint:622 msgid "One message · {1} of {2}" msgid_plural "{0} messages · {1} of {2}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:643 +#: ui/dialogs/import-dialog.slint:649 msgid "" "From Thunderbird for Android or K-9 Mail. Existing accounts are never " "changed." @@ -3865,116 +3869,128 @@ msgstr "" "Android için Thunderbird veya K-9 Mail'den. Mevcut hesaplar asla " "değiştirilmez." -#: ui/dialogs/import-dialog.slint:644 +#: ui/dialogs/import-dialog.slint:650 msgid "From Thunderbird. Existing accounts are never changed." msgstr "Thunderbird'den. Mevcut hesaplar asla değiştirilmez." -#: ui/dialogs/import-dialog.slint:682 +#: ui/dialogs/import-dialog.slint:688 msgid "Already in Flectar Mail" msgstr "Zaten Flectar Mail'de" -#: ui/dialogs/import-dialog.slint:683 +#: ui/dialogs/import-dialog.slint:689 msgid "Cannot be imported" msgstr "İçe aktarılamaz" -#: ui/dialogs/import-dialog.slint:684 +#: ui/dialogs/import-dialog.slint:690 msgid "Sign in with Google after import" msgstr "İçe aktardıktan sonra Google ile oturum açın" -#: ui/dialogs/import-dialog.slint:685 +#: ui/dialogs/import-dialog.slint:691 msgid "Sign in with Microsoft after import" msgstr "İçe aktardıktan sonra Microsoft ile oturum açın" -#: ui/dialogs/import-dialog.slint:686 +#: ui/dialogs/import-dialog.slint:692 msgid "{} · enter your password after import" msgstr "{} · içe aktardıktan sonra parolanızı girin" -#: ui/dialogs/import-dialog.slint:692 +#: ui/dialogs/import-dialog.slint:698 msgid "Named “{}” in the other app" msgstr "Diğer uygulamada adı “{}”" -#: ui/dialogs/import-dialog.slint:711 +#: ui/dialogs/import-dialog.slint:718 +msgid "" +"Mail stays on this device unless you choose an account for it. Messages " +"already there are skipped, so an import can be repeated." +msgstr "" + +#: ui/dialogs/import-dialog.slint:719 msgid "" "Imported mail is kept only on this device. Messages already here are " "skipped, so an import can be repeated." msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "No folders chosen" msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "One folder chosen, {}" msgid_plural "{n} folders chosen, {}" msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:742 +#: ui/dialogs/import-dialog.slint:750 msgid "Imported one account. Sign in to it to start syncing." msgid_plural "Imported {n} accounts. Sign in to each one to start syncing." msgstr[0] "Bir hesap içe aktarıldı. Eşitlemeyi başlatmak için oturum açın." msgstr[1] "" "{n} hesap içe aktarıldı. Eşitlemeyi başlatmak için her birinde oturum açın." -#: ui/dialogs/import-dialog.slint:748 +#: ui/dialogs/import-dialog.slint:756 msgid "No accounts were imported." msgstr "Hiçbir hesap içe aktarılmadı." -#: ui/dialogs/import-dialog.slint:754 +#: ui/dialogs/import-dialog.slint:762 msgid "One account was already in Flectar Mail and was left unchanged." msgid_plural "" "{n} accounts were already in Flectar Mail and were left unchanged." msgstr[0] "Bir hesap zaten Flectar Mail'deydi ve değiştirilmedi." msgstr[1] "{n} hesap zaten Flectar Mail'deydi ve değiştirilmedi." -#: ui/dialogs/import-dialog.slint:760 +#: ui/dialogs/import-dialog.slint:768 msgid "" "The theme, language, and other preferences from the backup were applied." msgstr "Yedekteki tema, dil ve diğer tercihler uygulandı." -#: ui/dialogs/import-dialog.slint:767 +#: ui/dialogs/import-dialog.slint:775 msgid "Imported one message." msgid_plural "Imported {} messages." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:768 +#: ui/dialogs/import-dialog.slint:776 msgid "No new messages were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:774 +#: ui/dialogs/import-dialog.slint:782 msgid "One message was already here and was skipped." msgid_plural "{} messages were already here and were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:780 +#: ui/dialogs/import-dialog.slint:788 msgid "One message larger than 128 MB was skipped." msgid_plural "{} messages larger than 128 MB were skipped." msgstr[0] "" msgstr[1] "" -#: ui/dialogs/import-dialog.slint:786 +#: ui/dialogs/import-dialog.slint:794 +msgid "The server refused one message: {1}" +msgid_plural "The server refused {0} messages: {1}" +msgstr[0] "" +msgstr[1] "" + +#: ui/dialogs/import-dialog.slint:800 msgid "The import was stopped. Importing the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:798 +#: ui/dialogs/import-dialog.slint:812 msgid "{} could not be imported: {}" msgstr "{} içe aktarılamadı: {}" -#: ui/dialogs/import-dialog.slint:804 +#: ui/dialogs/import-dialog.slint:818 msgid "Some mail in {} could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:885 msgid "Importing mail… {}%" msgstr "" -#: ui/dialogs/import-dialog.slint:929 +#: ui/dialogs/import-dialog.slint:943 msgid "Show" msgstr "" -#: ui/dialogs/import-dialog.slint:939 ui/views/files-view.slint:696 +#: ui/dialogs/import-dialog.slint:953 ui/views/files-view.slint:696 msgid "Dismiss" msgstr "Yoksay" diff --git a/lang/zh_Hans/LC_MESSAGES/flectar-mail.po b/lang/zh_Hans/LC_MESSAGES/flectar-mail.po index fe21e7ea..90811fb3 100644 --- a/lang/zh_Hans/LC_MESSAGES/flectar-mail.po +++ b/lang/zh_Hans/LC_MESSAGES/flectar-mail.po @@ -903,7 +903,7 @@ msgstr "导出 Flectar Mail 账户备份" msgid "Flectar Mail backup" msgstr "Flectar Mail 备份" -#: ui/app.slint:358 ui/dialogs/import-dialog.slint:401 +#: ui/app.slint:358 ui/dialogs/import-dialog.slint:407 #: ui/views/onboarding-view.slint:222 msgid "Import accounts and mail" msgstr "" @@ -3400,157 +3400,157 @@ msgstr "创建标签" msgid "Create folder" msgstr "创建文件夹" -#: ui/dialogs/import-dialog.slint:125 +#: ui/dialogs/import-dialog.slint:130 msgid "No valid email address was found." msgstr "未找到有效的电子邮件地址。" -#: ui/dialogs/import-dialog.slint:126 +#: ui/dialogs/import-dialog.slint:131 msgid "No incoming mail server is configured." msgstr "未配置收件服务器。" -#: ui/dialogs/import-dialog.slint:127 +#: ui/dialogs/import-dialog.slint:132 msgid "The incoming server {} uses a protocol Flectar Mail does not support." msgstr "收件服务器 {} 使用了 Flectar Mail 不支持的协议。" -#: ui/dialogs/import-dialog.slint:128 +#: ui/dialogs/import-dialog.slint:133 msgid "No outgoing mail server is configured." msgstr "未配置发件服务器。" -#: ui/dialogs/import-dialog.slint:129 +#: ui/dialogs/import-dialog.slint:134 msgid "The outgoing server {} uses a protocol Flectar Mail does not support." msgstr "发件服务器 {} 使用了 Flectar Mail 不支持的协议。" -#: ui/dialogs/import-dialog.slint:130 +#: ui/dialogs/import-dialog.slint:135 msgid "" "The incoming server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:131 +#: ui/dialogs/import-dialog.slint:136 msgid "" "The outgoing server {} is not encrypted, so your password and mail cross the " "network unprotected." msgstr "" -#: ui/dialogs/import-dialog.slint:132 +#: ui/dialogs/import-dialog.slint:137 msgid "" "{} keeps your password off its unencrypted connection, but Flectar Mail " "would send it in the clear. Turn on SSL/TLS or STARTTLS for this server " "first." msgstr "" -#: ui/dialogs/import-dialog.slint:134 +#: ui/dialogs/import-dialog.slint:139 msgid "" "The incoming server connects without signing in, which Flectar Mail does not " "support." msgstr "收件服务器无需登录即可连接，Flectar Mail 不支持这种方式。" -#: ui/dialogs/import-dialog.slint:135 +#: ui/dialogs/import-dialog.slint:140 msgid "" "The incoming server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "收件服务器使用客户端证书登录，Flectar Mail 不支持该方式。" -#: ui/dialogs/import-dialog.slint:136 +#: ui/dialogs/import-dialog.slint:141 msgid "" "The incoming server signs in with {}, which Flectar Mail does not support." msgstr "收件服务器使用 {} 登录，Flectar Mail 不支持该方式。" -#: ui/dialogs/import-dialog.slint:137 +#: ui/dialogs/import-dialog.slint:142 msgid "" "The outgoing server sends mail without signing in, which Flectar Mail does " "not support." msgstr "发件服务器无需登录即可发送邮件，Flectar Mail 不支持这种方式。" -#: ui/dialogs/import-dialog.slint:138 +#: ui/dialogs/import-dialog.slint:143 msgid "" "The outgoing server signs in with a client certificate, which Flectar Mail " "does not support." msgstr "发件服务器使用客户端证书登录，Flectar Mail 不支持该方式。" -#: ui/dialogs/import-dialog.slint:139 +#: ui/dialogs/import-dialog.slint:144 msgid "" "The outgoing server signs in with {}, which Flectar Mail does not support." msgstr "发件服务器使用 {} 登录，Flectar Mail 不支持该方式。" -#: ui/dialogs/import-dialog.slint:140 +#: ui/dialogs/import-dialog.slint:145 msgid "" "The outgoing server signs in as {}. Flectar Mail uses one sign-in for both " "servers." msgstr "发件服务器以 {} 身份登录。Flectar Mail 对两个服务器使用同一登录信息。" -#: ui/dialogs/import-dialog.slint:141 +#: ui/dialogs/import-dialog.slint:146 msgid "The incoming server has no user name." msgstr "收件服务器没有用户名。" -#: ui/dialogs/import-dialog.slint:142 +#: ui/dialogs/import-dialog.slint:147 msgid "The server settings for {} are not valid." msgstr "{} 的服务器设置无效。" -#: ui/dialogs/import-dialog.slint:143 +#: ui/dialogs/import-dialog.slint:148 msgid "This address appears earlier in the file." msgstr "此地址已在文件中较早出现。" -#: ui/dialogs/import-dialog.slint:144 +#: ui/dialogs/import-dialog.slint:149 msgid "" "Your password will be sent over the encrypted connection instead of with " "CRAM-MD5." msgstr "您的密码将通过加密连接发送，而不是使用 CRAM-MD5。" -#: ui/dialogs/import-dialog.slint:145 +#: ui/dialogs/import-dialog.slint:150 msgid "You will sign in with Microsoft instead of a password." msgstr "您将使用 Microsoft 登录，而不是密码。" -#: ui/dialogs/import-dialog.slint:146 +#: ui/dialogs/import-dialog.slint:151 msgid "You will sign in with Google instead of a password." msgstr "您将使用 Google 登录，而不是密码。" -#: ui/dialogs/import-dialog.slint:147 +#: ui/dialogs/import-dialog.slint:152 msgid "" "The account signs in as {}, which is not an email address. Add it with its " "own address instead." msgstr "该账户以 {} 登录，这不是电子邮件地址。请改用其自身的地址添加。" -#: ui/dialogs/import-dialog.slint:148 +#: ui/dialogs/import-dialog.slint:153 msgid "" "Flectar Mail cannot use browser sign-in for {}. Sign in with an app password." msgstr "Flectar Mail 无法为 {} 使用浏览器登录。请使用应用专用密码登录。" -#: ui/dialogs/import-dialog.slint:149 +#: ui/dialogs/import-dialog.slint:154 msgid "The provider's standard outgoing server replaces {}." msgstr "将使用服务商的标准发件服务器代替 {}。" -#: ui/dialogs/import-dialog.slint:150 +#: ui/dialogs/import-dialog.slint:155 msgid "This account syncs with {} instead of downloading mail with POP3." msgstr "" -#: ui/dialogs/import-dialog.slint:151 ui/dialogs/settings-dialog.slint:1983 +#: ui/dialogs/import-dialog.slint:156 ui/dialogs/settings-dialog.slint:1983 msgid "Mail is removed from the server once it's on this device." msgstr "" -#: ui/dialogs/import-dialog.slint:152 ui/dialogs/settings-dialog.slint:1982 +#: ui/dialogs/import-dialog.slint:157 ui/dialogs/settings-dialog.slint:1982 msgid "Mail you delete here is removed from the server too." msgstr "" -#: ui/dialogs/import-dialog.slint:153 +#: ui/dialogs/import-dialog.slint:158 msgid "" "Mail is removed from the server {} days after it's downloaded, or once " "deleted here." msgstr "" -#: ui/dialogs/import-dialog.slint:154 +#: ui/dialogs/import-dialog.slint:159 msgid "" "No choice here matches how long the account kept mail on the server, so the " "closest one is used." msgstr "" -#: ui/dialogs/import-dialog.slint:155 +#: ui/dialogs/import-dialog.slint:160 msgid "One other address is managed by Gmail and appears after you sign in." msgid_plural "" "{n} other addresses are managed by Gmail and appear after you sign in." msgstr[0] "另有 {n} 个地址由 Gmail 管理，登录后会显示。" -#: ui/dialogs/import-dialog.slint:156 +#: ui/dialogs/import-dialog.slint:161 msgid "" "One sending address was not imported because it is invalid or uses another " "outgoing server." @@ -3559,209 +3559,213 @@ msgid_plural "" "another outgoing server." msgstr[0] "有 {n} 个发件地址未导入，因为它们无效或使用了其他发件服务器。" -#: ui/dialogs/import-dialog.slint:157 +#: ui/dialogs/import-dialog.slint:162 msgid "A signature stored in a file outside the profile was not imported." msgstr "存储在配置文件之外的签名文件未导入。" -#: ui/dialogs/import-dialog.slint:158 +#: ui/dialogs/import-dialog.slint:163 msgid "A signature larger than 32 KB was not imported." msgstr "大于 32 KB 的签名未导入。" -#: ui/dialogs/import-dialog.slint:163 +#: ui/dialogs/import-dialog.slint:168 msgid "The file could not be read: {}" msgstr "无法读取文件：{}" -#: ui/dialogs/import-dialog.slint:164 +#: ui/dialogs/import-dialog.slint:169 msgid "The settings file is too large." msgstr "设置文件过大。" -#: ui/dialogs/import-dialog.slint:165 +#: ui/dialogs/import-dialog.slint:170 msgid "" "This is not a supported settings export or mail file. Choose a .k9s file, a " "Thunderbird profile export or prefs.js, a Flectar Mail backup, or mail saved " "as .mbox or .eml files." msgstr "" -#: ui/dialogs/import-dialog.slint:166 +#: ui/dialogs/import-dialog.slint:171 msgid "The file is damaged: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:167 +#: ui/dialogs/import-dialog.slint:172 msgid "This settings format (version {}) is not supported." msgstr "不支持此设置格式（版本 {}）。" -#: ui/dialogs/import-dialog.slint:168 +#: ui/dialogs/import-dialog.slint:173 msgid "The settings contain no mail accounts." msgstr "设置中不包含邮件账户。" -#: ui/dialogs/import-dialog.slint:169 +#: ui/dialogs/import-dialog.slint:174 msgid "No mail was found in this folder." msgstr "" -#: ui/dialogs/import-dialog.slint:170 +#: ui/dialogs/import-dialog.slint:175 msgid "" "This folder contains several Thunderbird profiles. Choose the profile folder " "inside it that you want to import." msgstr "此文件夹包含多个 Thunderbird 配置文件。请选择其中要导入的配置文件夹。" -#: ui/dialogs/import-dialog.slint:171 +#: ui/dialogs/import-dialog.slint:176 msgid "" "This folder is not a Thunderbird profile. Choose the folder that contains " "prefs.js." msgstr "此文件夹不是 Thunderbird 配置文件。请选择包含 prefs.js 的文件夹。" -#: ui/dialogs/import-dialog.slint:172 +#: ui/dialogs/import-dialog.slint:177 msgid "" "This Thunderbird profile is on a network location. Choose the profile folder " "itself to import it." msgstr "" "此 Thunderbird 配置文件位于网络位置。要导入它，请直接选择该配置文件夹。" -#: ui/dialogs/import-dialog.slint:173 +#: ui/dialogs/import-dialog.slint:178 msgid "The backup could not be restored: {}" msgstr "无法恢复备份：{}" -#: ui/dialogs/import-dialog.slint:174 +#: ui/dialogs/import-dialog.slint:179 msgid "" "The import stopped: {}. The mail imported until then was kept, and importing " "the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:175 +#: ui/dialogs/import-dialog.slint:180 msgid "Import failed: {}" msgstr "导入失败：{}" -#: ui/dialogs/import-dialog.slint:180 +#: ui/dialogs/import-dialog.slint:185 msgid "Could not import accounts" msgstr "无法导入账户" -#: ui/dialogs/import-dialog.slint:181 +#: ui/dialogs/import-dialog.slint:186 msgid "Could not import all the mail" msgstr "" -#: ui/dialogs/import-dialog.slint:182 +#: ui/dialogs/import-dialog.slint:187 msgid "No mail found" msgstr "" -#: ui/dialogs/import-dialog.slint:183 +#: ui/dialogs/import-dialog.slint:188 msgid "Could not read your selection" msgstr "" -#: ui/dialogs/import-dialog.slint:189 +#: ui/dialogs/import-dialog.slint:193 +msgid "Uploaded to the account’s server, into the folder “{}”" +msgstr "" + +#: ui/dialogs/import-dialog.slint:195 msgid "In the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:191 +#: ui/dialogs/import-dialog.slint:197 msgid "Kept on this device, in the folder “{}”" msgstr "" -#: ui/dialogs/import-dialog.slint:192 +#: ui/dialogs/import-dialog.slint:198 msgid "Kept on this device" msgstr "" -#: ui/dialogs/import-dialog.slint:223 +#: ui/dialogs/import-dialog.slint:229 msgid "" "Local Folders kept outside the profile were not found. Choose their folder " "to import them." msgstr "" -#: ui/dialogs/import-dialog.slint:224 +#: ui/dialogs/import-dialog.slint:230 msgid "Local Folders kept outside the profile were not found." msgstr "" -#: ui/dialogs/import-dialog.slint:230 +#: ui/dialogs/import-dialog.slint:236 msgid "Feeds and newsgroups are not imported." msgstr "" -#: ui/dialogs/import-dialog.slint:254 ui/dialogs/import-dialog.slint:667 +#: ui/dialogs/import-dialog.slint:260 ui/dialogs/import-dialog.slint:673 msgid "Import {}" msgstr "导入 {}" -#: ui/dialogs/import-dialog.slint:295 +#: ui/dialogs/import-dialog.slint:301 msgid "Where to import {}" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stopping…" msgstr "" -#: ui/dialogs/import-dialog.slint:316 +#: ui/dialogs/import-dialog.slint:322 msgid "Stop" msgstr "" -#: ui/dialogs/import-dialog.slint:322 +#: ui/dialogs/import-dialog.slint:328 msgid "Continue in background" msgstr "" -#: ui/dialogs/import-dialog.slint:327 ui/views/files-view.slint:324 +#: ui/dialogs/import-dialog.slint:333 ui/views/files-view.slint:324 msgid "Back" msgstr "返回" -#: ui/dialogs/import-dialog.slint:332 +#: ui/dialogs/import-dialog.slint:338 msgid "Choose folder…" msgstr "选择文件夹…" -#: ui/dialogs/import-dialog.slint:345 +#: ui/dialogs/import-dialog.slint:351 msgid "Choose file…" msgstr "选择文件…" -#: ui/dialogs/import-dialog.slint:353 +#: ui/dialogs/import-dialog.slint:359 msgid "Next" msgstr "" -#: ui/dialogs/import-dialog.slint:359 ui/dialogs/import-dialog.slint:368 +#: ui/dialogs/import-dialog.slint:365 ui/dialogs/import-dialog.slint:374 msgid "Import one account" msgid_plural "Import {n} accounts" msgstr[0] "导入 {n} 个账户" -#: ui/dialogs/import-dialog.slint:369 ui/dialogs/settings-dialog.slint:2186 +#: ui/dialogs/import-dialog.slint:375 ui/dialogs/settings-dialog.slint:2186 msgid "Import" msgstr "导入" -#: ui/dialogs/import-dialog.slint:376 +#: ui/dialogs/import-dialog.slint:382 msgid "Open accounts" msgstr "打开账户" -#: ui/dialogs/import-dialog.slint:385 +#: ui/dialogs/import-dialog.slint:391 msgid "Show mail" msgstr "" -#: ui/dialogs/import-dialog.slint:468 +#: ui/dialogs/import-dialog.slint:474 msgid "Choose accounts to import" msgstr "选择要导入的账户" -#: ui/dialogs/import-dialog.slint:469 +#: ui/dialogs/import-dialog.slint:475 msgid "Choose mail to import" msgstr "" -#: ui/dialogs/import-dialog.slint:470 ui/dialogs/import-dialog.slint:873 +#: ui/dialogs/import-dialog.slint:476 ui/dialogs/import-dialog.slint:887 msgid "Import stopped" msgstr "" -#: ui/dialogs/import-dialog.slint:471 ui/dialogs/import-dialog.slint:874 +#: ui/dialogs/import-dialog.slint:477 ui/dialogs/import-dialog.slint:888 msgid "Import complete" msgstr "导入完成" -#: ui/dialogs/import-dialog.slint:486 +#: ui/dialogs/import-dialog.slint:492 msgid "" "Bring your accounts from Thunderbird, Thunderbird for Android, K-9 Mail, or " "a Flectar Mail backup, and mail from Thunderbird or saved mail files. " "Passwords are never imported: you sign in to each account afterward." msgstr "" -#: ui/dialogs/import-dialog.slint:492 +#: ui/dialogs/import-dialog.slint:498 msgid "Thunderbird on this device" msgstr "此设备上的 Thunderbird" -#: ui/dialogs/import-dialog.slint:506 +#: ui/dialogs/import-dialog.slint:512 msgid "Import from Thunderbird profile {}" msgstr "从 Thunderbird 配置文件 {} 导入" -#: ui/dialogs/import-dialog.slint:534 +#: ui/dialogs/import-dialog.slint:540 msgid "{} (default profile)" msgstr "{}（默认配置文件）" -#: ui/dialogs/import-dialog.slint:569 +#: ui/dialogs/import-dialog.slint:575 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip), profile folders and prefs.js, Flectar Mail backups (." @@ -3769,139 +3773,150 @@ msgid "" "archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:570 +#: ui/dialogs/import-dialog.slint:576 msgid "" "Supported: Thunderbird for Android and K-9 Mail settings (.k9s), Thunderbird " "profile exports (.zip) and prefs.js, Flectar Mail backups (.json), and mail " "saved as .mbox or .eml files or in ZIP archives of them." msgstr "" -#: ui/dialogs/import-dialog.slint:583 +#: ui/dialogs/import-dialog.slint:589 msgid "Looking for accounts and mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:584 ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:590 ui/dialogs/import-dialog.slint:885 msgid "Importing accounts…" msgstr "正在导入账户…" -#: ui/dialogs/import-dialog.slint:585 ui/dialogs/import-dialog.slint:604 +#: ui/dialogs/import-dialog.slint:591 ui/dialogs/import-dialog.slint:610 msgid "Importing mail…" msgstr "" -#: ui/dialogs/import-dialog.slint:616 +#: ui/dialogs/import-dialog.slint:622 msgid "One message · {1} of {2}" msgid_plural "{0} messages · {1} of {2}" msgstr[0] "" -#: ui/dialogs/import-dialog.slint:643 +#: ui/dialogs/import-dialog.slint:649 msgid "" "From Thunderbird for Android or K-9 Mail. Existing accounts are never " "changed." msgstr "来自 Android 版 Thunderbird 或 K-9 Mail。现有账户不会被更改。" -#: ui/dialogs/import-dialog.slint:644 +#: ui/dialogs/import-dialog.slint:650 msgid "From Thunderbird. Existing accounts are never changed." msgstr "来自 Thunderbird。现有账户不会被更改。" -#: ui/dialogs/import-dialog.slint:682 +#: ui/dialogs/import-dialog.slint:688 msgid "Already in Flectar Mail" msgstr "已在 Flectar Mail 中" -#: ui/dialogs/import-dialog.slint:683 +#: ui/dialogs/import-dialog.slint:689 msgid "Cannot be imported" msgstr "无法导入" -#: ui/dialogs/import-dialog.slint:684 +#: ui/dialogs/import-dialog.slint:690 msgid "Sign in with Google after import" msgstr "导入后使用 Google 登录" -#: ui/dialogs/import-dialog.slint:685 +#: ui/dialogs/import-dialog.slint:691 msgid "Sign in with Microsoft after import" msgstr "导入后使用 Microsoft 登录" -#: ui/dialogs/import-dialog.slint:686 +#: ui/dialogs/import-dialog.slint:692 msgid "{} · enter your password after import" msgstr "{} · 导入后输入密码" -#: ui/dialogs/import-dialog.slint:692 +#: ui/dialogs/import-dialog.slint:698 msgid "Named “{}” in the other app" msgstr "在另一应用中名为“{}”" -#: ui/dialogs/import-dialog.slint:711 +#: ui/dialogs/import-dialog.slint:718 +msgid "" +"Mail stays on this device unless you choose an account for it. Messages " +"already there are skipped, so an import can be repeated." +msgstr "" + +#: ui/dialogs/import-dialog.slint:719 msgid "" "Imported mail is kept only on this device. Messages already here are " "skipped, so an import can be repeated." msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "No folders chosen" msgstr "" -#: ui/dialogs/import-dialog.slint:731 +#: ui/dialogs/import-dialog.slint:739 msgid "One folder chosen, {}" msgid_plural "{n} folders chosen, {}" msgstr[0] "" -#: ui/dialogs/import-dialog.slint:742 +#: ui/dialogs/import-dialog.slint:750 msgid "Imported one account. Sign in to it to start syncing." msgid_plural "Imported {n} accounts. Sign in to each one to start syncing." msgstr[0] "已导入 {n} 个账户。请登录每个账户以开始同步。" -#: ui/dialogs/import-dialog.slint:748 +#: ui/dialogs/import-dialog.slint:756 msgid "No accounts were imported." msgstr "未导入任何账户。" -#: ui/dialogs/import-dialog.slint:754 +#: ui/dialogs/import-dialog.slint:762 msgid "One account was already in Flectar Mail and was left unchanged." msgid_plural "" "{n} accounts were already in Flectar Mail and were left unchanged." msgstr[0] "有 {n} 个账户已在 Flectar Mail 中，未作更改。" -#: ui/dialogs/import-dialog.slint:760 +#: ui/dialogs/import-dialog.slint:768 msgid "" "The theme, language, and other preferences from the backup were applied." msgstr "已应用备份中的主题、语言和其他偏好设置。" -#: ui/dialogs/import-dialog.slint:767 +#: ui/dialogs/import-dialog.slint:775 msgid "Imported one message." msgid_plural "Imported {} messages." msgstr[0] "" -#: ui/dialogs/import-dialog.slint:768 +#: ui/dialogs/import-dialog.slint:776 msgid "No new messages were imported." msgstr "" -#: ui/dialogs/import-dialog.slint:774 +#: ui/dialogs/import-dialog.slint:782 msgid "One message was already here and was skipped." msgid_plural "{} messages were already here and were skipped." msgstr[0] "" -#: ui/dialogs/import-dialog.slint:780 +#: ui/dialogs/import-dialog.slint:788 msgid "One message larger than 128 MB was skipped." msgid_plural "{} messages larger than 128 MB were skipped." msgstr[0] "" -#: ui/dialogs/import-dialog.slint:786 +#: ui/dialogs/import-dialog.slint:794 +msgid "The server refused one message: {1}" +msgid_plural "The server refused {0} messages: {1}" +msgstr[0] "" + +#: ui/dialogs/import-dialog.slint:800 msgid "The import was stopped. Importing the same mail again adds the rest." msgstr "" -#: ui/dialogs/import-dialog.slint:798 +#: ui/dialogs/import-dialog.slint:812 msgid "{} could not be imported: {}" msgstr "无法导入 {}：{}" -#: ui/dialogs/import-dialog.slint:804 +#: ui/dialogs/import-dialog.slint:818 msgid "Some mail in {} could not be read: {}" msgstr "" -#: ui/dialogs/import-dialog.slint:871 +#: ui/dialogs/import-dialog.slint:885 msgid "Importing mail… {}%" msgstr "" -#: ui/dialogs/import-dialog.slint:929 +#: ui/dialogs/import-dialog.slint:943 msgid "Show" msgstr "" -#: ui/dialogs/import-dialog.slint:939 ui/views/files-view.slint:696 +#: ui/dialogs/import-dialog.slint:953 ui/views/files-view.slint:696 msgid "Dismiss" msgstr "忽略" diff --git a/src/import_controller.rs b/src/import_controller.rs index bec1b443..637c2d4e 100644 --- a/src/import_controller.rs +++ b/src/import_controller.rs @@ -33,8 +33,8 @@ struct ImportSession { source: Option, /// Mail the source keeps, by store, and the folders chosen from it. mail: Vec, - /// Where mail can go: this device, then POP3 accounts by address. - destinations: Vec>, + /// Where mail can go: this device, then accounts. + destinations: Vec>, /// What each mail row shows: a store, or one of its folders. rows: Vec<(usize, Option)>, /// Addresses the source's accounts send from. Mail from them is filed @@ -85,15 +85,44 @@ impl ImportSession { } } +/// An account mail can go into, by address and protocol: one here, or one +/// chosen for import. +#[derive(Debug, Clone, PartialEq)] +struct MailAccount { + email: String, + protocol: MailProtocol, +} + +impl MailAccount { + /// Its mail is on its server, so mail imported into it is uploaded + /// there. A POP3 account's exists only on this device. + fn uploads(&self) -> bool { + self.protocol != MailProtocol::Pop3 + } +} + /// One store of mail, the folders chosen from it, and where it goes. struct MailChoice { store: MailStore, selected: Vec, /// An index into the session's destinations. destination: usize, + /// The folder its mail goes in on an account's server; without one, the + /// folder for messages chosen one by one. + upload_folder: Option, } impl MailChoice { + /// A store of an app's profile, whose mail is named after it on a + /// server. + fn from_profile(store: MailStore) -> Self { + let upload_folder = Some(store.label.clone()); + Self { + upload_folder, + ..Self::new(store) + } + } + fn new(store: MailStore) -> Self { // Mail that was thrown away or was junk is left out unless chosen. let tops = store @@ -120,6 +149,7 @@ impl MailChoice { store, selected, destination: 0, + upload_folder: None, } } @@ -172,9 +202,11 @@ struct MailJob { source: MailSource, folders: Vec, bytes: u64, - destination: Option, + destination: Option, /// The folder the mail goes in on this device, if it goes there. parent: Option, + /// The folder it goes in on an account's server. + upload_folder: Option, } /// How far the whole import is, across stores. @@ -194,6 +226,9 @@ struct MailOutcome { imported: u64, already_present: u64, too_large: u64, + /// Messages a server refused, and why it refused the first. + refused: u64, + refusal: Option, stopped: bool, /// Folders not read to the end, by name, with the reason. unreadable: Vec<(String, String)>, @@ -342,31 +377,32 @@ fn show_review(app: &AppWindow, session: &ImportSession) { ui.set_stage("review".into()); } -/// The POP3 accounts mail can go into: those here, and those chosen for -/// import. Their mail, like local mail, exists only on this device. -fn mail_destinations(session: &ImportSession, accounts: &[Account]) -> Vec> { - let mut destinations: Vec> = vec![None]; - let pop3 = accounts +/// The accounts mail can go into: those here, and the POP3 accounts chosen +/// for import. A POP3 account's mail, like local mail, exists only on this +/// device; mail for another account is uploaded to its server, so it needs +/// one already signed in. +fn mail_destinations(session: &ImportSession, accounts: &[Account]) -> Vec> { + let mut destinations: Vec> = vec![None]; + let here = accounts.iter().map(|account| MailAccount { + email: account.email.clone(), + protocol: account.mail_protocol, + }); + let chosen = session + .plans .iter() - .filter(|account| account.mail_protocol == MailProtocol::Pop3) - .map(|account| account.email.clone()) - .chain( - session - .plans - .iter() - .zip(&session.selected) - .filter(|(_, selected)| **selected) - .filter_map(|(plan, _)| plan.draft.as_ref()) - .filter(|draft| draft.config.mail_protocol == MailProtocol::Pop3) - .map(|draft| draft.config.email.clone()), - ); - for email in pop3 { - if !destinations - .iter() - .flatten() - .any(|known| known.eq_ignore_ascii_case(&email)) - { - destinations.push(Some(email)); + .zip(&session.selected) + .filter(|(_, selected)| **selected) + .filter_map(|(plan, _)| plan.draft.as_ref()) + .filter(|draft| draft.config.mail_protocol == MailProtocol::Pop3) + .map(|draft| MailAccount { + email: draft.config.email.clone(), + protocol: MailProtocol::Pop3, + }); + for account in here.chain(chosen) { + if !destinations.iter().flatten().any(|known| { + known.protocol == account.protocol && known.email.eq_ignore_ascii_case(&account.email) + }) { + destinations.push(Some(account)); } } destinations @@ -376,7 +412,7 @@ fn mail_destinations(session: &ImportSession, accounts: &[Account]) -> Vec], + destinations: &[Option], store: &MailStore, ) -> usize { let Some(email) = store.account.as_ref().and_then(|account| { @@ -393,11 +429,33 @@ fn default_destination( .position(|destination| { destination .as_ref() - .is_some_and(|known| known.eq_ignore_ascii_case(email)) + .is_some_and(|known| !known.uploads() && known.email.eq_ignore_ascii_case(email)) }) .unwrap_or(0) } +/// How the destination menu names a destination: by address, with the +/// protocol where an address has more than one account. +fn destination_name(destinations: &[Option], index: usize, device: &str) -> String { + let Some(account) = &destinations[index] else { + return device.to_owned(); + }; + let shared = destinations.iter().flatten().any(|other| { + other.protocol != account.protocol && other.email.eq_ignore_ascii_case(&account.email) + }); + if !shared { + return account.email.clone(); + } + let protocol = match account.protocol { + MailProtocol::Imap => "IMAP", + MailProtocol::Jmap => "JMAP", + MailProtocol::Gmail => "Gmail", + MailProtocol::Pop3 => "POP3", + MailProtocol::Local => "", + }; + format!("{} ({protocol})", account.email) +} + /// Present the mail step for the accounts chosen before it. fn show_mail(app: &AppWindow, session: &mut ImportSession, accounts: &[Account]) { let destinations = mail_destinations(session, accounts); @@ -421,13 +479,9 @@ fn show_mail(app: &AppWindow, session: &mut ImportSession, accounts: &[Account]) let device = translated(app, &UiMessage::plain("On this device")).to_string(); let ui = app.global::(); ui.set_destinations(ModelRc::new(VecModel::from( - session - .destinations - .iter() - .map(|destination| { - slint::SharedString::from(destination.as_deref().unwrap_or(device.as_str())) - }) - .collect::>(), + (0..session.destinations.len()) + .map(|index| destination_name(&session.destinations, index, &device).into()) + .collect::>(), ))); show_mail_rows(app, session); ui.set_stage("mail".into()); @@ -441,6 +495,11 @@ fn show_mail_rows(app: &AppWindow, session: &mut ImportSession) { let mut chosen_bytes = 0; for (store_index, choice) in session.mail.iter().enumerate() { let (selected, partial) = choice.state(0..choice.folders().len()); + let uploads = session + .destinations + .get(choice.destination) + .and_then(Option::as_ref) + .is_some_and(MailAccount::uploads); rows.push((store_index, None)); models.push(ImportMailRow { is_store: true, @@ -455,6 +514,15 @@ fn show_mail_rows(app: &AppWindow, session: &mut ImportSession) { } else { slint::SharedString::default() }, + upload_folder: if uploads { + choice + .upload_folder + .as_deref() + .unwrap_or(loose.as_str()) + .into() + } else { + slint::SharedString::default() + }, }); for (index, folder) in choice.folders().iter().enumerate() { let (selected, partial) = if !folder.has_messages() { @@ -484,6 +552,7 @@ fn show_mail_rows(app: &AppWindow, session: &mut ImportSession) { partial, destination: 0, folder: slint::SharedString::default(), + upload_folder: slint::SharedString::default(), }); } } @@ -523,6 +592,7 @@ fn mail_jobs(session: &ImportSession) -> Vec { .account .is_some() .then(|| choice.store.label.clone()), + upload_folder: choice.upload_folder.clone(), }) }) .collect() @@ -560,19 +630,26 @@ async fn import_mail( outcome.stopped = true; break; } - let account = job.destination.as_ref().and_then(|email| { + let account = job.destination.as_ref().and_then(|destination| { accounts.iter().find(|account| { - account.mail_protocol == MailProtocol::Pop3 - && account.email.eq_ignore_ascii_case(email) + account.mail_protocol == destination.protocol + && account.email.eq_ignore_ascii_case(&destination.email) }) }); let (destination, parent) = match account { - Some(account) => (Destination::Account(account.id), None), + Some(account) if account.mail_protocol == MailProtocol::Pop3 => { + (Destination::Account(account.id), None) + } + Some(account) => (Destination::Account(account.id), job.upload_folder.clone()), // An account that couldn't be added leaves its mail on this // device, apart from the rest. None => ( Destination::Local, - job.parent.clone().or_else(|| job.destination.clone()), + job.parent.clone().or_else(|| { + job.destination + .as_ref() + .map(|destination| destination.email.clone()) + }), ), }; // How progress names each of the job's folders. @@ -637,6 +714,10 @@ async fn import_mail( outcome.imported += report.imported; outcome.already_present += report.already_present; outcome.too_large += report.too_large; + outcome.refused += report.refused; + if outcome.refusal.is_none() { + outcome.refusal = report.refusal; + } outcome.folders.extend(report.folders); for (path, error) in report.unreadable { let mut name = path.join("/"); @@ -683,6 +764,8 @@ fn show_mail_report(app: &AppWindow, outcome: &MailOutcome) { ui.set_mail_imported(ui_count(outcome.imported)); ui.set_mail_already_present(ui_count(outcome.already_present)); ui.set_mail_too_large(ui_count(outcome.too_large)); + ui.set_mail_refused(ui_count(outcome.refused)); + ui.set_mail_refusal(outcome.refusal.clone().unwrap_or_default().into()); ui.set_mail_stopped(outcome.stopped); ui.set_mail_failures(ModelRc::new(VecModel::from( outcome @@ -726,6 +809,8 @@ fn clear_results(app: &AppWindow) { ui.set_mail_imported(0); ui.set_mail_already_present(0); ui.set_mail_too_large(0); + ui.set_mail_refused(0); + ui.set_mail_refusal(slint::SharedString::default()); ui.set_mail_stopped(false); ui.set_mail_failures(ModelRc::default()); } @@ -906,7 +991,7 @@ pub(super) fn register_import_callbacks( .collect(); session.plans = plans; session.source = Some(source); - session.mail = mail.into_iter().map(MailChoice::new).collect(); + session.mail = mail.into_iter().map(MailChoice::from_profile).collect(); session.own_addresses = own_addresses; if session.plans.is_empty() { let accounts = state.borrow().connected_accounts.clone(); @@ -1509,15 +1594,24 @@ mod tests { account(2, "imap@example.com", MailProtocol::Imap), ]; let mut session = ImportSession { - mail: vec![MailChoice::new(local), MailChoice::new(pop)], + mail: vec![MailChoice::new(local), MailChoice::from_profile(pop)], ..ImportSession::default() }; session.destinations = mail_destinations(&session, &accounts); - // Only a POP3 account keeps its mail on this device alone. + let pop3 = MailAccount { + email: "pop@example.com".into(), + protocol: MailProtocol::Pop3, + }; + let imap = MailAccount { + email: "imap@example.com".into(), + protocol: MailProtocol::Imap, + }; assert_eq!( session.destinations, - [None, Some("pop@example.com".to_owned())] + [None, Some(pop3.clone()), Some(imap.clone())] ); + // Only an IMAP account's mail is uploaded to its server. + assert!(!pop3.uploads() && imap.uploads()); // Without a plan for its account, a store stays on this device. assert_eq!( default_destination(&session, &session.destinations, &session.mail[1].store), @@ -1532,15 +1626,52 @@ mod tests { assert_eq!(jobs[0].bytes, folders[1].size + folders[2].size); assert_eq!(jobs[0].destination, None); assert_eq!(jobs[0].parent, None); + assert_eq!(jobs[0].upload_folder, None); // An account's mail goes in a folder of its own if it stays here. - assert_eq!(jobs[1].destination.as_deref(), Some("pop@example.com")); + assert_eq!(jobs[1].destination, Some(pop3)); assert_eq!(jobs[1].parent.as_deref(), Some("Local Folders")); + // On a server, a profile's mail goes in a folder named after it. + session.mail[1].destination = 2; + let jobs = mail_jobs(&session); + assert_eq!(jobs[1].destination, Some(imap)); + assert_eq!(jobs[1].upload_folder.as_deref(), Some("Local Folders")); // A store with nothing chosen is left out. session.mail[0].selected.fill(false); assert_eq!(mail_jobs(&session).len(), 1); } + #[test] + fn destinations_are_named_by_address() { + let destinations = [ + None, + Some(MailAccount { + email: "ana@example.com".into(), + protocol: MailProtocol::Pop3, + }), + Some(MailAccount { + email: "Ana@example.com".into(), + protocol: MailProtocol::Imap, + }), + Some(MailAccount { + email: "bo@example.com".into(), + protocol: MailProtocol::Jmap, + }), + ]; + let names = (0..destinations.len()) + .map(|index| destination_name(&destinations, index, "On this device")) + .collect::>(); + assert_eq!( + names, + [ + "On this device", + "ana@example.com (POP3)", + "Ana@example.com (IMAP)", + "bo@example.com" + ] + ); + } + #[test] fn mail_without_accounts_is_named_after_what_was_chosen() { assert_eq!( diff --git a/tests/account_import_dialog.rs b/tests/account_import_dialog.rs index 085743b6..55382efd 100644 --- a/tests/account_import_dialog.rs +++ b/tests/account_import_dialog.rs @@ -395,12 +395,29 @@ fn mail_is_chosen_imported_and_reported(ui: &ImportHarness, window: &MinimalSoft state.set_destinations(ModelRc::new(VecModel::from(vec![ slint::SharedString::from("On this device"), slint::SharedString::from("jane@example.com"), + slint::SharedString::from("work@example.com"), ]))); state.set_mail_rows(ModelRc::new(VecModel::from(mail_rows()))); state.set_mail_selected_count(3); state.set_mail_selected_size("3.13 GB".into()); state.set_stage("mail".into()); render(window, 800, 700, "mail-desktop"); + // Mail for an IMAP, JMAP or Gmail account goes to its server. + let uploading = mail_rows() + .into_iter() + .enumerate() + .map(|(index, row)| match index { + 0 => ImportMailRow { + destination: 2, + upload_folder: "Local Folders".into(), + ..row + }, + _ => row, + }) + .collect::>(); + state.set_mail_rows(ModelRc::new(VecModel::from(uploading))); + render(window, 800, 700, "mail-upload-desktop"); + state.set_mail_rows(ModelRc::new(VecModel::from(mail_rows()))); // The first store's checkbox chooses all of its folders. let card_x = (800.0 - 600.0) / 2.0; @@ -477,6 +494,8 @@ fn mail_is_chosen_imported_and_reported(ui: &ImportHarness, window: &MinimalSoft state.set_mail_imported(1234); state.set_mail_already_present(12); state.set_mail_too_large(1); + state.set_mail_refused(2); + state.set_mail_refusal("NO [OVERQUOTA] Mailbox is full".into()); state.set_mail_stopped(true); state.set_mail_failures(ModelRc::new(VecModel::from(vec![ImportFailureRow { email: "Local Folders/Archives/2023".into(), diff --git a/ui/dialogs/import-dialog.slint b/ui/dialogs/import-dialog.slint index c749fc49..904dd750 100644 --- a/ui/dialogs/import-dialog.slint +++ b/ui/dialogs/import-dialog.slint @@ -47,10 +47,12 @@ export struct ImportMailRow { selected: bool, // Some of the folders it covers are chosen, not all. partial: bool, - // Stores: where the mail goes, an index into the destinations, and the - // folder it goes in on this device, if any. + // Stores: where the mail goes, an index into the destinations, the + // folder it goes in on this device, if any, and the folder it goes in on + // the server of the account it is uploaded to, if it is. destination: int, folder: string, + upload-folder: string, } // State of the account import flow. Rust owns the source, plan, and results; @@ -74,7 +76,7 @@ export global AccountImport { // The source has mail, chosen after its accounts. in property has-mail; in property <[ImportMailRow]> mail-rows; - // On this device, then the POP3 accounts mail can go into. + // On this device, then the accounts mail can go into. in property <[string]> destinations; in property mail-selected-count; in property mail-selected-size; @@ -103,6 +105,9 @@ export global AccountImport { in property mail-imported; in property mail-already-present; in property mail-too-large; + // Messages a server refused, and why it refused the first. + in property mail-refused; + in property mail-refusal; in property mail-stopped; in property <[ImportFailureRow]> mail-failures; callback choose-file(); @@ -185,6 +190,7 @@ global ImportText { // Where a store's mail goes, beyond what its destination menu shows. public pure function destination(row: ImportMailRow) -> string { + if row.upload-folder != "" { return @tr("Uploaded to the account’s server, into the folder “{}”", row.upload-folder); } if AccountImport.destinations.length > 1 { return row.destination == 0 && row.folder != "" ? @tr("In the folder “{}”", row.folder) : ""; } @@ -279,7 +285,7 @@ component MailRow inherits Rectangle { vertical-alignment: center; } } - // Mail can go into a POP3 account's folders instead. + // Mail can go into an account instead. if root.entry.is-store && AccountImport.destinations.length > 1 : HorizontalLayout { padding-left: 38px; padding-top: 4px; @@ -708,7 +714,9 @@ export component ImportDialog inherits Rectangle { spacing: 10px; vertical-stretch: 1; Text { - text: @tr("Imported mail is kept only on this device. Messages already here are skipped, so an import can be repeated."); + text: AccountImport.destinations.length > 1 + ? @tr("Mail stays on this device unless you choose an account for it. Messages already there are skipped, so an import can be repeated.") + : @tr("Imported mail is kept only on this device. Messages already here are skipped, so an import can be repeated."); color: AppTheme.secondary; font-size: TypeScale.secondary; wrap: word-wrap; @@ -782,6 +790,12 @@ export component ImportDialog inherits Rectangle { font-size: TypeScale.secondary; wrap: word-wrap; } + if AccountImport.mail-results && AccountImport.mail-refused > 0 : Text { + text: @tr("The server refused one message: {1}" | "The server refused {0} messages: {1}" % AccountImport.mail-refused, Numbers.count(AccountImport.mail-refused), AccountImport.mail-refusal); + color: AppTheme.destructive; + font-size: TypeScale.secondary; + wrap: word-wrap; + } if AccountImport.mail-stopped : Text { text: @tr("The import was stopped. Importing the same mail again adds the rest."); color: AppTheme.secondary;