diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c2de241e9..b1d84f84b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,8 +8,10 @@ on:
push:
branches:
- master
+ - ci-fxes
- maintaina-composerfixed
- FRAMEWORK_6_0
+ - identites-test-branch
pull_request:
branches:
- master
@@ -24,17 +26,24 @@ on:
jobs:
run:
runs-on: ${{ matrix.operating-system }}
+ timeout-minutes: 30
strategy:
matrix:
- operating-system: ['ubuntu-20.04']
- php-versions: ['7.4', '8.0', 'latest']
- phpunit-versions: ['latest', '9.5']
+ include:
+ - operating-system: 'ubuntu-22.04'
+ php-versions: '7.4'
+ phpunit-versions: '9.5'
+ - operating-system: 'ubuntu-22.04'
+ php-versions: '8.0'
+ phpunit-versions: '9.5'
+ # - operating-system: 'ubuntu-22.04'
+ # php-versions: '8.1'
+ # phpunit-versions: '10.1'
steps:
- name: Setup github ssh key
run: mkdir -p ~/.ssh/ && ssh-keyscan -t rsa github.com > ~/.ssh/known_hosts
- name: Checkout
uses: actions/checkout@v2
-
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
@@ -51,4 +60,5 @@ jobs:
COMPOSER_ROOT_VERSION=dev-FRAMEWORK_6_0 composer config minimum-stability dev
COMPOSER_ROOT_VERSION=dev-FRAMEWORK_6_0 composer install
- name: run phpunit
- run: phpunit --bootstrap test/bootstrap.php
+ run: |
+ phpunit --bootstrap test/Imp/bootstrap.php
diff --git a/.gitignore b/.gitignore
index 37c37d465..731f4f1f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,7 @@ run-tests.log
/.phpunit.cache
.phpunit.results.cache
.php-cs-fixer.cache
+
+# secrets
+
+.secrets
diff --git a/composer.json b/composer.json
index 5e9986baf..00067e3eb 100644
--- a/composer.json
+++ b/composer.json
@@ -111,4 +111,4 @@
"horde/horde-installer-plugin": true
}
}
-}
\ No newline at end of file
+}
diff --git a/config/prefs.php b/config/prefs.php
index a339a1de9..0395a5a50 100644
--- a/config/prefs.php
+++ b/config/prefs.php
@@ -10,917 +10,951 @@
// *** Personal Information Preferences ***
-$prefGroups['identities'] = array(
- 'column' => _("General"),
- 'label' => _("Personal Information"),
- 'desc' => _("Change the name, address, and signature that people see when they read and reply to your email."),
- 'members' => array(
+$prefGroups['identities'] = [
+ 'column' => _('General'),
+ 'label' => _('Personal Information'),
+ 'desc' => _('Change the name, address, and signature that people see when they read and reply to your email.'),
+ 'members' => [
'replyto_addr', 'alias_addr', 'tieto_addr', 'bcc_addr', 'signature',
'sig_dashes', 'signature_html_select', 'save_sent_mail',
- 'sent_mail_folder', 'sentmailselect'
- ),
- 'type' => 'identities'
-);
+ 'sent_mail_folder', 'sentmailselect', 'smimeselect', 'privkey', 'pubkey', 'privsignkey', 'privpubkey',
+ ],
+ 'type' => 'identities',
+];
-$_prefs['replyto_addr'] = array(
+$_prefs['replyto_addr'] = [
'value' => '',
'advanced' => true,
'type' => 'text',
- 'desc' => _("Your Reply-to: address: (optional)")
-);
+ 'desc' => _('Your Reply-to: address: (optional)'),
+];
-$_prefs['alias_addr'] = array(
+$_prefs['alias_addr'] = [
'value' => '',
'advanced' => true,
'type' => 'textarea',
- 'desc' => _("Your alias addresses: (optional, enter each address on a new line)")
-);
+ 'desc' => _('Your alias addresses: (optional, enter each address on a new line)'),
+];
-$_prefs['tieto_addr'] = array(
+$_prefs['tieto_addr'] = [
'value' => '',
'advanced' => true,
'type' => 'textarea',
- 'desc' => _("Addresses to explicitly tie to this identity: (optional, enter each address on a new line)")
-);
+ 'desc' => _('Addresses to explicitly tie to this identity: (optional, enter each address on a new line)'),
+];
-$_prefs['bcc_addr'] = array(
+$_prefs['bcc_addr'] = [
'value' => '',
'advanced' => true,
'type' => 'textarea',
- 'desc' => _("Addresses to BCC all messages: (optional, enter each address on a new line)")
-);
+ 'desc' => _('Addresses to BCC all messages: (optional, enter each address on a new line)'),
+];
-$_prefs['signature'] = array(
+$_prefs['signature'] = [
'value' => '',
'type' => 'textarea',
- 'desc' => _("Your signature:")
-);
+ 'desc' => _('Your signature:'),
+];
-$_prefs['sig_dashes'] = array(
+$_prefs['sig_dashes'] = [
'value' => 1,
'type' => 'checkbox',
- 'desc' => _("Precede your text signature with dashes ('-- ')?")
-);
+ 'desc' => _("Precede your text signature with dashes ('-- ')?"),
+];
// User's HTML signature - UI widget
-$_prefs['signature_html_select'] = array(
+$_prefs['signature_html_select'] = [
'type' => 'special',
'handler' => 'IMP_Prefs_Special_HtmlSignature',
- 'requires_nolock' => array('signature_html'),
- 'suppress' => function() {
+ 'requires_nolock' => ['signature_html'],
+ 'suppress' => function () {
return !IMP_Compose::canHtmlCompose();
- }
-);
+ },
+];
// User's HTML signature
-$_prefs['signature_html'] = array(
- 'value' => ''
-);
+$_prefs['signature_html'] = [
+ 'value' => '',
+];
// Show signature on compose screen?
-$_prefs['signature_show_compose'] = array(
+$_prefs['signature_show_compose'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("Show the signature on the compose screen?")
-);
+ 'desc' => _('Show the signature on the compose screen?'),
+];
-$_prefs['save_sent_mail'] = array(
+$_prefs['save_sent_mail'] = [
'value' => 1,
'type' => 'checkbox',
- 'desc' => _("Save sent mail?")
-);
+ 'desc' => _('Save sent mail?'),
+];
// sent mail mailbox
-$_prefs['sent_mail_folder'] = array(
+$_prefs['sent_mail_folder'] = [
// NOTE: Localization of this name for display purposes is done
// automatically. To change the default value based on the backend, see
// the 'special_mboxes' option in config/backends.php.
- 'value' => 'Sent'
-);
+ 'value' => 'Sent',
+];
// sent mail mailbox selection widget.
-$_prefs['sentmailselect'] = array(
+$_prefs['sentmailselect'] = [
'type' => 'special',
'handler' => 'IMP_Prefs_Special_Sentmail',
- 'requires_nolock' => array('sent_mail_folder')
-);
+ 'requires_nolock' => ['sent_mail_folder'],
+];
+
+// Keypars: Load Keypairs from the database in order to encrypt an identity's mails with an identity's keys
+$_prefs['privkey'] = [
+ 'type' => 'special',
+ 'handler' => 'IMP_Prefs_Special_SmimePrivateKey',
+ 'desc' => _('Set your keypair from the database:'),
+];
+$_prefs['pubkey'] = [
+ 'value' => '',
+];
+
+$_prefs['privsignkey'] = [
+ 'value' => '',
+];
+
+$_prefs['pubsignkey'] = [
+ 'value' => '',
+];
+// allows option to chose weather to encrypt with a complete key-managed smime identity or by only using a public key from the addressbook
+$_prefs['smimeselect'] = [
+ 'value' => 0, // default value will choose the adresbook, note: default identity will still be checked
+ 'type' => 'checkbox',
+ 'desc' => _('Check if you would like to use SMIME-keypairs for identities'),
+];
// *** ACL Preferences ***
-$prefGroups['acl'] = array(
- 'column' => _("General"),
- 'label' => _("Share Mailboxes"),
- 'desc' => _("Share your mailboxes with other users."),
- 'members' => array('aclmanagement'),
- 'suppress' => function() {
+$prefGroups['acl'] = [
+ 'column' => _('General'),
+ 'label' => _('Share Mailboxes'),
+ 'desc' => _('Share your mailboxes with other users.'),
+ 'members' => ['aclmanagement'],
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_ACL);
- }
-);
+ },
+];
// ACL preference management screen
-$_prefs['aclmanagement'] = array(
+$_prefs['aclmanagement'] = [
'type' => 'special',
- 'handler' => 'IMP_Prefs_Special_Acl'
-);
+ 'handler' => 'IMP_Prefs_Special_Acl',
+];
// mailbox sharing preferences
-$_prefs['acl'] = array(
+$_prefs['acl'] = [
// set 'locked' => true to disable mailbox sharing
- 'value' => ''
-);
+ 'value' => '',
+];
// *** Remote Accounts Preferences ***
-$prefGroups['remote'] = array(
- 'column' => _("General"),
- 'label' => _("Remote Accounts"),
- 'desc' => _("Configure remote mail accounts to display."),
- 'members' => array('remotemanagement')
-);
+$prefGroups['remote'] = [
+ 'column' => _('General'),
+ 'label' => _('Remote Accounts'),
+ 'desc' => _('Configure remote mail accounts to display.'),
+ 'members' => ['remotemanagement'],
+];
// UI for remote management.
-$_prefs['remotemanagement'] = array(
+$_prefs['remotemanagement'] = [
'type' => 'special',
'handler' => 'IMP_Prefs_Special_Remote',
- 'suppress' => function() {
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_REMOTE);
- }
-);
+ },
+];
// Internal remote accounts storage value
-$_prefs['remote'] = array(
+$_prefs['remote'] = [
// set 'locked' => true to disable remote accounts
// 'value' = serialize(array())
- 'value' => 'a:0:{}'
-);
+ 'value' => 'a:0:{}',
+];
// *** Saved Searches Preferences ***
-$prefGroups['searches'] = array(
- 'column' => _("General"),
- 'label' => _("Saved Searches"),
- 'desc' => _("Manage your saved searches"),
- 'members' => array(
- 'searchesmanagement'
- ),
- 'suppress' => function() {
+$prefGroups['searches'] = [
+ 'column' => _('General'),
+ 'label' => _('Saved Searches'),
+ 'desc' => _('Manage your saved searches'),
+ 'members' => [
+ 'searchesmanagement',
+ ],
+ 'suppress' => function () {
$imap = $GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create();
return (!$imap->access(IMP_Imap::ACCESS_SEARCH) ||
!$imap->access(IMP_Imap::ACCESS_FOLDERS));
- }
-);
+ },
+];
// UI for saved searches management.
-$_prefs['searchesmanagement'] = array(
+$_prefs['searchesmanagement'] = [
'type' => 'special',
- 'handler' => 'IMP_Prefs_Special_Searches'
-);
+ 'handler' => 'IMP_Prefs_Special_Searches',
+];
-$_prefs['vfolder'] = array(
+$_prefs['vfolder'] = [
// By default, Virtual Inbox is enabled and Virtual Trash is disabled.
// 'value' => serialize(array())
- 'value' => 'a:0:{}'
-);
+ 'value' => 'a:0:{}',
+];
-$_prefs['filter'] = array(
+$_prefs['filter'] = [
// By default, all filters are enabled.
// 'value' => serialize(array())
- 'value' => 'a:0:{}'
-);
+ 'value' => 'a:0:{}',
+];
// *** Filter Preferences ***
-$prefGroups['filters'] = array(
- 'column' => _("General"),
- 'label' => _("Filters"),
- 'desc' => _("Create filtering rules to organize your incoming mail, sort it into mailboxes, and delete spam."),
- 'members' => array(
+$prefGroups['filters'] = [
+ 'column' => _('General'),
+ 'label' => _('Filters'),
+ 'desc' => _('Create filtering rules to organize your incoming mail, sort it into mailboxes, and delete spam.'),
+ 'members' => [
'filters_link', 'filters_blacklist_link', 'filters_whitelist_link',
- 'filter_on_login', 'filter_on_display', 'filter_any_mailbox'
- )
-);
+ 'filter_on_login', 'filter_on_display', 'filter_any_mailbox',
+ ],
+];
-$_prefs['filters_link'] = array(
+$_prefs['filters_link'] = [
'type' => 'link',
'img' => 'filters.png',
- 'desc' => _("Edit your Filter Rules"),
+ 'desc' => _('Edit your Filter Rules'),
'help' => 'filter-edit-rules',
- 'suppress' => function() {
+ 'suppress' => function () {
try {
$GLOBALS['registry']->link('mail/showFilters');
return false;
- } catch (Horde_Exception $e) {}
+ } catch (Horde_Exception $e) {
+ }
return true;
},
- 'on_init' => function($ui) {
+ 'on_init' => function ($ui) {
$ui->prefs['filters_link']['url'] = $GLOBALS['registry']->link('mail/showFilters');
- }
-);
+ },
+];
-$_prefs['filters_blacklist_link'] = array(
+$_prefs['filters_blacklist_link'] = [
'type' => 'link',
'url' => '',
'img' => 'filters.png',
- 'desc' => _("Edit your Blacklist"),
+ 'desc' => _('Edit your Blacklist'),
'help' => 'filter-edit-blacklist',
- 'suppress' => function() {
+ 'suppress' => function () {
try {
$GLOBALS['registry']->link('mail/showBlacklist');
return false;
- } catch (Horde_Exception $e) {}
+ } catch (Horde_Exception $e) {
+ }
return true;
},
- 'on_init' => function($ui) {
+ 'on_init' => function ($ui) {
$ui->prefs['filters_blacklist_link']['url'] = $GLOBALS['registry']->link('mail/showBlacklist');
- }
-);
+ },
+];
-$_prefs['filters_whitelist_link'] = array(
+$_prefs['filters_whitelist_link'] = [
'type' => 'link',
'url' => '',
'img' => 'filters.png',
- 'desc' => _("Edit your Whitelist"),
+ 'desc' => _('Edit your Whitelist'),
'help' => 'filter-edit-whitelist',
- 'suppress' => function() {
+ 'suppress' => function () {
try {
$GLOBALS['registry']->link('mail/showWhitelist');
return false;
- } catch (Horde_Exception $e) {}
+ } catch (Horde_Exception $e) {
+ }
return true;
},
- 'on_init' => function($ui) {
+ 'on_init' => function ($ui) {
$ui->prefs['filters_whitelist_link']['url'] = $GLOBALS['registry']->link('mail/showWhitelist');
- }
-);
+ },
+];
-$_prefs['filter_on_login'] = array(
+$_prefs['filter_on_login'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("Apply filter rules upon logging on?"),
+ 'desc' => _('Apply filter rules upon logging on?'),
'help' => 'filter-on-login',
- 'suppress' => function() {
+ 'suppress' => function () {
return !IMP_Filter::canApplyFilters();
- }
-);
+ },
+];
-$_prefs['filter_on_display'] = array(
+$_prefs['filter_on_display'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("Apply filter rules whenever Inbox is displayed?"),
+ 'desc' => _('Apply filter rules whenever Inbox is displayed?'),
'help' => 'filter-on-display',
- 'suppress' => function() {
+ 'suppress' => function () {
return !IMP_Filter::canApplyFilters();
- }
-);
+ },
+];
-$_prefs['filter_any_mailbox'] = array(
+$_prefs['filter_any_mailbox'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("Allow filter rules to be applied in any mailbox?"),
+ 'desc' => _('Allow filter rules to be applied in any mailbox?'),
'help' => 'filter-any-mailbox',
- 'suppress' => function() {
+ 'suppress' => function () {
return !IMP_Filter::canApplyFilters();
- }
-);
+ },
+];
// *** Event Request Preferences ***
-$prefGroups['events'] = array(
- 'column' => _("General"),
- 'label' => _("Event Requests"),
- 'desc' => _("Configure how event or meeting requests should be handled."),
- 'members' => array('conflict_interval')
-);
+$prefGroups['events'] = [
+ 'column' => _('General'),
+ 'label' => _('Event Requests'),
+ 'desc' => _('Configure how event or meeting requests should be handled.'),
+ 'members' => ['conflict_interval'],
+];
-$_prefs['conflict_interval'] = array(
+$_prefs['conflict_interval'] = [
'value' => 30,
'type' => 'number',
- 'desc' => _("Minutes needed to consider a event as non-conflicting in iTip")
-);
+ 'desc' => _('Minutes needed to consider a event as non-conflicting in iTip'),
+];
// *** PGP Preferences ***
-$prefGroups['pgp'] = array(
- 'column' => _("General"),
- 'label' => _("PGP"),
- 'desc' => _("Configure PGP encryption support."),
- 'members' => array(
- 'pgpmanagement'
- ),
- 'suppress' => function() {
+$prefGroups['pgp'] = [
+ 'column' => _('General'),
+ 'label' => _('PGP'),
+ 'desc' => _('Configure PGP encryption support.'),
+ 'members' => [
+ 'pgpmanagement',
+ ],
+ 'suppress' => function () {
return !isset($GLOBALS['conf']['gnupg']['path']);
- }
-);
+ },
+];
// These preferences MUST appear on the same page.
-$_prefs['pgpmanagement'] = array(
- 'value' => array(
+$_prefs['pgpmanagement'] = [
+ 'value' => [
'use_pgp', 'use_pgp_text', 'pgp_attach_pubkey', 'pgp_verify',
- 'pgp_reply_pubkey', 'pgppublickey', 'pgpprivatekey'
- ),
- 'type' => 'container'
-);
+ 'pgp_reply_pubkey', 'pgppublickey', 'pgpprivatekey',
+ ],
+ 'type' => 'container',
+];
-$_prefs['use_pgp'] = array(
+$_prefs['use_pgp'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("Enable PGP functionality?"),
- 'help' => 'pgp-overview'
-);
+ 'desc' => _('Enable PGP functionality?'),
+ 'help' => 'pgp-overview',
+];
-$_prefs['use_pgp_text'] = array(
- 'value' => '
' . _("PGP support requires popup windows to be used. If your browser is currently set to disable popup windows, you must change this setting or else the PGP features will not work correctly.") . '
',
+$_prefs['use_pgp_text'] = [
+ 'value' => '
' . _('PGP support requires popup windows to be used. If your browser is currently set to disable popup windows, you must change this setting or else the PGP features will not work correctly.') . '
' . _("S/MIME support requires popup windows to be used. If your browser is currently set to disable popup windows, you must change this setting or else the S/MIME features will not work correctly.") . '
',
+$_prefs['use_smime_text'] = [
+ 'value' => '
' . _('S/MIME support requires popup windows to be used. If your browser is currently set to disable popup windows, you must change this setting or else the S/MIME features will not work correctly.') . '
',
'type' => 'rawhtml',
- 'requires' => array('use_smime')
-);
+ 'requires' => ['use_smime'],
+];
-$_prefs['smime_verify'] = array(
+$_prefs['smime_verify'] = [
'value' => 1,
'type' => 'checkbox',
- 'desc' => _("Should S/MIME signed messages be automatically verified when viewed?"),
+ 'desc' => _('Should S/MIME signed messages be automatically verified when viewed?'),
'help' => 'smime-option-verify',
- 'requires' => array('use_smime')
-);
+ 'requires' => ['use_smime'],
+];
+
+// S/MIME identity management widget
+$_prefs['smimeidentity'] = [
+ 'type' => 'special',
+ 'handler' => 'IMP_Prefs_Special_SmimeIdentities',
+ 'requires' => ['use_smime'],
+];
// S/MIME public keys management widget
-$_prefs['smimepublickey'] = array(
+$_prefs['smimepublickey'] = [
'type' => 'special',
'handler' => 'IMP_Prefs_Special_SmimePublicKey',
- 'requires' => array('use_smime')
-);
+ 'requires' => ['use_smime'],
+];
// S/MIME personal key management widget
-$_prefs['smimeprivatekey'] = array(
+$_prefs['smimeprivatekey'] = [
'type' => 'special',
'handler' => 'IMP_Prefs_Special_SmimePrivateKey',
- 'requires' => array('use_smime')
-);
+ 'requires' => ['use_smime'],
+];
-$_prefs['smime_public_key'] = array(
- 'value' => ''
-);
+$_prefs['smime_public_key'] = [
+ 'value' => '',
+];
-$_prefs['smime_public_sign_key'] = array(
- 'value' => ''
-);
+$_prefs['smime_public_sign_key'] = [
+ 'value' => '',
+];
-$_prefs['smime_private_key'] = array(
- 'value' => ''
-);
+$_prefs['smime_private_key'] = [
+ 'value' => '',
+];
-$_prefs['smime_private_sign_key'] = array(
- 'value' => ''
-);
+$_prefs['smime_private_sign_key'] = [
+ 'value' => '',
+];
-$_prefs['smime_additional_cert'] = array(
- 'value' => ''
-);
+$_prefs['smime_additional_cert'] = [
+ 'value' => '',
+];
-$_prefs['smime_additional_sign_cert'] = array(
- 'value' => ''
-);
+$_prefs['smime_additional_sign_cert'] = [
+ 'value' => '',
+];
// *** Compose Preferences ***
-$prefGroups['compose'] = array(
- 'column' => _("Compose"),
- 'label' => _("Composition"),
- 'desc' => _("Configure how you send mail."),
- 'members' => array(
+$prefGroups['compose'] = [
+ 'column' => _('Compose'),
+ 'label' => _('Composition'),
+ 'desc' => _('Configure how you send mail.'),
+ 'members' => [
'mailto_handler', 'compose_spellcheck', 'set_priority',
'compose_html', 'compose_html_font_family', 'compose_html_font_size',
'compose_cursor', 'signature_show_compose', 'encryptselect',
- 'delete_attachments_monthly_keep', 'request_mdn', 'reply_lang'
- )
-);
+ 'delete_attachments_monthly_keep', 'request_mdn', 'reply_lang',
+ ],
+];
// Link to register a mailto: handler with the browser
-$_prefs['mailto_handler'] = array(
+$_prefs['mailto_handler'] = [
'type' => 'special',
- 'handler' => 'IMP_Prefs_Special_Mailto'
-);
+ 'handler' => 'IMP_Prefs_Special_Mailto',
+];
-$_prefs['compose_spellcheck'] = array(
+$_prefs['compose_spellcheck'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("Check spelling before sending a message?")
-);
+ 'desc' => _('Check spelling before sending a message?'),
+];
-$_prefs['set_priority'] = array(
+$_prefs['set_priority'] = [
'value' => 1,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("Set a priority header when composing messages?")
-);
+ 'desc' => _('Set a priority header when composing messages?'),
+];
-$_prefs['compose_html'] = array(
+$_prefs['compose_html'] = [
'value' => 0,
'type' => 'enum',
- 'enum' => array(
- 0 => _("Plain Text"),
- 1 => _("Rich Text (HTML)")
- ),
- 'desc' => _("Default method to compose messages:")
-);
+ 'enum' => [
+ 0 => _('Plain Text'),
+ 1 => _('Rich Text (HTML)'),
+ ],
+ 'desc' => _('Default method to compose messages:'),
+];
// For the HTML editor, this is the default font family.
// This needs to be in CSS-parseable format.
-$_prefs['compose_html_font_family'] = array(
+$_prefs['compose_html_font_family'] = [
'value' => 'Arial',
'advanced' => true,
'locked' => true,
'type' => 'string',
- 'desc' => _("The default font family to use in the HTML editor."),
- 'requires' => array('compose_html')
-);
+ 'desc' => _('The default font family to use in the HTML editor.'),
+ 'requires' => ['compose_html'],
+];
-$_prefs['compose_html_font_size'] = array(
+$_prefs['compose_html_font_size'] = [
'value' => 14,
'advanced' => true,
'locked' => true,
'type' => 'number',
- 'desc' => _("The default font size to use in the HTML editor (in pixels)."),
- 'requires' => array('compose_html')
-);
+ 'desc' => _('The default font size to use in the HTML editor (in pixels).'),
+ 'requires' => ['compose_html'],
+];
-$_prefs['compose_cursor'] = array(
+$_prefs['compose_cursor'] = [
'value' => 'top',
'type' => 'enum',
- 'enum' => array(
- 'top' => _("Top"),
- 'bottom' => _("Bottom")
- ),
- 'desc' => _("Where should the cursor be located in the compose text area by default?")
-);
+ 'enum' => [
+ 'top' => _('Top'),
+ 'bottom' => _('Bottom'),
+ ],
+ 'desc' => _('Where should the cursor be located in the compose text area by default?'),
+];
// Select widget for the 'default_encrypt' preference
-$_prefs['encryptselect'] = array(
+$_prefs['encryptselect'] = [
'type' => 'special',
'handler' => 'IMP_Prefs_Special_Encrypt',
- 'requires_nolock' => array('default_encrypt')
-);
+ 'requires_nolock' => ['default_encrypt'],
+];
// The default encryption method to use when sending messages
-$_prefs['default_encrypt'] = array(
- 'value' => IMP::ENCRYPT_NONE
-);
+$_prefs['default_encrypt'] = [
+ 'value' => IMP::ENCRYPT_NONE,
+];
-$_prefs['delete_attachments_monthly_keep'] = array(
+$_prefs['delete_attachments_monthly_keep'] = [
'value' => 6,
'advanced' => true,
'type' => 'number',
'zero' => true,
- 'desc' => _("Delete linked attachments after this many months (0 to never delete):"),
+ 'desc' => _('Delete linked attachments after this many months (0 to never delete):'),
'help' => 'prefs-delete_attachments_monthly_keep',
- 'suppress' => function() {
+ 'suppress' => function () {
return empty($GLOBALS['conf']['compose']['link_attachments']);
- }
-);
+ },
+];
-$_prefs['request_mdn'] = array(
+$_prefs['request_mdn'] = [
'value' => 'never',
'advanced' => true,
'type' => 'enum',
- 'enum' => array(
- 'never' => _("No"),
- 'always' => _("Yes")
- ),
- 'desc' => _("Request read receipts?"),
- 'help' => 'prefs-request_mdn'
-);
-
-$_prefs['reply_lang'] = array(
+ 'enum' => [
+ 'never' => _('No'),
+ 'always' => _('Yes'),
+ ],
+ 'desc' => _('Request read receipts?'),
+ 'help' => 'prefs-request_mdn',
+];
+
+$_prefs['reply_lang'] = [
// 'value' => serialize(array())
'value' => 'a:0:{}',
'advanced' => true,
'type' => 'multienum',
- 'enum' => array(),
- 'desc' => _("What language(s) do you prefer replies to your messages to be in? (Hold down the CTRL key when clicking to add multiple languages)"),
- 'on_init' => function($ui) {
+ 'enum' => [],
+ 'desc' => _('What language(s) do you prefer replies to your messages to be in? (Hold down the CTRL key when clicking to add multiple languages)'),
+ 'on_init' => function ($ui) {
$enum = Horde_Nls::getLanguageISO();
asort($enum);
$ui->prefs['reply_lang']['enum'] = $enum;
},
-);
+];
// The list of buttons to show in CKeditor
// See http://docs.cksource.com/CKEditor_3.x/Developers_Guide/Toolbar for
// details on configuration
-$_prefs['ckeditor_buttons'] = array(
+$_prefs['ckeditor_buttons'] = [
'value' => "[['Bold','Italic','Underline'],['Font','FontSize'],['TextColor','BGColor'],['Cut','Copy','Paste'],['Undo','Redo'],['NumberedList','BulletedList'],['Link','Unlink'],['Image','Table','Smiley','SpecialChar']]",
// Very basic set of buttons:
// 'value' => "['Bold','Italic','-','NumberedList','BulletedList','-','Link','Unlink']",
// More advanced set of buttons (default for IMP < 6.2):
// 'value' => "[['Source','Maximize','-','Templates'],['Cut','Copy','Paste'],['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],'/',['NumberedList','BulletedList','-','Outdent','Indent','Blockquote'],['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],['Link','Unlink'],['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar'],'/',['Styles','Format','Font','FontSize'],['Bold','Italic','Underline','Strike','-','Subscript','Superscript'],['TextColor','BGColor']]",
-);
+];
-$_prefs['signature_expanded'] = array(
+$_prefs['signature_expanded'] = [
'value' => 0,
'type' => 'implicit',
-);
+];
// *** Compose Templates Preferences ***
-$prefGroups['composetemplates'] = array(
- 'column' => _("Compose"),
- 'label' => _("Compose Templates"),
- 'desc' => _("Edit compose templates."),
- 'members' => array('composetemplates_management', 'composetemplates_new'),
- 'suppress' => function() {
+$prefGroups['composetemplates'] = [
+ 'column' => _('Compose'),
+ 'label' => _('Compose Templates'),
+ 'desc' => _('Edit compose templates.'),
+ 'members' => ['composetemplates_management', 'composetemplates_new'],
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->isImap();
- }
-);
+ },
+];
// Compose templates configuration widget
-$_prefs['composetemplates_management'] = array(
+$_prefs['composetemplates_management'] = [
'type' => 'special',
- 'handler' => 'IMP_Prefs_Special_ComposeTemplates'
-);
+ 'handler' => 'IMP_Prefs_Special_ComposeTemplates',
+];
// Link to compose templates mailbox.
-$_prefs['composetemplates_new'] = array(
+$_prefs['composetemplates_new'] = [
'type' => 'link',
'xurl' => '',
'img' => 'edit.png',
- 'desc' => _("Create new Template"),
- 'suppress' => function() {
+ 'desc' => _('Create new Template'),
+ 'suppress' => function () {
return !IMP_Mailbox::getPref('composetemplates_mbox');
},
- 'on_init' => function($ui) {
+ 'on_init' => function ($ui) {
$clink = new IMP_Compose_Link();
- $ui->prefs['composetemplates_new']['xurl'] = $clink->link()->add(array(
+ $ui->prefs['composetemplates_new']['xurl'] = $clink->link()->add([
'actionID' => 'template_new',
- 'type' => 'template_new'
- ));
- }
-);
+ 'type' => 'template_new',
+ ]);
+ },
+];
// Compose templates mailbox
-$_prefs['composetemplates_mbox'] = array(
+$_prefs['composetemplates_mbox'] = [
// NOTE: Localization of this name for display purposes is done
// automatically. To change the default value based on the backend, see
// the 'special_mboxes' option in config/backends.php.
- 'value' => 'Templates'
-);
+ 'value' => 'Templates',
+];
// *** Compose Reply Preferences ***
-$prefGroups['reply'] = array(
- 'column' => _("Compose"),
- 'label' => _("Replies"),
- 'desc' => _("Configure how you reply to mail."),
- 'members' => array(
+$prefGroups['reply'] = [
+ 'column' => _('Compose'),
+ 'label' => _('Replies'),
+ 'desc' => _('Configure how you reply to mail.'),
+ 'members' => [
'reply_format', 'reply_charset', 'reply_headers', 'reply_quote',
- 'attrib_text', 'reply_strip_sig'
- )
-);
+ 'attrib_text', 'reply_strip_sig',
+ ],
+];
-$_prefs['reply_format'] = array(
+$_prefs['reply_format'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("When replying, use the same format as the original message?")
-);
+ 'desc' => _('When replying, use the same format as the original message?'),
+];
-$_prefs['reply_charset'] = array(
- 'desc' => _("Use the charset of the original message when replying?"),
+$_prefs['reply_charset'] = [
+ 'desc' => _('Use the charset of the original message when replying?'),
'advanced' => true,
'value' => 0,
- 'type' => 'checkbox'
-);
+ 'type' => 'checkbox',
+];
-$_prefs['reply_headers'] = array(
+$_prefs['reply_headers'] = [
'desc' => _("Include a brief summary of the original message's header in a reply?"),
'value' => 0,
- 'type' => 'checkbox'
-);
+ 'type' => 'checkbox',
+];
-$_prefs['reply_quote'] = array(
+$_prefs['reply_quote'] = [
'value' => 1,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("Include original message in a reply?")
-);
+ 'desc' => _('Include original message in a reply?'),
+];
-$_prefs['attrib_text'] = array(
- 'value' => _("Quoting %f:"),
+$_prefs['attrib_text'] = [
+ 'value' => _('Quoting %f:'),
'advanced' => true,
'type' => 'text',
- 'desc' => _("How to attribute quoted lines in a reply?"),
+ 'desc' => _('How to attribute quoted lines in a reply?'),
'help' => 'prefs-attrib_text',
- 'requires' => array('reply_quote')
-);
+ 'requires' => ['reply_quote'],
+];
-$_prefs['reply_strip_sig'] = array(
+$_prefs['reply_strip_sig'] = [
'desc' => _("Strip the sender's signature from plaintext replies?"),
'advanced' => true,
'value' => 0,
'type' => 'checkbox',
- 'requires' => array('reply_quote')
-);
+ 'requires' => ['reply_quote'],
+];
// *** Compose Forward Preferences ***
-$prefGroups['forward'] = array(
- 'column' => _("Compose"),
- 'label' => _("Forwards"),
- 'desc' => _("Configure how you forward mail."),
- 'members' => array('forward_default', 'forward_format')
-);
+$prefGroups['forward'] = [
+ 'column' => _('Compose'),
+ 'label' => _('Forwards'),
+ 'desc' => _('Configure how you forward mail.'),
+ 'members' => ['forward_default', 'forward_format'],
+];
-$_prefs['forward_default'] = array(
+$_prefs['forward_default'] = [
'value' => 'attach',
'advanced' => true,
// If this preference is locked, the user will not be able to select the
// forward method.
// 'locked' => true,
'type' => 'enum',
- 'enum' => array(
- 'attach' => _("As attachment"),
- 'body' => _("In the body text"),
- 'both' => _("As both body text and an attachment"),
- 'editasnew' => _("Edit as New")
- ),
- 'desc' => _("How should messages be forwarded by default?")
-);
-
-$_prefs['forward_format'] = array(
+ 'enum' => [
+ 'attach' => _('As attachment'),
+ 'body' => _('In the body text'),
+ 'both' => _('As both body text and an attachment'),
+ 'editasnew' => _('Edit as New'),
+ ],
+ 'desc' => _('How should messages be forwarded by default?'),
+];
+
+$_prefs['forward_format'] = [
'value' => 0,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("When forwarding a message in the body text, should the same format as the original message be used?")
-);
+ 'desc' => _('When forwarding a message in the body text, should the same format as the original message be used?'),
+];
// *** Drafts Preferences ***
-$prefGroups['drafts'] = array(
- 'column' => _("Compose"),
- 'label' => _("Drafts"),
- 'desc' => _("Manage message drafts."),
- 'members' => array(
- 'draftsselect', 'close_draft', 'unseen_drafts', 'auto_save_drafts'
- )
-);
+$prefGroups['drafts'] = [
+ 'column' => _('Compose'),
+ 'label' => _('Drafts'),
+ 'desc' => _('Manage message drafts.'),
+ 'members' => [
+ 'draftsselect', 'close_draft', 'unseen_drafts', 'auto_save_drafts',
+ ],
+];
// drafts mailbox selection widget.
-$_prefs['draftsselect'] = array(
+$_prefs['draftsselect'] = [
'type' => 'special',
'handler' => 'IMP_Prefs_Special_Drafts',
- 'requires_nolock' => array('drafts_folder')
-);
+ 'requires_nolock' => ['drafts_folder'],
+];
// drafts mailbox
-$_prefs['drafts_folder'] = array(
+$_prefs['drafts_folder'] = [
// NOTE: Localization of this name for display purposes is done
// automatically. To change the default value based on the backend, see
// the 'special_mboxes' option in config/backends.php.
- 'value' => 'Drafts'
-);
+ 'value' => 'Drafts',
+];
-$_prefs['close_draft'] = array(
+$_prefs['close_draft'] = [
'value' => 1,
'type' => 'checkbox',
- 'desc' => _("Close the compose window after saving a draft?")
-);
+ 'desc' => _('Close the compose window after saving a draft?'),
+];
-$_prefs['unseen_drafts'] = array(
+$_prefs['unseen_drafts'] = [
'value' => 0,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("Save drafts as unseen?")
-);
+ 'desc' => _('Save drafts as unseen?'),
+];
-$_prefs['auto_save_drafts'] = array(
+$_prefs['auto_save_drafts'] = [
// Value is in minutes
'value' => 5,
'advanced' => true,
'type' => 'enum',
- 'enum' => array(
- 0 => _("No"),
- 1 => _("Every minute"),
- 5 => _("Every 5 minutes")
- ),
- 'desc' => _("Save drafts automatically while composing?"),
-);
+ 'enum' => [
+ 0 => _('No'),
+ 1 => _('Every minute'),
+ 5 => _('Every 5 minutes'),
+ ],
+ 'desc' => _('Save drafts automatically while composing?'),
+];
// *** Sent Mail Preferences ***
-$prefGroups['sentmail'] = array(
- 'column' => _("Compose"),
- 'label' => _("Sent Mail"),
- 'desc' => _("Manage sent mail."),
- 'members' => array(
+$prefGroups['sentmail'] = [
+ 'column' => _('Compose'),
+ 'label' => _('Sent Mail'),
+ 'desc' => _('Manage sent mail.'),
+ 'members' => [
'save_attachments', 'rename_sentmail_monthly',
'delete_sentmail_monthly_keep', 'purge_sentmail_interval',
- 'purge_sentmail_keep'
- )
-);
+ 'purge_sentmail_keep',
+ ],
+];
-$_prefs['save_attachments'] = array(
+$_prefs['save_attachments'] = [
'value' => 'never',
'type' => 'enum',
- 'enum' => array(
- 'always' => _("Yes"),
- 'never' => _("No")
- ),
- 'desc' => _("Save attachments in the sent-mail message?"),
- 'help' => 'prefs-save_attachments'
-);
-
-$_prefs['rename_sentmail_monthly'] = array(
+ 'enum' => [
+ 'always' => _('Yes'),
+ 'never' => _('No'),
+ ],
+ 'desc' => _('Save attachments in the sent-mail message?'),
+ 'help' => 'prefs-save_attachments',
+];
+
+$_prefs['rename_sentmail_monthly'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("Rename sent mail mailbox at beginning of month?"),
+ 'desc' => _('Rename sent mail mailbox at beginning of month?'),
'help' => 'prefs-rename_sentmail_monthly',
- 'suppress' => function() {
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS);
- }
-);
+ },
+];
-$_prefs['delete_sentmail_monthly_keep'] = array(
+$_prefs['delete_sentmail_monthly_keep'] = [
'value' => 0,
'type' => 'number',
'zero' => true,
- 'desc' => _("Delete old sent mail mailboxes after this many months (0 to never delete):"),
+ 'desc' => _('Delete old sent mail mailboxes after this many months (0 to never delete):'),
'help' => 'prefs-delete_sentmail_monthly_keep',
- 'suppress' => function() {
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS);
- }
-);
+ },
+];
-$_prefs['purge_sentmail_interval'] = array(
+$_prefs['purge_sentmail_interval'] = [
'value' => 0,
'type' => 'enum',
- 'enum' => array_merge(array(0 => _("Never")), Horde_LoginTasks::getLabels()),
- 'desc' => _("Purge sent mail how often:"),
+ 'enum' => array_merge([0 => _('Never')], Horde_LoginTasks::getLabels()),
+ 'desc' => _('Purge sent mail how often:'),
'help' => 'prefs-purge_sentmail_interval',
- 'suppress' => function() {
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS);
- }
-);
+ },
+];
-$_prefs['purge_sentmail_keep'] = array(
+$_prefs['purge_sentmail_keep'] = [
'value' => 30,
'type' => 'number',
- 'desc' => _("Purge messages in sent mail mailbox(es) older than this amount of days."),
+ 'desc' => _('Purge messages in sent mail mailbox(es) older than this amount of days.'),
'help' => 'prefs-purge_sentmail_keep',
- 'requires' => array('purge_sentmail_interval'),
- 'suppress' => function() {
+ 'requires' => ['purge_sentmail_interval'],
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS);
- }
-);
+ },
+];
// *** Addressbook Preferences ***
-$prefGroups['addressbooks'] = array(
- 'column' => _("Compose"),
- 'label' => _("Address Books"),
- 'desc' => _("Select address book sources for adding/searching."),
- 'members' => array(
- 'save_recipients', 'sourceselect', 'add_source'
- ),
- 'suppress' => function() {
+$prefGroups['addressbooks'] = [
+ 'column' => _('Compose'),
+ 'label' => _('Address Books'),
+ 'desc' => _('Select address book sources for adding/searching.'),
+ 'members' => [
+ 'save_recipients', 'sourceselect', 'add_source',
+ ],
+ 'suppress' => function () {
$contacts_app = $GLOBALS['registry']->hasInterface('contacts');
return (!$contacts_app ||
!$GLOBALS['registry']->hasPermission($contacts_app));
- }
-);
+ },
+];
-$_prefs['save_recipients'] = array(
+$_prefs['save_recipients'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("Save recipients automatically to the default address book?")
-);
+ 'desc' => _('Save recipients automatically to the default address book?'),
+];
// address book selection widget
-$_prefs['sourceselect'] = array(
+$_prefs['sourceselect'] = [
'type' => 'special',
'handler' => 'IMP_Prefs_Special_Sourceselect',
- 'requires_nolock' => array('search_sources'),
- 'on_init' => function($ui) {
+ 'requires_nolock' => ['search_sources'],
+ 'on_init' => function ($ui) {
Horde_Core_Prefs_Ui_Widgets::addressbooksInit();
- }
-);
+ },
+];
// Address book(s) to use when expanding addresses
// Refer to Turba's config/backends.php for possible source values
//
// You can provide default values this way:
// 'value' => json_encode(array('source_one', 'source_two'))
-$_prefs['search_sources'] = array(
+$_prefs['search_sources'] = [
'value' => '',
- 'on_change' => function() {
+ 'on_change' => function () {
$GLOBALS['injector']->getInstance('IMP_Contacts')->clearCache();
- }
-);
+ },
+];
// Field(s) to use when expanding addresses
// Refer to Turba's config/backends.php for possible source and field values
@@ -933,632 +967,633 @@
// ))
// will search the fields 'field_one' and 'field_two' in source_one and
// 'field_three' in source_two.
-$_prefs['search_fields'] = array(
+$_prefs['search_fields'] = [
'value' => '',
- 'on_change' => function() {
+ 'on_change' => function () {
$GLOBALS['injector']->getInstance('IMP_Contacts')->clearCache();
- }
-);
+ },
+];
// If NOT using shared address books in Turba, you can put a $cfgSources array
// element name in the value field. See the preference hook example in
// config/hooks.php.dist if using shared address books.
-$_prefs['add_source'] = array(
+$_prefs['add_source'] = [
// 'value' => 'localsql',
'value' => '',
'type' => 'enum',
- 'enum' => array(),
- 'desc' => _("Choose the address book to use when adding addresses."),
- 'suppress' => function() {
+ 'enum' => [],
+ 'desc' => _('Choose the address book to use when adding addresses.'),
+ 'suppress' => function () {
try {
- $GLOBALS['registry']->call('contacts/sources', array(true));
+ $GLOBALS['registry']->call('contacts/sources', [true]);
return false;
- } catch (Horde_Exception $e) {}
+ } catch (Horde_Exception $e) {
+ }
return true;
},
- 'on_init' => function($ui) {
- $ui->prefs['add_source']['enum'] = $GLOBALS['registry']->call('contacts/sources', array(true));
- }
-);
+ 'on_init' => function ($ui) {
+ $ui->prefs['add_source']['enum'] = $GLOBALS['registry']->call('contacts/sources', [true]);
+ },
+];
// *** Message Viewing Preferences ***
-$prefGroups['viewing'] = array(
- 'column' => _("Message"),
- 'label' => _("Viewing"),
- 'desc' => _("Configure how messages are displayed."),
- 'members' => array(
+$prefGroups['viewing'] = [
+ 'column' => _('Message'),
+ 'label' => _('Viewing'),
+ 'desc' => _('Configure how messages are displayed.'),
+ 'members' => [
'filtering', 'strip_attachments', 'alternative_display',
'image_replacement', 'image_replacement_manage', 'highlight_text',
'highlight_simple_markup', 'show_quoteblocks', 'dim_signature',
- 'emoticons', 'parts_display', 'mail_hdr', 'send_mdn'
- )
-);
+ 'emoticons', 'parts_display', 'mail_hdr', 'send_mdn',
+ ],
+];
-$_prefs['filtering'] = array(
+$_prefs['filtering'] = [
'value' => 0,
'locked' => true,
'type' => 'checkbox',
- 'desc' => _("Filter message content for unwanted text (e.g. profanity)?")
-);
+ 'desc' => _('Filter message content for unwanted text (e.g. profanity)?'),
+];
-$_prefs['strip_attachments'] = array(
+$_prefs['strip_attachments'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("Allow attachments to be stripped from messages?"));
+ 'desc' => _('Allow attachments to be stripped from messages?')];
-$_prefs['alternative_display'] = array(
+$_prefs['alternative_display'] = [
'value' => 'html',
'advanced' => true,
'type' => 'enum',
- 'enum' => array(
- 'html' => _("HTML part"),
- 'text' => _("Plaintext part")
- ),
- 'desc' => _("For messages with alternative representations of a text part, which part should be displayed?"),
- 'suppress' => function() {
+ 'enum' => [
+ 'html' => _('HTML part'),
+ 'text' => _('Plaintext part'),
+ ],
+ 'desc' => _('For messages with alternative representations of a text part, which part should be displayed?'),
+ 'suppress' => function () {
$mock_part = new Horde_Mime_Part();
$mock_part->setType('text/html');
return !$GLOBALS['injector']->getInstance('IMP_Factory_MimeViewer')->create($mock_part)->canRender('inline');
- }
-);
+ },
+];
-$_prefs['image_replacement'] = array(
+$_prefs['image_replacement'] = [
'value' => 1,
'type' => 'checkbox',
- 'desc' => _("Block images in messages unless they are specifically requested to be loaded?"),
- 'help' => 'prefs-image_replacement'
-);
+ 'desc' => _('Block images in messages unless they are specifically requested to be loaded?'),
+ 'help' => 'prefs-image_replacement',
+];
-$_prefs['image_replacement_manage'] = array(
+$_prefs['image_replacement_manage'] = [
'type' => 'special',
'advanced' => true,
'handler' => 'IMP_Prefs_Special_ImageReplacement',
- 'requires' => array('image_replacement')
-);
+ 'requires' => ['image_replacement'],
+];
// List of e-mail addresses to allow images from (in addition to e-mail
// addresses contained in the user's addressbooks.
// You can provide default values this way:
// 'value' => json_encode(array('foo@example.com', 'foo2@example.com'))
-$_prefs['image_replacement_addrs'] = array(
+$_prefs['image_replacement_addrs'] = [
// Value is a JSON encoded array of email addresses.
- 'value' => '[]'
-);
+ 'value' => '[]',
+];
-$_prefs['highlight_text'] = array(
+$_prefs['highlight_text'] = [
'value' => 1,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("Mark different levels of quoting with different colors?")
-);
+ 'desc' => _('Mark different levels of quoting with different colors?'),
+];
-$_prefs['highlight_simple_markup'] = array(
+$_prefs['highlight_simple_markup'] = [
'value' => 1,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("Mark simple markup?")
-);
+ 'desc' => _('Mark simple markup?'),
+];
-$_prefs['show_quoteblocks'] = array(
+$_prefs['show_quoteblocks'] = [
'value' => 'thread',
'type' => 'enum',
- 'enum' => array(
- 'shown' => _("Shown"),
- 'thread' => _("Hidden in Thread View"),
- 'list' => _("Hidden in List Messages"),
- 'listthread' => _("Hidden in Thread View and List Messages"),
- 'hidden' => _("Hidden")
- ),
- 'desc' => _("How should large blocks of quoted text be shown by default? (Toggling the block will always be available).")
-);
-
-$_prefs['dim_signature'] = array(
+ 'enum' => [
+ 'shown' => _('Shown'),
+ 'thread' => _('Hidden in Thread View'),
+ 'list' => _('Hidden in List Messages'),
+ 'listthread' => _('Hidden in Thread View and List Messages'),
+ 'hidden' => _('Hidden'),
+ ],
+ 'desc' => _('How should large blocks of quoted text be shown by default? (Toggling the block will always be available).'),
+];
+
+$_prefs['dim_signature'] = [
'value' => 0,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("Dim signatures?")
-);
+ 'desc' => _('Dim signatures?'),
+];
-$_prefs['emoticons'] = array(
+$_prefs['emoticons'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("Convert textual emoticons into graphical ones?")
-);
+ 'desc' => _('Convert textual emoticons into graphical ones?'),
+];
-$_prefs['parts_display'] = array(
+$_prefs['parts_display'] = [
'value' => 'atc',
'type' => 'enum',
- 'enum' => array(
- 'all' => _("Show all parts"),
- 'atc' => _("Show all attachments"),
- 'none' => _("Do not show parts")
- ),
- 'desc' => _("Which message parts do you want to display in the summary?")
-);
+ 'enum' => [
+ 'all' => _('Show all parts'),
+ 'atc' => _('Show all attachments'),
+ 'none' => _('Do not show parts'),
+ ],
+ 'desc' => _('Which message parts do you want to display in the summary?'),
+];
// Display custom headers when viewing messages?
-$_prefs['mail_hdr'] = array(
+$_prefs['mail_hdr'] = [
// Value is a list of headers to display, separated by "\n"
// e.g.: "Message-ID\nX-Spam-Level"
'value' => '',
'type' => 'textarea',
- 'desc' => _("Additional headers to display when viewing: (enter each header on a new line)")
-);
+ 'desc' => _('Additional headers to display when viewing: (enter each header on a new line)'),
+];
-$_prefs['send_mdn'] = array(
+$_prefs['send_mdn'] = [
'value' => 1,
'advanced' => true,
'type' => 'enum',
- 'enum' => array(
- 0 => _("Never send read receipt"),
- 1 => _("Always prompt"),
+ 'enum' => [
+ 0 => _('Never send read receipt'),
+ 1 => _('Always prompt'),
// This preference is not given to the user by default - it makes it
// too easy for spam messages to determine valid e-mail addresses.
// 2 => _("Prompt only if necessary; otherwise automatically send")
- ),
- 'desc' => _("Prompt to send read receipt (a/k/a message disposition notification) when requested by the sender?"),
+ ],
+ 'desc' => _('Prompt to send read receipt (a/k/a message disposition notification) when requested by the sender?'),
'help' => 'prefs-send_mdn',
- 'suppress' => function() {
+ 'suppress' => function () {
return ($GLOBALS['injector']->getInstance('IMP_Maillog') instanceof IMP_Maillog_Storage_Null);
- }
-);
+ },
+];
// *** Delete/Move Messages Preferences ***
-$prefGroups['delmove'] = array(
- 'column' => _("Message"),
- 'label' => _("Deleting and Moving Messages"),
- 'desc' => _("Set preferences for what happens when you move and delete messages."),
- 'members' => array(
+$prefGroups['delmove'] = [
+ 'column' => _('Message'),
+ 'label' => _('Deleting and Moving Messages'),
+ 'desc' => _('Set preferences for what happens when you move and delete messages.'),
+ 'members' => [
'mailbox_return', 'delete_mark_seen', 'use_trash', 'trashselect',
- 'delhide_trash', 'purge_trash_interval', 'purge_trash_keep'
- )
-);
+ 'delhide_trash', 'purge_trash_interval', 'purge_trash_keep',
+ ],
+];
-$_prefs['mailbox_return'] = array(
+$_prefs['mailbox_return'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("Return to the mailbox listing after deleting, moving, or copying a message?") . ' (' . _("Mobile view only") . ')'
-);
+ 'desc' => _('Return to the mailbox listing after deleting, moving, or copying a message?') . ' (' . _('Mobile view only') . ')',
+];
-$_prefs['delete_mark_seen'] = array(
+$_prefs['delete_mark_seen'] = [
'value' => 0,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("Mark messages as seen when deleting?")
-);
+ 'desc' => _('Mark messages as seen when deleting?'),
+];
-$_prefs['use_trash'] = array(
+$_prefs['use_trash'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("Move deleted messages to your Trash mailbox instead of marking them as deleted in the current mailbox?"),
- 'on_change' => function() {
+ 'desc' => _('Move deleted messages to your Trash mailbox instead of marking them as deleted in the current mailbox?'),
+ 'on_change' => function () {
$GLOBALS['injector']->getInstance('IMP_Mailbox_SessionCache')
->expire(IMP_Mailbox_SessionCache::CACHE_SPECIALMBOXES);
if ($GLOBALS['prefs']->getValue('use_trash') &&
!$GLOBALS['prefs']->getValue('trash_folder')) {
- $GLOBALS['notification']->push(_("You have activated move to Trash but no Trash mailbox is defined. You will be unable to delete messages until you set a Trash mailbox in the preferences."), 'horde.warning');
+ $GLOBALS['notification']->push(_('You have activated move to Trash but no Trash mailbox is defined. You will be unable to delete messages until you set a Trash mailbox in the preferences.'), 'horde.warning');
}
- }
-);
+ },
+];
// trash mailbox selection widget.
-$_prefs['trashselect'] = array(
+$_prefs['trashselect'] = [
'type' => 'special',
'handler' => 'IMP_Prefs_Special_Trash',
- 'requires' => array('use_trash'),
- 'requires_nolock' => array('use_trash', 'trash_folder'),
- 'suppress' => function() {
+ 'requires' => ['use_trash'],
+ 'requires_nolock' => ['use_trash', 'trash_folder'],
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_TRASH);
- }
-);
+ },
+];
// trash mailbox
-$_prefs['trash_folder'] = array(
+$_prefs['trash_folder'] = [
// NOTE: Localization of this name for display purposes is done
// automatically. To change the default value based on the backend, see
// the 'special_mboxes' option in config/backends.php.
'value' => 'Trash',
- 'on_change' => function() {
+ 'on_change' => function () {
if ($GLOBALS['prefs']->getValue('use_trash') &&
!$GLOBALS['prefs']->getValue('trash_folder')) {
- $GLOBALS['notification']->push(_("You have activated move to Trash but no Trash mailbox is defined. You will be unable to delete messages until you set a Trash mailbox in the preferences."), 'horde.warning');
+ $GLOBALS['notification']->push(_('You have activated move to Trash but no Trash mailbox is defined. You will be unable to delete messages until you set a Trash mailbox in the preferences.'), 'horde.warning');
}
- }
-);
+ },
+];
// This REALLY should be disabled; other clients may not be configured the
// same as IMP so it is very dangerous to hide messages that still exist in
// the mailbox (enabling Trash indicates that the user wants to ignore the
// \Deleted flag in IMP).
-$_prefs['delhide_trash'] = array(
+$_prefs['delhide_trash'] = [
// Disabled and locked by default
'value' => 0,
'locked' => true,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("Hide deleted messages even if using the Trash mailbox?")
-);
+ 'desc' => _('Hide deleted messages even if using the Trash mailbox?'),
+];
-$_prefs['purge_trash_interval'] = array(
+$_prefs['purge_trash_interval'] = [
'value' => 0,
'type' => 'enum',
- 'enum' => array_merge(array(0 => _("Never")), Horde_LoginTasks::getLabels()),
- 'desc' => _("Purge Trash how often:"),
+ 'enum' => array_merge([0 => _('Never')], Horde_LoginTasks::getLabels()),
+ 'desc' => _('Purge Trash how often:'),
'help' => 'prefs-purge_trash_interval',
- 'requires' => array('use_trash'),
- 'requires_nolock' => array('use_trash'),
- 'suppress' => function() {
+ 'requires' => ['use_trash'],
+ 'requires_nolock' => ['use_trash'],
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_TRASH);
- }
-);
+ },
+];
-$_prefs['purge_trash_keep'] = array(
+$_prefs['purge_trash_keep'] = [
'value' => 30,
'type' => 'number',
- 'desc' => _("Purge messages in Trash mailbox older than this amount of days."),
+ 'desc' => _('Purge messages in Trash mailbox older than this amount of days.'),
'help' => 'prefs-purge_trash_keep',
- 'requires' => array('use_trash', 'purge_trash_interval'),
- 'requires_nolock' => array('use_trash'),
- 'suppress' => function() {
+ 'requires' => ['use_trash', 'purge_trash_interval'],
+ 'requires_nolock' => ['use_trash'],
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_TRASH);
- }
-);
+ },
+];
// hide deleted
-$_prefs['delhide'] = array(
- 'value' => 0
-);
+$_prefs['delhide'] = [
+ 'value' => 0,
+];
// *** Spam Preferences ***
-$prefGroups['spamreport'] = array(
- 'column' => _("Message"),
- 'label' => _("Spam Reporting"),
- 'desc' => _("Configure spam reporting."),
- 'members' => array(
+$prefGroups['spamreport'] = [
+ 'column' => _('Message'),
+ 'label' => _('Spam Reporting'),
+ 'desc' => _('Configure spam reporting.'),
+ 'members' => [
'spamselect', 'delete_spam_after_report', 'move_innocent_after_report',
- 'purge_spam_interval', 'purge_spam_keep'
- )
-);
+ 'purge_spam_interval', 'purge_spam_keep',
+ ],
+];
// spam mailbox selection widget.
-$_prefs['spamselect'] = array(
+$_prefs['spamselect'] = [
'type' => 'special',
'handler' => 'IMP_Prefs_Special_Spam',
- 'requires_nolock' => array('spam_folder')
-);
+ 'requires_nolock' => ['spam_folder'],
+];
// spam mailbox
-$_prefs['spam_folder'] = array(
+$_prefs['spam_folder'] = [
// NOTE: Localization of this name for display purposes is done
// automatically. To change the default value based on the backend, see
// the 'special_mboxes' option in config/backends.php.
- 'value' => 'Spam'
-);
+ 'value' => 'Spam',
+];
-$_prefs['delete_spam_after_report'] = array(
+$_prefs['delete_spam_after_report'] = [
'value' => 0,
'type' => 'enum',
- 'enum' => array(),
- 'desc' => _("What to do with messages after they have been reported as spam?"),
+ 'enum' => [],
+ 'desc' => _('What to do with messages after they have been reported as spam?'),
'help' => 'prefs-delete_spam_after_report',
- 'on_init' => function($ui) {
- $enum = array(
- 0 => _("Nothing"),
- 1 => _("Delete message")
- );
+ 'on_init' => function ($ui) {
+ $enum = [
+ 0 => _('Nothing'),
+ 1 => _('Delete message'),
+ ];
if ($GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS)) {
- $enum[2] = _("Move to Spam mailbox");
+ $enum[2] = _('Move to Spam mailbox');
}
$ui->prefs['delete_spam_after_report']['enum'] = $enum;
- }
-);
+ },
+];
-$_prefs['move_innocent_after_report'] = array(
+$_prefs['move_innocent_after_report'] = [
'value' => 0,
'type' => 'enum',
- 'enum' => array(
- 0 => _("Nothing"),
- 1 => _("Move to Inbox")
- ),
- 'desc' => _("What to do with messages after they have been reported as innocent?"),
+ 'enum' => [
+ 0 => _('Nothing'),
+ 1 => _('Move to Inbox'),
+ ],
+ 'desc' => _('What to do with messages after they have been reported as innocent?'),
'help' => 'prefs-move_innocent_after_report',
- 'suppress' => function() {
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS);
- }
-);
+ },
+];
-$_prefs['purge_spam_interval'] = array(
+$_prefs['purge_spam_interval'] = [
'value' => 0,
'type' => 'enum',
- 'enum' => array_merge(array(0 => _("Never")), Horde_LoginTasks::getLabels()),
- 'desc' => _("Purge Spam mailbox how often:"),
+ 'enum' => array_merge([0 => _('Never')], Horde_LoginTasks::getLabels()),
+ 'desc' => _('Purge Spam mailbox how often:'),
'help' => 'prefs-purge_spam_interval',
- 'suppress' => function() {
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS);
- }
-);
+ },
+];
-$_prefs['purge_spam_keep'] = array(
+$_prefs['purge_spam_keep'] = [
'value' => 30,
'type' => 'number',
- 'desc' => _("Purge messages in Spam mailbox older than this amount of days."),
+ 'desc' => _('Purge messages in Spam mailbox older than this amount of days.'),
'help' => 'prefs-purge_spam_keep',
- 'requires' => array('purge_spam_interval'),
- 'suppress' => function() {
+ 'requires' => ['purge_spam_interval'],
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS);
- }
-);
+ },
+];
// *** New Mail Notification Preferences ***
-$prefGroups['newmail'] = array(
- 'column' => _("Message"),
- 'label' => _("New Mail"),
- 'desc' => _("Control when new mail will be checked for, and whether or not to notify you when it arrives."),
- 'members' => array(
- 'refresh_time', 'nav_poll_all', 'newmail_notify', 'newmail_soundselect'
- )
-);
+$prefGroups['newmail'] = [
+ 'column' => _('Message'),
+ 'label' => _('New Mail'),
+ 'desc' => _('Control when new mail will be checked for, and whether or not to notify you when it arrives.'),
+ 'members' => [
+ 'refresh_time', 'nav_poll_all', 'newmail_notify', 'newmail_soundselect',
+ ],
+];
-$_prefs['refresh_time'] = array(
+$_prefs['refresh_time'] = [
// Value in seconds
'value' => 0,
'type' => 'enum',
- 'enum' => array(
- 0 => _("Never"),
- 30 => _("Every 30 seconds"),
- 60 => _("Every minute"),
- 300 => _("Every 5 minutes"),
- 900 => _("Every 15 minutes"),
- 1800 => _("Every half hour")
- ),
- 'desc' => _("New mail poll interval on mailbox page:"),
-);
-
-$_prefs['newmail_notify'] = array(
+ 'enum' => [
+ 0 => _('Never'),
+ 30 => _('Every 30 seconds'),
+ 60 => _('Every minute'),
+ 300 => _('Every 5 minutes'),
+ 900 => _('Every 15 minutes'),
+ 1800 => _('Every half hour'),
+ ],
+ 'desc' => _('New mail poll interval on mailbox page:'),
+];
+
+$_prefs['newmail_notify'] = [
'value' => 0,
'type' => 'checkbox',
- 'desc' => _("Display notification when new mail arrives?"),
-);
+ 'desc' => _('Display notification when new mail arrives?'),
+];
// Sound to play on new mail notification
-$_prefs['newmail_audio'] = array(
- 'value' => ''
-);
+$_prefs['newmail_audio'] = [
+ 'value' => '',
+];
// sound selection widget
-$_prefs['newmail_soundselect'] = array(
+$_prefs['newmail_soundselect'] = [
'type' => 'special',
'handler' => 'IMP_Prefs_Special_NewmailSound',
- 'requires' => array('newmail_notify'),
- 'requires_nolock' => array('newmail_audio')
-);
+ 'requires' => ['newmail_notify'],
+ 'requires_nolock' => ['newmail_audio'],
+];
// *** IMAP Flag Preferences ***
-$prefGroups['flags'] = array(
- 'column' => _("Message"),
- 'label' => _("Flags"),
- 'desc' => _("Configure flag highlighting."),
- 'members' => array('flagmanagement', 'show_all_flags'),
- 'suppress' => function() {
+$prefGroups['flags'] = [
+ 'column' => _('Message'),
+ 'label' => _('Flags'),
+ 'desc' => _('Configure flag highlighting.'),
+ 'members' => ['flagmanagement', 'show_all_flags'],
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FLAGS);
- }
-);
+ },
+];
// UI for flag management.
-$_prefs['flagmanagement'] = array(
+$_prefs['flagmanagement'] = [
'type' => 'special',
- 'handler' => 'IMP_Prefs_Special_Flag'
-);
+ 'handler' => 'IMP_Prefs_Special_Flag',
+];
// This array contains the list of flags created by the user through the
// flags UI, and any modifications to the built-in system flags.
-$_prefs['msgflags'] = array(
+$_prefs['msgflags'] = [
// 'value' = serialize(array())
- 'value' => 'a:0:{}'
-);
+ 'value' => 'a:0:{}',
+];
-$_prefs['show_all_flags'] = array(
+$_prefs['show_all_flags'] = [
'value' => 0,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("Show all flags (including flags set by other mail programs)?")
-);
+ 'desc' => _('Show all flags (including flags set by other mail programs)?'),
+];
// *** Printing Preferences ***
-$prefGroups['printing'] = array(
- 'column' => _("Message"),
- 'label' => _("Printing"),
- 'desc' => _("Configure message printing."),
- 'members' => array('add_printedby', 'add_bcc')
-);
+$prefGroups['printing'] = [
+ 'column' => _('Message'),
+ 'label' => _('Printing'),
+ 'desc' => _('Configure message printing.'),
+ 'members' => ['add_printedby', 'add_bcc'],
+];
-$_prefs['add_printedby'] = array(
+$_prefs['add_printedby'] = [
'value' => 0,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("Add a \"Printed By\" header to the top of printed messages?")
-);
+ 'desc' => _('Add a "Printed By" header to the top of printed messages?'),
+];
-$_prefs['add_bcc'] = array(
+$_prefs['add_bcc'] = [
'value' => 0,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("Include the \"Bcc\" header when printing a sent email?")
-);
+ 'desc' => _('Include the "Bcc" header when printing a sent email?'),
+];
// *** Mailbox Display Preferences ***
-$prefGroups['mboxdisplay'] = array(
- 'column' => _("Mailbox"),
- 'label' => _("Mailbox Display"),
- 'desc' => _("Change display preferences for viewing the listing of messages in a mailbox."),
- 'members' => array(
+$prefGroups['mboxdisplay'] = [
+ 'column' => _('Mailbox'),
+ 'label' => _('Mailbox Display'),
+ 'desc' => _('Change display preferences for viewing the listing of messages in a mailbox.'),
+ 'members' => [
'initialpageselect', 'mailbox_start', 'sortby', 'sortdir', 'sortdate',
- 'atc_flag'
- )
-);
+ 'atc_flag',
+ ],
+];
// select widget for the initial_page preference
-$_prefs['initialpageselect'] = array(
+$_prefs['initialpageselect'] = [
'type' => 'special',
'handler' => 'IMP_Prefs_Special_InitialPage',
- 'requires_nolock' => array('initial_page'),
- 'suppress' => function() {
+ 'requires_nolock' => ['initial_page'],
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS);
- }
-);
+ },
+];
// The initial page to display. Either:
// - IMP::INITIAL_FOLDERS (display folders page; smartmobile only)
// - mailbox name (defaults to INBOX)
-$_prefs['initial_page'] = array(
- 'value' => ''
-);
+$_prefs['initial_page'] = [
+ 'value' => '',
+];
-$_prefs['mailbox_start'] = array(
+$_prefs['mailbox_start'] = [
'value' => IMP::MAILBOX_START_FIRSTUNSEEN,
'type' => 'enum',
- 'enum' => array(
- IMP::MAILBOX_START_FIRSTUNSEEN => _("First (oldest) Unseen Message"),
- IMP::MAILBOX_START_LASTUNSEEN => _("Last (newest) Unseen Message"),
- IMP::MAILBOX_START_FIRSTPAGE => _("First Page"),
- IMP::MAILBOX_START_LASTPAGE => _("Last Page")
- ),
- 'desc' => _("When opening a mailbox for the first time, where do you want to start?")
-);
-
-$_prefs['sortby'] = array(
+ 'enum' => [
+ IMP::MAILBOX_START_FIRSTUNSEEN => _('First (oldest) Unseen Message'),
+ IMP::MAILBOX_START_LASTUNSEEN => _('Last (newest) Unseen Message'),
+ IMP::MAILBOX_START_FIRSTPAGE => _('First Page'),
+ IMP::MAILBOX_START_LASTPAGE => _('Last Page'),
+ ],
+ 'desc' => _('When opening a mailbox for the first time, where do you want to start?'),
+];
+
+$_prefs['sortby'] = [
// Sort by sequence by default. It is the fastest sort as it is the only
// sort that can be done without parsing message headers. It sorts
// messages by the order they were initially processed by the mail server.
'value' => Horde_Imap_Client::SORT_SEQUENCE,
'type' => 'enum',
- 'enum' => array(
- Horde_Imap_Client::SORT_SEQUENCE => _("NONE"),
- IMP::IMAP_SORT_DATE => _("Date"),
- Horde_Imap_Client::SORT_FROM => _("From Address"),
- Horde_Imap_Client::SORT_TO => _("To Address"),
- Horde_Imap_Client::SORT_SUBJECT => _("Subject"),
- Horde_Imap_Client::SORT_SIZE => _("Message Size"),
- Horde_Imap_Client::SORT_THREAD => _("Thread")
- ),
- 'desc' => _("Default sorting criteria:")
-);
-
-$_prefs['sortdir'] = array(
+ 'enum' => [
+ Horde_Imap_Client::SORT_SEQUENCE => _('NONE'),
+ IMP::IMAP_SORT_DATE => _('Date'),
+ Horde_Imap_Client::SORT_FROM => _('From Address'),
+ Horde_Imap_Client::SORT_TO => _('To Address'),
+ Horde_Imap_Client::SORT_SUBJECT => _('Subject'),
+ Horde_Imap_Client::SORT_SIZE => _('Message Size'),
+ Horde_Imap_Client::SORT_THREAD => _('Thread'),
+ ],
+ 'desc' => _('Default sorting criteria:'),
+];
+
+$_prefs['sortdir'] = [
'value' => 0,
'type' => 'enum',
- 'enum' => array(
- 0 => _("Ascending"),
- 1 => _("Descending")
- ),
- 'desc' => _("Default sorting direction:")
-);
+ 'enum' => [
+ 0 => _('Ascending'),
+ 1 => _('Descending'),
+ ],
+ 'desc' => _('Default sorting direction:'),
+];
// sort prefs for individual mailboxes
-$_prefs['sortpref'] = array(
+$_prefs['sortpref'] = [
// value = serialize(array())
- 'value' => 'a:0:{}'
-);
+ 'value' => 'a:0:{}',
+];
-$_prefs['sortdate'] = array(
+$_prefs['sortdate'] = [
// Use internal IMAP date by default - this is generally the date that a
// message was first received on the IMAP server and is maintained even
// if the message moves between mailboxes.
'value' => Horde_Imap_Client::SORT_ARRIVAL,
'advanced' => true,
'type' => 'enum',
- 'enum' => array(
- Horde_Imap_Client::SORT_ARRIVAL => _("Arrival time on server"),
- Horde_Imap_Client::SORT_DATE => _("Date in message headers")
- ),
- 'desc' => _("Criteria to use when sorting by date:")
-);
-
-$_prefs['atc_flag'] = array(
+ 'enum' => [
+ Horde_Imap_Client::SORT_ARRIVAL => _('Arrival time on server'),
+ Horde_Imap_Client::SORT_DATE => _('Date in message headers'),
+ ],
+ 'desc' => _('Criteria to use when sorting by date:'),
+];
+
+$_prefs['atc_flag'] = [
// Disabled by default since display requires a bit of extra overhead to
// obtain the MIME Content-Type of the base portion of the message.
// Additionally, this algorithm is not 100% accurate.
'value' => 0,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("Indicate whether a message has attachments or is signed or encrypted in the mailbox listing?")
-);
+ 'desc' => _('Indicate whether a message has attachments or is signed or encrypted in the mailbox listing?'),
+];
// *** Folder Display Preferences ***
-$prefGroups['folderdisplay'] = array(
- 'column' => _("Mailbox"),
- 'label' => _("Folder Display"),
- 'desc' => _("Change folder navigation display preferences."),
- 'members' => array(
- 'subscribe', 'nav_expanded', 'tree_view', 'nav_poll_all'
- )
-);
+$prefGroups['folderdisplay'] = [
+ 'column' => _('Mailbox'),
+ 'label' => _('Folder Display'),
+ 'desc' => _('Change folder navigation display preferences.'),
+ 'members' => [
+ 'subscribe', 'nav_expanded', 'tree_view', 'nav_poll_all',
+ ],
+];
-$_prefs['subscribe'] = array(
+$_prefs['subscribe'] = [
'value' => 1,
'advanced' => true,
'type' => 'checkbox',
- 'desc' => _("Use IMAP mailbox subscriptions?"),
- 'on_change' => function() {
+ 'desc' => _('Use IMAP mailbox subscriptions?'),
+ 'on_change' => function () {
$GLOBALS['injector']->getInstance('IMP_Ftree')->init();
- }
-);
+ },
+];
-$_prefs['nav_expanded'] = array(
+$_prefs['nav_expanded'] = [
'value' => 2,
'type' => 'enum',
- 'enum' => array(
- IMP_Ftree_Prefs_Expanded::NO => _("No"),
- IMP_Ftree_Prefs_Expanded::YES => _("Yes"),
- IMP_Ftree_Prefs_Expanded::LAST => _("Remember the last view")
- ),
- 'desc' => _("Expand the entire folder tree by default in the folders view?"),
- 'suppress' => function() {
+ 'enum' => [
+ IMP_Ftree_Prefs_Expanded::NO => _('No'),
+ IMP_Ftree_Prefs_Expanded::YES => _('Yes'),
+ IMP_Ftree_Prefs_Expanded::LAST => _('Remember the last view'),
+ ],
+ 'desc' => _('Expand the entire folder tree by default in the folders view?'),
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS);
- }
-);
+ },
+];
-$_prefs['tree_view'] = array(
+$_prefs['tree_view'] = [
'value' => 0,
'advanced' => true,
'type' => 'enum',
- 'enum' => array(
- 0 => _("Combine all namespaces"),
- 1 => _("Show non-private mailboxes in separate folders")
- ),
- 'desc' => _("How should namespaces be displayed in the folder tree view?"),
- 'suppress' => function() {
+ 'enum' => [
+ 0 => _('Combine all namespaces'),
+ 1 => _('Show non-private mailboxes in separate folders'),
+ ],
+ 'desc' => _('How should namespaces be displayed in the folder tree view?'),
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS);
},
- 'on_change' => function() {
+ 'on_change' => function () {
$GLOBALS['injector']->getInstance('IMP_Ftree')->init();
- }
-);
+ },
+];
-$_prefs['nav_poll_all'] = array(
+$_prefs['nav_poll_all'] = [
// This is locked and disabled by default. You almost certainly DO NOT
// want to poll all mailboxes by default: this can cause crippling load
// on your server and is generally NOT what users want (polling things
@@ -1568,29 +1603,29 @@
'advanced' => true,
'locked' => true,
'type' => 'checkbox',
- 'desc' => _("Poll all mailboxes for new mail?"),
- 'suppress' => function() {
+ 'desc' => _('Poll all mailboxes for new mail?'),
+ 'suppress' => function () {
return !$GLOBALS['injector']->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_FOLDERS);
},
- 'on_change' => function() {
+ 'on_change' => function () {
$GLOBALS['injector']->getInstance('IMP_Ftree')->init();
- }
-);
+ },
+];
// list of folders to expand by default
-$_prefs['expanded_folders'] = array(
+$_prefs['expanded_folders'] = [
// value = serialize(array())
- 'value' => 'a:0:{}'
-);
+ 'value' => 'a:0:{}',
+];
// list of mailboxes to poll for new mail
-$_prefs['nav_poll'] = array(
- 'value' => ''
-);
+$_prefs['nav_poll'] = [
+ 'value' => '',
+];
// ignore uidvalid changes across sessions
-$_prefs['ignore_uidvalidity'] = array(
+$_prefs['ignore_uidvalidity'] = [
'value' => 0,
'type' => 'checkbox',
- 'locked' => true
-);
+ 'locked' => true,
+];
diff --git a/js/alias.js b/js/alias.js
new file mode 100644
index 000000000..e9b7cd1f8
--- /dev/null
+++ b/js/alias.js
@@ -0,0 +1,47 @@
+/**
+ * Author of passphrase dialog
+ *
+ * @author Michael Slusarz
+ * @copyright 2014-2015 Horde LLC
+ * @license GPL-2 (http://www.horde.org/licenses/gpl)
+ */
+
+/**
+ * Reimplemented passphrase dialog for alias dialog
+ *
+ * @author Rafael te Boekhorst
+ * @copyright 2014-2015 Horde LLC
+ * @license GPL-2 (http://www.horde.org/licenses/gpl)
+ *
+ */
+
+var ImpAliasDialog = {
+ display: function (data) {
+ HordeDialog.display(Object.extend(data, {
+ form_id: 'imp_alias',
+ password: false
+ }));
+ },
+
+ onClick: function (e) {
+ switch (e.element().identify()) {
+ case 'imp_alias':
+ HordeCore.doAction(
+ 'checkAlias',
+ e.findElement('FORM').serialize(true),
+ { callback: this.callback.bind(this) }
+ );
+ break;
+ }
+ },
+
+ callback: function (r) {
+ if (r) {
+ $('imp_alias').fire('ImpAliasDialog:success');
+ HordeDialog.close();
+ }
+ }
+
+};
+
+document.observe('HordeDialog:onClick', ImpAliasDialog.onClick.bindAsEventListener(ImpAliasDialog));
diff --git a/js/prefs/switchencryptionoptions.js b/js/prefs/switchencryptionoptions.js
new file mode 100644
index 000000000..a259ddfe1
--- /dev/null
+++ b/js/prefs/switchencryptionoptions.js
@@ -0,0 +1,111 @@
+/**
+ * Managing Keys for identities in the preferences UI.
+ *
+ * @author Rafael te Boekhorst
+ * @copyright 2014-2015 Horde LLC
+ * @license GPL-2 (http://www.horde.org/licenses/gpl)
+ */
+
+const switchEncryption = {
+ // checks whether the smime checkbox is clicked and shows/hides
+ checkSMIMEOption() {
+ // get checkbox info
+ const smimeSelect = document.getElementById('smimeselect');
+ if (smimeSelect.checked) {
+ const prefsSmimeContainer = document.querySelectorAll('.prefsSmimeContainer');
+ prefsSmimeContainer.forEach((container) => {
+ container.style.display = 'block';
+ });
+ } else {
+ const prefsSmimeContainer = document.querySelectorAll('.prefsSmimeContainer');
+ prefsSmimeContainer.forEach((container) => {
+ container.style.display = 'none';
+ });
+ this.showKeys();
+ }
+ },
+
+ // shows the keys of the identity
+ showKeys() {
+ // get the identityID
+ const identity = document.getElementById('identity');
+ const identityID = Number(identity.value);
+
+ var translatedText;
+ // doAction method from HordeCore
+ HordeCore.doAction(
+ 'getPubKeyInfos',
+ {},
+ {
+ callback: (response) => {
+ translatedText = response
+ }
+ })
+
+
+ // doAction method from HordeCore
+ HordeCore.doAction(
+ 'getIdentityPubKey',
+ {
+ identityID: identityID,
+ },
+ {
+ callback: (response) => {
+ // check for keys in the address book for the identity and show them
+ let div = document.querySelectorAll('div.prefsSmimeContainer')[0];
+
+ // ajax reloads things for three times for some reason, so make sure that nothing appears additionally. Remove extra appearances.
+ if (div.previousElementSibling.id === 'addressbookpubkey') {
+ div.previousElementSibling.remove();
+ div.previousElementSibling.remove();
+ }
+
+ if (document.getElementById('smimeselect').checked) {
+ let addressbookpubkey = document.getElementById('addressbookpubkey');
+ if (addressbookpubkey) {
+ addressbookpubkey.remove();
+ }
+ let addressbookonlyinfos = document.getElementById('addressbookonlyinfos');
+ if (addressbookonlyinfos) {
+ addressbookonlyinfos.remove();
+ }
+ }
+
+ // if smime is not selected, some information on the keys in the address book shows
+ if (!document.getElementById('smimeselect').checked) {
+ let ul = document.createElement('ul');
+ ul.setAttribute('id', 'addressbookpubkey');
+
+ for (let key in response) {
+ if (response.hasOwnProperty(key)) {
+ let li = document.createElement('li');
+ li.style.listStyleType = 'none';
+ li.innerHTML = String(response[key]);
+ ul.appendChild(li);
+ }
+ }
+
+ div.parentNode.insertBefore(ul, div);
+
+ // create a text to inform the user
+ let text = translatedText;
+ // 'The following key from the address book is used for this identity if you want to use the address book only (without SMIME-keys):';
+ let infodiv = document.createElement('div');
+ infodiv.setAttribute('id', 'addressbookonlyinfos');
+ infodiv.textContent = text;
+ ul.parentNode.insertBefore(infodiv, ul);
+ }
+ },
+ },
+ );
+ },
+ };
+
+ // on change of identity show chosen options for SMIME management or Addressbook keys management
+ document.addEventListener('HordeIdentitySelect:change', switchEncryption.checkSMIMEOption.bind(switchEncryption));
+ document.addEventListener('DOMContentLoaded', switchEncryption.checkSMIMEOption.bind(switchEncryption));
+ const smimeselect = document.getElementById('smimeselect');
+ if (smimeselect) {
+ smimeselect.addEventListener('click', switchEncryption.checkSMIMEOption.bind(switchEncryption));
+ }
+
\ No newline at end of file
diff --git a/lib/Ajax/Application.php b/lib/Ajax/Application.php
index 4d166eeeb..bd0342e71 100644
--- a/lib/Ajax/Application.php
+++ b/lib/Ajax/Application.php
@@ -55,33 +55,35 @@ protected function _init()
$this->queue = $injector->getInstance('IMP_Ajax_Queue');
switch ($registry->getView()) {
- case $registry::VIEW_BASIC:
- case $registry::VIEW_DYNAMIC:
- $this->addHandler('IMP_Ajax_Application_Handler_Common');
- $this->addHandler('IMP_Ajax_Application_Handler_Contacts');
- $this->addHandler('IMP_Ajax_Application_Handler_ComposeAttach');
- $this->addHandler('IMP_Ajax_Application_Handler_Draft');
- $this->addHandler('IMP_Ajax_Application_Handler_Dynamic');
- $this->addHandler('IMP_Ajax_Application_Handler_Mboxtoggle');
- $this->addHandler('IMP_Ajax_Application_Handler_Passphrase');
- $this->addHandler('IMP_Ajax_Application_Handler_Search');
- if ($injector->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_REMOTE)) {
- $this->addHandler('IMP_Ajax_Application_Handler_Remote');
- $this->addHandler('IMP_Ajax_Application_Handler_RemotePrefs');
- }
- break;
-
- case $registry::VIEW_MINIMAL:
- case $registry::VIEW_SMARTMOBILE:
- $this->addHandler('IMP_Ajax_Application_Handler_Common');
- $this->addHandler('IMP_Ajax_Application_Handler_ComposeAttach');
- $this->addHandler('IMP_Ajax_Application_Handler_Dynamic');
- $this->addHandler('IMP_Ajax_Application_Handler_Draft')->disabled = array(
- 'autoSaveDraft',
- 'saveTemplate'
- );
- $this->addHandler('IMP_Ajax_Application_Handler_Smartmobile');
- break;
+ case $registry::VIEW_BASIC:
+ case $registry::VIEW_DYNAMIC:
+ $this->addHandler('IMP_Ajax_Application_Handler_Common');
+ $this->addHandler('IMP_Ajax_Application_Handler_Contacts');
+ $this->addHandler('IMP_Ajax_Application_Handler_ComposeAttach');
+ $this->addHandler('IMP_Ajax_Application_Handler_Draft');
+ $this->addHandler('IMP_Ajax_Application_Handler_Dynamic');
+ $this->addHandler('IMP_Ajax_Application_Handler_Mboxtoggle');
+ $this->addHandler('IMP_Ajax_Application_Handler_Passphrase');
+ $this->addHandler('IMP_Ajax_Application_Handler_Alias');
+ $this->addHandler('IMP_Ajax_Application_Handler_SwitchEncryption');
+ $this->addHandler('IMP_Ajax_Application_Handler_Search');
+ if ($injector->getInstance('IMP_Factory_Imap')->create()->access(IMP_Imap::ACCESS_REMOTE)) {
+ $this->addHandler('IMP_Ajax_Application_Handler_Remote');
+ $this->addHandler('IMP_Ajax_Application_Handler_RemotePrefs');
+ }
+ break;
+
+ case $registry::VIEW_MINIMAL:
+ case $registry::VIEW_SMARTMOBILE:
+ $this->addHandler('IMP_Ajax_Application_Handler_Common');
+ $this->addHandler('IMP_Ajax_Application_Handler_ComposeAttach');
+ $this->addHandler('IMP_Ajax_Application_Handler_Dynamic');
+ $this->addHandler('IMP_Ajax_Application_Handler_Draft')->disabled = [
+ 'autoSaveDraft',
+ 'saveTemplate',
+ ];
+ $this->addHandler('IMP_Ajax_Application_Handler_Smartmobile');
+ break;
}
$this->addHandler('IMP_Ajax_Application_Handler_ImageUnblock');
@@ -99,7 +101,7 @@ protected function _init()
/* Make sure the viewport entry is initialized. */
$vp = isset($this->_vars->viewport)
? json_decode($this->_vars->viewport)
- : new stdClass;
+ : new stdClass();
$this->_vars->viewport = new Horde_Support_ObjectStub($vp);
/* GLOBAL TASKS */
@@ -107,11 +109,11 @@ protected function _init()
/* Check for global msgload task. */
if (isset($this->_vars->msgload)) {
$this->queue->message(
- $this->indices->mailbox->fromBuids(array($this->_vars->msgload)),
- array(
+ $this->indices->mailbox->fromBuids([$this->_vars->msgload]),
+ [
'peek' => true,
- 'preview' => true
- )
+ 'preview' => true,
+ ]
);
}
@@ -167,7 +169,7 @@ public function initCompose()
{
global $injector;
- $ob = new stdClass;
+ $ob = new stdClass();
$ob->compose = $injector->getInstance('IMP_Factory_Compose')->create($this->_vars->imp_compose);
$ob->ajax = new IMP_Ajax_Application_Compose($ob->compose, $this->_vars->type);
@@ -222,16 +224,16 @@ public function checkUidvalidity()
*/
public function viewPortData($change)
{
- $args = array(
+ $args = [
'change' => $change,
- 'mbox' => strval($this->indices->mailbox)
- );
+ 'mbox' => strval($this->indices->mailbox),
+ ];
- $params = array(
+ $params = [
'applyfilter', 'cache', 'cacheid', 'delhide', 'initial', 'qsearch',
'qsearchfield', 'qsearchfilter', 'qsearchflag', 'qsearchflagnot',
- 'qsearchmbox', 'rangeslice', 'sortby', 'sortdir'
- );
+ 'qsearchmbox', 'rangeslice', 'sortby', 'sortdir',
+ ];
$vp = $this->_vars->viewport;
@@ -240,24 +242,24 @@ public function viewPortData($change)
}
if ($vp->search || $args['initial']) {
- $args += array(
+ $args += [
'after' => intval($vp->after),
- 'before' => intval($vp->before)
- );
+ 'before' => intval($vp->before),
+ ];
}
if ($vp->search) {
$search = json_decode($vp->search);
- $args += array(
- 'search_buid' => isset($search->buid) ? $search->buid : null,
- 'search_unseen' => isset($search->unseen) ? $search->unseen : null
- );
+ $args += [
+ 'search_buid' => $search->buid ?? null,
+ 'search_unseen' => $search->unseen ?? null,
+ ];
} else {
- list($slice_start, $slice_end) = explode(':', $vp->slice, 2);
- $args += array(
+ [$slice_start, $slice_end] = explode(':', $vp->slice, 2);
+ $args += [
'slice_start' => intval($slice_start),
- 'slice_end' => intval($slice_end)
- );
+ 'slice_end' => intval($slice_end),
+ ];
}
return $GLOBALS['injector']->getInstance('IMP_Ajax_Application_ListMessages')->listMessages($args);
@@ -347,23 +349,23 @@ public function composeSetup($action)
$addr = $this->getAddrFields();
- $headers = array(
+ $headers = [
/* Set up the From address based on the identity. */
'from' => strval($identity->getFromLine(null, $this->_vars->from)),
'to' => implode(',', $addr['to']['addr']),
'cc' => implode(',', $addr['cc']['addr']),
'bcc' => implode(',', $addr['bcc']['addr']),
'redirect_to' => implode(',', $addr['redirect_to']['addr']),
- 'subject' => $this->_vars->subject
- );
+ 'subject' => $this->_vars->subject,
+ ];
$imp_compose = $injector->getInstance('IMP_Factory_Compose')->create($this->_vars->composeCache);
- $result = new stdClass;
+ $result = new stdClass();
$result->action = $action;
$result->success = 1;
- return array($result, $imp_compose, $headers, $identity);
+ return [$result, $imp_compose, $headers, $identity];
}
/**
@@ -375,15 +377,15 @@ public function composeSetup($action)
*/
public function getAddrFields()
{
- $out = array();
+ $out = [];
- foreach (array('to', 'cc', 'bcc', 'redirect_to') as $val) {
+ foreach (['to', 'cc', 'bcc', 'redirect_to'] as $val) {
$data = $this->_vars->get($val);
$data_ac = $this->_vars->get($val . '_ac');
- $tmp = array(
- 'addr' => array(),
- 'map' => false
- );
+ $tmp = [
+ 'addr' => [],
+ 'map' => false,
+ ];
if (strlen($data_ac)) {
$tmp['map'] = true;
@@ -393,7 +395,7 @@ public function getAddrFields()
} else {
$tmp['addr'] += is_array($data)
? array_values($data)
- : array($data);
+ : [$data];
}
$out[$val] = $tmp;
@@ -441,21 +443,20 @@ public function previewUids()
$buid = $this->indices->buids->getSingle();
$uid = $this->indices->getSingle();
- $puids = array(
- array(
+ $puids = [
+ [
'mbox' => $buid[0]->form_to,
- 'uid' => $buid[1]
- )
- );
+ 'uid' => $buid[1],
+ ],
+ ];
if ($buid[0] != $uid[0]) {
- $puids[] = array(
+ $puids[] = [
'mbox' => $uid[0]->form_to,
- 'uid' => $uid[1]
- );
+ 'uid' => $uid[1],
+ ];
}
return $puids;
}
-
}
diff --git a/lib/Ajax/Application/Handler/Alias.php b/lib/Ajax/Application/Handler/Alias.php
new file mode 100644
index 000000000..6d7d7d494
--- /dev/null
+++ b/lib/Ajax/Application/Handler/Alias.php
@@ -0,0 +1,55 @@
+
+ * @author Michael Slusarz
+ * @category Horde
+ * @copyright 2012-2017 Horde LLC
+ * @license http://www.horde.org/licenses/gpl GPL
+ * @package IMP
+ */
+class IMP_Ajax_Application_Handler_Alias extends Horde_Core_Ajax_Application_Handler
+{
+ /**
+ * AJAX action: Check passphrase.
+ *
+ * Variables required in form input:
+ * - dialog_input: (string) Input from the dialog screen.
+ * - reload: (mixed) If set, reloads page instead of returning data.
+ * - symmetricid: (string) The symmetric ID to process.
+ * - type: (string) The passphrase type.
+ *
+ * @return boolean True on success.
+ */
+ public function checkAlias()
+ {
+ global $injector;
+
+ $alias = $this->vars->dialog_input;
+ $keyid = $this->vars->keyid;
+
+ $identity = $injector->getInstance('IMP_Identity');
+ $identityID = $identity->getDefault();
+
+ $result = new IMP_Prefs_Special_SmimeAliasHandler();
+ $result = $result->handle($keyid, $alias, $identityID);
+
+ return ($result && $this->vars->reload)
+ ? new Horde_Core_Ajax_Response_HordeCore_Reload($this->vars->reload)
+ : $result;
+
+ }
+}
diff --git a/lib/Ajax/Application/Handler/SwitchEncryption.php b/lib/Ajax/Application/Handler/SwitchEncryption.php
new file mode 100644
index 000000000..f115515f2
--- /dev/null
+++ b/lib/Ajax/Application/Handler/SwitchEncryption.php
@@ -0,0 +1,59 @@
+
+ * @category Horde
+ * @copyright 2012-2017 Horde LLC
+ * @license http://www.horde.org/licenses/gpl GPL
+ * @package IMP
+ */
+
+class IMP_Ajax_Application_Handler_SwitchEncryption extends Horde_Core_Ajax_Application_Handler
+{
+ /**
+ * AJAX action: Get Keys from Identity of adressbook.
+ *
+ *
+ * @return array Array with keys of identity.
+ */
+ public function getIdentityPubKey()
+ {
+ global $injector;
+
+ // get ID of identity and email
+ $identityID = $this->vars->identityID;
+
+ // get identity
+ $identity = $injector->getInstance('IMP_Identity');
+
+
+ $handler = new SwitchHandler();
+ return $handler->getPublicKeysForPrefsIdentities($identity, $identityID);
+ }
+
+ /**
+ * AJAX action: Get Translated text wiht information.
+ *
+ *
+ * @return string Text with information concerning key-management.
+ */
+ public function getPubKeyInfos()
+ {
+ $translatedText = _('The following key from the address book is used for this identity if you want to use the address book only (without SMIME-keys):');
+
+ return $translatedText;
+ }
+}
diff --git a/lib/Ajax/Imple/AliasDialog.php b/lib/Ajax/Imple/AliasDialog.php
new file mode 100644
index 000000000..f1bfd6403
--- /dev/null
+++ b/lib/Ajax/Imple/AliasDialog.php
@@ -0,0 +1,76 @@
+
+ * @category Horde
+ * @copyright 2010-2017 Horde LLC
+ * @license http://www.horde.org/licenses/gpl GPL
+ * @package IMP
+ */
+class IMP_Ajax_Imple_AliasDialog extends Horde_Core_Ajax_Imple
+{
+ /**
+ * @param array $params Configuration parameters.
+ * - onload: (boolean) [OPTIONAL] If set, will trigger action on page
+ * load.
+ * - params: (array) [OPTIONAL] Any additional parameters to pass to
+ * AJAX action.
+ * - type: (string) The dialog type.
+ */
+ public function __construct(array $params = [])
+ {
+ parent::__construct($params);
+ }
+
+ /**
+ */
+ protected function _attach($init)
+ {
+ global $page_output;
+
+ if ($init) {
+ $page_output->addScriptPackage('Horde_Core_Script_Package_Dialog');
+ $page_output->addScriptFile('alias.js', 'imp');
+ }
+
+ $params = $this->_params['params']
+ ?? [];
+ if (isset($params['reload'])) {
+ $params['reload'] = strval($params['reload']);
+ }
+
+
+ $js_params = [
+ 'hidden' => array_merge($params, ['keyid' => $this->_params['keyid']]),
+ 'text' => _('Enter the alias for your certificate.'),
+ ];
+
+ $js = 'ImpAliasDialog.display(' . Horde::escapeJson($js_params, ['nodelimit' => true]) . ')';
+ if (!empty($this->_params['onload'])) {
+ $page_output->addInlineScript([$js], true);
+ return false;
+ }
+
+ return $js;
+ }
+
+ /**
+ */
+ protected function _handle(Horde_Variables $vars)
+ {
+ return false;
+ }
+}
diff --git a/lib/Basic/Smime.php b/lib/Basic/Smime.php
index 11ef2589f..af0e12f07 100644
--- a/lib/Basic/Smime.php
+++ b/lib/Basic/Smime.php
@@ -29,6 +29,11 @@ class IMP_Basic_Smime extends IMP_Basic_Base
*/
protected $_smime;
+ /**
+ * @var IMP_Identity
+ */
+ protected $_identity;
+
/**
*/
protected function _init()
@@ -36,125 +41,222 @@ protected function _init()
global $injector, $notification;
$this->_smime = $injector->getInstance('IMP_Smime');
+ $this->_identity = $injector->getInstance('IMP_Identity');
+ $identityID = $this->_identity->getDefault();
/* Run through the action handlers */
switch ($this->vars->actionID) {
- case 'import_public_key':
- $this->_importKeyDialog('public');
- break;
-
- case 'process_import_public_key':
- try {
- $publicKey = $this->_getImportKey('upload_key', $this->vars->import_key);
-
- /* Add the public key to the storage system. */
- $this->_smime->addPublicKey($publicKey);
- $notification->push(_("S/MIME public key successfully added."), 'horde.success');
- $this->_reloadWindow();
- } catch (Horde_Browser_Exception $e) {
- $notification->push(_("No S/MIME public key imported."), 'horde.error');
- } catch (Horde_Exception $e) {
- $notification->push($e);
- }
+ case 'import_public_key':
+ $this->_importKeyDialog('public');
+ break;
+
+ case 'process_import_public_key':
+ try {
+ $publicKey = $this->_getImportKey('upload_key', $this->vars->import_key);
+
+ /* Add the public key to the storage system. */
+ $this->_smime->addPublicKey($publicKey);
+ $notification->push(_('S/MIME public key successfully added.'), 'horde.success');
+ $this->_reloadWindow();
+ } catch (Horde_Browser_Exception $e) {
+ $notification->push(_('No S/MIME public key imported.'), 'horde.error');
+ } catch (Horde_Exception $e) {
+ $notification->push($e);
+ }
- $this->vars->actionID = 'import_public_key';
- $this->_importKeyDialog('public');
- break;
+ $this->vars->actionID = 'import_public_key';
+ $this->_importKeyDialog('public');
+ break;
- case 'view_public_key':
- case 'info_public_key':
- try {
- $key = $this->_smime->getPublicKey($this->vars->email);
- } catch (Horde_Exception $e) {
- $key = $e->getMessage();
- }
- if ($this->vars->actionID == 'view_public_key') {
- $this->_textWindowOutput('S/MIME Public Key', $key);
- }
- $this->_printCertInfo($key);
- break;
-
- case 'view_personal_public_key':
- case 'view_personal_public_sign_key':
- $this->_textWindowOutput(
- 'S/MIME Personal Public Key',
- $this->_smime->getPersonalPublicKey(
- $this->vars->actionID == 'view_personal_public_sign_key'
- )
- );
- break;
-
- case 'info_personal_public_key':
- case 'info_personal_public_sign_key':
- $this->_printCertInfo(
- $this->_smime->getPersonalPublicKey(
- $this->vars->actionID == 'info_personal_public_sign_key'
- )
- );
- break;
-
- case 'view_personal_private_key':
- case 'view_personal_private_sign_key':
- $this->_textWindowOutput(
- 'S/MIME Personal Private Key',
- $this->_smime->getPersonalPrivateKey(
- $this->vars->actionID == 'view_personal_private_sign_key'
- )
- );
- break;
-
- case 'import_personal_certs':
- $this->_importKeyDialog('personal');
- break;
-
- case 'process_import_personal_certs':
- $reload = false;
- $pkcs12_2nd = false;
- try {
- $pkcs12 = $this->_getImportKey('upload_key');
- $this->_smime->addFromPKCS12($pkcs12, $this->vars->upload_key_pass, $this->vars->upload_key_pk_pass);
- $notification->push(_("S/MIME Public/Private Keypair successfully added."), 'horde.success');
- if ($pkcs12_2nd = $this->_getSecondaryKey()) {
- $this->_smime->addFromPKCS12($pkcs12, $this->vars->upload_key_pass2, $this->vars->upload_key_pk_pass2, true);
- $notification->push(_("Secondary S/MIME Public/Private Keypair successfully added."), 'horde.success');
+ case 'view_public_key':
+ case 'info_public_key':
+ try {
+ $key = $this->_smime->getPublicKey($this->vars->email, $identityID); // here the method is never used to get the keys of an identity
+ } catch (Horde_Exception $e) {
+ $key = $e->getMessage();
}
- $reload = true;
- } catch (Horde_Browser_Exception $e) {
- if ($e->getCode() != UPLOAD_ERR_NO_FILE ||
- !($pkcs12_2nd = $this->_getSecondaryKey())) {
- $notification->push(_("Personal S/MIME certificates NOT imported."), 'horde.error');
+ if ($this->vars->actionID == 'view_public_key') {
+ $this->_textWindowOutput('S/MIME Public Key', $key);
}
- } catch (Horde_Exception $e) {
- $notification->push(_("Personal S/MIME certificates NOT imported: ") . $e->getMessage(), 'horde.error');
- }
- if (!$reload &&
- ($pkcs12_2nd || ($pkcs12_2nd = $this->_getSecondaryKey()))) {
- if (!$this->_smime->getPersonalPublicKey()) {
- $notification->push(_("Cannot import secondary personal S/MIME certificates without primary certificates."), 'horde.error');
- } else {
- try {
- $this->_smime->addFromPKCS12($pkcs12_2nd, $this->vars->upload_key_pass2, $this->vars->upload_key_pk_pass2, true);
- $notification->push(_("Secondary S/MIME Public/Private Keypair successfully added."), 'horde.success');
- $reload = true;
- } catch (Horde_Exception $e) {
- $notification->push(_("Personal S/MIME certificates NOT imported: ") . $e->getMessage(), 'horde.error');
+ $this->_printCertInfo($key);
+ break;
+
+ case 'view_personal_public_key':
+ case 'view_personal_public_sign_key':
+ $this->_textWindowOutput(
+ 'S/MIME Personal Public Key',
+ $this->_smime->getPersonalPublicKey(
+ $this->vars->actionID == 'view_personal_public_sign_key',
+ $identityID
+ )
+ );
+ break;
+
+ case 'info_personal_public_key':
+ case 'info_personal_public_sign_key':
+ $this->_printCertInfo(
+ $this->_smime->getPersonalPublicKey(
+ $this->vars->actionID == 'info_personal_public_sign_key',
+ $identityID
+ )
+ );
+ break;
+
+ case 'view_extra_public_info':
+ $this->_printCertInfo(
+ $this->_smime->getExtraPublicKey(
+ $this->vars->pkID,
+ // if actionID euquals value, add it, otherwise load defaul value of function
+ $this->vars->actionID == 'view_personal_public_sign_info',
+ $identityID
+ )
+ );
+ break;
+
+ case 'view_personal_private_key':
+ case 'view_personal_private_sign_key':
+ $this->_textWindowOutput(
+ 'S/MIME Personal Private Key',
+ $this->_smime->getPersonalPrivateKey(
+ $this->vars->actionID == 'view_personal_private_sign_key',
+ $identityID
+ )
+ );
+ break;
+
+ case 'view_extra_private_keys':
+ $this->_textWindowOutput(
+ 'S/MIME Extra Private Keys',
+ $this->_smime->getExtraPrivateKey(
+ $this->vars->pkID,
+ // if actionID euquals value, add it, otherwise load defaul value of function
+ $this->vars->actionID == 'view_personal_private_sign_key',
+ $identityID
+ )
+ );
+ break;
+
+ case 'view_extra_public_keys':
+ $this->_textWindowOutput(
+ 'S/MIME Extra Private Keys',
+ $this->_smime->getExtraPublicKey(
+ $this->vars->pkID,
+ // if actionID euquals value, add it, otherwise load defaul value of function
+ $this->vars->actionID == 'view_personal_public_sign_key',
+ $identityID
+ )
+ );
+ break;
+
+ case 'import_personal_certs':
+ $this->_importKeyDialog('personal');
+ break;
+
+ case 'import_extra_personal_certs':
+ $this->_importKeyDialog('extra');
+ break;
+
+ case 'import_extra_identity_certs':
+ $this->_importKeyDialog('identity');
+ break;
+
+ case 'process_import_extra_identity_certs':
+ case 'process_import_extra_personal_certs':
+ $reload = false;
+ $pkcs12_2nd = false;
+ try {
+ // check if identity or personal certs are added
+ $identity = false;
+ $extra = false;
+ $identity_used =false;
+ if ($this->vars->actionID === 'process_import_extra_identity_certs') {
+ $identity=true;
+ $identityID = $this->_identity->getDefault();
+ } else {
+ $extra=true;
}
+ $pkcs12 = $this->_getImportKey('upload_key');
+ $this->_smime->addFromPKCS12($pkcs12, $this->vars->upload_key_pass, $this->vars->upload_key_pk_pass, null, $extra, $identityID, $identity_used);
+ // notifications on success or failure are in addFromPKCS12()
+ if ($pkcs12_2nd = $this->_getSecondaryKey()) {
+ // TODO: fix setup for secondary sign keys and such
+ }
+ $reload = true;
+ } catch (Horde_Browser_Exception $e) {
+ if ($e->getCode() != UPLOAD_ERR_NO_FILE ||
+ !($pkcs12_2nd = $this->_getSecondaryKey())) {
+ $notification->push(_('Personal S/MIME certificates NOT imported.'), 'horde.error');
+ }
+ } catch (Horde_Exception $e) {
+ $notification->push(_('Personal S/MIME certificates NOT imported: ') . $e->getMessage(), 'horde.error');
+ }
+ // TODO: fix setup for secondary sign keys and such
+ if ($reload) {
+ $this->_reloadWindow();
}
- }
- if ($reload) {
- $this->_reloadWindow();
- }
+ // set correct actionID and importKeyDialog feature
+ if ($identity) {
+ $this->vars->actionID = 'import_extra_identity_certs';
+ $this->_importKeyDialog('identity');
+ } elseif ($extra) {
+ $this->vars->actionID = 'import_extra_personal_certs';
+ $this->_importKeyDialog('extra');
+ }
+
+ break;
+
+ case 'process_import_personal_certs':
+ $reload = false;
+ $pkcs12_2nd = false;
+ $signkey = false; // because 'process_import_personal_sign_certs' should take care of that
+ $extrakey = false; // because these are not extra keys
+ $identityID = $this->_identity->getDefault(); // keys are added in dependence of their identity
+ try {
+ $pkcs12 = $this->_getImportKey('upload_key');
+ $this->_smime->addFromPKCS12($pkcs12, $this->vars->upload_key_pass, $this->vars->upload_key_pk_pass, $signkey, $extrakey, $identityID);
+ $notification->push(_('S/MIME Public/Private Keypair successfully added.'), 'horde.success');
+ if ($pkcs12_2nd = $this->_getSecondaryKey()) {
+ $this->_smime->addFromPKCS12($pkcs12, $this->vars->upload_key_pass2, $this->vars->upload_key_pk_pass2, $signkey=true, $extrakey, $identityID);
+ $notification->push(_('Secondary S/MIME Public/Private Keypair successfully added.'), 'horde.success');
+ }
+ $reload = true;
+ } catch (Horde_Browser_Exception $e) {
+ if ($e->getCode() != UPLOAD_ERR_NO_FILE ||
+ !($pkcs12_2nd = $this->_getSecondaryKey())) {
+ $notification->push(_('Personal S/MIME certificates NOT imported.'), 'horde.error');
+ }
+ } catch (Horde_Exception $e) {
+ $notification->push(_('Personal S/MIME certificates NOT imported: ') . $e->getMessage(), 'horde.error');
+ }
+ if (!$reload &&
+ ($pkcs12_2nd || ($pkcs12_2nd = $this->_getSecondaryKey()))) {
+ if (!$this->_smime->getPersonalPublicKey(0, $identityID)) {
+ $notification->push(_('Cannot import secondary personal S/MIME certificates without primary certificates.'), 'horde.error');
+ } else {
+ try {
+ $this->_smime->addFromPKCS12($pkcs12_2nd, $this->vars->upload_key_pass2, $this->vars->upload_key_pk_pass2, $signkey=true, $extrakey, $identityID);
+ $notification->push(_('Secondary S/MIME Public/Private Keypair successfully added.'), 'horde.success');
+ $reload = true;
+ } catch (Horde_Exception $e) {
+ $notification->push(_('Personal S/MIME certificates NOT imported: ') . $e->getMessage(), 'horde.error');
+ }
+ }
+ }
+
+ if ($reload) {
+ $this->_reloadWindow();
+ }
- $this->vars->actionID = 'import_personal_certs';
- $this->_importKeyDialog('personal');
- break;
+ $this->vars->actionID = 'import_personal_certs';
+ $this->_importKeyDialog('personal');
+ break;
}
}
/**
*/
- public static function url(array $opts = array())
+ public static function url(array $opts = [])
{
return Horde::url('basic.php')->add('page', 'smime');
}
@@ -175,12 +277,12 @@ protected function _getSecondaryKey()
return false;
}
$notification->push(
- _("Secondary personal S/MIME certificates NOT imported."),
+ _('Secondary personal S/MIME certificates NOT imported.'),
'horde.error'
);
} catch (Horde_Exception $e) {
$notification->push(
- _("Secondary personal S/MIME certificates NOT imported: ")
+ _('Secondary personal S/MIME certificates NOT imported: ')
. $e->getMessage(),
'horde.error'
);
@@ -200,17 +302,33 @@ protected function _importKeyDialog($target)
global $notification, $page_output, $registry;
$page_output->topbar = $page_output->sidebar = false;
- $page_output->addInlineScript(array(
- '$$("INPUT.horde-cancel").first().observe("click", function() { window.close(); })'
- ), true);
+ $page_output->addInlineScript([
+ '$$("INPUT.horde-cancel").first().observe("click", function() { window.close(); })',
+ ], true);
/* Import CSS located with prefs CSS. */
$p_css = new Horde_Themes_Element('prefs.css');
$page_output->addStylesheet($p_css->fs, $p_css->uri);
- $this->title = $target == 'personal'
- ? _("Import Personal S/MIME Certificate")
- : _("Import Public S/MIME Key");
+ // $this->title = $target == 'personal'
+ // ? _('Import Personal S/MIME Certificate')
+ // : _('Import Public S/MIME Key');
+ /* Setting target for personal, public and for extra certificates */
+ switch ($target) {
+ case 'personal':
+ $this->title = _('Import Personal S/MIME Certificate');
+ break;
+ case 'extra':
+ $this->title = _('Import Extra Personal S/MIME Certificates');
+ // no break
+ case 'identity':
+ $this->title = _('Import S/MIME Certificates for new Identity');
+ // no break
+ default:
+ $this->title = _('Import Public S/MIME Key');
+ break;
+ }
+
/* Need to use regular status notification - AJAX notifications won't
* show in popup windows. */
@@ -219,9 +337,9 @@ protected function _importKeyDialog($target)
$notification->attach('status');
}
- $view = new Horde_View(array(
- 'templatePath' => IMP_TEMPLATES . '/smime'
- ));
+ $view = new Horde_View([
+ 'templatePath' => IMP_TEMPLATES . '/smime',
+ ]);
$view->addHelper('Text');
$view->reload = $this->vars->reload;
@@ -235,11 +353,11 @@ protected function _importKeyDialog($target)
*/
protected function _reloadWindow()
{
- echo Horde::wrapInlineScript(array(
+ echo Horde::wrapInlineScript([
'opener.focus();'.
'opener.location.href="' . base64_decode($this->vars->reload) . '";',
- 'window.close();'
- ));
+ 'window.close();',
+ ]);
exit;
}
@@ -267,8 +385,8 @@ protected function _printCertInfo($cert = '')
$cert_info = $this->_smime->certToHTML($cert);
$this->_textWindowOutput(
- _("S/MIME Key Information"),
- empty($cert_info) ? _("Invalid key") : $cert_info,
+ _('S/MIME Key Information'),
+ empty($cert_info) ? _('Invalid key') : $cert_info,
!empty($cert_info)
);
}
@@ -288,8 +406,7 @@ protected function _getImportKey($filename, $key = null)
return $key;
}
- $GLOBALS['browser']->wasFileUploaded($filename, _("key"));
+ $GLOBALS['browser']->wasFileUploaded($filename, _('key'));
return file_get_contents($_FILES[$filename]['tmp_name']);
}
-
}
diff --git a/lib/Factory/Smime.php b/lib/Factory/Smime.php
index 52d730833..5054b3a84 100644
--- a/lib/Factory/Smime.php
+++ b/lib/Factory/Smime.php
@@ -32,8 +32,10 @@ public function create(Horde_Injector $injector)
return new IMP_Smime(
$injector->getInstance('Horde_Core_Factory_Crypt')->create(
'Horde_Crypt_Smime'
+ ),
+ $injector->getInstance('Horde_Core_Factory_Db')->create(
+ 'imp'
)
);
}
-
}
diff --git a/lib/Mime/Viewer/Smime.php b/lib/Mime/Viewer/Smime.php
index d2176bd17..95dffecbe 100644
--- a/lib/Mime/Viewer/Smime.php
+++ b/lib/Mime/Viewer/Smime.php
@@ -38,23 +38,23 @@ class IMP_Mime_Viewer_Smime extends Horde_Mime_Viewer_Base
*
* @var array
*/
- protected $_capability = array(
+ protected $_capability = [
'full' => false,
'info' => false,
'inline' => true,
- 'raw' => false
- );
+ 'raw' => false,
+ ];
/**
* Metadata for the current viewer/data.
*
* @var array
*/
- protected $_metadata = array(
+ protected $_metadata = [
'compressed' => false,
'embedded' => true,
- 'forceinline' => true
- );
+ 'forceinline' => true,
+ ];
/**
* IMP_Smime object.
@@ -95,35 +95,37 @@ protected function _renderInline()
$id = $this->_mimepart->getMimeId();
switch ($this->_mimepart->getType()) {
- case 'multipart/signed':
- if (!in_array($this->_mimepart->getContentTypeParameter('protocol'), array('application/pkcs7-signature', 'application/x-pkcs7-signature'))) {
- return array();
- }
- $this->_parseSignedData(true);
- // Fall-through
-
- case 'application/pkcs7-mime':
- case 'application/x-pkcs7-mime':
- $cache = $this->getConfigParam('imp_contents')->getViewCache();
-
- if (isset($cache->smime[$id])) {
- $ret = array(
- $id => array(
- 'data' => null,
- 'status' => $cache->smime[$id]['status'],
- 'type' => 'text/plain; charset=' . $this->getConfigParam('charset'),
- 'wrap' => $cache->smime[$id]['wrap']
- )
- );
- if (isset($cache->smime[$id]['sig'])) {
- $ret[$cache->smime[$id]['sig']] = null;
+ case 'multipart/signed':
+ if (!in_array($this->_mimepart->getContentTypeParameter('protocol'), ['application/pkcs7-signature', 'application/x-pkcs7-signature'])) {
+ return [];
}
- return $ret;
- }
- // Fall-through
+ $this->_parseSignedData(true);
+ // Fall-through
+
+ // no break
+ case 'application/pkcs7-mime':
+ case 'application/x-pkcs7-mime':
+ $cache = $this->getConfigParam('imp_contents')->getViewCache();
+
+ if (isset($cache->smime[$id])) {
+ $ret = [
+ $id => [
+ 'data' => null,
+ 'status' => $cache->smime[$id]['status'],
+ 'type' => 'text/plain; charset=' . $this->getConfigParam('charset'),
+ 'wrap' => $cache->smime[$id]['wrap'],
+ ],
+ ];
+ if (isset($cache->smime[$id]['sig'])) {
+ $ret[$cache->smime[$id]['sig']] = null;
+ }
+ return $ret;
+ }
+ // Fall-through
- default:
- return array();
+ // no break
+ default:
+ return [];
}
}
@@ -137,16 +139,16 @@ protected function _renderInline()
*/
protected function _getEmbeddedMimeParts()
{
- if (!in_array($this->_mimepart->getType(), array('application/pkcs7-mime', 'application/x-pkcs7-mime'))) {
+ if (!in_array($this->_mimepart->getType(), ['application/pkcs7-mime', 'application/x-pkcs7-mime'])) {
return null;
}
switch ($this->_getSmimeType($this->_mimepart)) {
- case 'signed-data':
- return $this->_parseSignedData();
+ case 'signed-data':
+ return $this->_parseSignedData();
- case 'enveloped-data':
- return $this->_parseEnvelopedData();
+ case 'enveloped-data':
+ return $this->_parseEnvelopedData();
}
}
@@ -162,66 +164,124 @@ protected function _parseEnvelopedData()
/* Initialize inline data. */
$status = new IMP_Mime_Status(
$this->_mimepart,
- _("The data in this part has been encrypted via S/MIME.")
+ _('The data in this part has been encrypted via S/MIME.')
);
$status->icon('mime/encryption.png', 'S/MIME');
$cache = $this->getConfigParam('imp_contents')->getViewCache();
- $cache->smime[$base_id] = array(
+ $cache->smime[$base_id] = [
'status' => $status,
- 'wrap' => ''
- );
+ 'wrap' => '',
+ ];
/* Is PGP active? */
$this->_initSmime();
if (empty($this->_impsmime)) {
- $status->addText(_("S/MIME support is not currently enabled so the data is unable to be decrypted."));
+ $status->addText(_('S/MIME support is not currently enabled so the data is unable to be decrypted.'));
return null;
}
if (!$this->_impsmime->getPersonalPrivateKey()) {
- $status->addText(_("No personal private key exists so the data is unable to be decrypted."));
+ $status->addText(_('No personal private key exists so the data is unable to be decrypted.'));
return null;
}
/* Make sure we have a passphrase. */
$passphrase = $this->_impsmime->getPassphrase();
if ($passphrase === false) {
- $imple = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create('IMP_Ajax_Imple_PassphraseDialog', array(
- 'type' => 'smimePersonal'
- ));
- $status->addText(Horde::link('#', '', '', '', '', '', '', array('id' => $imple->getDomId())) . _("You must enter the passphrase for your S/MIME private key to view this data.") . '');
+ $imple = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imple')->create('IMP_Ajax_Imple_PassphraseDialog', [
+ 'type' => 'smimePersonal',
+ ]);
+ $status->addText(Horde::link('#', '', '', '', '', '', '', ['id' => $imple->getDomId()]) . _('You must enter the passphrase for your S/MIME private key to view this data.') . '');
return null;
}
-
$raw_text = $this->_getPartStream($this->_mimepart->getMimeId());
+ /* Decrypt the message */
+
+ // try to decrypt the data
try {
+ // try only with default personal certificates
$decrypted_data = $this->_impsmime->decryptMessage($this->_mimepart->replaceEOL($raw_text, Horde_Mime_Part::RFC_EOL));
} catch (Horde_Exception $e) {
- $status->addText($e->getMessage());
- return null;
+ // get the identityID to retrieve the extra personal keys
+ $identity = $GLOBALS['injector']->getInstance('IMP_Identity');
+ $identityID = $identity->getDefault();
+ $decrypted_data = null;
+
+ /* Try with other identities of the same user */
+ // need to get the right key from the prefs-identitues serialized array!
+ $identities = $identity->getAll('id');
+ foreach ($identities as $key => $value) {
+ try {
+ $decrypted_data = $this->_impsmime->decryptMessage($this->_mimepart->replaceEOL($raw_text, Horde_Mime_Part::RFC_EOL), null, $key);
+ } catch (\Throwable $f) {
+ // error with identity will be thrown at the end of this method
+ }
+ if (!is_null($decrypted_data)) {
+ break;
+ }
+ }
+
+ /* try with extra personal certificates */
+ if (is_null($decrypted_data)) {
+ // because this is about decryption, the private key is needed.
+ // here the keys of all other identities need to be added!
+ $keyslist = [];
+ foreach ($identities as $key => $value) {
+ $keyslist = array_merge($keyslist, $this->_impsmime->listPrivateKeyIds('smime_private_key', $key));
+ }
+
+ // check if privatekeys can be retrieved
+ foreach ($keyslist as $key => $otherkey) {
+ try {
+ $decrypted_data = $this->_impsmime->decryptMessage($this->_mimepart->replaceEOL($raw_text, Horde_Mime_Part::RFC_EOL), $otherkey);
+ } catch (\Throwable $g) {
+ // error with identity will be thrown at the end of this method
+ }
+ if (!is_null($decrypted_data)) {
+ break;
+ }
+ }
+ }
+
+ /* if still nothing worked: return an error specifying why decryption did not work */
+ if (is_null($decrypted_data)) {
+ if (isset($g) && isset($f)){
+ $status->addText(' Could not decrypt with any keys in the database: '.$f->getMessage());
+ }
+ else if (isset($f)) {
+ $status->addText(' An error occured with the key of an identity: '.$f->getMessage());
+ }
+ else if (isset($g)){
+ $status->addText(' An error occured with an extra key: '.$g->getMessage());
+ }
+ else {
+ $status->addText(' Decryption failed ');
+ }
+ return null;
+ }
}
$cache->smime[$base_id]['wrap'] = 'mimePartWrapValid';
- $new_part = Horde_Mime_Part::parseMessage($decrypted_data, array(
- 'forcemime' => true
- ));
+ $new_part = Horde_Mime_Part::parseMessage($decrypted_data, [
+ 'forcemime' => true,
+ ]);
switch ($new_part->getType()) {
- case 'application/pkcs7-mime':
- case 'application/x-pkcs7-mime':
- $signed_data = ($this->_getSmimeType($new_part) === 'signed-data');
- break;
-
- case 'multipart/signed':
- $signed_data = true;
- break;
-
- default:
- $signed_data = false;
- break;
+ case 'application/pkcs7-mime':
+ case 'application/x-pkcs7-mime':
+ $signed_data = ($this->_getSmimeType($new_part) === 'signed-data');
+ break;
+
+ case 'multipart/signed':
+ $signed_data = true;
+ break;
+
+ default:
+ $signed_data = false;
+ break;
}
if ($signed_data) {
@@ -234,9 +294,9 @@ protected function _parseEnvelopedData()
);
$new_part->setMetadata('imp-smime-decrypt', $data);
- $new_part->setContents($decrypted_data, array(
- 'encoding' => 'binary'
- ));
+ $new_part->setContents($decrypted_data, [
+ 'encoding' => 'binary',
+ ]);
}
return $new_part;
@@ -263,9 +323,9 @@ protected function _parseSignedData($sig_only = false)
if (!$curr = $iterator->current()) {
// application/pkcs-7-mime might be the base part.
// See RFC 5751 3.4.2
- $data_id = $base_id;
+ $data_id = $base_id;
} else {
- $data_id = $curr->getMimeId();
+ $data_id = $curr->getMimeId();
}
$id_ob = new Horde_Mime_Id($data_id);
@@ -274,20 +334,20 @@ protected function _parseSignedData($sig_only = false)
/* Initialize inline data. */
$status = new IMP_Mime_Status(
$this->_mimepart,
- _("The data in this part has been digitally signed via S/MIME.")
+ _('The data in this part has been digitally signed via S/MIME.')
);
$status->icon('mime/encryption.png', 'S/MIME');
$cache = $this->getConfigParam('imp_contents')->getViewCache();
- $cache->smime[$base_id] = array(
+ $cache->smime[$base_id] = [
'sig' => $sig_id,
'status' => $status,
- 'wrap' => 'mimePartWrap'
- );
+ 'wrap' => 'mimePartWrap',
+ ];
if (!IMP_Smime::enabled()) {
$status->addText(
- _("S/MIME support is not enabled so the digital signature is unable to be verified.")
+ _('S/MIME support is not enabled so the digital signature is unable to be verified.')
);
return null;
}
@@ -311,7 +371,7 @@ protected function _parseSignedData($sig_only = false)
$status->action(IMP_Mime_Status::WARNING);
}
if (!is_array($sig_result->email)) {
- $sig_result->email = array($sig_result->email);
+ $sig_result->email = [$sig_result->email];
}
$email = implode(', ', $sig_result->email);
$cache->smime[$base_id]['wrap'] = 'mimePartWrapValid';
@@ -329,41 +389,47 @@ protected function _parseSignedData($sig_only = false)
isset($sig_result->email) &&
$GLOBALS['registry']->hasMethod('contacts/addField') &&
$GLOBALS['prefs']->getValue('add_source')) {
- $status->addText(sprintf(_("Sender: %s"), $imp_contents->linkViewJS($this->_mimepart, 'view_attach', htmlspecialchars($email), array(
- 'jstext' => _("View certificate details"),
- 'params' => array(
+ $status->addText(sprintf(_('Sender: %s'), $imp_contents->linkViewJS($this->_mimepart, 'view_attach', htmlspecialchars($email), [
+ 'jstext' => _('View certificate details'),
+ 'params' => [
'mode' => IMP_Contents::RENDER_INLINE,
- 'view_smime_key' => 1
- )
- ))));
+ 'view_smime_key' => 1,
+ ],
+ ])));
foreach ($sig_result->email as $single_email) {
try {
- $this->_impsmime->getPublicKey($single_email);
+ $this->_impsmime->getPublicKey($single_email); // this is used to check if a public keys exists, if not: ask if user wants to save it in the adresbook
} catch (Horde_Exception $e) {
$imple = $GLOBALS['injector']
->getInstance('Horde_Core_Factory_Imple')
->create(
'IMP_Ajax_Imple_ImportEncryptKey',
- array(
+ [
'mime_id' => $base_id,
'muid' => strval($imp_contents->getIndicesOb()),
- 'type' => 'smime'
- )
+ 'type' => 'smime',
+ ]
);
$status->addText(
Horde::link(
- '#', '', '', '', '', '', '',
- array('id' => $imple->getDomId())
+ '#',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ ['id' => $imple->getDomId()]
)
- . _("Save the certificate to your Address Book.")
+ . _('Save the certificate to your Address Book.')
. ''
);
break;
}
}
} elseif (strlen($email)) {
- $status->addText(sprintf(_("Sender: %s"), htmlspecialchars($email)));
+ $status->addText(sprintf(_('Sender: %s'), htmlspecialchars($email)));
}
} catch (Horde_Exception $e) {
$status->action(IMP_Mime_Status::ERROR);
@@ -373,7 +439,7 @@ protected function _parseSignedData($sig_only = false)
} else {
$status->addMimeAction(
'smimeVerifyMsg',
- _("Click to verify the data.")
+ _('Click to verify the data.')
);
}
@@ -384,7 +450,7 @@ protected function _parseSignedData($sig_only = false)
if (!($subpart = $imp_contents->getMimePart($sig_id))) {
try {
$msg_data = $this->_impsmime->extractSignedContents($raw_text);
- $subpart = Horde_Mime_Part::parseMessage($msg_data, array('forcemime' => true));
+ $subpart = Horde_Mime_Part::parseMessage($msg_data, ['forcemime' => true]);
} catch (Horde_Exception $e) {
$status->addText($e->getMessage());
return null;
@@ -402,7 +468,7 @@ protected function _parseSignedData($sig_only = false)
protected function _outputSmimeKey()
{
if (empty($this->_impsmime)) {
- return array();
+ return [];
}
$raw_text = $this->_getPartStream($this->_mimepart->getMimeId());
@@ -410,15 +476,15 @@ protected function _outputSmimeKey()
try {
$sig_result = $this->_impsmime->verifySignature($this->_mimepart->replaceEOL($raw_text, Horde_Mime_Part::RFC_EOL));
} catch (Horde_Exception $e) {
- return array();
+ return [];
}
- return array(
- $this->_mimepart->getMimeId() => array(
+ return [
+ $this->_mimepart->getMimeId() => [
'data' => $this->_impsmime->certToHTML($sig_result->cert),
- 'type' => 'text/html; charset=' . $this->getConfigParam('charset')
- )
- );
+ 'type' => 'text/html; charset=' . $this->getConfigParam('charset'),
+ ],
+ ];
}
/**
@@ -426,7 +492,7 @@ protected function _outputSmimeKey()
protected function _getPartStream($id)
{
return $id
- ? $this->getConfigParam('imp_contents')->getBodyPart($id, array('mimeheaders' => true, 'stream' => true))->data
+ ? $this->getConfigParam('imp_contents')->getBodyPart($id, ['mimeheaders' => true, 'stream' => true])->data
: $this->getConfigParam('imp_contents')->fullMessageText();
}
@@ -458,15 +524,15 @@ protected function _getSmimeType(Horde_Mime_Part $part)
if ($val2['type'] == FILE_ASN1_TYPE_OBJECT_IDENTIFIER) {
/* ASN.1 values from STD 70/RFC 5652 - CMS syntax */
switch ($val2['content']) {
- case '1.2.840.113549.1.7.2':
- return 'signed-data';
+ case '1.2.840.113549.1.7.2':
+ return 'signed-data';
- case '1.2.840.113549.1.7.3':
- return 'enveloped-data';
+ case '1.2.840.113549.1.7.3':
+ return 'enveloped-data';
- default:
- // Other types not supported as of now.
- return null;
+ default:
+ // Other types not supported as of now.
+ return null;
}
}
}
@@ -475,5 +541,4 @@ protected function _getSmimeType(Horde_Mime_Part $part)
return null;
}
-
}
diff --git a/lib/Prefs/Identity.php b/lib/Prefs/Identity.php
index 6d7692be0..b9f14ab94 100644
--- a/lib/Prefs/Identity.php
+++ b/lib/Prefs/Identity.php
@@ -11,6 +11,8 @@
* @package IMP
*/
+use Horde\Util\HordeString;
+
/**
* This class provides an IMP-specific interface to all identities a
* user might have. Its methods take care of any site-specific
@@ -30,22 +32,22 @@ class IMP_Prefs_Identity extends Horde_Core_Prefs_Identity
*
* @var array
*/
- protected $_cached = array(
- 'aliases' => array(),
- 'from' => array(),
- 'names' => array(),
- 'signatures' => array()
- );
+ protected $_cached = [
+ 'aliases' => [],
+ 'from' => [],
+ 'names' => [],
+ 'signatures' => [],
+ ];
/**
* Identity preferences added by IMP.
*
* @var array
*/
- protected $_impPrefs = array(
+ protected $_impPrefs = [
'replyto_addr', 'alias_addr', 'tieto_addr', 'bcc_addr', 'signature',
- 'signature_html', 'save_sent_mail', IMP_Mailbox::MBOX_SENT
- );
+ 'signature_html', 'save_sent_mail', IMP_Mailbox::MBOX_SENT, 'smimeselect', 'privkey', 'privsignkey', 'pubkey', 'pubsignkey',
+ ];
/**
* Reads all the user's identities from the prefs object or builds
@@ -139,12 +141,11 @@ public function getFromLine($ident = null, $from_address = '')
*/
public function getSelectList()
{
- $list = array();
+ $list = [];
foreach ($this->getAll($this->_prefnames['id']) as $k => $v) {
$list[$k] = strval($this->getFromAddress($k)) . ' (' . $v . ')';
}
-
return $list;
}
@@ -206,6 +207,37 @@ public function getFromAddress($ident = null)
return $this->_cached['from'][$ident];
}
+
+ /**
+ * Returns the email adress in a human readable form. Constructed from the Horde_Mail_Rfc822_Address object.
+ *
+ * @param integer $ident The identity to retrieve the address from.
+ *
+ * @return String A humanreadale email-address.
+ */
+ public function getEmail()
+ {
+ $idArray = $this->get($this->getDefault());
+ $emailadress = $idArray['from_addr'];
+ return $emailadress;
+ }
+
+ /**
+ * Returns all email adress in a human readable form. Constructed from the Horde_Mail_Rfc822_Address object.
+ *
+ *
+ * @return Array An array of humanreadale email-addresses (strings).
+ */
+ public function getEmailsOfIds()
+ {
+ $list = [];
+
+ foreach ($this->getAll($this->_prefnames['id']) as $k => $v) {
+ $list[$k] = strval($this->getEmail());
+ }
+ return $list;
+ }
+
/**
* Returns all aliases based on the chosen identity.
*
@@ -314,7 +346,7 @@ protected function _identitiesWithDefaultFirst()
$ids = $this->_identities;
$default = $this->getDefault();
unset($ids[$default]);
- return array_merge(array($default), array_keys($ids));
+ return array_merge([$default], array_keys($ids));
}
/**
@@ -504,13 +536,13 @@ public function getValue($key, $identity = null)
$val = parent::getValue($key, $identity);
switch ($key) {
- case IMP_Mailbox::MBOX_SENT:
- return (is_string($val) && strlen($val))
- ? IMP_Mailbox::get(IMP_Mailbox::prefFrom($val))
- : null;
+ case IMP_Mailbox::MBOX_SENT:
+ return (is_string($val) && strlen($val))
+ ? IMP_Mailbox::get(IMP_Mailbox::prefFrom($val))
+ : null;
- default:
- return $val;
+ default:
+ return $val;
}
}
@@ -522,25 +554,28 @@ public function getValue($key, $identity = null)
public function setValue($key, $val, $identity = null)
{
switch ($key) {
- case 'alias_addr':
- case 'bcc_addr':
- case 'replyto_addr':
- case 'tieto_addr':
- if (is_string($val) && (strpbrk($val, "\r\n") !== false)) {
- $val = preg_split("/[\r\n]+/", $val);
- }
+ case 'alias_addr':
+ case 'bcc_addr':
+ case 'replyto_addr':
+ case 'tieto_addr':
+ if (is_string($val) && (strpbrk($val, "\r\n") !== false)) {
+ $val = preg_split("/[\r\n]+/", $val);
+ }
- /* Validate Reply-To, Alias, Tie-to, and BCC addresses. */
- $val = IMP::parseAddressList($val, array(
- 'limit' => ($val == 'replyto_addr') ? 1 : 0
- ))->addresses;
- break;
-
- case IMP_Mailbox::MBOX_SENT:
- $GLOBALS['injector']->getInstance('IMP_Mailbox_SessionCache')
- ->expire(IMP_Mailbox_SessionCache::CACHE_SPECIALMBOXES);
- $val = IMP_Mailbox::prefTo($val);
- break;
+ /* Validate Reply-To, Alias, Tie-to, and BCC addresses. */
+ $val = IMP::parseAddressList($val, [
+ 'limit' => ($val == 'replyto_addr') ? 1 : 0,
+ ])->addresses;
+ break;
+
+ case IMP_Mailbox::MBOX_SENT:
+ $GLOBALS['injector']->getInstance('IMP_Mailbox_SessionCache')
+ ->expire(IMP_Mailbox_SessionCache::CACHE_SPECIALMBOXES);
+ $val = IMP_Mailbox::prefTo($val);
+ break;
+ case 'pubkey':
+ case 'privkey':
+ break;
}
return parent::setValue($key, $val, $identity);
@@ -558,7 +593,7 @@ public function setValue($key, $val, $identity = null)
*/
public function getAllSentmail($unique = true)
{
- $list = array();
+ $list = [];
foreach (array_keys($this->_identities) as $key) {
if ($mbox = $this->getValue(IMP_Mailbox::MBOX_SENT, $key)) {
@@ -584,5 +619,4 @@ public function saveSentmail($ident = null)
? $this->getValue('save_sent_mail', $ident)
: false;
}
-
}
diff --git a/lib/Prefs/Special/SmimeAliasHandler.php b/lib/Prefs/Special/SmimeAliasHandler.php
new file mode 100644
index 000000000..9730e27b4
--- /dev/null
+++ b/lib/Prefs/Special/SmimeAliasHandler.php
@@ -0,0 +1,36 @@
+
+ * @author Michael Slusarz
+ * @category Horde
+ * @copyright 2012-2017 Horde LLC
+ * @license http://www.horde.org/licenses/gpl GPL
+ * @package IMP
+ */
+class IMP_Prefs_Special_SmimeAliasHandler
+{
+ public function handle($keyid, $alias, $identityID){
+
+ global $injector, $notification;
+
+ $result = false;
+
+ if (empty($keyid) || empty($alias)) {
+ $notification->push(_('No alias entered.'), 'horde.error');
+ return $result;
+ }
+
+ try {
+ $injector->getInstance('IMP_Smime')->updateAlias($keyid, $alias, $identityID);
+ $result = true;
+ $notification->push(_('Alias has been set.'), 'horde.success');
+ } catch (Horde_Exception $e) {
+ $notification->push($e, 'horde.error');
+ }
+
+ return ($result);
+ }
+}
diff --git a/lib/Prefs/Special/SmimeIdentities.php b/lib/Prefs/Special/SmimeIdentities.php
new file mode 100644
index 000000000..4a72a6692
--- /dev/null
+++ b/lib/Prefs/Special/SmimeIdentities.php
@@ -0,0 +1,49 @@
+
+ * @author Michael Slusarz
+ * @category Horde
+ * @copyright 2012-2017 Horde LLC
+ * @license http://www.horde.org/licenses/gpl GPL
+ * @package IMP
+ */
+class IMP_Prefs_Special_SmimeIdentities implements Horde_Core_Prefs_Ui_Special
+{
+ /**
+ */
+ public function init(Horde_Core_Prefs_Ui $ui)
+ {
+ }
+
+ /**
+ */
+ public function display(Horde_Core_Prefs_Ui $ui)
+ {
+ global $injector, $page_output;
+
+ $view = new Horde_View([
+ 'templatePath' => IMP_TEMPLATES . '/prefs',
+ ]);
+ $view->addHelper('Horde_Core_View_Helper_Help');
+ $view->addHelper('Text');
+
+ $identity = $injector->getInstance('IMP_Identity');
+ $identityID = $identity->getDefault();
+ $view->defaultIdentity = $identity->getFullname($identityID);
+ $view->defaultAdres = $identity->getEmail();
+ $view->linkMailIdentity = Horde::url($GLOBALS['registry']->getServiceLink('prefs', 'imp'), true)->add('group', 'identities');
+
+ return $view->render('smimeidentities');
+ }
+
+ /**
+ */
+ public function update(Horde_Core_Prefs_Ui $ui)
+ {
+ // this can eventually be updated to allow the user to switch identities within the smime prefs section. Could be more convenient.
+ return false;
+ }
+}
diff --git a/lib/Prefs/Special/SmimePrivateKey.php b/lib/Prefs/Special/SmimePrivateKey.php
index 87006f3d1..8fdc9ddd5 100644
--- a/lib/Prefs/Special/SmimePrivateKey.php
+++ b/lib/Prefs/Special/SmimePrivateKey.php
@@ -23,57 +23,205 @@
*/
class IMP_Prefs_Special_SmimePrivateKey implements Horde_Core_Prefs_Ui_Special
{
+ /**
+ * View variable to share accross functions in this class, contains the ui?
+ */
+ private $view = null;
+
+ /**
+ * Identities variable: set to true if the users loads the prefs page to set identities
+ */
+ private $identities = false;
+
+ /**
+ * Smime url: generates the URL needed for the links to the SMIME keys
+ */
+ private $smime_url;
+
+ /**
+ * Smime prefs url: generate the url for the prefs for smime
+ */
+ private $smime_prefs_url;
+
+ /**
+ * Smime: class that holds the variable that interact with the database
+ */
+ private $smime;
+
+ /**
+ * Identity: class that holds methods to get information about the identities saved in the prefs table
+ */
+ private $identity;
+
/**
*/
public function init(Horde_Core_Prefs_Ui $ui)
{
+ global $injector;
+
+ /* Loading Smime bas url in order to set links to it */
+ $this->smime_url = IMP_Basic_Smime::url();
+
+ /* Page base url */
+ $this->smime_prefs_url = Horde::url($GLOBALS['registry']->getServiceLink('prefs', 'imp'), true)->add('group', 'smime');
+
+ /* Loading the IMP Smime class which hods all the methods that a.o. interact wiht the DB */
+ $this->smime = $injector->getInstance('IMP_Smime');
+
+ /* Get Identity Class Object */
+ $this->identity = $injector->getInstance('IMP_Identity');
+ }
+
+ private function checkIdentityPageIsUsed(Horde_Core_Prefs_Ui $ui)
+ {
+ if ($ui->vars->group === 'identities') {
+ $this->identities = true;
+ return true;
+ }
+ return false;
+ }
+
+ private function setUploadScripts($ui, $identityID = null)
+ {
+ global $browser, $page_output, $session;
+
+ $view = $this->view;
+ $identities = $this->identities;
+ $smime_url = $this->smime_url;
+
+ if ($browser->allowFileUploads()) {
+ $view->import = true;
+ $page_output->addInlineScript([
+ 'if ($("import_smime_personal") != undefined) $("import_smime_personal").observe("click", function(e) { ' . Horde::popupJs($smime_url, ['params' => ['actionID' => 'import_personal_certs', 'reload' => base64_encode($ui->selfUrl()->setRaw(true))], 'height' => 450, 'width' => 750, 'urlencode' => true]) . '; e.stop(); })',
+ 'if ($("import_extra_smime_personal") != undefined) $("import_extra_smime_personal").observe("click", function(e) { ' . Horde::popupJs($smime_url, ['params' => ['actionID' => 'import_extra_personal_certs', 'reload' => base64_encode($ui->selfUrl()->setRaw(true))], 'height' => 450, 'width' => 750, 'urlencode' => true]) . '; e.stop(); })',
+ ], true);
+ }
+
+ if ($identities) {
+ $page_output->addScriptFile('prefs/switchencryptionoptions.js');
+ }
+ }
+
+ /**
+ * Function to list all extra keys
+ */
+ private function listExtraKeys($identityID = 0)
+ {
+ try {
+ $extra_private_keys = $this->smime->listAllKeys($prefName = 'smime_private_key', $identityID); // TODO: what about singkeys?
+ } catch (Horde_Exception $e) {
+ $extra_private_keys = [];
+ }
+
+ return $extra_private_keys;
}
/**
+ * Displays function of Horde_Core_Prefs_Ui, called after init()
*/
- public function display(Horde_Core_Prefs_Ui $ui)
+ public function display(Horde_Core_Prefs_Ui $ui, $identityID =0)
{
- global $browser, $injector, $page_output, $prefs;
+ global $injector, $prefs, $page_output, $vars;
+
+ $this->checkIdentityPageIsUsed($ui);
+ $identity = $this->identity;
+ $identities = $this->identities;
+ $smime_url = $this->smime_url;
+ $smime = $this->smime;
+
+ /* Adding js to page output */
$page_output->addScriptPackage('IMP_Script_Package_Imp');
+ /* Get the current default Idenity ID to load the keys that belong to it */
+ $defaultIdentity = $identity->getDefault();
+
+ /* Adding css to page output */
$p_css = new Horde_Themes_Element('prefs.css');
$page_output->addStylesheet($p_css->fs, $p_css->uri);
- $view = new Horde_View(array(
- 'templatePath' => IMP_TEMPLATES . '/prefs'
- ));
+ /* an instance of IMP_smime to be able to list all keys, their ids and aliases from the DB */
+ try {
+ $extra_private_keys = $smime->listAllKeys($prefName = 'smime_private_key', $defaultIdentity); // TODO: what about singkeys?
+ } catch (Horde_Exception $e) {
+ $extra_private_keys = [];
+ }
+
+ /* Loading View Template and Help Template */
+ $this->view = $view = new Horde_View([
+ 'templatePath' => IMP_TEMPLATES . '/prefs',
+ ]);
$view->addHelper('Horde_Core_View_Helper_Help');
+ /* Set the result of the identity check to the view */
+ $view->identities = $identities;
+
+ /* Loading Connection Status to View */
if (!Horde::isConnectionSecure()) {
$view->notsecure = true;
return $view->render('smimeprivatekey');
}
- $smime_url = IMP_Basic_Smime::url();
+ /* Loading Keys that are set as Personal Certificate
+ (the certificates that are actually used) */
- $view->has_key = $prefs->getValue('smime_public_key') &&
- $prefs->getValue('smime_private_key');
- $view->has_sign_key = $prefs->getValue('smime_public_sign_key') &&
- $prefs->getValue('smime_private_sign_key');
+ // Check if this concerns the keys of an identity.
+ // Identities are used to reply to mails with a seemingly different account.
+ // See: Preferences > Mail > Personal Information
+ if (!$identities) {
+ $view->has_key = $smime->getPersonalPrivateKey(0, $defaultIdentity) &&
+ $smime->getPersonalPublicKey(0, $defaultIdentity); // check if both private and public keys can be fetched (returns a boolean)
+ $smime->getPersonalPrivateKey(1, $defaultIdentity) &&
+ $smime->getPersonalPublicKey(1, $defaultIdentity);
+ } else {
+ // Ask user to go the smime page to set the keys for each identity
+ $view->relink = Horde::link($this->smime_prefs_url)
+ . _('Change SMIME preferences here') . '';
+ }
- if ($browser->allowFileUploads()) {
- $view->import = true;
- $page_output->addInlineScript(array(
- '$("import_smime_personal").observe("click", function(e) { ' . Horde::popupJs($smime_url, array('params' => array('actionID' => 'import_personal_certs', 'reload' => base64_encode($ui->selfUrl()->setRaw(true))), 'height' => 450, 'width' => 750, 'urlencode' => true)) . '; e.stop(); })'
- ), true);
+
+ /* Addding to view: Browser Importoptions for uploading Certificates */
+ $this->setUploadScripts($ui);
+
+
+ /* Loading private keys from the Database that are not used as Personal Certificates */
+ if (!empty($extra_private_keys)) {
+ // adding base url links to each private key: so one can view the keys
+ $pk_list = [];
+ $countnumber = 0;
+ foreach ($extra_private_keys as $val) {
+ $privatelink = $smime_url->copy()->add(['actionID' => 'view_extra_private_keys', 'pkID' => $val['private_key_id']]);
+ $publiclink = $smime_url->copy()->add(['actionID' => 'view_extra_public_keys', 'pkID' => $val['private_key_id']]);
+ $publicInfoLink = $smime_url->copy()->add(['actionID' => 'view_extra_public_info', 'pkID' => $val['private_key_id']]);
+ $title = 'View Extra Private Keys';
+ $pk_list[$countnumber]['publiclink'] = Horde::link($publiclink, $title, null, 'view_key');
+ $pk_list[$countnumber]['publicinfolink'] = Horde::link($publicInfoLink, $title, null, 'info_key');
+ $pk_list[$countnumber]['privatelink'] = Horde::link($privatelink, $title, null, 'view_key');
+ $pk_list[$countnumber]['id'] = $val['private_key_id'];
+ $pk_list[$countnumber]['alias'] = $val['alias'];
+ $countnumber ++;
+ }
+
+ // Adding extra private keys to view
+ $view->{'viewprivateextras'} = $pk_list;
}
+
+ /* If no key was found, return the current view and discontinue rest of the logic from here on */
if (!$view->has_key) {
return $view->render('smimeprivatekey');
}
- $smime = $injector->getInstance('IMP_Smime');
- foreach (array('' => false, '_sign' => true) as $suffix => $secondary) {
+ /* adding primary and secondary personal keys */
+ foreach (['' => false, '_sign' => true] as $suffix => $secondary) {
+ // If no secondary Ceritificates or signkeys are found: skip this loop
if ($secondary && !$view->has_sign_key) {
continue;
}
- $cert = $smime->parseCert($smime->getPersonalPublicKey($secondary));
+ $pubkey = $smime->getPersonalPublicKey($secondary, $defaultIdentity);
+ $cert = $smime->parseCert($pubkey);
+
+ // Checking for validity date if set
if (!empty($cert['validity']['notafter'])) {
$expired = new Horde_Date($cert['validity']['notafter']);
if ($expired->before(time())) {
@@ -86,101 +234,192 @@ public function display(Horde_Core_Prefs_Ui $ui)
}
}
+ // TODO: default identity should be gotten from the identity field in the prefs table always so switching becomes possible
$view->{'viewpublic' . $suffix} = $smime_url->copy()
->add('actionID', 'view_personal_public' . $suffix . '_key')
- ->link(array(
+ ->link([
'title' => $secondary
- ? _("View Secondary Personal Public Certificate")
- : _("View Personal Public Certificate"),
- 'target' => 'view_key'
- ))
- . _("View") . '';
+ ? _('View Secondary Personal Public Certificate')
+ : _('View Personal Public Certificate'),
+ 'target' => 'view_key',
+ ])
+ . _('View') . '';
+
$view->{'infopublic' . $suffix} = $smime_url->copy()
->add('actionID', 'info_personal_public' . $suffix . '_key')
- ->link(array(
- 'title' => _("Information on Personal Public Certificate"),
- 'target' => 'info_key'
- ))
- . _("Details") . '';
+ ->link([
+ 'title' => _('Information on Personal Public Certificate'),
+ 'target' => 'info_key',
+ ])
+ . _('Details') . '';
+
+ $view->{'privatekeyexits'} = $smime->getSetPrivateKeyId(0, $defaultIdentity); // check if private key exists and return its id value if so
+ $view->{'signkeyexits'} = $smime->getSetPrivateKeyId(1, $defaultIdentity); // Note: self::KEY_SECONDARY = 1 in Smime.php... This checks if a sign ey exists and returns the id
+ $view->{'aliasexists'} = $smime->getAlias($view->privatekeyexits, $defaultIdentity); // gets the alias of the key by ID
+ $view->{'signaliasexists'} = $smime->getAlias($view->signkeyexits, $defaultIdentity); // gets the alias of the key by ID
+
+ // set alias
+ if ($secondary === true) {
+ $imple2 = $injector->getInstance('Horde_Core_Factory_Imple')->create(
+ 'IMP_Ajax_Imple_AliasDialog',
+ [
+ 'params' => [
+ 'reload' => $ui->selfUrl()->setRaw(true),
+ 'secondary' => intval($secondary),
+ ],
+ 'keyid' => $view->signkeyexits,
+ ]
+ );
+ } else {
+ $imple2 = $injector->getInstance('Horde_Core_Factory_Imple')->create(
+ 'IMP_Ajax_Imple_AliasDialog',
+ [
+ 'params' => [
+ 'reload' => $ui->selfUrl()->setRaw(true),
+ 'secondary' => intval($secondary),
+ ],
+ 'keyid' => $view->privatekeyexits,
+ ]
+ );
+ }
+
+ $view->{'alias' . $suffix} = Horde::link(
+ '#',
+ _('Enter Alias'),
+ null,
+ null,
+ null,
+ null,
+ null,
+ ['id' => $imple2->getDomId()]
+ ) . _('Enter Alias') . '';
if ($smime->getPassphrase($secondary)) {
- $view->{'passphrase' . $suffix} = $ui->selfUrl(array(
+ $view->{'passphrase' . $suffix} = $ui->selfUrl([
'special' => true,
- 'token' => true
- ))
+ 'token' => true,
+ ])
->add('unset_smime' . $suffix . '_passphrase', 1)
- ->link(array(
- 'title' => _("Unload Passphrase")
- ))
- . _("Unload Passphrase") . '';
+ ->link([
+ 'title' => _('Unload Passphrase'),
+ ])
+ . _('Unload Passphrase') . '';
} else {
$imple = $injector->getInstance('Horde_Core_Factory_Imple')
->create(
'IMP_Ajax_Imple_PassphraseDialog',
- array(
- 'params' => array(
+ [
+ 'params' => [
'reload' => $ui->selfUrl()->setRaw(true),
- 'secondary' => intval($secondary)
- ),
- 'type' => 'smimePersonal'
- )
+ 'secondary' => intval($secondary),
+ ],
+ 'type' => 'smimePersonal',
+ ]
);
$view->{'passphrase' . $suffix} = Horde::link(
'#',
- _("Enter Passphrase"),
+ _('Enter Passphrase'),
null,
null,
null,
null,
null,
- array('id' => $imple->getDomId())
- ) . _("Enter Passphrase");
+ ['id' => $imple->getDomId()]
+ ) . _('Enter Passphrase') . '';
}
+ // Adding to view: private key link
$view->{'viewprivate' . $suffix} = $smime_url->copy()
->add('actionID', 'view_personal_private' . $suffix . '_key')
- ->link(array(
- 'title' => _("View Secondary Personal Private Key"),
- 'target' => 'view_key'
- ))
- . _("View") . '';
- $page_output->addInlineScript(array(
- '$("delete_smime_personal' . $suffix . '").observe("click", function(e) { if (!window.confirm(' . json_encode(_("Are you sure you want to delete your keypair? (This is NOT recommended!)")) . ')) { e.stop(); } })'
- ), true);
+ ->link([
+ 'title' => _('View Secondary Personal Private Key'),
+ 'target' => 'view_key',
+ ])
+ . _('View') . '';
+
+ // Warning if the set personal key is about to be deleted
+ $page_output->addInlineScript([
+ 'if ($("delete_smime_personal' . $suffix . '") != undefined) $("delete_smime_personal' . $suffix . '").observe("click", function(e) { if (!window.confirm(' . json_encode(_('Are you sure you want to delete your keypair? (Please click "Unset Personal Certificate" if you want to save the key in the keystore. Non-saved certificates will be removed permanently.)')) . ')) { e.stop(); } })',
+ 'if ($("delete_smime_extra' . $suffix . '") != undefined) $("delete_smime_extra' . $suffix . '").observe("click", function(e) { if (!window.confirm(' . json_encode(_('Are you sure you want to delete your keypair? You are trying to delete a keypair from the keystore. If you continue these certificates will be removed permanently. ')) . ')) { e.stop(); } })',
+ 'if ($("unset_smime_personal' . $suffix . '") != undefined) $("unset_smime_personal' . $suffix . '").observe("click", function(e) { if (!window.confirm(' . json_encode(_('Are you sure you want to unset your keypair? You will need to add another key to be able to send encrypted mails.')) . ')) { e.stop(); } })',
+ 'if ($("set_smime_personal' . $suffix . '") != undefined) $("set_smime_personal' . $suffix . '").observe("click", function(e) { if (!window.confirm(' . json_encode(_('Are you sure you want to set a new keypair? Currently set keypair will be moved to the database. New emails will be encrypted with the newly set keypair.')) . ')) { e.stop(); } })',
+ 'if ($("unset_smime_secondary' . $suffix . '") != undefined) $("unset_smime_secondary' . $suffix . '").observe("click", function(e) { if (!window.confirm(' . json_encode(_('Are you sure you want to unset your secondary keypair?')) . ')) { e.stop(); } })',
+ 'if ($("set_smime_secondary' . $suffix . '") != undefined) $("set_smime_secondary' . $suffix . '").observe("click", function(e) { if (!window.confirm(' . json_encode(_('Are you sure you want to set a singing key? Current key for singing will be moved to the database. New emails will be singing with the newly set singing key.')) . ')) { e.stop(); } })',
+ ], true);
}
+
+
return $view->render('smimeprivatekey');
}
+
/**
*/
public function update(Horde_Core_Prefs_Ui $ui)
{
global $injector, $notification;
- if (isset($ui->vars->delete_smime_personal) ||
+ $identityID = $this->identity->getDefault();
+
+ if (isset($ui->vars->delete_smime_personal) || // delete personal certificates
isset($ui->vars->delete_smime_personal_sign)) {
- $injector->getInstance('IMP_Smime')->deletePersonalKeys(
- $ui->vars->delete_smime_personal_sign
+ $injector->getInstance('IMP_Smime')->deletePersonalKeys( // for deletion this needs to get the identity id...
+ $ui->vars->delete_smime_personal_sign,
+ $identityID
);
$notification->push(
isset($ui->vars->delete_smime_personal_sign)
- ? _("Secondary personal S/MIME keys deleted successfully.")
- : _("Personal S/MIME keys deleted successfully."),
+ ? _('Secondary personal S/MIME keys deleted successfully.')
+ : _('Personal S/MIME keys deleted successfully.'),
'horde.success'
);
- } elseif (isset($ui->vars->unset_smime_passphrase) ||
+ } elseif (isset($ui->vars->delete_smime_extra)) { // delete extra certificates
+ $injector->getInstance('IMP_Smime')->deleteExtraKey(
+ $ui->vars->delete_smime_extra,
+ $identityID
+ );
+ $notification->push(
+ isset($ui->vars->delete_smime_extra_secondary) // TODO: fix deletion of additional extra secondary keys?
+ ? _('Secondary extra S/MIME keys deleted successfully.')
+ : _('Extra S/MIME keys deleted successfully.'),
+ 'horde.success'
+ );
+ } elseif (isset($ui->vars->unset_smime_passphrase) || // change passphrase
isset($ui->vars->unset_smime_sign_passphrase)) {
$injector->getInstance('IMP_Smime')->unsetPassphrase(
$ui->vars->unset_smime_sign_passphrase
);
$notification->push(
- _("S/MIME passphrase successfully unloaded."),
+ _('S/MIME passphrase successfully unloaded.'),
+ 'horde.success'
+ );
+ } elseif (isset($ui->vars->unset_smime_personal)) { // unsetting personal certificate and transfering it to the db
+ $injector->getInstance('IMP_Smime')->unsetSmimePersonal(0, false, $identityID);
+ } elseif (isset($ui->vars->unset_smime_secondary)) { // unsetting secondary certificate and transfering it to the db
+ $injector->getInstance('IMP_Smime')->unsetSmimeSecondary(1, $identityID);
+ } elseif (isset($ui->vars->set_smime_personal)) { // setting personal certificate... first have to unset?
+ // TODO: Problem: there is a problem here, when clicking next to the number, the first id gets selected!
+ $injector->getInstance('IMP_Smime')->setSmimePersonal(
+ $ui->vars->set_smime_personal,
+ 0,
+ $identityID
+ );
+ $notification->push(
+ _('S/MIME Certificate set and successfully transfered previous certificate to extra keys.'),
+ 'horde.success'
+ );
+ } elseif (isset($ui->vars->set_smime_secondary)) { // setting secondary certificate
+ $injector->getInstance('IMP_Smime')->setSmimeSecondary(
+ $ui->vars->set_smime_secondary,
+ $identityID
+ );
+ $notification->push(
+ _('S/MIME Singing Certificate set and successfully transfered previous signing certificate to extra keys.'),
'horde.success'
);
}
return false;
}
-
}
diff --git a/lib/Prefs/Special/SmimePublicKey.php b/lib/Prefs/Special/SmimePublicKey.php
index 174e03255..a5dad9e5a 100644
--- a/lib/Prefs/Special/SmimePublicKey.php
+++ b/lib/Prefs/Special/SmimePublicKey.php
@@ -35,48 +35,51 @@ public function display(Horde_Core_Prefs_Ui $ui)
{
global $browser, $injector, $page_output, $prefs;
+ /* Adding js to page output */
$page_output->addScriptPackage('IMP_Script_Package_Imp');
+ /* Adding css to page output */
$p_css = new Horde_Themes_Element('prefs.css');
$page_output->addStylesheet($p_css->fs, $p_css->uri);
+ /* Get list of Public Keys on keyring with the help of a IMP_Smime instance. */
$imp_smime = $injector->getInstance('IMP_Smime');
-
- /* Get list of Public Keys on keyring. */
try {
$pubkey_list = $imp_smime->listPublicKeys();
} catch (Horde_Exception $e) {
- $pubkey_list = array();
+ $pubkey_list = [];
}
- $smime_url = IMP_Basic_Smime::url();
-
- $view = new Horde_View(array(
- 'templatePath' => IMP_TEMPLATES . '/prefs'
- ));
+ /* Loading View Template and Help Template */
+ $view = new Horde_View([
+ 'templatePath' => IMP_TEMPLATES . '/prefs',
+ ]);
$view->addHelper('Horde_Core_View_Helper_Help');
$view->addHelper('Text');
+ /* Loading the base url for smime: in order to set links for the various certificates */
+ $smime_url = IMP_Basic_Smime::url();
+
if (!empty($pubkey_list)) {
uasort(
$pubkey_list,
- function ($a, $b)
- {
+ function ($a, $b) {
return strcoll($a['name'], $b['name']);
}
);
- $plist = array();
- $self_url = $ui->selfUrl(array('special' => true, 'token' => true));
+ $plist = [];
+ $self_url = $ui->selfUrl(['special' => true, 'token' => true]);
foreach ($pubkey_list as $val) {
- $plist[] = array(
+ $plist[] = [
'name' => $val['name'],
'email' => $val['email'],
- 'view' => Horde::link($smime_url->copy()->add(array('actionID' => 'view_public_key', 'email' => $val['email'])), sprintf(_("View %s Public Key"), $val['name']), null, 'view_key'),
- 'info' => Horde::link($smime_url->copy()->add(array('actionID' => 'info_public_key', 'email' => $val['email'])), sprintf(_("Information on %s Public Key"), $val['name']), null, 'info_key'),
- 'delete' => Horde::link($self_url->copy()->add(array('delete_smime_pubkey' => 1, 'email' => $val['email'])), sprintf(_("Delete %s Public Key"), $val['name']), null, null, "window.confirm('" . addslashes(_("Are you sure you want to delete this public key?")) . "')")
- );
+ 'view' => Horde::link($smime_url->copy()->add(['actionID' => 'view_public_key', 'email' => $val['email']]), sprintf(_('View %s Public Key'), $val['name']), null, 'view_key'),
+ 'info' => Horde::link($smime_url->copy()->add(['actionID' => 'info_public_key', 'email' => $val['email']]), sprintf(_('Information on %s Public Key'), $val['name']), null, 'info_key'),
+ 'delete' => Horde::link($self_url->copy()->add(['delete_smime_pubkey' => 1, 'email' => $val['email']]), sprintf(_('Delete %s Public Key'), $val['name']), null, null, "window.confirm('" . addslashes(_('Are you sure you want to delete this public key?')) . "')"),
+ ];
}
+
$view->pubkey_list = $plist;
}
@@ -84,9 +87,9 @@ function ($a, $b)
$view->can_import = true;
$view->no_source = !$prefs->getValue('add_source');
if (!$view->no_source) {
- $page_output->addInlineScript(array(
- '$("import_smime_public").observe("click", function(e) { ' . Horde::popupJs($smime_url, array('params' => array('actionID' => 'import_public_key', 'reload' => base64_encode($ui->selfUrl()->setRaw(true))), 'height' => 275, 'width' => 750, 'urlencode' => true)) . '; e.stop(); })'
- ), true);
+ $page_output->addInlineScript([
+ '$("import_smime_public").observe("click", function(e) { ' . Horde::popupJs($smime_url, ['params' => ['actionID' => 'import_public_key', 'reload' => base64_encode($ui->selfUrl()->setRaw(true))], 'height' => 275, 'width' => 750, 'urlencode' => true]) . '; e.stop(); })',
+ ], true);
}
}
@@ -102,7 +105,7 @@ public function update(Horde_Core_Prefs_Ui $ui)
if (isset($ui->vars->delete_smime_pubkey)) {
try {
$injector->getInstance('IMP_Smime')->deletePublicKey($ui->vars->email);
- $notification->push(sprintf(_("S/MIME Public Key for \"%s\" was successfully deleted."), $ui->vars->email), 'horde.success');
+ $notification->push(sprintf(_('S/MIME Public Key for "%s" was successfully deleted.'), $ui->vars->email), 'horde.success');
} catch (Horde_Exception $e) {
$notification->push($e);
}
@@ -110,5 +113,4 @@ public function update(Horde_Core_Prefs_Ui $ui)
return false;
}
-
}
diff --git a/lib/Prefs/SwitchHandler.php b/lib/Prefs/SwitchHandler.php
new file mode 100644
index 000000000..1b5f7ec24
--- /dev/null
+++ b/lib/Prefs/SwitchHandler.php
@@ -0,0 +1,44 @@
+
+ * @category Horde
+ * @copyright 2012-2017 Horde LLC
+ * @license http://www.horde.org/licenses/gpl GPL
+ * @package IMP
+ */
+
+use IMP_Prefs_Identity;
+
+class IMP_Prefs_SwitchHandler
+{
+
+ /**
+ * gets the keys form the address book for the prefs identity frontend
+ *
+ * @param integer $identityID: the identity from where the keys should be gotten
+ *
+ * @return array returns an array containing links to the keys
+ */
+ public function getPublicKeysForPrefsIdentities($identity, $identityID){
+
+ $email = $identity->getEmail();
+ $name = $identity->getName($identityID);
+
+ $smime_url = Horde::url('../imp/basic.php')->add('page', 'smime');
+
+ try {
+ $linksToKey = [
+ 'view' => Horde::link($smime_url->copy()->add(['actionID' => 'view_public_key', 'email' => $email]), sprintf(_('View %s Public Key'), $name), null, 'view_key')."key",
+ 'info' => Horde::link($smime_url->copy()->add(['actionID' => 'info_public_key', 'email' => $email]), sprintf(_('View %s Public Info'), $name), null, 'info_key')."info",
+ ];
+ } catch (\Throwable $th) {
+ throw $th;
+ }
+
+
+ return $linksToKey;
+
+ }
+}
\ No newline at end of file
diff --git a/lib/Smime.php b/lib/Smime.php
index ed978643b..35c304681 100644
--- a/lib/Smime.php
+++ b/lib/Smime.php
@@ -26,17 +26,20 @@
class IMP_Smime
{
/* Name of the S/MIME public key field in addressbook. */
- const PUBKEY_FIELD = 'smimePublicKey';
+ public const PUBKEY_FIELD = 'smimePublicKey';
/* Encryption type constants. */
- const ENCRYPT = 'smime_encrypt';
- const SIGN = 'smime_sign';
- const SIGNENC = 'smime_signenc';
+ public const ENCRYPT = 'smime_encrypt';
+ public const SIGN = 'smime_sign';
+ public const SIGNENC = 'smime_signenc';
/* Which key to use. */
- const KEY_PRIMARY = 0;
- const KEY_SECONDARY = 1;
- const KEY_SECONDARY_OR_PRIMARY = 2;
+ public const KEY_PRIMARY = 0;
+ public const KEY_SECONDARY = 1;
+ public const KEY_SECONDARY_OR_PRIMARY = 2;
+
+ /* The default identity that is set */
+ public $defaultIdentity;
/**
* S/MIME object.
@@ -45,6 +48,13 @@ class IMP_Smime
*/
protected $_smime;
+ /**
+ * Handle for the current database connection.
+ *
+ * @var Horde_Db_Adapter
+ */
+ protected $_db;
+
/**
* Return whether PGP support is current enabled in IMP.
*
@@ -64,9 +74,10 @@ public static function enabled()
*
* @param Horde_Crypt_Smime $pgp S/MIME object.
*/
- public function __construct(Horde_Crypt_Smime $smime)
+ public function __construct(Horde_Crypt_Smime $smime, $db)
{
$this->_smime = $smime;
+ $this->_db = $db;
}
/**
@@ -79,20 +90,23 @@ public function encryptList()
{
global $injector, $registry;
- $ret = array();
+ $identity = $injector->getInstance('IMP_Identity');
+ $identityID = $identity->getDefault();
+
+ $ret = [];
if ($registry->hasMethod('contacts/getField') ||
$injector->getInstance('Horde_Core_Hooks')->hookExists('smime_key', 'imp')) {
- $ret += array(
- self::ENCRYPT => _("S/MIME Encrypt Message")
- );
+ $ret += [
+ self::ENCRYPT => _('S/MIME Encrypt Message'),
+ ];
}
- if ($this->getPersonalPrivateKey()) {
- $ret += array(
- self::SIGN => _("S/MIME Sign Message"),
- self::SIGNENC => _("S/MIME Sign/Encrypt Message")
- );
+ if ($this->getPersonalPrivateKey(self::KEY_PRIMARY, $identityID)) {
+ $ret += [
+ self::SIGN => _('S/MIME Sign Message'),
+ self::SIGNENC => _('S/MIME Sign/Encrypt Message'),
+ ];
}
return $ret;
@@ -102,111 +116,543 @@ public function encryptList()
* Adds the personal public key to the prefs.
*
* @param string|array $key The public key to add.
- * @param boolean $signkey Is this the secondary key for signing?
+ * @param boolean $signkey The secondary key for signing (optional).
+ * @param int $identityID The identity for wich the public key should be added.
*/
- public function addPersonalPublicKey($key, $signkey = false)
+ public function addPersonalPublicKey($key, $signkey = false, $identityID=0)
{
- $prefName = $signkey ? 'smime_public_sign_key' : 'smime_public_key';
+ global $injector, $prefs;
+ // clean key if it is in array
$val = is_array($key) ? implode('', $key) : $key;
- try {
- $val = HordeString::convertToUtf8($val);
- } catch (Exception $ex) {
+ $val = HordeString::convertToUtf8($val);
+
+ // NOTE: the public key does not need a field, because it will be the same as for the private key anyway
+
+ if ($signkey === true || $signkey == self::KEY_SECONDARY) {
+ $prefName = 'smime_public_sign_key';
+ } else {
+ $prefName = 'smime_public_key';
}
- $GLOBALS['prefs']->setValue($prefName, $val);
+
+ $prefs->setValue($prefName, $val);
}
/**
* Adds the personal private key to the prefs.
*
- * @param string|array $key The private key to add.
- * @param boolean $signkey Is this the secondary key for signing?
+ * @param string|array $key The private key to add.
+ * @param boolean $signkey Set this to indicate the secondary key for signing
+ * @param boolean $calledFromSetSmime This is to stop unneded notifications
+ * @param int $identityID The identity for wich the private key should be added
*/
- public function addPersonalPrivateKey($key, $signkey = false)
+ public function addPersonalPrivateKey($key, $signkey = false, $calledFromSetSmime = false, $identityID=0)
{
- $prefName = $signkey ? 'smime_private_sign_key' : 'smime_private_key';
+ // TODO: find way to only add an id to the array of prefs..
+
+ global $prefs, $injector;
+ // clean key if it is a string otherwise, if it is an ID (which it should be) keep it
$val = is_array($key) ? implode('', $key) : $key;
- try {
- $val = HordeString::convertToUtf8($val);
- } catch (Exception $ex) {
+ $val = HordeString::convertToUtf8($val);
+
+ // get the keyid to set it to the identites array in prefs
+ $keyID = $this->privateKeyExists($key, $identityID, true, true);
+
+ // use identity to set the peronal private key to the serialized identity array
+ $identity = $injector->getInstance('IMP_Identity');
+
+ // check if a private key already exists
+ $check = $prefs->getValue('smime_private_key');
+
+ // it there is a private key, these will be unset first and then the new one will be added to the database and its id will be added to the prefs array
+ // unsetting
+
+ if (!empty($check) && $signkey == false) {
+ $this->unsetSmimePersonal($signkey, $calledFromSetSmime, $identityID);
+ }
+
+ // setting id to prefstables, only if $key is an integer
+ if (!empty($keyID)) {
+ if ($signkey === true || $signkey == self::KEY_SECONDARY) {
+ $prefName = 'smime_private_sign_key';
+ $identity->setValue('privsignkey', $keyID, $identityID);
+ } else {
+ $prefName = 'smime_private_key';
+ $identity->setValue('privkey', $keyID, $identityID);
+ }
+ $prefs->setValue($prefName, $val);
+ $identity->save();
+ }
+ }
+
+ /**
+ * Adds extra personal keys to the extra keys table.
+ *
+ * @param string|array $key The private key to add.
+ * @param string|array $key The public key to add.
+ * @param string $password The password for the private key to add.
+ * @param string $pref_name To be removed... TODO.@param string|array
+ * @param string $identity The name of the identity to save the keys for
+ * @param bool $identity_used Marks the keys as the one that is being used
+ */
+ public function addExtraPersonalKeys(
+ $private_key,
+ $public_key,
+ $password,
+ $pref_name = 'smime_private_key',
+ $identityID=0,
+ $identity_used=false
+ ) {
+ global $notification;
+ /* Get the user_name */
+ // TODO: is there a way to only use prefs?
+ $user_name = $GLOBALS['registry']->getAuth();
+
+ // Encrypt the password
+ $key = $GLOBALS['conf']['secret_key'];
+ $blowfish = new Horde_Crypt_Blowfish($key);
+ $encryptedPassword = $blowfish->encrypt($password);
+ $encryptedPassword = base64_encode($encryptedPassword);
+
+ if ($this->privateKeyExists($private_key, $identityID)) {
+ $notification->push(_('Key is allready in the Database'), 'horde.success');
+ return false;
+ }
+
+ if (!empty($public_key) && !empty($private_key) && !empty($encryptedPassword)) {
+ $query = 'INSERT INTO imp_smime_extrakeys (pref_name, user_name, private_key, public_key, privatekey_passwd, identity, identity_used) VALUES (?, ?, ?, ?, ?, ?, ?)';
+ $values = [$pref_name, $user_name, $private_key, $public_key, $encryptedPassword, $identityID, $identity_used];
+ $this->_db->insert($query, $values);
+ return true;
}
- $GLOBALS['prefs']->setValue($prefName, $val);
}
/**
* Adds a list of additional certs to the prefs.
*
- * @param string|array $key The additional certifcate(s) to add.
- * @param boolean $signkey Is this the secondary key for signing?
+ * @param string|array $key The additional certifcate(s) to add.
+ * @param boolean $signkey Is this the secondary key for signing?
*/
public function addAdditionalCert($key, $signkey = false)
{
$prefName = $signkey ? 'smime_additional_sign_cert' : 'smime_additional_cert';
$val = is_array($key) ? implode('', $key) : $key;
- try {
- $val = HordeString::convertToUtf8($val);
- } catch (Exception $ex) {
- }
+ $val = HordeString::convertToUtf8($val);
$GLOBALS['prefs']->setValue($prefName, $val);
}
/**
* Returns the personal public key from the prefs.
*
- * @param integer $signkey One of the IMP_Sime::KEY_* constants.
+ * @param integer $signkey: One of the IMP_Sime::KEY_* constants.
+ * @param integer $identityID: The Identity to retrieve the personal public key from.
*
* @return string The personal S/MIME public key.
*/
- public function getPersonalPublicKey($signkey = self::KEY_PRIMARY)
+ public function getPersonalPublicKey($signkey = self::KEY_PRIMARY, $identityID = 0)
{
- global $prefs;
+ global $injector;
- $key = $prefs->getValue(
- $signkey ? 'smime_public_sign_key' : 'smime_public_key'
- );
- if (!$key && $signkey == self::KEY_SECONDARY_OR_PRIMARY) {
- $key = $prefs->getValue('smime_public_key');
+ $identity = $injector->getInstance('IMP_Identity');
+
+ // note: this is getting the privatekeyid from the identities array as this id suffices (no extra pub-id-key needed)
+ if ($signkey === self::KEY_SECONDARY) {
+ $keyID = $identity->getValue('privsignkey', $identityID);
+ } else {
+ $keyID = $identity->getValue('privkey', $identityID);
}
+ // with keyID get key from extratables
+ $key = $this->getExtraPublicKey($keyID);
return $key;
}
/**
* Returns the personal private key from the prefs.
*
- * @param integer $signkey One of the IMP_Sime::KEY_* constants.
+ * @param int $signkey: One of the IMP_Sime::KEY_* constants.
+ * @param int $identityID: The identity for wich the key should be gotten. TODO: this not yet implemented!
*
* @return string The personal S/MIME private key.
*/
- public function getPersonalPrivateKey($signkey = self::KEY_PRIMARY)
+ public function getPersonalPrivateKey($signkey = self::KEY_PRIMARY, $identityID=0)
{
- global $prefs;
+ global $injector;
- $key = $prefs->getValue(
- $signkey ? 'smime_private_sign_key' : 'smime_private_key'
- );
- if (!$key && $signkey == self::KEY_SECONDARY_OR_PRIMARY) {
- $key = $prefs->getValue('smime_private_key');
+ $identity = $injector->getInstance('IMP_Identity');
+ if ($signkey === self::KEY_SECONDARY) {
+ $keyID = $identity->getValue('privsignkey', $identityID);
+ } else {
+ $keyID = $identity->getValue('privkey', $identityID);
}
+ // with keyID get key from extratables
+ $key = $this->getExtraPrivateKey($keyID);
return $key;
+
+ // TODO: Problem: current users will have their keys on that spot and will loose them! Need a migrate script!
+ }
+
+ /**
+ * Retrieves a specific public key from the extrakeys table or throws an exception.
+ *
+ * @param int $privateKeyId: get the public key of of the privatekey (its id)
+ * @param string $prefName: indicates that a key is for sining
+ * @param int $identityID: The identity ID to retrieve the extra key for
+ *
+ * @return string Specific S/MIME private key.
+ * @throws Horde_Db_Exception
+ *
+ * TODO: need to remove the $prefName thingie for extrakeys table, makes no sense
+ */
+ public function getExtraPublicKey($privateKeyId, $prefName = 'smime_private_key', $identityID=0)
+ {
+ // TODO: there is no use for prefName or identityID! it has to be removed from all calls to this functino
+ // reason: the keyid is given and the username, no need for anything else
+
+ // Build the SQL query
+ $query = 'SELECT private_key_id, public_key FROM imp_smime_extrakeys WHERE private_key_id=?';
+ $values = [$privateKeyId];
+ // Run the SQL query
+ $result = $this->_db->selectOne($query, $values); // returns one key
+ return $result['public_key'];
+ }
+
+ /**
+ * Retrieves a specific private key from the extrakeys table.
+ *
+ * @param int $id: id of the key to search for
+ * @param string $prefname: currently set to discern between sing keys and normal keys
+ * @param int $identityID: the identity to look for
+ *
+ * @return string Specific S/MIME private key.
+ * @throws Horde_Db_Exception
+ */
+ public function getExtraPrivateKey($id, $prefName = 'smime_private_key', $identityID = 0)
+ {
+ // Build the SQL query
+ $query = 'SELECT private_key_id, private_key FROM imp_smime_extrakeys WHERE private_key_id=?';
+ $values = [$id];
+
+ // Run the SQL query
+ $result = $this->_db->selectOne($query, $values); // returns one key
+ return $result['private_key'];
+ }
+
+ /**
+ * Get private key id of the set Personal Certificate (if it exists in the database)
+ *
+ * @param string $prefname: currently set to discern between sing keys and normal keys
+ * @param int $identityID: the identity to look for
+ *
+ * @return int id of extra private certificate in DB
+ * @throws Horde_Db_Exception
+ */
+ public function getSetPrivateKeyId($signkey = self::KEY_PRIMARY, $identityID=0)
+ {
+ {
+ /* Get the user_name and personal certificate if existant */
+ // TODO: is there a way to only use prefs?
+ $user_name = $GLOBALS['registry']->getAuth();
+ $personalCertificate = $this->getPersonalPrivateKey($signkey, $identityID);
+
+ //check the database and if keys are the same
+ $returnvalue = $this->privateKeyExists($personalCertificate, $identityID, $returnID=true, $returnLastIdInTable=false);
+
+ if (isset($returnvalue) && !empty($returnvalue)) {
+ return $returnvalue;
+ } else {
+ return false;
+ }
+ }
+ }
+
+ /**
+ * Check if the private keys allready exist.
+ * Example: if the key already exists, there is no need to load it into the database again
+ *
+ * @param string $personalCertificate: the personal certificate to look for
+ * @param int $idenitytId: the id of the identity to look for
+ * @param bool $returnID: returns the id of the private key that was found
+ * @param bool $returnLastIdInTable: returns the last ID that was set in the table
+ *
+ * @return bool|int if private key is there or not, if an ID should be returned
+ * @throws Horde_Db_Exception
+ */
+ public function privateKeyExists($personalCertificate, $identityID, $returnID=false, $returnLastIdInTable=false)
+ {
+ /* Get the user_name */
+ // TODO: is there a way to only use prefs?
+ $user_name = $GLOBALS['registry']->getAuth();
+
+ // Build the SQL query
+ $query = 'SELECT private_key_id, private_key FROM imp_smime_extrakeys WHERE user_name=? AND identity=?';
+ $values = [$user_name, $identityID];
+
+ // Run the SQL query
+ $result = $this->_db->selectAll($query, $values); // returns an array with keys
+ if (!empty($result)) {
+ // check if privatekeys are the same
+ foreach ($result as $key => $value) {
+ $diff = strcmp($value, $personalCertificate);
+ if ($value['private_key'] === $personalCertificate || isset($diff) && $diff == 0) {
+ if ($returnID === true) {
+ return $value['private_key_id'];
+ }
+ return true;
+ }
+ }
+ } else {
+ if ($returnLastIdInTable) {
+ // return last id in the table, else if table is empty return the index 0
+ !empty($result) ? $result = array_key_last($result) : $result = 0;
+ return $result;
+ }
+ return false;
+ }
+ }
+
+
+ /**
+ * Retrieves all public and private keys and their aliases from imp_smime_extrakeys table.
+ *
+ * @param string $prefname: To discern between sing keys and normal keys
+ * @param int $identityID: The identity to look for
+ *
+ * @return array All S/MIME private keys available.
+ * @throws Horde_Db_Exception
+ */
+ public function listAllKeys($prefName = 'smime_private_key', $identity = 0)
+ {
+ /* Get the user_name */
+ // TODO: is there a way to only use prefs?
+ // TODO: prefname can be removed here from this function call as well
+ $user_name = $GLOBALS['registry']->getAuth();
+
+ // Build the SQL query
+ $query = 'SELECT private_key_id, private_key, public_key, alias FROM imp_smime_extrakeys WHERE user_name=? AND identity=?';
+ $values = [$user_name, $identity];
+
+ // Run the SQL query
+ $result = $this->_db->selectAll($query, $values); // returns an array with keys
+ return $result;
+ }
+
+
+ /**
+ * Retrieves all private key ids from imp_smime_extrakeys table.
+ *
+ * @param string $prefNasme: defines if key is for encrypting or for signing
+ * @param integer $identityID: the identity to retrieve the keys from
+ *
+ * @return array All S/MIME private keys available.
+ * @throws Horde_Db_Exception
+ */
+ public function listPrivateKeyIds($prefName = 'smime_private_key', $identityID = 0)
+ {
+ /* Get the user_name */
+ // TODO: is there a way to only use prefs?
+ $user_name = $GLOBALS['registry']->getAuth('original');
+
+ $GLOBALS['session']->get('horde', 'auth/userId');
+
+ // Build the SQL query
+
+ $query = 'SELECT private_key_id FROM imp_smime_extrakeys WHERE pref_name=? AND user_name=? AND identity=?';
+ $values = [$prefName, $user_name, $identityID];
+
+ // Run the SQL query
+ $result = $this->_db->selectValues($query, $values); // returns an array with keys
+ return $result;
+ }
+
+ /**
+ * Setting an alias in the database
+ *
+ * @param int $keyid: Id of privatekey to set the alias for
+ * @param string $alias: Alias to set
+ * @param int $identityID: The identity for which the alias should be set
+ *
+ * @return bool|error returns either true, false or an error if database insertion failed
+ */
+ public function updateAlias($keyid, $alias, $identityID)
+ {
+ $query = 'UPDATE imp_smime_extrakeys SET alias = ? WHERE private_key_id = ? AND identity = ?';
+ $values = [$alias, $keyid, $identityID];
+ $this->_db->insert($query, $values);
+ }
+
+ /**
+ * Getting an alias from the database
+ *
+ * @param int $keyid to find the alias belong to the key
+ *
+ * @return string|bool returns an alias (name) of the certification or false if nothing is returned
+ */
+ public function getAlias($keyid, $identityID)
+ {
+ $query = 'SELECT alias FROM imp_smime_extrakeys WHERE private_key_id=? AND identity=?';
+ $values = [$keyid, $identityID];
+ $result = $this->_db->selectValue($query, $values, $identityID);
+
+ // checking if $result is empty
+ if (empty($result)) {
+ return false;
+ } else {
+ return $result;
+ }
+ }
+
+
+ /**
+ * Setting a new Personal Certificate and belonging Public Certificate:
+ * Transfers a Certificate and belonging Public Certificate from the Extra Keys table to Horde_Prefs
+ *
+ * @param int $keyid: Returns the key from the keyid
+ * @param int $signkey: Sets a sign key, per default a personal (primary) key is set
+ * @param int $identityID: The identity to look for
+ *
+ */
+ public function setSmimePersonal($keyid, $signkey=self::KEY_PRIMARY, $identityID=0)
+ {
+ if ($signkey == self::KEY_PRIMARY) {
+ $prefName = 'smime_private_key';
+ } elseif ($signkey == self::KEY_SECONDARY) {
+ $prefName = 'smime_private_sign_key';
+ }
+
+ // Warns unsetSmime functions that no notifications are needed
+ $calledFromSetSmime = true;
+ // find the private key that has been selected (NB: do not care if the key is a sign key or not TODO: so no prefname needed?)
+ $newprivatekey = $this->getExtraPrivateKey($keyid);
+ $newpublickey = $this->getExtraPublicKey($keyid); // buggy over here: need to remove singkey stuff in parameters
+
+ // check if a personal certificate is set
+ $check = null;
+ $check = $this->getPersonalPrivateKey(self::KEY_PRIMARY, $identityID); // this is not gonna work or is it?
+
+ $keyExists = $this->privateKeyExists($check, $identityID);
+
+ // check if there is a personal Certificate set
+ if (!empty($check)) {
+ // if there is a personal certificate, copy the personal certificate itself or the singkey (depending on wheater it is set) to the database otherwise discontinue the action
+ if ($keyExists) { // if the key exists in the database just add (overwrite) the key to the prefs table
+ $this->addPersonalPrivateKey($newprivatekey, $signkey, $calledFromSetSmime, $identityID);
+ $this->addPersonalPublicKey($newpublickey, $signkey, $identityID);
+ return;
+ }
+ // if the key is not in the database, first unset the key (which copies it to the database) and than add (overwrite) the new keys in the prefs table
+ // Note:
+ // - $calledFromSetSmime: This variable is used because setSmimePersonal() adds certifactes from the database allready.
+ // So there is no need to check for a correct password, as it should allready have locked the certificates in the database.
+ // - Setting $calledFromSetSmime = true stopps notifications from poping up.
+ // TODO:
+ // - the singkey stuff is very confusing, needs to be refactored
+ if ($this->unsetSmimePersonal($signkey = self::KEY_PRIMARY, $calledFromSetSmime, $identityID) != false) {
+ $this->addPersonalPrivateKey($newprivatekey, $signkey, $calledFromSetSmime);
+ $this->addPersonalPublicKey($newpublickey, $signkey);
+ return;
+ }
+ // otherwise do nothing
+ return;
+ }
+ // if not: import it. Note: if a newly imported but yet non-existant key is to be added, $calledFromSetSmime is not set to true, because password checks need to happen
+ $this->addPersonalPrivateKey($newprivatekey, $signkey, $calledFromSetSmime=false, $identityID);
+ $this->addPersonalPublicKey($newpublickey, $signkey, $identityID);
+ }
+
+ /**
+ * Setting a new certificate for signing SMIME mails
+ *
+ * @param int $keyid: To inform which key should be set as a secondary signkey
+ * @param int $identityID: The identity to look for
+ */
+ public function setSmimeSecondary($keyid, $identityID)
+ {
+ $this->setSmimePersonal($keyid, self::KEY_SECONDARY, $identityID);
+ }
+
+ /**
+ * Unsetting a Personal Certificate and belonging Public Certificate:
+ * Transfers a Personal Certificate and belonging Public Certificate to the Extra Keys table in the DB
+ *
+ * @param int $singkey: Defines the key to be processed. Per default it is the personal (primary) key, when e.g. set to self::KEY_SECONDARY the secondary sign key will be processed
+ * @param bool $calledFromSetSmime: Disables notifications for unset passwords: If the function is called from setSmimePersonal there is no reason to check for a password, because the key and the password is set in the database allready.
+ * @param int $identityID: The identity for wich the key should be set
+ */
+ public function unsetSmimePersonal($signkey = self::KEY_PRIMARY, $calledFromSetSmime = false, $identityID=0)
+ {
+ global $notification;
+
+ // get current personal certificates
+ $privateKey = $this->getPersonalPrivateKey($signkey, $identityID);
+ $publicKey = $this->getPersonalPublicKey($signkey, $identityID);
+
+ // get password, hash it and save it to the table
+ $password = $this->getPassphrase($signkey);
+ if ($password == false || is_null($password) || empty($password)) {
+ // check if unsetSmimePersonal is called from setSmime, where passwords are set in the DB allready, and there is no need to push any notifications
+ if ($calledFromSetSmime == false) {
+ $notification->push(
+ _('Please set a correct password before unsetting the keys.'),
+ 'horde.error'
+ );
+ }
+ return false;
+ }
+
+ // push these to the extra keys table
+ if (!empty($privateKey) && !empty($publicKey) && !empty($password)) {
+ if ($this->addExtraPersonalKeys($privateKey, $publicKey, $password, 'smime_private_key', $identityID)) {
+ try {
+ $this->deletePersonalKeys($signkey, $identityID);
+ $notification->push(
+ _('S/MIME Certificate unset and successfully transfered to extra keys.'),
+ 'horde.success'
+ );
+ return true;
+ } catch (\Throwable $th) {
+ $notification->push(
+ _('S/MIME Certificates were not proberly deleted from database.'),
+ 'horde.error'
+ );
+ throw $th;
+ }
+ } else {
+ // unsetting can be done because certificate is in the database anyway
+ $this->deletePersonalKeys($signkey, $identityID);
+ }
+ }
+ }
+
+ /**
+ * Unsetting a Certificate for Singing and transerfing it to extra tables
+ *
+ * @param bool $calledFromSetSmime: To inform the method that it does not need to check for a password again.
+ * @param int $identityID: The identity to look for.
+ */
+ public function unsetSmimeSecondary($calledFromSetSmime, $identityID=0)
+ {
+ $this->unsetSmimePersonal(self::KEY_SECONDARY, $calledFromSetSmime, $identityID);
}
/**
* Returns any additional certificates from the prefs.
*
* @param integer $signkey One of the IMP_Sime::KEY_* constants.
+ * @param integer $identityID the id of the identity to get the key from.
*
* @return string Additional signing certs for inclusion.
*/
- public function getAdditionalCert($signkey = self::KEY_PRIMARY)
+ public function getAdditionalCert($signkey = self::KEY_PRIMARY, $identityID=0)
{
- global $prefs;
+ global $injector;
- $key = $prefs->getValue(
- $signkey ? 'smime_additional_sign_cert' : 'smime_additional_cert'
- );
- if (!$key && $signkey == self::KEY_SECONDARY_OR_PRIMARY) {
- $key = $prefs->getValue('smime_additional_cert');
+ $identity = $injector->getInstance('IMP_Identity');
+
+ if ($signkey == self::KEY_PRIMARY || $signkey == self::KEY_SECONDARY_OR_PRIMARY) {
+ $key = $identity->getValue('pubsignkey', $identityID);
+ } else {
+ $key = $identity->getValue('pubkey', $identityID);
}
return $key;
@@ -215,25 +661,50 @@ public function getAdditionalCert($signkey = self::KEY_PRIMARY)
/**
* Deletes the specified personal keys from the prefs.
*
- * @param boolean $signkey Return the secondary key for signing?
+ * @param boolean $signkey: Return the secondary key for signing?
+ * @param int $identityID: The identity to look for.
*/
- public function deletePersonalKeys($signkey = false)
+ public function deletePersonalKeys($signkey = false, $identityID=0)
{
- global $prefs;
+ global $prefs, $injector;
// We always delete the secondary keys because we cannot have them
// without primary keys.
$prefs->setValue('smime_public_sign_key', '');
$prefs->setValue('smime_private_sign_key', '');
$prefs->setValue('smime_additional_sign_cert', '');
+ // also delete the ids set in the identity prefs array
+ $identity = $injector->getInstance('IMP_Identity');
+ $identity->setValue('privsignkey', '', $identityID);
+ $identity->setValue('pubsignkey', '', $identityID);
+
if (!$signkey) {
$prefs->setValue('smime_public_key', '');
$prefs->setValue('smime_private_key', '');
$prefs->setValue('smime_additional_cert', '');
+ // also delete the ids set in the identity prefs array
+ $identity->setValue('pubkey', '', $identityID);
+ $identity->setValue('privkey', '', $identityID);
}
+ $identity->save();
$this->unsetPassphrase($signkey);
}
+ /**
+ * Deletes the specified extra keys from the extra-keys-table.
+ *
+ * @param int $private_key_id: The ID of the privatekey to look for.
+ * @param boolean $signkey: Return the secondary key for signing?
+ */
+ public function deleteExtraKey($private_key_id, $signkey = false)
+ {
+ /* Build the SQL query. */
+ $query = 'DELETE FROM imp_smime_extrakeys WHERE private_key_id = ?';
+ $values = [ $private_key_id ];
+
+ $this->_db->delete($query, $values);
+ }
+
/**
* Adds a public key to an address book.
*
@@ -245,17 +716,17 @@ public function addPublicKey($cert)
{
global $prefs, $registry;
- list($name, $email) = $this->publicKeyInfo($cert);
+ [$name, $email] = $this->publicKeyInfo($cert);
$registry->call(
'contacts/addField',
- array(
+ [
$email,
$name,
self::PUBKEY_FIELD,
$cert,
- $prefs->getValue('add_source')
- )
+ $prefs->getValue('add_source'),
+ ]
);
}
@@ -272,14 +743,14 @@ public function publicKeyInfo($cert)
/* Make sure the certificate is valid. */
$key_info = openssl_x509_parse($cert);
if (!is_array($key_info) || !isset($key_info['subject'])) {
- throw new Horde_Crypt_Exception(_("Not a valid public key."));
+ throw new Horde_Crypt_Exception(_('Not a valid public key.'));
}
/* Add key to the user's address book. */
$email = $this->_smime->getEmailFromKey($cert);
if (is_null($email)) {
throw new Horde_Crypt_Exception(
- _("No email information located in the public key.")
+ _('No email information located in the public key.')
);
}
@@ -292,7 +763,7 @@ public function publicKeyInfo($cert)
$name = $email;
}
- return array($name, $email);
+ return [$name, $email];
}
/**
@@ -306,13 +777,13 @@ public function publicKeyInfo($cert)
*/
protected function _encryptParameters(Horde_Mail_Rfc822_List $addr)
{
- return array(
+ return [
'pubkey' => array_map(
- array($this, 'getPublicKey'),
+ [$this, 'getPublicKey'],
$addr->bare_addresses
),
- 'type' => 'message'
- );
+ 'type' => 'message',
+ ];
}
/**
@@ -333,29 +804,35 @@ public function getPublicKey($address)
$key = $injector->getInstance('Horde_Core_Hooks')->callHook(
'smime_key',
'imp',
- array($address)
+ [$address]
);
if ($key) {
return $key;
}
- } catch (Horde_Exception_HookNotSet $e) {}
+ } catch (Horde_Exception_HookNotSet $e) {
+ }
$contacts = $injector->getInstance('IMP_Contacts');
try {
$key = $registry->call(
'contacts/getField',
- array(
+ [
$address,
self::PUBKEY_FIELD,
$contacts->sources,
true,
- true
- )
+ true,
+ ]
);
} catch (Horde_Exception $e) {
/* See if the address points to the user's public key. */
- $personal_pubkey = $this->getPersonalPublicKey();
+ // check if this method is used to get keys of an identity
+ $identity = $injector->getInstance('IMP_Identity');
+ $identityID = $identity->getDefault();
+
+ $personal_pubkey = $this->getPersonalPublicKey(self::KEY_SECONDARY_OR_PRIMARY, $identityID);
+
if (!empty($personal_pubkey) &&
$injector->getInstance('IMP_Identity')->hasAddress($address)) {
return $personal_pubkey;
@@ -371,11 +848,11 @@ public function getPublicKey($address)
}
/**
- * Retrieves all public keys from a user's address book(s).
- *
- * @return array All S/MIME public keys available.
- * @throws Horde_Crypt_Exception
- */
+ * Retrieves all public keys from a user's address book(s).
+ *
+ * @return array All S/MIME public keys available.
+ * @throws Horde_Crypt_Exception
+ */
public function listPublicKeys()
{
global $injector, $registry;
@@ -383,12 +860,12 @@ public function listPublicKeys()
$sources = $injector->getInstance('IMP_Contacts')->sources;
if (empty($sources)) {
- return array();
+ return [];
}
return $registry->call(
'contacts/getAllAttributeValues',
- array(self::PUBKEY_FIELD, $sources)
+ [self::PUBKEY_FIELD, $sources]
);
}
@@ -405,11 +882,11 @@ public function deletePublicKey($email)
$registry->call(
'contacts/deleteField',
- array(
+ [
$email,
self::PUBKEY_FIELD,
- $injector->getInstance('IMP_Contacts')->sources
- )
+ $injector->getInstance('IMP_Contacts')->sources,
+ ]
);
}
@@ -420,27 +897,31 @@ public function deletePublicKey($email)
*/
protected function _signParameters()
{
- $pubkey = $this->getPersonalPublicKey(true);
- $additional = array();
+ //TODO: use a roto variable of the class instead of calling this over and over again
+ global $injector;
+ $identity = $injector->getInstance('IMP_Identity');
+ $identityID = $identity->getDefault();
+ $pubkey = $this->getPersonalPublicKey(true, $identityID);
+ $additional = [];
if ($pubkey) {
- $additional[] = $this->getPersonalPublicKey();
+ $additional[] = $this->getPersonalPublicKey(self::KEY_PRIMARY, $identityID);
$secondary = true;
} else {
- $pubkey = $this->getPersonalPublicKey();
+ $pubkey = $this->getPersonalPublicKey(self::KEY_PRIMARY, $identityID);
$secondary = false;
}
- $additional[] = $this->getAdditionalCert($secondary);
+ $additional[] = $this->getAdditionalCert($secondary, $identityID);
if ($secondary) {
$additional[] = $this->getAdditionalCert();
}
- return array(
+ return [
'type' => 'signature',
'pubkey' => $pubkey,
- 'privkey' => $this->getPersonalPrivateKey($secondary),
+ 'privkey' => $this->getPersonalPrivateKey($secondary, $identityID),
'passphrase' => $this->getPassphrase($secondary),
'sigtype' => 'detach',
'certs' => implode("\n", $additional),
- );
+ ];
}
/**
@@ -458,7 +939,7 @@ public function verifySignature($text)
return $this->_smime->verify(
$text,
empty($conf['openssl']['cafile'])
- ? array()
+ ? []
: $conf['openssl']['cafile']
);
}
@@ -466,65 +947,113 @@ public function verifySignature($text)
/**
* Decrypts a message with user's public/private keypair.
*
- * @param string $text The text to decrypt.
+ * @param string $text: The text to decrypt.
+ * @param integer $differentKey: The ID of an extra key, set in extra table of the database.
+ * @param integer $identityID: The ID of a specific identity to decrypt for.
*
* @return string See Horde_Crypt_Smime::decrypt().
* @throws Horde_Crypt_Exception
*/
- public function decryptMessage($text)
+ public function decryptMessage($text, $differentKey = null, $identityID = null)
{
- return $this->_smime->decrypt($text, array(
- 'type' => 'message',
- 'pubkey' => $this->getPersonalPublicKey(),
- 'privkey' => $this->getPersonalPrivateKey(),
- 'passphrase' => $this->getPassphrase()
- ));
+ global $injector;
+
+ // get the specified identity or the default identity
+ if ($identityID === null) {
+ $identity = $injector->getInstance('IMP_Identity');
+ $identityID = $identity->getDefault();
+ }
+
+ if ($differentKey === null) {
+ $value = $this->_smime->decrypt($text, [
+ 'type' => 'message',
+ 'pubkey' => $this->getPersonalPublicKey(self::KEY_PRIMARY, $identityID),
+ 'privkey' => $this->getPersonalPrivateKey(self::KEY_PRIMARY, $identityID),
+ 'passphrase' => $this->getPassphrase(),
+ ]);
+ return $value;
+ } else {
+ $value = $this->_smime->decrypt($text, [
+ 'type' => 'message',
+ 'pubkey' => $this->getExtraPublicKey($differentKey, $identityID),
+ 'privkey' => $this->getExtraPrivateKey($differentKey, $identityID),
+ 'passphrase' => $this->getPassphrase(null, $differentKey), // create get pasExtraKeyPassphrase()?
+ ]);
+ return $value;
+ }
}
/**
* Returns the user's passphrase from the session cache.
*
- * @param integer $signkey One of the IMP_Sime::KEY_* constants.
+ * @param integer $signkey One of the IMP_Sime::KEY_* constants.
+ * @param integer|null $differentkey If set, this integer will be used to find a privatekey id from the extrakeys table in the database.
*
* @return mixed The passphrase, if set. Returns false if the passphrase
* has not been loaded yet. Returns null if no passphrase
* is needed.
*/
- public function getPassphrase($signkey = self::KEY_PRIMARY)
+ public function getPassphrase($signkey = self::KEY_PRIMARY, $differentKey = null)
{
- global $prefs, $session;
-
- if ($signkey == self::KEY_SECONDARY_OR_PRIMARY) {
- if ($private_key = $this->getPersonalPrivateKey(self::KEY_SECONDARY)) {
- $signkey = self::KEY_SECONDARY;
+ global $prefs, $session, $injector;
+
+ // TODO: call identity here or ask for it as a parameter of the function?
+ $identity = $injector->getInstance('IMP_Identity');
+ $identityID = $identity->getDefault();
+
+ if ($differentKey === null) {
+ if ($signkey == self::KEY_SECONDARY_OR_PRIMARY || $signkey == self::KEY_SECONDARY) {
+ if ($private_key = $this->getPersonalPrivateKey(self::KEY_SECONDARY, $identityID)) {
+ $signkey = self::KEY_SECONDARY;
+ } else {
+ $private_key = $this->getPersonalPrivateKey(self::KEY_PRIMARY, $identityID);
+ $signkey = self::KEY_PRIMARY;
+ }
} else {
- $private_key = $this->getPersonalPrivateKey();
- $signkey = self::KEY_PRIMARY;
+ $private_key = $this->getPersonalPrivateKey($signkey, $identityID);
}
} else {
- $private_key = $this->getPersonalPrivateKey($signkey);
+ // TODO: Check if it is necessary to take care of secondary keys in extratables
+ $private_key = $this->getExtraPrivateKey($differentKey, $identityID);
}
if (empty($private_key)) {
return false;
}
- $suffix = $signkey ? '_sign' : '';
- if ($session->exists('imp', 'smime_passphrase' . $suffix)) {
- return $session->get('imp', 'smime_passphrase' . $suffix);
- }
+ if ($differentKey === null) {
+ $suffix = $signkey ? '_sign' : '';
+ if ($session->exists('imp', 'smime_passphrase' . $suffix)) {
+ return $session->get('imp', 'smime_passphrase' . $suffix);
+ }
- if (!$session->exists('imp', 'smime_null_passphrase' . $suffix)) {
- $session->set(
- 'imp',
- 'smime_null_passphrase' . $suffix,
- $this->_smime->verifyPassphrase($private_key, null)
- ? null
- : false
- );
+ if (!$session->exists('imp', 'smime_null_passphrase' . $suffix)) {
+ $session->set(
+ 'imp',
+ 'smime_null_passphrase' . $suffix,
+ $this->_smime->verifyPassphrase($private_key, null)
+ ? null
+ : false
+ );
+ }
+ $result = $session->get('imp', 'smime_null_passphrase' . $suffix);
+ } else {
+ // TODO: take care of extra sign keys
+ // get passphrase for specific key in the extra tables
+
+ // Build the SQL query
+ $query = 'SELECT privatekey_passwd FROM imp_smime_extrakeys WHERE private_key_id=? AND IDENTITY=?';
+ $values = [$differentKey, $identityID];
+ // Run the SQL query
+ $result = $this->_db->selectValue($query, $values);
+
+ # decrypt the hashed value here
+ $key = $GLOBALS['conf']['secret_key'];
+ $blowfish = new Horde_Crypt_Blowfish($key);
+ $result = base64_decode($result);
+ $result = $blowfish->decrypt($result);
}
-
- return $session->get('imp', 'smime_null_passphrase' . $suffix);
+ return $result;
}
/**
@@ -537,17 +1066,21 @@ public function getPassphrase($signkey = self::KEY_PRIMARY)
*/
public function storePassphrase($passphrase, $signkey = self::KEY_PRIMARY)
{
- global $session;
+ global $session, $injector;
+
+ // TODO: call identity here or ask for it as a parameter of the function?
+ $identity = $injector->getInstance('IMP_Identity');
+ $identityID = $identity->getDefault();
if ($signkey == self::KEY_SECONDARY_OR_PRIMARY) {
- if ($key = $this->getPersonalPrivateKey(self::KEY_SECONDARY)) {
+ if ($key = $this->getPersonalPrivateKey(self::KEY_SECONDARY, $identityID)) {
$signkey = self::KEY_SECONDARY;
} else {
- $key = $this->getPersonalPrivateKey();
+ $key = $this->getPersonalPrivateKey(self::KEY_PRIMARY, $identityID);
$signkey = self::KEY_PRIMARY;
}
} else {
- $key = $this->getPersonalPrivateKey($signkey);
+ $key = $this->getPersonalPrivateKey($signkey, $identityID);
}
if ($this->_smime->verifyPassphrase($key, $passphrase) !== false) {
$session->set(
@@ -589,9 +1122,10 @@ public function unsetPassphrase($signkey = false)
* @return Horde_Mime_Part See Horde_Crypt_Smime::encryptMIMEPart().
* @throws Horde_Crypt_Exception
*/
- public function encryptMimePart($mime_part,
- Horde_Mail_Rfc822_List $recip)
- {
+ public function encryptMimePart(
+ $mime_part,
+ Horde_Mail_Rfc822_List $recip
+ ) {
return $this->_smime->encryptMIMEPart(
$mime_part,
$this->_encryptParameters($recip)
@@ -624,9 +1158,10 @@ public function signMimePart($mime_part)
* Horde_Crypt_Smime::signAndencryptMIMEPart().
* @throws Horde_Crypt_Exception
*/
- public function signAndEncryptMimePart($mime_part,
- Horde_Mail_Rfc822_List $recip)
- {
+ public function signAndEncryptMimePart(
+ $mime_part,
+ Horde_Mail_Rfc822_List $recip
+ ) {
return $this->_smime->signAndEncryptMIMEPart(
$mime_part,
$this->_signParameters(),
@@ -638,32 +1173,61 @@ public function signAndEncryptMimePart($mime_part,
* Stores the public/private/additional certificates in the preferences
* from a given PKCS 12 file.
*
- * @param string $pkcs12 The PKCS 12 data.
- * @param string $password The password of the PKCS 12 file.
- * @param string $pkpass The password to use to encrypt the private key.
- * @param boolean $signkey Is this the secondary key for signing?
+ * TODO: Should keys be added to the extra table per default?
+ *
+ * @param string $pkcs12 The PKCS 12 data.
+ * @param string $password The password of the PKCS 12 file.
+ * @param string $pkpass The password to use to encrypt the private key.
+ * @param boolean $signkey Is this the secondary key for signing?
+ * @param boolean $extrakey Specifies if the key should be added to the extrakeys table
+ * @param integer $identityID The identity to look for.
*
* @throws Horde_Crypt_Exception
*/
public function addFromPKCS12(
- $pkcs12, $password, $pkpass = null, $signkey = false
- )
- {
- global $conf;
+ $pkcs12,
+ $password,
+ $pkpass = null,
+ $signkey = false,
+ $extrakey = false,
+ $identityID = 0,
+ $identity_used = false
+ ) {
+ global $conf, $notification;
$sslpath = empty($conf['openssl']['path'])
? null
: $conf['openssl']['path'];
- $params = array('sslpath' => $sslpath, 'password' => $password);
+ $params = ['sslpath' => $sslpath, 'password' => $password];
if (!empty($pkpass)) {
$params['newpassword'] = $pkpass;
}
- $result = $this->_smime->parsePKCS12Data($pkcs12, $params);
- $this->addPersonalPrivateKey($result->private, $signkey);
- $this->addPersonalPublicKey($result->public, $signkey);
- $this->addAdditionalCert($result->certs, $signkey);
+ $keysinfos = $this->_smime->parsePKCS12Data($pkcs12, $params);
+
+ // add keys to extra table
+ $result = $this->addExtraPersonalKeys($keysinfos->private, $keysinfos->public, $password, $pref_name = 'smime_private_key', $identityID, $identity_used);
+
+ if ($result) {
+ $notification->push(_('S/MIME Public/Private Keypair successfully added to exra keys in keystore.'), 'horde.success');
+ }
+
+ if ($extrakey === false) {
+ // get id for newly added key:
+ // if the private key does not exists, get newest id to add (see method parameters of privateKeyExists)
+ // else do nothing ;)
+
+ if (!$this->privateKeyExists($keysinfos->private, $identityId)) {
+ $id = $this->privateKeyExists($keysinfos->private, $identityId, false, true);
+
+ // add id to the identities (serialized array) in prefs
+ $this->addPersonalPrivateKey($id, $signkey, $calledFromSetSmime = false, $identityID);
+ $this->addPersonalPublicKey($id, $signkey, $identityID);
+ //TODO: This has to be checked again... not sure the method is needed anymore at all
+ //$this->addAdditionalCert($keysinfos->certs, $signkey, $identityID);
+ }
+ }
}
/**
diff --git a/locale/ar/LC_MESSAGES/imp.mo b/locale/ar/LC_MESSAGES/imp.mo
index e300d07b3..0f09e62bd 100644
Binary files a/locale/ar/LC_MESSAGES/imp.mo and b/locale/ar/LC_MESSAGES/imp.mo differ
diff --git a/locale/ar/LC_MESSAGES/imp.po b/locale/ar/LC_MESSAGES/imp.po
index 4d97b16a5..b2fabbf1d 100644
--- a/locale/ar/LC_MESSAGES/imp.po
+++ b/locale/ar/LC_MESSAGES/imp.po
@@ -271,8 +271,7 @@ msgstr "مرفق مخفي"
msgid "Blacklist"
msgstr "القائمة السوداء"
-#: templates/search/main.inc:62 templates/filters/manage.inc:17
-#: filters.php:143
+#: templates/search/main.inc:62 templates/filters/manage.inc:17 filters.php:143
msgid "Body"
msgstr "النص"
diff --git a/locale/ar_OM/LC_MESSAGES/imp.mo b/locale/ar_OM/LC_MESSAGES/imp.mo
index 177825fc1..b6d377414 100644
Binary files a/locale/ar_OM/LC_MESSAGES/imp.mo and b/locale/ar_OM/LC_MESSAGES/imp.mo differ
diff --git a/locale/ar_OM/LC_MESSAGES/imp.po b/locale/ar_OM/LC_MESSAGES/imp.po
index efde8e4c3..be7ca6c37 100644
--- a/locale/ar_OM/LC_MESSAGES/imp.po
+++ b/locale/ar_OM/LC_MESSAGES/imp.po
@@ -271,8 +271,7 @@ msgstr "مرفق مخفي"
msgid "Blacklist"
msgstr "القائمة السوداء"
-#: templates/search/main.inc:62 templates/filters/manage.inc:17
-#: filters.php:143
+#: templates/search/main.inc:62 templates/filters/manage.inc:17 filters.php:143
msgid "Body"
msgstr "النص"
diff --git a/locale/bg/LC_MESSAGES/imp.mo b/locale/bg/LC_MESSAGES/imp.mo
index 937c62323..f519d539f 100644
Binary files a/locale/bg/LC_MESSAGES/imp.mo and b/locale/bg/LC_MESSAGES/imp.mo differ
diff --git a/locale/bs/LC_MESSAGES/imp.mo b/locale/bs/LC_MESSAGES/imp.mo
index 27ea29adb..1d98e0165 100644
Binary files a/locale/bs/LC_MESSAGES/imp.mo and b/locale/bs/LC_MESSAGES/imp.mo differ
diff --git a/locale/bs/LC_MESSAGES/imp.po b/locale/bs/LC_MESSAGES/imp.po
index 63db66c4c..bcd3b4563 100644
--- a/locale/bs/LC_MESSAGES/imp.po
+++ b/locale/bs/LC_MESSAGES/imp.po
@@ -2932,9 +2932,8 @@ msgid "Thread View"
msgstr "Prikaz po toku teme"
#: message.php:255 mailbox.php:570 search.php:145
-#: templates/contacts/contacts.inc:216
-#: templates/mailbox/message_headers.inc:17 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: templates/contacts/contacts.inc:216 templates/mailbox/message_headers.inc:17
+#: templates/compose/redirect.inc:64 templates/compose/recompose.inc:10
msgid "To"
msgstr "Za"
diff --git a/locale/ca/LC_MESSAGES/imp.mo b/locale/ca/LC_MESSAGES/imp.mo
index 3aaa55a73..e34b92f11 100644
Binary files a/locale/ca/LC_MESSAGES/imp.mo and b/locale/ca/LC_MESSAGES/imp.mo differ
diff --git a/locale/ca/LC_MESSAGES/imp.po b/locale/ca/LC_MESSAGES/imp.po
index a55e371e8..dec5fce7c 100644
--- a/locale/ca/LC_MESSAGES/imp.po
+++ b/locale/ca/LC_MESSAGES/imp.po
@@ -404,8 +404,8 @@ msgid ""
"All messages in your \"%s\" folder older than %s days will be permanently "
"deleted."
msgstr ""
-"S'eliminaran de manera definitiva tots els missatges de la vostra carpeta \"%"
-"s\" amb més de %s dies d'antiguitat."
+"S'eliminaran de manera definitiva tots els missatges de la vostra carpeta "
+"\"%s\" amb més de %s dies d'antiguitat."
#: lib/Maintenance/Task/delete_attachments_monthly.php:59
#, php-format
@@ -4680,11 +4680,11 @@ msgstr "Esteu a punt de recollir el correu de la carpeta(es) següent(s):"
#: templates/folders/folders_confirm.html:10
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr ""
-"Esteu intentant eliminar tots els missatges que conté(enen) la(es) carpeta"
-"(es) següent(s):"
+"Esteu intentant eliminar tots els missatges que conté(enen) la(es) "
+"carpeta(es) següent(s):"
#: templates/folders/folders_confirm.html:9
msgid "You are attempting to delete the following folder(s)."
@@ -5096,8 +5096,7 @@ msgstr "nom"
msgid "none"
msgstr "cap"
-#: templates/fetchmail/account_select.inc:25
-#: templates/compose/spelling.inc:105
+#: templates/fetchmail/account_select.inc:25 templates/compose/spelling.inc:105
msgid "or"
msgstr "o"
diff --git a/locale/cs/LC_MESSAGES/imp.mo b/locale/cs/LC_MESSAGES/imp.mo
index b45513166..7e344bc39 100644
Binary files a/locale/cs/LC_MESSAGES/imp.mo and b/locale/cs/LC_MESSAGES/imp.mo differ
diff --git a/locale/cs/LC_MESSAGES/imp.po b/locale/cs/LC_MESSAGES/imp.po
index b40d50cdc..1ca3d4bd1 100644
--- a/locale/cs/LC_MESSAGES/imp.po
+++ b/locale/cs/LC_MESSAGES/imp.po
@@ -73,8 +73,7 @@ msgstr[2] "%d Příloh"
msgid "%d Attachments"
msgstr "%d Příloha"
-#: lib/Basic/Mailbox.php:397 lib/Basic/Mailbox.php:398
-#: lib/Basic/Thread.php:180
+#: lib/Basic/Mailbox.php:397 lib/Basic/Mailbox.php:398 lib/Basic/Thread.php:180
#, php-format
msgid "%d Messages"
msgstr "%d zpráv"
@@ -469,10 +468,6 @@ msgstr "Přidáno \"%s\" jako příloha."
msgid "Added flag \"%s\"."
msgstr "Přidán štítek \"%s\"."
-#: lib/Ajax/Application/Handler/Dynamic.php:633
-msgid "Adding group lists not currently supported."
-msgstr ""
-
#: config/prefs.php:1096
msgid ""
"Additional headers to display when viewing: (enter each header on a new "
@@ -615,11 +610,6 @@ msgstr "Povolit přístup k externím účtům?"
msgid "Always prompt"
msgstr "Vždy vyzývat"
-#: lib/Ajax/Application/Handler/ImageUnblock.php:39
-#, php-format
-msgid "Always showing images in messages sent by %s."
-msgstr ""
-
#: lib/Minimal/Compose.php:504
msgid "Ambiguous address found."
msgstr "Nejednoznačná adresa nalezena."
@@ -654,10 +644,6 @@ msgstr "Neznámá osoba"
msgid "Answered"
msgstr "Zodpovězena"
-#: templates/prefs/acl.html.php:41 templates/prefs/acl.html.php:76
-msgid "Append"
-msgstr ""
-
#: lib/Dynamic/Mailbox.php:482 templates/basic/mailbox/header.html.php:13
msgid "Apply Filters"
msgstr "Aplikovat filtry"
@@ -977,9 +963,8 @@ msgstr "Připojit Vaše kontaktní informace ke zprávě?"
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:69
-#: templates/minimal/compose.html.php:59
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:69
-#: templates/prefs/remote.html.php:80
+#: templates/minimal/compose.html.php:59 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:69 templates/prefs/remote.html.php:80
#: templates/saveimage/saveimage.html.php:20
#: templates/search/search.html.php:103
#: templates/smartmobile/compose.html.php:50
@@ -1200,16 +1185,6 @@ msgid "Click this box to add the original message text to the body."
msgstr ""
"Klepněte na tento box pro přidání původní zprávy do těla vytvářené zprávy."
-#: lib/Script/Package/Imp.php:33
-msgid "Click to always show images from this sender."
-msgstr ""
-
-#: lib/Mime/Viewer/Html.php:269
-msgid ""
-"Click to view HTML data in new window; it is possible this will allow you to "
-"view the message correctly."
-msgstr ""
-
#: config/prefs.php:1532
msgid "Clicking on the address will compose a new message to the sender"
msgstr "Kliknutím na adresu lze vytvořit novou zprávu pro odesílatele"
@@ -1277,10 +1252,6 @@ msgstr "Šablony zpráv"
msgid "Compose Templates mailbox:"
msgstr "Složka šablon:"
-#: lib/Dynamic/Compose/Common.php:260
-msgid "Compose action completed. You may now safely close this window."
-msgstr ""
-
#: config/prefs.php:599
msgid "Compose messages in a separate window?"
msgstr "Vytvářet zprávy v novém okně?"
@@ -1289,10 +1260,6 @@ msgstr "Vytvářet zprávy v novém okně?"
msgid "Composition"
msgstr "Vytváření zpráv"
-#: config/prefs.php:321
-msgid "Configure PGP encryption support."
-msgstr ""
-
#: config/prefs.php:404
#, fuzzy
msgid "Configure S/MIME encryption support."
@@ -1372,11 +1339,6 @@ msgstr "Kopírovat do schránky"
msgid "Copy/Move"
msgstr "Kopírovat/Přesunout"
-#: lib/Dynamic/Compose/Common.php:261
-#, php-format
-msgid "Could not add %d file(s) to message: only images are supported."
-msgstr ""
-
#: lib/Imap/Acl.php:100
#, php-format
msgid "Could not add rights for user \"%s\" for the mailbox \"%s\"."
@@ -1444,10 +1406,6 @@ msgstr "Nelze otevřít složku."
msgid "Could not parse mailbox data."
msgstr "Nelze otevřít schránku."
-#: lib/Dynamic/Compose/Common.php:264
-msgid "Could not paste image as the clipboard data is invalid."
-msgstr ""
-
#: lib/Imap/Acl.php:131
#, php-format
msgid "Could not remove rights for user \"%s\" for the mailbox \"%s\"."
@@ -1560,10 +1518,6 @@ msgstr "_Datum"
msgid "Date"
msgstr "Datum"
-#: lib/Dynamic/Mailbox.php:257
-msgid "Date (Arrival)"
-msgstr ""
-
#: lib/Dynamic/Mailbox.php:258
#, fuzzy
msgid "Date (Message)"
@@ -1619,8 +1573,8 @@ msgid "Delegated"
msgstr "Přiděleno"
#: lib/Dynamic/Compose/Common.php:186 lib/Dynamic/Mailbox.php:325
-#: lib/Dynamic/Mailbox.php:356 lib/Imap/Acl.php:196
-#: lib/Minimal/Message.php:218 templates/basic/folders/actions.html.php:26
+#: lib/Dynamic/Mailbox.php:356 lib/Imap/Acl.php:196 lib/Minimal/Message.php:218
+#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:30 templates/prefs/acl.html.php:43
#: templates/prefs/acl.html.php:78 templates/prefs/pgppublickey.html.php:22
@@ -1840,14 +1794,6 @@ msgstr "Stáhnout přílohu"
msgid "Download attachment:"
msgstr "Stáhnout přílohu:"
-#: lib/Dynamic/Mailbox.php:159
-msgid "Download into a MBOX file"
-msgstr ""
-
-#: lib/Dynamic/Mailbox.php:160
-msgid "Download into a MBOX file (ZIP compressed)"
-msgstr ""
-
#: lib/Compose.php:2891
#, fuzzy
msgid "Download link"
@@ -1874,10 +1820,6 @@ msgstr "Koncepty"
msgid "Drafts mailbox:"
msgstr "Složka konceptů:"
-#: templates/dynamic/compose.html.php:159
-msgid "Drop file(s) here to attach."
-msgstr ""
-
#: templates/prefs/pgpprivatekey.html.php:76 templates/prefs/remote.html.php:9
msgid "E-mail Address"
msgstr "E-mailová adresa"
@@ -2081,10 +2023,6 @@ msgstr "Položka \"%s\" byla úspěšně přidána do kontaktů"
msgid "Error"
msgstr "Chyba"
-#: lib/Contents.php:115
-msgid "Error displaying message: message does not exist on server."
-msgstr ""
-
#: lib/Ajax/Imple/VcardImport.php:73
#, fuzzy
msgid "Error reading the contact data."
@@ -2095,13 +2033,6 @@ msgstr "Chyba při odstraňování %d kontaktu."
msgid "Error sending reply: %s."
msgstr "Nastala chyba při zasílání odpovědi: %s."
-#: lib/Mbox/Import.php:195
-#, php-format
-msgid ""
-"Error when importing messages; %u messages successfully imported before "
-"error."
-msgstr ""
-
#: lib/Compose.php:2388
msgid "Error when redirecting message."
msgstr "Došlo k chybě při přesměrování zprávy."
@@ -2158,8 +2089,7 @@ msgid "Expand Headers"
msgstr "Rozbalit Hlavičky"
#: lib/Minimal/Compose.php:107 lib/Minimal/Compose.php:162
-#: templates/minimal/compose.html.php:58
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:58 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "Rozbalit jména"
@@ -2178,10 +2108,6 @@ msgstr "Délka Trvání"
msgid "Export"
msgstr "Export"
-#: templates/basic/folders/actions.html.php:29
-msgid "Expunge"
-msgstr ""
-
#: lib/Application.php:252
msgid "Fi_lters"
msgstr "Fi_ltry"
@@ -2273,15 +2199,6 @@ msgstr "Pro sledování"
msgid "Flags"
msgstr "Štítky"
-#: lib/Message.php:675
-#, php-format
-msgid ""
-"Flags were not changed for at least one message in the mailbox \"%s\" "
-"because the flags were altered by another connection to the mailbox prior to "
-"this request. You may redo the flag action if desired; this warning is "
-"precautionary to ensure you don't overwrite flag changes."
-msgstr ""
-
#: lib/Basic/Mailbox.php:680 lib/Basic/Message.php:603
msgid "Fo_rward"
msgstr "_Přeposlat"
@@ -2294,8 +2211,7 @@ msgstr "Složka"
msgid "Folder Actions"
msgstr "Akce složek"
-#: lib/Basic/Folders.php:274
-#: templates/basic/folders/folders_confirm.html.php:6
+#: lib/Basic/Folders.php:274 templates/basic/folders/folders_confirm.html.php:6
msgid "Folder Actions - Confirmation"
msgstr "Akce složky - potvrzení"
@@ -2355,14 +2271,6 @@ msgstr "Přeposílaná zpráva bude automaticky přidána k vámi odesílané zp
msgid "Forwards"
msgstr "Přeposílání"
-#: lib/Compose.php:1478
-#, php-format
-msgid ""
-"Found the word %s in the message text although there are no files attached "
-"to the message. Did you forget to attach a file? (This check will not be "
-"performed again for this message.)"
-msgstr ""
-
#: lib/Ajax/Imple/ItipRequest.php:358
msgid "Free/Busy Request Response"
msgstr "Odpověď na žádost o volném čase"
@@ -2377,8 +2285,7 @@ msgstr "_Od"
#: templates/basic/search/search-basic.html.php:16
#: templates/dynamic/compose.html.php:102
#: templates/dynamic/mailbox.html.php:128 templates/minimal/mailbox.html.php:9
-#: templates/smartmobile/search.html.php:11
-#: templates/thread/thread.html.php:21
+#: templates/smartmobile/search.html.php:11 templates/thread/thread.html.php:21
msgid "From"
msgstr "Od"
@@ -2601,15 +2508,6 @@ msgstr[0] "Importována %d zpráva od %s."
msgstr[1] "Importovány %d zprávy od %s."
msgstr[2] "Importováno %d zpráv od %s."
-#: lib/Mbox/Parse.php:82
-#, php-format
-msgid "Imported mailbox contains more than enforced limit of %u messages."
-msgstr ""
-
-#: lib/Dynamic/Mailbox.php:531
-msgid "Importing (this may take some time)..."
-msgstr ""
-
#: lib/Basic/Message.php:614 lib/Dynamic/Base.php:175
msgid "In Body Text"
msgstr "V textu zprávy"
@@ -2822,11 +2720,6 @@ msgstr "Odhlásit se"
msgid "Log out"
msgstr "Odhlásit"
-#: lib/Ajax/Application/Handler/Remote.php:124
-#, php-format
-msgid "Logged out of %s."
-msgstr ""
-
#: lib/Dynamic/Mailbox.php:542
msgid "Logging Out..."
msgstr "Odhlašování..."
@@ -2996,10 +2889,6 @@ msgstr "Maximální počet příjemců v časovém intervalu"
msgid "Maximum number of attachments reached."
msgstr "Byl dosažen maximální počet příloh."
-#: lib/Perms.php:60
-msgid "Maximum size (bytes) of compose body"
-msgstr ""
-
#: lib/Dynamic/Mailbox.php:530
msgid "Mbox or .eml file:"
msgstr "Mbox nebo .eml soubor:"
@@ -3178,10 +3067,6 @@ msgstr "Zobrazení více zpráv"
msgid "Multiple messages can only be forwarded as attachments."
msgstr "Výběr více zpráv může být vždy přeposílán pouze jako soubor příloh."
-#: lib/Smartmobile.php:176
-msgid "Must enter a non-empty name for the new destination mailbox."
-msgstr ""
-
#: config/prefs.php:1481
msgid "NONE"
msgstr "ŽÁDNÉ"
@@ -3234,10 +3119,9 @@ msgstr "Nový štítek"
msgid "New Mail"
msgstr "Nová pošta"
-#: lib/Application.php:430 lib/Basic/Compose.php:207
-#: lib/Basic/Compose.php:1152 lib/Compose.php:2200 lib/Dynamic/Base.php:157
-#: lib/Dynamic/Compose.php:78 lib/Dynamic/Mailbox.php:109
-#: lib/Minimal/Base.php:88 lib/Smartmobile.php:177
+#: lib/Application.php:430 lib/Basic/Compose.php:207 lib/Basic/Compose.php:1152
+#: lib/Compose.php:2200 lib/Dynamic/Base.php:157 lib/Dynamic/Compose.php:78
+#: lib/Dynamic/Mailbox.php:109 lib/Minimal/Base.php:88 lib/Smartmobile.php:177
#: templates/dynamic/mailbox.html.php:54
#: templates/smartmobile/compose.html.php:2
#: templates/smartmobile/folders.html.php:13
@@ -3571,10 +3455,6 @@ msgstr ""
"PGP kódování nemůže být standardně používáno jako veřejné klíče, nemůže být "
"nalezeno pro všechny příjemce."
-#: lib/Ajax/Application/Handler/Passphrase.php:55
-msgid "PGP passhprase stored in session."
-msgstr ""
-
#: lib/Prefs/Special/PgpPrivateKey.php:169
msgid "PGP passphrase successfully unloaded."
msgstr "PGP heslo bylo úspěšně odemčeno."
@@ -3642,18 +3522,6 @@ msgstr "Heslo"
msgid "Password for %s:"
msgstr "Heslo:"
-#: templates/pgp/import_key.html.php:19
-msgid ""
-"Paste PGP public keys into the textarea, upload a file containing PGP public "
-"keys, or combine both methods. Multiple keys are supported."
-msgstr ""
-
-#: templates/pgp/import_key.html.php:21
-msgid ""
-"Paste your PGP private key into the textarea or upload a file containing "
-"your key."
-msgstr ""
-
#: lib/Dynamic/Mailbox.php:525
#, php-format
msgid "Permanently delete %s?"
@@ -3973,13 +3841,12 @@ msgstr "Opakování"
msgid "Redirec_t"
msgstr "Přes_měrovat"
-#: lib/Basic/Compose.php:399 lib/Basic/Mailbox.php:685
-#: lib/Dynamic/Base.php:180 lib/Dynamic/Compose.php:148
-#: lib/Minimal/Compose.php:234 lib/Minimal/Compose.php:237
-#: lib/Minimal/Message.php:244 lib/Notification/Event/Status.php:32
+#: lib/Basic/Compose.php:399 lib/Basic/Mailbox.php:685 lib/Dynamic/Base.php:180
+#: lib/Dynamic/Compose.php:148 lib/Minimal/Compose.php:234
+#: lib/Minimal/Compose.php:237 lib/Minimal/Message.php:244
+#: lib/Notification/Event/Status.php:32
#: templates/basic/compose/redirect.html.php:51
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:55
msgid "Redirect"
msgid_plural "Redirect Messages"
@@ -4165,8 +4032,7 @@ msgid "Required Participant"
msgstr "Požadovaní účastníci"
#: templates/basic/search/search-basic.html.php:50
-#: templates/contacts/contacts.html.php:25
-#: templates/search/search.html.php:106
+#: templates/contacts/contacts.html.php:25 templates/search/search.html.php:106
msgid "Reset"
msgstr "Vynulovat"
@@ -4880,8 +4746,7 @@ msgstr "Předmět"
#: lib/Dynamic/Mailbox.php:186 lib/Dynamic/Mailbox.php:255
#: lib/Dynamic/Mailbox.php:491 lib/Message/Ui.php:39 lib/Smartmobile.php:181
#: templates/basic/search/search-basic.html.php:18
-#: templates/dynamic/compose.html.php:147
-#: templates/minimal/mailbox.html.php:10
+#: templates/dynamic/compose.html.php:147 templates/minimal/mailbox.html.php:10
#: templates/smartmobile/search.html.php:13
msgid "Subject"
msgstr "Předmět"
@@ -5232,12 +5097,6 @@ msgstr[0] "Zpráva byla vymazána."
msgstr[1] "Zpráva byla vymazána."
msgstr[2] "Zpráva byla vymazána."
-#: lib/Mime/Viewer/Plain.php:188
-msgid ""
-"The message part may contain incorrect character set information preventing "
-"correct display."
-msgstr ""
-
#: lib/Block/Newmail.php:45
msgid "The number of unseen messages to show"
msgstr "Počet nepřečtených zpráv k zobrazení"
@@ -5324,12 +5183,6 @@ msgstr "Text zaslané zprávy"
msgid "The text of the sent message can be viewed %s."
msgstr "Text zaslané zprávy lze zonrazit %s."
-#: lib/Compose/HtmlSignature.php:68
-msgid ""
-"The total size of your HTML signature image data has exceeded the maximum "
-"allowed."
-msgstr ""
-
#: lib/Mbox/Import.php:145
msgid "The uploaded file cannot be opened."
msgstr "Nahraný soubor nelze otevřít."
@@ -5344,8 +5197,7 @@ msgstr ""
"Zpráva neobsahuje žádné aliternativní části, které by ještě bylo možné "
"zobrazit."
-#: lib/Dynamic/Mailbox.php:553
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:553 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "Tato složka neobsahuje žadné zprávy."
@@ -5447,10 +5299,6 @@ msgstr "Tato akce není podporována."
msgid "This audio file is reported to be %s in length."
msgstr "Tento audio soubor je hlášen jako %d minut, %d sekund dlouhý."
-#: lib/Mime/Viewer/Pgp.php:426
-msgid "This digitally signed message is broken."
-msgstr ""
-
#: lib/Mime/Viewer/Pdf.php:86
msgid "This is a thumbnail of a PDF file attachment."
msgstr "Toto je miniatura připojeného PDF souboru."
@@ -5478,12 +5326,6 @@ msgstr "Toto může trvat nějaký čas. Skutečně chcete pokračovat?"
msgid "This message contains a Macintosh file (named \"%s\")."
msgstr "Tato zpráva obsahuje Macintosh soubor (s názvem \"%s\") ."
-#: lib/Mime/Viewer/Html.php:268
-msgid ""
-"This message contains corrupt styling data so the message contents may not "
-"appear correctly below."
-msgstr ""
-
#: lib/Contents.php:613
msgid "This message part cannot be viewed because it is too large."
msgstr "Tato část zprávy nemůže být zobrazena, protože je příliš velká."
@@ -6053,12 +5895,6 @@ msgstr[0] "Nemáte oprávnění posílat zprávy více než %d příjemcům."
msgstr[1] "Nemáte oprávnění posílat zprávy více než %d příjemcům."
msgstr[2] "Nemáte oprávnění posílat zprávy více než %d příjemcům."
-#: lib/Message.php:239
-msgid ""
-"You are over your quota, so your messages will be permanently deleted "
-"instead of moved to the Trash mailbox."
-msgstr ""
-
#: lib/Basic/Folders.php:57
#, fuzzy
msgid "You are renaming the mailbox:"
@@ -6111,11 +5947,6 @@ msgstr ""
msgid "You have already submitted this page."
msgstr "Tuto stránku již máte aktivovánu."
-#: lib/Basic/Compose.php:741 lib/Dynamic/Compose/Common.php:258
-msgid ""
-"You have edited your signature. Change the identity and lose your changes?"
-msgstr ""
-
#: lib/Ajax/Application/Handler/Dynamic.php:52
#, fuzzy, php-format
msgid "You may not create child mailboxes in \"%s\"."
@@ -6170,12 +6001,6 @@ msgstr "Musíte nejdříve vybrat alespoň jednu zprávu."
msgid "You must specify a recipient."
msgstr "Musíte zadat příjemce."
-#: lib/Dynamic/Base.php:196
-msgid ""
-"You need to either use the keyboard (Ctrl/Cmd + C) or right click on the "
-"selected address to access the Copy command."
-msgstr ""
-
#: lib/Maillog/Log/Redirect.php:65
#, php-format
msgid "You redirected this message on %s to: %s."
@@ -6274,22 +6099,10 @@ msgid ""
"Your alias addresses: (optional, enter each address on a new line)"
msgstr "Vaše aliasy: (nepovinné, vložte jednu adresu na řádek)"
-#: lib/Ajax/Application/Handler/ComposeAttach.php:57
-#: lib/Ajax/Application/Handler/Dynamic.php:1046
-msgid ""
-"Your attachment was not uploaded. Most likely, the file exceeded the maximum "
-"size allowed by the server configuration."
-msgstr ""
-
#: lib/Mime/Viewer/Images.php:133
msgid "Your browser does not support inline display of this image type."
msgstr "Váš prohlížeč nepodporuje zobrazení tohoto typu obrázku v těle zprávy."
-#: lib/Dynamic/Base.php:196
-msgid ""
-"Your browser security settings don't permit direct access to the clipboard."
-msgstr ""
-
#: templates/prefs/encrypt.html.php:3
msgid "Your default encryption method for sending messages:"
msgstr "Váše výchozí metoda šifrování pro odesílání zpráv:"
@@ -6313,15 +6126,6 @@ msgstr ""
"Vaše identita byla přepnuta na identitu asociovanou s adresou stávajícího "
"příjemce. Identita nebude znovu ověřována při této akci."
-#: lib/Compose/LinkedAttachment.php:220
-msgid "Your linked attachment has been downloaded by at least one user."
-msgstr ""
-
-#: lib/Compose.php:762
-#, php-format
-msgid "Your message body has exceeded the limit by body size by %d characters."
-msgstr ""
-
#: lib/Mime/Viewer/Status.php:122
msgid "Your message was successfully delivered."
msgstr "Vaše zpráva byla úspěšně doručena."
diff --git a/locale/da/LC_MESSAGES/imp.mo b/locale/da/LC_MESSAGES/imp.mo
index c98a60dd3..6af709ad8 100644
Binary files a/locale/da/LC_MESSAGES/imp.mo and b/locale/da/LC_MESSAGES/imp.mo differ
diff --git a/locale/da/LC_MESSAGES/imp.po b/locale/da/LC_MESSAGES/imp.po
index bac554851..a51ef7806 100644
--- a/locale/da/LC_MESSAGES/imp.po
+++ b/locale/da/LC_MESSAGES/imp.po
@@ -69,8 +69,7 @@ msgstr[1] "%d Vedhæftelser"
msgid "%d Attachments"
msgstr "%d Vedhæftelser"
-#: lib/Basic/Mailbox.php:400 lib/Basic/Mailbox.php:401
-#: lib/Basic/Thread.php:180
+#: lib/Basic/Mailbox.php:400 lib/Basic/Mailbox.php:401 lib/Basic/Thread.php:180
#, php-format
msgid "%d Messages"
msgstr "%d beskeder"
@@ -940,9 +939,8 @@ msgstr "Kan ikke vedhæfte kontakt information: %s"
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:69
-#: templates/minimal/compose.html.php:56
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:69
-#: templates/prefs/remote.html.php:60
+#: templates/minimal/compose.html.php:56 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:69 templates/prefs/remote.html.php:60
#: templates/saveimage/saveimage.html.php:20
#: templates/search/search.html.php:103
#: templates/smartmobile/compose.html.php:47
@@ -1555,8 +1553,8 @@ msgid "Delegated"
msgstr "Delegeret"
#: lib/Dynamic/Compose/Common.php:177 lib/Dynamic/Mailbox.php:322
-#: lib/Dynamic/Mailbox.php:353 lib/Imap/Acl.php:196
-#: lib/Minimal/Message.php:233 templates/basic/folders/actions.html.php:26
+#: lib/Dynamic/Mailbox.php:353 lib/Imap/Acl.php:196 lib/Minimal/Message.php:233
+#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:30 templates/prefs/acl.html.php:43
#: templates/prefs/acl.html.php:78 templates/prefs/pgppublickey.html.php:22
@@ -2095,8 +2093,7 @@ msgid "Expand Headers"
msgstr "Udfold Headers"
#: lib/Minimal/Compose.php:107 lib/Minimal/Compose.php:162
-#: templates/minimal/compose.html.php:55
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:55 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "Udfold navne"
@@ -2232,8 +2229,7 @@ msgstr "Mappe"
msgid "Folder Actions"
msgstr "Mappe handlinger"
-#: lib/Basic/Folders.php:274
-#: templates/basic/folders/folders_confirm.html.php:6
+#: lib/Basic/Folders.php:274 templates/basic/folders/folders_confirm.html.php:6
msgid "Folder Actions - Confirmation"
msgstr "Mappe-handlinger - Bekræftelse"
@@ -2315,10 +2311,9 @@ msgstr "Fra _m"
#: lib/Dynamic/Mailbox.php:251 lib/Dynamic/Mailbox.php:457
#: lib/Message/Ui.php:34 templates/basic/compose/compose.html.php:38
#: templates/basic/search/search-basic.html.php:16
-#: templates/dynamic/compose.html.php:98
-#: templates/dynamic/mailbox.html.php:116 templates/minimal/mailbox.html.php:9
-#: templates/smartmobile/search.html.php:11
-#: templates/thread/thread.html.php:21
+#: templates/dynamic/compose.html.php:98 templates/dynamic/mailbox.html.php:116
+#: templates/minimal/mailbox.html.php:9
+#: templates/smartmobile/search.html.php:11 templates/thread/thread.html.php:21
msgid "From"
msgstr "Fra"
@@ -3165,10 +3160,9 @@ msgstr "Nyt Flag"
msgid "New Mail"
msgstr "Ny email"
-#: lib/Application.php:438 lib/Basic/Compose.php:207
-#: lib/Basic/Compose.php:1151 lib/Compose.php:2145 lib/Dynamic/Base.php:157
-#: lib/Dynamic/Compose.php:78 lib/Dynamic/Mailbox.php:108
-#: lib/Minimal/Base.php:88 lib/Smartmobile.php:179
+#: lib/Application.php:438 lib/Basic/Compose.php:207 lib/Basic/Compose.php:1151
+#: lib/Compose.php:2145 lib/Dynamic/Base.php:157 lib/Dynamic/Compose.php:78
+#: lib/Dynamic/Mailbox.php:108 lib/Minimal/Base.php:88 lib/Smartmobile.php:179
#: templates/dynamic/mailbox.html.php:54
#: templates/smartmobile/compose.html.php:2
#: templates/smartmobile/folders.html.php:13
@@ -3348,8 +3342,7 @@ msgid "Non Participant"
msgstr "Ej deltager"
#: lib/Compose/Ui.php:223 lib/Mime/Viewer/Itip.php:388
-#: lib/Mime/Viewer/Itip.php:543
-#: templates/basic/search/search-basic.html.php:14
+#: lib/Mime/Viewer/Itip.php:543 templates/basic/search/search-basic.html.php:14
#: templates/basic/search/search-basic.html.php:31
#: templates/prefs/acl.html.php:38 templates/prefs/acl.html.php:73
#: templates/prefs/composetemplates.html.php:7
@@ -3898,13 +3891,12 @@ msgstr "Gentagelse"
msgid "Redirec_t"
msgstr "Omadresser _t"
-#: lib/Basic/Compose.php:400 lib/Basic/Mailbox.php:688
-#: lib/Dynamic/Base.php:180 lib/Dynamic/Compose.php:150
-#: lib/Minimal/Compose.php:228 lib/Minimal/Compose.php:231
-#: lib/Minimal/Message.php:257 lib/Notification/Event/Status.php:32
+#: lib/Basic/Compose.php:400 lib/Basic/Mailbox.php:688 lib/Dynamic/Base.php:180
+#: lib/Dynamic/Compose.php:150 lib/Minimal/Compose.php:228
+#: lib/Minimal/Compose.php:231 lib/Minimal/Message.php:257
+#: lib/Notification/Event/Status.php:32
#: templates/basic/compose/redirect.html.php:51
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:55
msgid "Redirect"
msgid_plural "Redirect Messages"
@@ -4088,8 +4080,7 @@ msgid "Required Participant"
msgstr "Krævet deltager"
#: templates/basic/search/search-basic.html.php:50
-#: templates/contacts/contacts.html.php:25
-#: templates/search/search.html.php:106
+#: templates/contacts/contacts.html.php:25 templates/search/search.html.php:106
msgid "Reset"
msgstr "Nulstil"
@@ -4791,8 +4782,7 @@ msgstr "Emne _j"
#: lib/Dynamic/Mailbox.php:184 lib/Dynamic/Mailbox.php:253
#: lib/Dynamic/Mailbox.php:459 lib/Message/Ui.php:39 lib/Smartmobile.php:183
#: templates/basic/search/search-basic.html.php:18
-#: templates/dynamic/compose.html.php:142
-#: templates/minimal/mailbox.html.php:10
+#: templates/dynamic/compose.html.php:142 templates/minimal/mailbox.html.php:10
#: templates/smartmobile/search.html.php:13
msgid "Subject"
msgstr "Emne"
@@ -5237,8 +5227,7 @@ msgstr "Brugerens ledig/optaget-information er gemt."
msgid "There are no alternative parts that can be displayed inline."
msgstr "Der findes ikke nogen alternativ del, som kan vises."
-#: lib/Dynamic/Mailbox.php:520
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:520 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "Der er ingen beskeder in denne brevbakke."
@@ -5887,8 +5876,8 @@ msgstr "Du er"
#: templates/basic/folders/folders_confirm.html.php:13
msgid ""
-"You are attempting to delete all messages contained in the following mailbox"
-"(es)."
+"You are attempting to delete all messages contained in the following "
+"mailbox(es)."
msgstr "Du er ved at slette alle beskeder i følgende mappe(r)."
#: templates/basic/folders/folders_confirm.html.php:11
diff --git a/locale/de/LC_MESSAGES/imp.mo b/locale/de/LC_MESSAGES/imp.mo
index 559cef46f..0a14676b0 100644
Binary files a/locale/de/LC_MESSAGES/imp.mo and b/locale/de/LC_MESSAGES/imp.mo differ
diff --git a/locale/de/LC_MESSAGES/imp.po b/locale/de/LC_MESSAGES/imp.po
index 9ab6f10b3..5983c9537 100644
--- a/locale/de/LC_MESSAGES/imp.po
+++ b/locale/de/LC_MESSAGES/imp.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: IMP H6 (7.0-git)\n"
"Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2017-07-26 15:06+0200\n"
+"POT-Creation-Date: 2023-05-30 10:11+0000\n"
"PO-Revision-Date: 2017-09-27 14:39+0200\n"
"Last-Translator: Jan Schneider \n"
"Language-Team: German \n"
@@ -188,7 +188,7 @@ msgstr "%s hat mehrere Wiederholungen von \"%s\" abgesagt."
msgid "%s has replied to a free/busy request."
msgstr "%s hat auf eine Frei/Gebucht-Anfrage geantwortet."
-#: lib/Mime/Viewer/Itip.php:736
+#: lib/Mime/Viewer/Itip.php:737
#, php-format
msgid "%s has replied to the assignment of task \"%s\"."
msgstr "%s hat auf die Zuweisung der Aufgabe \"%s\" geantwortet."
@@ -233,7 +233,7 @@ msgstr "%s ausgewählt."
msgid "%s wants to notify you about changes in \"%s\"."
msgstr "%s möchte Sie auf Änderungen an \"%s\" aufmerksam machen."
-#: lib/Indices/Copy/Notepad.php:111 lib/Indices/Copy/Tasklist.php:113
+#: lib/Indices/Copy/Notepad.php:112 lib/Indices/Copy/Tasklist.php:113
#, php-format
msgid "%s was successfully added to \"%s\"."
msgstr "%s wurde erfolgreich zu \"%s\" hinzugefügt."
@@ -248,13 +248,13 @@ msgstr "%s wurde erfolgreich Ihrem Adressbuch hinzugefügt."
msgid "%s wishes to amend \"%s\"."
msgstr "%s möchte \"%s\" ändern."
-#: lib/Mime/Viewer/Itip.php:727
+#: lib/Mime/Viewer/Itip.php:728
#, php-format
msgid "%s wishes to assign you \"%s\"."
msgstr "%s möchte Ihnen \"%s\" zuweisen."
#: lib/Mime/Viewer/Itip.php:300 lib/Mime/Viewer/Itip.php:314
-#: lib/Mime/Viewer/Itip.php:720
+#: lib/Mime/Viewer/Itip.php:721
#, php-format
msgid "%s wishes to make you aware of \"%s\"."
msgstr "%s möchte Sie auf \"%s\" aufmerksam machen."
@@ -264,7 +264,7 @@ msgstr "%s möchte Sie auf \"%s\" aufmerksam machen."
msgid "%s wishes to receive the latest information about \"%s\"."
msgstr "%s möchte die neuesten Informationen über \"%s\" erhalten."
-#: lib/Compose.php:2715
+#: lib/Compose.php:2717
#, php-format
msgid "%u Forwarded Messages"
msgstr "%u weitergeleitete Nachrichten"
@@ -273,7 +273,7 @@ msgstr "%u weitergeleitete Nachrichten"
msgid "1 message"
msgstr "1 Nachricht"
-#: lib/Mime/Viewer/Pgp.php:364
+#: lib/Mime/Viewer/Pgp.php:365
msgid "A PGP Public Key is attached to the message."
msgstr "Ein öffentlicher PGP-Schlüssel wurde an die Nachricht angehängt."
@@ -285,7 +285,7 @@ msgstr ""
"Eine Nachricht, die Sie verschickt haben, führte zu einer Empfangbestätigung "
"vom Empfänger."
-#: lib/Compose.php:3522
+#: lib/Compose.php:3529
msgid ""
"A message you were composing when your session expired has been recovered. "
"You may resume composing your message by going to your Drafts mailbox."
@@ -304,7 +304,7 @@ msgstr "ACL für \"%s\" wurde erfolgreich auf dem Ordner \"%s\" angelegt."
msgid "ACL rights for \"%s\" updated for the mailbox \"%s\"."
msgstr "ACL für \"%s\" wurde auf dem Ordner \"%s\" aktualisiert."
-#: lib/Mime/Viewer/Itip.php:729
+#: lib/Mime/Viewer/Itip.php:730
msgid "Accept and add this to my tasklist"
msgstr "Akzeptieren und zu meiner Aufgabenliste hinzufügen"
@@ -320,7 +320,7 @@ msgstr "Akzeptieren und in meinem Kalender aktualisieren"
msgid "Accept request"
msgstr "Anfrage akzeptieren"
-#: lib/Mime/Viewer/Itip.php:807
+#: lib/Mime/Viewer/Itip.php:808
msgid "Accepted"
msgstr "Angenommen"
@@ -373,7 +373,7 @@ msgstr "Cc hinzufügen"
msgid "Add OR clause"
msgstr "ODER-Verknüpfung hinzufügen"
-#: config/prefs.php:1397
+#: config/prefs.php:1432
msgid "Add a \"Printed By\" header to the top of printed messages?"
msgstr "\"Gedruckt von\" im Kopf von gedruckten Nachrichten einfügen?"
@@ -393,7 +393,7 @@ msgstr "Auf OK klicken, um diese Adressen hinzuzufügen"
msgid "Add this to my calendar"
msgstr "Zu meinem Kalender hinzufügen"
-#: lib/Mime/Viewer/Itip.php:722 lib/Mime/Viewer/Itip.php:730
+#: lib/Mime/Viewer/Itip.php:723 lib/Mime/Viewer/Itip.php:731
msgid "Add this to my tasklist"
msgstr "Zu meiner Aufgabenliste hinzufügen"
@@ -415,7 +415,7 @@ msgstr "\"%s\" als Anhang hinzugefügt."
msgid "Added flag \"%s\"."
msgstr "Marker \"%s\" hinzugefügt."
-#: config/prefs.php:1088
+#: config/prefs.php:1123
msgid ""
"Additional headers to display when viewing: (enter each header on a new "
"line)"
@@ -427,11 +427,11 @@ msgstr ""
msgid "Address Book"
msgstr "Adressbuch"
-#: config/prefs.php:885
+#: config/prefs.php:919
msgid "Address Books"
msgstr "Adressbücher"
-#: lib/Compose.php:2584
+#: lib/Compose.php:2586
msgid "Address rejected by the sending mail server."
msgstr "Adresse vom versendenden E-Mail-Server abgelehnt."
@@ -464,6 +464,14 @@ msgstr "Erweiterte Suche..."
msgid "After '%s'"
msgstr "Nach '%s'"
+#: lib/Prefs/Special/SmimeAliasHandler.php:29
+msgid "Alias has been set."
+msgstr "Alias wurde gesetzt."
+
+#: templates/prefs/smimeprivatekey.html.php:223
+msgid "Alias: "
+msgstr "Alias: "
+
#: templates/prefs/acl.html.php:45 templates/prefs/acl.html.php:80
msgid "All"
msgstr "Alle"
@@ -527,11 +535,11 @@ msgid "All rights on mailbox \"%s\" successfully removed for \"%s\"."
msgstr ""
"Alle Rechte von \"%2$s\" am Ordner \"%1$s\" wurden erfolgreich entfernt."
-#: config/prefs.php:990
+#: config/prefs.php:1025
msgid "Allow attachments to be stripped from messages?"
msgstr "Entfernen von Anhängen aus Nachrichten erlauben?"
-#: config/prefs.php:287
+#: config/prefs.php:314
msgid "Allow filter rules to be applied in any mailbox?"
msgstr "Anwendung von Filterregeln in allen Ordnern erlauben?"
@@ -551,7 +559,7 @@ msgstr "Zugriff auf externe Konten erlauben?"
msgid "Allow viewing of message source?"
msgstr "Anzeigen des Nachrichtenquelltextes erlauben?"
-#: config/prefs.php:1097
+#: config/prefs.php:1132
msgid "Always prompt"
msgstr "Immer nachfragen"
@@ -572,7 +580,7 @@ msgstr "Beim Anlegen der neuen Notiz ist ein unbekannter Fehler aufgetreten."
msgid "An unknown error occured while creating the new task."
msgstr "Beim Anlegen der neuen Aufgabe ist ein unbekannter Fehler aufgetreten."
-#: lib/Mime/Viewer/Itip.php:708
+#: lib/Mime/Viewer/Itip.php:709
msgid "An unknown person"
msgstr "Eine unbekannte Person"
@@ -588,11 +596,11 @@ msgstr "Einfügen"
msgid "Apply Filters"
msgstr "Filterregeln anwenden"
-#: config/prefs.php:267
+#: config/prefs.php:294
msgid "Apply filter rules upon logging on?"
msgstr "Filterregeln beim Anmelden anwenden?"
-#: config/prefs.php:277
+#: config/prefs.php:304
msgid "Apply filter rules whenever Inbox is displayed?"
msgstr "Filterregeln immer anwenden, wenn der Posteingang angezeigt wird?"
@@ -609,7 +617,7 @@ msgid "Are you sure you want to delete this flag?"
msgstr "Sind Sie sicher, dass Sie diesen Marker löschen möchten?"
#: lib/Prefs/Special/PgpPublicKey.php:79
-#: lib/Prefs/Special/SmimePublicKey.php:77
+#: lib/Prefs/Special/SmimePublicKey.php:79
msgid "Are you sure you want to delete this public key?"
msgstr ""
"Sind Sie sicher, dass Sie diesen öffentlichen Schlüssel löschen möchten?"
@@ -618,14 +626,67 @@ msgstr ""
msgid "Are you sure you want to delete this virtual folder?"
msgstr "Sind Sie sicher, dass Sie diesen virtuellen Ordner löschen möchten?"
+#: lib/Prefs/Special/SmimePrivateKey.php:342
+msgid ""
+"Are you sure you want to delete your keypair? (Please click \"Unset Personal "
+"Certificate\" if you want to save the key in the keystore. Non-saved "
+"certificates will be removed permanently.)"
+msgstr ""
+"Are you sure you want to delete your keypair? (Please click \"Unset Personal "
+"Certificate\" if you want to save the key in the keystore. Non-saved "
+"certificates will be removed permanently.)"
+
#: lib/Prefs/Special/PgpPrivateKey.php:79
-#: lib/Prefs/Special/SmimePrivateKey.php:148
msgid ""
"Are you sure you want to delete your keypair? (This is NOT recommended!)"
msgstr ""
"Sind Sie sicher, dass Sie Ihr Schlüsselpaar löschen möchten? (NICHT "
"empfohlen!)"
+#: lib/Prefs/Special/SmimePrivateKey.php:343
+msgid ""
+"Are you sure you want to delete your keypair? You are trying to delete a "
+"keypair from the keystore. If you continue these certificates will be "
+"removed permanently. "
+msgstr ""
+"Are you sure you want to delete your keypair? You are trying to delete a "
+"keypair from the keystore. If you continue these certificates will be "
+"removed permanently. "
+
+#: lib/Prefs/Special/SmimePrivateKey.php:345
+msgid ""
+"Are you sure you want to set a new keypair? Currently set keypair will be "
+"moved to the database. New emails will be encrypted with the newly set "
+"keypair."
+msgstr ""
+"Are you sure you want to set a new keypair? Currently set keypair will be "
+"moved to the database. New emails will be encrypted with the newly set "
+"keypair."
+
+#: lib/Prefs/Special/SmimePrivateKey.php:347
+msgid ""
+"Are you sure you want to set a singing key? Current key for singing will be "
+"moved to the database. New emails will be singing with the newly set singing "
+"key."
+msgstr ""
+"Are you sure you want to set a singing key? Current key for singing will be "
+"moved to the database. New emails will be singing with the newly set singing "
+"key."
+
+#: lib/Prefs/Special/SmimePrivateKey.php:344
+msgid ""
+"Are you sure you want to unset your keypair? You will need to add another "
+"key to be able to send encrypted mails."
+msgstr ""
+"Are you sure you want to unset your keypair? You will need to add another "
+"key to be able to send encrypted mails."
+
+#: lib/Prefs/Special/SmimePrivateKey.php:346
+msgid "Are you sure you want to unset your secondary keypair?"
+msgstr ""
+"Sind Sie sich sicher, dass Sie Ihre sekundäre Signatur-Zeritifakte "
+"zurücksetzen wollen?"
+
#: lib/Dynamic/Base.php:194
msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
msgstr "Sind Sie sicher, dass Sie diesen Anhang ENDGÜLTIG löschen möchten?"
@@ -643,7 +704,7 @@ msgstr "Sind Sie sicher, dass Sie diese Nachricht als Spam melden möchten?"
msgid "Arrival Time"
msgstr "Eingangszeit"
-#: config/prefs.php:1485
+#: config/prefs.php:1526
msgid "Arrival time on server"
msgstr "Eingangszeit auf dem Server"
@@ -651,15 +712,15 @@ msgstr "Eingangszeit auf dem Server"
msgid "As Attachment"
msgstr "Als Anhang"
-#: config/prefs.php:741
+#: config/prefs.php:775
msgid "As attachment"
msgstr "Als Anhang"
-#: config/prefs.php:743
+#: config/prefs.php:777
msgid "As both body text and an attachment"
msgstr "Sowohl im Nachrichtentext als auch als Anhang"
-#: config/prefs.php:1465
+#: config/prefs.php:1506
msgid "Ascending"
msgstr "Aufsteigend"
@@ -675,7 +736,7 @@ msgstr "Öffentlichen PGP-Schlüssel anhängen"
msgid "Attach contact information"
msgstr "Visitenkarte anhängen"
-#: lib/Compose.php:3455
+#: lib/Compose.php:3462
#, php-format
msgid ""
"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
@@ -683,7 +744,7 @@ msgstr ""
"Die Datei \"%s\" hat die erlaubte Größe für Anhänge überschritten. Die Datei "
"wurde NICHT angehängt."
-#: lib/Compose.php:3455
+#: lib/Compose.php:3462
msgid "Attached file exceeds the attachment size limits. File NOT attached."
msgstr ""
"Die Datei hat die erlaubte Größe für Anhänge überschritten und wurde NICHT "
@@ -708,15 +769,15 @@ msgstr "Anhang und Nachrichtentext"
msgid "Attachment doesn't exist."
msgstr "Anhang existiert nicht."
-#: lib/Compose.php:1244
+#: lib/Compose.php:1246
msgid "Attachment stripped: Original attachment type"
msgstr "Anhang entfernt: Ehemaliger Anhangstyp"
-#: lib/Ajax/Application/Handler/Dynamic.php:933 lib/Dynamic/Message.php:57
+#: lib/Ajax/Application/Handler/Dynamic.php:938 lib/Dynamic/Message.php:57
msgid "Attachment successfully stripped."
msgstr "Anhang erfolgreich gelöscht."
-#: lib/Compose.php:3048 lib/Compose.php:3055
+#: lib/Compose.php:3050 lib/Compose.php:3057
#: templates/smartmobile/compose.html.php:79
msgid "Attachments"
msgstr "Anhänge"
@@ -752,7 +813,7 @@ msgstr "Die automatische Konfiguration des Kontos war erfolgreich."
msgid "Automatically Generated Messages"
msgstr "Automatisch erstellte Nachrichten"
-#: lib/Mime/Viewer/Itip.php:886
+#: lib/Mime/Viewer/Itip.php:887
msgid "Awaiting Response"
msgstr "Auf Antwort wartend"
@@ -764,7 +825,7 @@ msgstr "Zurück zum Nachrichtenindex"
msgid "Backends"
msgstr "Backends"
-#: lib/Basic/Contacts.php:99 lib/Basic/Search.php:71
+#: lib/Basic/Contacts.php:99 lib/Basic/Search.php:71 lib/Contents/View.php:227
#: templates/contacts/contacts.html.php:37
#: templates/dynamic/compose.html.php:130
#: templates/dynamic/mailbox.html.php:154 templates/dynamic/message.html.php:96
@@ -793,7 +854,7 @@ msgstr ""
msgid "Blacklist"
msgstr "Ausschlussliste"
-#: config/prefs.php:1011
+#: config/prefs.php:1046
msgid ""
"Block images in messages unless they are specifically requested to be loaded?"
msgstr ""
@@ -804,7 +865,7 @@ msgstr ""
msgid "Body"
msgstr "Text"
-#: config/prefs.php:549
+#: config/prefs.php:583
msgid "Bottom"
msgstr "Unten"
@@ -821,7 +882,7 @@ msgstr "Eingebaute virtuelle Ordner können nicht bearbeitet werden."
msgid "Bulk Messages"
msgstr "Massen-E-Mails"
-#: lib/Compose.php:1890
+#: lib/Compose.php:1892
#, php-format
msgid "Can't attach contact information: %s"
msgstr "Visitenkarte konnte nicht angehängt werden: %s"
@@ -833,6 +894,8 @@ msgstr "Visitenkarte konnte nicht angehängt werden: %s"
#: templates/smartmobile/copymove.html.php:20
#: templates/smartmobile/message.html.php:91
#: templates/smartmobile/message.html.php:106
+#: templates/smime/import_extra_key.html.php:63
+#: templates/smime/import_identity_key.html.php:63
#: templates/smime/import_personal_key.html.php:63
#: templates/smime/import_public_key.html.php:29
msgid "Cancel"
@@ -861,7 +924,7 @@ msgstr ""
msgid "Cannot display message text."
msgstr "Nachrichtentext kann nicht angezeigt werden."
-#: lib/Basic/Smime.php:133
+#: lib/Basic/Smime.php:235
msgid ""
"Cannot import secondary personal S/MIME certificates without primary "
"certificates."
@@ -893,8 +956,8 @@ msgstr ""
"Der Nachrichtenteil kann nicht entfernt werden, weil der Ordner nur gelesen "
"werden kann."
-#: lib/Basic/Contacts.php:98 lib/Basic/Search.php:67 lib/Compose.php:2759
-#: lib/Contents/View.php:221 lib/Smartmobile.php:172
+#: lib/Basic/Contacts.php:98 lib/Basic/Search.php:67 lib/Compose.php:2761
+#: lib/Contents/View.php:223 lib/Smartmobile.php:172
#: templates/contacts/contacts.html.php:36
#: templates/dynamic/compose.html.php:122
#: templates/dynamic/mailbox.html.php:150 templates/dynamic/message.html.php:92
@@ -905,7 +968,7 @@ msgstr "Cc"
msgid "Cc:"
msgstr "Cc:"
-#: lib/Mime/Viewer/Itip.php:868
+#: lib/Mime/Viewer/Itip.php:869
msgid "Chair Person"
msgstr "Besprechungsleiter"
@@ -913,12 +976,16 @@ msgstr "Besprechungsleiter"
msgid "Change"
msgstr "Ändern"
-#: config/prefs.php:1407
+#: lib/Prefs/Special/SmimePrivateKey.php:179
+msgid "Change SMIME preferences here"
+msgstr "SMIME Einstellungen bitte hier ändern"
+
+#: config/prefs.php:1448
msgid ""
"Change display preferences for viewing the listing of messages in a mailbox."
msgstr "Ändern Sie Einstellungen für Nachrichtenlisten in einem Ordner."
-#: config/prefs.php:1508
+#: config/prefs.php:1549
msgid "Change folder navigation display preferences."
msgstr "Ändern Sie Einstellungen für die Ordnernavigation."
@@ -938,15 +1005,20 @@ msgstr "Rechtschreibprüfung"
msgid "Check for New Mail"
msgstr "Auf neue Nachrichten überprüfen"
-#: config/prefs.php:369
+#: config/prefs.php:396
msgid "Check for valid recipient PGP public keys while replying?"
msgstr "Beim Antworten auf gültige PGP-Schlüssel der Empfänger überprüfen?"
+#: config/prefs.php:131
+msgid "Check if you would like to use SMIME-keypairs for identities"
+msgstr ""
+"Prüfen Sie, ob Sie SMIME-Schlüsselpaare für Identitäten verwenden möchten"
+
#: templates/dynamic/mailbox.html.php:277
msgid "Check mailbox for new mail?"
msgstr "Ordner auf neue Nachrichten überprüfen?"
-#: config/prefs.php:504
+#: config/prefs.php:538
msgid "Check spelling before sending a message?"
msgstr "Rechtschreibung vor dem Versenden von Nachrichten überprüfen?"
@@ -954,7 +1026,7 @@ msgstr "Rechtschreibung vor dem Versenden von Nachrichten überprüfen?"
msgid "Checking..."
msgstr "Überprüfung..."
-#: config/prefs.php:951
+#: config/prefs.php:985
msgid "Choose the address book to use when adding addresses."
msgstr ""
"Wählen Sie das Adressbuch aus, zu dem neue Adressen hinzugefügt werden "
@@ -1019,11 +1091,11 @@ msgstr "Klicken um die Bestätigung zu verschicken."
msgid "Click to show message part display errors."
msgstr "Klicken um Fehler dieses Nachrichtenteils anzuzeigen."
-#: lib/Mime/Viewer/Smime.php:376
+#: lib/Mime/Viewer/Smime.php:442
msgid "Click to verify the data."
msgstr "Klicken um die Daten zu überprüfen."
-#: lib/Mime/Viewer/Pgp.php:483
+#: lib/Mime/Viewer/Pgp.php:484
msgid "Click to verify the message."
msgstr "Klicken um die Nachricht zu überprüfen."
@@ -1043,7 +1115,7 @@ msgstr "Klicken um die Nachricht in einem neuen Fenster anzuzeigen."
msgid "Close"
msgstr "Schließen"
-#: config/prefs.php:787
+#: config/prefs.php:821
msgid "Close the compose window after saving a draft?"
msgstr "Nachrichtenfenster nach dem Speichern eines Entwurfes schließen?"
@@ -1064,26 +1136,26 @@ msgstr "Farbe"
msgid "Color Picker"
msgstr "Farbauswahl"
-#: config/prefs.php:1543
+#: config/prefs.php:1584
msgid "Combine all namespaces"
msgstr "Alle Namensräume kombinieren"
-#: lib/Pgp.php:791 templates/itip/action.html.php:47
+#: lib/Pgp.php:792 templates/itip/action.html.php:47
#: templates/prefs/pgpprivatekey.html.php:65
msgid "Comment"
msgstr "Kommentar"
-#: lib/Mime/Viewer/Itip.php:819
+#: lib/Mime/Viewer/Itip.php:820
msgid "Completed"
msgstr "Erledigt"
-#: config/prefs.php:484 config/prefs.php:624 config/prefs.php:670
-#: config/prefs.php:727 config/prefs.php:761 config/prefs.php:815
-#: config/prefs.php:884
+#: config/prefs.php:518 config/prefs.php:658 config/prefs.php:704
+#: config/prefs.php:761 config/prefs.php:795 config/prefs.php:849
+#: config/prefs.php:918
msgid "Compose"
msgstr "Neue Nachricht"
-#: config/prefs.php:625
+#: config/prefs.php:659
msgid "Compose Templates"
msgstr "Vorlagen für neue Nachrichten"
@@ -1096,53 +1168,53 @@ msgid "Compose action completed. You may now safely close this window."
msgstr ""
"Aktion erfolgreich abgeschlossen. Sie können dieses Fenster jetzt schließen."
-#: config/prefs.php:485
+#: config/prefs.php:519
msgid "Composition"
msgstr "Erstellen"
-#: config/prefs.php:318
+#: config/prefs.php:345
msgid "Configure PGP encryption support."
msgstr "PGP-Unterstützung konfigurieren."
-#: config/prefs.php:401
+#: config/prefs.php:428
msgid "Configure S/MIME encryption support."
msgstr "S/MIME-Unterstützung konfigurieren."
-#: config/prefs.php:1355
+#: config/prefs.php:1390
msgid "Configure flag highlighting."
msgstr "Konfigurieren Sie wie Marker dargestellt werden."
-#: config/prefs.php:301
+#: config/prefs.php:328
msgid "Configure how event or meeting requests should be handled."
msgstr ""
"Konfigurieren Sie wie Termin- und Besprechungseinladungen behandelt werden "
"sollen."
-#: config/prefs.php:971
+#: config/prefs.php:1006
msgid "Configure how messages are displayed."
msgstr "Konfigurieren Sie wie Nachrichten angezeigt werden."
-#: config/prefs.php:729
+#: config/prefs.php:763
msgid "Configure how you forward mail."
msgstr "Konfigurieren Sie wie Nachrichten weitergeleitet werden sollen."
-#: config/prefs.php:672
+#: config/prefs.php:706
msgid "Configure how you reply to mail."
msgstr "Konfigurieren Sie wie Nachrichten beantwortet werden sollen."
-#: config/prefs.php:486
+#: config/prefs.php:520
msgid "Configure how you send mail."
msgstr "Konfigurieren Sie wie Nachrichten versendet werden."
-#: config/prefs.php:1389
+#: config/prefs.php:1424
msgid "Configure message printing."
msgstr "Druck-Einstellungen konfigurieren."
-#: config/prefs.php:141
+#: config/prefs.php:165
msgid "Configure remote mail accounts to display."
msgstr "Konfigurieren Sie externe E-Mail-Konten, die angezeigt werden sollen."
-#: config/prefs.php:1225
+#: config/prefs.php:1260
msgid "Configure spam reporting."
msgstr "Ändern Sie die Einstellungen für Spam-Meldungen."
@@ -1154,7 +1226,7 @@ msgstr "Enthält Anhänge"
msgid "Contents of compressed file:"
msgstr "Inhalt der komprimierten Datei:"
-#: config/prefs.php:1308
+#: config/prefs.php:1343
msgid ""
"Control when new mail will be checked for, and whether or not to notify you "
"when it arrives."
@@ -1166,7 +1238,7 @@ msgstr ""
msgid "Convert HTML data to plain text and view in new window."
msgstr "HTML-Daten in einfachen Text umwandeln und in neuem Fenster anzeigen."
-#: config/prefs.php:1068
+#: config/prefs.php:1103
msgid "Convert textual emoticons into graphical ones?"
msgstr "Text-Emoticons in grafische umwandeln?"
@@ -1202,7 +1274,7 @@ msgstr ""
"Rechte für den Benutzer \"%s\" an dem Ordner \"%s\" konnten nicht gesetzt "
"werden."
-#: lib/Compose.php:3310
+#: lib/Compose.php:3317
#, php-format
msgid "Could not attach %s to the message."
msgstr "%s konnte nicht an die Nachricht angehängt werden."
@@ -1212,16 +1284,16 @@ msgstr "%s konnte nicht an die Nachricht angehängt werden."
msgid "Could not authenticate to %s."
msgstr "Anmeldung bei %s fehlgeschlagen."
-#: lib/Contents/View.php:146
+#: lib/Contents/View.php:148
msgid "Could not auto-determine data type."
msgstr "Der Datentyp wurde nicht automatisch erkannt."
-#: lib/Mailbox.php:809
+#: lib/Mailbox.php:812
#, php-format
msgid "Could not delete Virtual Folder \"%s\"."
msgstr "Virtueller Ordner \"%s\" konnte nicht gelöscht werden."
-#: lib/Mailbox.php:1372
+#: lib/Mailbox.php:1375
#, php-format
msgid "Could not delete messages from %s. This mailbox is read-only."
msgstr ""
@@ -1274,7 +1346,7 @@ msgstr ""
"Rechte für den Benutzer \"%s\" an dem Ordner \"%s\" konnten nicht entzogen "
"werden."
-#: lib/Compose.php:1958 lib/Compose.php:2340 lib/Dynamic/Compose.php:282
+#: lib/Compose.php:1960 lib/Compose.php:2342 lib/Dynamic/Compose.php:285
msgid "Could not retrieve message data from the mail server."
msgstr "Die Nachricht konnte nicht vom Mailserver gelesen werden."
@@ -1312,7 +1384,7 @@ msgstr "Unterordner erstellen/Ordner umbenennen"
msgid "Create a new sent-mail mailbox"
msgstr "Neuen Ordner für gesendete Nachrichten anlegen"
-#: config/prefs.php:204
+#: config/prefs.php:228
msgid ""
"Create filtering rules to organize your incoming mail, sort it into "
"mailboxes, and delete spam."
@@ -1324,7 +1396,7 @@ msgstr ""
msgid "Create mailbox:"
msgstr "Ordner anlegen:"
-#: config/prefs.php:644
+#: config/prefs.php:678
msgid "Create new Template"
msgstr "Neue Vorlage erstellen"
@@ -1345,7 +1417,7 @@ msgstr "Unterordner erstellen und Ordner umbenennen"
msgid "Creating New Flag..."
msgstr "Neuen Marker erstellen..."
-#: config/prefs.php:1488
+#: config/prefs.php:1529
msgid "Criteria to use when sorting by date:"
msgstr "Kriterien für die Sortierung nach Datum:"
@@ -1354,6 +1426,12 @@ msgstr "Kriterien für die Sortierung nach Datum:"
msgid "Current access to %s"
msgstr "Aktuelle Rechte von %s"
+#: templates/prefs/smimeprivatekey.html.php:45
+#: templates/prefs/smimeprivatekey.html.php:120
+#, php-format
+msgid "Current alias for your Certificate Set: %s"
+msgstr "Alias ihrer Zeritifakte: %s"
+
#: lib/Basic/Search.php:79
msgid "Custom Header"
msgstr "Spezieller Kopfeintrag"
@@ -1366,8 +1444,8 @@ msgstr "Spezieller Kopfeintrag:"
msgid "Data"
msgstr "Daten"
-#: config/prefs.php:1451 lib/Basic/Search.php:91 lib/Compose.php:2739
-#: lib/Contents/View.php:218 lib/Dynamic/Mailbox.php:199
+#: config/prefs.php:1492 lib/Basic/Search.php:91 lib/Compose.php:2741
+#: lib/Contents/View.php:220 lib/Dynamic/Mailbox.php:199
#: templates/dynamic/mailbox.html.php:138 templates/dynamic/message.html.php:75
msgid "Date"
msgstr "Datum"
@@ -1388,7 +1466,7 @@ msgstr "Datum zurücksetzen"
msgid "Date Selection"
msgstr "Datumsauswahl"
-#: config/prefs.php:1486
+#: config/prefs.php:1527
msgid "Date in message headers"
msgstr "Datum im Nachrichtenkopf"
@@ -1396,23 +1474,23 @@ msgstr "Datum im Nachrichtenkopf"
msgid "Days"
msgstr "Tage"
-#: lib/Mime/Viewer/Itip.php:810
+#: lib/Mime/Viewer/Itip.php:811
msgid "Declined"
msgstr "Abgelehnt"
-#: config/prefs.php:521
+#: config/prefs.php:555
msgid "Default method to compose messages:"
msgstr "Standardmethode zum Erstellen von Nachrichten:"
-#: config/prefs.php:1458
+#: config/prefs.php:1499
msgid "Default sorting criteria:"
msgstr "Sortierreihenfolge:"
-#: config/prefs.php:1468
+#: config/prefs.php:1509
msgid "Default sorting direction:"
msgstr "Sortierrichtung:"
-#: lib/Mime/Viewer/Itip.php:816
+#: lib/Mime/Viewer/Itip.php:817
msgid "Delegated"
msgstr "Delegiert"
@@ -1429,20 +1507,24 @@ msgid "Delete"
msgstr "Löschen"
#: lib/Prefs/Special/PgpPublicKey.php:79
-#: lib/Prefs/Special/SmimePublicKey.php:77
+#: lib/Prefs/Special/SmimePublicKey.php:79
#, php-format
msgid "Delete %s Public Key"
msgstr "Öffentlichen Schlüssel %s löschen"
+#: templates/prefs/smimeprivatekey.html.php:256
+msgid "Delete Certificate"
+msgstr "Zeritifakte entfernen"
+
#: templates/prefs/pgpprivatekey.html.php:46
msgid "Delete Current Keys"
msgstr "Aktuellen Schlüssel löschen"
-#: templates/prefs/smimeprivatekey.html.php:41
+#: templates/prefs/smimeprivatekey.html.php:90
msgid "Delete Personal Certificate"
msgstr "Persönliches S/MIME-Zertifikat löschen"
-#: templates/prefs/smimeprivatekey.html.php:78
+#: templates/prefs/smimeprivatekey.html.php:164
msgid "Delete Secondary Personal Certificate"
msgstr "Zweites persönliches S/MIME-Zertifikat löschen"
@@ -1462,12 +1544,12 @@ msgstr "Ordner löschen und umbenennen"
msgid "Delete from my calendar"
msgstr "Aus meinem Kalender entfernen"
-#: config/prefs.php:571
+#: config/prefs.php:605
msgid "Delete linked attachments after this many months (0 to never delete):"
msgstr ""
"Verlinkte Anhänge nach so vielen Monaten löschen (0 um nie zu löschen):"
-#: config/prefs.php:1256
+#: config/prefs.php:1291
msgid "Delete message"
msgstr "Beitrag löschen"
@@ -1475,7 +1557,7 @@ msgstr "Beitrag löschen"
msgid "Delete messages"
msgstr "Nachrichten löschen"
-#: config/prefs.php:850
+#: config/prefs.php:884
msgid ""
"Delete old sent mail mailboxes after this many months (0 to never delete):"
msgstr ""
@@ -1494,7 +1576,7 @@ msgstr "Ordner löschen/umbennen"
msgid "Deleted"
msgstr "Gelöscht"
-#: lib/Mailbox.php:805
+#: lib/Mailbox.php:808
#, php-format
msgid "Deleted Virtual Folder \"%s\"."
msgstr "Virtueller Ordner \"%s\" gelöscht."
@@ -1509,7 +1591,7 @@ msgstr "Anhang \"%s\" gelöscht."
msgid "Deleted flag \"%s\"."
msgstr "Marker \"%s\" gelöscht."
-#: config/prefs.php:1115
+#: config/prefs.php:1150
msgid "Deleting and Moving Messages"
msgstr "Nachrichten löschen und verschieben"
@@ -1521,11 +1603,11 @@ msgstr "Anfrage ablehnen"
msgid "Deny request for free/busy information"
msgstr "Anfrage für Frei/Gebucht-Informationen ablehnen"
-#: lib/Mime/Viewer/Itip.php:731
+#: lib/Mime/Viewer/Itip.php:732
msgid "Deny task assignment"
msgstr "Aufgabenzuweisung ablehnen"
-#: config/prefs.php:1466
+#: config/prefs.php:1507
msgid "Descending"
msgstr "Absteigend"
@@ -1533,15 +1615,16 @@ msgstr "Absteigend"
msgid "Description"
msgstr "Beschreibung"
-#: lib/Prefs/Special/SmimePrivateKey.php:104
+#: lib/Prefs/Special/SmimePrivateKey.php:254
#: templates/prefs/pgpprivatekey.html.php:22
#: templates/prefs/pgpprivatekey.html.php:36
#: templates/prefs/pgppublickey.html.php:21
+#: templates/prefs/smimeprivatekey.html.php:234
#: templates/prefs/smimepublickey.html.php:23
msgid "Details"
-msgstr "Details"
+msgstr "Spezifikationen"
-#: config/prefs.php:1062
+#: config/prefs.php:1097
msgid "Dim signatures?"
msgstr "Signaturen abblenden?"
@@ -1558,7 +1641,7 @@ msgstr ""
"Wirklich alle Formatierungen (durch Umwandlung von HTML in einfachen Text) "
"verwerfen? Dieser Vorgang kann nicht rückgängig gemacht werden."
-#: config/prefs.php:1332
+#: config/prefs.php:1367
msgid "Display notification when new mail arrives?"
msgstr "Benachrichtigung anzeigen, wenn neue Nachrichten eintreffen?"
@@ -1570,7 +1653,7 @@ msgstr "Trifft NICHT zu"
msgid "Do Not Check for New Mail"
msgstr "Nicht auf neue Nachrichten überprüfen"
-#: config/prefs.php:1077
+#: config/prefs.php:1112
msgid "Do not show parts"
msgstr "Keine Teile anzeigen"
@@ -1596,11 +1679,11 @@ msgstr "Als MBOX-Datei herunterladen"
msgid "Download into a MBOX file (ZIP compressed)"
msgstr "Als (ZIP-komprimierte) MBOX-Datei herunterladen"
-#: lib/Compose.php:3075
+#: lib/Compose.php:3077
msgid "Download link"
msgstr "Herunterladen"
-#: lib/Compose.php:3068
+#: lib/Compose.php:3070
#, php-format
msgid "Download link: %s"
msgstr "Herunterladen: %s"
@@ -1609,7 +1692,7 @@ msgstr "Herunterladen: %s"
msgid "Draft"
msgstr "Entwurf"
-#: config/prefs.php:762 lib/Mailbox.php:1692 lib/Mailbox.php:1791
+#: config/prefs.php:796 lib/Mailbox.php:1695 lib/Mailbox.php:1794
msgid "Drafts"
msgstr "Entwürfe"
@@ -1621,7 +1704,7 @@ msgstr "Entwürfe-Ordner:"
msgid "Drop file(s) here to attach."
msgstr "Datei(en) zum Anhängen hier fallenlassen."
-#: lib/Pgp.php:792
+#: lib/Pgp.php:793
msgid "E-Mail"
msgstr "E-Mail-Adresse"
@@ -1637,7 +1720,7 @@ msgstr "FEHLER: Ihre Nachricht konnte nicht verschickt werden."
msgid "EXAMPLE LINK"
msgstr "BEISPIELLINK"
-#: lib/Ftree.php:1062
+#: lib/Ftree.php:1074
msgid "Edit"
msgstr "Bearbeiten"
@@ -1665,7 +1748,7 @@ msgstr "Suchanfrage bearbeiten"
msgid "Edit Template"
msgstr "Vorlage bearbeiten"
-#: lib/Dynamic/Mailbox.php:283 lib/Ftree.php:1062
+#: lib/Dynamic/Mailbox.php:283 lib/Ftree.php:1074
#: templates/search/search.html.php:7
msgid "Edit Virtual Folder"
msgstr "Virtuellen Ordner bearbeiten"
@@ -1674,36 +1757,36 @@ msgstr "Virtuellen Ordner bearbeiten"
msgid "Edit Virtual Folders"
msgstr "Virtuelle Ordner bearbeiten"
-#: config/prefs.php:744 lib/Dynamic/Base.php:175
+#: config/prefs.php:778 lib/Dynamic/Base.php:175
msgid "Edit as New"
msgstr "Als neu bearbeiten"
-#: config/prefs.php:626
+#: config/prefs.php:660
msgid "Edit compose templates."
msgstr "Bearbeiten Sie die Nachrichtenvorlagen."
-#: config/prefs.php:232
+#: config/prefs.php:257
msgid "Edit your Blacklist"
msgstr "Ausschlussliste bearbeiten"
-#: config/prefs.php:214
+#: config/prefs.php:238
msgid "Edit your Filter Rules"
msgstr "Filterregeln bearbeiten"
-#: config/prefs.php:250
+#: config/prefs.php:276
msgid "Edit your Whitelist"
msgstr "Positivliste bearbeiten"
-#: lib/Ajax/Application/Handler/Dynamic.php:1243
+#: lib/Ajax/Application/Handler/Dynamic.php:1248
msgid "Editing group lists not currently supported."
msgstr "Bearbeiten von Gruppenlisten noch nicht unterstützt."
-#: lib/Mailbox.php:1423
+#: lib/Mailbox.php:1426
#, php-format
msgid "Emptied all messages from %s."
msgstr "Alle Nachrichten aus %s gelöscht."
-#: lib/Mailbox.php:1385
+#: lib/Mailbox.php:1388
msgid "Emptied all messages from Virtual Trash Folder."
msgstr "Alle Nachrichten aus dem Virtuellen Papierkorb gelöscht."
@@ -1711,11 +1794,11 @@ msgstr "Alle Nachrichten aus dem Virtuellen Papierkorb gelöscht."
msgid "Empty"
msgstr "Leeren"
-#: config/prefs.php:339
+#: config/prefs.php:366
msgid "Enable PGP functionality?"
msgstr "PGP-Funktionen aktivieren?"
-#: config/prefs.php:423
+#: config/prefs.php:450
msgid "Enable S/MIME functionality?"
msgstr "S/MIME-Funktionen aktivieren?"
@@ -1731,22 +1814,27 @@ msgstr "Verschlüsselung"
msgid "End"
msgstr "Ende"
-#: lib/Compose.php:2434
+#: lib/Compose.php:2436
msgid "End forwarded message"
msgstr "Ende der weitergeleiteten Nachricht"
-#: lib/Compose.php:2245
+#: lib/Compose.php:2247
msgid "End message"
msgstr "Ende der Nachricht"
-#: lib/Compose.php:2245
+#: lib/Compose.php:2247
#, php-format
msgid "End message from %s"
msgstr "Ende der Nachricht von %s"
+#: lib/Prefs/Special/SmimePrivateKey.php:288
+#: lib/Prefs/Special/SmimePrivateKey.php:295
+msgid "Enter Alias"
+msgstr "Alias setzen"
+
#: lib/Prefs/Special/PgpPrivateKey.php:73
-#: lib/Prefs/Special/SmimePrivateKey.php:130
-#: lib/Prefs/Special/SmimePrivateKey.php:137
+#: lib/Prefs/Special/SmimePrivateKey.php:321
+#: lib/Prefs/Special/SmimePrivateKey.php:328
msgid "Enter Passphrase"
msgstr "Passwort eingeben"
@@ -1754,6 +1842,10 @@ msgstr "Passwort eingeben"
msgid "Enter Search Term"
msgstr "Suchtext eingeben"
+#: lib/Ajax/Imple/AliasDialog.php:58
+msgid "Enter the alias for your certificate."
+msgstr "Alias für ihr Zertifikat eintragen."
+
#: lib/Prefs/Special/ComposeTemplates.php:45
msgid "Enter the name for your new compose templates mailbox."
msgstr "Geben Sie einen Namen für Ihren neuen Vorlagen-Ordner an."
@@ -1793,7 +1885,7 @@ msgstr "Gesamte Nachricht"
msgid "Entire Message (including Headers)"
msgstr "Gesamte Nachricht (inklusive Nachrichtenkopf)"
-#: lib/Basic/Thread.php:63 lib/Compose.php:1579
+#: lib/Basic/Thread.php:63 lib/Compose.php:1581
#, php-format
msgid "Entry \"%s\" was successfully added to the address book"
msgstr "Der Eintrag \"%s\" wurde erfolgreich dem Adressbuch hinzugefügt"
@@ -1838,7 +1930,7 @@ msgstr ""
msgid "Error when loading the message."
msgstr "Fehler beim Laden der Nachricht."
-#: lib/Compose.php:2544
+#: lib/Compose.php:2546
msgid "Error when redirecting message."
msgstr "Fehler beim Umleiten der Nachricht."
@@ -1850,7 +1942,7 @@ msgstr ""
"Fehler! Für diese Anwendung muss Javascript verfügbar und im Browser "
"aktiviert sein."
-#: config/prefs.php:300
+#: config/prefs.php:327
msgid "Event Requests"
msgstr "Terminanfragen"
@@ -1858,23 +1950,23 @@ msgstr "Terminanfragen"
msgid "Event successfully deleted."
msgstr "Termin erfolgreich gelöscht."
-#: config/prefs.php:1323
+#: config/prefs.php:1358
msgid "Every 15 minutes"
msgstr "Alle 15 Minuten"
-#: config/prefs.php:1320
+#: config/prefs.php:1355
msgid "Every 30 seconds"
msgstr "Alle 30 Sekunden"
-#: config/prefs.php:805 config/prefs.php:1322
+#: config/prefs.php:839 config/prefs.php:1357
msgid "Every 5 minutes"
msgstr "Alle 5 Minuten"
-#: config/prefs.php:1324
+#: config/prefs.php:1359
msgid "Every half hour"
msgstr "Alle halbe Stunde"
-#: config/prefs.php:804 config/prefs.php:1321
+#: config/prefs.php:838 config/prefs.php:1356
msgid "Every minute"
msgstr "Alle 60 Sekunden"
@@ -1899,7 +1991,7 @@ msgstr "Gruppe ausklappen"
msgid "Expand Headers"
msgstr "Nachrichtenkopf ausklappen"
-#: config/prefs.php:1532
+#: config/prefs.php:1573
msgid "Expand the entire folder tree by default in the folders view?"
msgstr "In der Ordnerübersicht alle Ordner öffnen?"
@@ -1907,7 +1999,7 @@ msgstr "In der Ordnerübersicht alle Ordner öffnen?"
msgid "Expiration"
msgstr "Ablaufdatum"
-#: lib/Pgp.php:789
+#: lib/Pgp.php:790
msgid "Expiration Date"
msgstr "Verfallsdatum"
@@ -1915,6 +2007,14 @@ msgstr "Verfallsdatum"
msgid "Export"
msgstr "Exportieren"
+#: templates/prefs/smimeprivatekey.html.php:205
+msgid "Extra S/MIME Personal Certificates"
+msgstr "Extra S/MIME-Zertifikat"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:385
+msgid "Extra S/MIME keys deleted successfully."
+msgstr "Extra S/MIME-Zertifikat wurde gelöscht."
+
#: templates/mime/compressed.html.php:8
msgid "Filename"
msgstr "Dateiname"
@@ -1947,11 +2047,11 @@ msgstr "Filtern nach"
msgid "Filter mailboxes..."
msgstr "Ordner filtern..."
-#: config/prefs.php:984
+#: config/prefs.php:1019
msgid "Filter message content for unwanted text (e.g. profanity)?"
msgstr "Nachrichteninhalt nach unerwünschten Inhalten filtern?"
-#: config/prefs.php:203
+#: config/prefs.php:227
msgid "Filters"
msgstr "Filter"
@@ -1964,11 +2064,11 @@ msgstr "Filter: %s-Verwaltung"
msgid "Find"
msgstr "Suche"
-#: config/prefs.php:1435
+#: config/prefs.php:1476
msgid "First (oldest) Unseen Message"
msgstr "Erste (älteste) ungelesene Nachricht"
-#: config/prefs.php:1437
+#: config/prefs.php:1478
msgid "First Page"
msgstr "Erste Seite"
@@ -1992,7 +2092,7 @@ msgstr "Marker:"
msgid "Flagged for Followup"
msgstr "Markiert"
-#: config/prefs.php:1354
+#: config/prefs.php:1389
msgid "Flags"
msgstr "Marker"
@@ -2009,7 +2109,7 @@ msgstr ""
"Sie können die Markierung zurücknehmen wenn gewünscht. Dies ist nur eine "
"Warnung, damit Sie Markeränderungen nicht unabsichtlich überschreiben."
-#: lib/Mailbox.php:1765
+#: lib/Mailbox.php:1768
msgid "Folder"
msgstr "Ordner"
@@ -2017,7 +2117,7 @@ msgstr "Ordner"
msgid "Folder Actions"
msgstr "Ordneraktionen"
-#: config/prefs.php:1507
+#: config/prefs.php:1548
msgid "Folder Display"
msgstr "Ordneransicht"
@@ -2030,7 +2130,7 @@ msgstr "Ordnernavigation"
msgid "Folders"
msgstr "Ordner"
-#: config/prefs.php:1000
+#: config/prefs.php:1035
msgid ""
"For messages with alternative representations of a text part, which part "
"should be displayed?"
@@ -2038,7 +2138,7 @@ msgstr ""
"Welcher Nachrichtenteil soll angezeigt werden, wenn eine Nachricht "
"alternative Textansichten hat?"
-#: lib/Compose.php:2376 lib/Compose.php:2379 lib/Dynamic/Mailbox.php:317
+#: lib/Compose.php:2378 lib/Compose.php:2381 lib/Dynamic/Mailbox.php:317
#: lib/Notification/Event/Status.php:27 templates/dynamic/mailbox.html.php:32
#: templates/dynamic/message.html.php:15
#: templates/smartmobile/message.html.php:52
@@ -2049,15 +2149,15 @@ msgstr "Weiterleiten"
msgid "Forwarded"
msgstr "Weitergeleitet"
-#: lib/Compose.php:2700
+#: lib/Compose.php:2702
msgid "Forwarded Message"
msgstr "Weitergeleitete Nachricht"
-#: lib/Compose.php:2432
+#: lib/Compose.php:2434
msgid "Forwarded message"
msgstr "Weitergeleitete Nachricht"
-#: lib/Compose.php:2432
+#: lib/Compose.php:2434
#, php-format
msgid "Forwarded message from %s"
msgstr "Weitergeleitete Nachricht von %s"
@@ -2068,11 +2168,11 @@ msgstr ""
"Die weitergeleitete Nachricht wird automatisch an die verschickte Nachricht "
"angehängt."
-#: config/prefs.php:728
+#: config/prefs.php:762
msgid "Forwards"
msgstr "Weiterleitung"
-#: lib/Compose.php:1701
+#: lib/Compose.php:1703
#, php-format
msgid ""
"Found the word %s in the message text although there are no files attached "
@@ -2087,7 +2187,7 @@ msgstr ""
msgid "Free/Busy Request Response"
msgstr "Antwort auf Frei/Gebucht-Anfrage"
-#: lib/Basic/Search.php:55 lib/Compose.php:2743 lib/Contents/View.php:219
+#: lib/Basic/Search.php:55 lib/Compose.php:2745 lib/Contents/View.php:221
#: lib/Dynamic/Mailbox.php:179 lib/Dynamic/Mailbox.php:258
#: lib/Dynamic/Mailbox.php:495 lib/Smartmobile.php:175
#: templates/dynamic/compose.html.php:102
@@ -2096,7 +2196,7 @@ msgstr "Antwort auf Frei/Gebucht-Anfrage"
msgid "From"
msgstr "Von"
-#: config/prefs.php:1452
+#: config/prefs.php:1493
msgid "From Address"
msgstr "Von Adresse"
@@ -2108,9 +2208,9 @@ msgstr "Von:"
msgid "Gallery"
msgstr "Galerie"
-#: config/prefs.php:14 config/prefs.php:113 config/prefs.php:139
-#: config/prefs.php:166 config/prefs.php:202 config/prefs.php:299
-#: config/prefs.php:316 config/prefs.php:399
+#: config/prefs.php:14 config/prefs.php:137 config/prefs.php:163
+#: config/prefs.php:190 config/prefs.php:226 config/prefs.php:326
+#: config/prefs.php:343 config/prefs.php:426
msgid "General"
msgstr "Allgemeines"
@@ -2122,7 +2222,7 @@ msgstr "Los"
msgid "Go to your Inbox..."
msgstr "Zum Posteingang..."
-#: lib/Compose.php:1809
+#: lib/Compose.php:1811
msgid "HTML Message"
msgstr "HTML-Nachricht"
@@ -2130,27 +2230,27 @@ msgstr "HTML-Nachricht"
msgid "HTML composition"
msgstr "HTML-Modus"
-#: config/prefs.php:997
+#: config/prefs.php:1032
msgid "HTML part"
msgstr "HTML-Nachrichtenteil"
-#: lib/Pgp.php:793
+#: lib/Pgp.php:794
msgid "Hash-Algorithm"
msgstr "Hash-Algorithmus"
-#: config/prefs.php:1053
+#: config/prefs.php:1088
msgid "Hidden"
msgstr "Versteckt"
-#: config/prefs.php:1051
+#: config/prefs.php:1086
msgid "Hidden in List Messages"
msgstr "Versteckt in Mailinglisten-Nachrichten"
-#: config/prefs.php:1050
+#: config/prefs.php:1085
msgid "Hidden in Thread View"
msgstr "Versteckt in der Themenansicht"
-#: config/prefs.php:1052
+#: config/prefs.php:1087
msgid "Hidden in Thread View and List Messages"
msgstr "Versteckt in der Themenansicht und in Mailinglisten-Nachrichten"
@@ -2170,7 +2270,7 @@ msgstr "Vorschau ausblenden"
msgid "Hide Unsubscribed"
msgstr "Ausgeblendete Ordner verstecken"
-#: config/prefs.php:1185
+#: config/prefs.php:1220
msgid "Hide deleted messages even if using the Trash mailbox?"
msgstr ""
"Gelöschte Nachrichten auch verstecken, wenn ein Papierkorb-Ordner verwendet "
@@ -2188,7 +2288,7 @@ msgstr "Hohe Priorität"
msgid "Horizontal Layout"
msgstr "Horizontales Layout"
-#: config/prefs.php:1055
+#: config/prefs.php:1090
msgid ""
"How should large blocks of quoted text be shown by default? (Toggling the "
"block will always be available)."
@@ -2196,19 +2296,19 @@ msgstr ""
"Wie sollen größere Abschnitte zitierten Textes standardmäßig angezeigt "
"werden (Umschalten der Ansicht immer möglich)?"
-#: config/prefs.php:746
+#: config/prefs.php:780
msgid "How should messages be forwarded by default?"
msgstr "Wie sollen Nachrichten standardmäßig weitergeleitet werden?"
-#: config/prefs.php:1546
+#: config/prefs.php:1587
msgid "How should namespaces be displayed in the folder tree view?"
msgstr "Wie sollen Namensräume in dem Ordnerbaum angezeigt werden?"
-#: config/prefs.php:709
+#: config/prefs.php:743
msgid "How to attribute quoted lines in a reply?"
msgstr "Wie sollen zitierte Zeilen in einer Antwort markiert werden?"
-#: lib/Mime/Viewer/Pgp.php:279
+#: lib/Mime/Viewer/Pgp.php:280
msgid ""
"However, no personal private key exists so the message cannot be decrypted."
msgstr ""
@@ -2223,6 +2323,8 @@ msgstr "IMAP"
msgid "Icon"
msgstr "Symbol"
+#: templates/smime/import_extra_key.html.php:38
+#: templates/smime/import_identity_key.html.php:38
#: templates/smime/import_personal_key.html.php:38
msgid ""
"If present, this certificate will be used for signing messages only, while "
@@ -2234,6 +2336,14 @@ msgstr ""
"die Entschlüsselung von Nachrichten verwendet wird. Falls nicht vorhanden, "
"wird das erste Zertifikat für alle Zwecke verwendet."
+#: templates/prefs/smimeidentities.html.php:11
+msgid ""
+"If you want to set the keys for different identity, please change your "
+"default-identity first: "
+msgstr ""
+"Wenn Sie die Schlüssel für eine andere Identität setzen wollen, ändern Sie "
+"bitte zuerst Ihre Standard-Identität:"
+
#: lib/Contents.php:1282 templates/saveimage/saveimage.html.php:7
msgid "Image"
msgstr "Bild"
@@ -2247,11 +2357,29 @@ msgid "Images have been blocked in this message part."
msgstr "Bilder wurden blockiert."
#: lib/Dynamic/Mailbox.php:376 templates/pgp/import_key.html.php:42
+#: templates/smime/import_extra_key.html.php:62
+#: templates/smime/import_identity_key.html.php:62
#: templates/smime/import_personal_key.html.php:62
#: templates/smime/import_public_key.html.php:28
msgid "Import"
msgstr "Importieren"
+#: templates/prefs/smimeprivatekey.html.php:285
+msgid "Import Extra Personal Certificate"
+msgstr "Extra persönliche SMIME-Zertifikate importieren"
+
+#: templates/smime/import_extra_key.html.php:6
+msgid "Import Extra Personal S/MIME Certificate"
+msgstr "Importieren eines Extra SMIME-Zertifikates"
+
+#: lib/Basic/Smime.php:322
+msgid "Import Extra Personal S/MIME Certificates"
+msgstr "Importieren eines Extra SMIME-Zertifikates"
+
+#: templates/smime/import_identity_key.html.php:6
+msgid "Import Idenitity Personal S/MIME Certificate"
+msgstr "S/MIME-Zertifikat für neue Identität importieren"
+
#: templates/prefs/pgpprivatekey.html.php:129
msgid "Import Key"
msgstr "Schlüssel importieren"
@@ -2260,7 +2388,7 @@ msgstr "Schlüssel importieren"
msgid "Import PGP Key"
msgstr "PGP-Schlüssel importieren"
-#: templates/prefs/smimeprivatekey.html.php:90
+#: templates/prefs/smimeprivatekey.html.php:188
msgid "Import Personal Certificate"
msgstr "Persönliches Zertifikat importieren"
@@ -2268,7 +2396,7 @@ msgstr "Persönliches Zertifikat importieren"
msgid "Import Personal Key"
msgstr "Persönlichen Schlüssel importieren"
-#: lib/Basic/Smime.php:212 templates/smime/import_personal_key.html.php:6
+#: lib/Basic/Smime.php:319 templates/smime/import_personal_key.html.php:6
msgid "Import Personal S/MIME Certificate"
msgstr "Persönliches S/MIME-Zertifikat importieren"
@@ -2282,10 +2410,18 @@ msgstr "Öffentlichen Schlüssel importieren"
msgid "Import Public PGP Key"
msgstr "Öffentlichen PGP-Schlüssel importieren"
-#: lib/Basic/Smime.php:213 templates/smime/import_public_key.html.php:6
+#: lib/Basic/Smime.php:328 templates/smime/import_public_key.html.php:6
msgid "Import Public S/MIME Key"
msgstr "Öffentlichen S/MIME-Schlüssel importieren"
+#: lib/Basic/Smime.php:325
+msgid "Import S/MIME Certificates for new Identity"
+msgstr "S/MIME-Zertifikat für neue Identität importieren"
+
+#: templates/prefs/smimeprivatekey.html.php:275
+msgid "Import SMIME Certificate for a new Identity"
+msgstr "S/MIME-Zertifikat für neue Identität importieren"
+
#: lib/Mbox/Import.php:61
#, php-format
msgid "Imported %d message from %s."
@@ -2301,28 +2437,32 @@ msgstr "Importiere (kann einige Zeit dauern)..."
msgid "In Body Text"
msgstr "Im Nachrichtentext"
-#: lib/Mime/Viewer/Itip.php:822
+#: lib/Mime/Viewer/Itip.php:823
msgid "In Process"
msgstr "In Bearbeitung"
-#: config/prefs.php:742
+#: config/prefs.php:776
msgid "In the body text"
msgstr "Im Nachrichtentext"
-#: lib/Mailbox.php:1728 lib/Mailbox.php:1732 lib/Mailbox.php:1779
+#: lib/Mailbox.php:1731 lib/Mailbox.php:1735 lib/Mailbox.php:1782
#: lib/Remote.php:107
msgid "Inbox"
msgstr "Posteingang"
-#: config/prefs.php:693
+#: config/prefs.php:727
msgid "Include a brief summary of the original message's header in a reply?"
msgstr "Kurzform des ursprünglichen Nachrichtenkopfes in die Antwort einfügen?"
-#: config/prefs.php:702
+#: config/prefs.php:736
msgid "Include original message in a reply?"
msgstr "Originalnachricht in die Antwort einfügen?"
-#: config/prefs.php:1498
+#: config/prefs.php:1439
+msgid "Include the \"Bcc\" header when printing a sent email?"
+msgstr "Den \"Bcc\" header einfügen beim Ausdrucken einer gesendeten Email?"
+
+#: config/prefs.php:1539
msgid ""
"Indicate whether a message has attachments or is signed or encrypted in the "
"mailbox listing?"
@@ -2335,7 +2475,7 @@ msgid "Info"
msgstr "Information"
#: lib/Prefs/Special/PgpPublicKey.php:78
-#: lib/Prefs/Special/SmimePublicKey.php:76
+#: lib/Prefs/Special/SmimePublicKey.php:78
#, php-format
msgid "Information on %s Public Key"
msgstr "Informationen über %s öffentlichen Schlüssel"
@@ -2344,7 +2484,7 @@ msgstr "Informationen über %s öffentlichen Schlüssel"
msgid "Information on Personal Private Key"
msgstr "Informationen über den persönlichen privaten Schlüssel"
-#: lib/Prefs/Special/SmimePrivateKey.php:101
+#: lib/Prefs/Special/SmimePrivateKey.php:251
msgid "Information on Personal Public Certificate"
msgstr "Informationen über das persönliche öffentliche Zertifikat"
@@ -2383,12 +2523,12 @@ msgstr "Ungültige Adresse"
msgid "Invalid Subject"
msgstr "Ungültiger Betreff"
-#: lib/Compose.php:1512
+#: lib/Compose.php:1514
#, php-format
msgid "Invalid e-mail address (%s)."
msgstr "Ungültige E-Mail-Adresse (%s)."
-#: lib/Compose.php:1508
+#: lib/Compose.php:1510
#, php-format
msgid "Invalid e-mail address (%s): %s"
msgstr "Ungültige E-Mail-Adresse (%s): %s"
@@ -2397,7 +2537,7 @@ msgstr "Ungültige E-Mail-Adresse (%s): %s"
msgid "Invalid e-mail address."
msgstr "Ungültige E-Mail-Adresse."
-#: lib/Basic/Smime.php:271
+#: lib/Basic/Smime.php:389
msgid "Invalid key"
msgstr "Ungültiger Schlüssel"
@@ -2409,23 +2549,23 @@ msgstr "Ungültiges Passwort eingegeben."
msgid "Junk"
msgstr "Spam"
-#: lib/Pgp.php:788
+#: lib/Pgp.php:789
msgid "Key Creation"
msgstr "Schlüsselerzeugung"
-#: lib/Pgp.php:795
+#: lib/Pgp.php:796
msgid "Key Fingerprint"
msgstr "Fingerabdruck des Schlüssels"
-#: lib/Pgp.php:794
+#: lib/Pgp.php:795
msgid "Key ID"
msgstr "Schlüssel-Id"
-#: lib/Pgp.php:790
+#: lib/Pgp.php:791
msgid "Key Length"
msgstr "Schlüssellänge"
-#: lib/Pgp.php:787
+#: lib/Pgp.php:788
msgid "Key Type"
msgstr "Schlüsseltyp"
@@ -2453,6 +2593,10 @@ msgstr ""
"Sie können keine Schlüssel importieren, weil Sie kein Adressbuch angegeben "
"haben, das zum Hinzufügen neuer Kontakte verwendet werden soll."
+#: lib/Smime.php:217
+msgid "Key is allready in the Database"
+msgstr "Key ist bereits in der Datenbank anwesend"
+
#: lib/Prefs/Special/PgpPrivateKey.php:165
msgid "Key successfully sent to the public keyserver."
msgstr ""
@@ -2463,11 +2607,11 @@ msgstr ""
msgid "Label"
msgstr "Beschriftung"
-#: config/prefs.php:1436
+#: config/prefs.php:1477
msgid "Last (newest) Unseen Message"
msgstr "Letzte (neueste) ungelesene Nachricht"
-#: config/prefs.php:1438
+#: config/prefs.php:1479
msgid "Last Page"
msgstr "Letzte Seite"
@@ -2544,8 +2688,8 @@ msgstr "Macintosh-Datei"
msgid "Mail"
msgstr "Webmail"
-#: config/prefs.php:1405 config/prefs.php:1506 lib/Block/Summary.php:107
-#: lib/Mailbox.php:1816 templates/smartmobile/message.html.php:2
+#: config/prefs.php:1446 config/prefs.php:1547 lib/Block/Summary.php:107
+#: lib/Mailbox.php:1819 templates/smartmobile/message.html.php:2
msgid "Mailbox"
msgstr "Ordner"
@@ -2559,7 +2703,7 @@ msgstr "Ordner \"%s\" existiert bereits."
msgid "Mailbox %s does not exist."
msgstr "Ordner \"%s\" existiert nicht."
-#: config/prefs.php:1406
+#: config/prefs.php:1447
msgid "Mailbox Display"
msgstr "Ordnerübersicht"
@@ -2571,7 +2715,7 @@ msgstr "Ordnergröße"
msgid "Mailbox Summary"
msgstr "Ordnerübersicht"
-#: lib/Mailbox.php:672
+#: lib/Mailbox.php:675
msgid "Mailbox structure on server has changed."
msgstr "Die Ordnerstruktur auf dem Server hat sich geändert."
@@ -2596,15 +2740,15 @@ msgstr "Mailinglisten-Nachrichten"
msgid "Manage Remote Accounts"
msgstr "Externe Konten verwalten"
-#: config/prefs.php:763
+#: config/prefs.php:797
msgid "Manage message drafts."
msgstr "Nachrichtenentwürfe verwalten."
-#: config/prefs.php:817
+#: config/prefs.php:851
msgid "Manage sent mail."
msgstr "Gesendete Nachrichten verwalten."
-#: config/prefs.php:168
+#: config/prefs.php:192
msgid "Manage your saved searches"
msgstr "Verwalten Sie Ihre gespeicherten Suchen"
@@ -2624,16 +2768,16 @@ msgstr "Alle markieren als"
msgid "Mark as"
msgstr "Markieren als"
-#: config/prefs.php:1035
+#: config/prefs.php:1070
msgid "Mark different levels of quoting with different colors?"
msgstr ""
"Unterschiedliche Zitateinrückungen in unterschiedlichen Farben anzeigen?"
-#: config/prefs.php:1133
+#: config/prefs.php:1168
msgid "Mark messages as seen when deleting?"
msgstr "Nachrichten beim Löschen als gelesen markieren?"
-#: config/prefs.php:1042
+#: config/prefs.php:1077
msgid "Mark simple markup?"
msgstr "Einfache Auszeichnung hervorheben?"
@@ -2665,9 +2809,9 @@ msgstr "Maximale Textlänge (in Bytes) neuer Nachrichten."
msgid "Mbox or .eml file:"
msgstr "Mbox- oder .eml-Datei:"
-#: config/prefs.php:969 config/prefs.php:1114 config/prefs.php:1223
-#: config/prefs.php:1306 config/prefs.php:1353 config/prefs.php:1387
-#: lib/Compose.php:2239 lib/Contents.php:1287 lib/Dynamic/Message.php:149
+#: config/prefs.php:1004 config/prefs.php:1149 config/prefs.php:1258
+#: config/prefs.php:1341 config/prefs.php:1388 config/prefs.php:1422
+#: lib/Compose.php:2241 lib/Contents.php:1287 lib/Dynamic/Message.php:149
msgid "Message"
msgstr "Nachricht"
@@ -2689,15 +2833,15 @@ msgstr "Nachrichtentext"
msgid "Message Date"
msgstr "Nachrichten Datum"
-#: config/prefs.php:1455
+#: config/prefs.php:1496
msgid "Message Size"
msgstr "Nachrichten Größe"
-#: lib/Contents/View.php:168
+#: lib/Contents/View.php:170
msgid "Message Source"
msgstr "_Quelltext"
-#: lib/Compose.php:2239
+#: lib/Compose.php:2241
#, php-format
msgid "Message from %s"
msgstr "Nachricht von %s"
@@ -2718,7 +2862,7 @@ msgstr "Nachricht ist signiert"
msgid "Message redirected successfully."
msgstr "Nachricht erfolgreich umgeleitet."
-#: lib/Compose.php:1218 lib/Compose.php:1270
+#: lib/Compose.php:1220 lib/Compose.php:1272
#, php-format
msgid "Message sent successfully, but not saved to %s."
msgstr "Nachricht wurde erfolgreich versendet, aber nicht in %s gespeichert."
@@ -2748,13 +2892,13 @@ msgstr "Nachrichten von persönlichen Kontakten"
msgid "Messages with Attachments"
msgstr "Nachrichten mit Anhängen"
-#: config/prefs.php:308
+#: config/prefs.php:335
msgid "Minutes needed to consider a event as non-conflicting in iTip"
msgstr ""
"Abstand in Minuten um einen Termin nicht als Konflikt zu einer Einladung "
"anzusehen"
-#: config/prefs.php:1126
+#: config/prefs.php:1161
msgid "Mobile view only"
msgstr "Nur in der Mobilansicht"
@@ -2778,7 +2922,7 @@ msgstr "Verschiebe"
msgid "Move %s to %s"
msgstr "%s in %s verschieben"
-#: config/prefs.php:1139
+#: config/prefs.php:1174
msgid ""
"Move deleted messages to your Trash mailbox instead of marking them as "
"deleted in the current mailbox?"
@@ -2790,11 +2934,11 @@ msgstr ""
msgid "Move to Base Level"
msgstr "Zur obersten Ebene verschieben"
-#: config/prefs.php:1270
+#: config/prefs.php:1305
msgid "Move to Inbox"
msgstr "Zum Posteingang verschieben"
-#: config/prefs.php:1259
+#: config/prefs.php:1294
msgid "Move to Spam mailbox"
msgstr "Zum Spam-Ordner verschieben"
@@ -2806,7 +2950,7 @@ msgstr "Multipart"
msgid "Multiple Message View"
msgstr "Ansicht für mehrere Nachrichten"
-#: lib/Dynamic/Compose.php:125
+#: lib/Dynamic/Compose.php:126
msgid "Multiple messages can only be forwarded as attachments."
msgstr ""
"Mehrere Nachrichten auf einmal können nur als Anhänge weitergeleitet werden."
@@ -2819,11 +2963,11 @@ msgstr "Geben Sie einen Ordnernamen ein"
msgid "Must enter a non-empty name for the new destination mailbox."
msgstr "Der Name für den neuen Ordner darf nicht leer sein:"
-#: config/prefs.php:1450
+#: config/prefs.php:1491
msgid "NONE"
msgstr "KEINS"
-#: lib/Pgp.php:786 templates/itip/action.html.php:79
+#: lib/Pgp.php:787 templates/itip/action.html.php:79
msgid "Name"
msgstr "Name"
@@ -2844,7 +2988,7 @@ msgstr "Für die Suche in einem Zeitraum wird mindestens ein Datum benötigt."
msgid "Need at least one message recipient."
msgstr "Sie müssen mindestens einen Empfänger angeben."
-#: lib/Mime/Viewer/Itip.php:827
+#: lib/Mime/Viewer/Itip.php:828
msgid "Needs Action"
msgstr "Aktion benötigt"
@@ -2852,12 +2996,12 @@ msgstr "Aktion benötigt"
msgid "Negative Right"
msgstr "Negatives Recht"
-#: config/prefs.php:860 config/prefs.php:1191 config/prefs.php:1282
-#: config/prefs.php:1319 lib/Pgp.php:827
+#: config/prefs.php:894 config/prefs.php:1226 config/prefs.php:1317
+#: config/prefs.php:1354 lib/Pgp.php:828
msgid "Never"
msgstr "Nie"
-#: config/prefs.php:1096
+#: config/prefs.php:1131
msgid "Never send read receipt"
msgstr "Lesebestätigungen niemals verschicken"
@@ -2865,11 +3009,11 @@ msgstr "Lesebestätigungen niemals verschicken"
msgid "New Flag"
msgstr "Neuer Marker"
-#: config/prefs.php:1307
+#: config/prefs.php:1342
msgid "New Mail"
msgstr "Nachrichteneingang"
-#: lib/Application.php:310 lib/Compose.php:2356 lib/Dynamic/Base.php:154
+#: lib/Application.php:310 lib/Compose.php:2358 lib/Dynamic/Base.php:154
#: lib/Dynamic/Compose.php:79 lib/Dynamic/Mailbox.php:114
#: lib/Smartmobile.php:182 templates/dynamic/mailbox.html.php:54
#: templates/smartmobile/compose.html.php:2
@@ -2883,6 +3027,10 @@ msgstr "Neue Nachricht"
msgid "New Message to %s"
msgstr "Neue Nachricht an %s"
+#: templates/smime/import_extra_key.html.php:24
+#: templates/smime/import_extra_key.html.php:56
+#: templates/smime/import_identity_key.html.php:24
+#: templates/smime/import_identity_key.html.php:56
#: templates/smime/import_personal_key.html.php:24
#: templates/smime/import_personal_key.html.php:56
msgid "New Password for Private Key"
@@ -2892,7 +3040,7 @@ msgstr "Neues Passwort für privaten Schlüssel"
msgid "New User"
msgstr "Neuer Benutzer"
-#: config/prefs.php:1326
+#: config/prefs.php:1361
msgid "New mail poll interval on mailbox page:"
msgstr "Intervall zum Überprüfen auf neue Nachrichten in der Ordneransicht:"
@@ -2909,8 +3057,8 @@ msgstr "Neueste ungelesene Nachrichten"
msgid "Next"
msgstr "Weiter"
-#: config/prefs.php:583 config/prefs.php:803 config/prefs.php:830
-#: config/prefs.php:1528
+#: config/prefs.php:617 config/prefs.php:837 config/prefs.php:864
+#: config/prefs.php:1569
msgid "No"
msgstr "Nein"
@@ -2931,7 +3079,7 @@ msgstr "Es wurde kein öffentlicher PGP-Schlüssel importiert."
msgid "No Results Found"
msgstr "Keine Ergebnisse gefunden"
-#: lib/Basic/Smime.php:55
+#: lib/Basic/Smime.php:62
msgid "No S/MIME public key imported."
msgstr "Es wurde kein öffentlicher S/MIME-Schlüssel importiert."
@@ -2959,10 +3107,22 @@ msgstr "Keine Aktionen verfügbar"
msgid "No addresses were selected."
msgstr "Kein Adressen ausgewählt."
-#: lib/Smime.php:271
+#: templates/prefs/smimeprivatekey.html.php:224
+msgid "No alias"
+msgstr "Kein Alias"
+
+#: lib/Prefs/Special/SmimeAliasHandler.php:22
+msgid "No alias entered."
+msgstr "Kein Alias eingetragen."
+
+#: lib/Smime.php:753
msgid "No email information located in the public key."
msgstr "Keine E-Mail-Adresse im öffentlichen Schlüssel gefunden."
+#: templates/prefs/smimeprivatekey.html.php:214
+msgid "No extra Privateys in Keystore"
+msgstr "Keine extra Zeritifakte in der Datenbank"
+
#: lib/Quota/Ui.php:110
msgid "No limit"
msgstr "Keine Begrenzung"
@@ -2971,7 +3131,7 @@ msgstr "Keine Begrenzung"
msgid "No mailboxes with unseen messages"
msgstr "Keine Ordner mit ungelesenen Nachrichten"
-#: lib/Compose.php:2270
+#: lib/Compose.php:2272
msgid "No message body text"
msgstr "Kein Nachrichtentext"
@@ -2991,11 +3151,11 @@ msgstr "Es wurden keine passenden Nachrichten gefunden."
msgid "No passphrase entered."
msgstr "Kein Passwort eingegeben."
-#: templates/prefs/smimeprivatekey.html.php:84
+#: templates/prefs/smimeprivatekey.html.php:178
msgid "No personal certificate"
msgstr "Kein persönliches Zertifikat"
-#: lib/Mime/Viewer/Smime.php:183
+#: lib/Mime/Viewer/Smime.php:185
msgid "No personal private key exists so the data is unable to be decrypted."
msgstr ""
"Sie haben keinen privaten Schlüssel, so dass die Daten nicht entschlüsselt "
@@ -3017,13 +3177,13 @@ msgstr "Keine ungelesenen Nachrichten"
msgid "No valid public key found."
msgstr "Kein gültiger öffentlicher Schlüssel gefunden."
-#: lib/Mime/Viewer/Itip.php:876
+#: lib/Mime/Viewer/Itip.php:877
msgid "Non Participant"
msgstr "Kein Teilnehmer"
#: lib/Compose/Ui.php:56 lib/Mime/Viewer/Itip.php:430
-#: lib/Mime/Viewer/Itip.php:607 lib/Mime/Viewer/Itip.php:769 lib/Pgp.php:829
-#: lib/Pgp.php:830 templates/prefs/acl.html.php:39
+#: lib/Mime/Viewer/Itip.php:607 lib/Mime/Viewer/Itip.php:770 lib/Pgp.php:830
+#: lib/Pgp.php:831 templates/prefs/acl.html.php:39
#: templates/prefs/acl.html.php:74 templates/prefs/composetemplates.html.php:7
#: templates/prefs/drafts.html.php:7 templates/prefs/sentmail.html.php:7
#: templates/prefs/spam.html.php:7 templates/prefs/trash.html.php:7
@@ -3043,7 +3203,7 @@ msgstr "Nicht %s"
msgid "Not Junk"
msgstr "Kein Spam"
-#: lib/Smime.php:264
+#: lib/Smime.php:746
msgid "Not a valid public key."
msgstr "Kein gültiger öffentlicher Schlüssel."
@@ -3051,7 +3211,7 @@ msgstr "Kein gültiger öffentlicher Schlüssel."
msgid "Notepads"
msgstr "Notizblöcke"
-#: config/prefs.php:1255 config/prefs.php:1269
+#: config/prefs.php:1290 config/prefs.php:1304
msgid "Nothing"
msgstr "Nichts"
@@ -3090,14 +3250,16 @@ msgstr "Nur Ordner, die ungelesene Nachrichten enthalten, anzeigen?"
msgid "Open in new window"
msgstr "In neuem Fenster öffnen"
-#: lib/Mailbox.php:1761
+#: lib/Mailbox.php:1764
msgid "Opened Folder"
msgstr "Geöffneter Ordner"
-#: lib/Mime/Viewer/Itip.php:872
+#: lib/Mime/Viewer/Itip.php:873
msgid "Optional Participant"
msgstr "Optionaler Teilnehmer"
+#: templates/smime/import_extra_key.html.php:33
+#: templates/smime/import_identity_key.html.php:33
#: templates/smime/import_personal_key.html.php:33
msgid "Optional Secondary S/MIME Certificate"
msgstr "Optionales zweites S/MIME-Zertifikat"
@@ -3111,11 +3273,11 @@ msgstr "Sonstige"
msgid "Other Options"
msgstr "Weitere Funktionen"
-#: lib/Mailbox.php:1649
+#: lib/Mailbox.php:1652
msgid "Other Users"
msgstr "Andere Benutzer"
-#: config/prefs.php:317
+#: config/prefs.php:344
msgid "PGP"
msgstr "PGP"
@@ -3127,7 +3289,7 @@ msgstr "Verschlüsseln (PGP)"
msgid "PGP Encrypt Message with passphrase"
msgstr "Mit Passwort verschlüsseln (PGP)"
-#: lib/Compose.php:1088
+#: lib/Compose.php:1090
msgid "PGP Error: "
msgstr "PGP-Fehler: "
@@ -3168,7 +3330,7 @@ msgstr "Unterzeichnen und mit Passwort verschlüsseln (PGP)"
msgid "PGP passphrase successfully unloaded."
msgstr "PGP-Passwort für diese Sitzung gelöscht."
-#: config/prefs.php:344
+#: config/prefs.php:371
msgid ""
"PGP support requires popup windows to be used. If your browser is currently "
"set to disable popup windows, you must change this setting or else the PGP "
@@ -3179,12 +3341,12 @@ msgstr ""
"müssen sie diese Einstellung ändern, oder die PGP-Funktionen werden nicht "
"richtig funktionieren."
-#: lib/Compose.php:1036
+#: lib/Compose.php:1038
msgid "PGP: Need passphrase for personal private key."
msgstr ""
"PGP: Für den persönlichen privaten Schlüssel wird ein Passwort benötigt."
-#: lib/Compose.php:1053
+#: lib/Compose.php:1055
msgid "PGP: Need passphrase to encrypt your message with."
msgstr ""
"PGP: Für die Verschlüsselung Ihrer Nachricht wird ein Passwort benötigt."
@@ -3226,6 +3388,10 @@ msgstr "Passwort"
msgid "Password for %s:"
msgstr "Passwort für %s:"
+#: templates/smime/import_extra_key.html.php:18
+#: templates/smime/import_extra_key.html.php:50
+#: templates/smime/import_identity_key.html.php:18
+#: templates/smime/import_identity_key.html.php:50
#: templates/smime/import_personal_key.html.php:18
#: templates/smime/import_personal_key.html.php:50
msgid "Password of Uploaded Certificate"
@@ -3270,7 +3436,7 @@ msgstr "Persönlich"
msgid "Personal Information"
msgstr "Persönliche Angaben"
-#: lib/Basic/Search.php:128 lib/Search/Element/Personal.php:70
+#: lib/Basic/Search.php:128 lib/Search/Element/Personal.php:71
#: lib/Search/Filter/Personal.php:30
msgid "Personal Messages"
msgstr "Persönliche Nachrichten"
@@ -3291,27 +3457,27 @@ msgstr "Das persönliche PGP-Schlüsselpaar wurde erfolgreich erzeugt."
msgid "Personal PGP keys deleted successfully."
msgstr "Die persönlichen PGP-Schlüssel wurden erfolgreich gelöscht."
-#: lib/Basic/Smime.php:125
+#: lib/Basic/Smime.php:188 lib/Basic/Smime.php:227
msgid "Personal S/MIME certificates NOT imported."
msgstr "Es wurden KEINE persönlichen S/MIME-Zertifikate importiert."
-#: lib/Basic/Smime.php:128 lib/Basic/Smime.php:140
+#: lib/Basic/Smime.php:191 lib/Basic/Smime.php:230 lib/Basic/Smime.php:242
msgid "Personal S/MIME certificates NOT imported: "
msgstr "Es wurden KEINE persönlichen S/MIME-Zertifikate importiert: "
-#: lib/Prefs/Special/SmimePrivateKey.php:169
+#: lib/Prefs/Special/SmimePrivateKey.php:374
msgid "Personal S/MIME keys deleted successfully."
msgstr "Die persönlichen S/MIME-Schlüssel wurden erfolgreich gelöscht."
-#: config/prefs.php:518
+#: config/prefs.php:552
msgid "Plain Text"
msgstr "Einfacher Text"
-#: lib/Compose.php:1841
+#: lib/Compose.php:1843
msgid "Plaintext Message"
msgstr "Textnachricht"
-#: config/prefs.php:998
+#: config/prefs.php:1033
msgid "Plaintext part"
msgstr "Text-Nachrichtenteil"
@@ -3340,11 +3506,17 @@ msgstr "Bitte mindestens einen Ordner für die Suche angeben."
msgid "Please select at least one search criteria."
msgstr "Bitte wählen Sie mindestens ein Suchkriterium."
+#: lib/Smime.php:596
+msgid "Please set a correct password before unsetting the keys."
+msgstr ""
+"Bitte setzen Sie das richtige Passwort befor sie die Zertifikate "
+"zurücksetzen."
+
#: lib/Prefs/Special/Remote.php:50
msgid "Please wait..."
msgstr "Bitte warten..."
-#: config/prefs.php:1565
+#: config/prefs.php:1606
msgid "Poll all mailboxes for new mail?"
msgstr "Alle Ordner auf neue Nachrichten überprüfen?"
@@ -3381,11 +3553,11 @@ msgstr "Zurück"
msgid "Print"
msgstr "Drucken"
-#: lib/Contents/View.php:243
+#: lib/Contents/View.php:248
msgid "Printed By"
msgstr "Gedruckt Von"
-#: config/prefs.php:1388
+#: config/prefs.php:1423
msgid "Printing"
msgstr "Drucken"
@@ -3393,11 +3565,15 @@ msgstr "Drucken"
msgid "Priority"
msgstr "Priorität"
-#: lib/Pgp.php:825
+#: templates/prefs/smimeprivatekey.html.php:239
+msgid "Private Certificate: "
+msgstr "Privates Zertifikat: "
+
+#: lib/Pgp.php:826
msgid "Private Key"
msgstr "Privater Schlüssel"
-#: config/prefs.php:1102
+#: config/prefs.php:1137
msgid ""
"Prompt to send read receipt (a/k/a message disposition notification) when "
"requested by the sender?"
@@ -3405,11 +3581,15 @@ msgstr ""
"Nachfragen bevor eine Lesebestätigung geschickt wird, falls diese vom "
"Absender gewünscht wurde?"
-#: lib/Pgp.php:825
+#: templates/prefs/smimeprivatekey.html.php:232
+msgid "Public Certificate: "
+msgstr "Öffentliches Zertifikat: "
+
+#: lib/Pgp.php:826
msgid "Public Key"
msgstr "Öffentlicher Schlüssel"
-#: lib/Pgp.php:955
+#: lib/Pgp.php:956
msgid "Public PGP keyserver support has been disabled."
msgstr ""
"Die Unterstützung für öffentliche PGP-Schlüsselserver ist deaktiviert worden."
@@ -3422,11 +3602,11 @@ msgstr "Aufräumen"
msgid "Purge Deleted"
msgstr "Endgültig löschen"
-#: config/prefs.php:1283
+#: config/prefs.php:1318
msgid "Purge Spam mailbox how often:"
msgstr "Wie oft soll der Spam-Ordner geleert werden:"
-#: config/prefs.php:1192
+#: config/prefs.php:1227
msgid "Purge Trash how often:"
msgstr "Wie oft soll der Papierkorb geleert werden:"
@@ -3434,21 +3614,21 @@ msgstr "Wie oft soll der Papierkorb geleert werden:"
msgid "Purge messages"
msgstr "Nachrichten aufräumen"
-#: config/prefs.php:1293
+#: config/prefs.php:1328
msgid "Purge messages in Spam mailbox older than this amount of days."
msgstr "Nachrichten im Spam-Ordner nach so vielen Tagen endgültig löschen."
-#: config/prefs.php:1204
+#: config/prefs.php:1239
msgid "Purge messages in Trash mailbox older than this amount of days."
msgstr "Nachrichten im Papierkorb nach so vielen Tagen endgültig löschen."
-#: config/prefs.php:871
+#: config/prefs.php:905
msgid "Purge messages in sent mail mailbox(es) older than this amount of days."
msgstr ""
"Nachrichten in Ordnern für gesendete Nachrichten nach so vielen Tagen "
"endgültig löschen."
-#: config/prefs.php:861
+#: config/prefs.php:895
msgid "Purge sent mail how often:"
msgstr "Ordner für gesendete Nachrichten so oft leeren:"
@@ -3476,7 +3656,7 @@ msgstr "%d Nachrichten in Ordnern für gesendete Nachrichten gelöscht."
msgid "Purging 1 message from sent-mail mailbox %s."
msgstr "1 Nachricht im Ordner \"%s\" gelöscht."
-#: config/prefs.php:706
+#: config/prefs.php:740
#, php-format
msgid "Quoting %f:"
msgstr "Zitat von %f:"
@@ -3526,7 +3706,7 @@ msgstr "Empfänger: %s"
msgid "Recipients (To/Cc/Bcc)"
msgstr "Empfänger (An/Cc/Bcc)"
-#: lib/Search/Element/Recipient.php:69
+#: lib/Search/Element/Recipient.php:70
#, php-format
msgid "Recipients (To/Cc/Bcc) for '%s'"
msgstr "Empfänger (An/Cc/Bcc) für '%s'"
@@ -3535,7 +3715,7 @@ msgstr "Empfänger (An/Cc/Bcc) für '%s'"
msgid "Recurrence"
msgstr "Wiederholung"
-#: lib/Dynamic/Base.php:177 lib/Dynamic/Compose.php:149
+#: lib/Dynamic/Base.php:177 lib/Dynamic/Compose.php:150
#: lib/Notification/Event/Status.php:32 templates/dynamic/redirect.html.php:7
#: templates/smartmobile/message.html.php:55
msgid "Redirect"
@@ -3555,15 +3735,15 @@ msgstr "Suchergebnisse aktualisieren"
msgid "Remember the free/busy information."
msgstr "Frei/Gebucht-Informationen merken."
-#: config/prefs.php:1530
+#: config/prefs.php:1571
msgid "Remember the last view"
msgstr "Die letzte Ansicht merken"
-#: lib/Mailbox.php:1771
+#: lib/Mailbox.php:1774
msgid "Remote Account"
msgstr "Externes Konto"
-#: config/prefs.php:140 lib/Mailbox.php:1645
+#: config/prefs.php:164 lib/Mailbox.php:1648
msgid "Remote Accounts"
msgstr "Externe Konten"
@@ -3580,22 +3760,22 @@ msgstr "Umbenennen"
msgid "Rename %s to:"
msgstr "%s umbenennen nach:"
-#: config/prefs.php:839
+#: config/prefs.php:873
msgid "Rename sent mail mailbox at beginning of month?"
msgstr "Ordner für gesendete Nachrichten am Monatsbeginn umbenennen?"
-#: lib/Mailbox.php:874
+#: lib/Mailbox.php:877
#, php-format
msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
msgstr ""
"Die Umbenennung von \"%s\" nach \"%s\" ist fehlgeschlagen. Meldung des E-"
"Mail-Servers"
-#: config/prefs.php:671
+#: config/prefs.php:705
msgid "Replies"
msgstr "Antworten"
-#: lib/Dynamic/Compose.php:104 lib/Dynamic/Mailbox.php:316
+#: lib/Dynamic/Compose.php:105 lib/Dynamic/Mailbox.php:316
#: lib/Notification/Event/Status.php:39 templates/dynamic/mailbox.html.php:29
#: templates/dynamic/message.html.php:12
msgid "Reply"
@@ -3614,11 +3794,11 @@ msgstr "Antwort versendet."
msgid "Reply To Sender instead"
msgstr "Nur dem Absender antworten"
-#: lib/Dynamic/Compose.php:108 templates/smartmobile/message.html.php:39
+#: lib/Dynamic/Compose.php:109 templates/smartmobile/message.html.php:39
msgid "Reply to All"
msgstr "Allen Antworten"
-#: lib/Dynamic/Compose.php:112 templates/smartmobile/message.html.php:42
+#: lib/Dynamic/Compose.php:113 templates/smartmobile/message.html.php:42
msgid "Reply to List"
msgstr "Liste Antworten"
@@ -3638,7 +3818,7 @@ msgstr "Mit Frei/Gebucht-Informationen für die nächsten zwei Monate antworten.
msgid "Reply with requested free/busy information."
msgstr "Mit erfragten Frei/Gebucht-Informationen antworten."
-#: lib/Compose.php:2747
+#: lib/Compose.php:2749
msgid "Reply-To"
msgstr "Antwort an"
@@ -3659,7 +3839,7 @@ msgstr "Als kein Spam melden"
msgid "Report as Spam"
msgstr "Als Spam melden"
-#: config/prefs.php:586
+#: config/prefs.php:620
msgid "Request read receipts?"
msgstr "Lesebestätigungen anfordern?"
@@ -3671,7 +3851,7 @@ msgstr "Angegebene Nachricht nicht gefunden."
msgid "Required"
msgstr "Notwendig"
-#: lib/Mime/Viewer/Itip.php:864
+#: lib/Mime/Viewer/Itip.php:865
msgid "Required Participant"
msgstr "Erforderlicher Teilnehmer"
@@ -3685,7 +3865,7 @@ msgid "Reset"
msgstr "Zurücksetzen"
#: lib/Ajax/Imple/ItipRequest.php:136 lib/Ajax/Imple/ItipRequest.php:154
-#: lib/Mime/Viewer/Itip.php:370 lib/Mime/Viewer/Itip.php:749
+#: lib/Mime/Viewer/Itip.php:370 lib/Mime/Viewer/Itip.php:750
msgid "Respondent Status Updated."
msgstr "Status des Antwortenden aktualisiert."
@@ -3715,14 +3895,14 @@ msgstr "Wiederholen"
msgid "Return to %s"
msgstr "Zurück zu %s"
-#: config/prefs.php:1126
+#: config/prefs.php:1161
msgid ""
"Return to the mailbox listing after deleting, moving, or copying a message?"
msgstr ""
"Nach dem Löschen, Verschieben oder Kopieren von Nachrichten zum Ordner "
"zurückkehren?"
-#: config/prefs.php:519
+#: config/prefs.php:553
msgid "Rich Text (HTML)"
msgstr "Formatierter Text (HTML)"
@@ -3730,34 +3910,56 @@ msgstr "Formatierter Text (HTML)"
msgid "Role"
msgstr "Rolle"
-#: config/prefs.php:400
+#: config/prefs.php:427
msgid "S/MIME"
msgstr "S/MIME"
-#: lib/Smime.php:85
+#: lib/Prefs/Special/SmimePrivateKey.php:409
+msgid ""
+"S/MIME Certificate set and successfully transfered previous certificate to "
+"extra keys."
+msgstr ""
+"S/MIME Certificate set and successfully transfered previous certificate to "
+"extra keys."
+
+#: lib/Smime.php:609
+msgid "S/MIME Certificate unset and successfully transfered to extra keys."
+msgstr ""
+"Die extra S/MIME-Zertifikate wurden erfolgreich zurücksetzen und in die "
+"Datenbank übertragen."
+
+#: lib/Smime.php:615
+msgid "S/MIME Certificates were not proberly deleted from database."
+msgstr "S/MIME-Zertifikate wurden nicht aus der Datenbank gelöscht."
+
+#: lib/Smime.php:101
msgid "S/MIME Encrypt Message"
msgstr "Verschlüsseln (S/MIME)"
-#: lib/Compose.php:1136
+#: lib/Compose.php:1138
msgid "S/MIME Error: "
msgstr "S/MIME-Fehler: "
-#: lib/Compose.php:1112
+#: lib/Compose.php:1114
msgid "S/MIME Error: Need passphrase for personal private key."
msgstr ""
"S/MIME Fehler: Für den persönlichen privaten Schlüssel wird ein Passwort "
"benötigt."
-#: lib/Basic/Smime.php:270
+#: lib/Basic/Smime.php:388
msgid "S/MIME Key Information"
msgstr "S/MIME-Schlüssel-Informationen"
-#: templates/prefs/smimeprivatekey.html.php:11
+#: templates/prefs/smimeprivatekey.html.php:5
+msgid "S/MIME Personal Certificate of Identity"
+msgstr "Persönliche S/MIME-Zertifikate der gesetzten Identität"
+
+#: templates/prefs/smimeprivatekey.html.php:30
msgid "S/MIME Personal Certificate support requires a secure web connection."
msgstr ""
"Persönliche S/MIME-Zertifikate benötigen eine sichere Serververbindung."
-#: lib/Prefs/Special/SmimePublicKey.php:105
+#: lib/Prefs/Special/SmimePublicKey.php:108
#, php-format
msgid "S/MIME Public Key for \"%s\" was successfully deleted."
msgstr ""
@@ -3767,27 +3969,41 @@ msgstr ""
msgid "S/MIME Public Keyring"
msgstr "Öffentlicher S/MIME-Schlüsselbund"
-#: lib/Basic/Smime.php:116
+#: lib/Smime.php:1213
+msgid ""
+"S/MIME Public/Private Keypair successfully added to exra keys in keystore."
+msgstr ""
+"S/MIME Public/Private Keypair successfully added to exra keys in keystore."
+
+#: lib/Basic/Smime.php:218
msgid "S/MIME Public/Private Keypair successfully added."
msgstr "Das öffentliche/private Schlüsselpaar wurde erfolgreich gespeichert."
-#: lib/Smime.php:91
+#: lib/Smime.php:107
msgid "S/MIME Sign Message"
msgstr "Unterzeichnen (S/MIME)"
-#: lib/Smime.php:92
+#: lib/Smime.php:108
msgid "S/MIME Sign/Encrypt Message"
msgstr "Unterzeichnen und verschlüsseln (S/MIME)"
-#: lib/Prefs/Special/SmimePrivateKey.php:178
+#: lib/Prefs/Special/SmimePrivateKey.php:418
+msgid ""
+"S/MIME Singing Certificate set and successfully transfered previous signing "
+"certificate to extra keys."
+msgstr ""
+"S/MIME Singing Certificate set and successfully transfered previous signing "
+"certificate to extra keys."
+
+#: lib/Prefs/Special/SmimePrivateKey.php:394
msgid "S/MIME passphrase successfully unloaded."
msgstr "S/MIME-Passwort für diese Sitzung gelöscht."
-#: lib/Basic/Smime.php:52
+#: lib/Basic/Smime.php:59
msgid "S/MIME public key successfully added."
msgstr "Öffentlicher S/MIME-Schlüssel erfolgreich hinzugefügt."
-#: lib/Mime/Viewer/Smime.php:178
+#: lib/Mime/Viewer/Smime.php:180
msgid ""
"S/MIME support is not currently enabled so the data is unable to be "
"decrypted."
@@ -3795,7 +4011,7 @@ msgstr ""
"Die S/MIME-Unterstützung ist zur Zeit deaktiviert, so dass die Daten nicht "
"entschlüsselt werden können."
-#: lib/Mime/Viewer/Smime.php:290
+#: lib/Mime/Viewer/Smime.php:350
msgid ""
"S/MIME support is not enabled so the digital signature is unable to be "
"verified."
@@ -3803,7 +4019,7 @@ msgstr ""
"Die S/MIME-Unterstützung ist zur Zeit deaktiviert, so dass die digitale "
"Signatur nicht überprüft werden kann."
-#: config/prefs.php:428
+#: config/prefs.php:455
msgid ""
"S/MIME support requires popup windows to be used. If your browser is "
"currently set to disable popup windows, you must change this setting or else "
@@ -3848,15 +4064,15 @@ msgstr "Vorlage speichern"
msgid "Save as Draft"
msgstr "Entwurf speichern"
-#: config/prefs.php:832
+#: config/prefs.php:866
msgid "Save attachments in the sent-mail message?"
msgstr "Anhänge mit gesendeten Nachrichten speichern?"
-#: config/prefs.php:794
+#: config/prefs.php:828
msgid "Save drafts as unseen?"
msgstr "Entwürfe als ungelesen speichern?"
-#: config/prefs.php:807
+#: config/prefs.php:841
msgid "Save drafts automatically while composing?"
msgstr "Nachrichten beim Verfassen automatisch speichern?"
@@ -3868,7 +4084,7 @@ msgstr "Speichern in"
msgid "Save password?"
msgstr "Passwort speichern?"
-#: config/prefs.php:900
+#: config/prefs.php:934
msgid "Save recipients automatically to the default address book?"
msgstr "Empfänger automatisch im Standardadressbuch speichern?"
@@ -3880,15 +4096,15 @@ msgstr "Gesendete Nachrichten speichern"
msgid "Save sent mail?"
msgstr "Gesendete Nachrichten speichern?"
-#: lib/Mime/Viewer/Smime.php:359
+#: lib/Mime/Viewer/Smime.php:425
msgid "Save the certificate to your Address Book."
msgstr "Zertifikat in Ihrem Adressbuch speichern."
-#: lib/Mime/Viewer/Pgp.php:379
+#: lib/Mime/Viewer/Pgp.php:380
msgid "Save the key to your address book."
msgstr "Schlüssel im Adressbuch speichern."
-#: config/prefs.php:167
+#: config/prefs.php:191
msgid "Saved Searches"
msgstr "Gespeicherte Suchen"
@@ -3980,21 +4196,25 @@ msgstr "Alle Unterordner durchsuchen?"
msgid "Searching..."
msgstr "Suche..."
-#: lib/Basic/Smime.php:119 lib/Basic/Smime.php:137
+#: lib/Basic/Smime.php:221 lib/Basic/Smime.php:239
msgid "Secondary S/MIME Public/Private Keypair successfully added."
msgstr ""
"Das zweite öffentliche/private S/MIME-Schlüsselpaar wurde erfolgreich "
"gespeichert."
-#: lib/Basic/Smime.php:178
+#: lib/Prefs/Special/SmimePrivateKey.php:384
+msgid "Secondary extra S/MIME keys deleted successfully."
+msgstr "extra Signatur-Zertifikate wurden gelöscht."
+
+#: lib/Basic/Smime.php:280
msgid "Secondary personal S/MIME certificates NOT imported."
msgstr "Die zweiten persönlichen S/MIME-Zertifikate wurden NICHT importiert."
-#: lib/Basic/Smime.php:183
+#: lib/Basic/Smime.php:285
msgid "Secondary personal S/MIME certificates NOT imported: "
msgstr "Die zweiten persönlichen S/MIME-Zertifikate wurden NICHT importiert: "
-#: lib/Prefs/Special/SmimePrivateKey.php:168
+#: lib/Prefs/Special/SmimePrivateKey.php:373
msgid "Secondary personal S/MIME keys deleted successfully."
msgstr "Die zweiten persönlichen S/MIME-Schlüssel wurden erfolgreich gelöscht."
@@ -4011,7 +4231,7 @@ msgstr "Auswählen"
msgid "Select All"
msgstr "Alle auswählen"
-#: config/prefs.php:886
+#: config/prefs.php:920
msgid "Select address book sources for adding/searching."
msgstr "Adressbücher zum Suchen/Hinzufügen auswählen."
@@ -4052,12 +4272,12 @@ msgstr "Die Nachricht ohne ein Betreff verschicken?"
msgid "Send message without a subject?"
msgstr "Nachricht ohne ein Betreff verschicken?"
-#: lib/Mime/Viewer/Smime.php:332 lib/Mime/Viewer/Smime.php:366
+#: lib/Mime/Viewer/Smime.php:392 lib/Mime/Viewer/Smime.php:432
#, php-format
msgid "Sender: %s"
msgstr "Absender: %s"
-#: lib/Mailbox.php:1698 lib/Mailbox.php:1810
+#: lib/Mailbox.php:1701 lib/Mailbox.php:1813
msgid "Sent"
msgstr "Gesendet"
@@ -4066,7 +4286,7 @@ msgstr "Gesendet"
msgid "Sent Date: %s"
msgstr "Sendedatum: %s"
-#: config/prefs.php:816
+#: config/prefs.php:850
msgid "Sent Mail"
msgstr "Gesendete Nachrichten"
@@ -4083,7 +4303,12 @@ msgstr "E-Mail-Server"
msgid "Server Suggestion"
msgstr "Vorschlag des Servers"
-#: config/prefs.php:511
+#: templates/prefs/smimeprivatekey.html.php:47
+#: templates/prefs/smimeprivatekey.html.php:122
+msgid "Set Alias for your certificate: "
+msgstr "Alias für das Zertifikat setzen: "
+
+#: config/prefs.php:545
msgid "Set a priority header when composing messages?"
msgstr "Priorität beim Erstellen von neuen Nachrichten setzen?"
@@ -4091,37 +4316,49 @@ msgstr "Priorität beim Erstellen von neuen Nachrichten setzen?"
msgid "Set permissions for other users"
msgstr "Rechte für andere Benutzer festlegen"
-#: config/prefs.php:1116
+#: config/prefs.php:1151
msgid "Set preferences for what happens when you move and delete messages."
msgstr ""
"Legen Sie fest, was nach dem Löschen und Verschieben von Nachrichten "
"passieren soll."
-#: config/prefs.php:114
+#: templates/prefs/smimeprivatekey.html.php:244
+msgid "Set this key as a secondary sign certificate:"
+msgstr "Dieses Zertifikat als sekundäre Signatur-Zertifikat setzen:"
+
+#: templates/prefs/smimeprivatekey.html.php:250
+msgid "Set this key as personal certificate:"
+msgstr "Dieses Zertifikat als persönliches Zertifikat setzen:"
+
+#: config/prefs.php:112
+msgid "Set your keypair from the database:"
+msgstr "Zertifikate aus der Datenbank setzen:"
+
+#: config/prefs.php:138
msgid "Share Mailboxes"
msgstr "Gemeinsame Ordner"
-#: config/prefs.php:115
+#: config/prefs.php:139
msgid "Share your mailboxes with other users."
msgstr "Teilen Sie Ihre Ordner mit anderen Benutzern."
-#: lib/Mailbox.php:1651
+#: lib/Mailbox.php:1654
msgid "Shared"
msgstr "Gemeinsam"
-#: config/prefs.php:360
+#: config/prefs.php:387
msgid "Should PGP signed messages be automatically verified when viewed?"
msgstr ""
"Sollen mit PGP signierte Nachrichten beim Anzeigen automatisch überprüft "
"werden?"
-#: config/prefs.php:436
+#: config/prefs.php:463
msgid "Should S/MIME signed messages be automatically verified when viewed?"
msgstr ""
"Sollen mit S/MIME signierte Nachrichten beim Anzeigen automatisch überprüft "
"werden?"
-#: config/prefs.php:352
+#: config/prefs.php:379
msgid "Should your PGP public key to be attached to your messages by default?"
msgstr ""
"Soll Ihr öffentlicher PGP-Schlüssel standardmäßig an Ihre Nachrichten "
@@ -4169,17 +4406,17 @@ msgstr "Vorschau einblenden"
msgid "Show Unsubscribed Mailboxes"
msgstr "Ausgeblendete Ordner anzeigen"
-#: config/prefs.php:1076
+#: config/prefs.php:1111
msgid "Show all attachments"
msgstr "Alle Anhänge anzeigen"
-#: config/prefs.php:1379
+#: config/prefs.php:1414
msgid "Show all flags (including flags set by other mail programs)?"
msgstr ""
"Alle Marker anzeigen (auch wenn diese von anderen Mail-Programmen gesetzt "
"wurden)?"
-#: config/prefs.php:1075
+#: config/prefs.php:1110
msgid "Show all parts"
msgstr "Alle Teile anzeigen"
@@ -4187,7 +4424,7 @@ msgstr "Alle Teile anzeigen"
msgid "Show images..."
msgstr "Bilder anzeigen..."
-#: config/prefs.php:1544
+#: config/prefs.php:1585
msgid "Show non-private mailboxes in separate folders"
msgstr "Eigene und Ordner anderer getrennt anzeigen"
@@ -4195,7 +4432,7 @@ msgstr "Eigene und Ordner anderer getrennt anzeigen"
msgid "Show the signature on the compose screen?"
msgstr "Die Signatur beim Schreiben neuer Nachrichten anzeigen?"
-#: config/prefs.php:1049
+#: config/prefs.php:1084
msgid "Shown"
msgstr "Angezeigt"
@@ -4228,7 +4465,7 @@ msgstr "Größe - kleiner als (KB)"
msgid "Sort"
msgstr "Sortierung"
-#: lib/Mailbox.php:1715 lib/Mailbox.php:1797
+#: lib/Mailbox.php:1718 lib/Mailbox.php:1800
#: templates/dynamic/mailbox.html.php:36 templates/dynamic/message.html.php:19
#: templates/smartmobile/mailbox.html.php:38
#: templates/smartmobile/mailbox.html.php:48
@@ -4236,7 +4473,7 @@ msgstr "Sortierung"
msgid "Spam"
msgstr "Spam"
-#: config/prefs.php:1224
+#: config/prefs.php:1259
msgid "Spam Reporting"
msgstr "Spam-Meldungen"
@@ -4264,12 +4501,12 @@ msgstr "Status"
msgid "Strip Attachment"
msgstr "Anhang entfernen"
-#: config/prefs.php:715
+#: config/prefs.php:749
msgid "Strip the sender's signature from plaintext replies?"
msgstr "Die Signatur des Absenders bei Text-Antworten entfernen?"
-#: config/prefs.php:1454 lib/Basic/Search.php:75 lib/Compose.php:2751
-#: lib/Contents/View.php:222 lib/Dynamic/Mailbox.php:190
+#: config/prefs.php:1495 lib/Basic/Search.php:75 lib/Compose.php:2753
+#: lib/Contents/View.php:224 lib/Dynamic/Mailbox.php:190
#: lib/Dynamic/Mailbox.php:260 lib/Dynamic/Mailbox.php:497
#: lib/Smartmobile.php:186 templates/dynamic/compose.html.php:144
#: templates/smartmobile/search.html.php:13
@@ -4325,7 +4562,7 @@ msgstr "Zusammenfassung"
msgid "Task Lists"
msgstr "Aufgabenlisten"
-#: lib/Mailbox.php:1686 templates/prefs/acl.html.php:37
+#: lib/Mailbox.php:1689 templates/prefs/acl.html.php:37
#: templates/prefs/acl.html.php:72
msgid "Templates"
msgstr "Vorlagen"
@@ -4334,7 +4571,7 @@ msgstr "Vorlagen"
msgid "Tentatively Accept request"
msgstr "Anfrage vorläufig annehmen"
-#: lib/Mime/Viewer/Itip.php:813
+#: lib/Mime/Viewer/Itip.php:814
msgid "Tentatively Accepted"
msgstr "Vorläufig angenommen"
@@ -4346,14 +4583,29 @@ msgstr "Text"
msgid "Text:"
msgstr "Text:"
+#: templates/prefs/smimeprivatekey.html.php:59
+msgid "The ID of your Certificate Set: %s"
+msgstr "Die ID Ihrer Zertifikate: %s"
+
+#: templates/prefs/smimeprivatekey.html.php:134
+#, php-format
+msgid "The ID of your Sign Certificate Set: %s"
+msgstr "Die ID Ihrer Signatur-Zertifikate: %s"
+
+#: templates/prefs/smimeprivatekey.html.php:61
+#: templates/prefs/smimeprivatekey.html.php:136
+msgid "The ID of your Sign Certificate Set: not set in database"
+msgstr "Die ID Ihrer Signatur-Zertifikate: not set in database"
+
#: lib/Ajax/Application/Handler/Dynamic.php:880
+#: lib/Ajax/Application/Handler/Dynamic.php:890
msgid ""
"The Message Disposition Notification was not sent. This is what the server "
"said"
msgstr ""
"Die Empfangsbestätigung wurde nicht verschickt. Meldung des E-Mail-Servers"
-#: lib/Ajax/Application/Handler/Dynamic.php:889
+#: lib/Ajax/Application/Handler/Dynamic.php:894
msgid "The Message Disposition Notification was sent successfully."
msgstr "Die Empfangsbestätigung wurde erfolgreich verschickt."
@@ -4370,7 +4622,7 @@ msgstr "Die Kalenderdaten sind ungültig"
msgid "The current sent-mail mailbox(es) \"%s\" will be renamed."
msgstr "Aktuelle(r) Ordner für gesendete Nachrichten \"%s\" werden umbenannt."
-#: lib/Mime/Viewer/Pgp.php:300
+#: lib/Mime/Viewer/Pgp.php:301
msgid ""
"The data in this part does not appear to be a valid PGP encrypted message. "
"Error: "
@@ -4378,20 +4630,20 @@ msgstr ""
"Die Daten in diesem Nachrichtenteil scheinen keine gültige PGP-"
"verschlüsselte Nachricht zu sein. Fehler:"
-#: lib/Mime/Viewer/Pgp.php:260
+#: lib/Mime/Viewer/Pgp.php:261
msgid "The data in this part has been compressed via PGP."
msgstr "Die Daten in diesem Nachrichtenteil wurden mit PGP komprimiert."
-#: lib/Mime/Viewer/Pgp.php:313 lib/Mime/Viewer/Pgp.php:417
+#: lib/Mime/Viewer/Pgp.php:314 lib/Mime/Viewer/Pgp.php:418
msgid "The data in this part has been digitally signed via PGP."
msgstr "Die Daten in diesem Nachrichtenteil wurden mit PGP digital signiert."
-#: lib/Mime/Viewer/Smime.php:277
+#: lib/Mime/Viewer/Smime.php:337
msgid "The data in this part has been digitally signed via S/MIME."
msgstr ""
"Die Daten in diesem Nachrichtenteil wurden mit S/MIME digital signiert."
-#: lib/Mime/Viewer/Pgp.php:207
+#: lib/Mime/Viewer/Pgp.php:208
msgid ""
"The data in this part has been encrypted via PGP, however, PGP support is "
"disabled so the message cannot be decrypted."
@@ -4400,19 +4652,19 @@ msgstr ""
"PGP-Unterstützung wurde deaktiviert, so dass die Nachricht nicht "
"entschlüsselt werden kann."
-#: lib/Mime/Viewer/Pgp.php:231 lib/Mime/Viewer/Pgp.php:262
+#: lib/Mime/Viewer/Pgp.php:232 lib/Mime/Viewer/Pgp.php:263
msgid "The data in this part has been encrypted via PGP."
msgstr "Die Daten in diesem Nachrichtenteil wurden mit PGP verschlüsselt."
-#: lib/Mime/Viewer/Smime.php:165
+#: lib/Mime/Viewer/Smime.php:167
msgid "The data in this part has been encrypted via S/MIME."
msgstr "Die Daten in diesem Nachrichtenteil wurden mit S/MIME verschlüsselt."
-#: config/prefs.php:531
+#: config/prefs.php:565
msgid "The default font family to use in the HTML editor."
msgstr "Die Standard-Schriftfamilie für den HTML-Editor."
-#: config/prefs.php:540
+#: config/prefs.php:574
msgid "The default font size to use in the HTML editor (in pixels)."
msgstr "Die Standard-Schriftgröße für den HTML-Editor (in Pixeln)."
@@ -4437,6 +4689,15 @@ msgstr "Der Termin wurde Ihrem Kalender hinzugefügt."
msgid "The event was updated in your calendar."
msgstr "Der Termin wurde in Ihrem Kalender aktualisiert."
+#: lib/Ajax/Application/Handler/SwitchEncryption.php:55
+msgid ""
+"The following key from the address book is used for this identity if you "
+"want to use the address book only (without SMIME-keys):"
+msgstr ""
+"Der folgende Schlüssel aus dem Adressbuch wird für diese Identität "
+"verwendet, wenn Sie nur das Adressbuch verwenden wollen (ohne SMIME-"
+"Schlüssel):"
+
#: lib/Contents.php:626
msgid "The initial portion of this text part is displayed below."
msgstr "Der Anfang dieses Textteils wird weiter unten angezeigt."
@@ -4471,7 +4732,7 @@ msgstr "Der E-Mail-Server ist zur Zeit nicht verfügbar."
msgid "The mailbox \"%s\" is already empty."
msgstr "Der Ordner \"%s\" ist bereits leer."
-#: lib/Mailbox.php:825
+#: lib/Mailbox.php:828
#, php-format
msgid "The mailbox \"%s\" may not be deleted."
msgstr "Der Ordner \"%s\" darf nicht gelöscht werden."
@@ -4481,39 +4742,39 @@ msgstr "Der Ordner \"%s\" darf nicht gelöscht werden."
msgid "The mailbox \"%s\" may not be emptied."
msgstr "Der Ordner \"%s\" darf nicht geleert werden."
-#: lib/Mailbox.php:864
+#: lib/Mailbox.php:867
#, php-format
msgid "The mailbox \"%s\" may not be renamed."
msgstr "Der Ordner \"%s\" darf nicht umbenannt werden."
-#: lib/Mailbox.php:764
+#: lib/Mailbox.php:767
#, php-format
msgid "The mailbox \"%s\" was not created. This is what the server said"
msgstr ""
"Der Ordner \"%s\" konnte nicht erstellt werden. Meldung des E-Mail-Servers"
-#: lib/Mailbox.php:834
+#: lib/Mailbox.php:837
#, php-format
msgid "The mailbox \"%s\" was not deleted. This is what the server said"
msgstr ""
"Der Ordner \"%s\" konnte nicht gelöscht werden. Meldung des E-Mail-Servers"
-#: lib/Mailbox.php:768
+#: lib/Mailbox.php:771
#, php-format
msgid "The mailbox \"%s\" was successfully created."
msgstr "Der Ordner \"%s\" wurde erfolgreich erstellt."
-#: lib/Mailbox.php:831
+#: lib/Mailbox.php:834
#, php-format
msgid "The mailbox \"%s\" was successfully deleted."
msgstr "Der Ordner \"%s\" wurde erfolgreich gelöscht."
-#: lib/Mailbox.php:878
+#: lib/Mailbox.php:881
#, php-format
msgid "The mailbox \"%s\" was successfully renamed to \"%s\"."
msgstr "Der Ordner \"%s\" wurde erfolgreich nach \"%s\" umbenannt."
-#: lib/Mailbox.php:1399
+#: lib/Mailbox.php:1402
#, php-format
msgid "The mailbox %s is already empty."
msgstr "Der Ordner %s ist bereits leer."
@@ -4650,7 +4911,7 @@ msgstr ""
msgid "There are no messages in this mailbox."
msgstr "In diesem Ordner sind keine Nachrichten vorhanden"
-#: lib/Contents/Message.php:697
+#: lib/Contents/Message.php:696
msgid "There are no parts that can be shown inline."
msgstr "Es gibt keine Nachrichtenteile, die direkt angezeigt werden können."
@@ -4678,7 +4939,7 @@ msgstr ""
msgid "There was an error deleting the event: %s"
msgstr "Beim Löschen des Termins ist ein Fehler aufgetreten: %s"
-#: lib/Indices.php:758
+#: lib/Indices.php:756
#, php-format
msgid "There was an error flagging messages in the mailbox \"%s\": %s."
msgstr ""
@@ -4720,7 +4981,7 @@ msgstr ""
"Beim Verschieben der Nachrichten von \"%s\" nach \"%s\" ist ein Fehler "
"aufgetreten. Meldung des E-Mail-Servers"
-#: lib/Compose.php:883
+#: lib/Compose.php:885
#, php-format
msgid "There was an error sending your message: %s"
msgstr "Beim Versenden der Nachricht ist ein Fehler aufgetreten: %s"
@@ -4743,7 +5004,7 @@ msgstr ""
"Beim Aktualisieren des Termins ist ein Fehler aufgetreten: %s Versuchen Sie "
"stattdessen den Termin zu importieren."
-#: lib/Ajax/Imple/ItipRequest.php:158 lib/Mime/Viewer/Itip.php:751
+#: lib/Ajax/Imple/ItipRequest.php:158 lib/Mime/Viewer/Itip.php:752
#, php-format
msgid "There was an error updating the task: %s"
msgstr "Beim Aktualisieren der Aufgabe ist ein Fehler aufgetreten: %s"
@@ -4761,7 +5022,7 @@ msgstr "Diese Aktion wird nicht unterstützt."
msgid "This audio file is reported to be %s in length."
msgstr "Diese Audio-Datei ist %s lang."
-#: lib/Mime/Viewer/Pgp.php:440
+#: lib/Mime/Viewer/Pgp.php:441
msgid "This digitally signed message is broken."
msgstr "Diese digital signierte Nachricht ist defekt."
@@ -4843,7 +5104,7 @@ msgstr "Dieser Nachrichtenteil enhält keine Daten."
msgid "This video file is reported to be %s in length."
msgstr "Diese Video-Datei ist %s lang."
-#: config/prefs.php:1456 lib/Dynamic/Mailbox.php:261
+#: config/prefs.php:1497 lib/Dynamic/Mailbox.php:261
msgid "Thread"
msgstr "Thema"
@@ -4863,8 +5124,8 @@ msgstr "Sortieren nach Thema"
msgid "Thread View"
msgstr "Themenansicht"
-#: lib/Basic/Contacts.php:97 lib/Basic/Search.php:63 lib/Compose.php:2755
-#: lib/Contents/View.php:220 lib/Dynamic/Mailbox.php:185
+#: lib/Basic/Contacts.php:97 lib/Basic/Search.php:63 lib/Compose.php:2757
+#: lib/Contents/View.php:222 lib/Dynamic/Mailbox.php:185
#: lib/Dynamic/Mailbox.php:259 lib/Smartmobile.php:187
#: templates/contacts/contacts.html.php:34
#: templates/dynamic/compose.html.php:114
@@ -4873,7 +5134,7 @@ msgstr "Themenansicht"
msgid "To"
msgstr "An"
-#: config/prefs.php:1453
+#: config/prefs.php:1494
msgid "To Address"
msgstr "Empfängeradresse"
@@ -4901,7 +5162,7 @@ msgstr "An:"
msgid "Today, %s %s"
msgstr "Heute, %s %s"
-#: config/prefs.php:548
+#: config/prefs.php:582
msgid "Top"
msgstr "Oben"
@@ -4909,7 +5170,7 @@ msgstr "Oben"
msgid "Total"
msgstr "Insgesamt"
-#: lib/Mailbox.php:1721 lib/Mailbox.php:1803
+#: lib/Mailbox.php:1724 lib/Mailbox.php:1806
msgid "Trash"
msgstr "Papierkorb"
@@ -4947,7 +5208,7 @@ msgstr "Unbekannte Empfänger"
msgid "Unhandled component of type: %s"
msgstr "Nicht verarbeitete Komponente des Typs: %s"
-#: lib/Mime/Viewer/Itip.php:860 lib/Pgp.php:831 lib/Pgp.php:832 lib/Pgp.php:833
+#: lib/Mime/Viewer/Itip.php:861 lib/Pgp.php:832 lib/Pgp.php:833 lib/Pgp.php:834
msgid "Unknown"
msgstr "Unbekannt"
@@ -4963,13 +5224,13 @@ msgstr "Unbekannte Besprechung"
msgid "Unknown Sender"
msgstr "Unbekannter Absender"
-#: lib/Mime/Viewer/Itip.php:768
+#: lib/Mime/Viewer/Itip.php:769
msgid "Unknown Task"
msgstr "Unbekannte Aufgabe"
#: lib/Prefs/Special/PgpPrivateKey.php:65
-#: lib/Prefs/Special/SmimePrivateKey.php:113
-#: lib/Prefs/Special/SmimePrivateKey.php:115
+#: lib/Prefs/Special/SmimePrivateKey.php:304
+#: lib/Prefs/Special/SmimePrivateKey.php:306
msgid "Unload Passphrase"
msgstr "Passwort \"vergessen\""
@@ -4982,6 +5243,14 @@ msgstr "Markierung entfernen"
msgid "Unseen"
msgstr "Nicht gelesen"
+#: templates/prefs/smimeprivatekey.html.php:97
+msgid "Unset Personal Certificate"
+msgstr "Persönliches Zertifikat zurücksetzen"
+
+#: templates/prefs/smimeprivatekey.html.php:171
+msgid "Unset Secondary Certificate"
+msgstr "Sekundäres Zertifikat zurücksetzen"
+
#: lib/Dynamic/Mailbox.php:366
msgid "Unsubscribe"
msgstr "Ausblenden"
@@ -5000,7 +5269,7 @@ msgstr "Alle Unterordner von %s ausblenden?"
msgid "Update in my calendar"
msgstr "In meinem Kalendar aktualisieren"
-#: lib/Mime/Viewer/Itip.php:375 lib/Mime/Viewer/Itip.php:754
+#: lib/Mime/Viewer/Itip.php:375 lib/Mime/Viewer/Itip.php:755
msgid "Update respondent status"
msgstr "Status der Teilnehmer aktualisieren"
@@ -5009,6 +5278,10 @@ msgid "Update this event on my calendar"
msgstr "Diesen Termin in meinem Kalendar aktualisieren"
#: templates/pgp/import_key.html.php:37
+#: templates/smime/import_extra_key.html.php:11
+#: templates/smime/import_extra_key.html.php:43
+#: templates/smime/import_identity_key.html.php:11
+#: templates/smime/import_identity_key.html.php:43
#: templates/smime/import_personal_key.html.php:11
#: templates/smime/import_personal_key.html.php:43
#: templates/smime/import_public_key.html.php:22
@@ -5016,7 +5289,7 @@ msgid "Upload"
msgstr "Hochladen"
#: lib/Ajax/Application/Handler/ComposeAttach.php:94
-#: lib/Ajax/Application/Handler/Dynamic.php:1088
+#: lib/Ajax/Application/Handler/Dynamic.php:1093
msgid "Uploading attachments has been disabled on this server."
msgstr "Das Hochladen von Anhängen wurde auf diesem System deaktiviert."
@@ -5028,7 +5301,7 @@ msgstr "Hochladen..."
msgid "Use Default Value"
msgstr "Standardwert verwenden"
-#: config/prefs.php:1518
+#: config/prefs.php:1559
msgid "Use IMAP mailbox subscriptions?"
msgstr "IMAP Ordnerabonnement benutzen?"
@@ -5049,7 +5322,7 @@ msgstr "Falls verfügbar"
msgid "Use secure connection?"
msgstr "Sichere Verbindung benutzen?"
-#: config/prefs.php:686
+#: config/prefs.php:720
msgid "Use the charset of the original message when replying?"
msgstr "Beim Antworten den Zeichensatz der beantworteten Nachricht verwenden?"
@@ -5085,11 +5358,13 @@ msgstr "Vertikales Layout"
msgid "Video"
msgstr "Video"
-#: lib/Prefs/Special/SmimePrivateKey.php:97
-#: lib/Prefs/Special/SmimePrivateKey.php:146
+#: lib/Prefs/Special/SmimePrivateKey.php:246
+#: lib/Prefs/Special/SmimePrivateKey.php:338
#: templates/prefs/pgpprivatekey.html.php:21
#: templates/prefs/pgpprivatekey.html.php:35
#: templates/prefs/pgppublickey.html.php:20
+#: templates/prefs/smimeprivatekey.html.php:233
+#: templates/prefs/smimeprivatekey.html.php:240
#: templates/prefs/smimepublickey.html.php:22
msgid "View"
msgstr "Anzeigen"
@@ -5099,8 +5374,13 @@ msgstr "Anzeigen"
msgid "View %s"
msgstr "%s anzeigen"
+#: lib/Prefs/SwitchHandler.php:34
+#, php-format
+msgid "View %s Public Info"
+msgstr "Siehe %s Public Info"
+
#: lib/Prefs/Special/PgpPublicKey.php:77
-#: lib/Prefs/Special/SmimePublicKey.php:75
+#: lib/Prefs/Special/SmimePublicKey.php:77 lib/Prefs/SwitchHandler.php:33
#, php-format
msgid "View %s Public Key"
msgstr "Öffentlichen %s Schlüssel anzeigen"
@@ -5121,7 +5401,7 @@ msgstr "HTML-Daten in einem neuem Fenster anzeigen."
msgid "View Message"
msgstr "Nachricht anzeigen"
-#: lib/Mime/Viewer/Pdf.php:154
+#: lib/Mime/Viewer/Pdf.php:146
msgid "View PDF File"
msgstr "PDF-Datei anzeigen"
@@ -5129,7 +5409,7 @@ msgstr "PDF-Datei anzeigen"
msgid "View Personal Private Key"
msgstr "Persönlichen privaten Schlüssel anzeigen"
-#: lib/Prefs/Special/SmimePrivateKey.php:94
+#: lib/Prefs/Special/SmimePrivateKey.php:243
msgid "View Personal Public Certificate"
msgstr "Persönliches öffentliches Zertifikat anzeigen"
@@ -5137,11 +5417,11 @@ msgstr "Persönliches öffentliches Zertifikat anzeigen"
msgid "View Personal Public Key"
msgstr "Persönlichen öffentlichen Schlüssel anzeigen"
-#: lib/Prefs/Special/SmimePrivateKey.php:143
+#: lib/Prefs/Special/SmimePrivateKey.php:335
msgid "View Secondary Personal Private Key"
msgstr "Zweiten persönlichen privaten Schlüssel anzeigen"
-#: lib/Prefs/Special/SmimePrivateKey.php:93
+#: lib/Prefs/Special/SmimePrivateKey.php:242
msgid "View Secondary Personal Public Certificate"
msgstr "Zweites persönliches öffentliches Zertifikat anzeigen"
@@ -5154,7 +5434,7 @@ msgstr "Nachrichtenquelltext anzeigen"
msgid "View Thread"
msgstr "Thema Anzeigen"
-#: lib/Mime/Viewer/Smime.php:333
+#: lib/Mime/Viewer/Smime.php:393
msgid "View certificate details"
msgstr "Zertifikatdetails anzeigen"
@@ -5171,7 +5451,7 @@ msgstr "Details der abgewiesenen Nachricht anzeigen."
msgid "View event"
msgstr "Termin anzeigen"
-#: lib/Mime/Viewer/Pgp.php:381
+#: lib/Mime/Viewer/Pgp.php:382
msgid "View key details."
msgstr "Schlüsseldetails anzeigen."
@@ -5187,7 +5467,7 @@ msgstr "Aufgabe anzeigen"
msgid "View the text of the original sent message."
msgstr "Text der ursprünglich gesendeten Nachricht anzeigen."
-#: config/prefs.php:970
+#: config/prefs.php:1005
msgid "Viewing"
msgstr "Anzeige"
@@ -5215,7 +5495,7 @@ msgstr "Virtueller Ordner \"%s\" erfolgreich gespeichert."
msgid "Virtual Folder: %s"
msgstr "Virtueller Ordner: %s"
-#: lib/Dynamic/Mailbox.php:276 lib/Mailbox.php:1647
+#: lib/Dynamic/Mailbox.php:276 lib/Mailbox.php:1650
#: templates/flist/flist.html.php:27
msgid "Virtual Folders"
msgstr "Virtuelle Ordner"
@@ -5232,7 +5512,7 @@ msgstr "Virtueller Papierkorb"
msgid "Warning"
msgstr "Warnung"
-#: config/prefs.php:596
+#: config/prefs.php:630
msgid ""
"What language(s) do you prefer replies to your messages to be in? (Hold down "
"the CTRL key when clicking to add multiple languages)"
@@ -5240,19 +5520,19 @@ msgstr ""
"In welchen Sprachen möchten Sie gerne Ihre E-Mail-Nachrichten erhalten? "
"(Halten Sie die Strg-Taste gedrückt um mehrere auszuwählen)"
-#: config/prefs.php:1272
+#: config/prefs.php:1307
msgid "What to do with messages after they have been reported as innocent?"
msgstr ""
"Was soll mit Nachrichten geschehen, nachdem sie als kein Spam gemeldet "
"worden sind?"
-#: config/prefs.php:1251
+#: config/prefs.php:1286
msgid "What to do with messages after they have been reported as spam?"
msgstr ""
"Was soll mit Nachrichten geschehen, nachdem sie als Spam gemeldet worden "
"sind?"
-#: config/prefs.php:753
+#: config/prefs.php:787
msgid ""
"When forwarding a message in the body text, should the same format as the "
"original message be used?"
@@ -5260,21 +5540,21 @@ msgstr ""
"Soll beim Weiterleiten einer Nachricht das gleiche Nachrichtenformat wie bei "
"der Originalnachricht verwendet werden?"
-#: config/prefs.php:1440
+#: config/prefs.php:1481
msgid "When opening a mailbox for the first time, where do you want to start?"
msgstr "Was soll angezeigt werden, wenn Sie einen Ordner das erste Mal öffnen?"
-#: config/prefs.php:682
+#: config/prefs.php:716
msgid "When replying, use the same format as the original message?"
msgstr ""
"Beim Beantworten einer Nachricht das Nachrichtenformat der Originalnachricht "
"verwenden?"
-#: config/prefs.php:551
+#: config/prefs.php:585
msgid "Where should the cursor be located in the compose text area by default?"
msgstr "Wo soll die Schreibmarke im Nachrichtenfeld positioniert werden?"
-#: config/prefs.php:1079
+#: config/prefs.php:1114
msgid "Which message parts do you want to display in the summary?"
msgstr "Welche Nachrichtenteile sollen in der Übersicht angezeigt werden?"
@@ -5290,7 +5570,7 @@ msgstr "Schreiben"
msgid "Years"
msgstr "Jahre"
-#: config/prefs.php:584 config/prefs.php:829 config/prefs.php:1529
+#: config/prefs.php:618 config/prefs.php:863 config/prefs.php:1570
msgid "Yes"
msgstr "Ja"
@@ -5308,16 +5588,16 @@ msgstr "Gestern, %s %s"
msgid "You are"
msgstr "Sie"
-#: lib/Mailbox.php:737
+#: lib/Mailbox.php:740
msgid "You are not allowed to create mailboxes."
msgstr "Sie dürfen keine Ordner erstellen."
-#: lib/Mailbox.php:745
+#: lib/Mailbox.php:748
#, php-format
msgid "You are not allowed to create more than %d mailboxes."
msgstr "Sie dürfen nicht mehr als %d Ordner erstellen."
-#: lib/Compose.php:1432
+#: lib/Compose.php:1434
#, php-format
msgid ""
"You are not allowed to send messages to more than %d recipient within %d "
@@ -5332,7 +5612,7 @@ msgstr[1] ""
"Sie dürfen Nachrichten nicht an mehr als %d Empfänger in %d Stunden "
"verschicken."
-#: lib/Compose.php:1447
+#: lib/Compose.php:1449
#, php-format
msgid "You are not allowed to send messages to more than %d recipient."
msgid_plural "You are not allowed to send messages to more than %d recipients."
@@ -5351,7 +5631,7 @@ msgstr ""
msgid "You are replying to a mailing list"
msgstr "Sie antworten an eine Mailingliste"
-#: lib/Mailbox.php:907
+#: lib/Mailbox.php:910
#, php-format
msgid "You cannot unsubscribe from \"%s\"."
msgstr "Sie können \"%s\" nicht ausblenden."
@@ -5379,7 +5659,7 @@ msgid_plural "You have %d new mail messages in %s."
msgstr[0] "Sie haben %d neue Nachricht in %s."
msgstr[1] "Sie haben %d neue Nachrichten in %s."
-#: config/prefs.php:1145 config/prefs.php:1170
+#: config/prefs.php:1180 config/prefs.php:1205
msgid ""
"You have activated move to Trash but no Trash mailbox is defined. You will "
"be unable to delete messages until you set a Trash mailbox in the "
@@ -5418,21 +5698,21 @@ msgstr "Sie dürfen \"%s\" nicht löschen."
msgid "You may not rename \"%s\"."
msgstr "Sie dürfen \"%s\" nicht umbenennen."
-#: lib/Mime/Viewer/Pgp.php:273
+#: lib/Mime/Viewer/Pgp.php:274
msgid ""
"You must enter the passphrase for your PGP private key to view this message."
msgstr ""
"Sie müssen das Passwort für Ihren privaten PGP-Schlüssel angeben, um diese "
"Nachricht lesen zu können."
-#: lib/Mime/Viewer/Smime.php:193
+#: lib/Mime/Viewer/Smime.php:195
msgid ""
"You must enter the passphrase for your S/MIME private key to view this data."
msgstr ""
"Sie müssen das Passwort für Ihren privaten S/MIME-Schlüssel angeben, um "
"diese Daten lesen zu können."
-#: lib/Mime/Viewer/Pgp.php:241
+#: lib/Mime/Viewer/Pgp.php:242
msgid "You must enter the passphrase used to encrypt this message to view it."
msgstr ""
"Sie müssen das Passwort angeben, das zur Verschlüsselung dieser Nachricht "
@@ -5470,35 +5750,35 @@ msgstr "Sie haben auf diese Nachricht am %s geantwortet."
msgid "You replied to this message via the mailing list on %s."
msgstr "Sie haben am %s über die Mailingliste auf diese Nachricht geantwortet."
-#: lib/Mailbox.php:917
+#: lib/Mailbox.php:920
#, php-format
msgid "You were not subscribed to \"%s\". Here is what the server said"
msgstr ""
"Beim Einblenden des Ordners \"%s\" ist ein Fehler aufgetreten. Meldung des E-"
"Mail-Servers"
-#: lib/Mailbox.php:919
+#: lib/Mailbox.php:922
#, php-format
msgid "You were not unsubscribed from \"%s\". Here is what the server said"
msgstr ""
"Der Ordner \"%s\" wurde nicht ausgeblendet. Die Meldung des E-Mail-Servers"
-#: lib/Mailbox.php:955
+#: lib/Mailbox.php:958
#, php-format
msgid "You were successfully subscribed to \"%s\" and all subfolders."
msgstr "\"%s\" und alle Unterordner wurden erfolgreich eingeblendet."
-#: lib/Mailbox.php:933
+#: lib/Mailbox.php:936
#, php-format
msgid "You were successfully subscribed to \"%s\"."
msgstr "\"%s\" wurde erfolgreich eingeblendet."
-#: lib/Mailbox.php:956
+#: lib/Mailbox.php:959
#, php-format
msgid "You were successfully unsubscribed from \"%s\" and all subfolders."
msgstr "\"%s\" und alle Unterordner wurden erfolgreich ausgeblendet."
-#: lib/Mailbox.php:934
+#: lib/Mailbox.php:937
#, php-format
msgid "You were successfully unsubscribed from \"%s\"."
msgstr "\"%s\" wurde erfolgreich ausgeblendet."
@@ -5515,7 +5795,7 @@ msgstr "Ihr Name"
msgid "Your PGP Public/Private Keys"
msgstr "Ihre öffentlichen/privaten PGP-Schlüssel"
-#: templates/prefs/smimeprivatekey.html.php:30
+#: templates/prefs/smimeprivatekey.html.php:77
msgid "Your Private Certificate"
msgstr "Ihr privates Zertifikat"
@@ -5523,7 +5803,7 @@ msgstr "Ihr privates Zertifikat"
msgid "Your Private Key"
msgstr "Ihr privater Schlüssel"
-#: templates/prefs/smimeprivatekey.html.php:21
+#: templates/prefs/smimeprivatekey.html.php:68
msgid "Your Public Certificate"
msgstr "Ihr öffentliches Zertifikat"
@@ -5536,28 +5816,28 @@ msgid "Your Reply-to: address: (optional)"
msgstr ""
"Ihre E-Mail-Adresse für das Feld "Antwort an:" (optional)"
-#: templates/prefs/smimeprivatekey.html.php:4
+#: templates/prefs/smimeprivatekey.html.php:18
msgid "Your S/MIME Personal Certificate"
msgstr "Ihr persönliches S/MIME-Zertifikat"
-#: templates/prefs/smimeprivatekey.html.php:15
+#: templates/prefs/smimeprivatekey.html.php:35
#, php-format
msgid "Your S/MIME Personal Certificate has expired on %s at %s."
msgstr "Ihr persönliches S/MIME-Zertifikat ist am %s um %s abgelaufen."
-#: templates/prefs/smimeprivatekey.html.php:67
+#: templates/prefs/smimeprivatekey.html.php:151
msgid "Your Secondary Private Certificate"
msgstr "Ihr zweites privates Zertifikat"
-#: templates/prefs/smimeprivatekey.html.php:58
+#: templates/prefs/smimeprivatekey.html.php:142
msgid "Your Secondary Public Certificate"
msgstr "Ihr zweites öffentliches Zertifikat"
-#: templates/prefs/smimeprivatekey.html.php:47
+#: templates/prefs/smimeprivatekey.html.php:105
msgid "Your Secondary S/MIME Personal Certificate"
msgstr "Ihr zweites persönliches S/MIME-Zertifikat"
-#: templates/prefs/smimeprivatekey.html.php:52
+#: templates/prefs/smimeprivatekey.html.php:110
#, php-format
msgid "Your Secondary S/MIME Personal Certificate has expired on %s at %s."
msgstr "Ihr zweites persönliches S/MIME-Zertifikat ist am %s um %s abgelaufen."
@@ -5570,7 +5850,7 @@ msgstr ""
"eintragen)"
#: lib/Ajax/Application/Handler/ComposeAttach.php:57
-#: lib/Ajax/Application/Handler/Dynamic.php:1091
+#: lib/Ajax/Application/Handler/Dynamic.php:1096
msgid ""
"Your attachment was not uploaded. Most likely, the file exceeded the maximum "
"size allowed by the server configuration."
@@ -5593,6 +5873,10 @@ msgstr ""
"Die Sicherheitseinstellungen Ihres Browsers verhindern direkten Zugriff auf "
"die Zwischenablage."
+#: templates/prefs/smimeidentities.html.php:5
+msgid "Your currently set (default) identity: "
+msgstr "Gesetzte (standard) Identität: "
+
#: templates/prefs/encrypt.html.php:3
msgid "Your default encryption method for sending messages:"
msgstr ""
@@ -5636,7 +5920,7 @@ msgstr ""
msgid "Your signature:"
msgstr "Ihre Signatur:"
-#: lib/Compose.php:2721 lib/Contents/Message.php:443 lib/Mailbox/Ui.php:119
+#: lib/Compose.php:2723 lib/Contents/Message.php:443 lib/Mailbox/Ui.php:119
#: lib/Prefs/AttribText.php:103
msgid "[No Subject]"
msgstr "[Kein Betreff]"
@@ -5646,7 +5930,7 @@ msgstr "[Kein Betreff]"
msgid "[Part stripped: Original part type: %s, name: %s]"
msgstr "[Teil entfernt: Ehemaliger Typ des Nachrichtenteils: %s, Name: %s]"
-#: lib/Compose.php:3167
+#: lib/Compose.php:3169
msgid "[Truncated Text]"
msgstr "[Text gekürzt]"
@@ -5663,7 +5947,7 @@ msgid_plural "and %d more mailboxes"
msgstr[0] "und %d weiteren Ordner"
msgstr[1] "und %d weiteren Ordnern"
-#: lib/Compose.php:3336
+#: lib/Compose.php:3343
msgid "attachment"
msgstr "Anhang"
@@ -5689,11 +5973,15 @@ msgstr "\"%s\" markiert"
msgid "from"
msgstr "von"
-#: lib/Basic/Pgp.php:47 lib/Basic/Pgp.php:78 lib/Basic/Smime.php:291
+#: lib/Basic/Pgp.php:47 lib/Basic/Pgp.php:78 lib/Basic/Smime.php:409
msgid "key"
msgstr "Schlüssel"
-#: lib/Compose.php:3045
+#: templates/prefs/smimeidentities.html.php:12
+msgid "link to preferences"
+msgstr "Link zu Einstellungen"
+
+#: lib/Compose.php:3047
#, php-format
msgid "links will expire on %s"
msgstr "Links laufen am %s ab"
@@ -5727,18 +6015,18 @@ msgstr "Nachrichten ohne Anhänge"
msgid "months"
msgstr "Monaten"
-#: lib/Compose.php:1244
+#: lib/Compose.php:1246
msgid "name"
msgstr "Name"
#: lib/Search/Element/Autogenerated.php:61 lib/Search/Element/Bulk.php:53
#: lib/Search/Element/Header.php:57 lib/Search/Element/Mailinglist.php:52
-#: lib/Search/Element/Personal.php:70 lib/Search/Element/Recipient.php:69
+#: lib/Search/Element/Personal.php:71 lib/Search/Element/Recipient.php:70
#: lib/Search/Element/Text.php:62
msgid "not"
msgstr "nicht"
-#: lib/Contents/View.php:67
+#: lib/Contents/View.php:69
#, php-format
msgid "part %s"
msgstr "Teil %s"
diff --git a/locale/el/LC_MESSAGES/imp.mo b/locale/el/LC_MESSAGES/imp.mo
index 406bffbc8..3eb568c88 100644
Binary files a/locale/el/LC_MESSAGES/imp.mo and b/locale/el/LC_MESSAGES/imp.mo differ
diff --git a/locale/el/LC_MESSAGES/imp.po b/locale/el/LC_MESSAGES/imp.po
index 316dd5230..df444b8cd 100644
--- a/locale/el/LC_MESSAGES/imp.po
+++ b/locale/el/LC_MESSAGES/imp.po
@@ -47,11 +47,6 @@ msgstr "\"%s\" δεν ειδοποιείται πλέον για νέα μηνύ
msgid "\"%s\" mailbox now polled for new mail."
msgstr "\"%s\" ειδοποιείται πλέον για νέα μηνύματα mail."
-#: lib/Quota.php:49
-#, php-format
-msgid "%.0f %s"
-msgstr ""
-
#: lib/Quota.php:50
#, php-format
msgid "%.0f%% of %.0f %s"
@@ -74,8 +69,7 @@ msgstr[1] "%d Συνημμένα"
msgid "%d Attachments"
msgstr "%d Συνημμένα"
-#: lib/Basic/Mailbox.php:397 lib/Basic/Mailbox.php:398
-#: lib/Basic/Thread.php:180
+#: lib/Basic/Mailbox.php:397 lib/Basic/Mailbox.php:398 lib/Basic/Thread.php:180
#, php-format
msgid "%d Messages"
msgstr "%d Μηνύματα"
@@ -989,9 +983,8 @@ msgstr "δεν είναι δυνατή η επισύναψη των πληρο
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:69
-#: templates/minimal/compose.html.php:59
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:69
-#: templates/prefs/remote.html.php:80
+#: templates/minimal/compose.html.php:59 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:69 templates/prefs/remote.html.php:80
#: templates/saveimage/saveimage.html.php:20
#: templates/search/search.html.php:103
#: templates/smartmobile/compose.html.php:54
@@ -1655,8 +1648,8 @@ msgid "Delegated"
msgstr "Μεταβιβάσθηκε"
#: lib/Dynamic/Compose/Common.php:186 lib/Dynamic/Mailbox.php:327
-#: lib/Dynamic/Mailbox.php:358 lib/Imap/Acl.php:196
-#: lib/Minimal/Message.php:218 templates/basic/folders/actions.html.php:26
+#: lib/Dynamic/Mailbox.php:358 lib/Imap/Acl.php:196 lib/Minimal/Message.php:218
+#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:30 templates/prefs/acl.html.php:43
#: templates/prefs/acl.html.php:78 templates/prefs/pgppublickey.html.php:22
@@ -2204,8 +2197,7 @@ msgid "Expand Headers"
msgstr "Επέκταση Κεφαλίδων"
#: lib/Minimal/Compose.php:107 lib/Minimal/Compose.php:162
-#: templates/minimal/compose.html.php:58
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:58 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "Ανάπτυξη Ονομάτων"
@@ -2344,8 +2336,7 @@ msgstr "Φάκελος"
msgid "Folder Actions"
msgstr "Ενέργειες Φακέλων"
-#: lib/Basic/Folders.php:274
-#: templates/basic/folders/folders_confirm.html.php:6
+#: lib/Basic/Folders.php:274 templates/basic/folders/folders_confirm.html.php:6
msgid "Folder Actions - Confirmation"
msgstr "Ενέργειες Φακέλου - Επιβεβαίωση"
@@ -2431,8 +2422,7 @@ msgstr "Από"
#: templates/basic/search/search-basic.html.php:16
#: templates/dynamic/compose.html.php:102
#: templates/dynamic/mailbox.html.php:128 templates/minimal/mailbox.html.php:9
-#: templates/smartmobile/search.html.php:11
-#: templates/thread/thread.html.php:21
+#: templates/smartmobile/search.html.php:11 templates/thread/thread.html.php:21
msgid "From"
msgstr "Από"
@@ -2580,10 +2570,6 @@ msgstr ""
"Δεν υπάρχει κανένα προσωπικό ιδιωτικό κλειδί και συνεπώς το μήνυμα δεν "
"μπορεί να αποκρυπτογραφηθεί."
-#: templates/prefs/remote.html.php:48
-msgid "IMAP"
-msgstr ""
-
#: templates/prefs/flags.html.php:7
msgid "Icon"
msgstr "Εικονίδιο"
@@ -2773,10 +2759,6 @@ msgstr "Μη έγκυρο κλειδί"
msgid "Invalid passphrase entered."
msgstr "Δώσατε λανθασμένο κωδικό."
-#: lib/Flag/Imap/Junk.php:42
-msgid "Junk"
-msgstr ""
-
#: templates/basic/compose/compose.html.php:332
msgid "KB"
msgstr "KB"
@@ -3292,10 +3274,9 @@ msgstr "Νέα Σήμανση"
msgid "New Mail"
msgstr "Νέο Μήνυμα"
-#: lib/Application.php:430 lib/Basic/Compose.php:207
-#: lib/Basic/Compose.php:1152 lib/Compose.php:2209 lib/Dynamic/Base.php:157
-#: lib/Dynamic/Compose.php:78 lib/Dynamic/Mailbox.php:109
-#: lib/Minimal/Base.php:88 lib/Smartmobile.php:177
+#: lib/Application.php:430 lib/Basic/Compose.php:207 lib/Basic/Compose.php:1152
+#: lib/Compose.php:2209 lib/Dynamic/Base.php:157 lib/Dynamic/Compose.php:78
+#: lib/Dynamic/Mailbox.php:109 lib/Minimal/Base.php:88 lib/Smartmobile.php:177
#: templates/dynamic/mailbox.html.php:54
#: templates/smartmobile/compose.html.php:2
#: templates/smartmobile/folders.html.php:13
@@ -3651,10 +3632,6 @@ msgstr "PGP: Χρειάζεται κωδικό για το προσωπικό ι
msgid "PGP: Need passphrase to encrypt your message with."
msgstr "PGP: Χρειάζεται κωδικό για την κρυπτογράφηση του μηνύματος."
-#: templates/prefs/remote.html.php:49
-msgid "POP3"
-msgstr ""
-
#: templates/basic/mailbox/navbar.html.php:17
msgid "Page"
msgstr "Σελίδα "
@@ -4032,13 +4009,12 @@ msgstr "Επανάληψη"
msgid "Redirec_t"
msgstr "Ανακατεύθυνση"
-#: lib/Basic/Compose.php:421 lib/Basic/Mailbox.php:685
-#: lib/Dynamic/Base.php:180 lib/Dynamic/Compose.php:148
-#: lib/Minimal/Compose.php:234 lib/Minimal/Compose.php:237
-#: lib/Minimal/Message.php:244 lib/Notification/Event/Status.php:32
+#: lib/Basic/Compose.php:421 lib/Basic/Mailbox.php:685 lib/Dynamic/Base.php:180
+#: lib/Dynamic/Compose.php:148 lib/Minimal/Compose.php:234
+#: lib/Minimal/Compose.php:237 lib/Minimal/Message.php:244
+#: lib/Notification/Event/Status.php:32
#: templates/basic/compose/redirect.html.php:51
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:55
msgid "Redirect"
msgid_plural "Redirect Messages"
@@ -4227,8 +4203,7 @@ msgid "Required Participant"
msgstr "Ζητήθηκε Συμμετέχων"
#: templates/basic/search/search-basic.html.php:50
-#: templates/contacts/contacts.html.php:25
-#: templates/search/search.html.php:106
+#: templates/contacts/contacts.html.php:25 templates/search/search.html.php:106
msgid "Reset"
msgstr "Καθαρισμός Φόρμας"
@@ -4941,8 +4916,7 @@ msgstr "Θέμα"
#: lib/Dynamic/Mailbox.php:188 lib/Dynamic/Mailbox.php:258
#: lib/Dynamic/Mailbox.php:499 lib/Message/Ui.php:39 lib/Smartmobile.php:181
#: templates/basic/search/search-basic.html.php:18
-#: templates/dynamic/compose.html.php:147
-#: templates/minimal/mailbox.html.php:10
+#: templates/dynamic/compose.html.php:147 templates/minimal/mailbox.html.php:10
#: templates/smartmobile/search.html.php:13
msgid "Subject"
msgstr "Θέμα"
@@ -5072,15 +5046,6 @@ msgstr "Κείμενο:"
msgid "The From: column of the message should be linked:"
msgstr "Η στήλη Από: του μηνύματος πρέπει να συνδεθεί:"
-#: lib/Mime/Viewer/Appledouble.php:97
-msgid "The Macintosh resource fork"
-msgstr ""
-
-#: lib/Mime/Viewer/Appledouble.php:97
-#, php-format
-msgid "The Macintosh resource fork can be downloaded %s."
-msgstr ""
-
#: lib/Ajax/Application/Handler/Dynamic.php:852
msgid ""
"The Message Disposition Notification was not sent. This is what the server "
@@ -5420,8 +5385,7 @@ msgstr "Οι πληροφορίες ελεύθερου/απασχολημένο
msgid "There are no alternative parts that can be displayed inline."
msgstr "Δεν υπάρχουν εναλλακτικά μέρη που μπορούν να εμφανισθούν."
-#: lib/Dynamic/Mailbox.php:561
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:561 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "Δεν υπάρχουν μηνύματα σε αυτό το γραμματοκιβώτιο."
@@ -5624,10 +5588,9 @@ msgstr "Ταξινόμηση Νήματος"
msgid "Thread View"
msgstr "Προβολή νημάτων"
-#: lib/Basic/Contacts.php:111 lib/Basic/Mailbox.php:725
-#: lib/Basic/Search.php:65 lib/Compose.php:2599 lib/Dynamic/Mailbox.php:183
-#: lib/Dynamic/Mailbox.php:257 lib/Message/Ui.php:35
-#: templates/basic/compose/redirect.html.php:30
+#: lib/Basic/Contacts.php:111 lib/Basic/Mailbox.php:725 lib/Basic/Search.php:65
+#: lib/Compose.php:2599 lib/Dynamic/Mailbox.php:183 lib/Dynamic/Mailbox.php:257
+#: lib/Message/Ui.php:35 templates/basic/compose/redirect.html.php:30
#: templates/contacts/contacts.html.php:40
#: templates/dynamic/compose.html.php:114
#: templates/dynamic/mailbox.html.php:136 templates/thread/thread.html.php:21
diff --git a/locale/en/LC_MESSAGES/imp.po b/locale/en/LC_MESSAGES/imp.po
new file mode 100644
index 000000000..2db4806ac
--- /dev/null
+++ b/locale/en/LC_MESSAGES/imp.po
@@ -0,0 +1,5899 @@
+# English translations for IMP package.
+# Copyright (C) 2023 Horde LLC (http://www.horde.org/)
+# This file is distributed under the same license as the IMP package.
+# Automatically generated, 2023.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: IMP\n"
+"Report-Msgid-Bugs-To: dev@lists.horde.org\n"
+"POT-Creation-Date: 2023-05-30 09:47+0000\n"
+"PO-Revision-Date: 2023-05-30 09:47+0000\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: i18n@lists.horde.org\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: lib/Notification/Handler/Decorator/NewmailNotify.php:93
+msgid " and "
+msgstr " and "
+
+#: lib/LoginTasks/Task/RenameSentmailMonthly.php:66
+#, php-format
+msgid "\"%s\" mailbox being renamed at the start of the month."
+msgstr "\"%s\" mailbox being renamed at the start of the month."
+
+#: lib/Ajax/Application/Handler/Dynamic.php:493
+#, php-format
+msgid "\"%s\" mailbox no longer polled for new mail."
+msgstr "\"%s\" mailbox no longer polled for new mail."
+
+#: lib/Ajax/Application/Handler/Dynamic.php:490
+#, php-format
+msgid "\"%s\" mailbox now polled for new mail."
+msgstr "\"%s\" mailbox now polled for new mail."
+
+#: lib/Quota.php:49
+#, php-format
+msgid "%.0f %s"
+msgstr "%.0f %s"
+
+#: lib/Quota.php:50
+#, php-format
+msgid "%.0f%% of %.0f %s"
+msgstr "%.0f%% of %.0f %s"
+
+#: lib/Mbox/Size.php:51
+#, php-format
+msgid "%.2fMB"
+msgstr "%.2fMB"
+
+#: lib/Contents/Message.php:188
+#, php-format
+msgid "%d Attachment"
+msgid_plural "%d Attachments"
+msgstr[0] "%d Attachment"
+msgstr[1] "%d Attachments"
+
+#: lib/Basic/Thread.php:165
+#, php-format
+msgid "%d Messages"
+msgstr "%d Messages"
+
+#: lib/Ajax/Imple/VcardImport.php:101
+#, php-format
+msgid "%d contact was successfully added to your address book."
+msgid_plural "%d contacts were successfully added to your address book."
+msgstr[0] "%d contact was successfully added to your address book."
+msgstr[1] "%d contacts were successfully added to your address book."
+
+#: lib/Ajax/Application/Handler/Dynamic.php:846
+#, php-format
+msgid "%d message was purged from \"%s\"."
+msgid_plural "%d messages were purged from \"%s\"."
+msgstr[0] "%d message was purged from \"%s\"."
+msgstr[1] "%d messages were purged from \"%s\"."
+
+#: lib/Dynamic/Mailbox.php:542 lib/Smartmobile.php:178
+#, php-format
+msgid "%d messages"
+msgstr "%d messages"
+
+#: lib/Spam.php:182
+#, php-format
+msgid "%d messages have been deleted."
+msgstr "%d messages have been deleted."
+
+#: lib/Spam.php:128
+#, php-format
+msgid "%d messages have been reported as innocent."
+msgstr "%d messages have been reported as innocent."
+
+#: lib/Spam.php:132
+#, php-format
+msgid "%d messages have been reported as spam."
+msgstr "%d messages have been reported as spam."
+
+#: lib/Mime/Viewer/Audio.php:60 lib/Mime/Viewer/Video.php:82
+#, php-format
+msgid "%d minute"
+msgstr "%d minute"
+
+#: lib/Mime/Viewer/Audio.php:60 lib/Mime/Viewer/Video.php:82
+#, php-format
+msgid "%d minutes"
+msgstr "%d minutes"
+
+#: lib/Block/Newmail.php:103
+#, php-format
+msgid "%d more unseen message..."
+msgid_plural "%d more unseen messages..."
+msgstr[0] "%d more unseen message..."
+msgstr[1] "%d more unseen messages..."
+
+#: lib/Block/Summary.php:94
+#, php-format
+msgid "%d new"
+msgid_plural "%d new"
+msgstr[0] "%d new"
+msgstr[1] "%d new"
+
+#: lib/Dynamic/Compose/Common.php:263
+#, php-format
+msgid "%d recipients"
+msgstr "%d recipients"
+
+#: lib/Mime/Viewer/Audio.php:67 lib/Mime/Viewer/Video.php:89
+#, php-format
+msgid "%d second"
+msgstr "%d second"
+
+#: lib/Mime/Viewer/Audio.php:67 lib/Mime/Viewer/Video.php:89
+#, php-format
+msgid "%d seconds"
+msgstr "%d seconds"
+
+#: lib/Search/Element/Header.php:57
+#, php-format
+msgid "%s (Header) for \"%s\""
+msgstr "%s (Header) for \"%s\""
+
+#: lib/Contents.php:785 lib/IMP.php:77
+#, php-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: lib/Contents.php:784 lib/IMP.php:76
+#, php-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#: lib/Ajax/Addresses.php:169
+#, php-format
+msgid "%s [%d addresses]"
+msgstr "%s [%d addresses]"
+
+#: lib/Search/Element/Text.php:62
+#, php-format
+msgid "%s for '%s'"
+msgstr "%s for '%s'"
+
+#: lib/Mime/Viewer/Itip.php:396
+#, php-format
+msgid "%s has cancelled \"%s\"."
+msgstr "%s has cancelled \"%s\"."
+
+#: lib/Mime/Viewer/Itip.php:390
+#, php-format
+msgid "%s has cancelled an instance of the recurring \"%s\"."
+msgstr "%s has cancelled an instance of the recurring \"%s\"."
+
+#: lib/Mime/Viewer/Itip.php:385
+#, php-format
+msgid "%s has cancelled multiple instances of the recurring \"%s\"."
+msgstr "%s has cancelled multiple instances of the recurring \"%s\"."
+
+#: lib/Mime/Viewer/Itip.php:208
+#, php-format
+msgid "%s has replied to a free/busy request."
+msgstr "%s has replied to a free/busy request."
+
+#: lib/Mime/Viewer/Itip.php:737
+#, php-format
+msgid "%s has replied to the assignment of task \"%s\"."
+msgstr "%s has replied to the assignment of task \"%s\"."
+
+#: lib/Mime/Viewer/Itip.php:358
+#, php-format
+msgid "%s has replied to the invitation to \"%s\"."
+msgstr "%s has replied to the invitation to \"%s\"."
+
+#: lib/Mime/Viewer/Itip.php:199
+#, php-format
+msgid "%s has sent you free/busy information."
+msgstr "%s has sent you free/busy information."
+
+#: lib/Dynamic/Mailbox.php:543
+#, php-format
+msgid "%s is: %s."
+msgstr "%s is: %s."
+
+#: lib/Spam/Email.php:131
+#, php-format
+msgid "%s report from %s"
+msgstr "%s report from %s"
+
+#: lib/Mime/Viewer/Itip.php:204
+#, php-format
+msgid "%s requests your free/busy information."
+msgstr "%s requests your free/busy information."
+
+#: lib/Mime/Viewer/Itip.php:324
+#, php-format
+msgid "%s requests your presence at \"%s\"."
+msgstr "%s requests your presence at \"%s\"."
+
+#: lib/Dynamic/Mailbox.php:556
+#, php-format
+msgid "%s selected."
+msgstr "%s selected."
+
+#: lib/Mime/Viewer/Itip.php:311
+#, php-format
+msgid "%s wants to notify you about changes in \"%s\"."
+msgstr "%s wants to notify you about changes in \"%s\"."
+
+#: lib/Indices/Copy/Notepad.php:112 lib/Indices/Copy/Tasklist.php:113
+#, php-format
+msgid "%s was successfully added to \"%s\"."
+msgstr "%s was successfully added to \"%s\"."
+
+#: lib/Ajax/Application/Handler/Dynamic.php:642
+#, php-format
+msgid "%s was successfully added to your address book."
+msgstr "%s was successfully added to your address book."
+
+#: lib/Mime/Viewer/Itip.php:346
+#, php-format
+msgid "%s wishes to amend \"%s\"."
+msgstr "%s wishes to amend \"%s\"."
+
+#: lib/Mime/Viewer/Itip.php:728
+#, php-format
+msgid "%s wishes to assign you \"%s\"."
+msgstr "%s wishes to assign you \"%s\"."
+
+#: lib/Mime/Viewer/Itip.php:300 lib/Mime/Viewer/Itip.php:314
+#: lib/Mime/Viewer/Itip.php:721
+#, php-format
+msgid "%s wishes to make you aware of \"%s\"."
+msgstr "%s wishes to make you aware of \"%s\"."
+
+#: lib/Mime/Viewer/Itip.php:353
+#, php-format
+msgid "%s wishes to receive the latest information about \"%s\"."
+msgstr "%s wishes to receive the latest information about \"%s\"."
+
+#: lib/Compose.php:2717
+#, php-format
+msgid "%u Forwarded Messages"
+msgstr "%u Forwarded Messages"
+
+#: lib/Dynamic/Mailbox.php:541 lib/Smartmobile.php:177
+msgid "1 message"
+msgstr "1 message"
+
+#: lib/Mime/Viewer/Pgp.php:365
+msgid "A PGP Public Key is attached to the message."
+msgstr "A PGP Public Key is attached to the message."
+
+#: lib/Mime/Viewer/Mdn.php:122
+msgid ""
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+msgstr ""
+"A message you have sent has resulted in a return notification from the "
+"recipient."
+
+#: lib/Compose.php:3529
+msgid ""
+"A message you were composing when your session expired has been recovered. "
+"You may resume composing your message by going to your Drafts mailbox."
+msgstr ""
+"A message you were composing when your session expired has been recovered. "
+"You may resume composing your message by going to your Drafts mailbox."
+
+#: lib/Prefs/Special/Acl.php:172
+#, php-format
+msgid "ACL for \"%s\" successfully created for the mailbox \"%s\"."
+msgstr "ACL for \"%s\" successfully created for the mailbox \"%s\"."
+
+#: lib/Prefs/Special/Acl.php:197
+#, php-format
+msgid "ACL rights for \"%s\" updated for the mailbox \"%s\"."
+msgstr "ACL rights for \"%s\" updated for the mailbox \"%s\"."
+
+#: lib/Mime/Viewer/Itip.php:730
+msgid "Accept and add this to my tasklist"
+msgstr "Accept and add this to my tasklist"
+
+#: lib/Mime/Viewer/Itip.php:335
+msgid "Accept and add to my calendar"
+msgstr "Accept and add to my calendar"
+
+#: lib/Mime/Viewer/Itip.php:332
+msgid "Accept and update in my calendar"
+msgstr "Accept and update in my calendar"
+
+#: lib/Mime/Viewer/Itip.php:339
+msgid "Accept request"
+msgstr "Accept request"
+
+#: lib/Mime/Viewer/Itip.php:808
+msgid "Accepted"
+msgstr "Accepted"
+
+#: templates/dynamic/compose.html.php:24
+msgid "Accesskey Ctrl-Enter"
+msgstr "Accesskey Ctrl-Enter"
+
+#: templates/dynamic/compose.html.php:19
+msgid "Accesskey Esc"
+msgstr "Accesskey Esc"
+
+#: lib/Prefs/Special/Remote.php:147
+#, php-format
+msgid "Account \"%s\" added."
+msgstr "Account \"%s\" added."
+
+#: lib/Prefs/Special/Remote.php:159
+#, php-format
+msgid "Account \"%s\" deleted."
+msgstr "Account \"%s\" deleted."
+
+#: templates/itip/action.html.php:121 templates/itip/action.html.php:123
+#: templates/prefs/searches.html.php:10 templates/prefs/searches.html.php:49
+msgid "Actions"
+msgstr "Actions"
+
+#: lib/Basic/Thread.php:255 lib/Basic/Thread.php:280
+#, php-format
+msgid "Add %s to my Address Book"
+msgstr "Add %s to my Address Book"
+
+#: templates/prefs/remote.html.php:111
+msgid "Add Account"
+msgstr "Add Account"
+
+#: templates/dynamic/compose.html.php:158
+#: templates/smartmobile/compose.html.php:86
+msgid "Add Attachment"
+msgstr "Add Attachment"
+
+#: templates/dynamic/compose.html.php:140
+msgid "Add Bcc"
+msgstr "Add Bcc"
+
+#: templates/dynamic/compose.html.php:139
+msgid "Add Cc"
+msgstr "Add Cc"
+
+#: templates/search/search.html.php:33
+msgid "Add OR clause"
+msgstr "Add OR clause"
+
+#: config/prefs.php:1432
+msgid "Add a \"Printed By\" header to the top of printed messages?"
+msgstr "Add a \"Printed By\" header to the top of printed messages?"
+
+#: templates/search/search.html.php:31
+msgid "Add search criteria"
+msgstr "Add search criteria"
+
+#: lib/Ajax/Application/Handler/Search.php:86
+msgid "Add search mailbox"
+msgstr "Add search mailbox"
+
+#: templates/contacts/contacts.html.php:43
+msgid "Add these addresses by clicking OK"
+msgstr "Add these addresses by clicking OK"
+
+#: lib/Mime/Viewer/Itip.php:302
+msgid "Add this to my calendar"
+msgstr "Add this to my calendar"
+
+#: lib/Mime/Viewer/Itip.php:723 lib/Mime/Viewer/Itip.php:731
+msgid "Add this to my tasklist"
+msgstr "Add this to my tasklist"
+
+#: lib/Dynamic/Base.php:155
+msgid "Add to Address Book"
+msgstr "Add to Address Book"
+
+#: lib/Mime/Viewer/Itip.php:336
+msgid "Add to my calendar"
+msgstr "Add to my calendar"
+
+#: lib/Ajax/Application/Handler/ComposeAttach.php:84
+#, php-format
+msgid "Added \"%s\" as an attachment."
+msgstr "Added \"%s\" as an attachment."
+
+#: lib/Prefs/Special/Flag.php:105
+#, php-format
+msgid "Added flag \"%s\"."
+msgstr "Added flag \"%s\"."
+
+#: config/prefs.php:1123
+msgid ""
+"Additional headers to display when viewing: (enter each header on a new "
+"line)"
+msgstr ""
+"Additional headers to display when viewing: (enter each header on a new "
+"line)"
+
+#: lib/Basic/Contacts.php:113 templates/contacts/contacts.html.php:4
+msgid "Address Book"
+msgstr "Address Book"
+
+#: config/prefs.php:919
+msgid "Address Books"
+msgstr "Address Books"
+
+#: lib/Compose.php:2586
+msgid "Address rejected by the sending mail server."
+msgstr "Address rejected by the sending mail server."
+
+#: config/prefs.php:50
+msgid ""
+"Addresses to BCC all messages: (optional, enter each address on a new "
+"line)"
+msgstr ""
+"Addresses to BCC all messages: (optional, enter each address on a new "
+"line)"
+
+#: config/prefs.php:43
+msgid ""
+"Addresses to explicitly tie to this identity: (optional, enter each "
+"address on a new line)"
+msgstr ""
+"Addresses to explicitly tie to this identity: (optional, enter each "
+"address on a new line)"
+
+#: lib/Imap/Acl.php:184
+msgid "Administer"
+msgstr "Administer"
+
+#: lib/Dynamic/Mailbox.php:499
+msgid "Advanced Search..."
+msgstr "Advanced Search..."
+
+#: lib/Search/Element/Daterange.php:99
+#, php-format
+msgid "After '%s'"
+msgstr "After '%s'"
+
+#: lib/Prefs/Special/SmimeAliasHandler.php:29
+msgid "Alias has been set."
+msgstr "Alias has been set."
+
+#: templates/prefs/smimeprivatekey.html.php:223
+msgid "Alias: "
+msgstr "Alias: "
+
+#: templates/prefs/acl.html.php:45 templates/prefs/acl.html.php:80
+msgid "All"
+msgstr "All"
+
+#: lib/Search/Query.php:284 templates/search/search-all.html.php:2
+msgid "All Mailboxes"
+msgstr "All Mailboxes"
+
+#: lib/Dynamic/Mailbox.php:469
+msgid "All Parts"
+msgstr "All Parts"
+
+#: lib/LoginTasks/Task/PurgeSentmail.php:93
+#, php-format
+msgid ""
+"All messages in the mailbox \"%s\" older than %s days will be permanently "
+"deleted."
+msgid_plural ""
+"All messages in the mailboxes \"%s\" older than %s days will be permanently "
+"deleted."
+msgstr[0] ""
+"All messages in the mailbox \"%s\" older than %s days will be permanently "
+"deleted."
+msgstr[1] ""
+"All messages in the mailboxes \"%s\" older than %s days will be permanently "
+"deleted."
+
+#: lib/Dynamic/Mailbox.php:533
+msgid ""
+"All messages in this mailbox will be downloaded into the format that you "
+"choose. Depending on the size of the mailbox, this action may take awhile."
+msgstr ""
+"All messages in this mailbox will be downloaded into the format that you "
+"choose. Depending on the size of the mailbox, this action may take awhile."
+
+#: lib/LoginTasks/Task/PurgeSpam.php:82 lib/LoginTasks/Task/PurgeTrash.php:82
+#, php-format
+msgid ""
+"All messages in your \"%s\" mailbox older than %s days will be permanently "
+"deleted."
+msgstr ""
+"All messages in your \"%s\" mailbox older than %s days will be permanently "
+"deleted."
+
+#: lib/LoginTasks/Task/DeleteAttachmentsMonthly.php:56
+#, php-format
+msgid "All old linked attachments more than %s months old will be deleted."
+msgstr "All old linked attachments more than %s months old will be deleted."
+
+#: lib/LoginTasks/Task/DeleteSentmailMonthly.php:93
+#, php-format
+msgid "All old sent-mail mailboxes more than %s months old will be deleted."
+msgstr "All old sent-mail mailboxes more than %s months old will be deleted."
+
+#: lib/Prefs/Special/Acl.php:207
+#, php-format
+msgid "All rights on mailbox \"%s\" successfully removed for \"%s\"."
+msgstr "All rights on mailbox \"%s\" successfully removed for \"%s\"."
+
+#: config/prefs.php:1025
+msgid "Allow attachments to be stripped from messages?"
+msgstr "Allow attachments to be stripped from messages?"
+
+#: config/prefs.php:314
+msgid "Allow filter rules to be applied in any mailbox?"
+msgstr "Allow filter rules to be applied in any mailbox?"
+
+#: lib/Perms.php:40
+msgid "Allow folder navigation?"
+msgstr "Allow folder navigation?"
+
+#: lib/Perms.php:50
+msgid "Allow mailbox creation?"
+msgstr "Allow mailbox creation?"
+
+#: lib/Perms.php:45
+msgid "Allow remote account access?"
+msgstr "Allow remote account access?"
+
+#: lib/Perms.php:103
+msgid "Allow viewing of message source?"
+msgstr "Allow viewing of message source?"
+
+#: config/prefs.php:1132
+msgid "Always prompt"
+msgstr "Always prompt"
+
+#: lib/Ajax/Application/Handler/ImageUnblock.php:48
+#, php-format
+msgid "Always showing images in messages sent by %s."
+msgstr "Always showing images in messages sent by %s."
+
+#: lib/Indices.php:646
+msgid "An error occured while attempting to strip the part."
+msgstr "An error occured while attempting to strip the part."
+
+#: lib/Indices/Copy/Notepad.php:94
+msgid "An unknown error occured while creating the new note."
+msgstr "An unknown error occured while creating the new note."
+
+#: lib/Indices/Copy/Tasklist.php:96
+msgid "An unknown error occured while creating the new task."
+msgstr "An unknown error occured while creating the new task."
+
+#: lib/Mime/Viewer/Itip.php:709
+msgid "An unknown person"
+msgstr "An unknown person"
+
+#: lib/Flag/Imap/Answered.php:41
+msgid "Answered"
+msgstr "Answered"
+
+#: templates/prefs/acl.html.php:42 templates/prefs/acl.html.php:77
+msgid "Append"
+msgstr "Append"
+
+#: lib/Dynamic/Mailbox.php:488
+msgid "Apply Filters"
+msgstr "Apply Filters"
+
+#: config/prefs.php:294
+msgid "Apply filter rules upon logging on?"
+msgstr "Apply filter rules upon logging on?"
+
+#: config/prefs.php:304
+msgid "Apply filter rules whenever Inbox is displayed?"
+msgstr "Apply filter rules whenever Inbox is displayed?"
+
+#: lib/Prefs/Special/Remote.php:46
+msgid "Are you sure you want to delete this account?"
+msgstr "Are you sure you want to delete this account?"
+
+#: lib/Prefs/Special/Searches.php:109
+msgid "Are you sure you want to delete this filter?"
+msgstr "Are you sure you want to delete this filter?"
+
+#: lib/Prefs/Special/Flag.php:53
+msgid "Are you sure you want to delete this flag?"
+msgstr "Are you sure you want to delete this flag?"
+
+#: lib/Prefs/Special/PgpPublicKey.php:79
+#: lib/Prefs/Special/SmimePublicKey.php:79
+msgid "Are you sure you want to delete this public key?"
+msgstr "Are you sure you want to delete this public key?"
+
+#: lib/Prefs/Special/Searches.php:110
+msgid "Are you sure you want to delete this virtual folder?"
+msgstr "Are you sure you want to delete this virtual folder?"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:342
+msgid ""
+"Are you sure you want to delete your keypair? (Please click \"Unset Personal "
+"Certificate\" if you want to save the key in the keystore. Non-saved "
+"certificates will be removed permanently.)"
+msgstr ""
+"Are you sure you want to delete your keypair? (Please click \"Unset Personal "
+"Certificate\" if you want to save the key in the keystore. Non-saved "
+"certificates will be removed permanently.)"
+
+#: lib/Prefs/Special/PgpPrivateKey.php:79
+msgid ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+msgstr ""
+"Are you sure you want to delete your keypair? (This is NOT recommended!)"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:343
+msgid ""
+"Are you sure you want to delete your keypair? You are trying to delete a "
+"keypair from the keystore. If you continue these certificates will be "
+"removed permanently. "
+msgstr ""
+"Are you sure you want to delete your keypair? You are trying to delete a "
+"keypair from the keystore. If you continue these certificates will be "
+"removed permanently. "
+
+#: lib/Prefs/Special/SmimePrivateKey.php:345
+msgid ""
+"Are you sure you want to set a new keypair? Currently set keypair will be "
+"moved to the database. New emails will be encrypted with the newly set "
+"keypair."
+msgstr ""
+"Are you sure you want to set a new keypair? Currently set keypair will be "
+"moved to the database. New emails will be encrypted with the newly set "
+"keypair."
+
+#: lib/Prefs/Special/SmimePrivateKey.php:347
+msgid ""
+"Are you sure you want to set a singing key? Current key for singing will be "
+"moved to the database. New emails will be singing with the newly set singing "
+"key."
+msgstr ""
+"Are you sure you want to set a singing key? Current key for singing will be "
+"moved to the database. New emails will be singing with the newly set singing "
+"key."
+
+#: lib/Prefs/Special/SmimePrivateKey.php:344
+msgid ""
+"Are you sure you want to unset your keypair? You will need to add another "
+"key to be able to send encrypted mails."
+msgstr ""
+"Are you sure you want to unset your keypair? You will need to add another "
+"key to be able to send encrypted mails."
+
+#: lib/Prefs/Special/SmimePrivateKey.php:346
+msgid "Are you sure you want to unset your secondary keypair?"
+msgstr "Are you sure you want to unset your secondary keypair?"
+
+#: lib/Dynamic/Base.php:194
+msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
+msgstr "Are you sure you wish to PERMANENTLY delete this attachment?"
+
+#: templates/smartmobile/message.html.php:89
+msgid "Are you sure you wish to report this message as innocent?"
+msgstr "Are you sure you wish to report this message as innocent?"
+
+#: templates/smartmobile/message.html.php:104
+msgid "Are you sure you wish to report this message as spam?"
+msgstr "Are you sure you wish to report this message as spam?"
+
+#: lib/Dynamic/Mailbox.php:236
+msgid "Arrival Time"
+msgstr "Arrival Time"
+
+#: config/prefs.php:1526
+msgid "Arrival time on server"
+msgstr "Arrival time on server"
+
+#: lib/Dynamic/Base.php:171
+msgid "As Attachment"
+msgstr "As Attachment"
+
+#: config/prefs.php:775
+msgid "As attachment"
+msgstr "As attachment"
+
+#: config/prefs.php:777
+msgid "As both body text and an attachment"
+msgstr "As both body text and an attachment"
+
+#: config/prefs.php:1506
+msgid "Ascending"
+msgstr "Ascending"
+
+#: lib/Ajax/Application/Handler/Dynamic.php:823
+msgid "At least one attachment could not be deleted."
+msgstr "At least one attachment could not be deleted."
+
+#: lib/Dynamic/Compose/Common.php:182
+msgid "Attach Personal PGP Public Key"
+msgstr "Attach Personal PGP Public Key"
+
+#: lib/Dynamic/Compose/Common.php:186
+msgid "Attach contact information"
+msgstr "Attach contact information"
+
+#: lib/Compose.php:3462
+#, php-format
+msgid ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+msgstr ""
+"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
+
+#: lib/Compose.php:3462
+msgid "Attached file exceeds the attachment size limits. File NOT attached."
+msgstr "Attached file exceeds the attachment size limits. File NOT attached."
+
+#: lib/Ajax/Imple/ItipRequest.php:397
+msgid "Attached is a reply to a calendar request you sent."
+msgstr "Attached is a reply to a calendar request you sent."
+
+#: attachment.php:53
+#, php-format
+msgid "Attachment %s deleted."
+msgstr "Attachment %s deleted."
+
+#: lib/Dynamic/Base.php:173
+msgid "Attachment and Body Text"
+msgstr "Attachment and Body Text"
+
+#: attachment.php:55
+msgid "Attachment doesn't exist."
+msgstr "Attachment doesn't exist."
+
+#: lib/Compose.php:1246
+msgid "Attachment stripped: Original attachment type"
+msgstr "Attachment stripped: Original attachment type"
+
+#: lib/Ajax/Application/Handler/Dynamic.php:938 lib/Dynamic/Message.php:57
+msgid "Attachment successfully stripped."
+msgstr "Attachment successfully stripped."
+
+#: lib/Compose.php:3050 lib/Compose.php:3057
+#: templates/smartmobile/compose.html.php:79
+msgid "Attachments"
+msgstr "Attachments"
+
+#: templates/smartmobile/compose.html.php:70
+msgid "Attachments..."
+msgstr "Attachments..."
+
+#: templates/itip/action.html.php:74
+msgid "Attendees"
+msgstr "Attendees"
+
+#: lib/Contents.php:1279
+msgid "Audio"
+msgstr "Audio"
+
+#: lib/Ajax/Application/Handler/RemotePrefs.php:78
+msgid ""
+"Automatic configuration of the account failed. Please check your settings or "
+"otherwise use the Advanced Setup to manually enter the remote server "
+"configuration."
+msgstr ""
+"Automatic configuration of the account failed. Please check your settings or "
+"otherwise use the Advanced Setup to manually enter the remote server "
+"configuration."
+
+#: lib/Ajax/Application/Handler/RemotePrefs.php:70
+msgid "Automatic configuration of the account was successful."
+msgstr "Automatic configuration of the account was successful."
+
+#: lib/Search/Element/Autogenerated.php:61
+#: lib/Search/Filter/Autogenerated.php:30
+msgid "Automatically Generated Messages"
+msgstr "Automatically Generated Messages"
+
+#: lib/Mime/Viewer/Itip.php:887
+msgid "Awaiting Response"
+msgstr "Awaiting Response"
+
+#: lib/Basic/Thread.php:142
+msgid "Back to Multiple Message View Index"
+msgstr "Back to Multiple Message View Index"
+
+#: lib/Perms.php:116
+msgid "Backends"
+msgstr "Backends"
+
+#: lib/Basic/Contacts.php:99 lib/Basic/Search.php:71 lib/Contents/View.php:227
+#: templates/contacts/contacts.html.php:37
+#: templates/dynamic/compose.html.php:130
+#: templates/dynamic/mailbox.html.php:154 templates/dynamic/message.html.php:96
+msgid "Bcc"
+msgstr "Bcc"
+
+#: lib/Search/Element/Daterange.php:106
+#, php-format
+msgid "Before '%s'"
+msgstr "Before '%s'"
+
+#: lib/Search/Element/Daterange.php:119
+#, php-format
+msgid "Between '%s' and '%s'"
+msgstr "Between '%s' and '%s'"
+
+#: lib/Mime/Viewer/Html.php:180
+msgid ""
+"Beware of following any links in it or of providing the sender with any "
+"personal information."
+msgstr ""
+"Beware of following any links in it or of providing the sender with any "
+"personal information."
+
+#: lib/Dynamic/Mailbox.php:326 lib/Dynamic/Mailbox.php:433
+msgid "Blacklist"
+msgstr "Blacklist"
+
+#: config/prefs.php:1046
+msgid ""
+"Block images in messages unless they are specifically requested to be loaded?"
+msgstr ""
+"Block images in messages unless they are specifically requested to be loaded?"
+
+#: lib/Basic/Search.php:83 lib/Dynamic/Mailbox.php:494
+#: templates/smartmobile/search.html.php:10
+msgid "Body"
+msgstr "Body"
+
+#: config/prefs.php:583
+msgid "Bottom"
+msgstr "Bottom"
+
+#: lib/Basic/Search.php:371
+msgid "Built-in Filters cannot be edited."
+msgstr "Built-in Filters cannot be edited."
+
+#: lib/Basic/Search.php:364
+msgid "Built-in Virtual Folders cannot be edited."
+msgstr "Built-in Virtual Folders cannot be edited."
+
+#: lib/Basic/Search.php:116 lib/Search/Element/Bulk.php:53
+#: lib/Search/Filter/Bulk.php:30
+msgid "Bulk Messages"
+msgstr "Bulk Messages"
+
+#: lib/Compose.php:1892
+#, php-format
+msgid "Can't attach contact information: %s"
+msgstr "Can't attach contact information: %s"
+
+#: templates/contacts/contacts.html.php:58 templates/pgp/import_key.html.php:43
+#: templates/prefs/remote.html.php:80 templates/saveimage/saveimage.html.php:20
+#: templates/search/search.html.php:102
+#: templates/smartmobile/compose.html.php:54
+#: templates/smartmobile/copymove.html.php:20
+#: templates/smartmobile/message.html.php:91
+#: templates/smartmobile/message.html.php:106
+#: templates/smime/import_extra_key.html.php:63
+#: templates/smime/import_identity_key.html.php:63
+#: templates/smime/import_personal_key.html.php:63
+#: templates/smime/import_public_key.html.php:29
+msgid "Cancel"
+msgstr "Cancel"
+
+#: lib/Dynamic/Compose/Common.php:251
+msgid ""
+"Cancelling this message will permanently discard its contents and will "
+"delete auto-saved drafts.\n"
+"Are you sure you want to do this?"
+msgstr ""
+"Cancelling this message will permanently discard its contents and will "
+"delete auto-saved drafts.\n"
+"Are you sure you want to do this?"
+
+#: lib/Mime/Viewer/Partial.php:99
+#, php-format
+msgid ""
+"Cannot display message - found only %s of %s parts of this message in the "
+"current mailbox."
+msgstr ""
+"Cannot display message - found only %s of %s parts of this message in the "
+"current mailbox."
+
+#: lib/Mime/Viewer/Plain.php:171
+msgid "Cannot display message text."
+msgstr "Cannot display message text."
+
+#: lib/Basic/Smime.php:235
+msgid ""
+"Cannot import secondary personal S/MIME certificates without primary "
+"certificates."
+msgstr ""
+"Cannot import secondary personal S/MIME certificates without primary "
+"certificates."
+
+#: lib/Indices.php:376
+msgid "Cannot move messages to Trash - no Trash mailbox set in preferences."
+msgstr "Cannot move messages to Trash - no Trash mailbox set in preferences."
+
+#: lib/Ajax/Imple/ItipRequest.php:72
+msgid "Cannot retrieve calendar data from message."
+msgstr "Cannot retrieve calendar data from message."
+
+#: lib/Ajax/Imple/ImportEncryptKey.php:69
+msgid "Cannot retrieve public key from message."
+msgstr "Cannot retrieve public key from message."
+
+#: lib/Ajax/Imple/VcardImport.php:71
+msgid "Cannot retrieve vCard data from message."
+msgstr "Cannot retrieve vCard data from message."
+
+#: lib/Indices.php:539
+msgid "Cannot strip the part as the mailbox is read-only."
+msgstr "Cannot strip the part as the mailbox is read-only."
+
+#: lib/Basic/Contacts.php:98 lib/Basic/Search.php:67 lib/Compose.php:2761
+#: lib/Contents/View.php:223 lib/Smartmobile.php:172
+#: templates/contacts/contacts.html.php:36
+#: templates/dynamic/compose.html.php:122
+#: templates/dynamic/mailbox.html.php:150 templates/dynamic/message.html.php:92
+msgid "Cc"
+msgstr "Cc"
+
+#: templates/smartmobile/compose.html.php:36
+msgid "Cc:"
+msgstr "Cc:"
+
+#: lib/Mime/Viewer/Itip.php:869
+msgid "Chair Person"
+msgstr "Chair Person"
+
+#: templates/prefs/acl.html.php:95
+msgid "Change"
+msgstr "Change"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:179
+msgid "Change SMIME preferences here"
+msgstr "Change SMIME preferences here"
+
+#: config/prefs.php:1448
+msgid ""
+"Change display preferences for viewing the listing of messages in a mailbox."
+msgstr ""
+"Change display preferences for viewing the listing of messages in a mailbox."
+
+#: config/prefs.php:1549
+msgid "Change folder navigation display preferences."
+msgstr "Change folder navigation display preferences."
+
+#: config/prefs.php:16
+msgid ""
+"Change the name, address, and signature that people see when they read and "
+"reply to your email."
+msgstr ""
+"Change the name, address, and signature that people see when they read and "
+"reply to your email."
+
+#: lib/Dynamic/Compose/Common.php:288 templates/dynamic/compose.html.php:35
+msgid "Check Spelling"
+msgstr "Check Spelling"
+
+#: lib/Dynamic/Mailbox.php:363
+msgid "Check for New Mail"
+msgstr "Check for New Mail"
+
+#: config/prefs.php:396
+msgid "Check for valid recipient PGP public keys while replying?"
+msgstr "Check for valid recipient PGP public keys while replying?"
+
+#: templates/dynamic/mailbox.html.php:277
+msgid "Check mailbox for new mail?"
+msgstr "Check mailbox for new mail?"
+
+#: config/prefs.php:538
+msgid "Check spelling before sending a message?"
+msgstr "Check spelling before sending a message?"
+
+#: lib/Dynamic/Compose/Common.php:289 lib/Dynamic/Mailbox.php:528
+msgid "Checking..."
+msgstr "Checking..."
+
+#: config/prefs.php:985
+msgid "Choose the address book to use when adding addresses."
+msgstr "Choose the address book to use when adding addresses."
+
+#: templates/dynamic/mailbox.html.php:60 templates/dynamic/mailbox.html.php:68
+msgid "Clear Search"
+msgstr "Clear Search"
+
+#: lib/Dynamic/Mailbox.php:444
+msgid "Clear Sort"
+msgstr "Clear Sort"
+
+#: lib/Compose/LinkedAttachment.php:221
+msgid "Click on the following link to permanently delete the attachment:"
+msgstr "Click on the following link to permanently delete the attachment:"
+
+#: templates/dynamic/compose.html.php:182
+msgid "Click this box to add the original message as an attachment."
+msgstr "Click this box to add the original message as an attachment."
+
+#: templates/dynamic/compose.html.php:179
+msgid "Click this box to add the original message text to the body."
+msgstr "Click this box to add the original message text to the body."
+
+#: lib/Script/Package/Imp.php:33
+msgid "Click to always show images from this sender."
+msgstr "Click to always show images from this sender."
+
+#: lib/Mime/Viewer/Images.php:165
+msgid ""
+"Click to convert the image file into a format your browser can attempt to "
+"view."
+msgstr ""
+"Click to convert the image file into a format your browser can attempt to "
+"view."
+
+#: lib/Mime/Viewer/Tgz.php:79 lib/Mime/Viewer/Zip.php:89
+msgid "Click to display the file contents."
+msgstr "Click to display the file contents."
+
+#: lib/Contents.php:619
+msgid "Click to download the data."
+msgstr "Click to download the data."
+
+#: lib/Filter.php:144
+#, php-format
+msgid "Click to go to %s management page."
+msgstr "Click to go to %s management page."
+
+#: templates/prefs/mailto.html.php:3
+#, php-format
+msgid "Click to open all mailto: links using %s."
+msgstr "Click to open all mailto: links using %s."
+
+#: lib/Contents/Message.php:165
+msgid "Click to send the notification message."
+msgstr "Click to send the notification message."
+
+#: lib/Mime/Status/RenderIssue/Display.php:63
+msgid "Click to show message part display errors."
+msgstr "Click to show message part display errors."
+
+#: lib/Mime/Viewer/Smime.php:442
+msgid "Click to verify the data."
+msgstr "Click to verify the data."
+
+#: lib/Mime/Viewer/Pgp.php:484
+msgid "Click to verify the message."
+msgstr "Click to verify the message."
+
+#: lib/Mime/Viewer/Html.php:249
+msgid ""
+"Click to view HTML data in new window; it is possible this will allow you to "
+"view the message correctly."
+msgstr ""
+"Click to view HTML data in new window; it is possible this will allow you to "
+"view the message correctly."
+
+#: templates/dynamic/mailbox.html.php:184
+msgid "Click to view the message in a new window."
+msgstr "Click to view the message in a new window."
+
+#: templates/smartmobile/compose.html.php:90
+msgid "Close"
+msgstr "Close"
+
+#: config/prefs.php:821
+msgid "Close the compose window after saving a draft?"
+msgstr "Close the compose window after saving a draft?"
+
+#: lib/Dynamic/Mailbox.php:233 lib/Dynamic/Mailbox.php:295
+#: lib/Dynamic/Mailbox.php:372
+msgid "Collapse All"
+msgstr "Collapse All"
+
+#: templates/dynamic/mailbox.html.php:132
+msgid "Collapse Headers"
+msgstr "Collapse Headers"
+
+#: templates/prefs/flags.html.php:8
+msgid "Color"
+msgstr "Color"
+
+#: lib/Dynamic/Mailbox.php:52 lib/Prefs/Special/Flag.php:64
+msgid "Color Picker"
+msgstr "Color Picker"
+
+#: config/prefs.php:1584
+msgid "Combine all namespaces"
+msgstr "Combine all namespaces"
+
+#: lib/Pgp.php:792 templates/itip/action.html.php:47
+#: templates/prefs/pgpprivatekey.html.php:65
+msgid "Comment"
+msgstr "Comment"
+
+#: lib/Mime/Viewer/Itip.php:820
+msgid "Completed"
+msgstr "Completed"
+
+#: config/prefs.php:518 config/prefs.php:658 config/prefs.php:704
+#: config/prefs.php:761 config/prefs.php:795 config/prefs.php:849
+#: config/prefs.php:918
+msgid "Compose"
+msgstr "Compose"
+
+#: config/prefs.php:659
+msgid "Compose Templates"
+msgstr "Compose Templates"
+
+#: templates/prefs/composetemplates.html.php:3
+msgid "Compose Templates mailbox:"
+msgstr "Compose Templates mailbox:"
+
+#: lib/Dynamic/Compose/Common.php:252
+msgid "Compose action completed. You may now safely close this window."
+msgstr "Compose action completed. You may now safely close this window."
+
+#: config/prefs.php:519
+msgid "Composition"
+msgstr "Composition"
+
+#: config/prefs.php:345
+msgid "Configure PGP encryption support."
+msgstr "Configure PGP encryption support."
+
+#: config/prefs.php:428
+msgid "Configure S/MIME encryption support."
+msgstr "Configure S/MIME encryption support."
+
+#: config/prefs.php:1390
+msgid "Configure flag highlighting."
+msgstr "Configure flag highlighting."
+
+#: config/prefs.php:328
+msgid "Configure how event or meeting requests should be handled."
+msgstr "Configure how event or meeting requests should be handled."
+
+#: config/prefs.php:1006
+msgid "Configure how messages are displayed."
+msgstr "Configure how messages are displayed."
+
+#: config/prefs.php:763
+msgid "Configure how you forward mail."
+msgstr "Configure how you forward mail."
+
+#: config/prefs.php:706
+msgid "Configure how you reply to mail."
+msgstr "Configure how you reply to mail."
+
+#: config/prefs.php:520
+msgid "Configure how you send mail."
+msgstr "Configure how you send mail."
+
+#: config/prefs.php:1424
+msgid "Configure message printing."
+msgstr "Configure message printing."
+
+#: config/prefs.php:165
+msgid "Configure remote mail accounts to display."
+msgstr "Configure remote mail accounts to display."
+
+#: config/prefs.php:1260
+msgid "Configure spam reporting."
+msgstr "Configure spam reporting."
+
+#: lib/Basic/Search.php:120
+msgid "Contains Attachment(s)"
+msgstr "Contains Attachment(s)"
+
+#: templates/mime/compressed.html.php:2
+msgid "Contents of compressed file:"
+msgstr "Contents of compressed file:"
+
+#: config/prefs.php:1343
+msgid ""
+"Control when new mail will be checked for, and whether or not to notify you "
+"when it arrives."
+msgstr ""
+"Control when new mail will be checked for, and whether or not to notify you "
+"when it arrives."
+
+#: lib/Mime/Viewer/Html.php:104
+msgid "Convert HTML data to plain text and view in new window."
+msgstr "Convert HTML data to plain text and view in new window."
+
+#: config/prefs.php:1103
+msgid "Convert textual emoticons into graphical ones?"
+msgstr "Convert textual emoticons into graphical ones?"
+
+#: templates/smartmobile/copymove.html.php:11
+msgid "Copy"
+msgstr "Copy"
+
+#: lib/Dynamic/Mailbox.php:529
+#, php-format
+msgid "Copy %s to %s"
+msgstr "Copy %s to %s"
+
+#: lib/Dynamic/Base.php:156
+msgid "Copy to Clipboard"
+msgstr "Copy to Clipboard"
+
+#: templates/smartmobile/copymove.html.php:3
+#: templates/smartmobile/message.html.php:70
+msgid "Copy/Move"
+msgstr "Copy/Move"
+
+#: lib/Dynamic/Compose/Common.php:254
+#, php-format
+msgid "Could not add %d file(s) to message: only images are supported."
+msgstr "Could not add %d file(s) to message: only images are supported."
+
+#: lib/Imap/Acl.php:100
+#, php-format
+msgid "Could not add rights for user \"%s\" for the mailbox \"%s\"."
+msgstr "Could not add rights for user \"%s\" for the mailbox \"%s\"."
+
+#: lib/Compose.php:3317
+#, php-format
+msgid "Could not attach %s to the message."
+msgstr "Could not attach %s to the message."
+
+#: lib/Ajax/Application/Handler/Remote.php:115
+#, php-format
+msgid "Could not authenticate to %s."
+msgstr "Could not authenticate to %s."
+
+#: lib/Contents/View.php:148
+msgid "Could not auto-determine data type."
+msgstr "Could not auto-determine data type."
+
+#: lib/Mailbox.php:812
+#, php-format
+msgid "Could not delete Virtual Folder \"%s\"."
+msgstr "Could not delete Virtual Folder \"%s\"."
+
+#: lib/Mailbox.php:1375
+#, php-format
+msgid "Could not delete messages from %s. This mailbox is read-only."
+msgstr "Could not delete messages from %s. This mailbox is read-only."
+
+#: lib/Compose/View.php:39 lib/Compose/View.php:54
+msgid "Could not display attachment data."
+msgstr "Could not display attachment data."
+
+#: lib/Ajax/Application/Handler/Remote.php:50
+msgid "Could not find remote server configuration."
+msgstr "Could not find remote server configuration."
+
+#: lib/Basic/Listinfo.php:36 lib/Basic/Saveimage.php:43 lib/Basic/Thread.php:48
+#: lib/Dynamic/Maillog.php:60
+msgid "Could not load message."
+msgstr "Could not load message."
+
+#: lib/Imap.php:902
+msgid ""
+"Could not move all messages between mailboxes, so the original mailbox was "
+"not removed."
+msgstr ""
+"Could not move all messages between mailboxes, so the original mailbox was "
+"not removed."
+
+#: lib/Spam.php:198
+msgid ""
+"Could not move message to spam mailbox - no spam mailbox defined in "
+"preferences."
+msgstr ""
+"Could not move message to spam mailbox - no spam mailbox defined in "
+"preferences."
+
+#: lib/Ajax/Application/Handler/Common.php:698
+msgid "Could not open mailbox."
+msgstr "Could not open mailbox."
+
+#: lib/Dynamic/Compose/Common.php:262
+msgid "Could not paste image as the clipboard data is invalid."
+msgstr "Could not paste image as the clipboard data is invalid."
+
+#: lib/Imap/Acl.php:131
+#, php-format
+msgid "Could not remove rights for user \"%s\" for the mailbox \"%s\"."
+msgstr "Could not remove rights for user \"%s\" for the mailbox \"%s\"."
+
+#: lib/Compose.php:1960 lib/Compose.php:2342 lib/Dynamic/Compose.php:285
+msgid "Could not retrieve message data from the mail server."
+msgstr "Could not retrieve message data from the mail server."
+
+#: lib/Pgp.php:351
+#, php-format
+msgid "Could not retrieve public key for %s."
+msgstr "Could not retrieve public key for %s."
+
+#: lib/Dynamic/Base.php:166 lib/Dynamic/Mailbox.php:328
+msgid "Create Filter"
+msgstr "Create Filter"
+
+#: templates/prefs/pgpprivatekey.html.php:126
+msgid "Create Keys"
+msgstr "Create Keys"
+
+#: lib/Dynamic/Mailbox.php:254 lib/Dynamic/Mailbox.php:291
+#: templates/flist/flist.html.php:11
+msgid "Create Mailbox"
+msgstr "Create Mailbox"
+
+#: templates/dynamic/mailbox.html.php:288
+msgid "Create New Flag..."
+msgstr "Create New Flag..."
+
+#: lib/Dynamic/Mailbox.php:273
+msgid "Create New Template"
+msgstr "Create New Template"
+
+#: lib/Imap/Acl.php:188
+msgid "Create Subfolders/Rename Mailbox"
+msgstr "Create Subfolders/Rename Mailbox"
+
+#: lib/Prefs/Special/Sentmail.php:47
+msgid "Create a new sent-mail mailbox"
+msgstr "Create a new sent-mail mailbox"
+
+#: config/prefs.php:228
+msgid ""
+"Create filtering rules to organize your incoming mail, sort it into "
+"mailboxes, and delete spam."
+msgstr ""
+"Create filtering rules to organize your incoming mail, sort it into "
+"mailboxes, and delete spam."
+
+#: lib/Dynamic/Mailbox.php:530
+msgid "Create mailbox:"
+msgstr "Create mailbox:"
+
+#: config/prefs.php:678
+msgid "Create new Template"
+msgstr "Create new Template"
+
+#: lib/Dynamic/Mailbox.php:226 lib/Dynamic/Mailbox.php:356
+msgid "Create subfolder"
+msgstr "Create subfolder"
+
+#: lib/Dynamic/Mailbox.php:531
+#, php-format
+msgid "Create subfolder of %s:"
+msgstr "Create subfolder of %s:"
+
+#: lib/Imap/Acl.php:187
+msgid "Create subfolders and rename mailbox"
+msgstr "Create subfolders and rename mailbox"
+
+#: lib/Dynamic/Mailbox.php:546
+msgid "Creating New Flag..."
+msgstr "Creating New Flag..."
+
+#: config/prefs.php:1529
+msgid "Criteria to use when sorting by date:"
+msgstr "Criteria to use when sorting by date:"
+
+#: lib/Prefs/Special/Acl.php:75
+#, php-format
+msgid "Current access to %s"
+msgstr "Current access to %s"
+
+#: templates/prefs/smimeprivatekey.html.php:45
+msgid "Current alias for your Certificate Set: "
+msgstr "Current alias for your Certificate Set: "
+
+#: templates/prefs/smimeprivatekey.html.php:120
+#, php-format
+msgid "Current alias for your Certificate Set: %s"
+msgstr "Current alias for your Certificate Set: %s"
+
+#: lib/Basic/Search.php:79
+msgid "Custom Header"
+msgstr "Custom Header"
+
+#: lib/Basic/Search.php:489
+msgid "Custom Header:"
+msgstr "Custom Header:"
+
+#: lib/Dynamic/Compose/Common.php:253
+msgid "Data"
+msgstr "Data"
+
+#: config/prefs.php:1492 lib/Basic/Search.php:91 lib/Compose.php:2741
+#: lib/Contents/View.php:220 lib/Dynamic/Mailbox.php:199
+#: templates/dynamic/mailbox.html.php:138 templates/dynamic/message.html.php:75
+msgid "Date"
+msgstr "Date"
+
+#: lib/Dynamic/Mailbox.php:262
+msgid "Date (Arrival)"
+msgstr "Date (Arrival)"
+
+#: lib/Dynamic/Mailbox.php:263
+msgid "Date (Message)"
+msgstr "Date (Message)"
+
+#: lib/Basic/Search.php:490
+msgid "Date Reset"
+msgstr "Date Reset"
+
+#: lib/Basic/Search.php:491
+msgid "Date Selection"
+msgstr "Date Selection"
+
+#: config/prefs.php:1527
+msgid "Date in message headers"
+msgstr "Date in message headers"
+
+#: templates/search/search.html.php:114
+msgid "Days"
+msgstr "Days"
+
+#: lib/Mime/Viewer/Itip.php:811
+msgid "Declined"
+msgstr "Declined"
+
+#: config/prefs.php:555
+msgid "Default method to compose messages:"
+msgstr "Default method to compose messages:"
+
+#: config/prefs.php:1499
+msgid "Default sorting criteria:"
+msgstr "Default sorting criteria:"
+
+#: config/prefs.php:1509
+msgid "Default sorting direction:"
+msgstr "Default sorting direction:"
+
+#: lib/Mime/Viewer/Itip.php:817
+msgid "Delegated"
+msgstr "Delegated"
+
+#: lib/Dynamic/Compose/Common.php:176 lib/Dynamic/Mailbox.php:329
+#: lib/Dynamic/Mailbox.php:359 lib/Imap/Acl.php:196
+#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
+#: templates/prefs/acl.html.php:44 templates/prefs/acl.html.php:79
+#: templates/prefs/pgppublickey.html.php:22
+#: templates/prefs/smimepublickey.html.php:24
+#: templates/smartmobile/mailbox.html.php:37
+#: templates/smartmobile/mailbox.html.php:45
+#: templates/smartmobile/message.html.php:22
+msgid "Delete"
+msgstr "Delete"
+
+#: lib/Prefs/Special/PgpPublicKey.php:79
+#: lib/Prefs/Special/SmimePublicKey.php:79
+#, php-format
+msgid "Delete %s Public Key"
+msgstr "Delete %s Public Key"
+
+#: templates/prefs/smimeprivatekey.html.php:256
+msgid "Delete Certificate"
+msgstr "Delete Certificate"
+
+#: templates/prefs/pgpprivatekey.html.php:46
+msgid "Delete Current Keys"
+msgstr "Delete Current Keys"
+
+#: templates/prefs/smimeprivatekey.html.php:90
+msgid "Delete Personal Certificate"
+msgstr "Delete Personal Certificate"
+
+#: templates/prefs/smimeprivatekey.html.php:164
+msgid "Delete Secondary Personal Certificate"
+msgstr "Delete Secondary Personal Certificate"
+
+#: lib/Dynamic/Mailbox.php:284
+msgid "Delete Virtual Folder"
+msgstr "Delete Virtual Folder"
+
+#: templates/dynamic/mailbox.html.php:257
+msgid "Delete all subfolders?"
+msgstr "Delete all subfolders?"
+
+#: lib/Imap/Acl.php:191
+msgid "Delete and rename mailbox"
+msgstr "Delete and rename mailbox"
+
+#: lib/Mime/Viewer/Itip.php:398
+msgid "Delete from my calendar"
+msgstr "Delete from my calendar"
+
+#: config/prefs.php:605
+msgid "Delete linked attachments after this many months (0 to never delete):"
+msgstr "Delete linked attachments after this many months (0 to never delete):"
+
+#: config/prefs.php:1291
+msgid "Delete message"
+msgstr "Delete message"
+
+#: lib/Imap/Acl.php:195
+msgid "Delete messages"
+msgstr "Delete messages"
+
+#: config/prefs.php:884
+msgid ""
+"Delete old sent mail mailboxes after this many months (0 to never delete):"
+msgstr ""
+"Delete old sent mail mailboxes after this many months (0 to never delete):"
+
+#: lib/Dynamic/Mailbox.php:228
+msgid "Delete subfolders"
+msgstr "Delete subfolders"
+
+#: lib/Imap/Acl.php:192
+msgid "Delete/Rename Mailbox"
+msgstr "Delete/Rename Mailbox"
+
+#: lib/Flag/Imap/Deleted.php:41
+msgid "Deleted"
+msgstr "Deleted"
+
+#: lib/Mailbox.php:808
+#, php-format
+msgid "Deleted Virtual Folder \"%s\"."
+msgstr "Deleted Virtual Folder \"%s\"."
+
+#: lib/Ajax/Application/Handler/Dynamic.php:813
+#, php-format
+msgid "Deleted attachment \"%s\"."
+msgstr "Deleted attachment \"%s\"."
+
+#: lib/Prefs/Special/Flag.php:120
+#, php-format
+msgid "Deleted flag \"%s\"."
+msgstr "Deleted flag \"%s\"."
+
+#: config/prefs.php:1150
+msgid "Deleting and Moving Messages"
+msgstr "Deleting and Moving Messages"
+
+#: lib/Mime/Viewer/Itip.php:341
+msgid "Deny request"
+msgstr "Deny request"
+
+#: lib/Mime/Viewer/Itip.php:266
+msgid "Deny request for free/busy information"
+msgstr "Deny request for free/busy information"
+
+#: lib/Mime/Viewer/Itip.php:732
+msgid "Deny task assignment"
+msgstr "Deny task assignment"
+
+#: config/prefs.php:1507
+msgid "Descending"
+msgstr "Descending"
+
+#: templates/itip/action.html.php:41
+msgid "Description"
+msgstr "Description"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:254
+#: templates/prefs/pgpprivatekey.html.php:22
+#: templates/prefs/pgpprivatekey.html.php:36
+#: templates/prefs/pgppublickey.html.php:21
+#: templates/prefs/smimeprivatekey.html.php:234
+#: templates/prefs/smimepublickey.html.php:23
+msgid "Details"
+msgstr "Details"
+
+#: config/prefs.php:1097
+msgid "Dim signatures?"
+msgstr "Dim signatures?"
+
+#: templates/dynamic/compose.html.php:46
+#: templates/smartmobile/compose.html.php:65
+msgid "Discard Draft"
+msgstr "Discard Draft"
+
+#: lib/Dynamic/Compose/Common.php:265
+msgid ""
+"Discard all text formatting information (by converting from HTML to plain "
+"text)? This conversion cannot be reversed."
+msgstr ""
+"Discard all text formatting information (by converting from HTML to plain "
+"text)? This conversion cannot be reversed."
+
+#: config/prefs.php:1367
+msgid "Display notification when new mail arrives?"
+msgstr "Display notification when new mail arrives?"
+
+#: lib/Basic/Search.php:498
+msgid "Do NOT Match"
+msgstr "Do NOT Match"
+
+#: lib/Dynamic/Mailbox.php:364
+msgid "Do Not Check for New Mail"
+msgstr "Do Not Check for New Mail"
+
+#: config/prefs.php:1112
+msgid "Do not show parts"
+msgstr "Do not show parts"
+
+#: lib/Dynamic/Mailbox.php:483
+msgid "Don't Show"
+msgstr "Don't Show"
+
+#: lib/Contents.php:834 lib/Mime/Viewer/Tgz.php:120 lib/Mime/Viewer/Zip.php:130
+#: templates/mime/compressed.html.php:10
+msgid "Download"
+msgstr "Download"
+
+#: lib/Dynamic/Mailbox.php:524 lib/Dynamic/Message.php:122
+#, php-format
+msgid "Download All (%s)"
+msgstr "Download All (%s)"
+
+#: templates/dynamic/mailbox.html.php:229
+msgid "Download into a MBOX file"
+msgstr "Download into a MBOX file"
+
+#: templates/dynamic/mailbox.html.php:230
+msgid "Download into a MBOX file (ZIP compressed)"
+msgstr "Download into a MBOX file (ZIP compressed)"
+
+#: lib/Compose.php:3077
+msgid "Download link"
+msgstr "Download link"
+
+#: lib/Compose.php:3070
+#, php-format
+msgid "Download link: %s"
+msgstr "Download link: %s"
+
+#: lib/Flag/Imap/Draft.php:41
+msgid "Draft"
+msgstr "Draft"
+
+#: config/prefs.php:796 lib/Mailbox.php:1695 lib/Mailbox.php:1794
+msgid "Drafts"
+msgstr "Drafts"
+
+#: templates/prefs/drafts.html.php:3
+msgid "Drafts mailbox:"
+msgstr "Drafts mailbox:"
+
+#: templates/dynamic/compose.html.php:165
+msgid "Drop file(s) here to attach."
+msgstr "Drop file(s) here to attach."
+
+#: lib/Pgp.php:793
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: templates/prefs/pgpprivatekey.html.php:76 templates/prefs/remote.html.php:9
+msgid "E-mail Address"
+msgstr "E-mail Address"
+
+#: lib/Mime/Viewer/Status.php:135
+msgid "ERROR: Your message could not be delivered."
+msgstr "ERROR: Your message could not be delivered."
+
+#: lib/Mime/Viewer/Html.php:181
+msgid "EXAMPLE LINK"
+msgstr "EXAMPLE LINK"
+
+#: lib/Ftree.php:1074
+msgid "Edit"
+msgstr "Edit"
+
+#: lib/Dynamic/Mailbox.php:381
+msgid "Edit ACL"
+msgstr "Edit ACL"
+
+#: templates/search/search.html.php:9
+msgid "Edit Filter"
+msgstr "Edit Filter"
+
+#: templates/dynamic/mailbox.html.php:292
+msgid "Edit Flags..."
+msgstr "Edit Flags..."
+
+#: templates/smartmobile/mailbox.html.php:25
+msgid "Edit Search"
+msgstr "Edit Search"
+
+#: templates/dynamic/mailbox.html.php:62 templates/dynamic/mailbox.html.php:70
+msgid "Edit Search Query"
+msgstr "Edit Search Query"
+
+#: lib/Dynamic/Mailbox.php:272 lib/Dynamic/Mailbox.php:313
+msgid "Edit Template"
+msgstr "Edit Template"
+
+#: lib/Dynamic/Mailbox.php:283 lib/Ftree.php:1074
+#: templates/search/search.html.php:7
+msgid "Edit Virtual Folder"
+msgstr "Edit Virtual Folder"
+
+#: lib/Dynamic/Mailbox.php:278
+msgid "Edit Virtual Folders"
+msgstr "Edit Virtual Folders"
+
+#: config/prefs.php:778 lib/Dynamic/Base.php:175
+msgid "Edit as New"
+msgstr "Edit as New"
+
+#: config/prefs.php:660
+msgid "Edit compose templates."
+msgstr "Edit compose templates."
+
+#: config/prefs.php:257
+msgid "Edit your Blacklist"
+msgstr "Edit your Blacklist"
+
+#: config/prefs.php:238
+msgid "Edit your Filter Rules"
+msgstr "Edit your Filter Rules"
+
+#: config/prefs.php:276
+msgid "Edit your Whitelist"
+msgstr "Edit your Whitelist"
+
+#: lib/Ajax/Application/Handler/Dynamic.php:1248
+msgid "Editing group lists not currently supported."
+msgstr "Editing group lists not currently supported."
+
+#: lib/Mailbox.php:1426
+#, php-format
+msgid "Emptied all messages from %s."
+msgstr "Emptied all messages from %s."
+
+#: lib/Mailbox.php:1388
+msgid "Emptied all messages from Virtual Trash Folder."
+msgstr "Emptied all messages from Virtual Trash Folder."
+
+#: lib/Dynamic/Mailbox.php:358
+msgid "Empty"
+msgstr "Empty"
+
+#: config/prefs.php:366
+msgid "Enable PGP functionality?"
+msgstr "Enable PGP functionality?"
+
+#: config/prefs.php:450
+msgid "Enable S/MIME functionality?"
+msgstr "Enable S/MIME functionality?"
+
+#: templates/prefs/searches.html.php:9 templates/prefs/searches.html.php:48
+msgid "Enabled?"
+msgstr "Enabled?"
+
+#: templates/dynamic/compose.html.php:86
+msgid "Encryption"
+msgstr "Encryption"
+
+#: templates/itip/action.html.php:14
+msgid "End"
+msgstr "End"
+
+#: lib/Compose.php:2436
+msgid "End forwarded message"
+msgstr "End forwarded message"
+
+#: lib/Compose.php:2247
+msgid "End message"
+msgstr "End message"
+
+#: lib/Compose.php:2247
+#, php-format
+msgid "End message from %s"
+msgstr "End message from %s"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:288
+#: lib/Prefs/Special/SmimePrivateKey.php:295
+msgid "Enter Alias"
+msgstr "Enter Alias"
+
+#: lib/Prefs/Special/PgpPrivateKey.php:73
+#: lib/Prefs/Special/SmimePrivateKey.php:321
+#: lib/Prefs/Special/SmimePrivateKey.php:328
+msgid "Enter Passphrase"
+msgstr "Enter Passphrase"
+
+#: templates/contacts/contacts.html.php:10
+msgid "Enter Search Term"
+msgstr "Enter Search Term"
+
+#: lib/Ajax/Imple/AliasDialog.php:58
+msgid "Enter the alias for your certificate."
+msgstr "Enter the alias for your certificate."
+
+#: lib/Prefs/Special/ComposeTemplates.php:45
+msgid "Enter the name for your new compose templates mailbox."
+msgstr "Enter the name for your new compose templates mailbox."
+
+#: lib/Prefs/Special/Drafts.php:39
+msgid "Enter the name for your new drafts mailbox."
+msgstr "Enter the name for your new drafts mailbox."
+
+#: lib/Prefs/Special/Spam.php:39
+msgid "Enter the name for your new spam mailbox."
+msgstr "Enter the name for your new spam mailbox."
+
+#: lib/Prefs/Special/Trash.php:39
+msgid "Enter the name for your new trash mailbox."
+msgstr "Enter the name for your new trash mailbox."
+
+#: lib/Ajax/Imple/PassphraseDialog.php:62
+msgid "Enter the passphrase used to encrypt this message."
+msgstr "Enter the passphrase used to encrypt this message."
+
+#: lib/Ajax/Imple/PassphraseDialog.php:58
+msgid "Enter your personal PGP passphrase."
+msgstr "Enter your personal PGP passphrase."
+
+#: lib/Ajax/Imple/PassphraseDialog.php:66
+msgid "Enter your personal S/MIME passphrase."
+msgstr "Enter your personal S/MIME passphrase."
+
+#: lib/Basic/Search.php:87 lib/Dynamic/Mailbox.php:493
+#: templates/smartmobile/search.html.php:9
+msgid "Entire Message"
+msgstr "Entire Message"
+
+#: lib/Search/Element/Text.php:60
+msgid "Entire Message (including Headers)"
+msgstr "Entire Message (including Headers)"
+
+#: lib/Basic/Thread.php:63 lib/Compose.php:1581
+#, php-format
+msgid "Entry \"%s\" was successfully added to the address book"
+msgstr "Entry \"%s\" was successfully added to the address book"
+
+#: lib/Mime/Status.php:92
+msgid "Error"
+msgstr "Error"
+
+#: lib/Contents.php:114
+msgid "Error displaying message: message does not exist on server."
+msgstr "Error displaying message: message does not exist on server."
+
+#: lib/Ajax/Application/ListMessages.php:60
+msgid "Error in displaying search results."
+msgstr "Error in displaying search results."
+
+#: templates/dynamic/mailbox.html.php:71
+msgid "Error loading message list."
+msgstr "Error loading message list."
+
+#: lib/Ajax/Imple/VcardImport.php:74
+msgid "Error reading the contact data."
+msgstr "Error reading the contact data."
+
+#: lib/Ajax/Imple/ItipRequest.php:329 lib/Ajax/Imple/ItipRequest.php:441
+#, php-format
+msgid "Error sending reply: %s."
+msgstr "Error sending reply: %s."
+
+#: lib/Mbox/Import.php:195
+#, php-format
+msgid ""
+"Error when importing messages; %u messages successfully imported before "
+"error."
+msgstr ""
+"Error when importing messages; %u messages successfully imported before "
+"error."
+
+#: lib/Smartmobile.php:181
+msgid "Error when loading the message."
+msgstr "Error when loading the message."
+
+#: lib/Compose.php:2546
+msgid "Error when redirecting message."
+msgstr "Error when redirecting message."
+
+#: templates/dynamic/mailbox.html.php:4
+msgid ""
+"Error! This application requires javascript to be available and enabled in "
+"your browser."
+msgstr ""
+"Error! This application requires javascript to be available and enabled in "
+"your browser."
+
+#: config/prefs.php:327
+msgid "Event Requests"
+msgstr "Event Requests"
+
+#: lib/Ajax/Imple/ItipRequest.php:114
+msgid "Event successfully deleted."
+msgstr "Event successfully deleted."
+
+#: config/prefs.php:1358
+msgid "Every 15 minutes"
+msgstr "Every 15 minutes"
+
+#: config/prefs.php:1355
+msgid "Every 30 seconds"
+msgstr "Every 30 seconds"
+
+#: config/prefs.php:839 config/prefs.php:1357
+msgid "Every 5 minutes"
+msgstr "Every 5 minutes"
+
+#: config/prefs.php:1359
+msgid "Every half hour"
+msgstr "Every half hour"
+
+#: config/prefs.php:838 config/prefs.php:1356
+msgid "Every minute"
+msgstr "Every minute"
+
+#: templates/itip/action.html.php:110
+msgid "Exceptions"
+msgstr "Exceptions"
+
+#: lib/Smartmobile.php:173
+msgid "Exit Search"
+msgstr "Exit Search"
+
+#: lib/Dynamic/Mailbox.php:232 lib/Dynamic/Mailbox.php:294
+#: lib/Dynamic/Mailbox.php:371
+msgid "Expand All"
+msgstr "Expand All"
+
+#: lib/Dynamic/Compose/Common.php:255
+msgid "Expand Group"
+msgstr "Expand Group"
+
+#: templates/dynamic/mailbox.html.php:95
+msgid "Expand Headers"
+msgstr "Expand Headers"
+
+#: config/prefs.php:1573
+msgid "Expand the entire folder tree by default in the folders view?"
+msgstr "Expand the entire folder tree by default in the folders view?"
+
+#: templates/prefs/pgpprivatekey.html.php:107
+msgid "Expiration"
+msgstr "Expiration"
+
+#: lib/Pgp.php:790
+msgid "Expiration Date"
+msgstr "Expiration Date"
+
+#: lib/Dynamic/Mailbox.php:375
+msgid "Export"
+msgstr "Export"
+
+#: templates/prefs/smimeprivatekey.html.php:205
+msgid "Extra S/MIME Personal Certificates"
+msgstr "Extra S/MIME Personal Certificates"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:385
+msgid "Extra S/MIME keys deleted successfully."
+msgstr "Extra S/MIME keys deleted successfully."
+
+#: templates/mime/compressed.html.php:8
+msgid "Filename"
+msgstr "Filename"
+
+#: templates/dynamic/mailbox.html.php:20 templates/prefs/searches.html.php:47
+#: templates/search/search.html.php:88
+msgid "Filter"
+msgstr "Filter"
+
+#: lib/Basic/Search.php:294
+#, php-format
+msgid "Filter \"%s\" created succesfully."
+msgstr "Filter \"%s\" created succesfully."
+
+#: lib/Prefs/Special/Searches.php:133
+#, php-format
+msgid "Filter \"%s\" deleted."
+msgstr "Filter \"%s\" deleted."
+
+#: lib/Basic/Search.php:290
+#, php-format
+msgid "Filter \"%s\" edited successfully."
+msgstr "Filter \"%s\" edited successfully."
+
+#: lib/Dynamic/Mailbox.php:481
+msgid "Filter By"
+msgstr "Filter By"
+
+#: templates/smartmobile/folders.html.php:5
+msgid "Filter mailboxes..."
+msgstr "Filter mailboxes..."
+
+#: config/prefs.php:1019
+msgid "Filter message content for unwanted text (e.g. profanity)?"
+msgstr "Filter message content for unwanted text (e.g. profanity)?"
+
+#: config/prefs.php:227
+msgid "Filters"
+msgstr "Filters"
+
+#: lib/Filter.php:139
+#, php-format
+msgid "Filters: %s management page"
+msgstr "Filters: %s management page"
+
+#: templates/contacts/contacts.html.php:9
+msgid "Find"
+msgstr "Find"
+
+#: config/prefs.php:1476
+msgid "First (oldest) Unseen Message"
+msgstr "First (oldest) Unseen Message"
+
+#: config/prefs.php:1478
+msgid "First Page"
+msgstr "First Page"
+
+#: lib/Dynamic/Mailbox.php:545
+msgid "Flag Name:"
+msgstr "Flag Name:"
+
+#: lib/Flags.php:183
+msgid "Flag name already exists."
+msgstr "Flag name already exists."
+
+#: lib/Flags.php:177
+msgid "Flag name must not be empty."
+msgstr "Flag name must not be empty."
+
+#: lib/Basic/Search.php:492
+msgid "Flag:"
+msgstr "Flag:"
+
+#: lib/Flag/Imap/Flagged.php:45
+msgid "Flagged for Followup"
+msgstr "Flagged for Followup"
+
+#: config/prefs.php:1389
+msgid "Flags"
+msgstr "Flags"
+
+#: lib/Indices.php:733
+#, php-format
+msgid ""
+"Flags were not changed for at least one message in the mailbox \"%s\" "
+"because the flags were altered by another connection to the mailbox prior to "
+"this request. You may redo the flag action if desired; this warning is "
+"precautionary to ensure you don't overwrite flag changes."
+msgstr ""
+"Flags were not changed for at least one message in the mailbox \"%s\" "
+"because the flags were altered by another connection to the mailbox prior to "
+"this request. You may redo the flag action if desired; this warning is "
+"precautionary to ensure you don't overwrite flag changes."
+
+#: lib/Mailbox.php:1768
+msgid "Folder"
+msgstr "Folder"
+
+#: lib/Dynamic/Mailbox.php:96
+msgid "Folder Actions"
+msgstr "Folder Actions"
+
+#: config/prefs.php:1548
+msgid "Folder Display"
+msgstr "Folder Display"
+
+#: templates/prefs/initialpage.html.php:7
+msgid "Folder Navigator"
+msgstr "Folder Navigator"
+
+#: lib/Smartmobile.php:174 templates/smartmobile/folders.html.php:2
+#: templates/smartmobile/mailbox.html.php:2
+msgid "Folders"
+msgstr "Folders"
+
+#: config/prefs.php:1035
+msgid ""
+"For messages with alternative representations of a text part, which part "
+"should be displayed?"
+msgstr ""
+"For messages with alternative representations of a text part, which part "
+"should be displayed?"
+
+#: lib/Compose.php:2378 lib/Compose.php:2381 lib/Dynamic/Mailbox.php:317
+#: lib/Notification/Event/Status.php:27 templates/dynamic/mailbox.html.php:32
+#: templates/dynamic/message.html.php:15
+#: templates/smartmobile/message.html.php:52
+msgid "Forward"
+msgstr "Forward"
+
+#: lib/Flag/Imap/Forwarded.php:40
+msgid "Forwarded"
+msgstr "Forwarded"
+
+#: lib/Compose.php:2702
+msgid "Forwarded Message"
+msgstr "Forwarded Message"
+
+#: lib/Compose.php:2434
+msgid "Forwarded message"
+msgstr "Forwarded message"
+
+#: lib/Compose.php:2434
+#, php-format
+msgid "Forwarded message from %s"
+msgstr "Forwarded message from %s"
+
+#: lib/Ajax/Application/Handler/Smartmobile.php:76
+msgid "Forwarded message will be automatically added to your outgoing message."
+msgstr ""
+"Forwarded message will be automatically added to your outgoing message."
+
+#: config/prefs.php:762
+msgid "Forwards"
+msgstr "Forwards"
+
+#: lib/Compose.php:1703
+#, php-format
+msgid ""
+"Found the word %s in the message text although there are no files attached "
+"to the message. Did you forget to attach a file? (This check will not be "
+"performed again for this message.)"
+msgstr ""
+"Found the word %s in the message text although there are no files attached "
+"to the message. Did you forget to attach a file? (This check will not be "
+"performed again for this message.)"
+
+#: lib/Ajax/Imple/ItipRequest.php:433
+msgid "Free/Busy Request Response"
+msgstr "Free/Busy Request Response"
+
+#: lib/Basic/Search.php:55 lib/Compose.php:2745 lib/Contents/View.php:221
+#: lib/Dynamic/Mailbox.php:179 lib/Dynamic/Mailbox.php:258
+#: lib/Dynamic/Mailbox.php:495 lib/Smartmobile.php:175
+#: templates/dynamic/compose.html.php:102
+#: templates/dynamic/mailbox.html.php:142 templates/dynamic/message.html.php:84
+#: templates/smartmobile/search.html.php:11 templates/thread/thread.html.php:21
+msgid "From"
+msgstr "From"
+
+#: config/prefs.php:1493
+msgid "From Address"
+msgstr "From Address"
+
+#: lib/Mailbox/Ui.php:85 templates/smartmobile/compose.html.php:21
+msgid "From:"
+msgstr "From:"
+
+#: templates/saveimage/saveimage.html.php:12
+msgid "Gallery"
+msgstr "Gallery"
+
+#: config/prefs.php:14 config/prefs.php:137 config/prefs.php:163
+#: config/prefs.php:190 config/prefs.php:226 config/prefs.php:326
+#: config/prefs.php:343 config/prefs.php:426
+msgid "General"
+msgstr "General"
+
+#: templates/itip/action.html.php:131
+msgid "Go"
+msgstr "Go"
+
+#: lib/Block/Newmail.php:66
+msgid "Go to your Inbox..."
+msgstr "Go to your Inbox..."
+
+#: lib/Compose.php:1811
+msgid "HTML Message"
+msgstr "HTML Message"
+
+#: templates/dynamic/compose.html.php:58
+msgid "HTML composition"
+msgstr "HTML composition"
+
+#: config/prefs.php:1032
+msgid "HTML part"
+msgstr "HTML part"
+
+#: lib/Pgp.php:794
+msgid "Hash-Algorithm"
+msgstr "Hash-Algorithm"
+
+#: config/prefs.php:1088
+msgid "Hidden"
+msgstr "Hidden"
+
+#: config/prefs.php:1086
+msgid "Hidden in List Messages"
+msgstr "Hidden in List Messages"
+
+#: config/prefs.php:1085
+msgid "Hidden in Thread View"
+msgstr "Hidden in Thread View"
+
+#: config/prefs.php:1087
+msgid "Hidden in Thread View and List Messages"
+msgstr "Hidden in Thread View and List Messages"
+
+#: lib/Basic/Thread.php:299 templates/dynamic/header.html.php:5
+msgid "Hide Addresses"
+msgstr "Hide Addresses"
+
+#: lib/Dynamic/Mailbox.php:441
+msgid "Hide Deleted"
+msgstr "Hide Deleted"
+
+#: lib/Dynamic/Mailbox.php:424
+msgid "Hide Preview"
+msgstr "Hide Preview"
+
+#: lib/Dynamic/Mailbox.php:292
+msgid "Hide Unsubscribed"
+msgstr "Hide Unsubscribed"
+
+#: config/prefs.php:1220
+msgid "Hide deleted messages even if using the Trash mailbox?"
+msgstr "Hide deleted messages even if using the Trash mailbox?"
+
+#: lib/Dynamic/Compose/Common.php:219
+msgid "High"
+msgstr "High"
+
+#: lib/Flag/System/HighPriority.php:43
+msgid "High Priority"
+msgstr "High Priority"
+
+#: lib/Dynamic/Mailbox.php:426
+msgid "Horizontal Layout"
+msgstr "Horizontal Layout"
+
+#: config/prefs.php:1090
+msgid ""
+"How should large blocks of quoted text be shown by default? (Toggling the "
+"block will always be available)."
+msgstr ""
+"How should large blocks of quoted text be shown by default? (Toggling the "
+"block will always be available)."
+
+#: config/prefs.php:780
+msgid "How should messages be forwarded by default?"
+msgstr "How should messages be forwarded by default?"
+
+#: config/prefs.php:1587
+msgid "How should namespaces be displayed in the folder tree view?"
+msgstr "How should namespaces be displayed in the folder tree view?"
+
+#: config/prefs.php:743
+msgid "How to attribute quoted lines in a reply?"
+msgstr "How to attribute quoted lines in a reply?"
+
+#: lib/Mime/Viewer/Pgp.php:280
+msgid ""
+"However, no personal private key exists so the message cannot be decrypted."
+msgstr ""
+"However, no personal private key exists so the message cannot be decrypted."
+
+#: templates/prefs/remote.html.php:48
+msgid "IMAP"
+msgstr "IMAP"
+
+#: templates/prefs/flags.html.php:7
+msgid "Icon"
+msgstr "Icon"
+
+#: templates/smime/import_extra_key.html.php:38
+#: templates/smime/import_identity_key.html.php:38
+#: templates/smime/import_personal_key.html.php:38
+msgid ""
+"If present, this certificate will be used for signing messages only, while "
+"the first certificate will be used for message decryption only. If left "
+"empty, the first certificate will be used for all purposes."
+msgstr ""
+"If present, this certificate will be used for signing messages only, while "
+"the first certificate will be used for message decryption only. If left "
+"empty, the first certificate will be used for all purposes."
+
+#: templates/prefs/smimeidentities.html.php:11
+msgid ""
+"If you want to set the keys for different identity, please change your "
+"default-identity first: "
+msgstr ""
+"If you want to set the keys for different identity, please change your "
+"default-identity first: "
+
+#: lib/Contents.php:1282 templates/saveimage/saveimage.html.php:7
+msgid "Image"
+msgstr "Image"
+
+#: lib/Dynamic/Compose/Common.php:256
+msgid "Image Data"
+msgstr "Image Data"
+
+#: lib/Mime/Viewer/Html.php:230
+msgid "Images have been blocked in this message part."
+msgstr "Images have been blocked in this message part."
+
+#: lib/Dynamic/Mailbox.php:376 templates/pgp/import_key.html.php:42
+#: templates/smime/import_extra_key.html.php:62
+#: templates/smime/import_identity_key.html.php:62
+#: templates/smime/import_personal_key.html.php:62
+#: templates/smime/import_public_key.html.php:28
+msgid "Import"
+msgstr "Import"
+
+#: templates/prefs/smimeprivatekey.html.php:285
+msgid "Import Extra Personal Certificate"
+msgstr "Import Extra Personal Certificate"
+
+#: templates/smime/import_extra_key.html.php:6
+msgid "Import Extra Personal S/MIME Certificate"
+msgstr "Import Extra Personal S/MIME Certificate"
+
+#: lib/Basic/Smime.php:322
+msgid "Import Extra Personal S/MIME Certificates"
+msgstr "Import Extra Personal S/MIME Certificates"
+
+#: templates/smime/import_identity_key.html.php:6
+msgid "Import Idenitity Personal S/MIME Certificate"
+msgstr "Import Idenitity Personal S/MIME Certificate"
+
+#: templates/prefs/pgpprivatekey.html.php:129
+msgid "Import Key"
+msgstr "Import Key"
+
+#: lib/Basic/Pgp.php:158
+msgid "Import PGP Key"
+msgstr "Import PGP Key"
+
+#: templates/prefs/smimeprivatekey.html.php:188
+msgid "Import Personal Certificate"
+msgstr "Import Personal Certificate"
+
+#: templates/pgp/import_key.html.php:9 templates/pgp/import_key.html.php:26
+msgid "Import Personal Key"
+msgstr "Import Personal Key"
+
+#: lib/Basic/Smime.php:319 templates/smime/import_personal_key.html.php:6
+msgid "Import Personal S/MIME Certificate"
+msgstr "Import Personal S/MIME Certificate"
+
+#: templates/pgp/import_key.html.php:24
+#: templates/prefs/pgppublickey.html.php:40
+#: templates/prefs/smimepublickey.html.php:40
+msgid "Import Public Key"
+msgstr "Import Public Key"
+
+#: templates/pgp/import_key.html.php:7
+msgid "Import Public PGP Key"
+msgstr "Import Public PGP Key"
+
+#: lib/Basic/Smime.php:328 templates/smime/import_public_key.html.php:6
+msgid "Import Public S/MIME Key"
+msgstr "Import Public S/MIME Key"
+
+#: lib/Basic/Smime.php:325
+msgid "Import S/MIME Certificates for new Identity"
+msgstr "Import S/MIME Certificates for new Identity"
+
+#: templates/prefs/smimeprivatekey.html.php:275
+msgid "Import SMIME Certificate for a new Identity"
+msgstr "Import SMIME Certificate for a new Identity"
+
+#: lib/Mbox/Import.php:61
+#, php-format
+msgid "Imported %d message from %s."
+msgid_plural "Imported %d messages from %s"
+msgstr[0] "Imported %d message from %s."
+msgstr[1] "Imported %d messages from %s"
+
+#: lib/Dynamic/Mailbox.php:536
+msgid "Importing (this may take some time)..."
+msgstr "Importing (this may take some time)..."
+
+#: lib/Dynamic/Base.php:172
+msgid "In Body Text"
+msgstr "In Body Text"
+
+#: lib/Mime/Viewer/Itip.php:823
+msgid "In Process"
+msgstr "In Process"
+
+#: config/prefs.php:776
+msgid "In the body text"
+msgstr "In the body text"
+
+#: lib/Mailbox.php:1731 lib/Mailbox.php:1735 lib/Mailbox.php:1782
+#: lib/Remote.php:107
+msgid "Inbox"
+msgstr "Inbox"
+
+#: config/prefs.php:727
+msgid "Include a brief summary of the original message's header in a reply?"
+msgstr "Include a brief summary of the original message's header in a reply?"
+
+#: config/prefs.php:736
+msgid "Include original message in a reply?"
+msgstr "Include original message in a reply?"
+
+#: config/prefs.php:1439
+msgid "Include the \"Bcc\" header when printing a sent email?"
+msgstr "Include the \"Bcc\" header when printing a sent email?"
+
+#: config/prefs.php:1539
+msgid ""
+"Indicate whether a message has attachments or is signed or encrypted in the "
+"mailbox listing?"
+msgstr ""
+"Indicate whether a message has attachments or is signed or encrypted in the "
+"mailbox listing?"
+
+#: lib/Mime/Status/RenderIssue/Display.php:68 lib/Mime/Viewer/Mdn.php:189
+msgid "Info"
+msgstr "Info"
+
+#: lib/Prefs/Special/PgpPublicKey.php:78
+#: lib/Prefs/Special/SmimePublicKey.php:78
+#, php-format
+msgid "Information on %s Public Key"
+msgstr "Information on %s Public Key"
+
+#: lib/Prefs/Special/PgpPrivateKey.php:77
+msgid "Information on Personal Private Key"
+msgstr "Information on Personal Private Key"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:251
+msgid "Information on Personal Public Certificate"
+msgstr "Information on Personal Public Certificate"
+
+#: lib/Prefs/Special/PgpPrivateKey.php:55
+msgid "Information on Personal Public Key"
+msgstr "Information on Personal Public Key"
+
+#: templates/dynamic/mailbox.html.php:41 templates/dynamic/message.html.php:24
+#: templates/smartmobile/mailbox.html.php:39
+#: templates/smartmobile/mailbox.html.php:51
+#: templates/smartmobile/message.html.php:65
+msgid "Innocent"
+msgstr "Innocent"
+
+#: lib/Imap/Acl.php:176
+msgid "Insert"
+msgstr "Insert"
+
+#: templates/smime/import_public_key.html.php:11
+msgid "Insert Certificate Here"
+msgstr "Insert Certificate Here"
+
+#: lib/Imap/Acl.php:175
+msgid "Insert messages"
+msgstr "Insert messages"
+
+#: lib/Ajax/Imple/ItipRequest.php:444
+msgid "Invalid Action selected for this component."
+msgstr "Invalid Action selected for this component."
+
+#: lib/Dynamic/Mailbox.php:525 lib/Mailbox/Ui.php:89 lib/Smartmobile.php:183
+msgid "Invalid Address"
+msgstr "Invalid Address"
+
+#: lib/Dynamic/Mailbox.php:526
+msgid "Invalid Subject"
+msgstr "Invalid Subject"
+
+#: lib/Compose.php:1514
+#, php-format
+msgid "Invalid e-mail address (%s)."
+msgstr "Invalid e-mail address (%s)."
+
+#: lib/Compose.php:1510
+#, php-format
+msgid "Invalid e-mail address (%s): %s"
+msgstr "Invalid e-mail address (%s): %s"
+
+#: lib/Compose.php:768
+msgid "Invalid e-mail address."
+msgstr "Invalid e-mail address."
+
+#: lib/Basic/Smime.php:389
+msgid "Invalid key"
+msgstr "Invalid key"
+
+#: lib/Ajax/Application/Handler/Passphrase.php:67
+msgid "Invalid passphrase entered."
+msgstr "Invalid passphrase entered."
+
+#: lib/Flag/Imap/Junk.php:38
+msgid "Junk"
+msgstr "Junk"
+
+#: lib/Pgp.php:789
+msgid "Key Creation"
+msgstr "Key Creation"
+
+#: lib/Pgp.php:796
+msgid "Key Fingerprint"
+msgstr "Key Fingerprint"
+
+#: lib/Pgp.php:795
+msgid "Key ID"
+msgstr "Key ID"
+
+#: lib/Pgp.php:791
+msgid "Key Length"
+msgstr "Key Length"
+
+#: lib/Pgp.php:788
+msgid "Key Type"
+msgstr "Key Type"
+
+#: lib/Prefs/Special/PgpPrivateKey.php:95
+msgid ""
+"Key generation may take a long time to complete. Continue with key "
+"generation?"
+msgstr ""
+"Key generation may take a long time to complete. Continue with key "
+"generation?"
+
+#: templates/prefs/pgppublickey.html.php:47
+#: templates/prefs/smimepublickey.html.php:47
+msgid "Key import is not available. File upload is not enabled on this server."
+msgstr ""
+"Key import is not available. File upload is not enabled on this server."
+
+#: templates/prefs/pgppublickey.html.php:35
+#: templates/prefs/smimepublickey.html.php:35
+msgid ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+msgstr ""
+"Key import is not available. You have no address book defined to add your "
+"contacts."
+
+#: lib/Smime.php:217
+msgid "Key is allready in the Database"
+msgstr "Key is allready in the Database"
+
+#: lib/Prefs/Special/PgpPrivateKey.php:165
+msgid "Key successfully sent to the public keyserver."
+msgstr "Key successfully sent to the public keyserver."
+
+#: templates/prefs/flags.html.php:6 templates/prefs/remote.html.php:23
+#: templates/prefs/remote.html.php:85 templates/search/search.html.php:94
+msgid "Label"
+msgstr "Label"
+
+#: config/prefs.php:1477
+msgid "Last (newest) Unseen Message"
+msgstr "Last (newest) Unseen Message"
+
+#: config/prefs.php:1479
+msgid "Last Page"
+msgstr "Last Page"
+
+#: lib/Imap/Acl.php:160
+msgid "List"
+msgstr "List"
+
+#: lib/Dynamic/Mailbox.php:471 templates/dynamic/message.html.php:63
+#: templates/dynamic/message.html.php:65
+msgid "List Info"
+msgstr "List Info"
+
+#: templates/dynamic/header.html.php:8
+msgid "Load All Addresses"
+msgstr "Load All Addresses"
+
+#: lib/Smartmobile.php:179
+msgid "Load More Messages..."
+msgstr "Load More Messages..."
+
+#: lib/Mime/Viewer/Html.php:234
+msgid "Load Styling?"
+msgstr "Load Styling?"
+
+#: templates/search/search.html.php:18
+msgid "Load a Recent Search"
+msgstr "Load a Recent Search"
+
+#: lib/Mime/Viewer/Html.php:206
+msgid "Load message styling..."
+msgstr "Load message styling..."
+
+#: lib/Basic/Search.php:493 lib/Dynamic/Compose/Common.php:257
+#: lib/Dynamic/Mailbox.php:539 lib/Mime/Viewer/Html.php:81
+#: lib/Mime/Viewer/Images.php:131 templates/dynamic/compose-base.html.php:4
+#: templates/dynamic/compose.html.php:212 templates/dynamic/mailbox.html.php:2
+#: templates/dynamic/mailbox.html.php:305
+#: templates/dynamic/mailbox_subinfo.html.php:5
+#: templates/dynamic/message.html.php:4 templates/dynamic/sidebar.html.php:1
+#: templates/search/search.html.php:56
+msgid "Loading..."
+msgstr "Loading..."
+
+#: templates/itip/action.html.php:60
+msgid "Location"
+msgstr "Location"
+
+#: lib/Dynamic/Mailbox.php:255
+msgid "Log Out"
+msgstr "Log Out"
+
+#: lib/Ajax/Application/Handler/Remote.php:143
+#, php-format
+msgid "Logged out of %s."
+msgstr "Logged out of %s."
+
+#: lib/Dynamic/Mailbox.php:548
+msgid "Logging Out..."
+msgstr "Logging Out..."
+
+#: lib/Dynamic/Compose/Common.php:228
+msgid "Low"
+msgstr "Low"
+
+#: lib/Flag/System/LowPriority.php:39
+msgid "Low Priority"
+msgstr "Low Priority"
+
+#: lib/Mime/Viewer/Appledouble.php:106
+msgid "Macintosh File"
+msgstr "Macintosh File"
+
+#: smartmobile.php:23
+msgid "Mail"
+msgstr "Mail"
+
+#: config/prefs.php:1446 config/prefs.php:1547 lib/Block/Summary.php:107
+#: lib/Mailbox.php:1819 templates/smartmobile/message.html.php:2
+msgid "Mailbox"
+msgstr "Mailbox"
+
+#: lib/Ajax/Application/Handler/Dynamic.php:85
+#, php-format
+msgid "Mailbox \"%s\" already exists."
+msgstr "Mailbox \"%s\" already exists."
+
+#: lib/Ajax/Application/ListMessages.php:286
+#, php-format
+msgid "Mailbox %s does not exist."
+msgstr "Mailbox %s does not exist."
+
+#: config/prefs.php:1447
+msgid "Mailbox Display"
+msgstr "Mailbox Display"
+
+#: lib/Dynamic/Mailbox.php:378
+msgid "Mailbox Size"
+msgstr "Mailbox Size"
+
+#: lib/Block/Summary.php:35
+msgid "Mailbox Summary"
+msgstr "Mailbox Summary"
+
+#: lib/Mailbox.php:675
+msgid "Mailbox structure on server has changed."
+msgstr "Mailbox structure on server has changed."
+
+#: templates/flist/flist.html.php:16
+msgid "Mailboxes"
+msgstr "Mailboxes"
+
+#: lib/Basic/Listinfo.php:54 templates/listinfo/listinfo.html.php:2
+msgid "Mailing List Information"
+msgstr "Mailing List Information"
+
+#: lib/Flag/System/List.php:39
+msgid "Mailing List Message"
+msgstr "Mailing List Message"
+
+#: lib/Basic/Search.php:124 lib/Search/Element/Mailinglist.php:52
+#: lib/Search/Filter/Mailinglist.php:30
+msgid "Mailing List Messages"
+msgstr "Mailing List Messages"
+
+#: lib/Dynamic/Mailbox.php:517
+msgid "Manage Remote Accounts"
+msgstr "Manage Remote Accounts"
+
+#: config/prefs.php:797
+msgid "Manage message drafts."
+msgstr "Manage message drafts."
+
+#: config/prefs.php:851
+msgid "Manage sent mail."
+msgstr "Manage sent mail."
+
+#: config/prefs.php:192
+msgid "Manage your saved searches"
+msgstr "Manage your saved searches"
+
+#: lib/Imap/Acl.php:172
+msgid "Mark (Other)"
+msgstr "Mark (Other)"
+
+#: lib/Imap/Acl.php:168
+msgid "Mark (Seen)"
+msgstr "Mark (Seen)"
+
+#: lib/Dynamic/Mailbox.php:361
+msgid "Mark all as"
+msgstr "Mark all as"
+
+#: lib/Dynamic/Mailbox.php:320 lib/Dynamic/Mailbox.php:430
+msgid "Mark as"
+msgstr "Mark as"
+
+#: config/prefs.php:1070
+msgid "Mark different levels of quoting with different colors?"
+msgstr "Mark different levels of quoting with different colors?"
+
+#: config/prefs.php:1168
+msgid "Mark messages as seen when deleting?"
+msgstr "Mark messages as seen when deleting?"
+
+#: config/prefs.php:1077
+msgid "Mark simple markup?"
+msgstr "Mark simple markup?"
+
+#: lib/Imap/Acl.php:167
+msgid "Mark with Seen/Unseen flags"
+msgstr "Mark with Seen/Unseen flags"
+
+#: lib/Imap/Acl.php:171
+msgid "Mark with other flags (e.g. Important/Answered)"
+msgstr "Mark with other flags (e.g. Important/Answered)"
+
+#: lib/Perms.php:98
+msgid "Maximum Number of Mailboxes"
+msgstr "Maximum Number of Mailboxes"
+
+#: lib/Perms.php:70
+msgid "Maximum Number of Recipients per Message"
+msgstr "Maximum Number of Recipients per Message"
+
+#: lib/Perms.php:90
+msgid "Maximum Number of Recipients per Time Period"
+msgstr "Maximum Number of Recipients per Time Period"
+
+#: lib/Perms.php:60
+msgid "Maximum size (bytes) of compose body"
+msgstr "Maximum size (bytes) of compose body"
+
+#: lib/Dynamic/Mailbox.php:535
+msgid "Mbox or .eml file:"
+msgstr "Mbox or .eml file:"
+
+#: config/prefs.php:1004 config/prefs.php:1149 config/prefs.php:1258
+#: config/prefs.php:1341 config/prefs.php:1388 config/prefs.php:1422
+#: lib/Compose.php:2241 lib/Contents.php:1287 lib/Dynamic/Message.php:149
+msgid "Message"
+msgstr "Message"
+
+#: lib/Ajax/Application/Handler/Common.php:658
+#, php-format
+msgid "Message \"%s\" redirected successfully."
+msgstr "Message \"%s\" redirected successfully."
+
+#: lib/Ajax/Application/Handler/Common.php:572
+#, php-format
+msgid "Message \"%s\" sent successfully."
+msgstr "Message \"%s\" sent successfully."
+
+#: lib/Search/Element/Text.php:59
+msgid "Message Body"
+msgstr "Message Body"
+
+#: lib/Dynamic/Mailbox.php:237
+msgid "Message Date"
+msgstr "Message Date"
+
+#: config/prefs.php:1496
+msgid "Message Size"
+msgstr "Message Size"
+
+#: lib/Contents/View.php:170
+msgid "Message Source"
+msgstr "Message Source"
+
+#: lib/Compose.php:2241
+#, php-format
+msgid "Message from %s"
+msgstr "Message from %s"
+
+#: lib/Flag/System/Attachment.php:39
+msgid "Message has Attachments"
+msgstr "Message has Attachments"
+
+#: lib/Flag/System/Encrypted.php:39
+msgid "Message is Encrypted"
+msgstr "Message is Encrypted"
+
+#: lib/Flag/System/Signed.php:39
+msgid "Message is Signed"
+msgstr "Message is Signed"
+
+#: lib/Ajax/Application/Handler/Common.php:658
+msgid "Message redirected successfully."
+msgstr "Message redirected successfully."
+
+#: lib/Compose.php:1220 lib/Compose.php:1272
+#, php-format
+msgid "Message sent successfully, but not saved to %s."
+msgstr "Message sent successfully, but not saved to %s."
+
+#: lib/Ajax/Application/Handler/Common.php:570
+msgid "Message sent successfully."
+msgstr "Message sent successfully."
+
+#: lib/Mime/Viewer/Html.php:233
+msgid ""
+"Message styling has been suppressed in this message part since the style "
+"data lives on a remote server."
+msgstr ""
+"Message styling has been suppressed in this message part since the style "
+"data lives on a remote server."
+
+#: lib/Dynamic/Mailbox.php:557
+#, php-format
+msgid "Messages %d - %d"
+msgstr "Messages %d - %d"
+
+#: lib/Search/Filter/Contacts.php:31
+msgid "Messages From Personal Contacts"
+msgstr "Messages From Personal Contacts"
+
+#: lib/Search/Filter/Attachment.php:30
+msgid "Messages with Attachments"
+msgstr "Messages with Attachments"
+
+#: config/prefs.php:335
+msgid "Minutes needed to consider a event as non-conflicting in iTip"
+msgstr "Minutes needed to consider a event as non-conflicting in iTip"
+
+#: config/prefs.php:1161
+msgid "Mobile view only"
+msgstr "Mobile view only"
+
+#: templates/search/search.html.php:115
+msgid "Months"
+msgstr "Months"
+
+#: templates/smartmobile/compose.html.php:55
+#: templates/smartmobile/folders.html.php:13
+#: templates/smartmobile/mailbox.html.php:14
+#: templates/smartmobile/message.html.php:26
+msgid "More..."
+msgstr "More..."
+
+#: templates/smartmobile/copymove.html.php:12
+msgid "Move"
+msgstr "Move"
+
+#: lib/Dynamic/Mailbox.php:544
+#, php-format
+msgid "Move %s to %s"
+msgstr "Move %s to %s"
+
+#: config/prefs.php:1174
+msgid ""
+"Move deleted messages to your Trash mailbox instead of marking them as "
+"deleted in the current mailbox?"
+msgstr ""
+"Move deleted messages to your Trash mailbox instead of marking them as "
+"deleted in the current mailbox?"
+
+#: lib/Dynamic/Mailbox.php:102
+msgid "Move to Base Level"
+msgstr "Move to Base Level"
+
+#: config/prefs.php:1305
+msgid "Move to Inbox"
+msgstr "Move to Inbox"
+
+#: config/prefs.php:1294
+msgid "Move to Spam mailbox"
+msgstr "Move to Spam mailbox"
+
+#: lib/Contents.php:1290
+msgid "Multipart"
+msgstr "Multipart"
+
+#: lib/Basic/Thread.php:188 templates/thread/thread.html.php:2
+msgid "Multiple Message View"
+msgstr "Multiple Message View"
+
+#: lib/Dynamic/Compose.php:126
+msgid "Multiple messages can only be forwarded as attachments."
+msgstr "Multiple messages can only be forwarded as attachments."
+
+#: lib/Dynamic/Mailbox.php:547
+msgid "Must enter a folder name"
+msgstr "Must enter a folder name"
+
+#: lib/Smartmobile.php:180
+msgid "Must enter a non-empty name for the new destination mailbox."
+msgstr "Must enter a non-empty name for the new destination mailbox."
+
+#: config/prefs.php:1491
+msgid "NONE"
+msgstr "NONE"
+
+#: lib/Pgp.php:787 templates/itip/action.html.php:79
+msgid "Name"
+msgstr "Name"
+
+#: lib/Prefs/Special/PgpPrivateKey.php:135
+msgid "Name and/or email cannot be empty"
+msgstr "Name and/or email cannot be empty"
+
+#: lib/Compose/LinkedAttachment.php:218
+#, php-format
+msgid "Name: %s"
+msgstr "Name: %s"
+
+#: lib/Basic/Search.php:495
+msgid "Need at least one date in the date range search."
+msgstr "Need at least one date in the date range search."
+
+#: lib/Compose.php:771
+msgid "Need at least one message recipient."
+msgstr "Need at least one message recipient."
+
+#: lib/Mime/Viewer/Itip.php:828
+msgid "Needs Action"
+msgstr "Needs Action"
+
+#: templates/prefs/acl.html.php:32
+msgid "Negative Right"
+msgstr "Negative Right"
+
+#: config/prefs.php:894 config/prefs.php:1226 config/prefs.php:1317
+#: config/prefs.php:1354 lib/Pgp.php:828
+msgid "Never"
+msgstr "Never"
+
+#: config/prefs.php:1131
+msgid "Never send read receipt"
+msgstr "Never send read receipt"
+
+#: templates/prefs/flags.html.php:46
+msgid "New Flag"
+msgstr "New Flag"
+
+#: config/prefs.php:1342
+msgid "New Mail"
+msgstr "New Mail"
+
+#: lib/Application.php:310 lib/Compose.php:2358 lib/Dynamic/Base.php:154
+#: lib/Dynamic/Compose.php:79 lib/Dynamic/Mailbox.php:114
+#: lib/Smartmobile.php:182 templates/dynamic/mailbox.html.php:54
+#: templates/smartmobile/compose.html.php:2
+#: templates/smartmobile/folders.html.php:11
+#: templates/smartmobile/mailbox.html.php:11
+msgid "New Message"
+msgstr "New Message"
+
+#: lib/Basic/Thread.php:245 lib/Basic/Thread.php:270
+#, php-format
+msgid "New Message to %s"
+msgstr "New Message to %s"
+
+#: templates/smime/import_extra_key.html.php:24
+#: templates/smime/import_extra_key.html.php:56
+#: templates/smime/import_identity_key.html.php:24
+#: templates/smime/import_identity_key.html.php:56
+#: templates/smime/import_personal_key.html.php:24
+#: templates/smime/import_personal_key.html.php:56
+msgid "New Password for Private Key"
+msgstr "New Password for Private Key"
+
+#: templates/prefs/acl.html.php:59
+msgid "New User"
+msgstr "New User"
+
+#: config/prefs.php:1361
+msgid "New mail poll interval on mailbox page:"
+msgstr "New mail poll interval on mailbox page:"
+
+#: templates/smartmobile/copymove.html.php:16
+msgid "New mailbox name:"
+msgstr "New mailbox name:"
+
+#: lib/Block/Newmail.php:35
+msgid "Newest Unseen Messages"
+msgstr "Newest Unseen Messages"
+
+#: lib/Prefs/Special/Remote.php:49 templates/prefs/remote.html.php:78
+#: templates/smartmobile/message.html.php:77
+msgid "Next"
+msgstr "Next"
+
+#: config/prefs.php:617 config/prefs.php:837 config/prefs.php:864
+#: config/prefs.php:1569
+msgid "No"
+msgstr "No"
+
+#: templates/prefs/pgpprivatekey.html.php:111
+msgid "No Expiration"
+msgstr "No Expiration"
+
+#: templates/prefs/pgppublickey.html.php:28
+#: templates/prefs/smimepublickey.html.php:12
+msgid "No Keys in Keyring"
+msgstr "No Keys in Keyring"
+
+#: lib/Basic/Pgp.php:64
+msgid "No PGP public key imported."
+msgstr "No PGP public key imported."
+
+#: lib/Dynamic/Compose/Common.php:260
+msgid "No Results Found"
+msgstr "No Results Found"
+
+#: lib/Basic/Smime.php:62
+msgid "No S/MIME public key imported."
+msgstr "No S/MIME public key imported."
+
+#: templates/prefs/searches.html.php:80
+msgid "No Saved Searches Defined."
+msgstr "No Saved Searches Defined."
+
+#: lib/Dynamic/Mailbox.php:266
+msgid "No Sort"
+msgstr "No Sort"
+
+#: templates/prefs/newmailaudio.html.php:9
+msgid "No Sound"
+msgstr "No Sound"
+
+#: lib/Spam.php:109
+msgid "No Subject"
+msgstr "No Subject"
+
+#: lib/Dynamic/Mailbox.php:249
+msgid "No actions available"
+msgstr "No actions available"
+
+#: lib/Basic/Contacts.php:102
+msgid "No addresses were selected."
+msgstr "No addresses were selected."
+
+#: templates/prefs/smimeprivatekey.html.php:224
+msgid "No alias"
+msgstr "No alias"
+
+#: lib/Prefs/Special/SmimeAliasHandler.php:22
+msgid "No alias entered."
+msgstr "No alias entered."
+
+#: lib/Smime.php:753
+msgid "No email information located in the public key."
+msgstr "No email information located in the public key."
+
+#: templates/prefs/smimeprivatekey.html.php:214
+msgid "No extra Privateys in Keystore"
+msgstr "No extra Privateys in Keystore"
+
+#: lib/Quota/Ui.php:110
+msgid "No limit"
+msgstr "No limit"
+
+#: lib/Block/Summary.php:104
+msgid "No mailboxes with unseen messages"
+msgstr "No mailboxes with unseen messages"
+
+#: lib/Compose.php:2272
+msgid "No message body text"
+msgstr "No message body text"
+
+#: lib/Dynamic/Message.php:33
+msgid "No message index given."
+msgstr "No message index given."
+
+#: lib/Dynamic/Mailbox.php:540 lib/Smartmobile.php:176
+msgid "No messages"
+msgstr "No messages"
+
+#: lib/Dynamic/Mailbox.php:560
+msgid "No messages matched the search query."
+msgstr "No messages matched the search query."
+
+#: lib/Ajax/Application/Handler/Passphrase.php:43
+msgid "No passphrase entered."
+msgstr "No passphrase entered."
+
+#: templates/prefs/smimeprivatekey.html.php:178
+msgid "No personal certificate"
+msgstr "No personal certificate"
+
+#: lib/Mime/Viewer/Smime.php:185
+msgid "No personal private key exists so the data is unable to be decrypted."
+msgstr "No personal private key exists so the data is unable to be decrypted."
+
+#: templates/prefs/remote.html.php:105
+msgid "No remote accounts configured"
+msgstr "No remote accounts configured"
+
+#: lib/Dynamic/Compose/Common.php:264
+msgid "No spelling errors found."
+msgstr "No spelling errors found."
+
+#: lib/Block/Newmail.php:68
+msgid "No unread messages"
+msgstr "No unread messages"
+
+#: lib/Pgp.php:241
+msgid "No valid public key found."
+msgstr "No valid public key found."
+
+#: lib/Mime/Viewer/Itip.php:877
+msgid "Non Participant"
+msgstr "Non Participant"
+
+#: lib/Compose/Ui.php:56 lib/Mime/Viewer/Itip.php:430
+#: lib/Mime/Viewer/Itip.php:607 lib/Mime/Viewer/Itip.php:770 lib/Pgp.php:830
+#: lib/Pgp.php:831 templates/prefs/acl.html.php:39
+#: templates/prefs/acl.html.php:74 templates/prefs/composetemplates.html.php:7
+#: templates/prefs/drafts.html.php:7 templates/prefs/sentmail.html.php:7
+#: templates/prefs/spam.html.php:7 templates/prefs/trash.html.php:7
+msgid "None"
+msgstr "None"
+
+#: lib/Dynamic/Compose/Common.php:223
+msgid "Normal"
+msgstr "Normal"
+
+#: lib/Flag/Base.php:174
+#, php-format
+msgid "Not %s"
+msgstr "Not %s"
+
+#: lib/Flag/Imap/NotJunk.php:38
+msgid "Not Junk"
+msgstr "Not Junk"
+
+#: lib/Smime.php:746
+msgid "Not a valid public key."
+msgstr "Not a valid public key."
+
+#: templates/flist/flist.html.php:60 templates/flist/flist.html.php:63
+msgid "Notepads"
+msgstr "Notepads"
+
+#: config/prefs.php:1290 config/prefs.php:1304
+msgid "Nothing"
+msgstr "Nothing"
+
+#: lib/Compose/LinkedAttachment.php:208
+msgid "Notification: Linked attachment downloaded"
+msgstr "Notification: Linked attachment downloaded"
+
+#: templates/contacts/contacts.html.php:57
+msgid "OK"
+msgstr "OK"
+
+#: lib/Basic/Search.php:499 lib/Search/Element/Or.php:39
+#: templates/pgp/import_key.html.php:33
+#: templates/smime/import_public_key.html.php:17
+msgid "OR"
+msgstr "OR"
+
+#: lib/LoginTasks/Task/DeleteSentmailMonthly.php:72
+msgid "Old sent-mail mailboxes being purged."
+msgstr "Old sent-mail mailboxes being purged."
+
+#: lib/Basic/Search.php:95 lib/Search/Element/Within.php:79
+msgid "Older Than"
+msgstr "Older Than"
+
+#: lib/Search/Element/Daterange.php:113
+#, php-format
+msgid "On '%s'"
+msgstr "On '%s'"
+
+#: lib/Block/Summary.php:52
+msgid "Only display mailboxes with unread messages in them?"
+msgstr "Only display mailboxes with unread messages in them?"
+
+#: templates/dynamic/mailbox.html.php:108
+msgid "Open in new window"
+msgstr "Open in new window"
+
+#: lib/Mailbox.php:1764
+msgid "Opened Folder"
+msgstr "Opened Folder"
+
+#: lib/Mime/Viewer/Itip.php:873
+msgid "Optional Participant"
+msgstr "Optional Participant"
+
+#: templates/smime/import_extra_key.html.php:33
+#: templates/smime/import_identity_key.html.php:33
+#: templates/smime/import_personal_key.html.php:33
+msgid "Optional Secondary S/MIME Certificate"
+msgstr "Optional Secondary S/MIME Certificate"
+
+#: templates/dynamic/mailbox.html.php:16
+msgid "Other"
+msgstr "Other"
+
+#: templates/dynamic/compose.html.php:92 templates/dynamic/mailbox.html.php:88
+#: templates/dynamic/mailbox.html.php:126
+msgid "Other Options"
+msgstr "Other Options"
+
+#: lib/Mailbox.php:1652
+msgid "Other Users"
+msgstr "Other Users"
+
+#: config/prefs.php:344
+msgid "PGP"
+msgstr "PGP"
+
+#: lib/Pgp.php:73
+msgid "PGP Encrypt Message"
+msgstr "PGP Encrypt Message"
+
+#: lib/Pgp.php:84
+msgid "PGP Encrypt Message with passphrase"
+msgstr "PGP Encrypt Message with passphrase"
+
+#: lib/Compose.php:1090
+msgid "PGP Error: "
+msgstr "PGP Error: "
+
+#: templates/prefs/pgpprivatekey.html.php:11
+msgid "PGP Personal Key support requires a secure web connection."
+msgstr "PGP Personal Key support requires a secure web connection."
+
+#: lib/Basic/Pgp.php:56
+#, php-format
+msgid "PGP Public Key for \"%s (%s)\" was successfully added."
+msgstr "PGP Public Key for \"%s (%s)\" was successfully added."
+
+#: lib/Prefs/Special/PgpPublicKey.php:107
+#, php-format
+msgid "PGP Public Key for \"%s\" was successfully deleted."
+msgstr "PGP Public Key for \"%s\" was successfully deleted."
+
+#: templates/prefs/pgppublickey.html.php:4
+msgid "PGP Public Keyring"
+msgstr "PGP Public Keyring"
+
+#: lib/Pgp.php:78
+msgid "PGP Sign Message"
+msgstr "PGP Sign Message"
+
+#: lib/Pgp.php:79
+msgid "PGP Sign/Encrypt Message"
+msgstr "PGP Sign/Encrypt Message"
+
+#: lib/Pgp.php:85
+msgid "PGP Sign/Encrypt Message with passphrase"
+msgstr "PGP Sign/Encrypt Message with passphrase"
+
+#: lib/Prefs/Special/PgpPrivateKey.php:171
+msgid "PGP passphrase successfully unloaded."
+msgstr "PGP passphrase successfully unloaded."
+
+#: config/prefs.php:371
+msgid ""
+"PGP support requires popup windows to be used. If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+msgstr ""
+"PGP support requires popup windows to be used. If your browser is currently "
+"set to disable popup windows, you must change this setting or else the PGP "
+"features will not work correctly."
+
+#: lib/Compose.php:1038
+msgid "PGP: Need passphrase for personal private key."
+msgstr "PGP: Need passphrase for personal private key."
+
+#: lib/Compose.php:1055
+msgid "PGP: Need passphrase to encrypt your message with."
+msgstr "PGP: Need passphrase to encrypt your message with."
+
+#: templates/prefs/remote.html.php:49
+msgid "POP3"
+msgstr "POP3"
+
+#: lib/Contents/Message.php:187
+msgid "Parts"
+msgstr "Parts"
+
+#: templates/prefs/pgpprivatekey.html.php:87
+msgid "Passphrase"
+msgstr "Passphrase"
+
+#: templates/prefs/pgpprivatekey.html.php:98
+msgid "Passphrase (Again)"
+msgstr "Passphrase (Again)"
+
+#: lib/Ajax/Application/Handler/Passphrase.php:65
+msgid "Passphrase verified."
+msgstr "Passphrase verified."
+
+#: lib/Prefs/Special/PgpPrivateKey.php:138
+msgid "Passphrases cannot be empty"
+msgstr "Passphrases cannot be empty"
+
+#: lib/Prefs/Special/PgpPrivateKey.php:140
+msgid "Passphrases do not match"
+msgstr "Passphrases do not match"
+
+#: templates/prefs/remote.html.php:16
+msgid "Password"
+msgstr "Password"
+
+#: lib/Dynamic/Mailbox.php:551
+#, php-format
+msgid "Password for %s:"
+msgstr "Password for %s:"
+
+#: templates/smime/import_extra_key.html.php:18
+#: templates/smime/import_extra_key.html.php:50
+#: templates/smime/import_identity_key.html.php:18
+#: templates/smime/import_identity_key.html.php:50
+#: templates/smime/import_personal_key.html.php:18
+#: templates/smime/import_personal_key.html.php:50
+msgid "Password of Uploaded Certificate"
+msgstr "Password of Uploaded Certificate"
+
+#: templates/pgp/import_key.html.php:15
+msgid ""
+"Paste PGP public keys into the textarea, upload a file containing PGP public "
+"keys, or combine both methods. Multiple keys are supported."
+msgstr ""
+"Paste PGP public keys into the textarea, upload a file containing PGP public "
+"keys, or combine both methods. Multiple keys are supported."
+
+#: templates/pgp/import_key.html.php:17
+msgid ""
+"Paste your PGP private key into the textarea or upload a file containing "
+"your key."
+msgstr ""
+"Paste your PGP private key into the textarea or upload a file containing "
+"your key."
+
+#: templates/itip/action.html.php:53
+msgid "Percent complete"
+msgstr "Percent complete"
+
+#: lib/Dynamic/Mailbox.php:532
+#, php-format
+msgid "Permanently delete %s?"
+msgstr "Permanently delete %s?"
+
+#: lib/Dynamic/Mailbox.php:534
+#, php-format
+msgid "Permanently delete all %d messages in %s?"
+msgstr "Permanently delete all %d messages in %s?"
+
+#: lib/Flag/System/Personal.php:39
+msgid "Personal"
+msgstr "Personal"
+
+#: config/prefs.php:15
+msgid "Personal Information"
+msgstr "Personal Information"
+
+#: lib/Basic/Search.php:128 lib/Search/Element/Personal.php:71
+#: lib/Search/Filter/Personal.php:30
+msgid "Personal Messages"
+msgstr "Personal Messages"
+
+#: lib/Basic/Pgp.php:95
+msgid "Personal PGP key not imported."
+msgstr "Personal PGP key not imported."
+
+#: lib/Basic/Pgp.php:91
+msgid "Personal PGP key successfully added."
+msgstr "Personal PGP key successfully added."
+
+#: lib/Prefs/Special/PgpPrivateKey.php:157
+msgid "Personal PGP keypair generated successfully."
+msgstr "Personal PGP keypair generated successfully."
+
+#: lib/Prefs/Special/PgpPrivateKey.php:121
+msgid "Personal PGP keys deleted successfully."
+msgstr "Personal PGP keys deleted successfully."
+
+#: lib/Basic/Smime.php:188 lib/Basic/Smime.php:227
+msgid "Personal S/MIME certificates NOT imported."
+msgstr "Personal S/MIME certificates NOT imported."
+
+#: lib/Basic/Smime.php:191 lib/Basic/Smime.php:230 lib/Basic/Smime.php:242
+msgid "Personal S/MIME certificates NOT imported: "
+msgstr "Personal S/MIME certificates NOT imported: "
+
+#: lib/Prefs/Special/SmimePrivateKey.php:374
+msgid "Personal S/MIME keys deleted successfully."
+msgstr "Personal S/MIME keys deleted successfully."
+
+#: config/prefs.php:552
+msgid "Plain Text"
+msgstr "Plain Text"
+
+#: lib/Compose.php:1843
+msgid "Plaintext Message"
+msgstr "Plaintext Message"
+
+#: config/prefs.php:1033
+msgid "Plaintext part"
+msgstr "Plaintext part"
+
+#: templates/prefs/newmailaudio.html.php:3
+msgid ""
+"Play a sound when receiving new mail? Although most browsers support "
+"embedded sound files, some may require a plugin."
+msgstr ""
+"Play a sound when receiving new mail? Although most browsers support "
+"embedded sound files, some may require a plugin."
+
+#: lib/Application.php:221
+msgid "Please choose a mail server."
+msgstr "Please choose a mail server."
+
+#: lib/Prefs/Special/Flag.php:52
+msgid "Please enter the label for the new flag:"
+msgstr "Please enter the label for the new flag:"
+
+#: lib/Basic/Search.php:496
+msgid "Please select at least one mailbox to search."
+msgstr "Please select at least one mailbox to search."
+
+#: lib/Basic/Search.php:494
+msgid "Please select at least one search criteria."
+msgstr "Please select at least one search criteria."
+
+#: lib/Smime.php:596
+msgid "Please set a correct password before unsetting the keys."
+msgstr "Please set a correct password before unsetting the keys."
+
+#: lib/Prefs/Special/Remote.php:50
+msgid "Please wait..."
+msgstr "Please wait..."
+
+#: config/prefs.php:1606
+msgid "Poll all mailboxes for new mail?"
+msgstr "Poll all mailboxes for new mail?"
+
+#: templates/prefs/remote.html.php:69
+msgid "Port"
+msgstr "Port"
+
+#: lib/Dynamic/Mailbox.php:549
+msgid "Portal"
+msgstr "Portal"
+
+#: templates/itip/action.html.php:97
+msgid "Possible Conflicts"
+msgstr "Possible Conflicts"
+
+#: lib/Imap/Acl.php:180 templates/prefs/acl.html.php:41
+#: templates/prefs/acl.html.php:76
+msgid "Post"
+msgstr "Post"
+
+#: lib/Imap/Acl.php:179
+msgid "Post to this mailbox (not enforced by IMAP)"
+msgstr "Post to this mailbox (not enforced by IMAP)"
+
+#: config/prefs.php:62
+msgid "Precede your text signature with dashes ('-- ')?"
+msgstr "Precede your text signature with dashes ('-- ')?"
+
+#: templates/smartmobile/message.html.php:74
+msgid "Previous"
+msgstr "Previous"
+
+#: lib/Contents.php:853 lib/Contents.php:854
+msgid "Print"
+msgstr "Print"
+
+#: lib/Contents/View.php:248
+msgid "Printed By"
+msgstr "Printed By"
+
+#: config/prefs.php:1423
+msgid "Printing"
+msgstr "Printing"
+
+#: templates/dynamic/compose.html.php:80 templates/itip/action.html.php:21
+msgid "Priority"
+msgstr "Priority"
+
+#: templates/prefs/smimeprivatekey.html.php:239
+msgid "Private Certificate: "
+msgstr "Private Certificate: "
+
+#: lib/Pgp.php:826
+msgid "Private Key"
+msgstr "Private Key"
+
+#: config/prefs.php:1137
+msgid ""
+"Prompt to send read receipt (a/k/a message disposition notification) when "
+"requested by the sender?"
+msgstr ""
+"Prompt to send read receipt (a/k/a message disposition notification) when "
+"requested by the sender?"
+
+#: templates/prefs/smimeprivatekey.html.php:232
+msgid "Public Certificate: "
+msgstr "Public Certificate: "
+
+#: lib/Pgp.php:826
+msgid "Public Key"
+msgstr "Public Key"
+
+#: lib/Pgp.php:956
+msgid "Public PGP keyserver support has been disabled."
+msgstr "Public PGP keyserver support has been disabled."
+
+#: lib/Imap/Acl.php:200
+msgid "Purge"
+msgstr "Purge"
+
+#: lib/Dynamic/Mailbox.php:437 templates/smartmobile/mailbox.html.php:30
+msgid "Purge Deleted"
+msgstr "Purge Deleted"
+
+#: config/prefs.php:1318
+msgid "Purge Spam mailbox how often:"
+msgstr "Purge Spam mailbox how often:"
+
+#: config/prefs.php:1227
+msgid "Purge Trash how often:"
+msgstr "Purge Trash how often:"
+
+#: lib/Imap/Acl.php:199
+msgid "Purge messages"
+msgstr "Purge messages"
+
+#: config/prefs.php:1328
+msgid "Purge messages in Spam mailbox older than this amount of days."
+msgstr "Purge messages in Spam mailbox older than this amount of days."
+
+#: config/prefs.php:1239
+msgid "Purge messages in Trash mailbox older than this amount of days."
+msgstr "Purge messages in Trash mailbox older than this amount of days."
+
+#: config/prefs.php:905
+msgid "Purge messages in sent mail mailbox(es) older than this amount of days."
+msgstr ""
+"Purge messages in sent mail mailbox(es) older than this amount of days."
+
+#: config/prefs.php:895
+msgid "Purge sent mail how often:"
+msgstr "Purge sent mail how often:"
+
+#: lib/LoginTasks/Task/PurgeSpam.php:67
+#, php-format
+msgid "Purging %d message from Spam mailbox."
+msgid_plural "Purging %d messages from Spam mailbox."
+msgstr[0] "Purging %d message from Spam mailbox."
+msgstr[1] "Purging %d messages from Spam mailbox."
+
+#: lib/LoginTasks/Task/PurgeTrash.php:70
+#, php-format
+msgid "Purging %d message from Trash mailbox."
+msgid_plural "Purging %d messages from Trash mailbox."
+msgstr[0] "Purging %d message from Trash mailbox."
+msgstr[1] "Purging %d messages from Trash mailbox."
+
+#: lib/LoginTasks/Task/PurgeSentmail.php:70
+#, php-format
+msgid "Purging %d messages from sent-mail mailbox."
+msgstr "Purging %d messages from sent-mail mailbox."
+
+#: lib/LoginTasks/Task/PurgeSentmail.php:68
+#, php-format
+msgid "Purging 1 message from sent-mail mailbox %s."
+msgstr "Purging 1 message from sent-mail mailbox %s."
+
+#: config/prefs.php:740
+#, php-format
+msgid "Quoting %f:"
+msgstr "Quoting %f:"
+
+#: lib/Imap/Acl.php:164 templates/prefs/acl.html.php:40
+#: templates/prefs/acl.html.php:75
+msgid "Read"
+msgstr "Read"
+
+#: lib/Dynamic/Compose/Common.php:163
+msgid "Read Receipt"
+msgstr "Read Receipt"
+
+#: lib/Imap/Acl.php:163
+msgid "Read messages"
+msgstr "Read messages"
+
+#: templates/dynamic/mailbox_subinfo.html.php:6
+#: templates/subinfo/subinfo.html.php:8
+msgid "Read-Only"
+msgstr "Read-Only"
+
+#: templates/smartmobile/folders.html.php:25
+msgid "Rebuild"
+msgstr "Rebuild"
+
+#: lib/Dynamic/Mailbox.php:297
+msgid "Rebuild Folder List"
+msgstr "Rebuild Folder List"
+
+#: templates/search/search.html.php:16
+msgid "Recent Searches"
+msgstr "Recent Searches"
+
+#: lib/Compose.php:790
+msgid "Recipient address does not match the currently selected identity."
+msgstr "Recipient address does not match the currently selected identity."
+
+#: lib/Mime/Viewer/Mdn.php:143 lib/Mime/Viewer/Status.php:160
+#, php-format
+msgid "Recipient: %s"
+msgstr "Recipient: %s"
+
+#: lib/Basic/Search.php:59 lib/Dynamic/Mailbox.php:496
+#: templates/smartmobile/search.html.php:12
+msgid "Recipients (To/Cc/Bcc)"
+msgstr "Recipients (To/Cc/Bcc)"
+
+#: lib/Search/Element/Recipient.php:70
+#, php-format
+msgid "Recipients (To/Cc/Bcc) for '%s'"
+msgstr "Recipients (To/Cc/Bcc) for '%s'"
+
+#: templates/itip/action.html.php:67
+msgid "Recurrence"
+msgstr "Recurrence"
+
+#: lib/Dynamic/Base.php:177 lib/Dynamic/Compose.php:150
+#: lib/Notification/Event/Status.php:32 templates/dynamic/redirect.html.php:7
+#: templates/smartmobile/message.html.php:55
+msgid "Redirect"
+msgstr "Redirect"
+
+#: templates/dynamic/mailbox.html.php:26
+#: templates/smartmobile/folders.html.php:9
+#: templates/smartmobile/mailbox.html.php:9
+msgid "Refresh"
+msgstr "Refresh"
+
+#: templates/dynamic/mailbox.html.php:61
+msgid "Refresh Search Results"
+msgstr "Refresh Search Results"
+
+#: lib/Mime/Viewer/Itip.php:251
+msgid "Remember the free/busy information."
+msgstr "Remember the free/busy information."
+
+#: config/prefs.php:1571
+msgid "Remember the last view"
+msgstr "Remember the last view"
+
+#: lib/Mailbox.php:1774
+msgid "Remote Account"
+msgstr "Remote Account"
+
+#: config/prefs.php:164 lib/Mailbox.php:1648
+msgid "Remote Accounts"
+msgstr "Remote Accounts"
+
+#: templates/contacts/contacts.html.php:50
+msgid "Remove"
+msgstr "Remove"
+
+#: lib/Dynamic/Mailbox.php:227 lib/Dynamic/Mailbox.php:357
+msgid "Rename"
+msgstr "Rename"
+
+#: lib/Dynamic/Mailbox.php:552
+#, php-format
+msgid "Rename %s to:"
+msgstr "Rename %s to:"
+
+#: config/prefs.php:873
+msgid "Rename sent mail mailbox at beginning of month?"
+msgstr "Rename sent mail mailbox at beginning of month?"
+
+#: lib/Mailbox.php:877
+#, php-format
+msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
+msgstr "Renaming \"%s\" to \"%s\" failed. This is what the server said"
+
+#: config/prefs.php:705
+msgid "Replies"
+msgstr "Replies"
+
+#: lib/Dynamic/Compose.php:105 lib/Dynamic/Mailbox.php:316
+#: lib/Notification/Event/Status.php:39 templates/dynamic/mailbox.html.php:29
+#: templates/dynamic/message.html.php:12
+msgid "Reply"
+msgstr "Reply"
+
+#: templates/smartmobile/message.html.php:33
+msgid "Reply (Auto)"
+msgstr "Reply (Auto)"
+
+#: lib/Ajax/Imple/ItipRequest.php:326 lib/Ajax/Imple/ItipRequest.php:438
+msgid "Reply Sent."
+msgstr "Reply Sent."
+
+#: templates/dynamic/compose.html.php:172
+#: templates/dynamic/compose.html.php:176
+msgid "Reply To Sender instead"
+msgstr "Reply To Sender instead"
+
+#: lib/Dynamic/Compose.php:109 templates/smartmobile/message.html.php:39
+msgid "Reply to All"
+msgstr "Reply to All"
+
+#: lib/Dynamic/Compose.php:113 templates/smartmobile/message.html.php:42
+msgid "Reply to List"
+msgstr "Reply to List"
+
+#: templates/smartmobile/message.html.php:36
+msgid "Reply to Sender"
+msgstr "Reply to Sender"
+
+#: lib/Mime/Viewer/Itip.php:254 lib/Mime/Viewer/Itip.php:263
+msgid "Reply with Not Supported Message"
+msgstr "Reply with Not Supported Message"
+
+#: lib/Mime/Viewer/Itip.php:261
+msgid "Reply with free/busy for next 2 months."
+msgstr "Reply with free/busy for next 2 months."
+
+#: lib/Mime/Viewer/Itip.php:260
+msgid "Reply with requested free/busy information."
+msgstr "Reply with requested free/busy information."
+
+#: lib/Compose.php:2749
+msgid "Reply-To"
+msgstr "Reply-To"
+
+#: templates/smartmobile/message.html.php:24
+msgid "Reply..."
+msgstr "Reply..."
+
+#: templates/smartmobile/message.html.php:92
+#: templates/smartmobile/message.html.php:107
+msgid "Report"
+msgstr "Report"
+
+#: lib/Dynamic/Mailbox.php:325 templates/smartmobile/message.html.php:85
+msgid "Report as Innocent"
+msgstr "Report as Innocent"
+
+#: lib/Dynamic/Mailbox.php:324 templates/smartmobile/message.html.php:100
+msgid "Report as Spam"
+msgstr "Report as Spam"
+
+#: config/prefs.php:620
+msgid "Request read receipts?"
+msgstr "Request read receipts?"
+
+#: lib/Contents/Message.php:123
+msgid "Requested message not found."
+msgstr "Requested message not found."
+
+#: templates/prefs/remote.html.php:33
+msgid "Required"
+msgstr "Required"
+
+#: lib/Mime/Viewer/Itip.php:865
+msgid "Required Participant"
+msgstr "Required Participant"
+
+#: lib/Dynamic/Base.php:193
+#, php-format
+msgid "Resent on %s by:"
+msgstr "Resent on %s by:"
+
+#: templates/search/search.html.php:105
+msgid "Reset"
+msgstr "Reset"
+
+#: lib/Ajax/Imple/ItipRequest.php:136 lib/Ajax/Imple/ItipRequest.php:154
+#: lib/Mime/Viewer/Itip.php:370 lib/Mime/Viewer/Itip.php:750
+msgid "Respondent Status Updated."
+msgstr "Respondent Status Updated."
+
+#: lib/Dynamic/Mailbox.php:555
+#, php-format
+msgid "Results are %d Minutes Old"
+msgstr "Results are %d Minutes Old"
+
+#: templates/dynamic/mailbox.html.php:45
+msgid "Resume"
+msgstr "Resume"
+
+#: lib/Dynamic/Mailbox.php:311 templates/dynamic/mailbox.html.php:114
+msgid "Resume Draft"
+msgstr "Resume Draft"
+
+#: lib/Dynamic/Compose/Common.php:291
+msgid "Resume Editing"
+msgstr "Resume Editing"
+
+#: templates/dynamic/mailbox.html.php:69
+msgid "Retry"
+msgstr "Retry"
+
+#: lib/Basic/Search.php:508
+#, php-format
+msgid "Return to %s"
+msgstr "Return to %s"
+
+#: config/prefs.php:1161
+msgid ""
+"Return to the mailbox listing after deleting, moving, or copying a message?"
+msgstr ""
+"Return to the mailbox listing after deleting, moving, or copying a message?"
+
+#: config/prefs.php:553
+msgid "Rich Text (HTML)"
+msgstr "Rich Text (HTML)"
+
+#: templates/itip/action.html.php:80
+msgid "Role"
+msgstr "Role"
+
+#: config/prefs.php:427
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:409
+msgid ""
+"S/MIME Certificate set and successfully transfered previous certificate to "
+"extra keys."
+msgstr ""
+"S/MIME Certificate set and successfully transfered previous certificate to "
+"extra keys."
+
+#: lib/Smime.php:609
+msgid "S/MIME Certificate unset and successfully transfered to extra keys."
+msgstr "S/MIME Certificate unset and successfully transfered to extra keys."
+
+#: lib/Smime.php:615
+msgid "S/MIME Certificates were not proberly deleted from database."
+msgstr "S/MIME Certificates were not proberly deleted from database."
+
+#: lib/Smime.php:101
+msgid "S/MIME Encrypt Message"
+msgstr "S/MIME Encrypt Message"
+
+#: lib/Compose.php:1138
+msgid "S/MIME Error: "
+msgstr "S/MIME Error: "
+
+#: lib/Compose.php:1114
+msgid "S/MIME Error: Need passphrase for personal private key."
+msgstr "S/MIME Error: Need passphrase for personal private key."
+
+#: lib/Basic/Smime.php:388
+msgid "S/MIME Key Information"
+msgstr "S/MIME Key Information"
+
+#: templates/prefs/smimeprivatekey.html.php:5
+msgid "S/MIME Personal Certificate of Identity"
+msgstr "S/MIME Personal Certificate of Identity"
+
+#: templates/prefs/smimeprivatekey.html.php:30
+msgid "S/MIME Personal Certificate support requires a secure web connection."
+msgstr "S/MIME Personal Certificate support requires a secure web connection."
+
+#: lib/Prefs/Special/SmimePublicKey.php:108
+#, php-format
+msgid "S/MIME Public Key for \"%s\" was successfully deleted."
+msgstr "S/MIME Public Key for \"%s\" was successfully deleted."
+
+#: templates/prefs/smimepublickey.html.php:4
+msgid "S/MIME Public Keyring"
+msgstr "S/MIME Public Keyring"
+
+#: lib/Smime.php:1213
+msgid ""
+"S/MIME Public/Private Keypair successfully added to exra keys in keystore."
+msgstr ""
+"S/MIME Public/Private Keypair successfully added to exra keys in keystore."
+
+#: lib/Basic/Smime.php:218
+msgid "S/MIME Public/Private Keypair successfully added."
+msgstr "S/MIME Public/Private Keypair successfully added."
+
+#: lib/Smime.php:107
+msgid "S/MIME Sign Message"
+msgstr "S/MIME Sign Message"
+
+#: lib/Smime.php:108
+msgid "S/MIME Sign/Encrypt Message"
+msgstr "S/MIME Sign/Encrypt Message"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:418
+msgid ""
+"S/MIME Singing Certificate set and successfully transfered previous signing "
+"certificate to extra keys."
+msgstr ""
+"S/MIME Singing Certificate set and successfully transfered previous signing "
+"certificate to extra keys."
+
+#: lib/Prefs/Special/SmimePrivateKey.php:394
+msgid "S/MIME passphrase successfully unloaded."
+msgstr "S/MIME passphrase successfully unloaded."
+
+#: lib/Basic/Smime.php:59
+msgid "S/MIME public key successfully added."
+msgstr "S/MIME public key successfully added."
+
+#: lib/Mime/Viewer/Smime.php:180
+msgid ""
+"S/MIME support is not currently enabled so the data is unable to be "
+"decrypted."
+msgstr ""
+"S/MIME support is not currently enabled so the data is unable to be "
+"decrypted."
+
+#: lib/Mime/Viewer/Smime.php:350
+msgid ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+msgstr ""
+"S/MIME support is not enabled so the digital signature is unable to be "
+"verified."
+
+#: config/prefs.php:455
+msgid ""
+"S/MIME support requires popup windows to be used. If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+msgstr ""
+"S/MIME support requires popup windows to be used. If your browser is "
+"currently set to disable popup windows, you must change this setting or else "
+"the S/MIME features will not work correctly."
+
+#: lib/Dynamic/Mailbox.php:467 templates/dynamic/message.html.php:48
+#: templates/dynamic/message.html.php:50 templates/prefs/remote.html.php:79
+#: templates/search/search.html.php:101
+msgid "Save"
+msgstr "Save"
+
+#: lib/Dynamic/Compose/Common.php:172
+msgid "Save Attachments in Sent Mailbox"
+msgstr "Save Attachments in Sent Mailbox"
+
+#: templates/smartmobile/compose.html.php:62
+msgid "Save Draft"
+msgstr "Save Draft"
+
+#: lib/Basic/Saveimage.php:82
+msgid "Save Image"
+msgstr "Save Image"
+
+#: lib/Contents.php:845
+msgid "Save Image in Gallery"
+msgstr "Save Image in Gallery"
+
+#: templates/search/search.html.php:71
+msgid "Save Search"
+msgstr "Save Search"
+
+#: templates/dynamic/compose.html.php:30
+msgid "Save Template"
+msgstr "Save Template"
+
+#: templates/dynamic/compose.html.php:40
+msgid "Save as Draft"
+msgstr "Save as Draft"
+
+#: config/prefs.php:866
+msgid "Save attachments in the sent-mail message?"
+msgstr "Save attachments in the sent-mail message?"
+
+#: config/prefs.php:828
+msgid "Save drafts as unseen?"
+msgstr "Save drafts as unseen?"
+
+#: config/prefs.php:841
+msgid "Save drafts automatically while composing?"
+msgstr "Save drafts automatically while composing?"
+
+#: templates/dynamic/compose.html.php:66
+msgid "Save in"
+msgstr "Save in"
+
+#: templates/dynamic/mailbox.html.php:247
+msgid "Save password?"
+msgstr "Save password?"
+
+#: config/prefs.php:934
+msgid "Save recipients automatically to the default address book?"
+msgstr "Save recipients automatically to the default address book?"
+
+#: templates/dynamic/compose.html.php:74
+msgid "Save sent mail"
+msgstr "Save sent mail"
+
+#: config/prefs.php:90
+msgid "Save sent mail?"
+msgstr "Save sent mail?"
+
+#: lib/Mime/Viewer/Smime.php:425
+msgid "Save the certificate to your Address Book."
+msgstr "Save the certificate to your Address Book."
+
+#: lib/Mime/Viewer/Pgp.php:380
+msgid "Save the key to your address book."
+msgstr "Save the key to your address book."
+
+#: config/prefs.php:191
+msgid "Saved Searches"
+msgstr "Saved Searches"
+
+#: lib/Basic/Search.php:497
+msgid "Saved searches require a label."
+msgstr "Saved searches require a label."
+
+#: lib/Compose.php:339
+msgid "Saving the draft failed. Could not create a drafts mailbox."
+msgstr "Saving the draft failed. Could not create a drafts mailbox."
+
+#: lib/Compose.php:334
+msgid "Saving the draft failed. No drafts mailbox specified."
+msgstr "Saving the draft failed. No drafts mailbox specified."
+
+#: lib/Compose.php:268
+#, php-format
+msgid ""
+"Saving the message failed because it contains an invalid e-mail address: %s."
+msgstr ""
+"Saving the message failed because it contains an invalid e-mail address: %s."
+
+#: lib/Compose.php:671
+msgid "Saving the template failed: could not create the templates mailbox."
+msgstr "Saving the template failed: could not create the templates mailbox."
+
+#: lib/Compose.php:666
+msgid "Saving the template failed: no template mailbox exists."
+msgstr "Saving the template failed: no template mailbox exists."
+
+#: lib/Application.php:338 lib/Basic/Search.php:515 lib/Dynamic/Mailbox.php:230
+#: lib/Dynamic/Mailbox.php:368 lib/Dynamic/Mailbox.php:553
+#: templates/contacts/contacts.html.php:21 templates/search/search.html.php:11
+#: templates/smartmobile/mailbox.html.php:22
+#: templates/smartmobile/search.html.php:3
+msgid "Search"
+msgstr "Search"
+
+#: lib/Search/Filter.php:48
+#, php-format
+msgid "Search %s"
+msgstr "Search %s"
+
+#: lib/Search/Query.php:291
+#, php-format
+msgid "Search %s in %s"
+msgstr "Search %s in %s"
+
+#: lib/Dynamic/Mailbox.php:554
+#, php-format
+msgid "Search (%s)"
+msgstr "Search (%s)"
+
+#: lib/Basic/Search.php:500
+msgid "Search All Mailboxes"
+msgstr "Search All Mailboxes"
+
+#: templates/search/search.html.php:23
+msgid "Search Criteria"
+msgstr "Search Criteria"
+
+#: templates/search/search.html.php:52
+msgid "Search Mailboxes"
+msgstr "Search Mailboxes"
+
+#: lib/Search/Query.php:144 lib/Smartmobile.php:185
+#: templates/contacts/contacts.html.php:28
+msgid "Search Results"
+msgstr "Search Results"
+
+#: lib/Basic/Search.php:501
+msgid "Search Term:"
+msgstr "Search Term:"
+
+#: lib/Basic/Search.php:502
+msgid "Search all subfolders?"
+msgstr "Search all subfolders?"
+
+#: lib/Basic/Contacts.php:103
+msgid "Searching..."
+msgstr "Searching..."
+
+#: lib/Basic/Smime.php:221 lib/Basic/Smime.php:239
+msgid "Secondary S/MIME Public/Private Keypair successfully added."
+msgstr "Secondary S/MIME Public/Private Keypair successfully added."
+
+#: lib/Prefs/Special/SmimePrivateKey.php:384
+msgid "Secondary extra S/MIME keys deleted successfully."
+msgstr "Secondary extra S/MIME keys deleted successfully."
+
+#: lib/Basic/Smime.php:280
+msgid "Secondary personal S/MIME certificates NOT imported."
+msgstr "Secondary personal S/MIME certificates NOT imported."
+
+#: lib/Basic/Smime.php:285
+msgid "Secondary personal S/MIME certificates NOT imported: "
+msgstr "Secondary personal S/MIME certificates NOT imported: "
+
+#: lib/Prefs/Special/SmimePrivateKey.php:373
+msgid "Secondary personal S/MIME keys deleted successfully."
+msgstr "Secondary personal S/MIME keys deleted successfully."
+
+#: lib/Dynamic/Mailbox.php:243 lib/Flag/Imap/Seen.php:42
+msgid "Seen"
+msgstr "Seen"
+
+#: templates/itip/action.html.php:125
+msgid "Select"
+msgstr "Select"
+
+#: templates/dynamic/mailbox.html.php:192
+#: templates/dynamic/mailbox.html.php:212
+msgid "Select All"
+msgstr "Select All"
+
+#: config/prefs.php:920
+msgid "Select address book sources for adding/searching."
+msgstr "Select address book sources for adding/searching."
+
+#: templates/contacts/contacts.html.php:30
+msgid "Select address(es)"
+msgstr "Select address(es)"
+
+#: templates/saveimage/saveimage.html.php:8
+msgid "Select the gallery to save the image in."
+msgstr "Select the gallery to save the image in."
+
+#: templates/contacts/contacts.html.php:41
+msgid "Selected Addresses"
+msgstr "Selected Addresses"
+
+#: templates/dynamic/compose.html.php:24
+msgid "Send"
+msgstr "Send"
+
+#: lib/Prefs/Special/PgpPrivateKey.php:59
+#: templates/prefs/pgpprivatekey.html.php:23
+msgid "Send Key to Public Keyserver"
+msgstr "Send Key to Public Keyserver"
+
+#: lib/Mime/Viewer/Itip.php:354
+msgid "Send Latest Information"
+msgstr "Send Latest Information"
+
+#: templates/smartmobile/compose.html.php:53
+msgid "Send Message"
+msgstr "Send Message"
+
+#: lib/Smartmobile.php:184
+msgid "Send message without a Subject?"
+msgstr "Send message without a Subject?"
+
+#: lib/Dynamic/Compose/Common.php:261
+msgid "Send message without a subject?"
+msgstr "Send message without a subject?"
+
+#: lib/Mime/Viewer/Smime.php:392 lib/Mime/Viewer/Smime.php:432
+#, php-format
+msgid "Sender: %s"
+msgstr "Sender: %s"
+
+#: lib/Mailbox.php:1701 lib/Mailbox.php:1813
+msgid "Sent"
+msgstr "Sent"
+
+#: lib/Compose/LinkedAttachment.php:220
+#, php-format
+msgid "Sent Date: %s"
+msgstr "Sent Date: %s"
+
+#: config/prefs.php:850
+msgid "Sent Mail"
+msgstr "Sent Mail"
+
+#: templates/prefs/sentmail.html.php:3
+msgid "Sent mail mailbox:"
+msgstr "Sent mail mailbox:"
+
+#: lib/Application.php:213 templates/prefs/remote.html.php:55
+#: templates/prefs/remote.html.php:87
+msgid "Server"
+msgstr "Server"
+
+#: templates/prefs/specialuse.html.php:2
+msgid "Server Suggestion"
+msgstr "Server Suggestion"
+
+#: templates/prefs/smimeprivatekey.html.php:47
+#: templates/prefs/smimeprivatekey.html.php:122
+msgid "Set Alias for your certificate: "
+msgstr "Set Alias for your certificate: "
+
+#: config/prefs.php:545
+msgid "Set a priority header when composing messages?"
+msgstr "Set a priority header when composing messages?"
+
+#: lib/Imap/Acl.php:183
+msgid "Set permissions for other users"
+msgstr "Set permissions for other users"
+
+#: config/prefs.php:1151
+msgid "Set preferences for what happens when you move and delete messages."
+msgstr "Set preferences for what happens when you move and delete messages."
+
+#: templates/prefs/smimeprivatekey.html.php:244
+msgid "Set this key as a secondary sign certificate:"
+msgstr "Set this key as a secondary sign certificate:"
+
+#: templates/prefs/smimeprivatekey.html.php:250
+msgid "Set this key as personal certificate:"
+msgstr "Set this key as personal certificate:"
+
+#: config/prefs.php:112
+msgid "Set your keypair from the database:"
+msgstr "Set your keypair from the database:"
+
+#: config/prefs.php:138
+msgid "Share Mailboxes"
+msgstr "Share Mailboxes"
+
+#: config/prefs.php:139
+msgid "Share your mailboxes with other users."
+msgstr "Share your mailboxes with other users."
+
+#: lib/Mailbox.php:1654
+msgid "Shared"
+msgstr "Shared"
+
+#: config/prefs.php:387
+msgid "Should PGP signed messages be automatically verified when viewed?"
+msgstr "Should PGP signed messages be automatically verified when viewed?"
+
+#: config/prefs.php:463
+msgid "Should S/MIME signed messages be automatically verified when viewed?"
+msgstr "Should S/MIME signed messages be automatically verified when viewed?"
+
+#: config/prefs.php:379
+msgid "Should your PGP public key to be attached to your messages by default?"
+msgstr "Should your PGP public key to be attached to your messages by default?"
+
+#: lib/Basic/Thread.php:298 templates/dynamic/header.html.php:4
+#, php-format
+msgid "Show Addresses (%d)"
+msgstr "Show Addresses (%d)"
+
+#: templates/prefs/remote.html.php:42
+msgid "Show Advanced Setup"
+msgstr "Show Advanced Setup"
+
+#: templates/contacts/contacts.html.php:22
+#: templates/smartmobile/folders.html.php:19
+msgid "Show All"
+msgstr "Show All"
+
+#: lib/Dynamic/Mailbox.php:293
+msgid "Show All Mailboxes"
+msgstr "Show All Mailboxes"
+
+#: lib/Dynamic/Mailbox.php:440
+msgid "Show Deleted"
+msgstr "Show Deleted"
+
+#: lib/Mime/Viewer/Html.php:231
+msgid "Show Images?"
+msgstr "Show Images?"
+
+#: lib/Dynamic/Mailbox.php:482
+msgid "Show Only"
+msgstr "Show Only"
+
+#: templates/smartmobile/folders.html.php:22
+msgid "Show Polled"
+msgstr "Show Polled"
+
+#: lib/Dynamic/Mailbox.php:425
+msgid "Show Preview"
+msgstr "Show Preview"
+
+#: templates/search/search.html.php:63
+msgid "Show Unsubscribed Mailboxes"
+msgstr "Show Unsubscribed Mailboxes"
+
+#: config/prefs.php:1111
+msgid "Show all attachments"
+msgstr "Show all attachments"
+
+#: config/prefs.php:1414
+msgid "Show all flags (including flags set by other mail programs)?"
+msgstr "Show all flags (including flags set by other mail programs)?"
+
+#: config/prefs.php:1110
+msgid "Show all parts"
+msgstr "Show all parts"
+
+#: lib/Mime/Viewer/Html.php:204
+msgid "Show images..."
+msgstr "Show images..."
+
+#: config/prefs.php:1585
+msgid "Show non-private mailboxes in separate folders"
+msgstr "Show non-private mailboxes in separate folders"
+
+#: config/prefs.php:84
+msgid "Show the signature on the compose screen?"
+msgstr "Show the signature on the compose screen?"
+
+#: config/prefs.php:1084
+msgid "Shown"
+msgstr "Shown"
+
+#: templates/dynamic/compose.html.php:201
+msgid "Signature"
+msgstr "Signature"
+
+#: lib/Dynamic/Mailbox.php:215 lib/Dynamic/Mailbox.php:264
+#: templates/mime/compressed.html.php:9
+msgid "Size"
+msgstr "Size"
+
+#: lib/Basic/Search.php:104
+msgid "Size (KB) <"
+msgstr "Size (KB) <"
+
+#: lib/Basic/Search.php:109
+msgid "Size (KB) >"
+msgstr "Size (KB) >"
+
+#: lib/Search/Element/Size.php:62
+msgid "Size - Greater Than (KB)"
+msgstr "Size - Greater Than (KB)"
+
+#: lib/Search/Element/Size.php:63
+msgid "Size - Less Than (KB)"
+msgstr "Size - Less Than (KB)"
+
+#: templates/dynamic/mailbox.html.php:209
+msgid "Sort"
+msgstr "Sort"
+
+#: lib/Mailbox.php:1718 lib/Mailbox.php:1800
+#: templates/dynamic/mailbox.html.php:36 templates/dynamic/message.html.php:19
+#: templates/smartmobile/mailbox.html.php:38
+#: templates/smartmobile/mailbox.html.php:48
+#: templates/smartmobile/message.html.php:60
+msgid "Spam"
+msgstr "Spam"
+
+#: config/prefs.php:1259
+msgid "Spam Reporting"
+msgstr "Spam Reporting"
+
+#: templates/prefs/spam.html.php:3
+msgid "Spam mailbox:"
+msgstr "Spam mailbox:"
+
+#: lib/Dynamic/Compose/Common.php:290
+msgid "Spell Check Failed"
+msgstr "Spell Check Failed"
+
+#: templates/itip/action.html.php:7
+msgid "Start"
+msgstr "Start"
+
+#: templates/smartmobile/search.html.php:16
+msgid "Start Search"
+msgstr "Start Search"
+
+#: templates/itip/action.html.php:81
+msgid "Status"
+msgstr "Status"
+
+#: lib/Contents.php:870
+msgid "Strip Attachment"
+msgstr "Strip Attachment"
+
+#: config/prefs.php:749
+msgid "Strip the sender's signature from plaintext replies?"
+msgstr "Strip the sender's signature from plaintext replies?"
+
+#: config/prefs.php:1495 lib/Basic/Search.php:75 lib/Compose.php:2753
+#: lib/Contents/View.php:224 lib/Dynamic/Mailbox.php:190
+#: lib/Dynamic/Mailbox.php:260 lib/Dynamic/Mailbox.php:497
+#: lib/Smartmobile.php:186 templates/dynamic/compose.html.php:144
+#: templates/smartmobile/search.html.php:13
+msgid "Subject"
+msgstr "Subject"
+
+#: templates/smartmobile/compose.html.php:43
+msgid "Subject:"
+msgstr "Subject:"
+
+#: templates/saveimage/saveimage.html.php:19
+#: templates/search/search.html.php:104
+#: templates/smartmobile/copymove.html.php:19
+msgid "Submit"
+msgstr "Submit"
+
+#: lib/Dynamic/Mailbox.php:365
+msgid "Subscribe"
+msgstr "Subscribe"
+
+#: lib/Dynamic/Mailbox.php:565
+#, php-format
+msgid "Subscribe to %s?"
+msgstr "Subscribe to %s?"
+
+#: lib/Dynamic/Mailbox.php:566
+#, php-format
+msgid "Subscribe to all subfolders of %s?"
+msgstr "Subscribe to all subfolders of %s?"
+
+#: lib/Mime/Status.php:96
+msgid "Success"
+msgstr "Success"
+
+#: lib/Ajax/Imple/ImportEncryptKey.php:89
+msgid "Successfully added certificate from message."
+msgstr "Successfully added certificate from message."
+
+#: lib/Ajax/Imple/ImportEncryptKey.php:77
+msgid "Successfully added public key from message."
+msgstr "Successfully added public key from message."
+
+#: lib/Ajax/Application/Handler/Remote.php:78
+#, php-format
+msgid "Successfully authenticated to %s."
+msgstr "Successfully authenticated to %s."
+
+#: templates/itip/action.html.php:28
+msgid "Summary"
+msgstr "Summary"
+
+#: templates/flist/flist.html.php:43 templates/flist/flist.html.php:46
+msgid "Task Lists"
+msgstr "Task Lists"
+
+#: lib/Mailbox.php:1689 templates/prefs/acl.html.php:37
+#: templates/prefs/acl.html.php:72
+msgid "Templates"
+msgstr "Templates"
+
+#: lib/Mime/Viewer/Itip.php:340
+msgid "Tentatively Accept request"
+msgstr "Tentatively Accept request"
+
+#: lib/Mime/Viewer/Itip.php:814
+msgid "Tentatively Accepted"
+msgstr "Tentatively Accepted"
+
+#: lib/Contents.php:1293
+msgid "Text"
+msgstr "Text"
+
+#: templates/smartmobile/compose.html.php:46
+msgid "Text:"
+msgstr "Text:"
+
+#: templates/prefs/smimeprivatekey.html.php:59
+msgid "The ID of your Certificate Set: "
+msgstr "The ID of your Certificate Set: "
+
+#: templates/prefs/smimeprivatekey.html.php:134
+#, php-format
+msgid "The ID of your Sign Certificate Set: %s"
+msgstr "The ID of your Sign Certificate Set: %s"
+
+#: templates/prefs/smimeprivatekey.html.php:61
+#: templates/prefs/smimeprivatekey.html.php:136
+msgid "The ID of your Sign Certificate Set: not set in database"
+msgstr "The ID of your Sign Certificate Set: not set in database"
+
+#: lib/Ajax/Application/Handler/Dynamic.php:880
+#: lib/Ajax/Application/Handler/Dynamic.php:890
+msgid ""
+"The Message Disposition Notification was not sent. This is what the server "
+"said"
+msgstr ""
+"The Message Disposition Notification was not sent. This is what the server "
+"said"
+
+#: lib/Ajax/Application/Handler/Dynamic.php:894
+msgid "The Message Disposition Notification was sent successfully."
+msgstr "The Message Disposition Notification was sent successfully."
+
+#: templates/dynamic/compose.html.php:155
+msgid "The attachment limit has been reached."
+msgstr "The attachment limit has been reached."
+
+#: lib/Ajax/Imple/ItipRequest.php:80 lib/Mime/Viewer/Itip.php:102
+msgid "The calendar data is invalid"
+msgstr "The calendar data is invalid"
+
+#: lib/LoginTasks/Task/RenameSentmailMonthly.php:114
+#, php-format
+msgid "The current sent-mail mailbox(es) \"%s\" will be renamed."
+msgstr "The current sent-mail mailbox(es) \"%s\" will be renamed."
+
+#: lib/Mime/Viewer/Pgp.php:301
+msgid ""
+"The data in this part does not appear to be a valid PGP encrypted message. "
+"Error: "
+msgstr ""
+"The data in this part does not appear to be a valid PGP encrypted message. "
+"Error: "
+
+#: lib/Mime/Viewer/Pgp.php:261
+msgid "The data in this part has been compressed via PGP."
+msgstr "The data in this part has been compressed via PGP."
+
+#: lib/Mime/Viewer/Pgp.php:314 lib/Mime/Viewer/Pgp.php:418
+msgid "The data in this part has been digitally signed via PGP."
+msgstr "The data in this part has been digitally signed via PGP."
+
+#: lib/Mime/Viewer/Smime.php:337
+msgid "The data in this part has been digitally signed via S/MIME."
+msgstr "The data in this part has been digitally signed via S/MIME."
+
+#: lib/Mime/Viewer/Pgp.php:208
+msgid ""
+"The data in this part has been encrypted via PGP, however, PGP support is "
+"disabled so the message cannot be decrypted."
+msgstr ""
+"The data in this part has been encrypted via PGP, however, PGP support is "
+"disabled so the message cannot be decrypted."
+
+#: lib/Mime/Viewer/Pgp.php:232 lib/Mime/Viewer/Pgp.php:263
+msgid "The data in this part has been encrypted via PGP."
+msgstr "The data in this part has been encrypted via PGP."
+
+#: lib/Mime/Viewer/Smime.php:167
+msgid "The data in this part has been encrypted via S/MIME."
+msgstr "The data in this part has been encrypted via S/MIME."
+
+#: config/prefs.php:565
+msgid "The default font family to use in the HTML editor."
+msgstr "The default font family to use in the HTML editor."
+
+#: config/prefs.php:574
+msgid "The default font size to use in the HTML editor (in pixels)."
+msgstr "The default font size to use in the HTML editor (in pixels)."
+
+#: lib/Compose.php:362
+#, php-format
+msgid "The draft has been saved to the \"%s\" mailbox."
+msgstr "The draft has been saved to the \"%s\" mailbox."
+
+#: lib/Compose.php:364
+msgid "The draft was not successfully saved."
+msgstr "The draft was not successfully saved."
+
+#: lib/Prefs/Special/Remote.php:47
+msgid "The e-mail field cannot be empty."
+msgstr "The e-mail field cannot be empty."
+
+#: lib/Ajax/Imple/ItipRequest.php:514
+msgid "The event was added to your calendar."
+msgstr "The event was added to your calendar."
+
+#: lib/Ajax/Imple/ItipRequest.php:491
+msgid "The event was updated in your calendar."
+msgstr "The event was updated in your calendar."
+
+#: lib/Contents.php:626
+msgid "The initial portion of this text part is displayed below."
+msgstr "The initial portion of this text part is displayed below."
+
+#: lib/Compose/LinkedAttachment.php:79
+msgid ""
+"The linked attachment does not exist. It may have been deleted by the "
+"original sender or it may have expired."
+msgstr ""
+"The linked attachment does not exist. It may have been deleted by the "
+"original sender or it may have expired."
+
+#: lib/Mime/Viewer/Html.php:181
+msgid "The links that caused this warning have this background color:"
+msgstr "The links that caused this warning have this background color:"
+
+#: templates/prefs/imagereplacement.html.php:2
+msgid ""
+"The list of addresses that will NOT have their images blocked by default "
+"(enter each address on a new line)"
+msgstr ""
+"The list of addresses that will NOT have their images blocked by default "
+"(enter each address on a new line)"
+
+#: lib/Imap.php:769
+msgid "The mail server is not currently avaliable."
+msgstr "The mail server is not currently avaliable."
+
+#: lib/Ajax/Application/Handler/Dynamic.php:211
+#, php-format
+msgid "The mailbox \"%s\" is already empty."
+msgstr "The mailbox \"%s\" is already empty."
+
+#: lib/Mailbox.php:828
+#, php-format
+msgid "The mailbox \"%s\" may not be deleted."
+msgstr "The mailbox \"%s\" may not be deleted."
+
+#: lib/Ajax/Application/Handler/Dynamic.php:207
+#, php-format
+msgid "The mailbox \"%s\" may not be emptied."
+msgstr "The mailbox \"%s\" may not be emptied."
+
+#: lib/Mailbox.php:867
+#, php-format
+msgid "The mailbox \"%s\" may not be renamed."
+msgstr "The mailbox \"%s\" may not be renamed."
+
+#: lib/Mailbox.php:767
+#, php-format
+msgid "The mailbox \"%s\" was not created. This is what the server said"
+msgstr "The mailbox \"%s\" was not created. This is what the server said"
+
+#: lib/Mailbox.php:837
+#, php-format
+msgid "The mailbox \"%s\" was not deleted. This is what the server said"
+msgstr "The mailbox \"%s\" was not deleted. This is what the server said"
+
+#: lib/Mailbox.php:771
+#, php-format
+msgid "The mailbox \"%s\" was successfully created."
+msgstr "The mailbox \"%s\" was successfully created."
+
+#: lib/Mailbox.php:834
+#, php-format
+msgid "The mailbox \"%s\" was successfully deleted."
+msgstr "The mailbox \"%s\" was successfully deleted."
+
+#: lib/Mailbox.php:881
+#, php-format
+msgid "The mailbox \"%s\" was successfully renamed to \"%s\"."
+msgstr "The mailbox \"%s\" was successfully renamed to \"%s\"."
+
+#: lib/Mailbox.php:1402
+#, php-format
+msgid "The mailbox %s is already empty."
+msgstr "The mailbox %s is already empty."
+
+#: lib/Spam.php:115
+#, php-format
+msgid "The message \"%s\" has been reported as innocent."
+msgstr "The message \"%s\" has been reported as innocent."
+
+#: lib/Spam.php:121
+#, php-format
+msgid "The message \"%s\" has been reported as spam."
+msgstr "The message \"%s\" has been reported as spam."
+
+#: lib/Basic/Contacts.php:101
+msgid "The message being composed has been closed."
+msgstr "The message being composed has been closed."
+
+#: lib/Smartmobile.php:184
+msgid "The message does not have a Subject entered."
+msgstr "The message does not have a Subject entered."
+
+#: lib/Dynamic/Compose/Common.php:261
+msgid "The message does not have a subject entered."
+msgstr "The message does not have a subject entered."
+
+#: lib/Spam.php:116
+#, php-format
+msgid "The message from \"%s\" has been reported as innocent."
+msgstr "The message from \"%s\" has been reported as innocent."
+
+#: lib/Spam.php:122
+#, php-format
+msgid "The message from \"%s\" has been reported as spam."
+msgstr "The message from \"%s\" has been reported as spam."
+
+#: lib/Mime/Viewer/Mdn.php:162
+msgid ""
+"The message has been deleted by the recipient; it is unknown whether they "
+"viewed the message."
+msgstr ""
+"The message has been deleted by the recipient; it is unknown whether they "
+"viewed the message."
+
+#: lib/Filter.php:76 lib/Spam.php:180
+msgid "The message has been deleted."
+msgid_plural "The messages have been deleted."
+msgstr[0] "The message has been deleted."
+msgstr[1] "The messages have been deleted."
+
+#: lib/Mime/Viewer/Mdn.php:158
+msgid "The message has been displayed to the recipient."
+msgstr "The message has been displayed to the recipient."
+
+#: lib/Mime/Viewer/Plain.php:172
+msgid ""
+"The message part may contain incorrect character set information preventing "
+"correct display."
+msgstr ""
+"The message part may contain incorrect character set information preventing "
+"correct display."
+
+#: lib/Block/Newmail.php:45
+msgid "The number of unseen messages to show"
+msgstr "The number of unseen messages to show"
+
+#: lib/Prefs/Special/Remote.php:48
+msgid "The password field cannot be empty."
+msgstr "The password field cannot be empty."
+
+#: templates/dynamic/compose.html.php:188
+msgid "The recipient has indicated that they prefer replies in these languages"
+msgstr ""
+"The recipient has indicated that they prefer replies in these languages"
+
+#: lib/Contents/Message.php:164
+msgid ""
+"The sender of this message is requesting notification from you when you have "
+"read this message."
+msgstr ""
+"The sender of this message is requesting notification from you when you have "
+"read this message."
+
+#: lib/Dynamic/Mailbox.php:537
+msgid "The server is still generating the message list."
+msgstr "The server is still generating the message list."
+
+#: lib/Dynamic/Mailbox.php:538
+msgid "The server was unable to generate the message list."
+msgstr "The server was unable to generate the message list."
+
+#: lib/Indices.php:315
+msgid "The source directory is read-only."
+msgstr "The source directory is read-only."
+
+#: lib/Indices.php:309
+msgid "The target directory is read-only."
+msgstr "The target directory is read-only."
+
+#: lib/Ajax/Imple/ItipRequest.php:251
+msgid "The task has been added to your tasklist."
+msgstr "The task has been added to your tasklist."
+
+#: lib/Compose.php:697
+msgid "The template has been saved."
+msgstr "The template has been saved."
+
+#: lib/Compose.php:694
+msgid "The template was not successfully saved."
+msgstr "The template was not successfully saved."
+
+#: lib/Compose/HtmlSignature.php:68
+msgid ""
+"The total size of your HTML signature image data has exceeded the maximum "
+"allowed."
+msgstr ""
+"The total size of your HTML signature image data has exceeded the maximum "
+"allowed."
+
+#: lib/Mbox/Import.php:145
+msgid "The uploaded file cannot be opened."
+msgstr "The uploaded file cannot be opened."
+
+#: lib/Ajax/Imple/ItipRequest.php:231 lib/Mime/Viewer/Itip.php:246
+msgid "The user's free/busy information was sucessfully stored."
+msgstr "The user's free/busy information was sucessfully stored."
+
+#: lib/Mime/Viewer/Alternative.php:98 lib/Mime/Viewer/Alternative.php:180
+msgid "There are no alternative parts that can be displayed inline."
+msgstr "There are no alternative parts that can be displayed inline."
+
+#: lib/Dynamic/Mailbox.php:559
+msgid "There are no messages in this mailbox."
+msgstr "There are no messages in this mailbox."
+
+#: lib/Contents/Message.php:696
+msgid "There are no parts that can be shown inline."
+msgstr "There are no parts that can be shown inline."
+
+#: lib/Basic/Thread.php:108
+msgid "There is no text that can be displayed inline."
+msgstr "There is no text that can be displayed inline."
+
+#: lib/Indices.php:301
+#, php-format
+msgid ""
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr ""
+"There was an error copying messages from \"%s\" to \"%s\". This is what the "
+"server said"
+
+#: lib/Indices.php:421
+#, php-format
+msgid "There was an error deleting messages from the mailbox \"%s\"."
+msgstr "There was an error deleting messages from the mailbox \"%s\"."
+
+#: lib/Ajax/Imple/ItipRequest.php:117
+#, php-format
+msgid "There was an error deleting the event: %s"
+msgstr "There was an error deleting the event: %s"
+
+#: lib/Indices.php:756
+#, php-format
+msgid "There was an error flagging messages in the mailbox \"%s\": %s."
+msgstr "There was an error flagging messages in the mailbox \"%s\": %s."
+
+#: lib/Mbox/Import.php:58
+#, php-format
+msgid "There was an error importing %s."
+msgstr "There was an error importing %s."
+
+#: lib/Ajax/Imple/VcardImport.php:96
+msgid "There was an error importing the contact data:"
+msgstr "There was an error importing the contact data:"
+
+#: lib/Ajax/Imple/ItipRequest.php:524
+#, php-format
+msgid "There was an error importing the event: %s"
+msgstr "There was an error importing the event: %s"
+
+#: lib/Ajax/Imple/ItipRequest.php:260
+#, php-format
+msgid "There was an error importing the task: %s"
+msgstr "There was an error importing the task: %s"
+
+#: lib/Ajax/Imple/ItipRequest.php:234 lib/Mime/Viewer/Itip.php:248
+#, php-format
+msgid "There was an error importing user's free/busy information: %s"
+msgstr "There was an error importing user's free/busy information: %s"
+
+#: lib/Indices.php:297
+#, php-format
+msgid ""
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+msgstr ""
+"There was an error moving messages from \"%s\" to \"%s\". This is what the "
+"server said"
+
+#: lib/Compose.php:885
+#, php-format
+msgid "There was an error sending your message: %s"
+msgstr "There was an error sending your message: %s"
+
+#: lib/Ajax/Imple/ItipRequest.php:208
+#, php-format
+msgid "There was an error updating attendee status: %s"
+msgstr "There was an error updating attendee status: %s"
+
+#: lib/Ajax/Imple/ItipRequest.php:140 lib/Mime/Viewer/Itip.php:372
+#, php-format
+msgid "There was an error updating the event: %s"
+msgstr "There was an error updating the event: %s"
+
+#: lib/Ajax/Imple/ItipRequest.php:501
+#, php-format
+msgid ""
+"There was an error updating the event: %s Trying to import the event instead."
+msgstr ""
+"There was an error updating the event: %s Trying to import the event instead."
+
+#: lib/Ajax/Imple/ItipRequest.php:158 lib/Mime/Viewer/Itip.php:752
+#, php-format
+msgid "There was an error updating the task: %s"
+msgstr "There was an error updating the task: %s"
+
+#: lib/Ajax/Imple/ItipRequest.php:120 lib/Ajax/Imple/ItipRequest.php:143
+#: lib/Ajax/Imple/ItipRequest.php:161 lib/Ajax/Imple/ItipRequest.php:237
+#: lib/Ajax/Imple/ItipRequest.php:263 lib/Ajax/Imple/ItipRequest.php:269
+#: lib/Ajax/Imple/ItipRequest.php:332 lib/Ajax/Imple/ItipRequest.php:451
+#: lib/Ajax/Imple/ItipRequest.php:529
+msgid "This action is not supported."
+msgstr "This action is not supported."
+
+#: lib/Mime/Viewer/Audio.php:74
+#, php-format
+msgid "This audio file is reported to be %s in length."
+msgstr "This audio file is reported to be %s in length."
+
+#: lib/Mime/Viewer/Pgp.php:441
+msgid "This digitally signed message is broken."
+msgstr "This digitally signed message is broken."
+
+#: lib/Mime/Viewer/Tgz.php:75 lib/Mime/Viewer/Zip.php:85
+msgid "This is a compressed file."
+msgstr "This is a compressed file."
+
+#: lib/Mime/Viewer/Pdf.php:88
+msgid "This is a thumbnail of a PDF file attachment."
+msgstr "This is a thumbnail of a PDF file attachment."
+
+#: lib/Mime/Viewer/Video.php:98
+msgid "This is a thumbnail of a video attachment."
+msgstr "This is a thumbnail of a video attachment."
+
+#: lib/Mime/Viewer/Images.php:199
+msgid "This is a thumbnail of an image attachment."
+msgstr "This is a thumbnail of an image attachment."
+
+#: lib/Indices.php:414 lib/Indices.php:706
+msgid "This mailbox is read-only."
+msgstr "This mailbox is read-only."
+
+#: lib/Mime/Viewer/Appledouble.php:99
+#, php-format
+msgid "This message contains a Macintosh file (named \"%s\")."
+msgstr "This message contains a Macintosh file (named \"%s\")."
+
+#: lib/Mime/Viewer/Html.php:248
+msgid ""
+"This message contains corrupt styling data so the message contents may not "
+"appear correctly below."
+msgstr ""
+"This message contains corrupt styling data so the message contents may not "
+"appear correctly below."
+
+#: lib/Mime/Viewer/Html.php:260
+msgid "This message contains images that cannot be loaded."
+msgstr "This message contains images that cannot be loaded."
+
+#: lib/Mime/Viewer/Html.php:179
+msgid "This message may not be from whom it claims to be."
+msgstr "This message may not be from whom it claims to be."
+
+#: lib/Contents.php:618
+msgid "This message part cannot be viewed because it is too large."
+msgstr "This message part cannot be viewed because it is too large."
+
+#: lib/Mime/Viewer/Html.php:102
+msgid ""
+"This message part contains HTML data, but inline HTML display is disabled."
+msgstr ""
+"This message part contains HTML data, but inline HTML display is disabled."
+
+#: lib/Ajax/Application/Handler/Smartmobile.php:142
+msgid "This message to"
+msgstr "This message to"
+
+#: lib/Mime/Viewer/Mdn.php:178
+msgid "This notification was explicitly sent by the recipient."
+msgstr "This notification was explicitly sent by the recipient."
+
+#: lib/Mime/Viewer/Related.php:141
+msgid ""
+"This part contains an attachment that can not be displayed within this part:"
+msgstr ""
+"This part contains an attachment that can not be displayed within this part:"
+
+#: lib/Mime/Viewer/Alternative.php:178
+msgid "This part contains no message contents."
+msgstr "This part contains no message contents."
+
+#: lib/Mime/Viewer/Video.php:94
+#, php-format
+msgid "This video file is reported to be %s in length."
+msgstr "This video file is reported to be %s in length."
+
+#: config/prefs.php:1497 lib/Dynamic/Mailbox.php:261
+msgid "Thread"
+msgstr "Thread"
+
+#: templates/thread/thread.html.php:2
+msgid "Thread Display"
+msgstr "Thread Display"
+
+#: lib/Basic/Thread.php:136
+msgid "Thread List"
+msgstr "Thread List"
+
+#: lib/Dynamic/Mailbox.php:269
+msgid "Thread Sort"
+msgstr "Thread Sort"
+
+#: lib/Basic/Thread.php:187
+msgid "Thread View"
+msgstr "Thread View"
+
+#: lib/Basic/Contacts.php:97 lib/Basic/Search.php:63 lib/Compose.php:2757
+#: lib/Contents/View.php:222 lib/Dynamic/Mailbox.php:185
+#: lib/Dynamic/Mailbox.php:259 lib/Smartmobile.php:187
+#: templates/contacts/contacts.html.php:34
+#: templates/dynamic/compose.html.php:114
+#: templates/dynamic/mailbox.html.php:146 templates/dynamic/message.html.php:88
+#: templates/thread/thread.html.php:21
+msgid "To"
+msgstr "To"
+
+#: config/prefs.php:1494
+msgid "To Address"
+msgstr "To Address"
+
+#: lib/Dynamic/Base.php:160
+msgid "To All"
+msgstr "To All"
+
+#: lib/Dynamic/Base.php:161
+msgid "To List"
+msgstr "To List"
+
+#: lib/Dynamic/Base.php:159
+msgid "To Sender"
+msgstr "To Sender"
+
+#: lib/Basic/Thread.php:118 lib/Basic/Thread.php:120 lib/Mailbox/Ui.php:74
+#: templates/dynamic/redirect.html.php:14
+#: templates/smartmobile/compose.html.php:7
+#: templates/smartmobile/compose.html.php:29
+msgid "To:"
+msgstr "To:"
+
+#: lib/Message/Date.php:132
+#, php-format
+msgid "Today, %s %s"
+msgstr "Today, %s %s"
+
+#: config/prefs.php:582
+msgid "Top"
+msgstr "Top"
+
+#: lib/Block/Summary.php:107
+msgid "Total"
+msgstr "Total"
+
+#: lib/Mailbox.php:1724 lib/Mailbox.php:1806
+msgid "Trash"
+msgstr "Trash"
+
+#: templates/prefs/trash.html.php:3
+msgid "Trash mailbox:"
+msgstr "Trash mailbox:"
+
+#: templates/prefs/remote.html.php:45 templates/search/search.html.php:85
+msgid "Type"
+msgstr "Type"
+
+#: lib/Compose/LinkedAttachment.php:219
+#, php-format
+msgid "Type: %s"
+msgstr "Type: %s"
+
+#: lib/Quota/Hook.php:46 lib/Quota/Imap.php:47
+msgid "Unable to retrieve quota"
+msgstr "Unable to retrieve quota"
+
+#: templates/dynamic/mailbox.html.php:181
+msgid "Unable to view message in preview pane."
+msgstr "Unable to view message in preview pane."
+
+#: lib/Dynamic/Mailbox.php:330 lib/Dynamic/Mailbox.php:438
+msgid "Undelete"
+msgstr "Undelete"
+
+#: lib/Basic/Thread.php:291 lib/Contents/Message.php:297 lib/Mailbox/Ui.php:80
+msgid "Undisclosed Recipients"
+msgstr "Undisclosed Recipients"
+
+#: lib/Mime/Viewer/Itip.php:163
+#, php-format
+msgid "Unhandled component of type: %s"
+msgstr "Unhandled component of type: %s"
+
+#: lib/Mime/Viewer/Itip.php:861 lib/Pgp.php:832 lib/Pgp.php:833 lib/Pgp.php:834
+msgid "Unknown"
+msgstr "Unknown"
+
+#: lib/Message/Date.php:139
+msgid "Unknown Date"
+msgstr "Unknown Date"
+
+#: lib/Mime/Viewer/Itip.php:429 lib/Mime/Viewer/Itip.php:606
+msgid "Unknown Meeting"
+msgstr "Unknown Meeting"
+
+#: lib/Prefs/AttribText.php:63 lib/Prefs/AttribText.php:79
+msgid "Unknown Sender"
+msgstr "Unknown Sender"
+
+#: lib/Mime/Viewer/Itip.php:769
+msgid "Unknown Task"
+msgstr "Unknown Task"
+
+#: lib/Prefs/Special/PgpPrivateKey.php:65
+#: lib/Prefs/Special/SmimePrivateKey.php:304
+#: lib/Prefs/Special/SmimePrivateKey.php:306
+msgid "Unload Passphrase"
+msgstr "Unload Passphrase"
+
+#: lib/Dynamic/Mailbox.php:321 lib/Dynamic/Mailbox.php:431
+msgid "Unmark as"
+msgstr "Unmark as"
+
+#: lib/Block/Summary.php:107 lib/Dynamic/Mailbox.php:244
+#: lib/Flag/System/Unseen.php:45
+msgid "Unseen"
+msgstr "Unseen"
+
+#: templates/prefs/smimeprivatekey.html.php:97
+msgid "Unset Personal Certificate"
+msgstr "Unset Personal Certificate"
+
+#: templates/prefs/smimeprivatekey.html.php:171
+msgid "Unset Secondary Certificate"
+msgstr "Unset Secondary Certificate"
+
+#: lib/Dynamic/Mailbox.php:366
+msgid "Unsubscribe"
+msgstr "Unsubscribe"
+
+#: lib/Dynamic/Mailbox.php:567
+#, php-format
+msgid "Unsubscribe to %s?"
+msgstr "Unsubscribe to %s?"
+
+#: lib/Dynamic/Mailbox.php:568
+#, php-format
+msgid "Unsubscribe to all subfolders of %s?"
+msgstr "Unsubscribe to all subfolders of %s?"
+
+#: lib/Mime/Viewer/Itip.php:333 lib/Mime/Viewer/Itip.php:393
+msgid "Update in my calendar"
+msgstr "Update in my calendar"
+
+#: lib/Mime/Viewer/Itip.php:375 lib/Mime/Viewer/Itip.php:755
+msgid "Update respondent status"
+msgstr "Update respondent status"
+
+#: lib/Mime/Viewer/Itip.php:348
+msgid "Update this event on my calendar"
+msgstr "Update this event on my calendar"
+
+#: templates/pgp/import_key.html.php:37
+#: templates/smime/import_extra_key.html.php:11
+#: templates/smime/import_extra_key.html.php:43
+#: templates/smime/import_identity_key.html.php:11
+#: templates/smime/import_identity_key.html.php:43
+#: templates/smime/import_personal_key.html.php:11
+#: templates/smime/import_personal_key.html.php:43
+#: templates/smime/import_public_key.html.php:22
+msgid "Upload"
+msgstr "Upload"
+
+#: lib/Ajax/Application/Handler/ComposeAttach.php:94
+#: lib/Ajax/Application/Handler/Dynamic.php:1093
+msgid "Uploading attachments has been disabled on this server."
+msgstr "Uploading attachments has been disabled on this server."
+
+#: lib/Dynamic/Compose/Common.php:266
+msgid "Uploading..."
+msgstr "Uploading..."
+
+#: templates/prefs/sentmail.html.php:8
+msgid "Use Default Value"
+msgstr "Use Default Value"
+
+#: config/prefs.php:1559
+msgid "Use IMAP mailbox subscriptions?"
+msgstr "Use IMAP mailbox subscriptions?"
+
+#: lib/Dynamic/Mailbox.php:312 templates/dynamic/mailbox.html.php:48
+#: templates/dynamic/mailbox.html.php:120
+msgid "Use Template"
+msgstr "Use Template"
+
+#: templates/prefs/trash.html.php:9
+msgid "Use Virtual Trash"
+msgstr "Use Virtual Trash"
+
+#: templates/prefs/remote.html.php:34
+msgid "Use if available"
+msgstr "Use if available"
+
+#: templates/prefs/remote.html.php:30
+msgid "Use secure connection?"
+msgstr "Use secure connection?"
+
+#: config/prefs.php:720
+msgid "Use the charset of the original message when replying?"
+msgstr "Use the charset of the original message when replying?"
+
+#: templates/prefs/acl.html.php:13
+msgid "User"
+msgstr "User"
+
+#: lib/Dynamic/Mailbox.php:550
+msgid "User Options"
+msgstr "User Options"
+
+#: lib/Imap/Acl.php:159
+msgid "User can see the mailbox"
+msgstr "User can see the mailbox"
+
+#: lib/Application.php:416
+msgid "User is not authenticated."
+msgstr "User is not authenticated."
+
+#: templates/prefs/remote.html.php:62 templates/prefs/remote.html.php:86
+msgid "Username"
+msgstr "Username"
+
+#: lib/Dynamic/Base.php:195
+msgid "Verifying..."
+msgstr "Verifying..."
+
+#: lib/Dynamic/Mailbox.php:427
+msgid "Vertical Layout"
+msgstr "Vertical Layout"
+
+#: lib/Contents.php:1296
+msgid "Video"
+msgstr "Video"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:246
+#: lib/Prefs/Special/SmimePrivateKey.php:338
+#: templates/prefs/pgpprivatekey.html.php:21
+#: templates/prefs/pgpprivatekey.html.php:35
+#: templates/prefs/pgppublickey.html.php:20
+#: templates/prefs/smimeprivatekey.html.php:233
+#: templates/prefs/smimeprivatekey.html.php:240
+#: templates/prefs/smimepublickey.html.php:22
+msgid "View"
+msgstr "View"
+
+#: lib/Contents.php:809 lib/Contents.php:993
+#, php-format
+msgid "View %s"
+msgstr "View %s"
+
+#: lib/Prefs/SwitchHandler.php:34
+#, php-format
+msgid "View %s Public Info"
+msgstr "View %s Public Info"
+
+#: lib/Prefs/Special/PgpPublicKey.php:77
+#: lib/Prefs/Special/SmimePublicKey.php:77 lib/Prefs/SwitchHandler.php:33
+#, php-format
+msgid "View %s Public Key"
+msgstr "View %s Public Key"
+
+#: templates/dynamic/message.html.php:55 templates/dynamic/message.html.php:57
+msgid "View All Parts"
+msgstr "View All Parts"
+
+#: lib/Mime/Viewer/Images.php:202
+msgid "View Attachment"
+msgstr "View Attachment"
+
+#: lib/Mime/Viewer/Html.php:103
+msgid "View HTML data in new window."
+msgstr "View HTML data in new window."
+
+#: lib/Dynamic/Mailbox.php:314
+msgid "View Message"
+msgstr "View Message"
+
+#: lib/Mime/Viewer/Pdf.php:146
+msgid "View PDF File"
+msgstr "View PDF File"
+
+#: lib/Prefs/Special/PgpPrivateKey.php:76
+msgid "View Personal Private Key"
+msgstr "View Personal Private Key"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:243
+msgid "View Personal Public Certificate"
+msgstr "View Personal Public Certificate"
+
+#: lib/Prefs/Special/PgpPrivateKey.php:54
+msgid "View Personal Public Key"
+msgstr "View Personal Public Key"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:335
+msgid "View Secondary Personal Private Key"
+msgstr "View Secondary Personal Private Key"
+
+#: lib/Prefs/Special/SmimePrivateKey.php:242
+msgid "View Secondary Personal Public Certificate"
+msgstr "View Secondary Personal Public Certificate"
+
+#: lib/Dynamic/Mailbox.php:333 lib/Dynamic/Mailbox.php:468
+#: templates/dynamic/message.html.php:41 templates/dynamic/message.html.php:43
+msgid "View Source"
+msgstr "View Source"
+
+#: lib/Dynamic/Mailbox.php:470
+msgid "View Thread"
+msgstr "View Thread"
+
+#: lib/Mime/Viewer/Smime.php:393
+msgid "View certificate details"
+msgstr "View certificate details"
+
+#: lib/Mime/Viewer/Status.php:141
+msgid "View details of the delivered message."
+msgstr "View details of the delivered message."
+
+#: lib/Mime/Viewer/Status.php:133
+msgid "View details of the returned message."
+msgstr "View details of the returned message."
+
+#: lib/Ajax/Imple/ItipRequest.php:492 lib/Ajax/Imple/ItipRequest.php:493
+#: lib/Ajax/Imple/ItipRequest.php:515 lib/Ajax/Imple/ItipRequest.php:516
+msgid "View event"
+msgstr "View event"
+
+#: lib/Mime/Viewer/Pgp.php:382
+msgid "View key details."
+msgstr "View key details."
+
+#: templates/prefs/initialpage.html.php:3
+msgid "View or mailbox to display after login:"
+msgstr "View or mailbox to display after login:"
+
+#: lib/Ajax/Imple/ItipRequest.php:252 lib/Ajax/Imple/ItipRequest.php:253
+msgid "View task"
+msgstr "View task"
+
+#: lib/Mime/Viewer/Mdn.php:196
+msgid "View the text of the original sent message."
+msgstr "View the text of the original sent message."
+
+#: config/prefs.php:1005
+msgid "Viewing"
+msgstr "Viewing"
+
+#: templates/prefs/searches.html.php:8 templates/search/search.html.php:89
+msgid "Virtual Folder"
+msgstr "Virtual Folder"
+
+#: lib/Basic/Search.php:312
+#, php-format
+msgid "Virtual Folder \"%s\" created succesfully."
+msgstr "Virtual Folder \"%s\" created succesfully."
+
+#: lib/Prefs/Special/Searches.php:131
+#, php-format
+msgid "Virtual Folder \"%s\" deleted."
+msgstr "Virtual Folder \"%s\" deleted."
+
+#: lib/Basic/Search.php:309
+#, php-format
+msgid "Virtual Folder \"%s\" edited successfully."
+msgstr "Virtual Folder \"%s\" edited successfully."
+
+#: lib/Dynamic/Mailbox.php:558
+#, php-format
+msgid "Virtual Folder: %s"
+msgstr "Virtual Folder: %s"
+
+#: lib/Dynamic/Mailbox.php:276 lib/Mailbox.php:1650
+#: templates/flist/flist.html.php:27
+msgid "Virtual Folders"
+msgstr "Virtual Folders"
+
+#: lib/Search/Vfolder/Vinbox.php:31
+msgid "Virtual Inbox"
+msgstr "Virtual Inbox"
+
+#: lib/Search/Vfolder/Vtrash.php:38
+msgid "Virtual Trash"
+msgstr "Virtual Trash"
+
+#: lib/Contents.php:622 lib/Mime/Status.php:100
+msgid "Warning"
+msgstr "Warning"
+
+#: config/prefs.php:630
+msgid ""
+"What language(s) do you prefer replies to your messages to be in? (Hold down "
+"the CTRL key when clicking to add multiple languages)"
+msgstr ""
+"What language(s) do you prefer replies to your messages to be in? (Hold down "
+"the CTRL key when clicking to add multiple languages)"
+
+#: config/prefs.php:1307
+msgid "What to do with messages after they have been reported as innocent?"
+msgstr "What to do with messages after they have been reported as innocent?"
+
+#: config/prefs.php:1286
+msgid "What to do with messages after they have been reported as spam?"
+msgstr "What to do with messages after they have been reported as spam?"
+
+#: config/prefs.php:787
+msgid ""
+"When forwarding a message in the body text, should the same format as the "
+"original message be used?"
+msgstr ""
+"When forwarding a message in the body text, should the same format as the "
+"original message be used?"
+
+#: config/prefs.php:1481
+msgid "When opening a mailbox for the first time, where do you want to start?"
+msgstr "When opening a mailbox for the first time, where do you want to start?"
+
+#: config/prefs.php:716
+msgid "When replying, use the same format as the original message?"
+msgstr "When replying, use the same format as the original message?"
+
+#: config/prefs.php:585
+msgid "Where should the cursor be located in the compose text area by default?"
+msgstr ""
+"Where should the cursor be located in the compose text area by default?"
+
+#: config/prefs.php:1114
+msgid "Which message parts do you want to display in the summary?"
+msgstr "Which message parts do you want to display in the summary?"
+
+#: lib/Dynamic/Mailbox.php:327 lib/Dynamic/Mailbox.php:434
+msgid "Whitelist"
+msgstr "Whitelist"
+
+#: templates/prefs/acl.html.php:43 templates/prefs/acl.html.php:78
+msgid "Write"
+msgstr "Write"
+
+#: templates/search/search.html.php:116
+msgid "Years"
+msgstr "Years"
+
+#: config/prefs.php:618 config/prefs.php:863 config/prefs.php:1570
+msgid "Yes"
+msgstr "Yes"
+
+#: lib/Message/Date.php:155
+#, php-format
+msgid "Yesterday, %s"
+msgstr "Yesterday, %s"
+
+#: lib/Message/Date.php:115
+#, php-format
+msgid "Yesterday, %s %s"
+msgstr "Yesterday, %s %s"
+
+#: templates/dynamic/compose.html.php:171
+msgid "You are"
+msgstr "You are"
+
+#: lib/Mailbox.php:740
+msgid "You are not allowed to create mailboxes."
+msgstr "You are not allowed to create mailboxes."
+
+#: lib/Mailbox.php:748
+#, php-format
+msgid "You are not allowed to create more than %d mailboxes."
+msgstr "You are not allowed to create more than %d mailboxes."
+
+#: lib/Compose.php:1434
+#, php-format
+msgid ""
+"You are not allowed to send messages to more than %d recipient within %d "
+"hours."
+msgid_plural ""
+"You are not allowed to send messages to more than %d recipients within %d "
+"hours."
+msgstr[0] ""
+"You are not allowed to send messages to more than %d recipient within %d "
+"hours."
+msgstr[1] ""
+"You are not allowed to send messages to more than %d recipients within %d "
+"hours."
+
+#: lib/Compose.php:1449
+#, php-format
+msgid "You are not allowed to send messages to more than %d recipient."
+msgid_plural "You are not allowed to send messages to more than %d recipients."
+msgstr[0] "You are not allowed to send messages to more than %d recipient."
+msgstr[1] "You are not allowed to send messages to more than %d recipients."
+
+#: lib/Indices.php:458
+msgid ""
+"You are over your quota, so your messages will be permanently deleted "
+"instead of moved to the Trash mailbox."
+msgstr ""
+"You are over your quota, so your messages will be permanently deleted "
+"instead of moved to the Trash mailbox."
+
+#: templates/dynamic/compose.html.php:175
+msgid "You are replying to a mailing list"
+msgstr "You are replying to a mailing list"
+
+#: lib/Mailbox.php:910
+#, php-format
+msgid "You cannot unsubscribe from \"%s\"."
+msgstr "You cannot unsubscribe from \"%s\"."
+
+#: lib/Prefs/Special/Acl.php:52
+msgid "You do not have permission to change access to this mailbox."
+msgstr "You do not have permission to change access to this mailbox."
+
+#: lib/Imap/Acl.php:64
+msgid "You do not have permission to view the ACLs on this mailbox."
+msgstr "You do not have permission to view the ACLs on this mailbox."
+
+#: lib/Maillog/Log/Forward.php:75
+#, php-format
+msgid "You forwarded this message on %s to: %s."
+msgstr "You forwarded this message on %s to: %s."
+
+#: lib/Notification/Handler/Decorator/NewmailNotify.php:107
+#, php-format
+msgid "You have %d new mail message in %s."
+msgid_plural "You have %d new mail messages in %s."
+msgstr[0] "You have %d new mail message in %s."
+msgstr[1] "You have %d new mail messages in %s."
+
+#: config/prefs.php:1180 config/prefs.php:1205
+msgid ""
+"You have activated move to Trash but no Trash mailbox is defined. You will "
+"be unable to delete messages until you set a Trash mailbox in the "
+"preferences."
+msgstr ""
+"You have activated move to Trash but no Trash mailbox is defined. You will "
+"be unable to delete messages until you set a Trash mailbox in the "
+"preferences."
+
+#: lib/Dynamic/Compose/Common.php:250
+msgid ""
+"You have edited your signature. Change the identity and lose your changes?"
+msgstr ""
+"You have edited your signature. Change the identity and lose your changes?"
+
+#: lib/Dynamic/Compose/Common.php:259
+msgid ""
+"You have reached the limit for the number of attachments in this message."
+msgstr ""
+"You have reached the limit for the number of attachments in this message."
+
+#: lib/Ajax/Application/Handler/Dynamic.php:52
+#, php-format
+msgid "You may not create child mailboxes in \"%s\"."
+msgstr "You may not create child mailboxes in \"%s\"."
+
+#: lib/Ajax/Application/Handler/Dynamic.php:121
+#, php-format
+msgid "You may not delete \"%s\"."
+msgstr "You may not delete \"%s\"."
+
+#: lib/Ajax/Application/Handler/Dynamic.php:125
+#, php-format
+msgid "You may not rename \"%s\"."
+msgstr "You may not rename \"%s\"."
+
+#: lib/Mime/Viewer/Pgp.php:274
+msgid ""
+"You must enter the passphrase for your PGP private key to view this message."
+msgstr ""
+"You must enter the passphrase for your PGP private key to view this message."
+
+#: lib/Mime/Viewer/Smime.php:195
+msgid ""
+"You must enter the passphrase for your S/MIME private key to view this data."
+msgstr ""
+"You must enter the passphrase for your S/MIME private key to view this data."
+
+#: lib/Mime/Viewer/Pgp.php:242
+msgid "You must enter the passphrase used to encrypt this message to view it."
+msgstr "You must enter the passphrase used to encrypt this message to view it."
+
+#: lib/Basic/Contacts.php:104
+msgid "You must select an address first."
+msgstr "You must select an address first."
+
+#: lib/Dynamic/Base.php:192
+msgid ""
+"You need to either use the keyboard (Ctrl/Cmd + C) or right click on the "
+"selected address to access the Copy command."
+msgstr ""
+"You need to either use the keyboard (Ctrl/Cmd + C) or right click on the "
+"selected address to access the Copy command."
+
+#: lib/Maillog/Log/Redirect.php:82
+#, php-format
+msgid "You redirected this message on %s to: %s."
+msgstr "You redirected this message on %s to: %s."
+
+#: lib/Maillog/Log/Replyall.php:35
+#, php-format
+msgid "You replied to all recipients of this message on %s."
+msgstr "You replied to all recipients of this message on %s."
+
+#: lib/Maillog/Log/Reply.php:35
+#, php-format
+msgid "You replied to this message on %s."
+msgstr "You replied to this message on %s."
+
+#: lib/Maillog/Log/Replylist.php:35
+#, php-format
+msgid "You replied to this message via the mailing list on %s."
+msgstr "You replied to this message via the mailing list on %s."
+
+#: lib/Mailbox.php:920
+#, php-format
+msgid "You were not subscribed to \"%s\". Here is what the server said"
+msgstr "You were not subscribed to \"%s\". Here is what the server said"
+
+#: lib/Mailbox.php:922
+#, php-format
+msgid "You were not unsubscribed from \"%s\". Here is what the server said"
+msgstr "You were not unsubscribed from \"%s\". Here is what the server said"
+
+#: lib/Mailbox.php:958
+#, php-format
+msgid "You were successfully subscribed to \"%s\" and all subfolders."
+msgstr "You were successfully subscribed to \"%s\" and all subfolders."
+
+#: lib/Mailbox.php:936
+#, php-format
+msgid "You were successfully subscribed to \"%s\"."
+msgstr "You were successfully subscribed to \"%s\"."
+
+#: lib/Mailbox.php:959
+#, php-format
+msgid "You were successfully unsubscribed from \"%s\" and all subfolders."
+msgstr "You were successfully unsubscribed from \"%s\" and all subfolders."
+
+#: lib/Mailbox.php:937
+#, php-format
+msgid "You were successfully unsubscribed from \"%s\"."
+msgstr "You were successfully unsubscribed from \"%s\"."
+
+#: lib/Basic/Search.php:99 lib/Search/Element/Within.php:80
+msgid "Younger Than"
+msgstr "Younger Than"
+
+#: templates/prefs/pgpprivatekey.html.php:54
+msgid "Your Name"
+msgstr "Your Name"
+
+#: templates/prefs/pgpprivatekey.html.php:4
+msgid "Your PGP Public/Private Keys"
+msgstr "Your PGP Public/Private Keys"
+
+#: templates/prefs/smimeprivatekey.html.php:77
+msgid "Your Private Certificate"
+msgstr "Your Private Certificate"
+
+#: templates/prefs/pgpprivatekey.html.php:31
+msgid "Your Private Key"
+msgstr "Your Private Key"
+
+#: templates/prefs/smimeprivatekey.html.php:68
+msgid "Your Public Certificate"
+msgstr "Your Public Certificate"
+
+#: templates/prefs/pgpprivatekey.html.php:18
+msgid "Your Public Key"
+msgstr "Your Public Key"
+
+#: config/prefs.php:29
+msgid "Your Reply-to: address: (optional)"
+msgstr "Your Reply-to: address: (optional)"
+
+#: templates/prefs/smimeprivatekey.html.php:18
+msgid "Your S/MIME Personal Certificate"
+msgstr "Your S/MIME Personal Certificate"
+
+#: templates/prefs/smimeprivatekey.html.php:35
+#, php-format
+msgid "Your S/MIME Personal Certificate has expired on %s at %s."
+msgstr "Your S/MIME Personal Certificate has expired on %s at %s."
+
+#: templates/prefs/smimeprivatekey.html.php:151
+msgid "Your Secondary Private Certificate"
+msgstr "Your Secondary Private Certificate"
+
+#: templates/prefs/smimeprivatekey.html.php:142
+msgid "Your Secondary Public Certificate"
+msgstr "Your Secondary Public Certificate"
+
+#: templates/prefs/smimeprivatekey.html.php:105
+msgid "Your Secondary S/MIME Personal Certificate"
+msgstr "Your Secondary S/MIME Personal Certificate"
+
+#: templates/prefs/smimeprivatekey.html.php:110
+#, php-format
+msgid "Your Secondary S/MIME Personal Certificate has expired on %s at %s."
+msgstr "Your Secondary S/MIME Personal Certificate has expired on %s at %s."
+
+#: config/prefs.php:36
+msgid ""
+"Your alias addresses: (optional, enter each address on a new line)"
+msgstr ""
+"Your alias addresses: (optional, enter each address on a new line)"
+
+#: lib/Ajax/Application/Handler/ComposeAttach.php:57
+#: lib/Ajax/Application/Handler/Dynamic.php:1096
+msgid ""
+"Your attachment was not uploaded. Most likely, the file exceeded the maximum "
+"size allowed by the server configuration."
+msgstr ""
+"Your attachment was not uploaded. Most likely, the file exceeded the maximum "
+"size allowed by the server configuration."
+
+#: lib/Dynamic/Compose/Common.php:258
+msgid "Your attachment(s) are too large and cannot be uploaded."
+msgstr "Your attachment(s) are too large and cannot be uploaded."
+
+#: lib/Mime/Viewer/Images.php:154
+msgid "Your browser does not support inline display of this image type."
+msgstr "Your browser does not support inline display of this image type."
+
+#: lib/Dynamic/Base.php:192
+msgid ""
+"Your browser security settings don't permit direct access to the clipboard."
+msgstr ""
+"Your browser security settings don't permit direct access to the clipboard."
+
+#: templates/prefs/smimeidentities.html.php:5
+msgid "Your currently set (default) identity: "
+msgstr "Your currently set (default) identity: "
+
+#: templates/prefs/encrypt.html.php:3
+msgid "Your default encryption method for sending messages:"
+msgstr "Your default encryption method for sending messages:"
+
+#: templates/dynamic/compose.html.php:185
+msgid ""
+"Your identity has been switched to the identity associated with the current "
+"recipient address. Click this box to revert to the original identity. The "
+"identity will not be checked again during this compose action."
+msgstr ""
+"Your identity has been switched to the identity associated with the current "
+"recipient address. Click this box to revert to the original identity. The "
+"identity will not be checked again during this compose action."
+
+#: lib/Compose/LinkedAttachment.php:217
+msgid "Your linked attachment has been downloaded by at least one user."
+msgstr "Your linked attachment has been downloaded by at least one user."
+
+#: lib/Compose.php:760
+#, php-format
+msgid "Your message body has exceeded the limit by body size by %d characters."
+msgstr ""
+"Your message body has exceeded the limit by body size by %d characters."
+
+#: lib/Mime/Viewer/Status.php:143
+msgid "Your message was successfully delivered."
+msgstr "Your message was successfully delivered."
+
+#: templates/prefs/signaturehtml.html.php:2
+msgid ""
+"Your signature to use when composing with the HTML editor (if empty, the "
+"text signature will be used)"
+msgstr ""
+"Your signature to use when composing with the HTML editor (if empty, the "
+"text signature will be used)"
+
+#: config/prefs.php:56
+msgid "Your signature:"
+msgstr "Your signature:"
+
+#: lib/Compose.php:2723 lib/Contents/Message.php:443 lib/Mailbox/Ui.php:119
+#: lib/Prefs/AttribText.php:103
+msgid "[No Subject]"
+msgstr "[No Subject]"
+
+#: lib/Indices.php:582
+#, php-format
+msgid "[Part stripped: Original part type: %s, name: %s]"
+msgstr "[Part stripped: Original part type: %s, name: %s]"
+
+#: lib/Compose.php:3169
+msgid "[Truncated Text]"
+msgstr "[Truncated Text]"
+
+#: lib/Basic/Search.php:488
+#: lib/Notification/Handler/Decorator/NewmailNotify.php:98
+#: lib/Search/Filter.php:43 lib/Search/Query.php:276
+msgid "and"
+msgstr "and"
+
+#: lib/Notification/Handler/Decorator/NewmailNotify.php:100
+#, php-format
+msgid "and %d more mailbox"
+msgid_plural "and %d more mailboxes"
+msgstr[0] "and %d more mailbox"
+msgstr[1] "and %d more mailboxes"
+
+#: lib/Compose.php:3343
+msgid "attachment"
+msgstr "attachment"
+
+#: lib/Contents/View.php:53
+msgid "attachments.zip"
+msgstr "attachments.zip"
+
+#: lib/Dynamic/Mailbox.php:527
+msgid "base level of the folder tree"
+msgstr "base level of the folder tree"
+
+#: lib/Search/Element/Within.php:92
+msgid "days"
+msgstr "days"
+
+#: lib/Search/Element/Flag.php:66
+#, php-format
+msgid "flagged \"%s\""
+msgstr "flagged \"%s\""
+
+#: templates/contacts/contacts.html.php:12
+#: templates/dynamic/mailbox.html.php:98
+msgid "from"
+msgstr "from"
+
+#: lib/Basic/Pgp.php:47 lib/Basic/Pgp.php:78 lib/Basic/Smime.php:409
+msgid "key"
+msgstr "key"
+
+#: templates/prefs/smimeidentities.html.php:12
+msgid "link to preferences"
+msgstr "link to preferences"
+
+#: lib/Compose.php:3047
+#, php-format
+msgid "links will expire on %s"
+msgstr "links will expire on %s"
+
+#: lib/Mbox/Import.php:51
+msgid "mailbox file"
+msgstr "mailbox file"
+
+#: templates/prefs/signaturehtml.html.php:2
+#, php-format
+msgid "maximum total image size is %s"
+msgstr "maximum total image size is %s"
+
+#: lib/Search/Element/Contacts.php:62
+msgid "messages from a personal contact"
+msgstr "messages from a personal contact"
+
+#: lib/Search/Element/Contacts.php:61
+msgid "messages not from a personal contact"
+msgstr "messages not from a personal contact"
+
+#: lib/Search/Element/Attachment.php:52
+msgid "messages with attachment(s)"
+msgstr "messages with attachment(s)"
+
+#: lib/Search/Element/Attachment.php:51
+msgid "messages without attachment(s)"
+msgstr "messages without attachment(s)"
+
+#: lib/Search/Element/Within.php:88
+msgid "months"
+msgstr "months"
+
+#: lib/Compose.php:1246
+msgid "name"
+msgstr "name"
+
+#: lib/Search/Element/Autogenerated.php:61 lib/Search/Element/Bulk.php:53
+#: lib/Search/Element/Header.php:57 lib/Search/Element/Mailinglist.php:52
+#: lib/Search/Element/Personal.php:71 lib/Search/Element/Recipient.php:70
+#: lib/Search/Element/Text.php:62
+msgid "not"
+msgstr "not"
+
+#: lib/Contents/View.php:69
+#, php-format
+msgid "part %s"
+msgstr "part %s"
+
+#: templates/dynamic/compose.html.php:171
+msgid "replying to ALL"
+msgstr "replying to ALL"
+
+#: lib/Basic/Search.php:503
+msgid "to"
+msgstr "to"
+
+#: lib/Search/Element/Within.php:84
+msgid "years"
+msgstr "years"
+
+#: lib/Filter.php:71
+msgid "your blacklist"
+msgstr "your blacklist"
+
+#: lib/Filter.php:93
+msgid "your whitelist"
+msgstr "your whitelist"
diff --git a/locale/en/help.xml b/locale/en/help.xml
index a26247486..9e3435c1b 100644
--- a/locale/en/help.xml
+++ b/locale/en/help.xml
@@ -359,6 +359,13 @@
If this option is selected, you will be able to import your personal S/MIME keys, read encrypted mail, verify digitally signed mail, and encrypt/sign your outgoing mail.
+
+
+ S/MIME: Preferences: Identities: Personal Certificates
+
+ Each Identity can have multiple SMIME certificates set. First create a new identity, then set this identity to 'default', after that you can change the SMIME certificates for the identity.
+
+ S/MIME: Preferences: Personal Certificates
@@ -367,6 +374,14 @@
+
+ S/MIME: Preferences: Extra Certificates
+
+ If you want to manage mutliple certificates you can save them as an extra certificate.
+ In order to use these certificates you first have to set them as personal keys.
+
+
+
S/MIME: Preferences: Personal Certificates: Import
@@ -381,6 +396,47 @@
+
+ S/MIME: Preferences: Personal Certificates: Unset
+
+ Unset a personal certificate from the prefs table but save it as a backup in the extra certificates table.
+ After the personal certificate is unset, you will neet do import or set another certificate for encrypting S/MIME messages.
+
+
+
+
+ S/MIME: Preferences: Secondary Certificates: Unset
+
+ Unset a secondary certificate from the prefs table but save it as a backup in the extra certificates table.
+ After the secondary certificate is unset, you can import or set another certificate for signing S/MIME messages.
+
+
+
+
+ S/MIME: Preferences: Extra Certificates: Set
+
+ Set an extra certificate from the database as your personal certificate to use.
+ Click on the ID (the number) to set this certificate as your personal certificate.
+ After it is set, you will be able to use this extra key as a personal certificate for encrypting S/MIME messages.
+
+
+
+
+ S/MIME: Preferences: Secondary Certificates: Set
+
+ Set a secondary certificate from the database as your singing certificate to use.
+ Click on the ID (the number) to set this certificate as your signing certificate.
+ After it is set, you will be able to use this key as a singing certificate for singing S/MIME messages.
+
+
+
+
+ S/MIME: Preferences: Extra Certificates: Delete
+
+ Delete your extra certificates from the database by clicking on the ID (number) of the certificate you want to remove. You will no longer be able set this extra key as a personal certificate for encrypting S/MIME messages.
+
+
+
S/MIME: Preferences: Manage Public Keys
diff --git a/locale/es/LC_MESSAGES/imp.mo b/locale/es/LC_MESSAGES/imp.mo
index 9e1f8328d..6ba3a51ec 100644
Binary files a/locale/es/LC_MESSAGES/imp.mo and b/locale/es/LC_MESSAGES/imp.mo differ
diff --git a/locale/es/LC_MESSAGES/imp.po b/locale/es/LC_MESSAGES/imp.po
index 02831304c..495557135 100644
--- a/locale/es/LC_MESSAGES/imp.po
+++ b/locale/es/LC_MESSAGES/imp.po
@@ -69,8 +69,7 @@ msgstr[1] "%d adjuntos"
msgid "%d Attachments"
msgstr "%d adjuntos"
-#: lib/Basic/Mailbox.php:397 lib/Basic/Mailbox.php:398
-#: lib/Basic/Thread.php:180
+#: lib/Basic/Mailbox.php:397 lib/Basic/Mailbox.php:398 lib/Basic/Thread.php:180
#, php-format
msgid "%d Messages"
msgstr "%d mensajes"
@@ -967,9 +966,8 @@ msgstr "No se puede adjuntar la información de contacto: %s"
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:69
-#: templates/minimal/compose.html.php:59
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:69
-#: templates/prefs/remote.html.php:80
+#: templates/minimal/compose.html.php:59 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:69 templates/prefs/remote.html.php:80
#: templates/saveimage/saveimage.html.php:20
#: templates/search/search.html.php:103
#: templates/smartmobile/compose.html.php:50
@@ -1608,8 +1606,8 @@ msgid "Delegated"
msgstr "Delegado"
#: lib/Dynamic/Compose/Common.php:179 lib/Dynamic/Mailbox.php:325
-#: lib/Dynamic/Mailbox.php:356 lib/Imap/Acl.php:196
-#: lib/Minimal/Message.php:224 templates/basic/folders/actions.html.php:26
+#: lib/Dynamic/Mailbox.php:356 lib/Imap/Acl.php:196 lib/Minimal/Message.php:224
+#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:30 templates/prefs/acl.html.php:43
#: templates/prefs/acl.html.php:78 templates/prefs/pgppublickey.html.php:22
@@ -2143,8 +2141,7 @@ msgid "Expand Headers"
msgstr "Expandir cabeceras"
#: lib/Minimal/Compose.php:107 lib/Minimal/Compose.php:162
-#: templates/minimal/compose.html.php:58
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:58 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "Expandir nombres"
@@ -2280,8 +2277,7 @@ msgstr "Carpeta"
msgid "Folder Actions"
msgstr "Acc. de carpeta"
-#: lib/Basic/Folders.php:274
-#: templates/basic/folders/folders_confirm.html.php:6
+#: lib/Basic/Folders.php:274 templates/basic/folders/folders_confirm.html.php:6
msgid "Folder Actions - Confirmation"
msgstr "Acciones de carpeta - Confirmación"
@@ -2365,8 +2361,7 @@ msgstr "_De"
#: templates/basic/search/search-basic.html.php:16
#: templates/dynamic/compose.html.php:102
#: templates/dynamic/mailbox.html.php:128 templates/minimal/mailbox.html.php:9
-#: templates/smartmobile/search.html.php:11
-#: templates/thread/thread.html.php:21
+#: templates/smartmobile/search.html.php:11 templates/thread/thread.html.php:21
msgid "From"
msgstr "De"
@@ -3214,10 +3209,9 @@ msgstr "Nueva marca"
msgid "New Mail"
msgstr "Correo nuevo"
-#: lib/Application.php:430 lib/Basic/Compose.php:207
-#: lib/Basic/Compose.php:1152 lib/Compose.php:2201 lib/Dynamic/Base.php:157
-#: lib/Dynamic/Compose.php:78 lib/Dynamic/Mailbox.php:109
-#: lib/Minimal/Base.php:88 lib/Smartmobile.php:177
+#: lib/Application.php:430 lib/Basic/Compose.php:207 lib/Basic/Compose.php:1152
+#: lib/Compose.php:2201 lib/Dynamic/Base.php:157 lib/Dynamic/Compose.php:78
+#: lib/Dynamic/Mailbox.php:109 lib/Minimal/Base.php:88 lib/Smartmobile.php:177
#: templates/dynamic/mailbox.html.php:54
#: templates/smartmobile/compose.html.php:2
#: templates/smartmobile/folders.html.php:13
@@ -3399,8 +3393,7 @@ msgid "Non Participant"
msgstr "Sin participantes"
#: lib/Compose/Ui.php:223 lib/Mime/Viewer/Itip.php:388
-#: lib/Mime/Viewer/Itip.php:543
-#: templates/basic/search/search-basic.html.php:14
+#: lib/Mime/Viewer/Itip.php:543 templates/basic/search/search-basic.html.php:14
#: templates/basic/search/search-basic.html.php:31
#: templates/prefs/acl.html.php:38 templates/prefs/acl.html.php:73
#: templates/prefs/composetemplates.html.php:7
@@ -3950,13 +3943,12 @@ msgstr "Repetición"
msgid "Redirec_t"
msgstr "Redirigir (_q)"
-#: lib/Basic/Compose.php:399 lib/Basic/Mailbox.php:685
-#: lib/Dynamic/Base.php:180 lib/Dynamic/Compose.php:148
-#: lib/Minimal/Compose.php:234 lib/Minimal/Compose.php:237
-#: lib/Minimal/Message.php:248 lib/Notification/Event/Status.php:32
+#: lib/Basic/Compose.php:399 lib/Basic/Mailbox.php:685 lib/Dynamic/Base.php:180
+#: lib/Dynamic/Compose.php:148 lib/Minimal/Compose.php:234
+#: lib/Minimal/Compose.php:237 lib/Minimal/Message.php:248
+#: lib/Notification/Event/Status.php:32
#: templates/basic/compose/redirect.html.php:51
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:55
msgid "Redirect"
msgid_plural "Redirect Messages"
@@ -4140,8 +4132,7 @@ msgid "Required Participant"
msgstr "Participante requerido"
#: templates/basic/search/search-basic.html.php:50
-#: templates/contacts/contacts.html.php:25
-#: templates/search/search.html.php:106
+#: templates/contacts/contacts.html.php:25 templates/search/search.html.php:106
msgid "Reset"
msgstr "Limpiar"
@@ -4852,8 +4843,7 @@ msgstr "As_unto"
#: lib/Dynamic/Mailbox.php:186 lib/Dynamic/Mailbox.php:255
#: lib/Dynamic/Mailbox.php:491 lib/Message/Ui.php:39 lib/Smartmobile.php:181
#: templates/basic/search/search-basic.html.php:18
-#: templates/dynamic/compose.html.php:147
-#: templates/minimal/mailbox.html.php:10
+#: templates/dynamic/compose.html.php:147 templates/minimal/mailbox.html.php:10
#: templates/smartmobile/search.html.php:13
msgid "Subject"
msgstr "Asunto"
@@ -5319,8 +5309,7 @@ msgstr ""
msgid "There are no alternative parts that can be displayed inline."
msgstr "No hay partes alternativas que se puedan mostrar en línea."
-#: lib/Dynamic/Mailbox.php:553
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:553 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "No hay mensajes en este buzón."
diff --git a/locale/et/LC_MESSAGES/imp.mo b/locale/et/LC_MESSAGES/imp.mo
index 2880f933d..e1b7e808d 100644
Binary files a/locale/et/LC_MESSAGES/imp.mo and b/locale/et/LC_MESSAGES/imp.mo differ
diff --git a/locale/et/LC_MESSAGES/imp.po b/locale/et/LC_MESSAGES/imp.po
index ae030959e..e479f78bd 100644
--- a/locale/et/LC_MESSAGES/imp.po
+++ b/locale/et/LC_MESSAGES/imp.po
@@ -871,8 +871,7 @@ msgstr "Reklaam Kirjad"
msgid "Cancel"
msgstr "Loobu"
-#: templates/imp/compose/compose.html:26
-#: templates/imp/compose/compose.html:208
+#: templates/imp/compose/compose.html:26 templates/imp/compose/compose.html:208
#: templates/imp/compose/redirect.html:45
msgid "Cancel Message"
msgstr "Loobu kirjast"
@@ -1430,9 +1429,8 @@ msgstr "Delegeeritud"
#: lib/Imap/Acl.php:164 mailbox.php:556 message-dimp.php:175
#: message-mimp.php:270 message.php:513 templates/dimp/index.inc:140
#: templates/dimp/index.inc:380 templates/imp/contacts/contacts.html:60
-#: templates/imp/folders/actions.html:19
-#: templates/mimp/mailbox/mailbox.html:38 templates/prefs/pgppublickey.html:13
-#: templates/prefs/smimepublickey.html:13
+#: templates/imp/folders/actions.html:19 templates/mimp/mailbox/mailbox.html:38
+#: templates/prefs/pgppublickey.html:13 templates/prefs/smimepublickey.html:13
msgid "Delete"
msgstr "Kustuta"
@@ -1554,8 +1552,7 @@ msgid "Description:"
msgstr "Kirjeldus:"
#: templates/prefs/pgpprivatekey.html:19 templates/prefs/pgpprivatekey.html:30
-#: templates/prefs/pgppublickey.html:13
-#: templates/prefs/smimeprivatekey.html:19
+#: templates/prefs/pgppublickey.html:13 templates/prefs/smimeprivatekey.html:19
#: templates/prefs/smimepublickey.html:13
msgid "Details"
msgstr "Üksikasjad"
@@ -2716,10 +2713,8 @@ msgstr "Manuste suuruse piirmäär on täis."
msgid "Mbox or .eml file:"
msgstr "Mbox või .eml fail:"
-#: templates/mimp/compose/compose.html:71
-#: templates/mimp/folders/folders.html:5
-#: templates/mimp/mailbox/mailbox.html:49
-#: templates/mimp/mailbox/search.html:14
+#: templates/mimp/compose/compose.html:71 templates/mimp/folders/folders.html:5
+#: templates/mimp/mailbox/mailbox.html:49 templates/mimp/mailbox/search.html:14
#: templates/mimp/message/message.html:32
msgid "Menu"
msgstr "Menüü"
@@ -3157,8 +3152,8 @@ msgstr "Teade anne: Lingitud manus on allalaetud"
msgid "OK"
msgstr "OK"
-#: lib/Search/Element/Or.php:31 search.php:509
-#: templates/pgp/import_key.html:30 templates/smime/import_key.html:31
+#: lib/Search/Element/Or.php:31 search.php:509 templates/pgp/import_key.html:30
+#: templates/smime/import_key.html:31
msgid "OR"
msgstr "VÕI"
@@ -4003,8 +3998,7 @@ msgid "Save Certificate in your Address Book"
msgstr "Salvesta Sertifikaat oma Aadressiraamatusse"
#: compose-mimp.php:211 compose-mimp.php:214 compose-mimp.php:260
-#: templates/imp/compose/compose.html:24
-#: templates/imp/compose/compose.html:206
+#: templates/imp/compose/compose.html:24 templates/imp/compose/compose.html:206
#: templates/mimp/compose/compose.html:52
msgid "Save Draft"
msgstr "Salvesta mustand"
@@ -4194,8 +4188,7 @@ msgstr "Saada võti avalikku võtmeserverisse"
msgid "Send Latest Information"
msgstr "Saada värskeim info"
-#: templates/imp/compose/compose.html:21
-#: templates/imp/compose/compose.html:203
+#: templates/imp/compose/compose.html:21 templates/imp/compose/compose.html:203
msgid "Send Message"
msgstr "Saada kiri"
@@ -5264,8 +5257,7 @@ msgid "Type:"
msgstr "Tüüp:"
#: lib/Quota/Command.php:92 lib/Quota/Hook.php:42 lib/Quota/Imap.php:52
-#: lib/Quota/Maildir.php:64 lib/Quota/Mdaemon.php:65
-#: lib/Quota/Mercury32.php:70
+#: lib/Quota/Maildir.php:64 lib/Quota/Mdaemon.php:65 lib/Quota/Mercury32.php:70
msgid "Unable to retrieve quota"
msgstr "Piiranguinfo hankimine nurjus"
@@ -5392,8 +5384,7 @@ msgid "Vertical Layout"
msgstr "Püstkujundus"
#: templates/prefs/pgpprivatekey.html:19 templates/prefs/pgpprivatekey.html:30
-#: templates/prefs/pgppublickey.html:13
-#: templates/prefs/smimeprivatekey.html:19
+#: templates/prefs/pgppublickey.html:13 templates/prefs/smimeprivatekey.html:19
#: templates/prefs/smimeprivatekey.html:27
#: templates/prefs/smimepublickey.html:13
msgid "View"
@@ -5611,8 +5602,8 @@ msgstr "Sa oled"
#: templates/imp/folders/folders_confirm.html:11
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr "Sa kavatsed kustutada kõik kirjad järgmis(t)es kausta(de)s."
#: templates/imp/folders/folders_confirm.html:10
diff --git a/locale/eu/LC_MESSAGES/imp.mo b/locale/eu/LC_MESSAGES/imp.mo
index a256eb39e..206d6f48b 100644
Binary files a/locale/eu/LC_MESSAGES/imp.mo and b/locale/eu/LC_MESSAGES/imp.mo differ
diff --git a/locale/eu/LC_MESSAGES/imp.po b/locale/eu/LC_MESSAGES/imp.po
index 2aea05cc3..7a37ba5dc 100644
--- a/locale/eu/LC_MESSAGES/imp.po
+++ b/locale/eu/LC_MESSAGES/imp.po
@@ -869,8 +869,8 @@ msgstr "Mezu baztergarriak"
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:70
-#: templates/minimal/compose.html.php:55
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:70
+#: templates/minimal/compose.html.php:55 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:70
#: templates/saveimage/saveimage.html.php:21
#: templates/search/search.html.php:107
#: templates/smartmobile/compose.html.php:40
@@ -939,8 +939,7 @@ msgstr "Ezin da kendu MIME zatia, postontzia irakurtzekoa soilik delako"
#: lib/Compose.php:2226 lib/Ui/Message.php:28 search.php:57
#: templates/contacts/contacts.html.php:43
-#: templates/dynamic/compose.html.php:97
-#: templates/dynamic/mailbox.html.php:128
+#: templates/dynamic/compose.html.php:97 templates/dynamic/mailbox.html.php:128
msgid "Cc"
msgstr "Cc"
@@ -1440,8 +1439,8 @@ msgstr "Ordenatze-noranzko lehenetsia:"
msgid "Delegated"
msgstr "Delegatua"
-#: lib/Dynamic/Mailbox.php:312 lib/Dynamic/Mailbox.php:352
-#: lib/Imap/Acl.php:191 lib/Minimal/Message.php:228 lib/Smartmobile.php:158
+#: lib/Dynamic/Mailbox.php:312 lib/Dynamic/Mailbox.php:352 lib/Imap/Acl.php:191
+#: lib/Minimal/Message.php:228 lib/Smartmobile.php:158
#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:36 templates/prefs/acl.html.php:43
@@ -1939,8 +1938,7 @@ msgid "Expand Headers"
msgstr "Zabaldu goiburuak"
#: lib/Minimal/Compose.php:104 lib/Minimal/Compose.php:157
-#: templates/minimal/compose.html.php:54
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:54 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "Zabaldu izenak"
@@ -2116,14 +2114,12 @@ msgstr "Libre/lanpetuta eskaeraren erantzuna"
msgid "Fro_m"
msgstr "Nor_k"
-#: lib/Compose.php:2210 lib/Dynamic/Mailbox.php:183
-#: lib/Dynamic/Mailbox.php:249 lib/Dynamic/Mailbox.php:444
-#: lib/Ui/Message.php:26 search.php:45
+#: lib/Compose.php:2210 lib/Dynamic/Mailbox.php:183 lib/Dynamic/Mailbox.php:249
+#: lib/Dynamic/Mailbox.php:444 lib/Ui/Message.php:26 search.php:45
#: templates/basic/compose/compose.html.php:38
#: templates/basic/search/search-basic.html.php:17
#: templates/basic/thread/thread.html.php:19
-#: templates/dynamic/compose.html.php:76
-#: templates/dynamic/mailbox.html.php:116
+#: templates/dynamic/compose.html.php:76 templates/dynamic/mailbox.html.php:116
#: templates/minimal/mailbox.html.php:13
#: templates/smartmobile/search.html.php:12
msgid "From"
@@ -3202,8 +3198,7 @@ msgstr "Aukerako partaidea"
msgid "Other"
msgstr "Beste batzuk"
-#: templates/dynamic/compose.html.php:65
-#: templates/dynamic/mailbox.html.php:106
+#: templates/dynamic/compose.html.php:65 templates/dynamic/mailbox.html.php:106
msgid "Other Options"
msgstr "Beste aukera batzuk"
@@ -3657,8 +3652,7 @@ msgstr "Birbi_deratu"
#: lib/Minimal/Compose.php:223 lib/Minimal/Compose.php:226
#: lib/Minimal/Message.php:249 lib/Notification/Event/Status.php:32
#: mailbox.php:675 templates/basic/compose/redirect.html.php:53
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:29
msgid "Redirect"
msgstr "Birbideratu"
@@ -3815,8 +3809,7 @@ msgid "Required Participant"
msgstr "Beharrezko partaidea"
#: templates/basic/search/search-basic.html.php:51
-#: templates/contacts/contacts.html.php:26
-#: templates/search/search.html.php:110
+#: templates/contacts/contacts.html.php:26 templates/search/search.html.php:110
msgid "Reset"
msgstr "Berrezarri"
@@ -4533,8 +4526,7 @@ msgstr "_Gaia"
#: lib/Dynamic/Mailbox.php:251 lib/Dynamic/Mailbox.php:446
#: lib/Smartmobile.php:169 lib/Ui/Message.php:31 search.php:65
#: templates/basic/search/search-basic.html.php:19
-#: templates/dynamic/compose.html.php:130
-#: templates/minimal/mailbox.html.php:14
+#: templates/dynamic/compose.html.php:130 templates/minimal/mailbox.html.php:14
#: templates/smartmobile/search.html.php:14
msgid "Subject"
msgstr "Gaia"
@@ -4991,8 +4983,7 @@ msgstr "Erabiltzailearen libre/lanpetuta informazioa behar bezala gorde da."
msgid "There are no alternative parts that can be displayed inline."
msgstr "Ez dago barnean bistara daitekeen ordezko zatirik."
-#: lib/Dynamic/Mailbox.php:496
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:496 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "Ez dago mezurik postontzi honetan."
@@ -5176,13 +5167,12 @@ msgstr "Harika ordenatu"
msgid "Thread View"
msgstr "Hari-ikuspegia"
-#: lib/Compose.php:2222 lib/Dynamic/Mailbox.php:189
-#: lib/Dynamic/Mailbox.php:250 lib/Ui/Message.php:27 mailbox.php:717
-#: search.php:53 templates/basic/compose/redirect.html.php:32
+#: lib/Compose.php:2222 lib/Dynamic/Mailbox.php:189 lib/Dynamic/Mailbox.php:250
+#: lib/Ui/Message.php:27 mailbox.php:717 search.php:53
+#: templates/basic/compose/redirect.html.php:32
#: templates/basic/thread/thread.html.php:19
#: templates/contacts/contacts.html.php:41
-#: templates/dynamic/compose.html.php:87
-#: templates/dynamic/mailbox.html.php:124
+#: templates/dynamic/compose.html.php:87 templates/dynamic/mailbox.html.php:124
msgid "To"
msgstr "Nori"
@@ -5255,8 +5245,7 @@ msgid "Type"
msgstr "Mota"
#: lib/Quota/Command.php:90 lib/Quota/Hook.php:40 lib/Quota/Imap.php:50
-#: lib/Quota/Maildir.php:60 lib/Quota/Mdaemon.php:62
-#: lib/Quota/Mercury32.php:68
+#: lib/Quota/Maildir.php:60 lib/Quota/Mdaemon.php:62 lib/Quota/Mercury32.php:68
msgid "Unable to retrieve quota"
msgstr "Ezin da kuota eskuratu"
@@ -5620,8 +5609,8 @@ msgstr "Zu zara"
#: templates/basic/folders/folders_confirm.html.php:13
msgid ""
-"You are attempting to delete all messages contained in the following mailbox"
-"(es)."
+"You are attempting to delete all messages contained in the following "
+"mailbox(es)."
msgstr "Postontzi hauetako mezu guztiak ezabatzen saiatzen ari zara."
#: templates/basic/folders/folders_confirm.html.php:11
diff --git a/locale/fa/LC_MESSAGES/imp.mo b/locale/fa/LC_MESSAGES/imp.mo
index 7e18c6b49..db4e1e1e8 100644
Binary files a/locale/fa/LC_MESSAGES/imp.mo and b/locale/fa/LC_MESSAGES/imp.mo differ
diff --git a/locale/fa/LC_MESSAGES/imp.po b/locale/fa/LC_MESSAGES/imp.po
index a6af27af8..be015a48c 100644
--- a/locale/fa/LC_MESSAGES/imp.po
+++ b/locale/fa/LC_MESSAGES/imp.po
@@ -1119,11 +1119,10 @@ msgstr "جهت مرتب سازی پیش فرض:"
msgid "Delegated"
msgstr "نماینده"
-#: folders.php:413 templates/contacts/contacts.inc:239
-#: templates/pgp/pgp.inc:27 templates/message/navbar_actions.inc:6
-#: templates/fetchmail/manage.inc:68 templates/mailbox/actions.inc:8
-#: templates/mailbox/actions.inc:10 templates/smime/smime.inc:25
-#: templates/compose/attachments.inc:28
+#: folders.php:413 templates/contacts/contacts.inc:239 templates/pgp/pgp.inc:27
+#: templates/message/navbar_actions.inc:6 templates/fetchmail/manage.inc:68
+#: templates/mailbox/actions.inc:8 templates/mailbox/actions.inc:10
+#: templates/smime/smime.inc:25 templates/compose/attachments.inc:28
msgid "Delete"
msgstr "حذف"
@@ -4288,9 +4287,8 @@ msgid "Thread View"
msgstr "نمایش سلسلهایی "
#: search.php:143 mailbox.php:598 message.php:259
-#: templates/contacts/contacts.inc:214
-#: templates/mailbox/message_headers.inc:22 templates/compose/redirect.inc:61
-#: templates/compose/recompose.inc:10
+#: templates/contacts/contacts.inc:214 templates/mailbox/message_headers.inc:22
+#: templates/compose/redirect.inc:61 templates/compose/recompose.inc:10
msgid "To"
msgstr "به"
@@ -4578,8 +4576,8 @@ msgstr "شما در صدد واکشی نامههای الکترونیکی ا
#: templates/folders/folders_confirm.html:10
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr "شما در پی حذف پیغامهای پوشههای زیر هستید:"
#: templates/folders/folders_confirm.html:9
diff --git a/locale/fi/LC_MESSAGES/imp.mo b/locale/fi/LC_MESSAGES/imp.mo
index 0e750f832..45e96dfc6 100644
Binary files a/locale/fi/LC_MESSAGES/imp.mo and b/locale/fi/LC_MESSAGES/imp.mo differ
diff --git a/locale/fi/LC_MESSAGES/imp.po b/locale/fi/LC_MESSAGES/imp.po
index 20cf9da1b..9d9cb5089 100644
--- a/locale/fi/LC_MESSAGES/imp.po
+++ b/locale/fi/LC_MESSAGES/imp.po
@@ -428,8 +428,8 @@ msgid ""
"Addresses to BCC all messages: (optional, enter each address on a new "
"line)"
msgstr ""
-"Osoitteet, jotka lisätään piilokopiona kaikkiin viesteihin: "
-"(vapaaehtoinen, laita jokainen osoite omalle rivilleen)"
+"Osoitteet, jotka lisätään piilokopiona kaikkiin viesteihin: "
+"(vapaaehtoinen, laita jokainen osoite omalle rivilleen)"
#: config/prefs.php:43
msgid ""
@@ -868,8 +868,8 @@ msgstr "Bulkkiviestit"
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:70
-#: templates/minimal/compose.html.php:55
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:70
+#: templates/minimal/compose.html.php:55 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:70
#: templates/saveimage/saveimage.html.php:21
#: templates/search/search.html.php:107
#: templates/smartmobile/compose.html.php:40
@@ -939,8 +939,7 @@ msgstr ""
#: lib/Compose.php:2226 lib/Ui/Message.php:28 search.php:57
#: templates/contacts/contacts.html.php:43
-#: templates/dynamic/compose.html.php:97
-#: templates/dynamic/mailbox.html.php:128
+#: templates/dynamic/compose.html.php:97 templates/dynamic/mailbox.html.php:128
msgid "Cc"
msgstr "Kopio"
@@ -1436,8 +1435,8 @@ msgstr "Oletusjärjestyksen suunta:"
msgid "Delegated"
msgstr "Delegoitu"
-#: lib/Dynamic/Mailbox.php:312 lib/Dynamic/Mailbox.php:352
-#: lib/Imap/Acl.php:191 lib/Minimal/Message.php:228 lib/Smartmobile.php:158
+#: lib/Dynamic/Mailbox.php:312 lib/Dynamic/Mailbox.php:352 lib/Imap/Acl.php:191
+#: lib/Minimal/Message.php:228 lib/Smartmobile.php:158
#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:36 templates/prefs/acl.html.php:43
@@ -1935,8 +1934,7 @@ msgid "Expand Headers"
msgstr "Laajenna otsakkeet"
#: lib/Minimal/Compose.php:104 lib/Minimal/Compose.php:157
-#: templates/minimal/compose.html.php:54
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:54 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "Laajenna nimet"
@@ -2110,14 +2108,12 @@ msgstr "Vastaus vapaa/varattu pyyntöön"
msgid "Fro_m"
msgstr "Lähettä_jä"
-#: lib/Compose.php:2210 lib/Dynamic/Mailbox.php:183
-#: lib/Dynamic/Mailbox.php:249 lib/Dynamic/Mailbox.php:444
-#: lib/Ui/Message.php:26 search.php:45
+#: lib/Compose.php:2210 lib/Dynamic/Mailbox.php:183 lib/Dynamic/Mailbox.php:249
+#: lib/Dynamic/Mailbox.php:444 lib/Ui/Message.php:26 search.php:45
#: templates/basic/compose/compose.html.php:38
#: templates/basic/search/search-basic.html.php:17
#: templates/basic/thread/thread.html.php:19
-#: templates/dynamic/compose.html.php:76
-#: templates/dynamic/mailbox.html.php:116
+#: templates/dynamic/compose.html.php:76 templates/dynamic/mailbox.html.php:116
#: templates/minimal/mailbox.html.php:13
#: templates/smartmobile/search.html.php:12
msgid "From"
@@ -3193,8 +3189,7 @@ msgstr "Valinnainen osallistuja"
msgid "Other"
msgstr "Muut"
-#: templates/dynamic/compose.html.php:65
-#: templates/dynamic/mailbox.html.php:106
+#: templates/dynamic/compose.html.php:65 templates/dynamic/mailbox.html.php:106
msgid "Other Options"
msgstr "Muut asetukset"
@@ -3641,8 +3636,7 @@ msgstr "Uu_delleenohjaa"
#: lib/Minimal/Compose.php:223 lib/Minimal/Compose.php:226
#: lib/Minimal/Message.php:249 lib/Notification/Event/Status.php:32
#: mailbox.php:675 templates/basic/compose/redirect.html.php:53
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:29
msgid "Redirect"
msgstr "Ohjaa"
@@ -3799,8 +3793,7 @@ msgid "Required Participant"
msgstr "Pakollinen osallistuja"
#: templates/basic/search/search-basic.html.php:51
-#: templates/contacts/contacts.html.php:26
-#: templates/search/search.html.php:110
+#: templates/contacts/contacts.html.php:26 templates/search/search.html.php:110
msgid "Reset"
msgstr "Tyhjennä"
@@ -4511,8 +4504,7 @@ msgstr "_Otsikko"
#: lib/Dynamic/Mailbox.php:251 lib/Dynamic/Mailbox.php:446
#: lib/Smartmobile.php:169 lib/Ui/Message.php:31 search.php:65
#: templates/basic/search/search-basic.html.php:19
-#: templates/dynamic/compose.html.php:130
-#: templates/minimal/mailbox.html.php:14
+#: templates/dynamic/compose.html.php:130 templates/minimal/mailbox.html.php:14
#: templates/smartmobile/search.html.php:14
msgid "Subject"
msgstr "Otsikko"
@@ -4967,8 +4959,7 @@ msgstr "Käyttäjän vapaa/varattu tiedon tallennus onnistui."
msgid "There are no alternative parts that can be displayed inline."
msgstr "Ei ole vaihtoehtoisia osioita, joita voisi näyttää sisällytettynä."
-#: lib/Dynamic/Mailbox.php:496
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:496 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "Tässä postilaatikossa ei ole viestejä."
@@ -5152,13 +5143,12 @@ msgstr "Keskustelu järjestys"
msgid "Thread View"
msgstr "Keskustelunäkymä"
-#: lib/Compose.php:2222 lib/Dynamic/Mailbox.php:189
-#: lib/Dynamic/Mailbox.php:250 lib/Ui/Message.php:27 mailbox.php:717
-#: search.php:53 templates/basic/compose/redirect.html.php:32
+#: lib/Compose.php:2222 lib/Dynamic/Mailbox.php:189 lib/Dynamic/Mailbox.php:250
+#: lib/Ui/Message.php:27 mailbox.php:717 search.php:53
+#: templates/basic/compose/redirect.html.php:32
#: templates/basic/thread/thread.html.php:19
#: templates/contacts/contacts.html.php:41
-#: templates/dynamic/compose.html.php:87
-#: templates/dynamic/mailbox.html.php:124
+#: templates/dynamic/compose.html.php:87 templates/dynamic/mailbox.html.php:124
msgid "To"
msgstr "Vastaanottaja"
@@ -5231,8 +5221,7 @@ msgid "Type"
msgstr "Tyyppi"
#: lib/Quota/Command.php:90 lib/Quota/Hook.php:40 lib/Quota/Imap.php:50
-#: lib/Quota/Maildir.php:60 lib/Quota/Mdaemon.php:62
-#: lib/Quota/Mercury32.php:68
+#: lib/Quota/Maildir.php:60 lib/Quota/Mdaemon.php:62 lib/Quota/Mercury32.php:68
msgid "Unable to retrieve quota"
msgstr "Ei voitu hakea postikiintiön tietoja"
@@ -5597,8 +5586,8 @@ msgstr "Sinä olet"
#: templates/basic/folders/folders_confirm.html.php:13
msgid ""
-"You are attempting to delete all messages contained in the following mailbox"
-"(es)."
+"You are attempting to delete all messages contained in the following "
+"mailbox(es)."
msgstr "Olet yrittämässä poistaa kaikki viestit seuraavista kansioista."
#: templates/basic/folders/folders_confirm.html.php:11
diff --git a/locale/fr/LC_MESSAGES/imp.mo b/locale/fr/LC_MESSAGES/imp.mo
index 055a7d3a1..40fa7196c 100644
Binary files a/locale/fr/LC_MESSAGES/imp.mo and b/locale/fr/LC_MESSAGES/imp.mo differ
diff --git a/locale/fr/LC_MESSAGES/imp.po b/locale/fr/LC_MESSAGES/imp.po
index 7da05463c..a77223f53 100644
--- a/locale/fr/LC_MESSAGES/imp.po
+++ b/locale/fr/LC_MESSAGES/imp.po
@@ -900,8 +900,8 @@ msgstr "Envois massifs"
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:70
-#: templates/minimal/compose.html.php:56
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:70
+#: templates/minimal/compose.html.php:56 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:70
#: templates/saveimage/saveimage.html.php:21
#: templates/search/search.html.php:107
#: templates/smartmobile/compose.html.php:41
@@ -971,8 +971,7 @@ msgstr ""
#: lib/Compose.php:2239 lib/Ui/Message.php:28 search.php:57
#: templates/contacts/contacts.html.php:43
-#: templates/dynamic/compose.html.php:98
-#: templates/dynamic/mailbox.html.php:128
+#: templates/dynamic/compose.html.php:98 templates/dynamic/mailbox.html.php:128
msgid "Cc"
msgstr "Cc"
@@ -1478,8 +1477,8 @@ msgstr "Sens du tri par défaut :"
msgid "Delegated"
msgstr "Délégué"
-#: lib/Dynamic/Mailbox.php:318 lib/Dynamic/Mailbox.php:358
-#: lib/Imap/Acl.php:199 lib/Minimal/Message.php:228 lib/Smartmobile.php:159
+#: lib/Dynamic/Mailbox.php:318 lib/Dynamic/Mailbox.php:358 lib/Imap/Acl.php:199
+#: lib/Minimal/Message.php:228 lib/Smartmobile.php:159
#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:36 templates/prefs/acl.html.php:43
@@ -1979,8 +1978,7 @@ msgid "Expand Headers"
msgstr "Montrer les En-têtes"
#: lib/Minimal/Compose.php:104 lib/Minimal/Compose.php:157
-#: templates/minimal/compose.html.php:55
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:55 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "Développer les noms"
@@ -2158,14 +2156,12 @@ msgstr "Réponse à la requête sur les disponibilités"
msgid "Fro_m"
msgstr "D_e"
-#: lib/Compose.php:2223 lib/Dynamic/Mailbox.php:189
-#: lib/Dynamic/Mailbox.php:255 lib/Dynamic/Mailbox.php:457
-#: lib/Ui/Message.php:26 search.php:45
+#: lib/Compose.php:2223 lib/Dynamic/Mailbox.php:189 lib/Dynamic/Mailbox.php:255
+#: lib/Dynamic/Mailbox.php:457 lib/Ui/Message.php:26 search.php:45
#: templates/basic/compose/compose.html.php:38
#: templates/basic/search/search-basic.html.php:17
#: templates/basic/thread/thread.html.php:19
-#: templates/dynamic/compose.html.php:77
-#: templates/dynamic/mailbox.html.php:116
+#: templates/dynamic/compose.html.php:77 templates/dynamic/mailbox.html.php:116
#: templates/minimal/mailbox.html.php:13
#: templates/smartmobile/search.html.php:12
msgid "From"
@@ -3254,8 +3250,7 @@ msgstr "Participant facultatif"
msgid "Other"
msgstr "Autre"
-#: templates/dynamic/compose.html.php:66
-#: templates/dynamic/mailbox.html.php:106
+#: templates/dynamic/compose.html.php:66 templates/dynamic/mailbox.html.php:106
msgid "Other Options"
msgstr "Autres options"
@@ -3708,8 +3703,7 @@ msgstr "Rediri_ger"
#: lib/Minimal/Compose.php:223 lib/Minimal/Compose.php:226
#: lib/Minimal/Message.php:249 lib/Notification/Event/Status.php:32
#: mailbox.php:675 templates/basic/compose/redirect.html.php:53
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:29
msgid "Redirect"
msgstr "Rediriger"
@@ -3867,8 +3861,7 @@ msgid "Required Participant"
msgstr "Participant indispensable"
#: templates/basic/search/search-basic.html.php:51
-#: templates/contacts/contacts.html.php:26
-#: templates/search/search.html.php:110
+#: templates/contacts/contacts.html.php:26 templates/search/search.html.php:110
msgid "Reset"
msgstr "RÀZ"
@@ -4600,8 +4593,7 @@ msgstr "Ob_jet"
#: lib/Dynamic/Mailbox.php:257 lib/Dynamic/Mailbox.php:459
#: lib/Smartmobile.php:170 lib/Ui/Message.php:31 search.php:65
#: templates/basic/search/search-basic.html.php:19
-#: templates/dynamic/compose.html.php:131
-#: templates/minimal/mailbox.html.php:14
+#: templates/dynamic/compose.html.php:131 templates/minimal/mailbox.html.php:14
#: templates/smartmobile/search.html.php:14
msgid "Subject"
msgstr "Objet"
@@ -5054,8 +5046,7 @@ msgstr "Les disponibilités de l'utilisateur ont bien été enregistrées."
msgid "There are no alternative parts that can be displayed inline."
msgstr "Aucune partie alternative n'est affichable."
-#: lib/Dynamic/Mailbox.php:509
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:509 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "Il n'y a aucun message dans cette boîte."
@@ -5244,13 +5235,12 @@ msgstr "Tri en enfilade"
msgid "Thread View"
msgstr "Vue avec les enfilades"
-#: lib/Compose.php:2235 lib/Dynamic/Mailbox.php:195
-#: lib/Dynamic/Mailbox.php:256 lib/Ui/Message.php:27 mailbox.php:717
-#: search.php:53 templates/basic/compose/redirect.html.php:32
+#: lib/Compose.php:2235 lib/Dynamic/Mailbox.php:195 lib/Dynamic/Mailbox.php:256
+#: lib/Ui/Message.php:27 mailbox.php:717 search.php:53
+#: templates/basic/compose/redirect.html.php:32
#: templates/basic/thread/thread.html.php:19
#: templates/contacts/contacts.html.php:41
-#: templates/dynamic/compose.html.php:88
-#: templates/dynamic/mailbox.html.php:124
+#: templates/dynamic/compose.html.php:88 templates/dynamic/mailbox.html.php:124
msgid "To"
msgstr "À"
@@ -5323,8 +5313,7 @@ msgid "Type"
msgstr "Type"
#: lib/Quota/Command.php:90 lib/Quota/Hook.php:40 lib/Quota/Imap.php:50
-#: lib/Quota/Maildir.php:60 lib/Quota/Mdaemon.php:62
-#: lib/Quota/Mercury32.php:68
+#: lib/Quota/Maildir.php:60 lib/Quota/Mdaemon.php:62 lib/Quota/Mercury32.php:68
msgid "Unable to retrieve quota"
msgstr "Récupération du quota impossible"
@@ -5686,8 +5675,8 @@ msgstr "Vous êtes"
#: templates/basic/folders/folders_confirm.html.php:13
msgid ""
-"You are attempting to delete all messages contained in the following mailbox"
-"(es)."
+"You are attempting to delete all messages contained in the following "
+"mailbox(es)."
msgstr "Vous allez détruire tous les messages du(des) dossier(s) suivant(s)."
#: templates/basic/folders/folders_confirm.html.php:11
diff --git a/locale/gl/LC_MESSAGES/imp.mo b/locale/gl/LC_MESSAGES/imp.mo
index 7f51ee451..86ca8364b 100644
Binary files a/locale/gl/LC_MESSAGES/imp.mo and b/locale/gl/LC_MESSAGES/imp.mo differ
diff --git a/locale/gl/LC_MESSAGES/imp.po b/locale/gl/LC_MESSAGES/imp.po
index af8071f44..e73017dfe 100644
--- a/locale/gl/LC_MESSAGES/imp.po
+++ b/locale/gl/LC_MESSAGES/imp.po
@@ -57,21 +57,6 @@ msgstr " Asunto: "
msgid "#"
msgstr "#"
-#: lib/Quota.php:73
-#, php-format
-msgid "%.0f MB"
-msgstr ""
-
-#: lib/Quota.php:67
-#, php-format
-msgid "%.0f%% of %.0f MB"
-msgstr ""
-
-#: folders.php:311 folders.php:322 lib/Message.php:863
-#, php-format
-msgid "%.2fMB"
-msgstr ""
-
#: thread.php:162
#, php-format
msgid "%d Messages"
@@ -217,11 +202,6 @@ msgstr "%s desexa poñelo ao corrente de \"%s\"."
msgid "%s wishes to receive the latest information about \"%s\"."
msgstr "%s desexa recibir información actualizada sobre \"%s\"."
-#: compose.php:1233
-#, php-format
-msgid "%s%% of allowed size"
-msgstr ""
-
#: message.php:282 message.php:287 message.php:505
#, php-format
msgid "%s: %s"
@@ -299,10 +279,6 @@ msgstr ""
msgid "AND"
msgstr "E"
-#: config/prefs.php.dist:665
-msgid "About this editor"
-msgstr ""
-
#: config/prefs.php.dist:973
#, fuzzy
msgid "Above the message text"
@@ -431,10 +407,6 @@ msgstr ""
"Enderezos vinculados explicitamente a esta identidade: (opcional, "
"indique cada un nunha liña distinta)"
-#: lib/IMAP/ACL/rfc4314.php:59 lib/IMAP/ACL/rfc2086.php:57
-msgid "Administer"
-msgstr ""
-
#: templates/mailbox/navbar.html:10
msgid "All"
msgstr "Todos"
@@ -527,10 +499,6 @@ msgstr "Produciuse un erro descoñecido ao crear a nota."
msgid "An unknown error occured while creating the new task."
msgstr "Produciuse un erro descoñecido ao crear a tarefa."
-#: lib/MIME/Viewer/itip.php:882
-msgid "An unknown person"
-msgstr ""
-
#: message.php:477 mailbox.php:764 templates/message/navbar_navigate.html:12
#: templates/mailbox/navbar.html:18 templates/mailbox/navbar.html:34
msgid "Answered"
@@ -648,10 +616,6 @@ msgstr "Anexa ficheiros"
msgid "Attach a copy of your PGP public key to the message?"
msgstr "Quere engadir unha copia da súa clave pública PGP á mensaxe?"
-#: compose.php:1165
-msgid "Attach your contact information to the message?"
-msgstr ""
-
#: lib/MIME/Viewer/tnef.php:110
msgid "Attached File:"
msgstr "Ficheiro anexo:"
@@ -742,10 +706,6 @@ msgstr "Regresa ao Índice de visualización de mensaxes "
msgid "Back to Thread Display"
msgstr "Regresa a Visualiza os fíos de mensaxes"
-#: config/prefs.php.dist:631
-msgid "Background Color"
-msgstr ""
-
#: lib/IMAP/Client.php:480
#, php-format
msgid "Bad login name or password."
@@ -761,8 +721,8 @@ msgstr "A solicitude é incorrecta ou malformada. O servidor respondeu: %s"
msgid "Bad request: %s"
msgstr "A solicitude é incorrecta: %s"
-#: lib/Search.php:726 lib/UI/Message.php:28
-#: templates/contacts/contacts.html:43 templates/login/recompose.html:32
+#: lib/Search.php:726 lib/UI/Message.php:28 templates/contacts/contacts.html:43
+#: templates/login/recompose.html:32
msgid "Bcc"
msgstr "CCO"
@@ -794,10 +754,6 @@ msgstr ""
msgid "Body"
msgstr "Texto"
-#: message.php:570 config/prefs.php.dist:764
-msgid "Body Text Only"
-msgstr ""
-
#: message.php:571 config/prefs.php.dist:765
#, fuzzy
msgid "Body Text with Attachments"
@@ -817,10 +773,6 @@ msgstr "Tanto nas cabeceiras como no texto da mensaxe"
msgid "Bottom"
msgstr "Ambos"
-#: config/prefs.php.dist:640
-msgid "Bulleted List"
-msgstr ""
-
#: lib/IMAP/Client.php:409
#, fuzzy
msgid ""
@@ -861,10 +813,6 @@ msgstr "Non se pode conectar co servidor de correo."
msgid "Cannot connect to the remote mail server: "
msgstr "Non se pode conectar co servidor de correo: "
-#: lib/IMAP/Tree.php:2093
-msgid "Cannot directly create mailbox in this folder."
-msgstr ""
-
#: lib/MIME/Viewer/partial.php:47
#, php-format
msgid ""
@@ -874,16 +822,8 @@ msgstr ""
"Non se pode mostrar - na caixa de correo actual só se atoparon %s de %s "
"partes desta mensaxe."
-#: lib/Message.php:199
-msgid "Cannot move messages to Trash - no Trash mailbox set in preferences."
-msgstr ""
-
-#: pgp.php:282
-msgid "Cannot retrieve public key from cache."
-msgstr ""
-
-#: lib/Search.php:721 lib/UI/Message.php:27
-#: templates/contacts/contacts.html:42 templates/login/recompose.html:23
+#: lib/Search.php:721 lib/UI/Message.php:27 templates/contacts/contacts.html:42
+#: templates/login/recompose.html:23
msgid "Cc"
msgstr "Cc"
@@ -950,10 +890,6 @@ msgstr "Busca correo novo no(s) cartafol(es)"
msgid "Check spelling before sending a message?"
msgstr "Quere verificar a ortografía antes de enviar unha mensaxe?"
-#: lib/UI/Compose.php:153
-msgid "Checking ..."
-msgstr ""
-
#: templates/folders/actions.html:11 templates/folders/actions.html:13
#, fuzzy
msgid "Choose Action"
@@ -976,14 +912,6 @@ msgid "Choose the order of address books to search when expanding addresses."
msgstr ""
"Elixa a orde de busca nas axendas de enderezos cando expanda enderezos."
-#: config/prefs.php.dist:657
-msgid "Clear Inline Font Specifications"
-msgstr ""
-
-#: config/prefs.php.dist:656
-msgid "Clear MSOffice tags"
-msgstr ""
-
#: lib/MIME/Viewer/images.php:101
#, php-format
msgid "Click %s to convert the image file into a format your browser can view."
@@ -1020,11 +948,6 @@ msgstr "Prema %s para ver esta parte nunha xanela á parte."
msgid "Click HERE to verify the message."
msgstr "Prema %s para descargar a imaxe"
-#: config/prefs.php.dist:531
-#, php-format
-msgid "Click here to open all mailto: links in %s."
-msgstr ""
-
#: templates/prefs/sourceselect.inc:319
msgid ""
"Click on one of your selected address books and then select all fields to "
@@ -1075,10 +998,6 @@ msgstr "Contrae o cartafol"
msgid "Color Indicator:"
msgstr "Indicador de cor: "
-#: config/prefs.php.dist:1279
-msgid "Combine all namespaces"
-msgstr ""
-
#: templates/pgp/pgp.html:97
#, fuzzy
msgid "Comment:"
@@ -1113,10 +1032,6 @@ msgstr "Configure as opcións de previsualización do correo."
msgid "Connection to server failed."
msgstr "A conexión co servidor fallou"
-#: config/hooks.php.dist:530
-msgid "Contacts"
-msgstr ""
-
#: config/prefs.php.dist:177
#, php-format
msgid "Control PGP support for %s."
@@ -1184,12 +1099,6 @@ msgstr "Non se pode extraer o ficheiro solicitado do anexo MS-TNEF."
msgid "Could not extract the requested file from the Zip archive."
msgstr "Non se pode extraer o ficheiro solicitado do arquivo Zip."
-#: lib/Spam.php:237
-msgid ""
-"Could not move message to spam mailbox - no spam mailbox defined in "
-"preferences."
-msgstr ""
-
#: lib/IMAP/Client.php:320
#, fuzzy
msgid "Could not open secure connection to the IMAP server."
@@ -1211,11 +1120,6 @@ msgstr ""
msgid "Could not save recipients: %s"
msgstr "Non se pode crear o sistema traseiro VFS : %s"
-#: lib/Template.php:231
-#, php-format
-msgid "Could not save the compiled template file '%s'."
-msgstr ""
-
#: templates/fetchmail/fetchmailprefs.html:121
#: templates/folders/actions.html:16
msgid "Create"
@@ -1313,10 +1217,6 @@ msgstr "Personaliza o envío de correo."
msgid "Customize tasks to run upon logon to %s."
msgstr "Personaliza as tarefas que se van executar ao inicio da sesión en %s."
-#: config/prefs.php.dist:651
-msgid "Cut selection"
-msgstr ""
-
#: mailbox.php:582
msgid "Dat_e"
msgstr "Data"
@@ -1522,25 +1422,10 @@ msgid ""
"Did not attach \"%s\" as the maximum allowed upload size has been exceeded."
msgstr "Non se anexou \"%s\" porque o ficheiro está baleiro."
-#: lib/Compose.php:2944
-#, php-format
-msgid ""
-"Did not attach \"%s\" as the server configuration did not allow the file to "
-"be uploaded."
-msgstr ""
-
#: config/prefs.php.dist:921
msgid "Dim signatures?"
msgstr "Quere atenuar as sinaturas?"
-#: config/prefs.php.dist:661
-msgid "Direction left to right"
-msgstr ""
-
-#: config/prefs.php.dist:662
-msgid "Direction right to left"
-msgstr ""
-
#: config/prefs.php.dist:283
msgid "Display Virtual Inbox?"
msgstr "¿Mostrar a Bandexa de Entrada virtual?"
@@ -1583,10 +1468,6 @@ msgstr "Non busques correo novo no(s) cartafol(es)"
msgid "Do not generate a link in the From: column"
msgstr "Non xeres unha ligazón na columna De:"
-#: templates/javascript_defs.php:30
-msgid "Doing so will discard this message permanently."
-msgstr ""
-
#: login.php:430
msgid "Don't have an account? Sign up."
msgstr "Non dispón de conta? Solicite unha."
@@ -1632,10 +1513,6 @@ msgstr "Borrador"
msgid "Drafts folder:"
msgstr "Cartafol Borradores:"
-#: login.php:266
-msgid "Dynamic"
-msgstr ""
-
#: templates/pgp/pgp.html:102
#, fuzzy
msgid "E-mail Address:"
@@ -1861,10 +1738,6 @@ msgstr ""
"Quere expandir de forma predefinida toda a árbore de cartafoles no panel "
"lateral? "
-#: config/prefs.php.dist:601
-msgid "FCKeditor"
-msgstr ""
-
#: lib/IMP.php:870 lib/IMP.php:872
msgid "F_etch Mail"
msgstr "Recolle o correo"
@@ -1947,11 +1820,6 @@ msgstr "Primeira páxina da caixa de correo"
msgid "First Page"
msgstr "Primeira páxina"
-#: message.php:479 mailbox.php:774 templates/message/navbar_navigate.html:10
-#: templates/mailbox/navbar.html:16 templates/mailbox/navbar.html:32
-msgid "Flagged For Followup"
-msgstr ""
-
#: lib/Search.php:807
#, fuzzy
msgid "Flagged messages"
@@ -1992,10 +1860,6 @@ msgstr "O uso compartido de cartafoles non está habilitado."
msgid "Folder use is not enabled."
msgstr "O uso do cartafol non está habilitado."
-#: config/prefs.php.dist:630
-msgid "Font Color"
-msgstr ""
-
#: config/prefs.php.dist:1260
msgid "Format of message dates in the mailbox view for messages dated today"
msgstr "Formato de data das mensaxes datadas hoxe na vista Caixa de correo"
@@ -2044,10 +1908,6 @@ msgstr "Enderezo do remitente"
msgid "From:"
msgstr "Remitente"
-#: templates/saveimage/saveimage.html:12
-msgid "Gallery"
-msgstr ""
-
#: config/prefs.php.dist:14 config/prefs.php.dist:24 config/prefs.php.dist:34
#: config/prefs.php.dist:42
msgid "General Options"
@@ -2097,10 +1957,6 @@ msgstr "Versión HTML da mensaxe"
msgid "Headers"
msgstr "Cabeceiras"
-#: config/prefs.php.dist:664
-msgid "Help using editor"
-msgstr ""
-
#: templates/login/recompose.html:7
msgid "Here is the message you were composing:"
msgstr "A mensaxe que estaba redactando está aquí:"
@@ -2143,18 +1999,10 @@ msgstr "Prioridade alta"
msgid "Highest"
msgstr "A máis alta"
-#: config/prefs.php.dist:643
-msgid "Horizontal Rule"
-msgstr ""
-
#: config/prefs.php.dist:940
msgid "How do you want to display attachments?"
msgstr "Como quere mostrar os anexos?"
-#: config/prefs.php.dist:1281
-msgid "How should namespaces be displayed in the folder tree view?"
-msgstr ""
-
#: config/prefs.php.dist:792
msgid "How to attribute quoted lines in a reply"
msgstr "Como sinalar as liñas citadas nunha resposta?"
@@ -2205,10 +2053,6 @@ msgstr "Se continúa, vanse perder todas as mensaxes do(s) cartafol(es)!"
msgid "Image"
msgstr "Imaxe"
-#: lib/MIME/Viewer/html.php:160
-msgid "Images have been blocked to protect your privacy."
-msgstr ""
-
#: templates/folders/import.html:17
msgid "Import"
msgstr "Importa"
@@ -2286,19 +2130,12 @@ msgstr "Importa un ficheiro mbox"
msgid "Imported %d messages from %s."
msgstr "Importáronse %d mensaxes de %s."
-#: pgp.php:179
-msgid ""
-"Imported key contains your PGP private key. Only add your public key in the "
-"first step!"
-msgstr ""
-
#: lib/MIME/Viewer/itip.php:1029
msgid "In Process"
msgstr "En curso"
#: templates/prefs/initialpageselect.inc:4 lib/Folder.php:68 lib/api.php:293
-#: lib/IMP.php:732 lib/IMP.php:742 lib/IMAP/Tree.php:410
-#: lib/IMAP/Tree.php:1976
+#: lib/IMP.php:732 lib/IMP.php:742 lib/IMAP/Tree.php:410 lib/IMAP/Tree.php:1976
msgid "Inbox"
msgstr "Bandexa de entrada"
@@ -2306,18 +2143,10 @@ msgstr "Bandexa de entrada"
msgid "Include a brief summary of the header in a reply?"
msgstr "Quere incluír un resumo curto na resposta?"
-#: config/prefs.php.dist:775
-msgid "Include body text in forward message by default?"
-msgstr ""
-
#: config/prefs.php.dist:746
msgid "Include original message in a reply?"
msgstr "Quere incluír a mensaxe orixinal na resposta?"
-#: config/prefs.php.dist:642
-msgid "Increase Indent"
-msgstr ""
-
#: lib/MIME/Viewer/notification.php:59 lib/MIME/Viewer/status.php:131
msgid "Info"
msgstr "Información"
@@ -2350,22 +2179,6 @@ msgstr "Inverte"
msgid "Insert Certificate Here:"
msgstr "Insira aquí o certificado"
-#: config/prefs.php.dist:646
-msgid "Insert Table"
-msgstr ""
-
-#: config/prefs.php.dist:644
-msgid "Insert Web Link"
-msgstr ""
-
-#: config/prefs.php.dist:645
-msgid "Insert/Modify Image"
-msgstr ""
-
-#: config/prefs.php.dist:654
-msgid "Insert/Overwrite"
-msgstr ""
-
#: lib/MIME/Viewer/itip.php:451
msgid "Invalid Action selected for this component."
msgstr "Seleccionou unha acción non-válida para este compoñente"
@@ -2398,10 +2211,6 @@ msgstr "A tecla non é válida"
msgid "Invalid key"
msgstr "A tecla non é válida"
-#: lib/Compose.php:296
-msgid "Invalid message, cannot resume draft."
-msgstr ""
-
#: pgp.php:215
msgid "Invalid personal PGP private key."
msgstr "A clave privada PGP persoal non é válida."
@@ -2414,26 +2223,6 @@ msgstr "A clave pública PGP persoal non é válida."
msgid "Invert"
msgstr "Inverte"
-#: config/prefs.php.dist:627
-msgid "Italic"
-msgstr ""
-
-#: config/prefs.php.dist:636
-msgid "Justify Center"
-msgstr ""
-
-#: config/prefs.php.dist:638
-msgid "Justify Full"
-msgstr ""
-
-#: config/prefs.php.dist:635
-msgid "Justify Left"
-msgstr ""
-
-#: config/prefs.php.dist:637
-msgid "Justify Right"
-msgstr ""
-
#: templates/compose/compose.html:317 templates/compose/compose.html:325
msgid "KB"
msgstr "KB"
@@ -2514,10 +2303,6 @@ msgstr ""
msgid "Listing in the Header"
msgstr "Lista na cabeceira"
-#: compose.php:813
-msgid "Loading..."
-msgstr ""
-
#: templates/fetchmail/fetchmailprefs.html:72
msgid "Local Mailbox:"
msgstr "Caixa de correo local:"
@@ -2575,14 +2360,6 @@ msgstr "Caixa de correo"
msgid "Mailbox and Folder Display Options"
msgstr "Opcións de visualización das caixas de correo e cartafoles"
-#: lib/IMAP/ACL/rfc4314.php:52 lib/IMAP/ACL/rfc2086.php:52
-msgid "Mark (Other)"
-msgstr ""
-
-#: lib/IMAP/ACL/rfc4314.php:51 lib/IMAP/ACL/rfc2086.php:51
-msgid "Mark (Seen)"
-msgstr ""
-
#: templates/folders/actions.html:32
#, fuzzy
msgid "Mark All Messages as Seen"
@@ -2619,10 +2396,6 @@ msgstr "Coincidir en todas"
msgid "Match Any Query"
msgstr "Coincidir en calquera"
-#: config/prefs.php.dist:622
-msgid "Maximize/Minimize Editor"
-msgstr ""
-
#: templates/compose/compose.html:283
msgid "Maximum Attachment Size"
msgstr "Tamaño máximo do anexo"
@@ -2671,9 +2444,8 @@ msgid "Message Drafts"
msgstr "Data da mensaxe"
#: config/prefs.php.dist:62 config/prefs.php.dist:78 config/prefs.php.dist:86
-#: config/prefs.php.dist:93 config/prefs.php.dist:108
-#: config/prefs.php.dist:121 config/prefs.php.dist:129
-#: config/prefs.php.dist:138
+#: config/prefs.php.dist:93 config/prefs.php.dist:108 config/prefs.php.dist:121
+#: config/prefs.php.dist:129 config/prefs.php.dist:138
msgid "Message Options"
msgstr "Opcións da mensaxe "
@@ -2736,10 +2508,6 @@ msgstr "Mensaxes por páxina na vista Caixa de correo."
msgid "Messages to"
msgstr "Mensaxes a"
-#: login.php:270
-msgid "Minimalist"
-msgstr ""
-
#: templates/login/login.html:129
#, fuzzy
msgid "Mode"
@@ -2876,10 +2644,6 @@ msgstr "Sen previsualización de texto"
msgid "No S/MIME public key imported."
msgstr "Non se importaron claves públicas S/MIME"
-#: templates/prefs/soundselect.inc:5
-msgid "No Sound"
-msgstr ""
-
#: lib/MIME/Viewer/tnef.php:91
msgid "No attachments found."
msgstr "Non se atoparon anexos."
@@ -2908,10 +2672,6 @@ msgstr "Non hai cartafoles con novas mensaxes"
msgid "No folders with unseen messages"
msgstr "Non hai cartafoles con mensaxes sen ler"
-#: lib/IMP.php:1048
-msgid "No limit"
-msgstr ""
-
#: lib/Compose.php:1732
msgid "No message body text"
msgstr "Non hai texto da mensaxe"
@@ -2996,10 +2756,6 @@ msgstr "Non é un borrador"
msgid "Note that this can take some time"
msgstr "Teña en conta que pode levar algo de tempo"
-#: lib/IMP.php:542
-msgid "Notepads"
-msgstr ""
-
#: config/hooks.php.dist:522
#, fuzzy
msgid "Notes"
@@ -3063,10 +2819,6 @@ msgstr "O cartafol está aberto"
msgid "Optional Participant"
msgstr "Participante opcional"
-#: config/prefs.php.dist:639
-msgid "Ordered List"
-msgstr ""
-
#: templates/fetchmail/fetchmailprefs.html:3
msgid "Other Mail Accounts"
msgstr "Outras contas de correo"
@@ -3143,12 +2895,6 @@ msgstr "Mensaxe asinada/cifrada en PGP"
msgid "PGP Sign/Encrypt Message with passphrase"
msgstr "Mensaxe asinada/cifrada en PGP"
-#: compose.php:733
-msgid ""
-"PGP encryption cannot be used by default as public keys cannot be found for "
-"all recipients."
-msgstr ""
-
#: pgp.php:210
msgid "PGP private key successfully added."
msgstr "A clave privada PGP engadiuse correctamente."
@@ -3265,10 +3011,6 @@ msgstr "Contrasinal"
msgid "Password: "
msgstr "Contrasinal"
-#: config/prefs.php.dist:653
-msgid "Paste from clipboard"
-msgstr ""
-
#: message.php:465 mailbox.php:752 templates/mailbox/navbar.html:24
msgid "Personal"
msgstr "Persoal"
@@ -3408,10 +3150,6 @@ msgstr "Funciona con Horde"
msgid "Precede your signature with dashes ('-- ')?"
msgstr "Quere antepoñer guións ('-- ') á súa sinatura?"
-#: config/hooks.php.dist:538
-msgid "Preferences"
-msgstr ""
-
#: smime.php:262 pgp.php:271 filterprefs.php:53
msgid "Preferences successfully updated."
msgstr "As preferencias actualizáronse correctamente."
@@ -3432,10 +3170,6 @@ msgstr "Páxina anterior"
msgid "Print"
msgstr "Imprime"
-#: config/prefs.php.dist:650
-msgid "Print document"
-msgstr ""
-
#: message.php:691
#, fuzzy
msgid "Printed By"
@@ -3480,10 +3214,6 @@ msgstr "Desactivouse o soporte de servidores de claves públicas PGP"
msgid "Pur_ge Deleted"
msgstr "Baleira o lixo"
-#: lib/IMAP/ACL/rfc4314.php:58 templates/folders/actions.html:22
-msgid "Purge"
-msgstr ""
-
#: mailbox.php:454 mailbox.php:522
msgid "Purge Deleted"
msgstr "Baleira o lixo"
@@ -3989,10 +3719,6 @@ msgstr "Quere gardar a busca como un cartafol virtual?"
msgid "Save sent mail?"
msgstr "Quere gardar as mensaxes enviadas?"
-#: lib/Compose.php:247
-msgid "Saving the draft failed. Could not create a drafts folder."
-msgstr ""
-
#: lib/Compose.php:187
#, fuzzy
msgid "Saving the draft failed. No draft folder specified."
@@ -4189,14 +3915,6 @@ msgstr "Comparte o seu cartafol de correo con outros usuarios."
msgid "Shared Folders"
msgstr "Cartafoles compartidos"
-#: templates/pgp/pgp.html:15
-msgid "Should PGP signed messages automatically be verified when viewed?"
-msgstr ""
-
-#: templates/smime/smime.html:7
-msgid "Should S/MIME signed messages automatically be verified when viewed?"
-msgstr ""
-
#: config/prefs.php.dist:913
msgid ""
"Should large blocks of quoted text be shown or hidden by default? It can be "
@@ -4262,10 +3980,6 @@ msgid "Show an icon to allow stripping of attachments from messages?"
msgstr ""
"Quere mostrar unha icona que permita extraer anexos desde as mensaxes? "
-#: config/prefs.php.dist:1280
-msgid "Show non-private mailboxes in separate folders"
-msgstr ""
-
#: config/prefs.php.dist:1124
msgid "Show previews for unread messages only?"
msgstr "Quere mostrar previsualizacións só das mensaxes sen ler?"
@@ -4313,14 +4027,6 @@ msgstr "Tamaño"
msgid "Size"
msgstr "Tamaño"
-#: lib/Search.php:762
-msgid "Size (KB) <"
-msgstr ""
-
-#: lib/Search.php:768
-msgid "Size (KB) >"
-msgstr ""
-
#: templates/compose/compose.html:325
#, fuzzy
msgid "Size:"
@@ -4354,10 +4060,6 @@ msgstr "Ordena por Fío de mensaxes"
msgid "Sort by To Address"
msgstr "Ordena por destinatario"
-#: config/prefs.php.dist:329
-msgid "Spam"
-msgstr ""
-
#: lib/IMAP/Tree.php:1999
#, fuzzy
msgid "Spam folder"
@@ -4380,10 +4082,6 @@ msgstr "Os cartafoles virtuais especiais non se poden modificar."
msgid "Spell Check Failed"
msgstr "Verificador ortográfico"
-#: config/prefs.php.dist:660
-msgid "Split Block"
-msgstr ""
-
#: lib/MIME/Viewer/itip.php:599 lib/MIME/Viewer/itip.php:601
#: lib/MIME/Viewer/itip.php:775 lib/MIME/Viewer/itip.php:777
#, fuzzy
@@ -4411,10 +4109,6 @@ msgstr "Deseño de fondo:"
msgid "Status"
msgstr "Estado"
-#: config/prefs.php.dist:629
-msgid "Strikethrough"
-msgstr ""
-
#: message.php:684
#, fuzzy
msgid "Strip All Attachments"
@@ -4508,10 +4202,6 @@ msgstr "Cambia o cartafol"
msgid "Target Mailbox:"
msgstr "Caixa de correo remota:"
-#: lib/IMP.php:525
-msgid "Task Lists"
-msgstr ""
-
#: config/hooks.php.dist:514
#, fuzzy
msgid "Tasks"
@@ -4547,10 +4237,6 @@ msgstr "Texto"
msgid "Text Font"
msgstr "Texto"
-#: config/prefs.php.dist:623
-msgid "Text Format"
-msgstr ""
-
#: config/prefs.php.dist:625
#, fuzzy
msgid "Text Size"
@@ -4596,14 +4282,6 @@ msgstr "Gardouse a conta \"%s\"."
msgid "The attachment was not found."
msgstr "Non se atopou o anexo."
-#: config/prefs.php.dist:666
-msgid "The buttons NOT to show when using Xinha."
-msgstr ""
-
-#: config/prefs.php.dist:612
-msgid "The buttons to show when using FCKeditor."
-msgstr ""
-
#: lib/MIME/Viewer/itip.php:70
msgid "The calendar data is invalid"
msgstr "A data da axenda non é válida"
@@ -4706,10 +4384,6 @@ msgstr ""
"Non se pode abrir a xanela de gardado de imaxes. ¿Ten configurado o seu "
"navegador para que bloquee as xanelas emerxentes?"
-#: config/prefs.php.dist:603
-msgid "The javascript editor to use on the compose page."
-msgstr ""
-
#: lib/MIME/Viewer/status.php:74
msgid "The mail server generated the following error message:"
msgstr "O servidor de correo xerou a seguinte mensaxe de erro:"
@@ -4759,12 +4433,6 @@ msgstr ""
msgid "The message below has been compressed with PGP."
msgstr "Esta mensaxe cifrouse mediante PGP"
-#: lib/MIME/Viewer/pgp.php:201
-msgid ""
-"The message below has been digitally signed and encrypted with PGP, but the "
-"signature cannot be verified."
-msgstr ""
-
#: lib/MIME/Viewer/pgp.php:207
#, fuzzy
msgid "The message below has been digitally signed and encrypted with PGP."
@@ -4782,12 +4450,6 @@ msgstr "Esta mensaxe asinouse dixitalmente mediante PGP"
msgid "The message below has been digitally signed with PGP."
msgstr "Esta mensaxe asinouse dixitalmente mediante PGP"
-#: lib/MIME/Viewer/pgp.php:318
-msgid ""
-"The message below has been encrypted with PGP, however, PGP support is "
-"disabled so the message cannot be decrypted."
-msgstr ""
-
#: lib/MIME/Viewer/pgp.php:360
#, fuzzy
msgid ""
@@ -4809,12 +4471,6 @@ msgstr ""
"Para ver esta mensaxe ten que introducir a frase clave da sua clave privada "
"PGP."
-#: lib/MIME/Viewer/pgp.php:353
-msgid ""
-"The message below has been encrypted with PGP. You must enter the passphrase "
-"that was used to encrypt this message."
-msgstr ""
-
#: lib/MIME/Viewer/pgp.php:460
#, fuzzy
msgid "The message below has been verified."
@@ -4891,12 +4547,6 @@ msgstr "Non se puido substituír a sinatura."
msgid "The signature was successfully replaced."
msgstr "A sinatura substituíuse correctamente."
-#: attachment.php:60
-msgid ""
-"The specified attachment does not exist. It may have been deleted by the "
-"original sender."
-msgstr ""
-
#: attachment.php:129
#, fuzzy
msgid "The specified file cannot be read."
@@ -4917,12 +4567,6 @@ msgstr "Eliminouse o deseño de fondo \"%s\"."
msgid "The stationery \"%s\" has been updated."
msgstr "Actualizouse o deseño de fondo \"%s\"."
-#: lib/Compose.php:972
-msgid ""
-"The system is not properly configured. A detailed error description has been "
-"logged for the administrator."
-msgstr ""
-
#: lib/MIME/Viewer/itip.php:192
msgid "The task has been added to your tasklist."
msgstr "Engadiuse a tarefa á lista de tarefas."
@@ -5061,10 +4705,6 @@ msgstr "Esta acción non está soportada."
msgid "This action is not yet implemented."
msgstr "Esta acción non está implementada."
-#: templates/javascript_defs.php:61
-msgid "This folder may not be renamed:"
-msgstr ""
-
#: templates/javascript_defs.php:58
msgid "This may take some time. Are you sure you want to continue?"
msgstr "Isto pode levar algún tempo. Seguro que desexa continuar?"
@@ -5103,21 +4743,10 @@ msgstr "Esta mensaxe asinouse dixitalmente mediante S/MIME"
msgid "This message has been encrypted via S/MIME."
msgstr "Esta mensaxe cifrouse mediante S/MIME"
-#: lib/MIME/Contents.php:449
-msgid "This message part cannot be viewed because it is too large."
-msgstr ""
-
#: message.php:521
msgid "This message to"
msgstr "A mensaxe para"
-#: lib/IMP.php:338
-#, php-format
-msgid ""
-"This request cannot be completed because the link you followed or the form "
-"you submitted was only valid for %d minutes. Please try again now."
-msgstr ""
-
#: acl.php:47
msgid "This server does not support sharing folders."
msgstr "Este servidor non soporta o uso compartido de cartafoles."
@@ -5135,14 +4764,6 @@ msgstr "Visualiza o Fío de mensaxes"
msgid "Thread View"
msgstr "Vista por Fío de mensaxes"
-#: lib/MIME/Viewer/pdf.php:103
-msgid "Thumbnail of attached PDF file"
-msgstr ""
-
-#: lib/MIME/Viewer/images.php:167
-msgid "Thumbnail of attached image"
-msgstr ""
-
#: compose.php:832 mailbox.php:587 lib/Search.php:716 lib/UI/Mailbox.php:90
#: lib/UI/Message.php:26 templates/contacts/contacts.html:40
#: templates/login/recompose.html:14
@@ -5163,23 +4784,11 @@ msgstr "Todos"
msgid "To List"
msgstr "Resposta á lista"
-#: message.php:558
-msgid "To Sender"
-msgstr ""
-
#: message.php:565
#, fuzzy
msgid "To _All"
msgstr "Todos"
-#: message.php:561
-msgid "To _List"
-msgstr ""
-
-#: templates/compose/redirect.html:47
-msgid "To field"
-msgstr ""
-
#: templates/prefs/sourceselect.inc:324
msgid ""
"To select multiple fields, hold down the Control (PC) or Command (Mac) while "
@@ -5206,14 +4815,6 @@ msgstr ""
msgid "To:"
msgstr "Destinatario"
-#: config/prefs.php.dist:659
-msgid "Toggle Borders"
-msgstr ""
-
-#: config/prefs.php.dist:663
-msgid "Toggle HTML Source"
-msgstr ""
-
#: config/prefs.php.dist:683
#, fuzzy
msgid "Top"
@@ -5224,14 +4825,6 @@ msgstr "Destinatario"
msgid "Total Size:"
msgstr "Tamaño total dos anexos:"
-#: login.php:263
-msgid "Traditional"
-msgstr ""
-
-#: config/prefs.php.dist:316
-msgid "Trash"
-msgstr ""
-
#: lib/IMAP/Tree.php:1986
msgid "Trash folder"
msgstr "Lixo"
@@ -5250,9 +4843,9 @@ msgstr "Houbo un erro ao importar o evento: %s."
msgid "Unable to connect to SQL server."
msgstr "Non se pode conectar co servidor de correo."
-#: lib/Quota/mercury32.php:68 lib/Quota/command.php:91
-#: lib/Quota/logfile.php:85 lib/Quota/hook.php:42 lib/Quota/maildir.php:111
-#: lib/Quota/imap.php:42 lib/Quota/mdaemon.php:45
+#: lib/Quota/mercury32.php:68 lib/Quota/command.php:91 lib/Quota/logfile.php:85
+#: lib/Quota/hook.php:42 lib/Quota/maildir.php:111 lib/Quota/imap.php:42
+#: lib/Quota/mdaemon.php:45
msgid "Unable to retrieve quota"
msgstr "Non se pode determinar a cota de espazo"
@@ -5283,10 +4876,6 @@ msgstr "Recupera"
msgid "Undisclosed Recipients"
msgstr "Non se especificou ningún destinatario"
-#: config/prefs.php.dist:647
-msgid "Undoes your last action"
-msgstr ""
-
#: lib/IMAP/Client.php:464
msgid "Unexpected response from server to AUTHENTICATE command."
msgstr "Resposta inesperada do servidor ao comando AUTHENTICATE."
@@ -5523,13 +5112,6 @@ msgstr "Etiqueta do cartafol virtual"
msgid "Warning"
msgstr "Aviso"
-#: lib/IMP.php:334
-msgid ""
-"We cannot verify that this request was really sent by you. It could be a "
-"malicious request. If you intended to perform this action, you can retry it "
-"now."
-msgstr ""
-
#: login.php:196 login.php:355 templates/login/mobile.inc:11
#, php-format
msgid "Welcome to %s"
@@ -5558,12 +5140,6 @@ msgid ""
"start on?"
msgstr "Ao abrir unha caixa de correo ¿en que páxina desexa empezar?"
-#: config/prefs.php.dist:755
-msgid ""
-"When replying/forwarding to a message, should we use the same format as the "
-"original message?"
-msgstr ""
-
#: config/prefs.php.dist:719
msgid "When saving sent-mail, should we save attachment data?"
msgstr "Quere gardar os anexos canda as mensaxes enviadas?"
@@ -5576,22 +5152,10 @@ msgstr ""
"Ao enviar correo ou expandir enderezos, ¿que dominio hai que engadirlles aos "
"enderezos non cualificados (os que non inclúen \"@\")?"
-#: config/prefs.php.dist:976
-msgid "Where do you want to display links to alternative formats of a message?"
-msgstr ""
-
-#: config/prefs.php.dist:686
-msgid "Where should the cursor be located in the compose text area by default?"
-msgstr ""
-
#: message.php:584 mailbox.php:530
msgid "Whitelist"
msgstr "Lista branca"
-#: lib/prefs.php:241 config/prefs.php.dist:602
-msgid "Xinha"
-msgstr ""
-
#: templates/search/search.html:105
#, fuzzy
msgid "Year"
@@ -5696,12 +5260,6 @@ msgstr "Ten %s mensaxes novas."
msgid "You have 1 new message."
msgstr "Ten 1 mensaxe nova."
-#: lib/prefs.php:172
-msgid ""
-"You have activated move to Trash but no Trash folder is defined. You will be "
-"unable to delete messages until you set a Trash folder in the preferences."
-msgstr ""
-
#: compose.php:150
msgid "You have already submitted this page."
msgstr "Xa enviou esta páxina."
@@ -5711,10 +5269,6 @@ msgstr "Xa enviou esta páxina."
msgid "You have new mail in:"
msgstr "Ten 1 mensaxe nova."
-#: templates/fetchmail/fetchmail.html:22
-msgid "You have not configured any external mail accounts."
-msgstr ""
-
#: lib/Compose.php:1244
msgid "You must enter at least one recipient."
msgstr "Debe incluír polo menos un destinatario."
@@ -5800,12 +5354,6 @@ msgstr "Foi subscrito correctamente a \"%s\""
msgid "You were successfully unsubscribed from \"%s\""
msgstr "Cancelouse correctamente a súa subscrición de \"%s\""
-#: lib/Identity/imp.php:156
-msgid ""
-"Your From address is not a valid email address. This can be fixed in your "
-"Personal Information options page."
-msgstr ""
-
#: templates/pgp/pgp.html:92
#, fuzzy
msgid "Your Name:"
@@ -5833,10 +5381,6 @@ msgstr "Enderezo Responder a: (opcional)"
msgid "Your S/MIME Public/Private Certificates"
msgstr "Os seus certificados S/MIME público/privado"
-#: fetchmail.php:22
-msgid "Your account does not support fetching external mail."
-msgstr ""
-
#: templates/fetchmail/fetchmailprefs.html:18
msgid "Your accounts:"
msgstr "As súas contas:"
@@ -6104,10 +5648,6 @@ msgstr "ficheiro de Caixa de correo"
msgid "name"
msgstr "nome"
-#: lib/Search.php:590
-msgid "not"
-msgstr ""
-
#: lib/Search.php:595 templates/fetchmail/fetchmailprefs.html:26
msgid "or"
msgstr "ou"
diff --git a/locale/he/LC_MESSAGES/imp.mo b/locale/he/LC_MESSAGES/imp.mo
index 9d3067cb9..f7f3001a4 100644
Binary files a/locale/he/LC_MESSAGES/imp.mo and b/locale/he/LC_MESSAGES/imp.mo differ
diff --git a/locale/hr/LC_MESSAGES/imp.mo b/locale/hr/LC_MESSAGES/imp.mo
index 47c577d4b..1314b4e4c 100644
Binary files a/locale/hr/LC_MESSAGES/imp.mo and b/locale/hr/LC_MESSAGES/imp.mo differ
diff --git a/locale/hr/LC_MESSAGES/imp.po b/locale/hr/LC_MESSAGES/imp.po
index 1e68e758b..4b832a265 100644
--- a/locale/hr/LC_MESSAGES/imp.po
+++ b/locale/hr/LC_MESSAGES/imp.po
@@ -882,14 +882,12 @@ msgstr "Masovne poruke"
#: templates/dimp/javascript_defs.php:142 templates/pgp/import_key.html:49
#: templates/mimp/compose/compose.html:56 templates/smime/import_key.html:70
#: templates/saveimage/saveimage.html:21 templates/imp/search/search.html:107
-#: templates/imp/contacts/contacts.html:70
-#: templates/imp/folders/import.html:17
+#: templates/imp/contacts/contacts.html:70 templates/imp/folders/import.html:17
#: templates/imp/folders/folders_confirm.html:24
msgid "Cancel"
msgstr "Odustani"
-#: templates/imp/compose/redirect.html:45
-#: templates/imp/compose/compose.html:26
+#: templates/imp/compose/redirect.html:45 templates/imp/compose/compose.html:26
#: templates/imp/compose/compose.html:208
msgid "Cancel Message"
msgstr "Otkaži poruku"
@@ -2773,10 +2771,8 @@ msgstr "Dosegnuta je maksimalna veličina priloga."
msgid "Mbox or .eml file:"
msgstr "Mbox ili .eml datoteka:"
-#: templates/mimp/compose/compose.html:71
-#: templates/mimp/folders/folders.html:5
-#: templates/mimp/message/message.html:32
-#: templates/mimp/mailbox/search.html:14
+#: templates/mimp/compose/compose.html:71 templates/mimp/folders/folders.html:5
+#: templates/mimp/message/message.html:32 templates/mimp/mailbox/search.html:14
#: templates/mimp/mailbox/mailbox.html:49
msgid "Menu"
msgstr "Izbornik"
@@ -3224,8 +3220,8 @@ msgstr "Obavijest: preuzet prilog iz poveznice"
msgid "OK"
msgstr "Prihvati"
-#: search.php:509 lib/Search/Element/Or.php:31
-#: templates/pgp/import_key.html:30 templates/smime/import_key.html:31
+#: search.php:509 lib/Search/Element/Or.php:31 templates/pgp/import_key.html:30
+#: templates/smime/import_key.html:31
msgid "OR"
msgstr "ILI"
@@ -4075,8 +4071,7 @@ msgstr "Spremi certifikat u Vaš adresar"
# Započni godinu ?
#: compose-mimp.php:211 compose-mimp.php:214 compose-mimp.php:260
-#: templates/mimp/compose/compose.html:52
-#: templates/imp/compose/compose.html:24
+#: templates/mimp/compose/compose.html:52 templates/imp/compose/compose.html:24
#: templates/imp/compose/compose.html:206
msgid "Save Draft"
msgstr "Spremi koncept"
@@ -4269,8 +4264,7 @@ msgstr "Pošalji ključ na poslužitelj javnih ključeva."
msgid "Send Latest Information"
msgstr "Pošalji najnovije informacije"
-#: templates/imp/compose/compose.html:21
-#: templates/imp/compose/compose.html:203
+#: templates/imp/compose/compose.html:21 templates/imp/compose/compose.html:203
msgid "Send Message"
msgstr "Pošalji poruku"
@@ -4599,11 +4593,10 @@ msgstr "Sakrij prijelome redaka u pregledu?"
msgid "Sub_ject"
msgstr "_Naslov"
-#: mailbox-mimp.php:221 search.php:64 config/prefs.php:975
-#: lib/Compose.php:2073 lib/Ui/Message.php:32
-#: templates/dimp/javascript_defs.php:111 templates/dimp/index.inc:206
-#: templates/dimp/index.inc:447 templates/dimp/index.inc:488
-#: templates/mobile/javascript_defs.php:61
+#: mailbox-mimp.php:221 search.php:64 config/prefs.php:975 lib/Compose.php:2073
+#: lib/Ui/Message.php:32 templates/dimp/javascript_defs.php:111
+#: templates/dimp/index.inc:206 templates/dimp/index.inc:447
+#: templates/dimp/index.inc:488 templates/mobile/javascript_defs.php:61
#: templates/dimp/message/message.html:54
#: templates/imp/search/search-basic.html:18
msgid "Subject"
@@ -5367,9 +5360,8 @@ msgstr "Umjesto toga pokušavam uvoz događaja."
msgid "Type:"
msgstr "Vrsta:"
-#: lib/Quota/Maildir.php:64 lib/Quota/Mdaemon.php:65
-#: lib/Quota/Mercury32.php:70 lib/Quota/Imap.php:52 lib/Quota/Hook.php:42
-#: lib/Quota/Command.php:92
+#: lib/Quota/Maildir.php:64 lib/Quota/Mdaemon.php:65 lib/Quota/Mercury32.php:70
+#: lib/Quota/Imap.php:52 lib/Quota/Hook.php:42 lib/Quota/Command.php:92
msgid "Unable to retrieve quota"
msgstr "Nije uspjelo dohvaćanje kvote"
@@ -5720,8 +5712,8 @@ msgstr "Vi ste"
#: templates/imp/folders/folders_confirm.html:11
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr "Pokušavate obrisati sve poruke iz sljedećih mapa:"
#: templates/imp/folders/folders_confirm.html:10
diff --git a/locale/hu/LC_MESSAGES/imp.mo b/locale/hu/LC_MESSAGES/imp.mo
index 5b43c0ba1..3ab8a2c66 100644
Binary files a/locale/hu/LC_MESSAGES/imp.mo and b/locale/hu/LC_MESSAGES/imp.mo differ
diff --git a/locale/hu/LC_MESSAGES/imp.po b/locale/hu/LC_MESSAGES/imp.po
index 983cb2004..f39c33145 100644
--- a/locale/hu/LC_MESSAGES/imp.po
+++ b/locale/hu/LC_MESSAGES/imp.po
@@ -66,8 +66,7 @@ msgstr[1] "%d csatolmány"
msgid "%d Attachments"
msgstr "%d csatolmány"
-#: lib/Basic/Thread.php:181 lib/Basic/Mailbox.php:397
-#: lib/Basic/Mailbox.php:398
+#: lib/Basic/Thread.php:181 lib/Basic/Mailbox.php:397 lib/Basic/Mailbox.php:398
#, php-format
msgid "%d Messages"
msgstr "%d levél"
@@ -964,15 +963,13 @@ msgid "Can't attach contact information: %s"
msgstr "Nem sikerült a névjegy csatolása: %s"
#: lib/Minimal/Compose.php:350 templates/prefs/remote.html.php:80
-#: templates/search/search.html.php:103
-#: templates/contacts/contacts.html.php:69
+#: templates/search/search.html.php:103 templates/contacts/contacts.html.php:69
#: templates/smartmobile/copymove.html.php:20
#: templates/smartmobile/compose.html.php:50
#: templates/smartmobile/message.html.php:91
#: templates/smartmobile/message.html.php:106
-#: templates/minimal/compose.html.php:59
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:69
-#: templates/smime/import_key.html.php:78
+#: templates/minimal/compose.html.php:59 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:69 templates/smime/import_key.html.php:78
#: templates/basic/compose/redirect.html.php:53
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
@@ -1606,10 +1603,10 @@ msgstr "Alapértelmezett sorbarendezési irány:"
msgid "Delegated"
msgstr "másnak átadva"
-#: lib/Imap/Acl.php:196 lib/Minimal/Message.php:224
-#: lib/Dynamic/Mailbox.php:325 lib/Dynamic/Mailbox.php:356
-#: lib/Dynamic/Compose/Common.php:186 templates/prefs/acl.html.php:44
-#: templates/prefs/acl.html.php:79 templates/prefs/pgppublickey.html.php:22
+#: lib/Imap/Acl.php:196 lib/Minimal/Message.php:224 lib/Dynamic/Mailbox.php:325
+#: lib/Dynamic/Mailbox.php:356 lib/Dynamic/Compose/Common.php:186
+#: templates/prefs/acl.html.php:44 templates/prefs/acl.html.php:79
+#: templates/prefs/pgppublickey.html.php:22
#: templates/prefs/smimepublickey.html.php:24
#: templates/smartmobile/mailbox.html.php:20
#: templates/smartmobile/mailbox.html.php:28
@@ -2146,8 +2143,7 @@ msgid "Expand Headers"
msgstr "Fejlécek kibontása"
#: lib/Minimal/Compose.php:107 lib/Minimal/Compose.php:162
-#: templates/minimal/compose.html.php:58
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:58 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "A címrészlet teljessé egészítése"
@@ -2281,8 +2277,7 @@ msgstr "Mappa"
msgid "Folder Actions"
msgstr "Mappa műveletek"
-#: lib/Basic/Folders.php:274
-#: templates/basic/folders/folders_confirm.html.php:6
+#: lib/Basic/Folders.php:274 templates/basic/folders/folders_confirm.html.php:6
msgid "Folder Actions - Confirmation"
msgstr "Mappák kezelése - Megerősítés"
@@ -2359,11 +2354,9 @@ msgstr "Válasz elfoglaltsági kérdésre"
msgid "Fro_m"
msgstr "Feladó"
-#: lib/Compose.php:2557 lib/Dynamic/Mailbox.php:175
-#: lib/Dynamic/Mailbox.php:253 lib/Dynamic/Mailbox.php:489
-#: lib/Basic/Search.php:57 lib/Message/Ui.php:34
-#: templates/thread/thread.html.php:21
-#: templates/smartmobile/search.html.php:11
+#: lib/Compose.php:2557 lib/Dynamic/Mailbox.php:175 lib/Dynamic/Mailbox.php:253
+#: lib/Dynamic/Mailbox.php:489 lib/Basic/Search.php:57 lib/Message/Ui.php:34
+#: templates/thread/thread.html.php:21 templates/smartmobile/search.html.php:11
#: templates/minimal/mailbox.html.php:9
#: templates/basic/search/search-basic.html.php:16
#: templates/basic/compose/compose.html.php:38
@@ -4133,8 +4126,7 @@ msgstr "Szükséges"
msgid "Required Participant"
msgstr "szükséges résztvevő"
-#: templates/search/search.html.php:106
-#: templates/contacts/contacts.html.php:25
+#: templates/search/search.html.php:106 templates/contacts/contacts.html.php:25
#: templates/basic/search/search-basic.html.php:50
msgid "Reset"
msgstr "Reset"
@@ -5309,8 +5301,7 @@ msgstr "A felhasználó elfoglaltsági adatai sikeresen elmentve."
msgid "There are no alternative parts that can be displayed inline."
msgstr "Nincs megjeleníthető alternatív részek a szövegben."
-#: lib/Dynamic/Mailbox.php:553
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:553 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "Ebben a mappában nincsenek levelek."
@@ -5507,9 +5498,8 @@ msgstr "Téma sorrend"
msgid "Thread View"
msgstr "Logikai nézet"
-#: lib/Compose.php:2569 lib/Dynamic/Mailbox.php:181
-#: lib/Dynamic/Mailbox.php:254 lib/Basic/Search.php:65
-#: lib/Basic/Mailbox.php:725 lib/Message/Ui.php:35
+#: lib/Compose.php:2569 lib/Dynamic/Mailbox.php:181 lib/Dynamic/Mailbox.php:254
+#: lib/Basic/Search.php:65 lib/Basic/Mailbox.php:725 lib/Message/Ui.php:35
#: templates/contacts/contacts.html.php:40 templates/thread/thread.html.php:21
#: templates/basic/compose/redirect.html.php:30
#: templates/dynamic/compose.html.php:114
diff --git a/locale/id/LC_MESSAGES/imp.mo b/locale/id/LC_MESSAGES/imp.mo
index 8c79e0ba3..ae3d51104 100644
Binary files a/locale/id/LC_MESSAGES/imp.mo and b/locale/id/LC_MESSAGES/imp.mo differ
diff --git a/locale/imp.pot b/locale/imp.pot
index 88f3ab514..791d50e29 100644
--- a/locale/imp.pot
+++ b/locale/imp.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: IMP\n"
"Report-Msgid-Bugs-To: dev@lists.horde.org\n"
-"POT-Creation-Date: 2017-07-26 15:06+0200\n"
+"POT-Creation-Date: 2023-05-30 10:11+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -182,7 +182,7 @@ msgstr ""
msgid "%s has replied to a free/busy request."
msgstr ""
-#: lib/Mime/Viewer/Itip.php:736
+#: lib/Mime/Viewer/Itip.php:737
#, php-format
msgid "%s has replied to the assignment of task \"%s\"."
msgstr ""
@@ -227,7 +227,7 @@ msgstr ""
msgid "%s wants to notify you about changes in \"%s\"."
msgstr ""
-#: lib/Indices/Copy/Notepad.php:111 lib/Indices/Copy/Tasklist.php:113
+#: lib/Indices/Copy/Notepad.php:112 lib/Indices/Copy/Tasklist.php:113
#, php-format
msgid "%s was successfully added to \"%s\"."
msgstr ""
@@ -242,13 +242,13 @@ msgstr ""
msgid "%s wishes to amend \"%s\"."
msgstr ""
-#: lib/Mime/Viewer/Itip.php:727
+#: lib/Mime/Viewer/Itip.php:728
#, php-format
msgid "%s wishes to assign you \"%s\"."
msgstr ""
#: lib/Mime/Viewer/Itip.php:300 lib/Mime/Viewer/Itip.php:314
-#: lib/Mime/Viewer/Itip.php:720
+#: lib/Mime/Viewer/Itip.php:721
#, php-format
msgid "%s wishes to make you aware of \"%s\"."
msgstr ""
@@ -258,7 +258,7 @@ msgstr ""
msgid "%s wishes to receive the latest information about \"%s\"."
msgstr ""
-#: lib/Compose.php:2715
+#: lib/Compose.php:2717
#, php-format
msgid "%u Forwarded Messages"
msgstr ""
@@ -267,7 +267,7 @@ msgstr ""
msgid "1 message"
msgstr ""
-#: lib/Mime/Viewer/Pgp.php:364
+#: lib/Mime/Viewer/Pgp.php:365
msgid "A PGP Public Key is attached to the message."
msgstr ""
@@ -277,7 +277,7 @@ msgid ""
"recipient."
msgstr ""
-#: lib/Compose.php:3522
+#: lib/Compose.php:3529
msgid ""
"A message you were composing when your session expired has been recovered. "
"You may resume composing your message by going to your Drafts mailbox."
@@ -293,7 +293,7 @@ msgstr ""
msgid "ACL rights for \"%s\" updated for the mailbox \"%s\"."
msgstr ""
-#: lib/Mime/Viewer/Itip.php:729
+#: lib/Mime/Viewer/Itip.php:730
msgid "Accept and add this to my tasklist"
msgstr ""
@@ -309,7 +309,7 @@ msgstr ""
msgid "Accept request"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:807
+#: lib/Mime/Viewer/Itip.php:808
msgid "Accepted"
msgstr ""
@@ -362,7 +362,7 @@ msgstr ""
msgid "Add OR clause"
msgstr ""
-#: config/prefs.php:1397
+#: config/prefs.php:1432
msgid "Add a \"Printed By\" header to the top of printed messages?"
msgstr ""
@@ -382,7 +382,7 @@ msgstr ""
msgid "Add this to my calendar"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:722 lib/Mime/Viewer/Itip.php:730
+#: lib/Mime/Viewer/Itip.php:723 lib/Mime/Viewer/Itip.php:731
msgid "Add this to my tasklist"
msgstr ""
@@ -404,7 +404,7 @@ msgstr ""
msgid "Added flag \"%s\"."
msgstr ""
-#: config/prefs.php:1088
+#: config/prefs.php:1123
msgid ""
"Additional headers to display when viewing: (enter each header on a new "
"line)"
@@ -414,11 +414,11 @@ msgstr ""
msgid "Address Book"
msgstr ""
-#: config/prefs.php:885
+#: config/prefs.php:919
msgid "Address Books"
msgstr ""
-#: lib/Compose.php:2584
+#: lib/Compose.php:2586
msgid "Address rejected by the sending mail server."
msgstr ""
@@ -447,6 +447,14 @@ msgstr ""
msgid "After '%s'"
msgstr ""
+#: lib/Prefs/Special/SmimeAliasHandler.php:29
+msgid "Alias has been set."
+msgstr ""
+
+#: templates/prefs/smimeprivatekey.html.php:223
+msgid "Alias: "
+msgstr ""
+
#: templates/prefs/acl.html.php:45 templates/prefs/acl.html.php:80
msgid "All"
msgstr ""
@@ -498,11 +506,11 @@ msgstr ""
msgid "All rights on mailbox \"%s\" successfully removed for \"%s\"."
msgstr ""
-#: config/prefs.php:990
+#: config/prefs.php:1025
msgid "Allow attachments to be stripped from messages?"
msgstr ""
-#: config/prefs.php:287
+#: config/prefs.php:314
msgid "Allow filter rules to be applied in any mailbox?"
msgstr ""
@@ -522,7 +530,7 @@ msgstr ""
msgid "Allow viewing of message source?"
msgstr ""
-#: config/prefs.php:1097
+#: config/prefs.php:1132
msgid "Always prompt"
msgstr ""
@@ -543,7 +551,7 @@ msgstr ""
msgid "An unknown error occured while creating the new task."
msgstr ""
-#: lib/Mime/Viewer/Itip.php:708
+#: lib/Mime/Viewer/Itip.php:709
msgid "An unknown person"
msgstr ""
@@ -559,11 +567,11 @@ msgstr ""
msgid "Apply Filters"
msgstr ""
-#: config/prefs.php:267
+#: config/prefs.php:294
msgid "Apply filter rules upon logging on?"
msgstr ""
-#: config/prefs.php:277
+#: config/prefs.php:304
msgid "Apply filter rules whenever Inbox is displayed?"
msgstr ""
@@ -580,7 +588,7 @@ msgid "Are you sure you want to delete this flag?"
msgstr ""
#: lib/Prefs/Special/PgpPublicKey.php:79
-#: lib/Prefs/Special/SmimePublicKey.php:77
+#: lib/Prefs/Special/SmimePublicKey.php:79
msgid "Are you sure you want to delete this public key?"
msgstr ""
@@ -588,12 +596,49 @@ msgstr ""
msgid "Are you sure you want to delete this virtual folder?"
msgstr ""
+#: lib/Prefs/Special/SmimePrivateKey.php:342
+msgid ""
+"Are you sure you want to delete your keypair? (Please click \"Unset Personal "
+"Certificate\" if you want to save the key in the keystore. Non-saved "
+"certificates will be removed permanently.)"
+msgstr ""
+
#: lib/Prefs/Special/PgpPrivateKey.php:79
-#: lib/Prefs/Special/SmimePrivateKey.php:148
msgid ""
"Are you sure you want to delete your keypair? (This is NOT recommended!)"
msgstr ""
+#: lib/Prefs/Special/SmimePrivateKey.php:343
+msgid ""
+"Are you sure you want to delete your keypair? You are trying to delete a "
+"keypair from the keystore. If you continue these certificates will be "
+"removed permanently. "
+msgstr ""
+
+#: lib/Prefs/Special/SmimePrivateKey.php:345
+msgid ""
+"Are you sure you want to set a new keypair? Currently set keypair will be "
+"moved to the database. New emails will be encrypted with the newly set "
+"keypair."
+msgstr ""
+
+#: lib/Prefs/Special/SmimePrivateKey.php:347
+msgid ""
+"Are you sure you want to set a singing key? Current key for singing will be "
+"moved to the database. New emails will be singing with the newly set singing "
+"key."
+msgstr ""
+
+#: lib/Prefs/Special/SmimePrivateKey.php:344
+msgid ""
+"Are you sure you want to unset your keypair? You will need to add another "
+"key to be able to send encrypted mails."
+msgstr ""
+
+#: lib/Prefs/Special/SmimePrivateKey.php:346
+msgid "Are you sure you want to unset your secondary keypair?"
+msgstr ""
+
#: lib/Dynamic/Base.php:194
msgid "Are you sure you wish to PERMANENTLY delete this attachment?"
msgstr ""
@@ -610,7 +655,7 @@ msgstr ""
msgid "Arrival Time"
msgstr ""
-#: config/prefs.php:1485
+#: config/prefs.php:1526
msgid "Arrival time on server"
msgstr ""
@@ -618,15 +663,15 @@ msgstr ""
msgid "As Attachment"
msgstr ""
-#: config/prefs.php:741
+#: config/prefs.php:775
msgid "As attachment"
msgstr ""
-#: config/prefs.php:743
+#: config/prefs.php:777
msgid "As both body text and an attachment"
msgstr ""
-#: config/prefs.php:1465
+#: config/prefs.php:1506
msgid "Ascending"
msgstr ""
@@ -642,13 +687,13 @@ msgstr ""
msgid "Attach contact information"
msgstr ""
-#: lib/Compose.php:3455
+#: lib/Compose.php:3462
#, php-format
msgid ""
"Attached file \"%s\" exceeds the attachment size limits. File NOT attached."
msgstr ""
-#: lib/Compose.php:3455
+#: lib/Compose.php:3462
msgid "Attached file exceeds the attachment size limits. File NOT attached."
msgstr ""
@@ -669,15 +714,15 @@ msgstr ""
msgid "Attachment doesn't exist."
msgstr ""
-#: lib/Compose.php:1244
+#: lib/Compose.php:1246
msgid "Attachment stripped: Original attachment type"
msgstr ""
-#: lib/Ajax/Application/Handler/Dynamic.php:933 lib/Dynamic/Message.php:57
+#: lib/Ajax/Application/Handler/Dynamic.php:938 lib/Dynamic/Message.php:57
msgid "Attachment successfully stripped."
msgstr ""
-#: lib/Compose.php:3048 lib/Compose.php:3055
+#: lib/Compose.php:3050 lib/Compose.php:3057
#: templates/smartmobile/compose.html.php:79
msgid "Attachments"
msgstr ""
@@ -710,7 +755,7 @@ msgstr ""
msgid "Automatically Generated Messages"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:886
+#: lib/Mime/Viewer/Itip.php:887
msgid "Awaiting Response"
msgstr ""
@@ -722,7 +767,7 @@ msgstr ""
msgid "Backends"
msgstr ""
-#: lib/Basic/Contacts.php:99 lib/Basic/Search.php:71
+#: lib/Basic/Contacts.php:99 lib/Basic/Search.php:71 lib/Contents/View.php:227
#: templates/contacts/contacts.html.php:37
#: templates/dynamic/compose.html.php:130
#: templates/dynamic/mailbox.html.php:154 templates/dynamic/message.html.php:96
@@ -749,7 +794,7 @@ msgstr ""
msgid "Blacklist"
msgstr ""
-#: config/prefs.php:1011
+#: config/prefs.php:1046
msgid ""
"Block images in messages unless they are specifically requested to be loaded?"
msgstr ""
@@ -759,7 +804,7 @@ msgstr ""
msgid "Body"
msgstr ""
-#: config/prefs.php:549
+#: config/prefs.php:583
msgid "Bottom"
msgstr ""
@@ -776,7 +821,7 @@ msgstr ""
msgid "Bulk Messages"
msgstr ""
-#: lib/Compose.php:1890
+#: lib/Compose.php:1892
#, php-format
msgid "Can't attach contact information: %s"
msgstr ""
@@ -788,6 +833,8 @@ msgstr ""
#: templates/smartmobile/copymove.html.php:20
#: templates/smartmobile/message.html.php:91
#: templates/smartmobile/message.html.php:106
+#: templates/smime/import_extra_key.html.php:63
+#: templates/smime/import_identity_key.html.php:63
#: templates/smime/import_personal_key.html.php:63
#: templates/smime/import_public_key.html.php:29
msgid "Cancel"
@@ -811,7 +858,7 @@ msgstr ""
msgid "Cannot display message text."
msgstr ""
-#: lib/Basic/Smime.php:133
+#: lib/Basic/Smime.php:235
msgid ""
"Cannot import secondary personal S/MIME certificates without primary "
"certificates."
@@ -837,8 +884,8 @@ msgstr ""
msgid "Cannot strip the part as the mailbox is read-only."
msgstr ""
-#: lib/Basic/Contacts.php:98 lib/Basic/Search.php:67 lib/Compose.php:2759
-#: lib/Contents/View.php:221 lib/Smartmobile.php:172
+#: lib/Basic/Contacts.php:98 lib/Basic/Search.php:67 lib/Compose.php:2761
+#: lib/Contents/View.php:223 lib/Smartmobile.php:172
#: templates/contacts/contacts.html.php:36
#: templates/dynamic/compose.html.php:122
#: templates/dynamic/mailbox.html.php:150 templates/dynamic/message.html.php:92
@@ -849,7 +896,7 @@ msgstr ""
msgid "Cc:"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:868
+#: lib/Mime/Viewer/Itip.php:869
msgid "Chair Person"
msgstr ""
@@ -857,12 +904,16 @@ msgstr ""
msgid "Change"
msgstr ""
-#: config/prefs.php:1407
+#: lib/Prefs/Special/SmimePrivateKey.php:179
+msgid "Change SMIME preferences here"
+msgstr ""
+
+#: config/prefs.php:1448
msgid ""
"Change display preferences for viewing the listing of messages in a mailbox."
msgstr ""
-#: config/prefs.php:1508
+#: config/prefs.php:1549
msgid "Change folder navigation display preferences."
msgstr ""
@@ -880,15 +931,19 @@ msgstr ""
msgid "Check for New Mail"
msgstr ""
-#: config/prefs.php:369
+#: config/prefs.php:396
msgid "Check for valid recipient PGP public keys while replying?"
msgstr ""
+#: config/prefs.php:131
+msgid "Check if you would like to use SMIME-keypairs for identities"
+msgstr ""
+
#: templates/dynamic/mailbox.html.php:277
msgid "Check mailbox for new mail?"
msgstr ""
-#: config/prefs.php:504
+#: config/prefs.php:538
msgid "Check spelling before sending a message?"
msgstr ""
@@ -896,7 +951,7 @@ msgstr ""
msgid "Checking..."
msgstr ""
-#: config/prefs.php:951
+#: config/prefs.php:985
msgid "Choose the address book to use when adding addresses."
msgstr ""
@@ -956,11 +1011,11 @@ msgstr ""
msgid "Click to show message part display errors."
msgstr ""
-#: lib/Mime/Viewer/Smime.php:376
+#: lib/Mime/Viewer/Smime.php:442
msgid "Click to verify the data."
msgstr ""
-#: lib/Mime/Viewer/Pgp.php:483
+#: lib/Mime/Viewer/Pgp.php:484
msgid "Click to verify the message."
msgstr ""
@@ -978,7 +1033,7 @@ msgstr ""
msgid "Close"
msgstr ""
-#: config/prefs.php:787
+#: config/prefs.php:821
msgid "Close the compose window after saving a draft?"
msgstr ""
@@ -999,26 +1054,26 @@ msgstr ""
msgid "Color Picker"
msgstr ""
-#: config/prefs.php:1543
+#: config/prefs.php:1584
msgid "Combine all namespaces"
msgstr ""
-#: lib/Pgp.php:791 templates/itip/action.html.php:47
+#: lib/Pgp.php:792 templates/itip/action.html.php:47
#: templates/prefs/pgpprivatekey.html.php:65
msgid "Comment"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:819
+#: lib/Mime/Viewer/Itip.php:820
msgid "Completed"
msgstr ""
-#: config/prefs.php:484 config/prefs.php:624 config/prefs.php:670
-#: config/prefs.php:727 config/prefs.php:761 config/prefs.php:815
-#: config/prefs.php:884
+#: config/prefs.php:518 config/prefs.php:658 config/prefs.php:704
+#: config/prefs.php:761 config/prefs.php:795 config/prefs.php:849
+#: config/prefs.php:918
msgid "Compose"
msgstr ""
-#: config/prefs.php:625
+#: config/prefs.php:659
msgid "Compose Templates"
msgstr ""
@@ -1030,51 +1085,51 @@ msgstr ""
msgid "Compose action completed. You may now safely close this window."
msgstr ""
-#: config/prefs.php:485
+#: config/prefs.php:519
msgid "Composition"
msgstr ""
-#: config/prefs.php:318
+#: config/prefs.php:345
msgid "Configure PGP encryption support."
msgstr ""
-#: config/prefs.php:401
+#: config/prefs.php:428
msgid "Configure S/MIME encryption support."
msgstr ""
-#: config/prefs.php:1355
+#: config/prefs.php:1390
msgid "Configure flag highlighting."
msgstr ""
-#: config/prefs.php:301
+#: config/prefs.php:328
msgid "Configure how event or meeting requests should be handled."
msgstr ""
-#: config/prefs.php:971
+#: config/prefs.php:1006
msgid "Configure how messages are displayed."
msgstr ""
-#: config/prefs.php:729
+#: config/prefs.php:763
msgid "Configure how you forward mail."
msgstr ""
-#: config/prefs.php:672
+#: config/prefs.php:706
msgid "Configure how you reply to mail."
msgstr ""
-#: config/prefs.php:486
+#: config/prefs.php:520
msgid "Configure how you send mail."
msgstr ""
-#: config/prefs.php:1389
+#: config/prefs.php:1424
msgid "Configure message printing."
msgstr ""
-#: config/prefs.php:141
+#: config/prefs.php:165
msgid "Configure remote mail accounts to display."
msgstr ""
-#: config/prefs.php:1225
+#: config/prefs.php:1260
msgid "Configure spam reporting."
msgstr ""
@@ -1086,7 +1141,7 @@ msgstr ""
msgid "Contents of compressed file:"
msgstr ""
-#: config/prefs.php:1308
+#: config/prefs.php:1343
msgid ""
"Control when new mail will be checked for, and whether or not to notify you "
"when it arrives."
@@ -1096,7 +1151,7 @@ msgstr ""
msgid "Convert HTML data to plain text and view in new window."
msgstr ""
-#: config/prefs.php:1068
+#: config/prefs.php:1103
msgid "Convert textual emoticons into graphical ones?"
msgstr ""
@@ -1128,7 +1183,7 @@ msgstr ""
msgid "Could not add rights for user \"%s\" for the mailbox \"%s\"."
msgstr ""
-#: lib/Compose.php:3310
+#: lib/Compose.php:3317
#, php-format
msgid "Could not attach %s to the message."
msgstr ""
@@ -1138,16 +1193,16 @@ msgstr ""
msgid "Could not authenticate to %s."
msgstr ""
-#: lib/Contents/View.php:146
+#: lib/Contents/View.php:148
msgid "Could not auto-determine data type."
msgstr ""
-#: lib/Mailbox.php:809
+#: lib/Mailbox.php:812
#, php-format
msgid "Could not delete Virtual Folder \"%s\"."
msgstr ""
-#: lib/Mailbox.php:1372
+#: lib/Mailbox.php:1375
#, php-format
msgid "Could not delete messages from %s. This mailbox is read-only."
msgstr ""
@@ -1190,7 +1245,7 @@ msgstr ""
msgid "Could not remove rights for user \"%s\" for the mailbox \"%s\"."
msgstr ""
-#: lib/Compose.php:1958 lib/Compose.php:2340 lib/Dynamic/Compose.php:282
+#: lib/Compose.php:1960 lib/Compose.php:2342 lib/Dynamic/Compose.php:285
msgid "Could not retrieve message data from the mail server."
msgstr ""
@@ -1228,7 +1283,7 @@ msgstr ""
msgid "Create a new sent-mail mailbox"
msgstr ""
-#: config/prefs.php:204
+#: config/prefs.php:228
msgid ""
"Create filtering rules to organize your incoming mail, sort it into "
"mailboxes, and delete spam."
@@ -1238,7 +1293,7 @@ msgstr ""
msgid "Create mailbox:"
msgstr ""
-#: config/prefs.php:644
+#: config/prefs.php:678
msgid "Create new Template"
msgstr ""
@@ -1259,7 +1314,7 @@ msgstr ""
msgid "Creating New Flag..."
msgstr ""
-#: config/prefs.php:1488
+#: config/prefs.php:1529
msgid "Criteria to use when sorting by date:"
msgstr ""
@@ -1268,6 +1323,12 @@ msgstr ""
msgid "Current access to %s"
msgstr ""
+#: templates/prefs/smimeprivatekey.html.php:45
+#: templates/prefs/smimeprivatekey.html.php:120
+#, php-format
+msgid "Current alias for your Certificate Set: %s"
+msgstr ""
+
#: lib/Basic/Search.php:79
msgid "Custom Header"
msgstr ""
@@ -1280,8 +1341,8 @@ msgstr ""
msgid "Data"
msgstr ""
-#: config/prefs.php:1451 lib/Basic/Search.php:91 lib/Compose.php:2739
-#: lib/Contents/View.php:218 lib/Dynamic/Mailbox.php:199
+#: config/prefs.php:1492 lib/Basic/Search.php:91 lib/Compose.php:2741
+#: lib/Contents/View.php:220 lib/Dynamic/Mailbox.php:199
#: templates/dynamic/mailbox.html.php:138 templates/dynamic/message.html.php:75
msgid "Date"
msgstr ""
@@ -1302,7 +1363,7 @@ msgstr ""
msgid "Date Selection"
msgstr ""
-#: config/prefs.php:1486
+#: config/prefs.php:1527
msgid "Date in message headers"
msgstr ""
@@ -1310,23 +1371,23 @@ msgstr ""
msgid "Days"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:810
+#: lib/Mime/Viewer/Itip.php:811
msgid "Declined"
msgstr ""
-#: config/prefs.php:521
+#: config/prefs.php:555
msgid "Default method to compose messages:"
msgstr ""
-#: config/prefs.php:1458
+#: config/prefs.php:1499
msgid "Default sorting criteria:"
msgstr ""
-#: config/prefs.php:1468
+#: config/prefs.php:1509
msgid "Default sorting direction:"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:816
+#: lib/Mime/Viewer/Itip.php:817
msgid "Delegated"
msgstr ""
@@ -1343,20 +1404,24 @@ msgid "Delete"
msgstr ""
#: lib/Prefs/Special/PgpPublicKey.php:79
-#: lib/Prefs/Special/SmimePublicKey.php:77
+#: lib/Prefs/Special/SmimePublicKey.php:79
#, php-format
msgid "Delete %s Public Key"
msgstr ""
+#: templates/prefs/smimeprivatekey.html.php:256
+msgid "Delete Certificate"
+msgstr ""
+
#: templates/prefs/pgpprivatekey.html.php:46
msgid "Delete Current Keys"
msgstr ""
-#: templates/prefs/smimeprivatekey.html.php:41
+#: templates/prefs/smimeprivatekey.html.php:90
msgid "Delete Personal Certificate"
msgstr ""
-#: templates/prefs/smimeprivatekey.html.php:78
+#: templates/prefs/smimeprivatekey.html.php:164
msgid "Delete Secondary Personal Certificate"
msgstr ""
@@ -1376,11 +1441,11 @@ msgstr ""
msgid "Delete from my calendar"
msgstr ""
-#: config/prefs.php:571
+#: config/prefs.php:605
msgid "Delete linked attachments after this many months (0 to never delete):"
msgstr ""
-#: config/prefs.php:1256
+#: config/prefs.php:1291
msgid "Delete message"
msgstr ""
@@ -1388,7 +1453,7 @@ msgstr ""
msgid "Delete messages"
msgstr ""
-#: config/prefs.php:850
+#: config/prefs.php:884
msgid ""
"Delete old sent mail mailboxes after this many months (0 to never delete):"
msgstr ""
@@ -1405,7 +1470,7 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: lib/Mailbox.php:805
+#: lib/Mailbox.php:808
#, php-format
msgid "Deleted Virtual Folder \"%s\"."
msgstr ""
@@ -1420,7 +1485,7 @@ msgstr ""
msgid "Deleted flag \"%s\"."
msgstr ""
-#: config/prefs.php:1115
+#: config/prefs.php:1150
msgid "Deleting and Moving Messages"
msgstr ""
@@ -1432,11 +1497,11 @@ msgstr ""
msgid "Deny request for free/busy information"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:731
+#: lib/Mime/Viewer/Itip.php:732
msgid "Deny task assignment"
msgstr ""
-#: config/prefs.php:1466
+#: config/prefs.php:1507
msgid "Descending"
msgstr ""
@@ -1444,15 +1509,16 @@ msgstr ""
msgid "Description"
msgstr ""
-#: lib/Prefs/Special/SmimePrivateKey.php:104
+#: lib/Prefs/Special/SmimePrivateKey.php:254
#: templates/prefs/pgpprivatekey.html.php:22
#: templates/prefs/pgpprivatekey.html.php:36
#: templates/prefs/pgppublickey.html.php:21
+#: templates/prefs/smimeprivatekey.html.php:234
#: templates/prefs/smimepublickey.html.php:23
msgid "Details"
msgstr ""
-#: config/prefs.php:1062
+#: config/prefs.php:1097
msgid "Dim signatures?"
msgstr ""
@@ -1467,7 +1533,7 @@ msgid ""
"text)? This conversion cannot be reversed."
msgstr ""
-#: config/prefs.php:1332
+#: config/prefs.php:1367
msgid "Display notification when new mail arrives?"
msgstr ""
@@ -1479,7 +1545,7 @@ msgstr ""
msgid "Do Not Check for New Mail"
msgstr ""
-#: config/prefs.php:1077
+#: config/prefs.php:1112
msgid "Do not show parts"
msgstr ""
@@ -1505,11 +1571,11 @@ msgstr ""
msgid "Download into a MBOX file (ZIP compressed)"
msgstr ""
-#: lib/Compose.php:3075
+#: lib/Compose.php:3077
msgid "Download link"
msgstr ""
-#: lib/Compose.php:3068
+#: lib/Compose.php:3070
#, php-format
msgid "Download link: %s"
msgstr ""
@@ -1518,7 +1584,7 @@ msgstr ""
msgid "Draft"
msgstr ""
-#: config/prefs.php:762 lib/Mailbox.php:1692 lib/Mailbox.php:1791
+#: config/prefs.php:796 lib/Mailbox.php:1695 lib/Mailbox.php:1794
msgid "Drafts"
msgstr ""
@@ -1530,7 +1596,7 @@ msgstr ""
msgid "Drop file(s) here to attach."
msgstr ""
-#: lib/Pgp.php:792
+#: lib/Pgp.php:793
msgid "E-Mail"
msgstr ""
@@ -1546,7 +1612,7 @@ msgstr ""
msgid "EXAMPLE LINK"
msgstr ""
-#: lib/Ftree.php:1062
+#: lib/Ftree.php:1074
msgid "Edit"
msgstr ""
@@ -1574,7 +1640,7 @@ msgstr ""
msgid "Edit Template"
msgstr ""
-#: lib/Dynamic/Mailbox.php:283 lib/Ftree.php:1062
+#: lib/Dynamic/Mailbox.php:283 lib/Ftree.php:1074
#: templates/search/search.html.php:7
msgid "Edit Virtual Folder"
msgstr ""
@@ -1583,36 +1649,36 @@ msgstr ""
msgid "Edit Virtual Folders"
msgstr ""
-#: config/prefs.php:744 lib/Dynamic/Base.php:175
+#: config/prefs.php:778 lib/Dynamic/Base.php:175
msgid "Edit as New"
msgstr ""
-#: config/prefs.php:626
+#: config/prefs.php:660
msgid "Edit compose templates."
msgstr ""
-#: config/prefs.php:232
+#: config/prefs.php:257
msgid "Edit your Blacklist"
msgstr ""
-#: config/prefs.php:214
+#: config/prefs.php:238
msgid "Edit your Filter Rules"
msgstr ""
-#: config/prefs.php:250
+#: config/prefs.php:276
msgid "Edit your Whitelist"
msgstr ""
-#: lib/Ajax/Application/Handler/Dynamic.php:1243
+#: lib/Ajax/Application/Handler/Dynamic.php:1248
msgid "Editing group lists not currently supported."
msgstr ""
-#: lib/Mailbox.php:1423
+#: lib/Mailbox.php:1426
#, php-format
msgid "Emptied all messages from %s."
msgstr ""
-#: lib/Mailbox.php:1385
+#: lib/Mailbox.php:1388
msgid "Emptied all messages from Virtual Trash Folder."
msgstr ""
@@ -1620,11 +1686,11 @@ msgstr ""
msgid "Empty"
msgstr ""
-#: config/prefs.php:339
+#: config/prefs.php:366
msgid "Enable PGP functionality?"
msgstr ""
-#: config/prefs.php:423
+#: config/prefs.php:450
msgid "Enable S/MIME functionality?"
msgstr ""
@@ -1640,22 +1706,27 @@ msgstr ""
msgid "End"
msgstr ""
-#: lib/Compose.php:2434
+#: lib/Compose.php:2436
msgid "End forwarded message"
msgstr ""
-#: lib/Compose.php:2245
+#: lib/Compose.php:2247
msgid "End message"
msgstr ""
-#: lib/Compose.php:2245
+#: lib/Compose.php:2247
#, php-format
msgid "End message from %s"
msgstr ""
+#: lib/Prefs/Special/SmimePrivateKey.php:288
+#: lib/Prefs/Special/SmimePrivateKey.php:295
+msgid "Enter Alias"
+msgstr ""
+
#: lib/Prefs/Special/PgpPrivateKey.php:73
-#: lib/Prefs/Special/SmimePrivateKey.php:130
-#: lib/Prefs/Special/SmimePrivateKey.php:137
+#: lib/Prefs/Special/SmimePrivateKey.php:321
+#: lib/Prefs/Special/SmimePrivateKey.php:328
msgid "Enter Passphrase"
msgstr ""
@@ -1663,6 +1734,10 @@ msgstr ""
msgid "Enter Search Term"
msgstr ""
+#: lib/Ajax/Imple/AliasDialog.php:58
+msgid "Enter the alias for your certificate."
+msgstr ""
+
#: lib/Prefs/Special/ComposeTemplates.php:45
msgid "Enter the name for your new compose templates mailbox."
msgstr ""
@@ -1700,7 +1775,7 @@ msgstr ""
msgid "Entire Message (including Headers)"
msgstr ""
-#: lib/Basic/Thread.php:63 lib/Compose.php:1579
+#: lib/Basic/Thread.php:63 lib/Compose.php:1581
#, php-format
msgid "Entry \"%s\" was successfully added to the address book"
msgstr ""
@@ -1741,7 +1816,7 @@ msgstr ""
msgid "Error when loading the message."
msgstr ""
-#: lib/Compose.php:2544
+#: lib/Compose.php:2546
msgid "Error when redirecting message."
msgstr ""
@@ -1751,7 +1826,7 @@ msgid ""
"your browser."
msgstr ""
-#: config/prefs.php:300
+#: config/prefs.php:327
msgid "Event Requests"
msgstr ""
@@ -1759,23 +1834,23 @@ msgstr ""
msgid "Event successfully deleted."
msgstr ""
-#: config/prefs.php:1323
+#: config/prefs.php:1358
msgid "Every 15 minutes"
msgstr ""
-#: config/prefs.php:1320
+#: config/prefs.php:1355
msgid "Every 30 seconds"
msgstr ""
-#: config/prefs.php:805 config/prefs.php:1322
+#: config/prefs.php:839 config/prefs.php:1357
msgid "Every 5 minutes"
msgstr ""
-#: config/prefs.php:1324
+#: config/prefs.php:1359
msgid "Every half hour"
msgstr ""
-#: config/prefs.php:804 config/prefs.php:1321
+#: config/prefs.php:838 config/prefs.php:1356
msgid "Every minute"
msgstr ""
@@ -1800,7 +1875,7 @@ msgstr ""
msgid "Expand Headers"
msgstr ""
-#: config/prefs.php:1532
+#: config/prefs.php:1573
msgid "Expand the entire folder tree by default in the folders view?"
msgstr ""
@@ -1808,7 +1883,7 @@ msgstr ""
msgid "Expiration"
msgstr ""
-#: lib/Pgp.php:789
+#: lib/Pgp.php:790
msgid "Expiration Date"
msgstr ""
@@ -1816,6 +1891,14 @@ msgstr ""
msgid "Export"
msgstr ""
+#: templates/prefs/smimeprivatekey.html.php:205
+msgid "Extra S/MIME Personal Certificates"
+msgstr ""
+
+#: lib/Prefs/Special/SmimePrivateKey.php:385
+msgid "Extra S/MIME keys deleted successfully."
+msgstr ""
+
#: templates/mime/compressed.html.php:8
msgid "Filename"
msgstr ""
@@ -1848,11 +1931,11 @@ msgstr ""
msgid "Filter mailboxes..."
msgstr ""
-#: config/prefs.php:984
+#: config/prefs.php:1019
msgid "Filter message content for unwanted text (e.g. profanity)?"
msgstr ""
-#: config/prefs.php:203
+#: config/prefs.php:227
msgid "Filters"
msgstr ""
@@ -1865,11 +1948,11 @@ msgstr ""
msgid "Find"
msgstr ""
-#: config/prefs.php:1435
+#: config/prefs.php:1476
msgid "First (oldest) Unseen Message"
msgstr ""
-#: config/prefs.php:1437
+#: config/prefs.php:1478
msgid "First Page"
msgstr ""
@@ -1893,7 +1976,7 @@ msgstr ""
msgid "Flagged for Followup"
msgstr ""
-#: config/prefs.php:1354
+#: config/prefs.php:1389
msgid "Flags"
msgstr ""
@@ -1906,7 +1989,7 @@ msgid ""
"precautionary to ensure you don't overwrite flag changes."
msgstr ""
-#: lib/Mailbox.php:1765
+#: lib/Mailbox.php:1768
msgid "Folder"
msgstr ""
@@ -1914,7 +1997,7 @@ msgstr ""
msgid "Folder Actions"
msgstr ""
-#: config/prefs.php:1507
+#: config/prefs.php:1548
msgid "Folder Display"
msgstr ""
@@ -1927,13 +2010,13 @@ msgstr ""
msgid "Folders"
msgstr ""
-#: config/prefs.php:1000
+#: config/prefs.php:1035
msgid ""
"For messages with alternative representations of a text part, which part "
"should be displayed?"
msgstr ""
-#: lib/Compose.php:2376 lib/Compose.php:2379 lib/Dynamic/Mailbox.php:317
+#: lib/Compose.php:2378 lib/Compose.php:2381 lib/Dynamic/Mailbox.php:317
#: lib/Notification/Event/Status.php:27 templates/dynamic/mailbox.html.php:32
#: templates/dynamic/message.html.php:15
#: templates/smartmobile/message.html.php:52
@@ -1944,15 +2027,15 @@ msgstr ""
msgid "Forwarded"
msgstr ""
-#: lib/Compose.php:2700
+#: lib/Compose.php:2702
msgid "Forwarded Message"
msgstr ""
-#: lib/Compose.php:2432
+#: lib/Compose.php:2434
msgid "Forwarded message"
msgstr ""
-#: lib/Compose.php:2432
+#: lib/Compose.php:2434
#, php-format
msgid "Forwarded message from %s"
msgstr ""
@@ -1961,11 +2044,11 @@ msgstr ""
msgid "Forwarded message will be automatically added to your outgoing message."
msgstr ""
-#: config/prefs.php:728
+#: config/prefs.php:762
msgid "Forwards"
msgstr ""
-#: lib/Compose.php:1701
+#: lib/Compose.php:1703
#, php-format
msgid ""
"Found the word %s in the message text although there are no files attached "
@@ -1977,7 +2060,7 @@ msgstr ""
msgid "Free/Busy Request Response"
msgstr ""
-#: lib/Basic/Search.php:55 lib/Compose.php:2743 lib/Contents/View.php:219
+#: lib/Basic/Search.php:55 lib/Compose.php:2745 lib/Contents/View.php:221
#: lib/Dynamic/Mailbox.php:179 lib/Dynamic/Mailbox.php:258
#: lib/Dynamic/Mailbox.php:495 lib/Smartmobile.php:175
#: templates/dynamic/compose.html.php:102
@@ -1986,7 +2069,7 @@ msgstr ""
msgid "From"
msgstr ""
-#: config/prefs.php:1452
+#: config/prefs.php:1493
msgid "From Address"
msgstr ""
@@ -1998,9 +2081,9 @@ msgstr ""
msgid "Gallery"
msgstr ""
-#: config/prefs.php:14 config/prefs.php:113 config/prefs.php:139
-#: config/prefs.php:166 config/prefs.php:202 config/prefs.php:299
-#: config/prefs.php:316 config/prefs.php:399
+#: config/prefs.php:14 config/prefs.php:137 config/prefs.php:163
+#: config/prefs.php:190 config/prefs.php:226 config/prefs.php:326
+#: config/prefs.php:343 config/prefs.php:426
msgid "General"
msgstr ""
@@ -2012,7 +2095,7 @@ msgstr ""
msgid "Go to your Inbox..."
msgstr ""
-#: lib/Compose.php:1809
+#: lib/Compose.php:1811
msgid "HTML Message"
msgstr ""
@@ -2020,27 +2103,27 @@ msgstr ""
msgid "HTML composition"
msgstr ""
-#: config/prefs.php:997
+#: config/prefs.php:1032
msgid "HTML part"
msgstr ""
-#: lib/Pgp.php:793
+#: lib/Pgp.php:794
msgid "Hash-Algorithm"
msgstr ""
-#: config/prefs.php:1053
+#: config/prefs.php:1088
msgid "Hidden"
msgstr ""
-#: config/prefs.php:1051
+#: config/prefs.php:1086
msgid "Hidden in List Messages"
msgstr ""
-#: config/prefs.php:1050
+#: config/prefs.php:1085
msgid "Hidden in Thread View"
msgstr ""
-#: config/prefs.php:1052
+#: config/prefs.php:1087
msgid "Hidden in Thread View and List Messages"
msgstr ""
@@ -2060,7 +2143,7 @@ msgstr ""
msgid "Hide Unsubscribed"
msgstr ""
-#: config/prefs.php:1185
+#: config/prefs.php:1220
msgid "Hide deleted messages even if using the Trash mailbox?"
msgstr ""
@@ -2076,25 +2159,25 @@ msgstr ""
msgid "Horizontal Layout"
msgstr ""
-#: config/prefs.php:1055
+#: config/prefs.php:1090
msgid ""
"How should large blocks of quoted text be shown by default? (Toggling the "
"block will always be available)."
msgstr ""
-#: config/prefs.php:746
+#: config/prefs.php:780
msgid "How should messages be forwarded by default?"
msgstr ""
-#: config/prefs.php:1546
+#: config/prefs.php:1587
msgid "How should namespaces be displayed in the folder tree view?"
msgstr ""
-#: config/prefs.php:709
+#: config/prefs.php:743
msgid "How to attribute quoted lines in a reply?"
msgstr ""
-#: lib/Mime/Viewer/Pgp.php:279
+#: lib/Mime/Viewer/Pgp.php:280
msgid ""
"However, no personal private key exists so the message cannot be decrypted."
msgstr ""
@@ -2107,6 +2190,8 @@ msgstr ""
msgid "Icon"
msgstr ""
+#: templates/smime/import_extra_key.html.php:38
+#: templates/smime/import_identity_key.html.php:38
#: templates/smime/import_personal_key.html.php:38
msgid ""
"If present, this certificate will be used for signing messages only, while "
@@ -2114,6 +2199,12 @@ msgid ""
"empty, the first certificate will be used for all purposes."
msgstr ""
+#: templates/prefs/smimeidentities.html.php:11
+msgid ""
+"If you want to set the keys for different identity, please change your "
+"default-identity first: "
+msgstr ""
+
#: lib/Contents.php:1282 templates/saveimage/saveimage.html.php:7
msgid "Image"
msgstr ""
@@ -2127,11 +2218,29 @@ msgid "Images have been blocked in this message part."
msgstr ""
#: lib/Dynamic/Mailbox.php:376 templates/pgp/import_key.html.php:42
+#: templates/smime/import_extra_key.html.php:62
+#: templates/smime/import_identity_key.html.php:62
#: templates/smime/import_personal_key.html.php:62
#: templates/smime/import_public_key.html.php:28
msgid "Import"
msgstr ""
+#: templates/prefs/smimeprivatekey.html.php:285
+msgid "Import Extra Personal Certificate"
+msgstr ""
+
+#: templates/smime/import_extra_key.html.php:6
+msgid "Import Extra Personal S/MIME Certificate"
+msgstr ""
+
+#: lib/Basic/Smime.php:322
+msgid "Import Extra Personal S/MIME Certificates"
+msgstr ""
+
+#: templates/smime/import_identity_key.html.php:6
+msgid "Import Idenitity Personal S/MIME Certificate"
+msgstr ""
+
#: templates/prefs/pgpprivatekey.html.php:129
msgid "Import Key"
msgstr ""
@@ -2140,7 +2249,7 @@ msgstr ""
msgid "Import PGP Key"
msgstr ""
-#: templates/prefs/smimeprivatekey.html.php:90
+#: templates/prefs/smimeprivatekey.html.php:188
msgid "Import Personal Certificate"
msgstr ""
@@ -2148,7 +2257,7 @@ msgstr ""
msgid "Import Personal Key"
msgstr ""
-#: lib/Basic/Smime.php:212 templates/smime/import_personal_key.html.php:6
+#: lib/Basic/Smime.php:319 templates/smime/import_personal_key.html.php:6
msgid "Import Personal S/MIME Certificate"
msgstr ""
@@ -2162,10 +2271,18 @@ msgstr ""
msgid "Import Public PGP Key"
msgstr ""
-#: lib/Basic/Smime.php:213 templates/smime/import_public_key.html.php:6
+#: lib/Basic/Smime.php:328 templates/smime/import_public_key.html.php:6
msgid "Import Public S/MIME Key"
msgstr ""
+#: lib/Basic/Smime.php:325
+msgid "Import S/MIME Certificates for new Identity"
+msgstr ""
+
+#: templates/prefs/smimeprivatekey.html.php:275
+msgid "Import SMIME Certificate for a new Identity"
+msgstr ""
+
#: lib/Mbox/Import.php:61
#, php-format
msgid "Imported %d message from %s."
@@ -2181,28 +2298,32 @@ msgstr ""
msgid "In Body Text"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:822
+#: lib/Mime/Viewer/Itip.php:823
msgid "In Process"
msgstr ""
-#: config/prefs.php:742
+#: config/prefs.php:776
msgid "In the body text"
msgstr ""
-#: lib/Mailbox.php:1728 lib/Mailbox.php:1732 lib/Mailbox.php:1779
+#: lib/Mailbox.php:1731 lib/Mailbox.php:1735 lib/Mailbox.php:1782
#: lib/Remote.php:107
msgid "Inbox"
msgstr ""
-#: config/prefs.php:693
+#: config/prefs.php:727
msgid "Include a brief summary of the original message's header in a reply?"
msgstr ""
-#: config/prefs.php:702
+#: config/prefs.php:736
msgid "Include original message in a reply?"
msgstr ""
-#: config/prefs.php:1498
+#: config/prefs.php:1439
+msgid "Include the \"Bcc\" header when printing a sent email?"
+msgstr ""
+
+#: config/prefs.php:1539
msgid ""
"Indicate whether a message has attachments or is signed or encrypted in the "
"mailbox listing?"
@@ -2213,7 +2334,7 @@ msgid "Info"
msgstr ""
#: lib/Prefs/Special/PgpPublicKey.php:78
-#: lib/Prefs/Special/SmimePublicKey.php:76
+#: lib/Prefs/Special/SmimePublicKey.php:78
#, php-format
msgid "Information on %s Public Key"
msgstr ""
@@ -2222,7 +2343,7 @@ msgstr ""
msgid "Information on Personal Private Key"
msgstr ""
-#: lib/Prefs/Special/SmimePrivateKey.php:101
+#: lib/Prefs/Special/SmimePrivateKey.php:251
msgid "Information on Personal Public Certificate"
msgstr ""
@@ -2261,12 +2382,12 @@ msgstr ""
msgid "Invalid Subject"
msgstr ""
-#: lib/Compose.php:1512
+#: lib/Compose.php:1514
#, php-format
msgid "Invalid e-mail address (%s)."
msgstr ""
-#: lib/Compose.php:1508
+#: lib/Compose.php:1510
#, php-format
msgid "Invalid e-mail address (%s): %s"
msgstr ""
@@ -2275,7 +2396,7 @@ msgstr ""
msgid "Invalid e-mail address."
msgstr ""
-#: lib/Basic/Smime.php:271
+#: lib/Basic/Smime.php:389
msgid "Invalid key"
msgstr ""
@@ -2287,23 +2408,23 @@ msgstr ""
msgid "Junk"
msgstr ""
-#: lib/Pgp.php:788
+#: lib/Pgp.php:789
msgid "Key Creation"
msgstr ""
-#: lib/Pgp.php:795
+#: lib/Pgp.php:796
msgid "Key Fingerprint"
msgstr ""
-#: lib/Pgp.php:794
+#: lib/Pgp.php:795
msgid "Key ID"
msgstr ""
-#: lib/Pgp.php:790
+#: lib/Pgp.php:791
msgid "Key Length"
msgstr ""
-#: lib/Pgp.php:787
+#: lib/Pgp.php:788
msgid "Key Type"
msgstr ""
@@ -2325,6 +2446,10 @@ msgid ""
"contacts."
msgstr ""
+#: lib/Smime.php:217
+msgid "Key is allready in the Database"
+msgstr ""
+
#: lib/Prefs/Special/PgpPrivateKey.php:165
msgid "Key successfully sent to the public keyserver."
msgstr ""
@@ -2334,11 +2459,11 @@ msgstr ""
msgid "Label"
msgstr ""
-#: config/prefs.php:1436
+#: config/prefs.php:1477
msgid "Last (newest) Unseen Message"
msgstr ""
-#: config/prefs.php:1438
+#: config/prefs.php:1479
msgid "Last Page"
msgstr ""
@@ -2415,8 +2540,8 @@ msgstr ""
msgid "Mail"
msgstr ""
-#: config/prefs.php:1405 config/prefs.php:1506 lib/Block/Summary.php:107
-#: lib/Mailbox.php:1816 templates/smartmobile/message.html.php:2
+#: config/prefs.php:1446 config/prefs.php:1547 lib/Block/Summary.php:107
+#: lib/Mailbox.php:1819 templates/smartmobile/message.html.php:2
msgid "Mailbox"
msgstr ""
@@ -2430,7 +2555,7 @@ msgstr ""
msgid "Mailbox %s does not exist."
msgstr ""
-#: config/prefs.php:1406
+#: config/prefs.php:1447
msgid "Mailbox Display"
msgstr ""
@@ -2442,7 +2567,7 @@ msgstr ""
msgid "Mailbox Summary"
msgstr ""
-#: lib/Mailbox.php:672
+#: lib/Mailbox.php:675
msgid "Mailbox structure on server has changed."
msgstr ""
@@ -2467,15 +2592,15 @@ msgstr ""
msgid "Manage Remote Accounts"
msgstr ""
-#: config/prefs.php:763
+#: config/prefs.php:797
msgid "Manage message drafts."
msgstr ""
-#: config/prefs.php:817
+#: config/prefs.php:851
msgid "Manage sent mail."
msgstr ""
-#: config/prefs.php:168
+#: config/prefs.php:192
msgid "Manage your saved searches"
msgstr ""
@@ -2495,15 +2620,15 @@ msgstr ""
msgid "Mark as"
msgstr ""
-#: config/prefs.php:1035
+#: config/prefs.php:1070
msgid "Mark different levels of quoting with different colors?"
msgstr ""
-#: config/prefs.php:1133
+#: config/prefs.php:1168
msgid "Mark messages as seen when deleting?"
msgstr ""
-#: config/prefs.php:1042
+#: config/prefs.php:1077
msgid "Mark simple markup?"
msgstr ""
@@ -2535,9 +2660,9 @@ msgstr ""
msgid "Mbox or .eml file:"
msgstr ""
-#: config/prefs.php:969 config/prefs.php:1114 config/prefs.php:1223
-#: config/prefs.php:1306 config/prefs.php:1353 config/prefs.php:1387
-#: lib/Compose.php:2239 lib/Contents.php:1287 lib/Dynamic/Message.php:149
+#: config/prefs.php:1004 config/prefs.php:1149 config/prefs.php:1258
+#: config/prefs.php:1341 config/prefs.php:1388 config/prefs.php:1422
+#: lib/Compose.php:2241 lib/Contents.php:1287 lib/Dynamic/Message.php:149
msgid "Message"
msgstr ""
@@ -2559,15 +2684,15 @@ msgstr ""
msgid "Message Date"
msgstr ""
-#: config/prefs.php:1455
+#: config/prefs.php:1496
msgid "Message Size"
msgstr ""
-#: lib/Contents/View.php:168
+#: lib/Contents/View.php:170
msgid "Message Source"
msgstr ""
-#: lib/Compose.php:2239
+#: lib/Compose.php:2241
#, php-format
msgid "Message from %s"
msgstr ""
@@ -2588,7 +2713,7 @@ msgstr ""
msgid "Message redirected successfully."
msgstr ""
-#: lib/Compose.php:1218 lib/Compose.php:1270
+#: lib/Compose.php:1220 lib/Compose.php:1272
#, php-format
msgid "Message sent successfully, but not saved to %s."
msgstr ""
@@ -2616,11 +2741,11 @@ msgstr ""
msgid "Messages with Attachments"
msgstr ""
-#: config/prefs.php:308
+#: config/prefs.php:335
msgid "Minutes needed to consider a event as non-conflicting in iTip"
msgstr ""
-#: config/prefs.php:1126
+#: config/prefs.php:1161
msgid "Mobile view only"
msgstr ""
@@ -2644,7 +2769,7 @@ msgstr ""
msgid "Move %s to %s"
msgstr ""
-#: config/prefs.php:1139
+#: config/prefs.php:1174
msgid ""
"Move deleted messages to your Trash mailbox instead of marking them as "
"deleted in the current mailbox?"
@@ -2654,11 +2779,11 @@ msgstr ""
msgid "Move to Base Level"
msgstr ""
-#: config/prefs.php:1270
+#: config/prefs.php:1305
msgid "Move to Inbox"
msgstr ""
-#: config/prefs.php:1259
+#: config/prefs.php:1294
msgid "Move to Spam mailbox"
msgstr ""
@@ -2670,7 +2795,7 @@ msgstr ""
msgid "Multiple Message View"
msgstr ""
-#: lib/Dynamic/Compose.php:125
+#: lib/Dynamic/Compose.php:126
msgid "Multiple messages can only be forwarded as attachments."
msgstr ""
@@ -2682,11 +2807,11 @@ msgstr ""
msgid "Must enter a non-empty name for the new destination mailbox."
msgstr ""
-#: config/prefs.php:1450
+#: config/prefs.php:1491
msgid "NONE"
msgstr ""
-#: lib/Pgp.php:786 templates/itip/action.html.php:79
+#: lib/Pgp.php:787 templates/itip/action.html.php:79
msgid "Name"
msgstr ""
@@ -2707,7 +2832,7 @@ msgstr ""
msgid "Need at least one message recipient."
msgstr ""
-#: lib/Mime/Viewer/Itip.php:827
+#: lib/Mime/Viewer/Itip.php:828
msgid "Needs Action"
msgstr ""
@@ -2715,12 +2840,12 @@ msgstr ""
msgid "Negative Right"
msgstr ""
-#: config/prefs.php:860 config/prefs.php:1191 config/prefs.php:1282
-#: config/prefs.php:1319 lib/Pgp.php:827
+#: config/prefs.php:894 config/prefs.php:1226 config/prefs.php:1317
+#: config/prefs.php:1354 lib/Pgp.php:828
msgid "Never"
msgstr ""
-#: config/prefs.php:1096
+#: config/prefs.php:1131
msgid "Never send read receipt"
msgstr ""
@@ -2728,11 +2853,11 @@ msgstr ""
msgid "New Flag"
msgstr ""
-#: config/prefs.php:1307
+#: config/prefs.php:1342
msgid "New Mail"
msgstr ""
-#: lib/Application.php:310 lib/Compose.php:2356 lib/Dynamic/Base.php:154
+#: lib/Application.php:310 lib/Compose.php:2358 lib/Dynamic/Base.php:154
#: lib/Dynamic/Compose.php:79 lib/Dynamic/Mailbox.php:114
#: lib/Smartmobile.php:182 templates/dynamic/mailbox.html.php:54
#: templates/smartmobile/compose.html.php:2
@@ -2746,6 +2871,10 @@ msgstr ""
msgid "New Message to %s"
msgstr ""
+#: templates/smime/import_extra_key.html.php:24
+#: templates/smime/import_extra_key.html.php:56
+#: templates/smime/import_identity_key.html.php:24
+#: templates/smime/import_identity_key.html.php:56
#: templates/smime/import_personal_key.html.php:24
#: templates/smime/import_personal_key.html.php:56
msgid "New Password for Private Key"
@@ -2755,7 +2884,7 @@ msgstr ""
msgid "New User"
msgstr ""
-#: config/prefs.php:1326
+#: config/prefs.php:1361
msgid "New mail poll interval on mailbox page:"
msgstr ""
@@ -2772,8 +2901,8 @@ msgstr ""
msgid "Next"
msgstr ""
-#: config/prefs.php:583 config/prefs.php:803 config/prefs.php:830
-#: config/prefs.php:1528
+#: config/prefs.php:617 config/prefs.php:837 config/prefs.php:864
+#: config/prefs.php:1569
msgid "No"
msgstr ""
@@ -2794,7 +2923,7 @@ msgstr ""
msgid "No Results Found"
msgstr ""
-#: lib/Basic/Smime.php:55
+#: lib/Basic/Smime.php:62
msgid "No S/MIME public key imported."
msgstr ""
@@ -2822,10 +2951,22 @@ msgstr ""
msgid "No addresses were selected."
msgstr ""
-#: lib/Smime.php:271
+#: templates/prefs/smimeprivatekey.html.php:224
+msgid "No alias"
+msgstr ""
+
+#: lib/Prefs/Special/SmimeAliasHandler.php:22
+msgid "No alias entered."
+msgstr ""
+
+#: lib/Smime.php:753
msgid "No email information located in the public key."
msgstr ""
+#: templates/prefs/smimeprivatekey.html.php:214
+msgid "No extra Privateys in Keystore"
+msgstr ""
+
#: lib/Quota/Ui.php:110
msgid "No limit"
msgstr ""
@@ -2834,7 +2975,7 @@ msgstr ""
msgid "No mailboxes with unseen messages"
msgstr ""
-#: lib/Compose.php:2270
+#: lib/Compose.php:2272
msgid "No message body text"
msgstr ""
@@ -2854,11 +2995,11 @@ msgstr ""
msgid "No passphrase entered."
msgstr ""
-#: templates/prefs/smimeprivatekey.html.php:84
+#: templates/prefs/smimeprivatekey.html.php:178
msgid "No personal certificate"
msgstr ""
-#: lib/Mime/Viewer/Smime.php:183
+#: lib/Mime/Viewer/Smime.php:185
msgid "No personal private key exists so the data is unable to be decrypted."
msgstr ""
@@ -2878,13 +3019,13 @@ msgstr ""
msgid "No valid public key found."
msgstr ""
-#: lib/Mime/Viewer/Itip.php:876
+#: lib/Mime/Viewer/Itip.php:877
msgid "Non Participant"
msgstr ""
#: lib/Compose/Ui.php:56 lib/Mime/Viewer/Itip.php:430
-#: lib/Mime/Viewer/Itip.php:607 lib/Mime/Viewer/Itip.php:769 lib/Pgp.php:829
-#: lib/Pgp.php:830 templates/prefs/acl.html.php:39
+#: lib/Mime/Viewer/Itip.php:607 lib/Mime/Viewer/Itip.php:770 lib/Pgp.php:830
+#: lib/Pgp.php:831 templates/prefs/acl.html.php:39
#: templates/prefs/acl.html.php:74 templates/prefs/composetemplates.html.php:7
#: templates/prefs/drafts.html.php:7 templates/prefs/sentmail.html.php:7
#: templates/prefs/spam.html.php:7 templates/prefs/trash.html.php:7
@@ -2904,7 +3045,7 @@ msgstr ""
msgid "Not Junk"
msgstr ""
-#: lib/Smime.php:264
+#: lib/Smime.php:746
msgid "Not a valid public key."
msgstr ""
@@ -2912,7 +3053,7 @@ msgstr ""
msgid "Notepads"
msgstr ""
-#: config/prefs.php:1255 config/prefs.php:1269
+#: config/prefs.php:1290 config/prefs.php:1304
msgid "Nothing"
msgstr ""
@@ -2951,14 +3092,16 @@ msgstr ""
msgid "Open in new window"
msgstr ""
-#: lib/Mailbox.php:1761
+#: lib/Mailbox.php:1764
msgid "Opened Folder"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:872
+#: lib/Mime/Viewer/Itip.php:873
msgid "Optional Participant"
msgstr ""
+#: templates/smime/import_extra_key.html.php:33
+#: templates/smime/import_identity_key.html.php:33
#: templates/smime/import_personal_key.html.php:33
msgid "Optional Secondary S/MIME Certificate"
msgstr ""
@@ -2972,11 +3115,11 @@ msgstr ""
msgid "Other Options"
msgstr ""
-#: lib/Mailbox.php:1649
+#: lib/Mailbox.php:1652
msgid "Other Users"
msgstr ""
-#: config/prefs.php:317
+#: config/prefs.php:344
msgid "PGP"
msgstr ""
@@ -2988,7 +3131,7 @@ msgstr ""
msgid "PGP Encrypt Message with passphrase"
msgstr ""
-#: lib/Compose.php:1088
+#: lib/Compose.php:1090
msgid "PGP Error: "
msgstr ""
@@ -3026,18 +3169,18 @@ msgstr ""
msgid "PGP passphrase successfully unloaded."
msgstr ""
-#: config/prefs.php:344
+#: config/prefs.php:371
msgid ""
"PGP support requires popup windows to be used. If your browser is currently "
"set to disable popup windows, you must change this setting or else the PGP "
"features will not work correctly."
msgstr ""
-#: lib/Compose.php:1036
+#: lib/Compose.php:1038
msgid "PGP: Need passphrase for personal private key."
msgstr ""
-#: lib/Compose.php:1053
+#: lib/Compose.php:1055
msgid "PGP: Need passphrase to encrypt your message with."
msgstr ""
@@ -3078,6 +3221,10 @@ msgstr ""
msgid "Password for %s:"
msgstr ""
+#: templates/smime/import_extra_key.html.php:18
+#: templates/smime/import_extra_key.html.php:50
+#: templates/smime/import_identity_key.html.php:18
+#: templates/smime/import_identity_key.html.php:50
#: templates/smime/import_personal_key.html.php:18
#: templates/smime/import_personal_key.html.php:50
msgid "Password of Uploaded Certificate"
@@ -3117,7 +3264,7 @@ msgstr ""
msgid "Personal Information"
msgstr ""
-#: lib/Basic/Search.php:128 lib/Search/Element/Personal.php:70
+#: lib/Basic/Search.php:128 lib/Search/Element/Personal.php:71
#: lib/Search/Filter/Personal.php:30
msgid "Personal Messages"
msgstr ""
@@ -3138,27 +3285,27 @@ msgstr ""
msgid "Personal PGP keys deleted successfully."
msgstr ""
-#: lib/Basic/Smime.php:125
+#: lib/Basic/Smime.php:188 lib/Basic/Smime.php:227
msgid "Personal S/MIME certificates NOT imported."
msgstr ""
-#: lib/Basic/Smime.php:128 lib/Basic/Smime.php:140
+#: lib/Basic/Smime.php:191 lib/Basic/Smime.php:230 lib/Basic/Smime.php:242
msgid "Personal S/MIME certificates NOT imported: "
msgstr ""
-#: lib/Prefs/Special/SmimePrivateKey.php:169
+#: lib/Prefs/Special/SmimePrivateKey.php:374
msgid "Personal S/MIME keys deleted successfully."
msgstr ""
-#: config/prefs.php:518
+#: config/prefs.php:552
msgid "Plain Text"
msgstr ""
-#: lib/Compose.php:1841
+#: lib/Compose.php:1843
msgid "Plaintext Message"
msgstr ""
-#: config/prefs.php:998
+#: config/prefs.php:1033
msgid "Plaintext part"
msgstr ""
@@ -3184,11 +3331,15 @@ msgstr ""
msgid "Please select at least one search criteria."
msgstr ""
+#: lib/Smime.php:596
+msgid "Please set a correct password before unsetting the keys."
+msgstr ""
+
#: lib/Prefs/Special/Remote.php:50
msgid "Please wait..."
msgstr ""
-#: config/prefs.php:1565
+#: config/prefs.php:1606
msgid "Poll all mailboxes for new mail?"
msgstr ""
@@ -3225,11 +3376,11 @@ msgstr ""
msgid "Print"
msgstr ""
-#: lib/Contents/View.php:243
+#: lib/Contents/View.php:248
msgid "Printed By"
msgstr ""
-#: config/prefs.php:1388
+#: config/prefs.php:1423
msgid "Printing"
msgstr ""
@@ -3237,21 +3388,29 @@ msgstr ""
msgid "Priority"
msgstr ""
-#: lib/Pgp.php:825
+#: templates/prefs/smimeprivatekey.html.php:239
+msgid "Private Certificate: "
+msgstr ""
+
+#: lib/Pgp.php:826
msgid "Private Key"
msgstr ""
-#: config/prefs.php:1102
+#: config/prefs.php:1137
msgid ""
"Prompt to send read receipt (a/k/a message disposition notification) when "
"requested by the sender?"
msgstr ""
-#: lib/Pgp.php:825
+#: templates/prefs/smimeprivatekey.html.php:232
+msgid "Public Certificate: "
+msgstr ""
+
+#: lib/Pgp.php:826
msgid "Public Key"
msgstr ""
-#: lib/Pgp.php:955
+#: lib/Pgp.php:956
msgid "Public PGP keyserver support has been disabled."
msgstr ""
@@ -3263,11 +3422,11 @@ msgstr ""
msgid "Purge Deleted"
msgstr ""
-#: config/prefs.php:1283
+#: config/prefs.php:1318
msgid "Purge Spam mailbox how often:"
msgstr ""
-#: config/prefs.php:1192
+#: config/prefs.php:1227
msgid "Purge Trash how often:"
msgstr ""
@@ -3275,19 +3434,19 @@ msgstr ""
msgid "Purge messages"
msgstr ""
-#: config/prefs.php:1293
+#: config/prefs.php:1328
msgid "Purge messages in Spam mailbox older than this amount of days."
msgstr ""
-#: config/prefs.php:1204
+#: config/prefs.php:1239
msgid "Purge messages in Trash mailbox older than this amount of days."
msgstr ""
-#: config/prefs.php:871
+#: config/prefs.php:905
msgid "Purge messages in sent mail mailbox(es) older than this amount of days."
msgstr ""
-#: config/prefs.php:861
+#: config/prefs.php:895
msgid "Purge sent mail how often:"
msgstr ""
@@ -3315,7 +3474,7 @@ msgstr ""
msgid "Purging 1 message from sent-mail mailbox %s."
msgstr ""
-#: config/prefs.php:706
+#: config/prefs.php:740
#, php-format
msgid "Quoting %f:"
msgstr ""
@@ -3364,7 +3523,7 @@ msgstr ""
msgid "Recipients (To/Cc/Bcc)"
msgstr ""
-#: lib/Search/Element/Recipient.php:69
+#: lib/Search/Element/Recipient.php:70
#, php-format
msgid "Recipients (To/Cc/Bcc) for '%s'"
msgstr ""
@@ -3373,7 +3532,7 @@ msgstr ""
msgid "Recurrence"
msgstr ""
-#: lib/Dynamic/Base.php:177 lib/Dynamic/Compose.php:149
+#: lib/Dynamic/Base.php:177 lib/Dynamic/Compose.php:150
#: lib/Notification/Event/Status.php:32 templates/dynamic/redirect.html.php:7
#: templates/smartmobile/message.html.php:55
msgid "Redirect"
@@ -3393,15 +3552,15 @@ msgstr ""
msgid "Remember the free/busy information."
msgstr ""
-#: config/prefs.php:1530
+#: config/prefs.php:1571
msgid "Remember the last view"
msgstr ""
-#: lib/Mailbox.php:1771
+#: lib/Mailbox.php:1774
msgid "Remote Account"
msgstr ""
-#: config/prefs.php:140 lib/Mailbox.php:1645
+#: config/prefs.php:164 lib/Mailbox.php:1648
msgid "Remote Accounts"
msgstr ""
@@ -3418,20 +3577,20 @@ msgstr ""
msgid "Rename %s to:"
msgstr ""
-#: config/prefs.php:839
+#: config/prefs.php:873
msgid "Rename sent mail mailbox at beginning of month?"
msgstr ""
-#: lib/Mailbox.php:874
+#: lib/Mailbox.php:877
#, php-format
msgid "Renaming \"%s\" to \"%s\" failed. This is what the server said"
msgstr ""
-#: config/prefs.php:671
+#: config/prefs.php:705
msgid "Replies"
msgstr ""
-#: lib/Dynamic/Compose.php:104 lib/Dynamic/Mailbox.php:316
+#: lib/Dynamic/Compose.php:105 lib/Dynamic/Mailbox.php:316
#: lib/Notification/Event/Status.php:39 templates/dynamic/mailbox.html.php:29
#: templates/dynamic/message.html.php:12
msgid "Reply"
@@ -3450,11 +3609,11 @@ msgstr ""
msgid "Reply To Sender instead"
msgstr ""
-#: lib/Dynamic/Compose.php:108 templates/smartmobile/message.html.php:39
+#: lib/Dynamic/Compose.php:109 templates/smartmobile/message.html.php:39
msgid "Reply to All"
msgstr ""
-#: lib/Dynamic/Compose.php:112 templates/smartmobile/message.html.php:42
+#: lib/Dynamic/Compose.php:113 templates/smartmobile/message.html.php:42
msgid "Reply to List"
msgstr ""
@@ -3474,7 +3633,7 @@ msgstr ""
msgid "Reply with requested free/busy information."
msgstr ""
-#: lib/Compose.php:2747
+#: lib/Compose.php:2749
msgid "Reply-To"
msgstr ""
@@ -3495,7 +3654,7 @@ msgstr ""
msgid "Report as Spam"
msgstr ""
-#: config/prefs.php:586
+#: config/prefs.php:620
msgid "Request read receipts?"
msgstr ""
@@ -3507,7 +3666,7 @@ msgstr ""
msgid "Required"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:864
+#: lib/Mime/Viewer/Itip.php:865
msgid "Required Participant"
msgstr ""
@@ -3521,7 +3680,7 @@ msgid "Reset"
msgstr ""
#: lib/Ajax/Imple/ItipRequest.php:136 lib/Ajax/Imple/ItipRequest.php:154
-#: lib/Mime/Viewer/Itip.php:370 lib/Mime/Viewer/Itip.php:749
+#: lib/Mime/Viewer/Itip.php:370 lib/Mime/Viewer/Itip.php:750
msgid "Respondent Status Updated."
msgstr ""
@@ -3551,12 +3710,12 @@ msgstr ""
msgid "Return to %s"
msgstr ""
-#: config/prefs.php:1126
+#: config/prefs.php:1161
msgid ""
"Return to the mailbox listing after deleting, moving, or copying a message?"
msgstr ""
-#: config/prefs.php:519
+#: config/prefs.php:553
msgid "Rich Text (HTML)"
msgstr ""
@@ -3564,31 +3723,49 @@ msgstr ""
msgid "Role"
msgstr ""
-#: config/prefs.php:400
+#: config/prefs.php:427
msgid "S/MIME"
msgstr ""
-#: lib/Smime.php:85
+#: lib/Prefs/Special/SmimePrivateKey.php:409
+msgid ""
+"S/MIME Certificate set and successfully transfered previous certificate to "
+"extra keys."
+msgstr ""
+
+#: lib/Smime.php:609
+msgid "S/MIME Certificate unset and successfully transfered to extra keys."
+msgstr ""
+
+#: lib/Smime.php:615
+msgid "S/MIME Certificates were not proberly deleted from database."
+msgstr ""
+
+#: lib/Smime.php:101
msgid "S/MIME Encrypt Message"
msgstr ""
-#: lib/Compose.php:1136
+#: lib/Compose.php:1138
msgid "S/MIME Error: "
msgstr ""
-#: lib/Compose.php:1112
+#: lib/Compose.php:1114
msgid "S/MIME Error: Need passphrase for personal private key."
msgstr ""
-#: lib/Basic/Smime.php:270
+#: lib/Basic/Smime.php:388
msgid "S/MIME Key Information"
msgstr ""
-#: templates/prefs/smimeprivatekey.html.php:11
+#: templates/prefs/smimeprivatekey.html.php:5
+msgid "S/MIME Personal Certificate of Identity"
+msgstr ""
+
+#: templates/prefs/smimeprivatekey.html.php:30
msgid "S/MIME Personal Certificate support requires a secure web connection."
msgstr ""
-#: lib/Prefs/Special/SmimePublicKey.php:105
+#: lib/Prefs/Special/SmimePublicKey.php:108
#, php-format
msgid "S/MIME Public Key for \"%s\" was successfully deleted."
msgstr ""
@@ -3597,39 +3774,50 @@ msgstr ""
msgid "S/MIME Public Keyring"
msgstr ""
-#: lib/Basic/Smime.php:116
+#: lib/Smime.php:1213
+msgid ""
+"S/MIME Public/Private Keypair successfully added to exra keys in keystore."
+msgstr ""
+
+#: lib/Basic/Smime.php:218
msgid "S/MIME Public/Private Keypair successfully added."
msgstr ""
-#: lib/Smime.php:91
+#: lib/Smime.php:107
msgid "S/MIME Sign Message"
msgstr ""
-#: lib/Smime.php:92
+#: lib/Smime.php:108
msgid "S/MIME Sign/Encrypt Message"
msgstr ""
-#: lib/Prefs/Special/SmimePrivateKey.php:178
+#: lib/Prefs/Special/SmimePrivateKey.php:418
+msgid ""
+"S/MIME Singing Certificate set and successfully transfered previous signing "
+"certificate to extra keys."
+msgstr ""
+
+#: lib/Prefs/Special/SmimePrivateKey.php:394
msgid "S/MIME passphrase successfully unloaded."
msgstr ""
-#: lib/Basic/Smime.php:52
+#: lib/Basic/Smime.php:59
msgid "S/MIME public key successfully added."
msgstr ""
-#: lib/Mime/Viewer/Smime.php:178
+#: lib/Mime/Viewer/Smime.php:180
msgid ""
"S/MIME support is not currently enabled so the data is unable to be "
"decrypted."
msgstr ""
-#: lib/Mime/Viewer/Smime.php:290
+#: lib/Mime/Viewer/Smime.php:350
msgid ""
"S/MIME support is not enabled so the digital signature is unable to be "
"verified."
msgstr ""
-#: config/prefs.php:428
+#: config/prefs.php:455
msgid ""
"S/MIME support requires popup windows to be used. If your browser is "
"currently set to disable popup windows, you must change this setting or else "
@@ -3670,15 +3858,15 @@ msgstr ""
msgid "Save as Draft"
msgstr ""
-#: config/prefs.php:832
+#: config/prefs.php:866
msgid "Save attachments in the sent-mail message?"
msgstr ""
-#: config/prefs.php:794
+#: config/prefs.php:828
msgid "Save drafts as unseen?"
msgstr ""
-#: config/prefs.php:807
+#: config/prefs.php:841
msgid "Save drafts automatically while composing?"
msgstr ""
@@ -3690,7 +3878,7 @@ msgstr ""
msgid "Save password?"
msgstr ""
-#: config/prefs.php:900
+#: config/prefs.php:934
msgid "Save recipients automatically to the default address book?"
msgstr ""
@@ -3702,15 +3890,15 @@ msgstr ""
msgid "Save sent mail?"
msgstr ""
-#: lib/Mime/Viewer/Smime.php:359
+#: lib/Mime/Viewer/Smime.php:425
msgid "Save the certificate to your Address Book."
msgstr ""
-#: lib/Mime/Viewer/Pgp.php:379
+#: lib/Mime/Viewer/Pgp.php:380
msgid "Save the key to your address book."
msgstr ""
-#: config/prefs.php:167
+#: config/prefs.php:191
msgid "Saved Searches"
msgstr ""
@@ -3792,19 +3980,23 @@ msgstr ""
msgid "Searching..."
msgstr ""
-#: lib/Basic/Smime.php:119 lib/Basic/Smime.php:137
+#: lib/Basic/Smime.php:221 lib/Basic/Smime.php:239
msgid "Secondary S/MIME Public/Private Keypair successfully added."
msgstr ""
-#: lib/Basic/Smime.php:178
+#: lib/Prefs/Special/SmimePrivateKey.php:384
+msgid "Secondary extra S/MIME keys deleted successfully."
+msgstr ""
+
+#: lib/Basic/Smime.php:280
msgid "Secondary personal S/MIME certificates NOT imported."
msgstr ""
-#: lib/Basic/Smime.php:183
+#: lib/Basic/Smime.php:285
msgid "Secondary personal S/MIME certificates NOT imported: "
msgstr ""
-#: lib/Prefs/Special/SmimePrivateKey.php:168
+#: lib/Prefs/Special/SmimePrivateKey.php:373
msgid "Secondary personal S/MIME keys deleted successfully."
msgstr ""
@@ -3821,7 +4013,7 @@ msgstr ""
msgid "Select All"
msgstr ""
-#: config/prefs.php:886
+#: config/prefs.php:920
msgid "Select address book sources for adding/searching."
msgstr ""
@@ -3862,12 +4054,12 @@ msgstr ""
msgid "Send message without a subject?"
msgstr ""
-#: lib/Mime/Viewer/Smime.php:332 lib/Mime/Viewer/Smime.php:366
+#: lib/Mime/Viewer/Smime.php:392 lib/Mime/Viewer/Smime.php:432
#, php-format
msgid "Sender: %s"
msgstr ""
-#: lib/Mailbox.php:1698 lib/Mailbox.php:1810
+#: lib/Mailbox.php:1701 lib/Mailbox.php:1813
msgid "Sent"
msgstr ""
@@ -3876,7 +4068,7 @@ msgstr ""
msgid "Sent Date: %s"
msgstr ""
-#: config/prefs.php:816
+#: config/prefs.php:850
msgid "Sent Mail"
msgstr ""
@@ -3893,7 +4085,12 @@ msgstr ""
msgid "Server Suggestion"
msgstr ""
-#: config/prefs.php:511
+#: templates/prefs/smimeprivatekey.html.php:47
+#: templates/prefs/smimeprivatekey.html.php:122
+msgid "Set Alias for your certificate: "
+msgstr ""
+
+#: config/prefs.php:545
msgid "Set a priority header when composing messages?"
msgstr ""
@@ -3901,31 +4098,43 @@ msgstr ""
msgid "Set permissions for other users"
msgstr ""
-#: config/prefs.php:1116
+#: config/prefs.php:1151
msgid "Set preferences for what happens when you move and delete messages."
msgstr ""
-#: config/prefs.php:114
+#: templates/prefs/smimeprivatekey.html.php:244
+msgid "Set this key as a secondary sign certificate:"
+msgstr ""
+
+#: templates/prefs/smimeprivatekey.html.php:250
+msgid "Set this key as personal certificate:"
+msgstr ""
+
+#: config/prefs.php:112
+msgid "Set your keypair from the database:"
+msgstr ""
+
+#: config/prefs.php:138
msgid "Share Mailboxes"
msgstr ""
-#: config/prefs.php:115
+#: config/prefs.php:139
msgid "Share your mailboxes with other users."
msgstr ""
-#: lib/Mailbox.php:1651
+#: lib/Mailbox.php:1654
msgid "Shared"
msgstr ""
-#: config/prefs.php:360
+#: config/prefs.php:387
msgid "Should PGP signed messages be automatically verified when viewed?"
msgstr ""
-#: config/prefs.php:436
+#: config/prefs.php:463
msgid "Should S/MIME signed messages be automatically verified when viewed?"
msgstr ""
-#: config/prefs.php:352
+#: config/prefs.php:379
msgid "Should your PGP public key to be attached to your messages by default?"
msgstr ""
@@ -3971,15 +4180,15 @@ msgstr ""
msgid "Show Unsubscribed Mailboxes"
msgstr ""
-#: config/prefs.php:1076
+#: config/prefs.php:1111
msgid "Show all attachments"
msgstr ""
-#: config/prefs.php:1379
+#: config/prefs.php:1414
msgid "Show all flags (including flags set by other mail programs)?"
msgstr ""
-#: config/prefs.php:1075
+#: config/prefs.php:1110
msgid "Show all parts"
msgstr ""
@@ -3987,7 +4196,7 @@ msgstr ""
msgid "Show images..."
msgstr ""
-#: config/prefs.php:1544
+#: config/prefs.php:1585
msgid "Show non-private mailboxes in separate folders"
msgstr ""
@@ -3995,7 +4204,7 @@ msgstr ""
msgid "Show the signature on the compose screen?"
msgstr ""
-#: config/prefs.php:1049
+#: config/prefs.php:1084
msgid "Shown"
msgstr ""
@@ -4028,7 +4237,7 @@ msgstr ""
msgid "Sort"
msgstr ""
-#: lib/Mailbox.php:1715 lib/Mailbox.php:1797
+#: lib/Mailbox.php:1718 lib/Mailbox.php:1800
#: templates/dynamic/mailbox.html.php:36 templates/dynamic/message.html.php:19
#: templates/smartmobile/mailbox.html.php:38
#: templates/smartmobile/mailbox.html.php:48
@@ -4036,7 +4245,7 @@ msgstr ""
msgid "Spam"
msgstr ""
-#: config/prefs.php:1224
+#: config/prefs.php:1259
msgid "Spam Reporting"
msgstr ""
@@ -4064,12 +4273,12 @@ msgstr ""
msgid "Strip Attachment"
msgstr ""
-#: config/prefs.php:715
+#: config/prefs.php:749
msgid "Strip the sender's signature from plaintext replies?"
msgstr ""
-#: config/prefs.php:1454 lib/Basic/Search.php:75 lib/Compose.php:2751
-#: lib/Contents/View.php:222 lib/Dynamic/Mailbox.php:190
+#: config/prefs.php:1495 lib/Basic/Search.php:75 lib/Compose.php:2753
+#: lib/Contents/View.php:224 lib/Dynamic/Mailbox.php:190
#: lib/Dynamic/Mailbox.php:260 lib/Dynamic/Mailbox.php:497
#: lib/Smartmobile.php:186 templates/dynamic/compose.html.php:144
#: templates/smartmobile/search.html.php:13
@@ -4125,7 +4334,7 @@ msgstr ""
msgid "Task Lists"
msgstr ""
-#: lib/Mailbox.php:1686 templates/prefs/acl.html.php:37
+#: lib/Mailbox.php:1689 templates/prefs/acl.html.php:37
#: templates/prefs/acl.html.php:72
msgid "Templates"
msgstr ""
@@ -4134,7 +4343,7 @@ msgstr ""
msgid "Tentatively Accept request"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:813
+#: lib/Mime/Viewer/Itip.php:814
msgid "Tentatively Accepted"
msgstr ""
@@ -4146,13 +4355,29 @@ msgstr ""
msgid "Text:"
msgstr ""
+#: templates/prefs/smimeprivatekey.html.php:59
+#, php-format
+msgid "The ID of your Certificate Set: %s"
+msgstr ""
+
+#: templates/prefs/smimeprivatekey.html.php:134
+#, php-format
+msgid "The ID of your Sign Certificate Set: %s"
+msgstr ""
+
+#: templates/prefs/smimeprivatekey.html.php:61
+#: templates/prefs/smimeprivatekey.html.php:136
+msgid "The ID of your Sign Certificate Set: not set in database"
+msgstr ""
+
#: lib/Ajax/Application/Handler/Dynamic.php:880
+#: lib/Ajax/Application/Handler/Dynamic.php:890
msgid ""
"The Message Disposition Notification was not sent. This is what the server "
"said"
msgstr ""
-#: lib/Ajax/Application/Handler/Dynamic.php:889
+#: lib/Ajax/Application/Handler/Dynamic.php:894
msgid "The Message Disposition Notification was sent successfully."
msgstr ""
@@ -4169,43 +4394,43 @@ msgstr ""
msgid "The current sent-mail mailbox(es) \"%s\" will be renamed."
msgstr ""
-#: lib/Mime/Viewer/Pgp.php:300
+#: lib/Mime/Viewer/Pgp.php:301
msgid ""
"The data in this part does not appear to be a valid PGP encrypted message. "
"Error: "
msgstr ""
-#: lib/Mime/Viewer/Pgp.php:260
+#: lib/Mime/Viewer/Pgp.php:261
msgid "The data in this part has been compressed via PGP."
msgstr ""
-#: lib/Mime/Viewer/Pgp.php:313 lib/Mime/Viewer/Pgp.php:417
+#: lib/Mime/Viewer/Pgp.php:314 lib/Mime/Viewer/Pgp.php:418
msgid "The data in this part has been digitally signed via PGP."
msgstr ""
-#: lib/Mime/Viewer/Smime.php:277
+#: lib/Mime/Viewer/Smime.php:337
msgid "The data in this part has been digitally signed via S/MIME."
msgstr ""
-#: lib/Mime/Viewer/Pgp.php:207
+#: lib/Mime/Viewer/Pgp.php:208
msgid ""
"The data in this part has been encrypted via PGP, however, PGP support is "
"disabled so the message cannot be decrypted."
msgstr ""
-#: lib/Mime/Viewer/Pgp.php:231 lib/Mime/Viewer/Pgp.php:262
+#: lib/Mime/Viewer/Pgp.php:232 lib/Mime/Viewer/Pgp.php:263
msgid "The data in this part has been encrypted via PGP."
msgstr ""
-#: lib/Mime/Viewer/Smime.php:165
+#: lib/Mime/Viewer/Smime.php:167
msgid "The data in this part has been encrypted via S/MIME."
msgstr ""
-#: config/prefs.php:531
+#: config/prefs.php:565
msgid "The default font family to use in the HTML editor."
msgstr ""
-#: config/prefs.php:540
+#: config/prefs.php:574
msgid "The default font size to use in the HTML editor (in pixels)."
msgstr ""
@@ -4230,6 +4455,12 @@ msgstr ""
msgid "The event was updated in your calendar."
msgstr ""
+#: lib/Ajax/Application/Handler/SwitchEncryption.php:55
+msgid ""
+"The following key from the address book is used for this identity if you "
+"want to use the address book only (without SMIME-keys):"
+msgstr ""
+
#: lib/Contents.php:626
msgid "The initial portion of this text part is displayed below."
msgstr ""
@@ -4259,7 +4490,7 @@ msgstr ""
msgid "The mailbox \"%s\" is already empty."
msgstr ""
-#: lib/Mailbox.php:825
+#: lib/Mailbox.php:828
#, php-format
msgid "The mailbox \"%s\" may not be deleted."
msgstr ""
@@ -4269,37 +4500,37 @@ msgstr ""
msgid "The mailbox \"%s\" may not be emptied."
msgstr ""
-#: lib/Mailbox.php:864
+#: lib/Mailbox.php:867
#, php-format
msgid "The mailbox \"%s\" may not be renamed."
msgstr ""
-#: lib/Mailbox.php:764
+#: lib/Mailbox.php:767
#, php-format
msgid "The mailbox \"%s\" was not created. This is what the server said"
msgstr ""
-#: lib/Mailbox.php:834
+#: lib/Mailbox.php:837
#, php-format
msgid "The mailbox \"%s\" was not deleted. This is what the server said"
msgstr ""
-#: lib/Mailbox.php:768
+#: lib/Mailbox.php:771
#, php-format
msgid "The mailbox \"%s\" was successfully created."
msgstr ""
-#: lib/Mailbox.php:831
+#: lib/Mailbox.php:834
#, php-format
msgid "The mailbox \"%s\" was successfully deleted."
msgstr ""
-#: lib/Mailbox.php:878
+#: lib/Mailbox.php:881
#, php-format
msgid "The mailbox \"%s\" was successfully renamed to \"%s\"."
msgstr ""
-#: lib/Mailbox.php:1399
+#: lib/Mailbox.php:1402
#, php-format
msgid "The mailbox %s is already empty."
msgstr ""
@@ -4426,7 +4657,7 @@ msgstr ""
msgid "There are no messages in this mailbox."
msgstr ""
-#: lib/Contents/Message.php:697
+#: lib/Contents/Message.php:696
msgid "There are no parts that can be shown inline."
msgstr ""
@@ -4451,7 +4682,7 @@ msgstr ""
msgid "There was an error deleting the event: %s"
msgstr ""
-#: lib/Indices.php:758
+#: lib/Indices.php:756
#, php-format
msgid "There was an error flagging messages in the mailbox \"%s\": %s."
msgstr ""
@@ -4487,7 +4718,7 @@ msgid ""
"server said"
msgstr ""
-#: lib/Compose.php:883
+#: lib/Compose.php:885
#, php-format
msgid "There was an error sending your message: %s"
msgstr ""
@@ -4508,7 +4739,7 @@ msgid ""
"There was an error updating the event: %s Trying to import the event instead."
msgstr ""
-#: lib/Ajax/Imple/ItipRequest.php:158 lib/Mime/Viewer/Itip.php:751
+#: lib/Ajax/Imple/ItipRequest.php:158 lib/Mime/Viewer/Itip.php:752
#, php-format
msgid "There was an error updating the task: %s"
msgstr ""
@@ -4526,7 +4757,7 @@ msgstr ""
msgid "This audio file is reported to be %s in length."
msgstr ""
-#: lib/Mime/Viewer/Pgp.php:440
+#: lib/Mime/Viewer/Pgp.php:441
msgid "This digitally signed message is broken."
msgstr ""
@@ -4600,7 +4831,7 @@ msgstr ""
msgid "This video file is reported to be %s in length."
msgstr ""
-#: config/prefs.php:1456 lib/Dynamic/Mailbox.php:261
+#: config/prefs.php:1497 lib/Dynamic/Mailbox.php:261
msgid "Thread"
msgstr ""
@@ -4620,8 +4851,8 @@ msgstr ""
msgid "Thread View"
msgstr ""
-#: lib/Basic/Contacts.php:97 lib/Basic/Search.php:63 lib/Compose.php:2755
-#: lib/Contents/View.php:220 lib/Dynamic/Mailbox.php:185
+#: lib/Basic/Contacts.php:97 lib/Basic/Search.php:63 lib/Compose.php:2757
+#: lib/Contents/View.php:222 lib/Dynamic/Mailbox.php:185
#: lib/Dynamic/Mailbox.php:259 lib/Smartmobile.php:187
#: templates/contacts/contacts.html.php:34
#: templates/dynamic/compose.html.php:114
@@ -4630,7 +4861,7 @@ msgstr ""
msgid "To"
msgstr ""
-#: config/prefs.php:1453
+#: config/prefs.php:1494
msgid "To Address"
msgstr ""
@@ -4658,7 +4889,7 @@ msgstr ""
msgid "Today, %s %s"
msgstr ""
-#: config/prefs.php:548
+#: config/prefs.php:582
msgid "Top"
msgstr ""
@@ -4666,7 +4897,7 @@ msgstr ""
msgid "Total"
msgstr ""
-#: lib/Mailbox.php:1721 lib/Mailbox.php:1803
+#: lib/Mailbox.php:1724 lib/Mailbox.php:1806
msgid "Trash"
msgstr ""
@@ -4704,7 +4935,7 @@ msgstr ""
msgid "Unhandled component of type: %s"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:860 lib/Pgp.php:831 lib/Pgp.php:832 lib/Pgp.php:833
+#: lib/Mime/Viewer/Itip.php:861 lib/Pgp.php:832 lib/Pgp.php:833 lib/Pgp.php:834
msgid "Unknown"
msgstr ""
@@ -4720,13 +4951,13 @@ msgstr ""
msgid "Unknown Sender"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:768
+#: lib/Mime/Viewer/Itip.php:769
msgid "Unknown Task"
msgstr ""
#: lib/Prefs/Special/PgpPrivateKey.php:65
-#: lib/Prefs/Special/SmimePrivateKey.php:113
-#: lib/Prefs/Special/SmimePrivateKey.php:115
+#: lib/Prefs/Special/SmimePrivateKey.php:304
+#: lib/Prefs/Special/SmimePrivateKey.php:306
msgid "Unload Passphrase"
msgstr ""
@@ -4739,6 +4970,14 @@ msgstr ""
msgid "Unseen"
msgstr ""
+#: templates/prefs/smimeprivatekey.html.php:97
+msgid "Unset Personal Certificate"
+msgstr ""
+
+#: templates/prefs/smimeprivatekey.html.php:171
+msgid "Unset Secondary Certificate"
+msgstr ""
+
#: lib/Dynamic/Mailbox.php:366
msgid "Unsubscribe"
msgstr ""
@@ -4757,7 +4996,7 @@ msgstr ""
msgid "Update in my calendar"
msgstr ""
-#: lib/Mime/Viewer/Itip.php:375 lib/Mime/Viewer/Itip.php:754
+#: lib/Mime/Viewer/Itip.php:375 lib/Mime/Viewer/Itip.php:755
msgid "Update respondent status"
msgstr ""
@@ -4766,6 +5005,10 @@ msgid "Update this event on my calendar"
msgstr ""
#: templates/pgp/import_key.html.php:37
+#: templates/smime/import_extra_key.html.php:11
+#: templates/smime/import_extra_key.html.php:43
+#: templates/smime/import_identity_key.html.php:11
+#: templates/smime/import_identity_key.html.php:43
#: templates/smime/import_personal_key.html.php:11
#: templates/smime/import_personal_key.html.php:43
#: templates/smime/import_public_key.html.php:22
@@ -4773,7 +5016,7 @@ msgid "Upload"
msgstr ""
#: lib/Ajax/Application/Handler/ComposeAttach.php:94
-#: lib/Ajax/Application/Handler/Dynamic.php:1088
+#: lib/Ajax/Application/Handler/Dynamic.php:1093
msgid "Uploading attachments has been disabled on this server."
msgstr ""
@@ -4785,7 +5028,7 @@ msgstr ""
msgid "Use Default Value"
msgstr ""
-#: config/prefs.php:1518
+#: config/prefs.php:1559
msgid "Use IMAP mailbox subscriptions?"
msgstr ""
@@ -4806,7 +5049,7 @@ msgstr ""
msgid "Use secure connection?"
msgstr ""
-#: config/prefs.php:686
+#: config/prefs.php:720
msgid "Use the charset of the original message when replying?"
msgstr ""
@@ -4842,11 +5085,13 @@ msgstr ""
msgid "Video"
msgstr ""
-#: lib/Prefs/Special/SmimePrivateKey.php:97
-#: lib/Prefs/Special/SmimePrivateKey.php:146
+#: lib/Prefs/Special/SmimePrivateKey.php:246
+#: lib/Prefs/Special/SmimePrivateKey.php:338
#: templates/prefs/pgpprivatekey.html.php:21
#: templates/prefs/pgpprivatekey.html.php:35
#: templates/prefs/pgppublickey.html.php:20
+#: templates/prefs/smimeprivatekey.html.php:233
+#: templates/prefs/smimeprivatekey.html.php:240
#: templates/prefs/smimepublickey.html.php:22
msgid "View"
msgstr ""
@@ -4856,8 +5101,13 @@ msgstr ""
msgid "View %s"
msgstr ""
+#: lib/Prefs/SwitchHandler.php:34
+#, php-format
+msgid "View %s Public Info"
+msgstr ""
+
#: lib/Prefs/Special/PgpPublicKey.php:77
-#: lib/Prefs/Special/SmimePublicKey.php:75
+#: lib/Prefs/Special/SmimePublicKey.php:77 lib/Prefs/SwitchHandler.php:33
#, php-format
msgid "View %s Public Key"
msgstr ""
@@ -4878,7 +5128,7 @@ msgstr ""
msgid "View Message"
msgstr ""
-#: lib/Mime/Viewer/Pdf.php:154
+#: lib/Mime/Viewer/Pdf.php:146
msgid "View PDF File"
msgstr ""
@@ -4886,7 +5136,7 @@ msgstr ""
msgid "View Personal Private Key"
msgstr ""
-#: lib/Prefs/Special/SmimePrivateKey.php:94
+#: lib/Prefs/Special/SmimePrivateKey.php:243
msgid "View Personal Public Certificate"
msgstr ""
@@ -4894,11 +5144,11 @@ msgstr ""
msgid "View Personal Public Key"
msgstr ""
-#: lib/Prefs/Special/SmimePrivateKey.php:143
+#: lib/Prefs/Special/SmimePrivateKey.php:335
msgid "View Secondary Personal Private Key"
msgstr ""
-#: lib/Prefs/Special/SmimePrivateKey.php:93
+#: lib/Prefs/Special/SmimePrivateKey.php:242
msgid "View Secondary Personal Public Certificate"
msgstr ""
@@ -4911,7 +5161,7 @@ msgstr ""
msgid "View Thread"
msgstr ""
-#: lib/Mime/Viewer/Smime.php:333
+#: lib/Mime/Viewer/Smime.php:393
msgid "View certificate details"
msgstr ""
@@ -4928,7 +5178,7 @@ msgstr ""
msgid "View event"
msgstr ""
-#: lib/Mime/Viewer/Pgp.php:381
+#: lib/Mime/Viewer/Pgp.php:382
msgid "View key details."
msgstr ""
@@ -4944,7 +5194,7 @@ msgstr ""
msgid "View the text of the original sent message."
msgstr ""
-#: config/prefs.php:970
+#: config/prefs.php:1005
msgid "Viewing"
msgstr ""
@@ -4972,7 +5222,7 @@ msgstr ""
msgid "Virtual Folder: %s"
msgstr ""
-#: lib/Dynamic/Mailbox.php:276 lib/Mailbox.php:1647
+#: lib/Dynamic/Mailbox.php:276 lib/Mailbox.php:1650
#: templates/flist/flist.html.php:27
msgid "Virtual Folders"
msgstr ""
@@ -4989,39 +5239,39 @@ msgstr ""
msgid "Warning"
msgstr ""
-#: config/prefs.php:596
+#: config/prefs.php:630
msgid ""
"What language(s) do you prefer replies to your messages to be in? (Hold down "
"the CTRL key when clicking to add multiple languages)"
msgstr ""
-#: config/prefs.php:1272
+#: config/prefs.php:1307
msgid "What to do with messages after they have been reported as innocent?"
msgstr ""
-#: config/prefs.php:1251
+#: config/prefs.php:1286
msgid "What to do with messages after they have been reported as spam?"
msgstr ""
-#: config/prefs.php:753
+#: config/prefs.php:787
msgid ""
"When forwarding a message in the body text, should the same format as the "
"original message be used?"
msgstr ""
-#: config/prefs.php:1440
+#: config/prefs.php:1481
msgid "When opening a mailbox for the first time, where do you want to start?"
msgstr ""
-#: config/prefs.php:682
+#: config/prefs.php:716
msgid "When replying, use the same format as the original message?"
msgstr ""
-#: config/prefs.php:551
+#: config/prefs.php:585
msgid "Where should the cursor be located in the compose text area by default?"
msgstr ""
-#: config/prefs.php:1079
+#: config/prefs.php:1114
msgid "Which message parts do you want to display in the summary?"
msgstr ""
@@ -5037,7 +5287,7 @@ msgstr ""
msgid "Years"
msgstr ""
-#: config/prefs.php:584 config/prefs.php:829 config/prefs.php:1529
+#: config/prefs.php:618 config/prefs.php:863 config/prefs.php:1570
msgid "Yes"
msgstr ""
@@ -5055,16 +5305,16 @@ msgstr ""
msgid "You are"
msgstr ""
-#: lib/Mailbox.php:737
+#: lib/Mailbox.php:740
msgid "You are not allowed to create mailboxes."
msgstr ""
-#: lib/Mailbox.php:745
+#: lib/Mailbox.php:748
#, php-format
msgid "You are not allowed to create more than %d mailboxes."
msgstr ""
-#: lib/Compose.php:1432
+#: lib/Compose.php:1434
#, php-format
msgid ""
"You are not allowed to send messages to more than %d recipient within %d "
@@ -5075,7 +5325,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: lib/Compose.php:1447
+#: lib/Compose.php:1449
#, php-format
msgid "You are not allowed to send messages to more than %d recipient."
msgid_plural "You are not allowed to send messages to more than %d recipients."
@@ -5092,7 +5342,7 @@ msgstr ""
msgid "You are replying to a mailing list"
msgstr ""
-#: lib/Mailbox.php:907
+#: lib/Mailbox.php:910
#, php-format
msgid "You cannot unsubscribe from \"%s\"."
msgstr ""
@@ -5117,7 +5367,7 @@ msgid_plural "You have %d new mail messages in %s."
msgstr[0] ""
msgstr[1] ""
-#: config/prefs.php:1145 config/prefs.php:1170
+#: config/prefs.php:1180 config/prefs.php:1205
msgid ""
"You have activated move to Trash but no Trash mailbox is defined. You will "
"be unable to delete messages until you set a Trash mailbox in the "
@@ -5149,17 +5399,17 @@ msgstr ""
msgid "You may not rename \"%s\"."
msgstr ""
-#: lib/Mime/Viewer/Pgp.php:273
+#: lib/Mime/Viewer/Pgp.php:274
msgid ""
"You must enter the passphrase for your PGP private key to view this message."
msgstr ""
-#: lib/Mime/Viewer/Smime.php:193
+#: lib/Mime/Viewer/Smime.php:195
msgid ""
"You must enter the passphrase for your S/MIME private key to view this data."
msgstr ""
-#: lib/Mime/Viewer/Pgp.php:241
+#: lib/Mime/Viewer/Pgp.php:242
msgid "You must enter the passphrase used to encrypt this message to view it."
msgstr ""
@@ -5193,32 +5443,32 @@ msgstr ""
msgid "You replied to this message via the mailing list on %s."
msgstr ""
-#: lib/Mailbox.php:917
+#: lib/Mailbox.php:920
#, php-format
msgid "You were not subscribed to \"%s\". Here is what the server said"
msgstr ""
-#: lib/Mailbox.php:919
+#: lib/Mailbox.php:922
#, php-format
msgid "You were not unsubscribed from \"%s\". Here is what the server said"
msgstr ""
-#: lib/Mailbox.php:955
+#: lib/Mailbox.php:958
#, php-format
msgid "You were successfully subscribed to \"%s\" and all subfolders."
msgstr ""
-#: lib/Mailbox.php:933
+#: lib/Mailbox.php:936
#, php-format
msgid "You were successfully subscribed to \"%s\"."
msgstr ""
-#: lib/Mailbox.php:956
+#: lib/Mailbox.php:959
#, php-format
msgid "You were successfully unsubscribed from \"%s\" and all subfolders."
msgstr ""
-#: lib/Mailbox.php:934
+#: lib/Mailbox.php:937
#, php-format
msgid "You were successfully unsubscribed from \"%s\"."
msgstr ""
@@ -5235,7 +5485,7 @@ msgstr ""
msgid "Your PGP Public/Private Keys"
msgstr ""
-#: templates/prefs/smimeprivatekey.html.php:30
+#: templates/prefs/smimeprivatekey.html.php:77
msgid "Your Private Certificate"
msgstr ""
@@ -5243,7 +5493,7 @@ msgstr ""
msgid "Your Private Key"
msgstr ""
-#: templates/prefs/smimeprivatekey.html.php:21
+#: templates/prefs/smimeprivatekey.html.php:68
msgid "Your Public Certificate"
msgstr ""
@@ -5255,28 +5505,28 @@ msgstr ""
msgid "Your Reply-to: address: (optional)"
msgstr ""
-#: templates/prefs/smimeprivatekey.html.php:4
+#: templates/prefs/smimeprivatekey.html.php:18
msgid "Your S/MIME Personal Certificate"
msgstr ""
-#: templates/prefs/smimeprivatekey.html.php:15
+#: templates/prefs/smimeprivatekey.html.php:35
#, php-format
msgid "Your S/MIME Personal Certificate has expired on %s at %s."
msgstr ""
-#: templates/prefs/smimeprivatekey.html.php:67
+#: templates/prefs/smimeprivatekey.html.php:151
msgid "Your Secondary Private Certificate"
msgstr ""
-#: templates/prefs/smimeprivatekey.html.php:58
+#: templates/prefs/smimeprivatekey.html.php:142
msgid "Your Secondary Public Certificate"
msgstr ""
-#: templates/prefs/smimeprivatekey.html.php:47
+#: templates/prefs/smimeprivatekey.html.php:105
msgid "Your Secondary S/MIME Personal Certificate"
msgstr ""
-#: templates/prefs/smimeprivatekey.html.php:52
+#: templates/prefs/smimeprivatekey.html.php:110
#, php-format
msgid "Your Secondary S/MIME Personal Certificate has expired on %s at %s."
msgstr ""
@@ -5287,7 +5537,7 @@ msgid ""
msgstr ""
#: lib/Ajax/Application/Handler/ComposeAttach.php:57
-#: lib/Ajax/Application/Handler/Dynamic.php:1091
+#: lib/Ajax/Application/Handler/Dynamic.php:1096
msgid ""
"Your attachment was not uploaded. Most likely, the file exceeded the maximum "
"size allowed by the server configuration."
@@ -5306,6 +5556,10 @@ msgid ""
"Your browser security settings don't permit direct access to the clipboard."
msgstr ""
+#: templates/prefs/smimeidentities.html.php:5
+msgid "Your currently set (default) identity: "
+msgstr ""
+
#: templates/prefs/encrypt.html.php:3
msgid "Your default encryption method for sending messages:"
msgstr ""
@@ -5340,7 +5594,7 @@ msgstr ""
msgid "Your signature:"
msgstr ""
-#: lib/Compose.php:2721 lib/Contents/Message.php:443 lib/Mailbox/Ui.php:119
+#: lib/Compose.php:2723 lib/Contents/Message.php:443 lib/Mailbox/Ui.php:119
#: lib/Prefs/AttribText.php:103
msgid "[No Subject]"
msgstr ""
@@ -5350,7 +5604,7 @@ msgstr ""
msgid "[Part stripped: Original part type: %s, name: %s]"
msgstr ""
-#: lib/Compose.php:3167
+#: lib/Compose.php:3169
msgid "[Truncated Text]"
msgstr ""
@@ -5367,7 +5621,7 @@ msgid_plural "and %d more mailboxes"
msgstr[0] ""
msgstr[1] ""
-#: lib/Compose.php:3336
+#: lib/Compose.php:3343
msgid "attachment"
msgstr ""
@@ -5393,11 +5647,15 @@ msgstr ""
msgid "from"
msgstr ""
-#: lib/Basic/Pgp.php:47 lib/Basic/Pgp.php:78 lib/Basic/Smime.php:291
+#: lib/Basic/Pgp.php:47 lib/Basic/Pgp.php:78 lib/Basic/Smime.php:409
msgid "key"
msgstr ""
-#: lib/Compose.php:3045
+#: templates/prefs/smimeidentities.html.php:12
+msgid "link to preferences"
+msgstr ""
+
+#: lib/Compose.php:3047
#, php-format
msgid "links will expire on %s"
msgstr ""
@@ -5431,18 +5689,18 @@ msgstr ""
msgid "months"
msgstr ""
-#: lib/Compose.php:1244
+#: lib/Compose.php:1246
msgid "name"
msgstr ""
#: lib/Search/Element/Autogenerated.php:61 lib/Search/Element/Bulk.php:53
#: lib/Search/Element/Header.php:57 lib/Search/Element/Mailinglist.php:52
-#: lib/Search/Element/Personal.php:70 lib/Search/Element/Recipient.php:69
+#: lib/Search/Element/Personal.php:71 lib/Search/Element/Recipient.php:70
#: lib/Search/Element/Text.php:62
msgid "not"
msgstr ""
-#: lib/Contents/View.php:67
+#: lib/Contents/View.php:69
#, php-format
msgid "part %s"
msgstr ""
diff --git a/locale/is/LC_MESSAGES/imp.mo b/locale/is/LC_MESSAGES/imp.mo
index 008c3e098..bbf263ff2 100644
Binary files a/locale/is/LC_MESSAGES/imp.mo and b/locale/is/LC_MESSAGES/imp.mo differ
diff --git a/locale/is/LC_MESSAGES/imp.po b/locale/is/LC_MESSAGES/imp.po
index 5e4f971c6..0a0bfcf0b 100644
--- a/locale/is/LC_MESSAGES/imp.po
+++ b/locale/is/LC_MESSAGES/imp.po
@@ -744,9 +744,8 @@ msgstr "Lækkandi"
msgid "Description"
msgstr "Lýsing"
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:65
-#: templates/smime/smime.inc:113
+#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
msgid "Details"
msgstr "Atriði"
@@ -2638,9 +2637,8 @@ msgid "Thread View"
msgstr "Efnisþráðshamur"
#: search.php:139 message.php:248 mailbox.php:585
-#: templates/mailbox/message_headers.inc:22
-#: templates/contacts/contacts.inc:219 templates/compose/recompose.inc:10
-#: templates/compose/redirect.inc:64
+#: templates/mailbox/message_headers.inc:22 templates/contacts/contacts.inc:219
+#: templates/compose/recompose.inc:10 templates/compose/redirect.inc:64
msgid "To"
msgstr "Til"
@@ -2727,9 +2725,9 @@ msgstr "Notandanafn"
msgid "Username:"
msgstr "Notandanafn:"
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151 templates/smime/smime.inc:65
-#: templates/smime/smime.inc:113 templates/smime/smime.inc:117
+#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
+#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
+#: templates/smime/smime.inc:117
msgid "View"
msgstr "Skoða"
@@ -2826,8 +2824,8 @@ msgstr "Þú ert um það bil að sækja póst fyrir eftirfarandi aðganga:"
#: templates/folders/folders_confirm.html:10
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr "Þú ert um það bil að eyða öllum skeytum í eftirfarandi möppu(m):"
#: templates/folders/folders_confirm.html:9
diff --git a/locale/it/LC_MESSAGES/imp.mo b/locale/it/LC_MESSAGES/imp.mo
index 4a0851d01..d09fe86ae 100644
Binary files a/locale/it/LC_MESSAGES/imp.mo and b/locale/it/LC_MESSAGES/imp.mo differ
diff --git a/locale/ja/LC_MESSAGES/imp.mo b/locale/ja/LC_MESSAGES/imp.mo
index 05286a423..b7878f60e 100644
Binary files a/locale/ja/LC_MESSAGES/imp.mo and b/locale/ja/LC_MESSAGES/imp.mo differ
diff --git a/locale/ja/LC_MESSAGES/imp.po b/locale/ja/LC_MESSAGES/imp.po
index bfffe00ca..f7e97dee6 100644
--- a/locale/ja/LC_MESSAGES/imp.po
+++ b/locale/ja/LC_MESSAGES/imp.po
@@ -68,8 +68,7 @@ msgstr[0] "%d 添付"
msgid "%d Attachments"
msgstr "%d 添付"
-#: lib/Basic/Mailbox.php:397 lib/Basic/Mailbox.php:398
-#: lib/Basic/Thread.php:180
+#: lib/Basic/Mailbox.php:397 lib/Basic/Mailbox.php:398 lib/Basic/Thread.php:180
#, php-format
msgid "%d Messages"
msgstr "%d 通のメッセージ"
@@ -933,9 +932,8 @@ msgstr "連絡先情報が添付できません：%s"
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:69
-#: templates/minimal/compose.html.php:59
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:69
-#: templates/prefs/remote.html.php:80
+#: templates/minimal/compose.html.php:59 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:69 templates/prefs/remote.html.php:80
#: templates/saveimage/saveimage.html.php:20
#: templates/search/search.html.php:103
#: templates/smartmobile/compose.html.php:50
@@ -1559,8 +1557,8 @@ msgid "Delegated"
msgstr "委任済み"
#: lib/Dynamic/Compose/Common.php:179 lib/Dynamic/Mailbox.php:325
-#: lib/Dynamic/Mailbox.php:356 lib/Imap/Acl.php:196
-#: lib/Minimal/Message.php:224 templates/basic/folders/actions.html.php:26
+#: lib/Dynamic/Mailbox.php:356 lib/Imap/Acl.php:196 lib/Minimal/Message.php:224
+#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:30 templates/prefs/acl.html.php:43
#: templates/prefs/acl.html.php:78 templates/prefs/pgppublickey.html.php:22
@@ -2093,8 +2091,7 @@ msgid "Expand Headers"
msgstr "ヘッダー拡大"
#: lib/Minimal/Compose.php:107 lib/Minimal/Compose.php:162
-#: templates/minimal/compose.html.php:58
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:58 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "名前を展開"
@@ -2229,8 +2226,7 @@ msgstr "フォルダ"
msgid "Folder Actions"
msgstr "フォルダ操作"
-#: lib/Basic/Folders.php:274
-#: templates/basic/folders/folders_confirm.html.php:6
+#: lib/Basic/Folders.php:274 templates/basic/folders/folders_confirm.html.php:6
msgid "Folder Actions - Confirmation"
msgstr "フォルダ操作 - 確認"
@@ -2313,8 +2309,7 @@ msgstr "_M差出人"
#: templates/basic/search/search-basic.html.php:16
#: templates/dynamic/compose.html.php:102
#: templates/dynamic/mailbox.html.php:128 templates/minimal/mailbox.html.php:9
-#: templates/smartmobile/search.html.php:11
-#: templates/thread/thread.html.php:21
+#: templates/smartmobile/search.html.php:11 templates/thread/thread.html.php:21
msgid "From"
msgstr "From"
@@ -3150,10 +3145,9 @@ msgstr "新規フラグ"
msgid "New Mail"
msgstr "新着メール"
-#: lib/Application.php:439 lib/Basic/Compose.php:207
-#: lib/Basic/Compose.php:1152 lib/Compose.php:2201 lib/Dynamic/Base.php:157
-#: lib/Dynamic/Compose.php:78 lib/Dynamic/Mailbox.php:109
-#: lib/Minimal/Base.php:88 lib/Smartmobile.php:177
+#: lib/Application.php:439 lib/Basic/Compose.php:207 lib/Basic/Compose.php:1152
+#: lib/Compose.php:2201 lib/Dynamic/Base.php:157 lib/Dynamic/Compose.php:78
+#: lib/Dynamic/Mailbox.php:109 lib/Minimal/Base.php:88 lib/Smartmobile.php:177
#: templates/dynamic/mailbox.html.php:54
#: templates/smartmobile/compose.html.php:2
#: templates/smartmobile/folders.html.php:13
@@ -3332,8 +3326,7 @@ msgid "Non Participant"
msgstr "参加者以外"
#: lib/Compose/Ui.php:223 lib/Mime/Viewer/Itip.php:388
-#: lib/Mime/Viewer/Itip.php:543
-#: templates/basic/search/search-basic.html.php:14
+#: lib/Mime/Viewer/Itip.php:543 templates/basic/search/search-basic.html.php:14
#: templates/basic/search/search-basic.html.php:31
#: templates/prefs/acl.html.php:38 templates/prefs/acl.html.php:73
#: templates/prefs/composetemplates.html.php:7
@@ -3868,13 +3861,12 @@ msgstr "繰り返す"
msgid "Redirec_t"
msgstr "_Tそのまま転送"
-#: lib/Basic/Compose.php:399 lib/Basic/Mailbox.php:685
-#: lib/Dynamic/Base.php:180 lib/Dynamic/Compose.php:148
-#: lib/Minimal/Compose.php:234 lib/Minimal/Compose.php:237
-#: lib/Minimal/Message.php:248 lib/Notification/Event/Status.php:32
+#: lib/Basic/Compose.php:399 lib/Basic/Mailbox.php:685 lib/Dynamic/Base.php:180
+#: lib/Dynamic/Compose.php:148 lib/Minimal/Compose.php:234
+#: lib/Minimal/Compose.php:237 lib/Minimal/Message.php:248
+#: lib/Notification/Event/Status.php:32
#: templates/basic/compose/redirect.html.php:51
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:55
msgid "Redirect"
msgid_plural "Redirect Messages"
@@ -4056,8 +4048,7 @@ msgid "Required Participant"
msgstr "必須参加者"
#: templates/basic/search/search-basic.html.php:50
-#: templates/contacts/contacts.html.php:25
-#: templates/search/search.html.php:106
+#: templates/contacts/contacts.html.php:25 templates/search/search.html.php:106
msgid "Reset"
msgstr "リセット"
@@ -4751,8 +4742,7 @@ msgstr "_J件名"
#: lib/Dynamic/Mailbox.php:186 lib/Dynamic/Mailbox.php:255
#: lib/Dynamic/Mailbox.php:491 lib/Message/Ui.php:39 lib/Smartmobile.php:181
#: templates/basic/search/search-basic.html.php:18
-#: templates/dynamic/compose.html.php:147
-#: templates/minimal/mailbox.html.php:10
+#: templates/dynamic/compose.html.php:147 templates/minimal/mailbox.html.php:10
#: templates/smartmobile/search.html.php:13
msgid "Subject"
msgstr "件名"
@@ -5210,8 +5200,7 @@ msgstr "予定情報は保存されました。"
msgid "There are no alternative parts that can be displayed inline."
msgstr "インライン表示可能な代替パートはありません。"
-#: lib/Dynamic/Mailbox.php:553
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:553 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "このメールボックスにはメールはありません。"
diff --git a/locale/km/LC_MESSAGES/imp.mo b/locale/km/LC_MESSAGES/imp.mo
index 41c8ef44a..8e336ba61 100644
Binary files a/locale/km/LC_MESSAGES/imp.mo and b/locale/km/LC_MESSAGES/imp.mo differ
diff --git a/locale/km/LC_MESSAGES/imp.po b/locale/km/LC_MESSAGES/imp.po
index 0763ea624..2891ef93d 100644
--- a/locale/km/LC_MESSAGES/imp.po
+++ b/locale/km/LC_MESSAGES/imp.po
@@ -4474,8 +4474,7 @@ msgstr "ថតនិមិ្មត \"%s\" ត្រូវបានប
#: lib/IMAP/Tree.php:132 lib/IMAP/Tree.php:145 lib/IMAP/Tree.php:147
#: lib/IMAP/Tree.php:151 lib/IMAP/Tree.php:152 lib/IMAP/Tree.php:613
-#: lib/IMAP/Tree.php:637 lib/IMAP/Tree.php:675
-#: templates/search/search.html:165
+#: lib/IMAP/Tree.php:637 lib/IMAP/Tree.php:675 templates/search/search.html:165
msgid "Virtual Folders"
msgstr "ថតនិមិ្មត"
@@ -4560,8 +4559,8 @@ msgstr "អ្នកទំនងជាទៅប្រមូលយក
#: templates/folders/folders_confirm.html:10
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr "អ្នកកំពុងប៉ុនប៉ងលុបសារទាំងអស់ ដែលមានក្នុងថតខាងក្រោម ។"
#: templates/folders/folders_confirm.html:9
diff --git a/locale/ko/LC_MESSAGES/imp.mo b/locale/ko/LC_MESSAGES/imp.mo
index acb8d34f1..0f06380ef 100644
Binary files a/locale/ko/LC_MESSAGES/imp.mo and b/locale/ko/LC_MESSAGES/imp.mo differ
diff --git a/locale/ko/LC_MESSAGES/imp.po b/locale/ko/LC_MESSAGES/imp.po
index ffd5477d5..9f206a197 100644
--- a/locale/ko/LC_MESSAGES/imp.po
+++ b/locale/ko/LC_MESSAGES/imp.po
@@ -45,8 +45,7 @@ msgstr "첨부파일 %d개"
msgid "%d Attachments"
msgstr "%d개의 첨부파일"
-#: lib/Basic/Mailbox.php:400 lib/Basic/Mailbox.php:401
-#: lib/Basic/Thread.php:180
+#: lib/Basic/Mailbox.php:400 lib/Basic/Mailbox.php:401 lib/Basic/Thread.php:180
#, php-format
msgid "%d Messages"
msgstr "%d개의 메시지"
@@ -696,9 +695,8 @@ msgstr "연락처 정보를 첨부할 수 없습니다: %s"
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:69
-#: templates/minimal/compose.html.php:56
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:69
-#: templates/prefs/remote.html.php:60
+#: templates/minimal/compose.html.php:56 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:69 templates/prefs/remote.html.php:60
#: templates/saveimage/saveimage.html.php:20
#: templates/search/search.html.php:103
#: templates/smartmobile/compose.html.php:47
@@ -1157,8 +1155,8 @@ msgid "Delegated"
msgstr "위임됨"
#: lib/Dynamic/Compose/Common.php:177 lib/Dynamic/Mailbox.php:322
-#: lib/Dynamic/Mailbox.php:353 lib/Imap/Acl.php:196
-#: lib/Minimal/Message.php:224 templates/basic/folders/actions.html.php:26
+#: lib/Dynamic/Mailbox.php:353 lib/Imap/Acl.php:196 lib/Minimal/Message.php:224
+#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:30 templates/prefs/acl.html.php:43
#: templates/prefs/acl.html.php:78 templates/prefs/pgppublickey.html.php:22
@@ -1590,8 +1588,7 @@ msgid "Expand Headers"
msgstr "머리글 펼치기"
#: lib/Minimal/Compose.php:107 lib/Minimal/Compose.php:162
-#: templates/minimal/compose.html.php:55
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:55 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "이름 펼치기"
@@ -1706,8 +1703,7 @@ msgstr "폴더"
msgid "Folder Actions"
msgstr "폴더 동작"
-#: lib/Basic/Folders.php:274
-#: templates/basic/folders/folders_confirm.html.php:6
+#: lib/Basic/Folders.php:274 templates/basic/folders/folders_confirm.html.php:6
msgid "Folder Actions - Confirmation"
msgstr "폴더 동작 - 확인"
@@ -1762,10 +1758,9 @@ msgstr "보내는 사람"
#: lib/Dynamic/Mailbox.php:251 lib/Dynamic/Mailbox.php:457
#: lib/Message/Ui.php:34 templates/basic/compose/compose.html.php:38
#: templates/basic/search/search-basic.html.php:16
-#: templates/dynamic/compose.html.php:98
-#: templates/dynamic/mailbox.html.php:116 templates/minimal/mailbox.html.php:9
-#: templates/smartmobile/search.html.php:11
-#: templates/thread/thread.html.php:21
+#: templates/dynamic/compose.html.php:98 templates/dynamic/mailbox.html.php:116
+#: templates/minimal/mailbox.html.php:9
+#: templates/smartmobile/search.html.php:11 templates/thread/thread.html.php:21
msgid "From"
msgstr "보내는 사람"
@@ -2433,10 +2428,9 @@ msgstr "새로운 깃발"
msgid "New Mail"
msgstr "새로운 메일"
-#: lib/Application.php:438 lib/Basic/Compose.php:207
-#: lib/Basic/Compose.php:1151 lib/Compose.php:2145 lib/Dynamic/Base.php:157
-#: lib/Dynamic/Compose.php:78 lib/Dynamic/Mailbox.php:108
-#: lib/Minimal/Base.php:88 lib/Smartmobile.php:179
+#: lib/Application.php:438 lib/Basic/Compose.php:207 lib/Basic/Compose.php:1151
+#: lib/Compose.php:2145 lib/Dynamic/Base.php:157 lib/Dynamic/Compose.php:78
+#: lib/Dynamic/Mailbox.php:108 lib/Minimal/Base.php:88 lib/Smartmobile.php:179
#: templates/dynamic/mailbox.html.php:54
#: templates/smartmobile/compose.html.php:2
#: templates/smartmobile/folders.html.php:13
@@ -2582,8 +2576,7 @@ msgid "No unread messages"
msgstr "읽지 않은 메시지가 없음"
#: lib/Compose/Ui.php:223 lib/Mime/Viewer/Itip.php:388
-#: lib/Mime/Viewer/Itip.php:543
-#: templates/basic/search/search-basic.html.php:14
+#: lib/Mime/Viewer/Itip.php:543 templates/basic/search/search-basic.html.php:14
#: templates/basic/search/search-basic.html.php:31
#: templates/prefs/acl.html.php:38 templates/prefs/acl.html.php:73
#: templates/prefs/composetemplates.html.php:7
@@ -2978,13 +2971,12 @@ msgstr "반복"
msgid "Redirec_t"
msgstr "재전송"
-#: lib/Basic/Compose.php:400 lib/Basic/Mailbox.php:688
-#: lib/Dynamic/Base.php:180 lib/Dynamic/Compose.php:150
-#: lib/Minimal/Compose.php:228 lib/Minimal/Compose.php:231
-#: lib/Minimal/Message.php:248 lib/Notification/Event/Status.php:32
+#: lib/Basic/Compose.php:400 lib/Basic/Mailbox.php:688 lib/Dynamic/Base.php:180
+#: lib/Dynamic/Compose.php:150 lib/Minimal/Compose.php:228
+#: lib/Minimal/Compose.php:231 lib/Minimal/Message.php:248
+#: lib/Notification/Event/Status.php:32
#: templates/basic/compose/redirect.html.php:51
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:55
msgid "Redirect"
msgid_plural "Redirect Messages"
@@ -3161,8 +3153,7 @@ msgid "Required Participant"
msgstr "필수 참가자"
#: templates/basic/search/search-basic.html.php:50
-#: templates/contacts/contacts.html.php:25
-#: templates/search/search.html.php:106
+#: templates/contacts/contacts.html.php:25 templates/search/search.html.php:106
msgid "Reset"
msgstr "초기화"
@@ -3737,8 +3728,7 @@ msgstr "제목"
#: lib/Dynamic/Mailbox.php:184 lib/Dynamic/Mailbox.php:253
#: lib/Dynamic/Mailbox.php:459 lib/Message/Ui.php:39 lib/Smartmobile.php:183
#: templates/basic/search/search-basic.html.php:18
-#: templates/dynamic/compose.html.php:142
-#: templates/minimal/mailbox.html.php:10
+#: templates/dynamic/compose.html.php:142 templates/minimal/mailbox.html.php:10
#: templates/smartmobile/search.html.php:13
msgid "Subject"
msgstr "제목"
@@ -4058,8 +4048,7 @@ msgstr "업로드된 파일을 열 수 없습니다."
msgid "The user's free/busy information was sucessfully stored."
msgstr "사용자의 한가함/바쁨 정보를 성공적으로 저장했습니다."
-#: lib/Dynamic/Mailbox.php:520
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:520 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "이 편지함에 메시지가 없습니다."
@@ -4873,12 +4862,6 @@ msgstr "타래글 표시"
msgid "_Whitelist"
msgstr "수신 허용"
-#: lib/Basic/Search.php:491
-#: lib/Notification/Handler/Decorator/NewmailNotify.php:98
-#: lib/Search/Filter.php:43 lib/Search/Query.php:270
-msgid "and"
-msgstr ""
-
#: lib/Compose.php:2990
msgid "attachment"
msgstr "첨부파일"
diff --git a/locale/lt/LC_MESSAGES/imp.mo b/locale/lt/LC_MESSAGES/imp.mo
index 6d3fa4710..57868bfc0 100644
Binary files a/locale/lt/LC_MESSAGES/imp.mo and b/locale/lt/LC_MESSAGES/imp.mo differ
diff --git a/locale/lt/LC_MESSAGES/imp.po b/locale/lt/LC_MESSAGES/imp.po
index 3e7efc5d3..8c98941b1 100644
--- a/locale/lt/LC_MESSAGES/imp.po
+++ b/locale/lt/LC_MESSAGES/imp.po
@@ -868,8 +868,7 @@ msgstr "Reklaminiai laiškai"
msgid "Cancel"
msgstr "Atšaukti"
-#: templates/imp/compose/compose.html:26
-#: templates/imp/compose/compose.html:167
+#: templates/imp/compose/compose.html:26 templates/imp/compose/compose.html:167
#: templates/imp/compose/redirect.html:45
msgid "Cancel Message"
msgstr "Atsisakyti laiško"
@@ -1428,9 +1427,8 @@ msgstr "Atstovaujamas"
#: lib/Imap/Acl.php:164 mailbox.php:555 message-dimp.php:176
#: message-mimp.php:267 message.php:512 templates/dimp/index.inc:137
#: templates/dimp/index.inc:370 templates/imp/contacts/contacts.html:60
-#: templates/imp/folders/actions.html:19
-#: templates/mimp/mailbox/mailbox.html:38 templates/prefs/pgppublickey.html:13
-#: templates/prefs/smimepublickey.html:13
+#: templates/imp/folders/actions.html:19 templates/mimp/mailbox/mailbox.html:38
+#: templates/prefs/pgppublickey.html:13 templates/prefs/smimepublickey.html:13
msgid "Delete"
msgstr "Ištrinti"
@@ -1553,8 +1551,7 @@ msgid "Description:"
msgstr "Aprašymas:"
#: templates/prefs/pgpprivatekey.html:19 templates/prefs/pgpprivatekey.html:30
-#: templates/prefs/pgppublickey.html:13
-#: templates/prefs/smimeprivatekey.html:19
+#: templates/prefs/pgppublickey.html:13 templates/prefs/smimeprivatekey.html:19
#: templates/prefs/smimepublickey.html:13
msgid "Details"
msgstr "Smulkiau"
@@ -2712,10 +2709,8 @@ msgstr "Pasiektas maksimalus prikabintų failų dydis."
msgid "Mbox or .eml file:"
msgstr "Mbox arba .eml failas:"
-#: templates/mimp/compose/compose.html:71
-#: templates/mimp/folders/folders.html:5
-#: templates/mimp/mailbox/mailbox.html:49
-#: templates/mimp/mailbox/search.html:14
+#: templates/mimp/compose/compose.html:71 templates/mimp/folders/folders.html:5
+#: templates/mimp/mailbox/mailbox.html:49 templates/mimp/mailbox/search.html:14
#: templates/mimp/message/message.html:32
msgid "Menu"
msgstr "Meniu"
@@ -3154,8 +3149,8 @@ msgstr "Pranešimas: susieti prikabinti failai buvo atsisiųsti"
msgid "OK"
msgstr "OK"
-#: lib/Search/Element/Or.php:31 search.php:500
-#: templates/pgp/import_key.html:30 templates/smime/import_key.html:31
+#: lib/Search/Element/Or.php:31 search.php:500 templates/pgp/import_key.html:30
+#: templates/smime/import_key.html:31
msgid "OR"
msgstr "ARBA"
@@ -3986,8 +3981,7 @@ msgid "Save Certificate in your Address Book"
msgstr "Išsaugoti sertifikatą savo adresų knygelėje"
#: compose-mimp.php:209 compose-mimp.php:212 compose-mimp.php:258
-#: templates/imp/compose/compose.html:24
-#: templates/imp/compose/compose.html:165
+#: templates/imp/compose/compose.html:24 templates/imp/compose/compose.html:165
#: templates/mimp/compose/compose.html:52
msgid "Save Draft"
msgstr "Išsaugoti juodraštį"
@@ -4174,8 +4168,7 @@ msgstr "Nusiųsti raktą į viešą raktų serverį"
msgid "Send Latest Information"
msgstr "Siųsti naujausią informaciją"
-#: templates/imp/compose/compose.html:21
-#: templates/imp/compose/compose.html:162
+#: templates/imp/compose/compose.html:21 templates/imp/compose/compose.html:162
msgid "Send Message"
msgstr "Siųsti laišką"
@@ -5233,8 +5226,7 @@ msgid "Type:"
msgstr "Tipas:"
#: lib/Quota/Command.php:92 lib/Quota/Hook.php:42 lib/Quota/Imap.php:52
-#: lib/Quota/Maildir.php:64 lib/Quota/Mdaemon.php:65
-#: lib/Quota/Mercury32.php:70
+#: lib/Quota/Maildir.php:64 lib/Quota/Mdaemon.php:65 lib/Quota/Mercury32.php:70
msgid "Unable to retrieve quota"
msgstr "Nepavyko apskaičiuoti naudojamos vietos"
@@ -5361,8 +5353,7 @@ msgid "Vertical Layout"
msgstr "Vertikalus išdėstymas"
#: templates/prefs/pgpprivatekey.html:19 templates/prefs/pgpprivatekey.html:30
-#: templates/prefs/pgppublickey.html:13
-#: templates/prefs/smimeprivatekey.html:19
+#: templates/prefs/pgppublickey.html:13 templates/prefs/smimeprivatekey.html:19
#: templates/prefs/smimeprivatekey.html:27
#: templates/prefs/smimepublickey.html:13
msgid "View"
@@ -5566,8 +5557,8 @@ msgstr "Taip"
#: templates/imp/folders/folders_confirm.html:11
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr "Jūs bandote ištrinti visus laiškus šiame(iuose) kataloge(uose)."
#: templates/imp/folders/folders_confirm.html:10
@@ -5822,8 +5813,8 @@ msgstr "Jūsų S/MIME viešasis/slaptasis sertifikatas"
msgid ""
"Your alias addresses: (optional, enter each address on a new line)"
msgstr ""
-"Kiti jūsų adresai: (nebūtina, kiekvieną adresą rašykite naujoje eilutėje)"
-""
+"Kiti jūsų adresai: (nebūtina, kiekvieną adresą rašykite naujoje "
+"eilutėje)"
#: lib/Mime/Viewer/Images.php:100
msgid "Your browser does not support inline display of this image type."
diff --git a/locale/lv/LC_MESSAGES/imp.mo b/locale/lv/LC_MESSAGES/imp.mo
index 5f6c9568b..8b8f15628 100644
Binary files a/locale/lv/LC_MESSAGES/imp.mo and b/locale/lv/LC_MESSAGES/imp.mo differ
diff --git a/locale/lv/LC_MESSAGES/imp.po b/locale/lv/LC_MESSAGES/imp.po
index 7720fbdf0..c80fbdc54 100644
--- a/locale/lv/LC_MESSAGES/imp.po
+++ b/locale/lv/LC_MESSAGES/imp.po
@@ -871,8 +871,8 @@ msgstr "Masveida vēstules"
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:70
-#: templates/minimal/compose.html.php:56
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:70
+#: templates/minimal/compose.html.php:56 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:70
#: templates/saveimage/saveimage.html.php:21
#: templates/search/search.html.php:107
#: templates/smartmobile/compose.html.php:41
@@ -940,8 +940,7 @@ msgstr "Nevar izdzēst MIME daļu, jo pastkaste pieejama tikai lasīšanai."
#: lib/Compose.php:2239 lib/Ui/Message.php:28 search.php:57
#: templates/contacts/contacts.html.php:43
-#: templates/dynamic/compose.html.php:98
-#: templates/dynamic/mailbox.html.php:128
+#: templates/dynamic/compose.html.php:98 templates/dynamic/mailbox.html.php:128
msgid "Cc"
msgstr "Cc"
@@ -1433,8 +1432,8 @@ msgstr "Noklusētais kārtošanas virziens:"
msgid "Delegated"
msgstr "Deleģēts"
-#: lib/Dynamic/Mailbox.php:318 lib/Dynamic/Mailbox.php:358
-#: lib/Imap/Acl.php:199 lib/Minimal/Message.php:228 lib/Smartmobile.php:159
+#: lib/Dynamic/Mailbox.php:318 lib/Dynamic/Mailbox.php:358 lib/Imap/Acl.php:199
+#: lib/Minimal/Message.php:228 lib/Smartmobile.php:159
#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:36 templates/prefs/acl.html.php:43
@@ -1933,8 +1932,7 @@ msgid "Expand Headers"
msgstr "Izvērst galvenes"
#: lib/Minimal/Compose.php:104 lib/Minimal/Compose.php:157
-#: templates/minimal/compose.html.php:55
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:55 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "Izvērst vārdus"
@@ -2108,14 +2106,12 @@ msgstr "Brīvs/Aizņemts pieprasījuma atbilde"
msgid "Fro_m"
msgstr "Sūtītājs"
-#: lib/Compose.php:2223 lib/Dynamic/Mailbox.php:189
-#: lib/Dynamic/Mailbox.php:255 lib/Dynamic/Mailbox.php:457
-#: lib/Ui/Message.php:26 search.php:45
+#: lib/Compose.php:2223 lib/Dynamic/Mailbox.php:189 lib/Dynamic/Mailbox.php:255
+#: lib/Dynamic/Mailbox.php:457 lib/Ui/Message.php:26 search.php:45
#: templates/basic/compose/compose.html.php:38
#: templates/basic/search/search-basic.html.php:17
#: templates/basic/thread/thread.html.php:19
-#: templates/dynamic/compose.html.php:77
-#: templates/dynamic/mailbox.html.php:116
+#: templates/dynamic/compose.html.php:77 templates/dynamic/mailbox.html.php:116
#: templates/minimal/mailbox.html.php:13
#: templates/smartmobile/search.html.php:12
msgid "From"
@@ -3196,8 +3192,7 @@ msgstr "Vēlamais dalībnieks"
msgid "Other"
msgstr "Cits"
-#: templates/dynamic/compose.html.php:66
-#: templates/dynamic/mailbox.html.php:106
+#: templates/dynamic/compose.html.php:66 templates/dynamic/mailbox.html.php:106
msgid "Other Options"
msgstr "Citi iestatījumi"
@@ -3652,8 +3647,7 @@ msgstr "Pāradresē_t"
#: lib/Minimal/Compose.php:223 lib/Minimal/Compose.php:226
#: lib/Minimal/Message.php:249 lib/Notification/Event/Status.php:32
#: mailbox.php:675 templates/basic/compose/redirect.html.php:53
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:29
msgid "Redirect"
msgstr "Pāradresēt"
@@ -3809,8 +3803,7 @@ msgid "Required Participant"
msgstr "Nepieciešamais dalībnieks"
#: templates/basic/search/search-basic.html.php:51
-#: templates/contacts/contacts.html.php:26
-#: templates/search/search.html.php:110
+#: templates/contacts/contacts.html.php:26 templates/search/search.html.php:110
msgid "Reset"
msgstr "Sākt no jauna"
@@ -4514,8 +4507,7 @@ msgstr "Temats"
#: lib/Dynamic/Mailbox.php:257 lib/Dynamic/Mailbox.php:459
#: lib/Smartmobile.php:170 lib/Ui/Message.php:31 search.php:65
#: templates/basic/search/search-basic.html.php:19
-#: templates/dynamic/compose.html.php:131
-#: templates/minimal/mailbox.html.php:14
+#: templates/dynamic/compose.html.php:131 templates/minimal/mailbox.html.php:14
#: templates/smartmobile/search.html.php:14
msgid "Subject"
msgstr "Temats"
@@ -4957,8 +4949,7 @@ msgstr "Lietotāja Brīvs/Aizņemts informācija saglabāta."
msgid "There are no alternative parts that can be displayed inline."
msgstr "Nav alternatīvo daļu, ko varētu parādīt iekļautā veidā."
-#: lib/Dynamic/Mailbox.php:509
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:509 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "Šajā pastkastē vēstuļu nav."
@@ -5132,13 +5123,12 @@ msgstr "Pavediena skatījums"
msgid "Thread View"
msgstr "Pavediena skatījums"
-#: lib/Compose.php:2235 lib/Dynamic/Mailbox.php:195
-#: lib/Dynamic/Mailbox.php:256 lib/Ui/Message.php:27 mailbox.php:717
-#: search.php:53 templates/basic/compose/redirect.html.php:32
+#: lib/Compose.php:2235 lib/Dynamic/Mailbox.php:195 lib/Dynamic/Mailbox.php:256
+#: lib/Ui/Message.php:27 mailbox.php:717 search.php:53
+#: templates/basic/compose/redirect.html.php:32
#: templates/basic/thread/thread.html.php:19
#: templates/contacts/contacts.html.php:41
-#: templates/dynamic/compose.html.php:88
-#: templates/dynamic/mailbox.html.php:124
+#: templates/dynamic/compose.html.php:88 templates/dynamic/mailbox.html.php:124
msgid "To"
msgstr "Saņēmējs"
@@ -5211,8 +5201,7 @@ msgid "Type"
msgstr "Tips"
#: lib/Quota/Command.php:90 lib/Quota/Hook.php:40 lib/Quota/Imap.php:50
-#: lib/Quota/Maildir.php:60 lib/Quota/Mdaemon.php:62
-#: lib/Quota/Mercury32.php:68
+#: lib/Quota/Maildir.php:60 lib/Quota/Mdaemon.php:62 lib/Quota/Mercury32.php:68
msgid "Unable to retrieve quota"
msgstr "Nevar noskaidrot kvotu"
@@ -5576,8 +5565,8 @@ msgstr "Jūs esat"
#: templates/basic/folders/folders_confirm.html.php:13
msgid ""
-"You are attempting to delete all messages contained in the following mailbox"
-"(es)."
+"You are attempting to delete all messages contained in the following "
+"mailbox(es)."
msgstr "Jūs mēģināt izdzēst visas vēstules sekojošā(s) mapē(s)."
#: templates/basic/folders/folders_confirm.html.php:11
diff --git a/locale/mk/LC_MESSAGES/imp.mo b/locale/mk/LC_MESSAGES/imp.mo
index 9d95e4601..4db3a85e3 100644
Binary files a/locale/mk/LC_MESSAGES/imp.mo and b/locale/mk/LC_MESSAGES/imp.mo differ
diff --git a/locale/nb/LC_MESSAGES/imp.mo b/locale/nb/LC_MESSAGES/imp.mo
index 915fde681..866204032 100644
Binary files a/locale/nb/LC_MESSAGES/imp.mo and b/locale/nb/LC_MESSAGES/imp.mo differ
diff --git a/locale/nb/LC_MESSAGES/imp.po b/locale/nb/LC_MESSAGES/imp.po
index c7a14c056..40fd3140e 100644
--- a/locale/nb/LC_MESSAGES/imp.po
+++ b/locale/nb/LC_MESSAGES/imp.po
@@ -1124,8 +1124,7 @@ msgid "Description"
msgstr "Beskrivelse"
#: templates/smime/smime.inc:65 templates/smime/smime.inc:113
-#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147
-#: templates/pgp/pgp.inc:151
+#: templates/pgp/pgp.inc:93 templates/pgp/pgp.inc:147 templates/pgp/pgp.inc:151
msgid "Details"
msgstr "Detaljer"
@@ -3847,8 +3846,8 @@ msgstr "Det oppstod en feil ved importering av hendelsen: %s."
#, php-format
msgid "There was an error importing user's free/busy information: %s."
msgstr ""
-"Det oppstod en feil ved importering av brukerens ledig/opptatt-informasjon: %"
-"s"
+"Det oppstod en feil ved importering av brukerens ledig/opptatt-informasjon: "
+"%s"
#: lib/Message.php:92
#, php-format
@@ -3978,9 +3977,8 @@ msgid "Thread View"
msgstr "Trådvisning"
#: message.php:255 mailbox.php:576 search.php:145
-#: templates/contacts/contacts.inc:221
-#: templates/mailbox/message_headers.inc:17 templates/compose/redirect.inc:64
-#: templates/compose/recompose.inc:10
+#: templates/contacts/contacts.inc:221 templates/mailbox/message_headers.inc:17
+#: templates/compose/redirect.inc:64 templates/compose/recompose.inc:10
msgid "To"
msgstr "Til"
diff --git a/locale/nl/LC_MESSAGES/imp.mo b/locale/nl/LC_MESSAGES/imp.mo
index bf55a9aa1..f62df99d6 100644
Binary files a/locale/nl/LC_MESSAGES/imp.mo and b/locale/nl/LC_MESSAGES/imp.mo differ
diff --git a/locale/nl/LC_MESSAGES/imp.po b/locale/nl/LC_MESSAGES/imp.po
index 980d087cf..fc97f9803 100644
--- a/locale/nl/LC_MESSAGES/imp.po
+++ b/locale/nl/LC_MESSAGES/imp.po
@@ -67,8 +67,7 @@ msgid_plural "%d Attachments"
msgstr[0] "%d Bijlage"
msgstr[1] "%d Bijlagen"
-#: lib/Basic/Mailbox.php:384 lib/Basic/Mailbox.php:385
-#: lib/Basic/Thread.php:165
+#: lib/Basic/Mailbox.php:384 lib/Basic/Mailbox.php:385 lib/Basic/Thread.php:165
#, php-format
msgid "%d Messages"
msgstr "%d Berichten"
@@ -419,8 +418,8 @@ msgid ""
"Additional headers to display when viewing: (enter each header on a new "
"line)"
msgstr ""
-"Extra koppen tonen bij weergave: (elke kop op een nieuwe regel invoeren)"
-""
+"Extra koppen tonen bij weergave: (elke kop op een nieuwe regel "
+"invoeren)"
#: lib/Basic/Compose.php:752 lib/Basic/Compose.php:867
#: lib/Basic/Contacts.php:117 templates/basic/compose/redirect.html.php:20
@@ -900,8 +899,8 @@ msgstr "Kan contact informatie niet toevoegen: %s"
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:69
-#: templates/minimal/compose.html.php:56
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:69
+#: templates/minimal/compose.html.php:56 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:69
#: templates/saveimage/saveimage.html.php:20
#: templates/search/search.html.php:107
#: templates/smartmobile/compose.html.php:47
@@ -1492,8 +1491,8 @@ msgid "Delegated"
msgstr "Overgedragen"
#: lib/Dynamic/Compose/Common.php:204 lib/Dynamic/Mailbox.php:302
-#: lib/Dynamic/Mailbox.php:336 lib/Imap/Acl.php:196
-#: lib/Minimal/Message.php:228 templates/basic/folders/actions.html.php:26
+#: lib/Dynamic/Mailbox.php:336 lib/Imap/Acl.php:196 lib/Minimal/Message.php:228
+#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:30 templates/prefs/acl.html.php:43
#: templates/prefs/acl.html.php:78 templates/prefs/pgppublickey.html.php:22
@@ -1801,8 +1800,8 @@ msgstr "Bewerk zoekterm"
msgid "Edit Template"
msgstr "Sjabloon bewerken"
-#: lib/Basic/Mailbox.php:415 lib/Dynamic/Mailbox.php:264
-#: lib/Imap/Tree.php:1761 templates/search/search.html.php:8
+#: lib/Basic/Mailbox.php:415 lib/Dynamic/Mailbox.php:264 lib/Imap/Tree.php:1761
+#: templates/search/search.html.php:8
msgid "Edit Virtual Folder"
msgstr "Bewerk virtuele map"
@@ -2018,8 +2017,7 @@ msgid "Expand Headers"
msgstr "Headers uitvouwen"
#: lib/Minimal/Compose.php:104 lib/Minimal/Compose.php:159
-#: templates/minimal/compose.html.php:55
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:55 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "Naamsuitbreiding"
@@ -2147,8 +2145,7 @@ msgstr "Map"
msgid "Folder Actions"
msgstr "Mapbewerking"
-#: lib/Basic/Folders.php:278
-#: templates/basic/folders/folders_confirm.html.php:6
+#: lib/Basic/Folders.php:278 templates/basic/folders/folders_confirm.html.php:6
msgid "Folder Actions - Confirmation"
msgstr "Mapbewerking - Bevestiging"
@@ -2232,10 +2229,9 @@ msgstr "_Van"
#: lib/Dynamic/Mailbox.php:240 lib/Dynamic/Mailbox.php:425
#: lib/Message/Ui.php:34 templates/basic/compose/compose.html.php:38
#: templates/basic/search/search-basic.html.php:16
-#: templates/dynamic/compose.html.php:95
-#: templates/dynamic/mailbox.html.php:116 templates/minimal/mailbox.html.php:9
-#: templates/smartmobile/search.html.php:11
-#: templates/thread/thread.html.php:21
+#: templates/dynamic/compose.html.php:95 templates/dynamic/mailbox.html.php:116
+#: templates/minimal/mailbox.html.php:9
+#: templates/smartmobile/search.html.php:11 templates/thread/thread.html.php:21
msgid "From"
msgstr "Van"
@@ -3039,10 +3035,9 @@ msgstr "Nieuwe vlag"
msgid "New Mail"
msgstr "Nieuwe mail"
-#: lib/Application.php:415 lib/Basic/Compose.php:208
-#: lib/Basic/Compose.php:1120 lib/Compose.php:1961 lib/Dynamic/Base.php:151
-#: lib/Dynamic/Compose.php:78 lib/Dynamic/Mailbox.php:104
-#: lib/Minimal/Base.php:88 lib/Smartmobile.php:171
+#: lib/Application.php:415 lib/Basic/Compose.php:208 lib/Basic/Compose.php:1120
+#: lib/Compose.php:1961 lib/Dynamic/Base.php:151 lib/Dynamic/Compose.php:78
+#: lib/Dynamic/Mailbox.php:104 lib/Minimal/Base.php:88 lib/Smartmobile.php:171
#: templates/dynamic/mailbox.html.php:54
#: templates/smartmobile/compose.html.php:2
#: templates/smartmobile/folders.html.php:13
@@ -3311,8 +3306,7 @@ msgstr "Extra deelnemer"
msgid "Other"
msgstr "Overig"
-#: templates/dynamic/compose.html.php:88
-#: templates/dynamic/mailbox.html.php:106
+#: templates/dynamic/compose.html.php:88 templates/dynamic/mailbox.html.php:106
msgid "Other Options"
msgstr "Overige opties"
@@ -3755,13 +3749,12 @@ msgstr "Geadresseerden (Aan/Cc/Bcc) voor '%s'"
msgid "Redirec_t"
msgstr "Om_leiden"
-#: lib/Basic/Compose.php:391 lib/Basic/Mailbox.php:669
-#: lib/Dynamic/Base.php:169 lib/Dynamic/Compose.php:160
-#: lib/Minimal/Compose.php:225 lib/Minimal/Compose.php:228
-#: lib/Minimal/Message.php:252 lib/Notification/Event/Status.php:32
+#: lib/Basic/Compose.php:391 lib/Basic/Mailbox.php:669 lib/Dynamic/Base.php:169
+#: lib/Dynamic/Compose.php:160 lib/Minimal/Compose.php:225
+#: lib/Minimal/Compose.php:228 lib/Minimal/Message.php:252
+#: lib/Notification/Event/Status.php:32
#: templates/basic/compose/redirect.html.php:51
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:36
msgid "Redirect"
msgstr "Omleiden"
@@ -3922,8 +3915,7 @@ msgid "Required Participant"
msgstr "Vereiste deelnemer"
#: templates/basic/search/search-basic.html.php:50
-#: templates/contacts/contacts.html.php:25
-#: templates/search/search.html.php:110
+#: templates/contacts/contacts.html.php:25 templates/search/search.html.php:110
msgid "Reset"
msgstr "Herstellen"
@@ -4626,8 +4618,7 @@ msgstr "Onde_rwerp"
#: lib/Dynamic/Mailbox.php:179 lib/Dynamic/Mailbox.php:242
#: lib/Dynamic/Mailbox.php:427 lib/Message/Ui.php:39 lib/Smartmobile.php:175
#: templates/basic/search/search-basic.html.php:18
-#: templates/dynamic/compose.html.php:139
-#: templates/minimal/mailbox.html.php:10
+#: templates/dynamic/compose.html.php:139 templates/minimal/mailbox.html.php:10
#: templates/smartmobile/search.html.php:13
msgid "Subject"
msgstr "Onderwerp"
@@ -5082,8 +5073,7 @@ msgstr "De vrij/bezet informatie van de gebruiker is met succes opgeslagen."
msgid "There are no alternative parts that can be displayed inline."
msgstr "Er zijn geen alternatieve onderdelen die weergegeven kunnen worden."
-#: lib/Dynamic/Mailbox.php:482
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:482 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "Er zijn geen berichten in deze map."
@@ -5737,8 +5727,8 @@ msgstr "U bent"
#: templates/basic/folders/folders_confirm.html.php:13
msgid ""
-"You are attempting to delete all messages contained in the following mailbox"
-"(es)."
+"You are attempting to delete all messages contained in the following "
+"mailbox(es)."
msgstr "U probeert alle berichten in de volgende map(pen) te verwijderen."
#: templates/basic/folders/folders_confirm.html.php:11
diff --git a/locale/nn/LC_MESSAGES/imp.mo b/locale/nn/LC_MESSAGES/imp.mo
index e914e15fb..16bfc1ff3 100644
Binary files a/locale/nn/LC_MESSAGES/imp.mo and b/locale/nn/LC_MESSAGES/imp.mo differ
diff --git a/locale/nn/LC_MESSAGES/imp.po b/locale/nn/LC_MESSAGES/imp.po
index 8e34082e4..acf2ce88e 100644
--- a/locale/nn/LC_MESSAGES/imp.po
+++ b/locale/nn/LC_MESSAGES/imp.po
@@ -1834,8 +1834,8 @@ msgid ""
"There was an error moving messages to the trash. This is what the server "
"said: %s"
msgstr ""
-"Problem ved flytting av meldingar til søppelkorga. Dette er kva tenaren sa: %"
-"s"
+"Problem ved flytting av meldingar til søppelkorga. Dette er kva tenaren sa: "
+"%s"
msgid "There was an error saving a draft."
msgstr "Problem ved lagring av kladd."
diff --git a/locale/pl/LC_MESSAGES/imp.mo b/locale/pl/LC_MESSAGES/imp.mo
index c02366911..669fef9d9 100644
Binary files a/locale/pl/LC_MESSAGES/imp.mo and b/locale/pl/LC_MESSAGES/imp.mo differ
diff --git a/locale/pl/LC_MESSAGES/imp.po b/locale/pl/LC_MESSAGES/imp.po
index c2974d0d7..66e115e94 100644
--- a/locale/pl/LC_MESSAGES/imp.po
+++ b/locale/pl/LC_MESSAGES/imp.po
@@ -80,8 +80,7 @@ msgstr[2] "%d Załączników"
msgid "%d Attachments"
msgstr "%d załączników"
-#: lib/Basic/Mailbox.php:399 lib/Basic/Mailbox.php:400
-#: lib/Basic/Thread.php:180
+#: lib/Basic/Mailbox.php:399 lib/Basic/Mailbox.php:400 lib/Basic/Thread.php:180
#, php-format
msgid "%d Messages"
msgstr "%d wiadomości"
@@ -965,9 +964,8 @@ msgstr "Nie można dołączyć informacji kontaktowych: %s?"
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:69
-#: templates/minimal/compose.html.php:56
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:69
-#: templates/prefs/remote.html.php:60
+#: templates/minimal/compose.html.php:56 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:69 templates/prefs/remote.html.php:60
#: templates/saveimage/saveimage.html.php:20
#: templates/search/search.html.php:103
#: templates/smartmobile/compose.html.php:47
@@ -1588,8 +1586,8 @@ msgid "Delegated"
msgstr "Oddelegowany"
#: lib/Dynamic/Compose/Common.php:177 lib/Dynamic/Mailbox.php:323
-#: lib/Dynamic/Mailbox.php:354 lib/Imap/Acl.php:196
-#: lib/Minimal/Message.php:224 templates/basic/folders/actions.html.php:26
+#: lib/Dynamic/Mailbox.php:354 lib/Imap/Acl.php:196 lib/Minimal/Message.php:224
+#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:30 templates/prefs/acl.html.php:43
#: templates/prefs/acl.html.php:78 templates/prefs/pgppublickey.html.php:22
@@ -2128,8 +2126,7 @@ msgid "Expand Headers"
msgstr "Rozwiń nazwy"
#: lib/Minimal/Compose.php:107 lib/Minimal/Compose.php:162
-#: templates/minimal/compose.html.php:55
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:55 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "Rozwiń nazwy"
@@ -2266,8 +2263,7 @@ msgstr "Folder"
msgid "Folder Actions"
msgstr "Działania na folderach"
-#: lib/Basic/Folders.php:274
-#: templates/basic/folders/folders_confirm.html.php:6
+#: lib/Basic/Folders.php:274 templates/basic/folders/folders_confirm.html.php:6
msgid "Folder Actions - Confirmation"
msgstr "Działania na folderze - potwierdzenie"
@@ -2351,10 +2347,9 @@ msgstr "Od"
#: lib/Dynamic/Mailbox.php:252 lib/Dynamic/Mailbox.php:460
#: lib/Message/Ui.php:34 templates/basic/compose/compose.html.php:38
#: templates/basic/search/search-basic.html.php:16
-#: templates/dynamic/compose.html.php:98
-#: templates/dynamic/mailbox.html.php:116 templates/minimal/mailbox.html.php:9
-#: templates/smartmobile/search.html.php:11
-#: templates/thread/thread.html.php:21
+#: templates/dynamic/compose.html.php:98 templates/dynamic/mailbox.html.php:116
+#: templates/minimal/mailbox.html.php:9
+#: templates/smartmobile/search.html.php:11 templates/thread/thread.html.php:21
msgid "From"
msgstr "Od"
@@ -3221,10 +3216,9 @@ msgstr "Nowy folder"
msgid "New Mail"
msgstr "Nowa poczta"
-#: lib/Application.php:438 lib/Basic/Compose.php:207
-#: lib/Basic/Compose.php:1150 lib/Compose.php:2166 lib/Dynamic/Base.php:157
-#: lib/Dynamic/Compose.php:78 lib/Dynamic/Mailbox.php:109
-#: lib/Minimal/Base.php:88 lib/Smartmobile.php:179
+#: lib/Application.php:438 lib/Basic/Compose.php:207 lib/Basic/Compose.php:1150
+#: lib/Compose.php:2166 lib/Dynamic/Base.php:157 lib/Dynamic/Compose.php:78
+#: lib/Dynamic/Mailbox.php:109 lib/Minimal/Base.php:88 lib/Smartmobile.php:179
#: templates/dynamic/mailbox.html.php:54
#: templates/smartmobile/compose.html.php:2
#: templates/smartmobile/folders.html.php:13
@@ -3405,8 +3399,7 @@ msgid "Non Participant"
msgstr "Nieuczestniczący"
#: lib/Compose/Ui.php:223 lib/Mime/Viewer/Itip.php:388
-#: lib/Mime/Viewer/Itip.php:543
-#: templates/basic/search/search-basic.html.php:14
+#: lib/Mime/Viewer/Itip.php:543 templates/basic/search/search-basic.html.php:14
#: templates/basic/search/search-basic.html.php:31
#: templates/prefs/acl.html.php:38 templates/prefs/acl.html.php:73
#: templates/prefs/composetemplates.html.php:7
@@ -3951,13 +3944,12 @@ msgstr "Powtarzalność"
msgid "Redirec_t"
msgstr "Przekieruj"
-#: lib/Basic/Compose.php:399 lib/Basic/Mailbox.php:687
-#: lib/Dynamic/Base.php:180 lib/Dynamic/Compose.php:148
-#: lib/Minimal/Compose.php:234 lib/Minimal/Compose.php:237
-#: lib/Minimal/Message.php:248 lib/Notification/Event/Status.php:32
+#: lib/Basic/Compose.php:399 lib/Basic/Mailbox.php:687 lib/Dynamic/Base.php:180
+#: lib/Dynamic/Compose.php:148 lib/Minimal/Compose.php:234
+#: lib/Minimal/Compose.php:237 lib/Minimal/Message.php:248
+#: lib/Notification/Event/Status.php:32
#: templates/basic/compose/redirect.html.php:51
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:55
msgid "Redirect"
msgid_plural "Redirect Messages"
@@ -4143,8 +4135,7 @@ msgid "Required Participant"
msgstr "Wymagane uczestnictwo"
#: templates/basic/search/search-basic.html.php:50
-#: templates/contacts/contacts.html.php:25
-#: templates/search/search.html.php:106
+#: templates/contacts/contacts.html.php:25 templates/search/search.html.php:106
msgid "Reset"
msgstr "Reset"
@@ -4859,8 +4850,7 @@ msgstr "Temat"
#: lib/Dynamic/Mailbox.php:185 lib/Dynamic/Mailbox.php:254
#: lib/Dynamic/Mailbox.php:462 lib/Message/Ui.php:39 lib/Smartmobile.php:183
#: templates/basic/search/search-basic.html.php:18
-#: templates/dynamic/compose.html.php:142
-#: templates/minimal/mailbox.html.php:10
+#: templates/dynamic/compose.html.php:142 templates/minimal/mailbox.html.php:10
#: templates/smartmobile/search.html.php:13
msgid "Subject"
msgstr "Temat"
@@ -5306,8 +5296,7 @@ msgstr "Wiadomość o dostępności użytkownika została zachowana."
msgid "There are no alternative parts that can be displayed inline."
msgstr "Nie ma alternatywnych części do wyświetlenia."
-#: lib/Dynamic/Mailbox.php:524
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:524 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "W tej skrzynce nie ma żadnych wiadomości."
diff --git a/locale/pt/LC_MESSAGES/imp.mo b/locale/pt/LC_MESSAGES/imp.mo
index 7c066d8f2..8e0c8a274 100644
Binary files a/locale/pt/LC_MESSAGES/imp.mo and b/locale/pt/LC_MESSAGES/imp.mo differ
diff --git a/locale/pt/LC_MESSAGES/imp.po b/locale/pt/LC_MESSAGES/imp.po
index 62c22811f..6bc6b293f 100644
--- a/locale/pt/LC_MESSAGES/imp.po
+++ b/locale/pt/LC_MESSAGES/imp.po
@@ -4667,8 +4667,8 @@ msgstr "Está a tentar descarregar correio da(s) seguinte(s) const(s):"
#: templates/folders/folders_confirm.html:10
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr ""
"Está a tentar remover todas as mensagens contidas na(s) seguinte(s) pasta(s)"
@@ -5089,8 +5089,7 @@ msgstr "Nome"
msgid "none"
msgstr "nenhum"
-#: templates/fetchmail/account_select.inc:25
-#: templates/compose/spelling.inc:106
+#: templates/fetchmail/account_select.inc:25 templates/compose/spelling.inc:106
msgid "or"
msgstr "ou"
diff --git a/locale/pt_BR/LC_MESSAGES/imp.mo b/locale/pt_BR/LC_MESSAGES/imp.mo
index ebf343927..52982b1a3 100644
Binary files a/locale/pt_BR/LC_MESSAGES/imp.mo and b/locale/pt_BR/LC_MESSAGES/imp.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/imp.po b/locale/pt_BR/LC_MESSAGES/imp.po
index 583a21410..364630e93 100644
--- a/locale/pt_BR/LC_MESSAGES/imp.po
+++ b/locale/pt_BR/LC_MESSAGES/imp.po
@@ -71,8 +71,7 @@ msgstr[1] "%d Anexos"
msgid "%d Attachments"
msgstr "%d Anexos"
-#: lib/Basic/Mailbox.php:397 lib/Basic/Mailbox.php:398
-#: lib/Basic/Thread.php:181
+#: lib/Basic/Mailbox.php:397 lib/Basic/Mailbox.php:398 lib/Basic/Thread.php:181
#, php-format
msgid "%d Messages"
msgstr "%d Mensagens"
@@ -976,9 +975,8 @@ msgstr "Impossível anexar informação de contato: %s"
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:69
-#: templates/minimal/compose.html.php:59
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:69
-#: templates/prefs/remote.html.php:80
+#: templates/minimal/compose.html.php:59 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:69 templates/prefs/remote.html.php:80
#: templates/saveimage/saveimage.html.php:20
#: templates/search/search.html.php:103
#: templates/smartmobile/compose.html.php:50
@@ -1619,8 +1617,8 @@ msgid "Delegated"
msgstr "Delegado"
#: lib/Dynamic/Compose/Common.php:186 lib/Dynamic/Mailbox.php:325
-#: lib/Dynamic/Mailbox.php:356 lib/Imap/Acl.php:196
-#: lib/Minimal/Message.php:224 templates/basic/folders/actions.html.php:26
+#: lib/Dynamic/Mailbox.php:356 lib/Imap/Acl.php:196 lib/Minimal/Message.php:224
+#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:30 templates/prefs/acl.html.php:43
#: templates/prefs/acl.html.php:78 templates/prefs/pgppublickey.html.php:22
@@ -2157,8 +2155,7 @@ msgid "Expand Headers"
msgstr "Expandir Cabeçalhos"
#: lib/Minimal/Compose.php:107 lib/Minimal/Compose.php:162
-#: templates/minimal/compose.html.php:58
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:58 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "Expandir Nomes"
@@ -2294,8 +2291,7 @@ msgstr "Pasta"
msgid "Folder Actions"
msgstr "Ações de Pasta"
-#: lib/Basic/Folders.php:274
-#: templates/basic/folders/folders_confirm.html.php:6
+#: lib/Basic/Folders.php:274 templates/basic/folders/folders_confirm.html.php:6
msgid "Folder Actions - Confirmation"
msgstr "Ações de Pastas - Confirmação"
@@ -2380,8 +2376,7 @@ msgstr "_De"
#: templates/basic/search/search-basic.html.php:16
#: templates/dynamic/compose.html.php:102
#: templates/dynamic/mailbox.html.php:128 templates/minimal/mailbox.html.php:9
-#: templates/smartmobile/search.html.php:11
-#: templates/thread/thread.html.php:21
+#: templates/smartmobile/search.html.php:11 templates/thread/thread.html.php:21
msgid "From"
msgstr "De"
@@ -3227,10 +3222,9 @@ msgstr "Nova Bandeira"
msgid "New Mail"
msgstr "Nova Mensagem"
-#: lib/Application.php:430 lib/Basic/Compose.php:207
-#: lib/Basic/Compose.php:1152 lib/Compose.php:2201 lib/Dynamic/Base.php:157
-#: lib/Dynamic/Compose.php:78 lib/Dynamic/Mailbox.php:109
-#: lib/Minimal/Base.php:88 lib/Smartmobile.php:177
+#: lib/Application.php:430 lib/Basic/Compose.php:207 lib/Basic/Compose.php:1152
+#: lib/Compose.php:2201 lib/Dynamic/Base.php:157 lib/Dynamic/Compose.php:78
+#: lib/Dynamic/Mailbox.php:109 lib/Minimal/Base.php:88 lib/Smartmobile.php:177
#: templates/dynamic/mailbox.html.php:54
#: templates/smartmobile/compose.html.php:2
#: templates/smartmobile/folders.html.php:13
@@ -3411,8 +3405,7 @@ msgid "Non Participant"
msgstr "Sem Participantes"
#: lib/Compose/Ui.php:223 lib/Mime/Viewer/Itip.php:388
-#: lib/Mime/Viewer/Itip.php:543
-#: templates/basic/search/search-basic.html.php:14
+#: lib/Mime/Viewer/Itip.php:543 templates/basic/search/search-basic.html.php:14
#: templates/basic/search/search-basic.html.php:31
#: templates/prefs/acl.html.php:38 templates/prefs/acl.html.php:73
#: templates/prefs/composetemplates.html.php:7
@@ -3958,13 +3951,12 @@ msgstr "Repetição"
msgid "Redirec_t"
msgstr "Redirec_ionar"
-#: lib/Basic/Compose.php:399 lib/Basic/Mailbox.php:685
-#: lib/Dynamic/Base.php:180 lib/Dynamic/Compose.php:148
-#: lib/Minimal/Compose.php:234 lib/Minimal/Compose.php:237
-#: lib/Minimal/Message.php:248 lib/Notification/Event/Status.php:32
+#: lib/Basic/Compose.php:399 lib/Basic/Mailbox.php:685 lib/Dynamic/Base.php:180
+#: lib/Dynamic/Compose.php:148 lib/Minimal/Compose.php:234
+#: lib/Minimal/Compose.php:237 lib/Minimal/Message.php:248
+#: lib/Notification/Event/Status.php:32
#: templates/basic/compose/redirect.html.php:51
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:55
msgid "Redirect"
msgid_plural "Redirect Messages"
@@ -4148,8 +4140,7 @@ msgid "Required Participant"
msgstr "Participante Obrigatório"
#: templates/basic/search/search-basic.html.php:50
-#: templates/contacts/contacts.html.php:25
-#: templates/search/search.html.php:106
+#: templates/contacts/contacts.html.php:25 templates/search/search.html.php:106
msgid "Reset"
msgstr "Limpar"
@@ -4852,8 +4843,7 @@ msgstr "_Assunto"
#: lib/Dynamic/Mailbox.php:186 lib/Dynamic/Mailbox.php:255
#: lib/Dynamic/Mailbox.php:491 lib/Message/Ui.php:39 lib/Smartmobile.php:181
#: templates/basic/search/search-basic.html.php:18
-#: templates/dynamic/compose.html.php:147
-#: templates/minimal/mailbox.html.php:10
+#: templates/dynamic/compose.html.php:147 templates/minimal/mailbox.html.php:10
#: templates/smartmobile/search.html.php:13
msgid "Subject"
msgstr "Assunto"
@@ -5318,8 +5308,7 @@ msgstr "A informação livre/ocupado do usuário foi armazenada com sucesso."
msgid "There are no alternative parts that can be displayed inline."
msgstr "Não existem partes alternativas que podem ser exibidas em linha."
-#: lib/Dynamic/Mailbox.php:553
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:553 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "Não existem mensagens nesta pasta."
diff --git a/locale/ro/LC_MESSAGES/imp.mo b/locale/ro/LC_MESSAGES/imp.mo
index 373079e6a..02125a747 100644
Binary files a/locale/ro/LC_MESSAGES/imp.mo and b/locale/ro/LC_MESSAGES/imp.mo differ
diff --git a/locale/ru/LC_MESSAGES/imp.mo b/locale/ru/LC_MESSAGES/imp.mo
index b602716d3..de6669012 100644
Binary files a/locale/ru/LC_MESSAGES/imp.mo and b/locale/ru/LC_MESSAGES/imp.mo differ
diff --git a/locale/ru/LC_MESSAGES/imp.po b/locale/ru/LC_MESSAGES/imp.po
index 19626763d..dfb0706f3 100644
--- a/locale/ru/LC_MESSAGES/imp.po
+++ b/locale/ru/LC_MESSAGES/imp.po
@@ -857,8 +857,8 @@ msgid "Bad login name or password."
msgstr "Пожалуйста, введите Ваши имя пользователя и пароль"
#: templates/contacts/contacts.inc:222 templates/compose/recompose.inc:20
-#: lib/Search.php:666 lib/UI/Message.php:28
-#: templates/contacts/contacts.html:43 templates/login/recompose.html:32
+#: lib/Search.php:666 lib/UI/Message.php:28 templates/contacts/contacts.html:43
+#: templates/login/recompose.html:32
msgid "Bcc"
msgstr "Bcc"
@@ -954,8 +954,8 @@ msgid "Cannot retrieve public key from cache."
msgstr "Неудачное соединение с сервером LDAP."
#: templates/contacts/contacts.inc:221 templates/compose/recompose.inc:15
-#: lib/Search.php:662 lib/UI/Message.php:27
-#: templates/contacts/contacts.html:42 templates/login/recompose.html:23
+#: lib/Search.php:662 lib/UI/Message.php:27 templates/contacts/contacts.html:42
+#: templates/login/recompose.html:23
msgid "Cc"
msgstr "Cc"
@@ -1486,8 +1486,7 @@ msgstr "Удалить виртуальную папку"
msgid "Delete Virtual Folder Definition for %s"
msgstr "Удалить папку(и)"
-#: templates/fetchmail/manage.inc:43
-#: templates/fetchmail/fetchmailprefs.html:86
+#: templates/fetchmail/manage.inc:43 templates/fetchmail/fetchmailprefs.html:86
msgid "Delete fetched messages from remote server?"
msgstr "Удалить принятые сообщения со стороннего сервера"
@@ -2003,8 +2002,7 @@ msgid "Fetch Mail in a separate window?"
msgstr "Собирать почту в отдельном окне."
# fuzzy
-#: templates/fetchmail/manage.inc:46
-#: templates/fetchmail/fetchmailprefs.html:89
+#: templates/fetchmail/manage.inc:46 templates/fetchmail/fetchmailprefs.html:89
msgid "Fetch messages upon logging on?"
msgstr "Принять сообщения при входе в систему"
@@ -2179,8 +2177,7 @@ msgstr "Адрес отправителя"
msgid "General Options"
msgstr "Общие настройки"
-#: templates/fetchmail/manage.inc:37
-#: templates/fetchmail/fetchmailprefs.html:80
+#: templates/fetchmail/manage.inc:37 templates/fetchmail/fetchmailprefs.html:80
msgid "Get only new messages? (IMAP only)"
msgstr "Получить только новые сообщения (для IMAP)"
@@ -2553,8 +2550,7 @@ msgid "Listing in the Header"
msgstr "В заголовке сообщения"
# fuzzy
-#: templates/fetchmail/manage.inc:30
-#: templates/fetchmail/fetchmailprefs.html:72
+#: templates/fetchmail/manage.inc:30 templates/fetchmail/fetchmailprefs.html:72
msgid "Local Mailbox:"
msgstr "Папка на локальном сервере:"
@@ -2655,8 +2651,7 @@ msgstr "Отметить как:"
msgid "Mark different levels of quoting with different colors?"
msgstr "Выделять цветами разные уровни цитирования"
-#: templates/fetchmail/manage.inc:40
-#: templates/fetchmail/fetchmailprefs.html:83
+#: templates/fetchmail/manage.inc:40 templates/fetchmail/fetchmailprefs.html:83
msgid "Mark messages as seen? (IMAP only)"
msgstr "Пометить сообщения как прочитанные (для IMAP)"
@@ -2726,8 +2721,7 @@ msgstr "Время отправки"
# fuzzy
#: config/prefs.php.dist:52 config/prefs.php.dist:70 config/prefs.php.dist:85
-#: config/prefs.php.dist:94 config/prefs.php.dist:102
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:94 config/prefs.php.dist:102 config/prefs.php.dist:110
msgid "Message Options"
msgstr "Настройки сообщений"
@@ -3719,8 +3713,7 @@ msgid "Remember the last view"
msgstr "Запомнить последнее состояние"
# fuzzy
-#: templates/fetchmail/manage.inc:27
-#: templates/fetchmail/fetchmailprefs.html:68
+#: templates/fetchmail/manage.inc:27 templates/fetchmail/fetchmailprefs.html:68
msgid "Remote Mailbox:"
msgstr "Папка на стороннем сервере:"
@@ -4119,8 +4112,8 @@ msgstr "Ошибка записи черновика. Сервер ответи
#: lib/Compose.php:203
#, fuzzy, php-format
msgid ""
-"Saving the draft failed. The %s header contains an invalid e-mail address: %"
-"s."
+"Saving the draft failed. The %s header contains an invalid e-mail address: "
+"%s."
msgstr "Ошибка записи черновика. Сервер ответил: %s"
#: lib/Compose.php:240
@@ -5008,8 +5001,7 @@ msgstr "Подпись успешно заменена."
msgid "There are no alternative parts that can be displayed."
msgstr "Сообщение в неверном формате и не может быть отображено"
-#: templates/mailbox/empty_mailbox.inc:3
-#: templates/mailbox/empty_mailbox.html:2
+#: templates/mailbox/empty_mailbox.inc:3 templates/mailbox/empty_mailbox.html:2
msgid "There are no messages in this mailbox."
msgstr "В этом ящике нет писем."
@@ -5385,8 +5377,7 @@ msgid "Username"
msgstr "Имя пользователя"
# fuzzy
-#: templates/fetchmail/manage.inc:17
-#: templates/fetchmail/fetchmailprefs.html:55
+#: templates/fetchmail/manage.inc:17 templates/fetchmail/fetchmailprefs.html:55
msgid "Username:"
msgstr "Имя пользователя"
@@ -5606,8 +5597,8 @@ msgstr "Вы хотите удалить следующие папки:"
# fuzzy
#: templates/folders/folders_confirm.html:10
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr "Вы пытаетесь удалить все сообщения в следующей папке:"
# fuzzy
@@ -6082,9 +6073,8 @@ msgstr "нет"
msgid "not"
msgstr "Нет"
-#: templates/fetchmail/account_select.inc:25
-#: templates/compose/spelling.inc:105 lib/Search.php:542
-#: templates/fetchmail/fetchmailprefs.html:26
+#: templates/fetchmail/account_select.inc:25 templates/compose/spelling.inc:105
+#: lib/Search.php:542 templates/fetchmail/fetchmailprefs.html:26
msgid "or"
msgstr "или"
diff --git a/locale/sk/LC_MESSAGES/imp.mo b/locale/sk/LC_MESSAGES/imp.mo
index 1babb18e0..09e8ab9ff 100644
Binary files a/locale/sk/LC_MESSAGES/imp.mo and b/locale/sk/LC_MESSAGES/imp.mo differ
diff --git a/locale/sk/LC_MESSAGES/imp.po b/locale/sk/LC_MESSAGES/imp.po
index 5e36c7a3c..7f6564b4f 100644
--- a/locale/sk/LC_MESSAGES/imp.po
+++ b/locale/sk/LC_MESSAGES/imp.po
@@ -73,8 +73,7 @@ msgstr[2] "%d Príloh"
msgid "%d Attachments"
msgstr "%d Prílohy"
-#: lib/Basic/Mailbox.php:399 lib/Basic/Mailbox.php:400
-#: lib/Basic/Thread.php:180
+#: lib/Basic/Mailbox.php:399 lib/Basic/Mailbox.php:400 lib/Basic/Thread.php:180
#, php-format
msgid "%d Messages"
msgstr "Správy (%d)"
@@ -964,9 +963,8 @@ msgstr "Nie je možné priložiť kontaktné informácie: %s"
#: templates/basic/folders/folders_confirm.html.php:27
#: templates/basic/folders/import.html.php:17
#: templates/contacts/contacts.html.php:69
-#: templates/minimal/compose.html.php:59
-#: templates/minimal/redirect.html.php:29 templates/pgp/import_key.html.php:69
-#: templates/prefs/remote.html.php:80
+#: templates/minimal/compose.html.php:59 templates/minimal/redirect.html.php:29
+#: templates/pgp/import_key.html.php:69 templates/prefs/remote.html.php:80
#: templates/saveimage/saveimage.html.php:20
#: templates/search/search.html.php:103
#: templates/smartmobile/compose.html.php:50
@@ -1255,10 +1253,6 @@ msgstr "Vytváranie šablón"
msgid "Compose Templates mailbox:"
msgstr "Priečinok pre šablóny:"
-#: lib/Dynamic/Compose/Common.php:253
-msgid "Compose action completed. You may now safely close this window."
-msgstr ""
-
#: config/prefs.php:599
msgid "Compose messages in a separate window?"
msgstr "Písať správy v novom okne?"
@@ -1601,8 +1595,8 @@ msgid "Delegated"
msgstr "Postúpené"
#: lib/Dynamic/Compose/Common.php:179 lib/Dynamic/Mailbox.php:325
-#: lib/Dynamic/Mailbox.php:356 lib/Imap/Acl.php:196
-#: lib/Minimal/Message.php:224 templates/basic/folders/actions.html.php:26
+#: lib/Dynamic/Mailbox.php:356 lib/Imap/Acl.php:196 lib/Minimal/Message.php:224
+#: templates/basic/folders/actions.html.php:26
#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
#: templates/minimal/mailbox.html.php:30 templates/prefs/acl.html.php:43
#: templates/prefs/acl.html.php:78 templates/prefs/pgppublickey.html.php:22
@@ -2137,8 +2131,7 @@ msgid "Expand Headers"
msgstr "Rozbaliť hlavičky"
#: lib/Minimal/Compose.php:107 lib/Minimal/Compose.php:162
-#: templates/minimal/compose.html.php:58
-#: templates/minimal/redirect.html.php:28
+#: templates/minimal/compose.html.php:58 templates/minimal/redirect.html.php:28
msgid "Expand Names"
msgstr "Rozbaliť mená"
@@ -2249,15 +2242,6 @@ msgstr "Čakajúce na odpoveď"
msgid "Flags"
msgstr "Príznaky"
-#: lib/Message.php:675
-#, php-format
-msgid ""
-"Flags were not changed for at least one message in the mailbox \"%s\" "
-"because the flags were altered by another connection to the mailbox prior to "
-"this request. You may redo the flag action if desired; this warning is "
-"precautionary to ensure you don't overwrite flag changes."
-msgstr ""
-
#: lib/Basic/Mailbox.php:682 lib/Basic/Message.php:603
msgid "Fo_rward"
msgstr "P_reposlať"
@@ -2270,8 +2254,7 @@ msgstr "Priečinok"
msgid "Folder Actions"
msgstr "Operácie v priečinkoch"
-#: lib/Basic/Folders.php:274
-#: templates/basic/folders/folders_confirm.html.php:6
+#: lib/Basic/Folders.php:274 templates/basic/folders/folders_confirm.html.php:6
msgid "Folder Actions - Confirmation"
msgstr "Operácie priečinka - potvrdenie"
@@ -2355,8 +2338,7 @@ msgstr "_Od"
#: templates/basic/search/search-basic.html.php:16
#: templates/dynamic/compose.html.php:102
#: templates/dynamic/mailbox.html.php:128 templates/minimal/mailbox.html.php:9
-#: templates/smartmobile/search.html.php:11
-#: templates/thread/thread.html.php:21
+#: templates/smartmobile/search.html.php:11 templates/thread/thread.html.php:21
msgid "From"
msgstr "Od"
@@ -3202,10 +3184,9 @@ msgstr "Nový príznak"
msgid "New Mail"
msgstr "Nová pošta"
-#: lib/Application.php:439 lib/Basic/Compose.php:207
-#: lib/Basic/Compose.php:1152 lib/Compose.php:2201 lib/Dynamic/Base.php:157
-#: lib/Dynamic/Compose.php:78 lib/Dynamic/Mailbox.php:109
-#: lib/Minimal/Base.php:88 lib/Smartmobile.php:177
+#: lib/Application.php:439 lib/Basic/Compose.php:207 lib/Basic/Compose.php:1152
+#: lib/Compose.php:2201 lib/Dynamic/Base.php:157 lib/Dynamic/Compose.php:78
+#: lib/Dynamic/Mailbox.php:109 lib/Minimal/Base.php:88 lib/Smartmobile.php:177
#: templates/dynamic/mailbox.html.php:54
#: templates/smartmobile/compose.html.php:2
#: templates/smartmobile/folders.html.php:13
@@ -3385,8 +3366,7 @@ msgid "Non Participant"
msgstr "Nie je účastník"
#: lib/Compose/Ui.php:223 lib/Mime/Viewer/Itip.php:388
-#: lib/Mime/Viewer/Itip.php:543
-#: templates/basic/search/search-basic.html.php:14
+#: lib/Mime/Viewer/Itip.php:543 templates/basic/search/search-basic.html.php:14
#: templates/basic/search/search-basic.html.php:31
#: templates/prefs/acl.html.php:38 templates/prefs/acl.html.php:73
#: templates/prefs/composetemplates.html.php:7
@@ -3931,13 +3911,12 @@ msgstr "Opakovanie"
msgid "Redirec_t"
msgstr "Pre_smerovať"
-#: lib/Basic/Compose.php:399 lib/Basic/Mailbox.php:687
-#: lib/Dynamic/Base.php:180 lib/Dynamic/Compose.php:148
-#: lib/Minimal/Compose.php:234 lib/Minimal/Compose.php:237
-#: lib/Minimal/Message.php:248 lib/Notification/Event/Status.php:32
+#: lib/Basic/Compose.php:399 lib/Basic/Mailbox.php:687 lib/Dynamic/Base.php:180
+#: lib/Dynamic/Compose.php:148 lib/Minimal/Compose.php:234
+#: lib/Minimal/Compose.php:237 lib/Minimal/Message.php:248
+#: lib/Notification/Event/Status.php:32
#: templates/basic/compose/redirect.html.php:51
-#: templates/dynamic/redirect.html.php:7
-#: templates/minimal/redirect.html.php:27
+#: templates/dynamic/redirect.html.php:7 templates/minimal/redirect.html.php:27
#: templates/smartmobile/message.html.php:55
msgid "Redirect"
msgid_plural "Redirect Messages"
@@ -4121,8 +4100,7 @@ msgid "Required Participant"
msgstr "Požadovaný účastník"
#: templates/basic/search/search-basic.html.php:50
-#: templates/contacts/contacts.html.php:25
-#: templates/search/search.html.php:106
+#: templates/contacts/contacts.html.php:25 templates/search/search.html.php:106
msgid "Reset"
msgstr "Vymazať formulár"
@@ -4826,8 +4804,7 @@ msgstr "P_redmet"
#: lib/Dynamic/Mailbox.php:186 lib/Dynamic/Mailbox.php:255
#: lib/Dynamic/Mailbox.php:491 lib/Message/Ui.php:39 lib/Smartmobile.php:181
#: templates/basic/search/search-basic.html.php:18
-#: templates/dynamic/compose.html.php:147
-#: templates/minimal/mailbox.html.php:10
+#: templates/dynamic/compose.html.php:147 templates/minimal/mailbox.html.php:10
#: templates/smartmobile/search.html.php:13
msgid "Subject"
msgstr "Predmet"
@@ -5294,8 +5271,7 @@ msgstr "Informácia o zaneprázdnenosti používateľa bola úspešne uložená.
msgid "There are no alternative parts that can be displayed inline."
msgstr "Nie sú k dispozícii žiadne alternatívne časti na zobrazenie."
-#: lib/Dynamic/Mailbox.php:553
-#: templates/basic/mailbox/empty_mailbox.html.php:6
+#: lib/Dynamic/Mailbox.php:553 templates/basic/mailbox/empty_mailbox.html.php:6
msgid "There are no messages in this mailbox."
msgstr "Tento priečinok je prázdny."
diff --git a/locale/sl/LC_MESSAGES/imp.mo b/locale/sl/LC_MESSAGES/imp.mo
index 7876349f0..6d92e3739 100644
Binary files a/locale/sl/LC_MESSAGES/imp.mo and b/locale/sl/LC_MESSAGES/imp.mo differ
diff --git a/locale/sl/LC_MESSAGES/imp.po b/locale/sl/LC_MESSAGES/imp.po
index 8e5b8745f..b56b95532 100644
--- a/locale/sl/LC_MESSAGES/imp.po
+++ b/locale/sl/LC_MESSAGES/imp.po
@@ -2232,8 +2232,7 @@ msgid "Message Date"
msgstr "Datum Sporočila"
#: config/prefs.php.dist:53 config/prefs.php.dist:70 config/prefs.php.dist:85
-#: config/prefs.php.dist:94 config/prefs.php.dist:102
-#: config/prefs.php.dist:110
+#: config/prefs.php.dist:94 config/prefs.php.dist:102 config/prefs.php.dist:110
msgid "Message Options"
msgstr "Možnosti Sporočila"
@@ -3359,8 +3358,7 @@ msgstr "Shrani sliko"
msgid "Save Image in Gallery"
msgstr "Shrani sliko v galerijo"
-#: filterprefs.php:112 templates/smime/smime.html:95
-#: templates/pgp/pgp.html:148
+#: filterprefs.php:112 templates/smime/smime.html:95 templates/pgp/pgp.html:148
msgid "Save Options"
msgstr "Shrani Možnosti"
@@ -3975,8 +3973,7 @@ msgstr "Nabiralnik %s je e prazen."
msgid "The message \"%s\" from \"%s\" (%d bytes) exceeds fetch size limit."
msgstr "Sporočilo \"%s\" iz \"%s\" (%d bytov) presega omejitev."
-#: templates/javascript/contacts.js:19
-#: templates/javascript/src/contacts.js:110
+#: templates/javascript/contacts.js:19 templates/javascript/src/contacts.js:110
msgid "The message being composed has been closed. Exiting."
msgstr "Sporočilo, ki ste ga sestavljali se je zaprlo. Izhod."
@@ -4309,8 +4306,7 @@ msgstr "Sporočilo k"
msgid "This server does not support sharing folders."
msgstr "Strežnik ne podpira skupne rabe map."
-#: templates/javascript/contacts.js:20
-#: templates/javascript/src/contacts.js:116
+#: templates/javascript/contacts.js:20 templates/javascript/src/contacts.js:116
msgid "This window must be called from a compose window."
msgstr "To okno morate odpreti iz okna za sestavljanje sporočila."
@@ -4670,8 +4666,8 @@ msgstr "Presneli si boste e-pošto z naslednjih računov:"
#: templates/folders/folders_confirm.html:10
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr "Izbrisali boste vsa sporočila v naslednjih mapah:"
#: templates/folders/folders_confirm.html:9
@@ -4707,8 +4703,8 @@ msgid ""
"You are not allowed to send messages to more than %d recipients within %d "
"hours."
msgstr ""
-"Ne nimate pravic poslati sporočila več kot %d prejemnikom hrati v obdobju %"
-"d ur."
+"Ne nimate pravic poslati sporočila več kot %d prejemnikom hrati v obdobju "
+"%d ur."
#: lib/Compose.php:1043
#, php-format
diff --git a/locale/sv/LC_MESSAGES/imp.mo b/locale/sv/LC_MESSAGES/imp.mo
index c14a513de..926d8892c 100644
Binary files a/locale/sv/LC_MESSAGES/imp.mo and b/locale/sv/LC_MESSAGES/imp.mo differ
diff --git a/locale/sv/LC_MESSAGES/imp.po b/locale/sv/LC_MESSAGES/imp.po
index eec888695..881c73627 100644
--- a/locale/sv/LC_MESSAGES/imp.po
+++ b/locale/sv/LC_MESSAGES/imp.po
@@ -908,8 +908,7 @@ msgstr "Bulk-meddelanden"
msgid "Cancel"
msgstr "Avbryt"
-#: templates/imp/compose/compose.html:26
-#: templates/imp/compose/compose.html:208
+#: templates/imp/compose/compose.html:26 templates/imp/compose/compose.html:208
msgid "Cancel Message"
msgstr "Avbyt meddelande"
@@ -1500,9 +1499,8 @@ msgstr "Delegerad"
#: message-mimp.php:265 message.php:523 templates/dimp/index.inc:142
#: templates/dimp/index.inc:275 templates/dimp/index.inc:386
#: templates/imp/contacts/contacts.html:60
-#: templates/imp/folders/actions.html:19
-#: templates/mimp/mailbox/mailbox.html:38 templates/prefs/pgppublickey.html:13
-#: templates/prefs/smimepublickey.html:13
+#: templates/imp/folders/actions.html:19 templates/mimp/mailbox/mailbox.html:38
+#: templates/prefs/pgppublickey.html:13 templates/prefs/smimepublickey.html:13
msgid "Delete"
msgstr "Radera"
@@ -1621,8 +1619,7 @@ msgid "Description:"
msgstr "Beskrivning:"
#: templates/prefs/pgpprivatekey.html:19 templates/prefs/pgpprivatekey.html:30
-#: templates/prefs/pgppublickey.html:13
-#: templates/prefs/smimeprivatekey.html:19
+#: templates/prefs/pgppublickey.html:13 templates/prefs/smimeprivatekey.html:19
#: templates/prefs/smimepublickey.html:13
msgid "Details"
msgstr "Detaljer"
@@ -2824,10 +2821,8 @@ msgstr "Maxstorlek för samtliga bilagor uppnådd."
msgid "Mbox or .eml file:"
msgstr "Mbox eller .eml-file:"
-#: templates/mimp/compose/compose.html:71
-#: templates/mimp/folders/folders.html:5
-#: templates/mimp/mailbox/mailbox.html:49
-#: templates/mimp/mailbox/search.html:14
+#: templates/mimp/compose/compose.html:71 templates/mimp/folders/folders.html:5
+#: templates/mimp/mailbox/mailbox.html:49 templates/mimp/mailbox/search.html:14
#: templates/mimp/message/message.html:32
msgid "Menu"
msgstr "Meny"
@@ -2943,10 +2938,6 @@ msgstr "Meddelande till"
msgid "Messages with Attachments"
msgstr "Meddelanden med bilagor"
-#: config/prefs.php:1284
-msgid "Minutes needed to consider a event as a non-conflicting one in iTip"
-msgstr ""
-
#: mobile.php:19
msgid "Mobile Mail"
msgstr "Mobil post"
@@ -3273,8 +3264,8 @@ msgstr "Notifiering: Länkad bilaga nerladdad"
msgid "OK"
msgstr "OK"
-#: lib/Search/Element/Or.php:31 search.php:496
-#: templates/pgp/import_key.html:30 templates/smime/import_key.html:31
+#: lib/Search/Element/Or.php:31 search.php:496 templates/pgp/import_key.html:30
+#: templates/smime/import_key.html:31
msgid "OR"
msgstr "eller"
@@ -4123,8 +4114,7 @@ msgid "Save Certificate in your Address Book"
msgstr "Spara certifikat i din adressbok"
#: compose-mimp.php:205 compose-mimp.php:208 compose-mimp.php:254
-#: templates/imp/compose/compose.html:24
-#: templates/imp/compose/compose.html:206
+#: templates/imp/compose/compose.html:24 templates/imp/compose/compose.html:206
#: templates/mimp/compose/compose.html:52
msgid "Save Draft"
msgstr "Spara utkast"
@@ -4319,8 +4309,7 @@ msgstr "Skicka nyckel till publik nyckelserver"
msgid "Send Latest Information"
msgstr "Skicka senaste informationen"
-#: templates/imp/compose/compose.html:21
-#: templates/imp/compose/compose.html:203
+#: templates/imp/compose/compose.html:21 templates/imp/compose/compose.html:203
msgid "Send Message"
msgstr "Skicka meddelande"
@@ -5419,8 +5408,7 @@ msgid "Type:"
msgstr "Typ:"
#: lib/Quota/Command.php:92 lib/Quota/Hook.php:42 lib/Quota/Imap.php:52
-#: lib/Quota/Maildir.php:64 lib/Quota/Mdaemon.php:65
-#: lib/Quota/Mercury32.php:70
+#: lib/Quota/Maildir.php:64 lib/Quota/Mdaemon.php:65 lib/Quota/Mercury32.php:70
msgid "Unable to retrieve quota"
msgstr "Kunde inte läsa quota"
@@ -5555,8 +5543,7 @@ msgid "Video part"
msgstr "Videodel"
#: templates/prefs/pgpprivatekey.html:19 templates/prefs/pgpprivatekey.html:30
-#: templates/prefs/pgppublickey.html:13
-#: templates/prefs/smimeprivatekey.html:19
+#: templates/prefs/pgppublickey.html:13 templates/prefs/smimeprivatekey.html:19
#: templates/prefs/smimeprivatekey.html:27
#: templates/prefs/smimepublickey.html:13
msgid "View"
@@ -5781,8 +5768,8 @@ msgstr "Du är"
#: templates/imp/folders/folders_confirm.html:11
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr "Du försöker raderas alla meddelande i följanden mapp(ar)."
#: templates/imp/folders/folders_confirm.html:10
@@ -6024,8 +6011,8 @@ msgstr "Ditt publika/privata S/MIME-certifikat"
msgid ""
"Your alias addresses: (optional, enter each address on a new line)"
msgstr ""
-"Dina alias adresser: (ej obligatoriskt, skriv varje adress på en ny rad)"
-""
+"Dina alias adresser: (ej obligatoriskt, skriv varje adress på en ny "
+"rad)"
#: lib/Mime/Viewer/Images.php:112
msgid "Your browser does not support inline display of this image type."
diff --git a/locale/th/LC_MESSAGES/imp.mo b/locale/th/LC_MESSAGES/imp.mo
index c43f74a69..0a79bb185 100644
Binary files a/locale/th/LC_MESSAGES/imp.mo and b/locale/th/LC_MESSAGES/imp.mo differ
diff --git a/locale/th/LC_MESSAGES/imp.po b/locale/th/LC_MESSAGES/imp.po
index d0a3e2d85..d2d8d3389 100644
--- a/locale/th/LC_MESSAGES/imp.po
+++ b/locale/th/LC_MESSAGES/imp.po
@@ -227,8 +227,7 @@ msgstr "สำเนาซ่อนถึง"
msgid "Blacklist"
msgstr "บัญชีดำ"
-#: filters.php:141 templates/filters/manage.inc:17
-#: templates/search/main.inc:62
+#: filters.php:141 templates/filters/manage.inc:17 templates/search/main.inc:62
msgid "Body"
msgstr "เนื้อหา"
@@ -1645,8 +1644,7 @@ msgstr "ตัวเลือกเกี่ยวกับผู้ใช้"
msgid "Username"
msgstr "ชื่อผู้ใช้"
-#: lib/IMP.php:936 lib/MIME/Viewer/enriched.php:177
-#: lib/MIME/Viewer/text.php:97
+#: lib/IMP.php:936 lib/MIME/Viewer/enriched.php:177 lib/MIME/Viewer/text.php:97
#, c-format
msgid "View %s"
msgstr "แสดง %s"
diff --git a/locale/tr/LC_MESSAGES/imp.mo b/locale/tr/LC_MESSAGES/imp.mo
index a04a8c580..99038c209 100644
Binary files a/locale/tr/LC_MESSAGES/imp.mo and b/locale/tr/LC_MESSAGES/imp.mo differ
diff --git a/locale/tr/LC_MESSAGES/imp.po b/locale/tr/LC_MESSAGES/imp.po
index 13ce1bb8c..24c4ba26b 100644
--- a/locale/tr/LC_MESSAGES/imp.po
+++ b/locale/tr/LC_MESSAGES/imp.po
@@ -19,11 +19,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: folders.php:352 mailbox.php:361
-#, php-format
-msgid " (Accesskey %s)"
-msgstr ""
-
#: lib/Notification/Handler/Decorator/NewmailNotify.php:72
msgid " and "
msgstr "ve"
@@ -152,11 +147,6 @@ msgstr "%s şunun için '%s'"
msgid "%s has cancelled \"%s\"."
msgstr "%s iptal edildi \"%s\"."
-#: lib/Mime/Viewer/Itip.php:657
-#, php-format
-msgid "%s has cancelled an instance of the recurring \"%s\"."
-msgstr ""
-
#: lib/Mime/Viewer/Itip.php:497
#, php-format
msgid "%s has replied to a free/busy request."
@@ -182,11 +172,6 @@ msgstr "%s posta kutusu ay başında yeniden adlandırılıyor."
msgid "%s part"
msgstr "%s parça"
-#: lib/Spam.php:144
-#, php-format
-msgid "%s report from %s"
-msgstr ""
-
#: lib/Mime/Viewer/Itip.php:493
#, php-format
msgid "%s requests your free/busy information."
@@ -333,10 +318,6 @@ msgstr "500 karakter"
msgid "6 hours"
msgstr "6 saat"
-#: lib/Mime/Viewer/Pgp.php:321
-msgid "A PGP Public Key is attached to the message."
-msgstr ""
-
#: templates/dimp/index.inc:525
msgid "A left click"
msgstr "Bir sol tık"
@@ -375,20 +356,6 @@ msgid "A right-click on a message or a folder will display available actions."
msgstr ""
"Bir iletiye yada dizine sağ tıklayarak eylemleri görüntüleyebilirsiniz."
-#: lib/Prefs/Ui.php:693
-#, php-format
-msgid "ACL for \"%s\" successfully created for the mailbox \"%s\"."
-msgstr ""
-
-#: lib/Prefs/Ui.php:718
-#, php-format
-msgid "ACL rights for \"%s\" updated for the mailbox \"%s\"."
-msgstr ""
-
-#: lib/Imap/Acl.php:26
-msgid "ACLs not configured for this server."
-msgstr ""
-
#: lib/Mime/Viewer/Itip.php:624
msgid "Accept and add to my calendar"
msgstr "Onayla ve takvimime ekle"
@@ -471,8 +438,8 @@ msgid ""
"Additional headers to display when viewing: (enter each header on a new "
"line)"
msgstr ""
-"Görüntülenecek ilave başlıklar: (herbir başlığı yeni bir satırda girin.)"
-""
+"Görüntülenecek ilave başlıklar: (herbir başlığı yeni bir satırda "
+"girin.)"
#: compose.php:744 compose.php:745 compose.php:891 contacts.php:117
#: templates/imp/contacts/contacts.html:8
@@ -572,10 +539,6 @@ msgstr "Dizin Yaratılmasına İzin Verilsin mi?"
msgid "Allow filter rules to be applied in any mailbox?"
msgstr "Süzgeç kuralları herhangi bir posta kutusuna uygulansın mı? "
-#: templates/dimp/index.inc:534
-msgid "Alt"
-msgstr ""
-
#: config/prefs.php:303
msgid "Always"
msgstr "Her zaman"
@@ -904,8 +867,7 @@ msgstr "Toplu İletiler"
msgid "Cancel"
msgstr "İptal"
-#: templates/imp/compose/compose.html:26
-#: templates/imp/compose/compose.html:208
+#: templates/imp/compose/compose.html:26 templates/imp/compose/compose.html:208
msgid "Cancel Message"
msgstr "İletiyi iptal et"
@@ -949,10 +911,6 @@ msgstr "Açık anahtarı iletiden çekilemiyor."
msgid "Cannot save sent-mail message to \"%s\" as that mailbox is read-only."
msgstr "Gönderilen ileti \"%s\" dizinine kaydedilemiyor. Dizin salt-okunur."
-#: lib/Message.php:475
-msgid "Cannot strip the MIME part as the mailbox is read-only."
-msgstr ""
-
#: lib/Compose.php:2095 lib/Ui/Message.php:29 search.php:56
#: templates/dimp/index.inc:224 templates/imp/contacts/contacts.html:43
msgid "Cc"
@@ -1015,10 +973,6 @@ msgstr "Tümü_nü İşaretle/İşaretleme"
msgid "Check for New Mail"
msgstr "Yeni İleti için Denetle"
-#: config/prefs.php:1333
-msgid "Check for valid recipient PGP public keys while replying?"
-msgstr ""
-
#: config/prefs.php:202
msgid "Check spelling before sending a message?"
msgstr "İleti göndermeden önce yazım denetimi uygulansın mı?"
@@ -1317,10 +1271,6 @@ msgstr "Posta Kutusu açılamıyor."
msgid "Could not remove rights for user \"%s\" for the mailbox \"%s\"."
msgstr "\"%s\" kullanıcısının \"%s\" dizinindeki izin silinemedi."
-#: lib/Imap/Acl.php:53
-msgid "Could not retrieve ACL"
-msgstr ""
-
#: lib/Ui/Compose.php:175
msgid "Could not retrieve message data from the mail server."
msgstr "Sunucudan ileti verisi alınamıyor"
@@ -1492,9 +1442,8 @@ msgstr "Yetkili"
#: message-mimp.php:265 message.php:523 templates/dimp/index.inc:142
#: templates/dimp/index.inc:275 templates/dimp/index.inc:386
#: templates/imp/contacts/contacts.html:60
-#: templates/imp/folders/actions.html:19
-#: templates/mimp/mailbox/mailbox.html:38 templates/prefs/pgppublickey.html:13
-#: templates/prefs/smimepublickey.html:13
+#: templates/imp/folders/actions.html:19 templates/mimp/mailbox/mailbox.html:38
+#: templates/prefs/pgppublickey.html:13 templates/prefs/smimepublickey.html:13
msgid "Delete"
msgstr "Sil"
@@ -1612,8 +1561,7 @@ msgid "Description:"
msgstr "Açıklama:"
#: templates/prefs/pgpprivatekey.html:19 templates/prefs/pgpprivatekey.html:30
-#: templates/prefs/pgppublickey.html:13
-#: templates/prefs/smimeprivatekey.html:19
+#: templates/prefs/pgppublickey.html:13 templates/prefs/smimeprivatekey.html:19
#: templates/prefs/smimepublickey.html:13
msgid "Details"
msgstr "Ayrıntılar"
@@ -1769,10 +1717,6 @@ msgstr "ÖRNEK"
msgid "Edit"
msgstr "Düzenle"
-#: templates/dimp/index.inc:298
-msgid "Edit ACL"
-msgstr ""
-
#: templates/imp/search/search.html:11
msgid "Edit Filter"
msgstr "Süzgeci Düzenle"
@@ -2433,12 +2377,6 @@ msgid "Imported %d message from %s."
msgid_plural "Imported %d messages from %s"
msgstr[0] "%d ileti %s konumundan içeri aktarıldı."
-#: pgp.php:67
-msgid ""
-"Imported key contains your PGP private key. Only add your public key in the "
-"first step!"
-msgstr ""
-
#: message.php:550 templates/dimp/index.inc:405
#: templates/dimp/message/message.html:135
msgid "In Body Text"
@@ -2802,10 +2740,8 @@ msgstr "En büyük ek boyutuna ulaşıldı."
msgid "Mbox or .eml file:"
msgstr "Mbox yada .eml dosyası"
-#: templates/mimp/compose/compose.html:71
-#: templates/mimp/folders/folders.html:5
-#: templates/mimp/mailbox/mailbox.html:49
-#: templates/mimp/mailbox/search.html:14
+#: templates/mimp/compose/compose.html:71 templates/mimp/folders/folders.html:5
+#: templates/mimp/mailbox/mailbox.html:49 templates/mimp/mailbox/search.html:14
#: templates/mimp/message/message.html:32
msgid "Menu"
msgstr "Menü"
@@ -3017,10 +2953,6 @@ msgstr "En az bir tane alıcı adresi girilmeli"
msgid "Needs Action"
msgstr "Eylem Gerekiyor"
-#: templates/prefs/acl.html:28
-msgid "Negative Right"
-msgstr ""
-
#: config/prefs.php:301 config/prefs.php:523 config/prefs.php:761
#: config/prefs.php:846 config/prefs.php:877
msgid "Never"
@@ -3250,8 +3182,8 @@ msgstr "Bildirim: Bağlı ek indirildi"
msgid "OK"
msgstr "Tamam"
-#: lib/Search/Element/Or.php:31 search.php:496
-#: templates/pgp/import_key.html:30 templates/smime/import_key.html:31
+#: lib/Search/Element/Or.php:31 search.php:496 templates/pgp/import_key.html:30
+#: templates/smime/import_key.html:31
msgid "OR"
msgstr "VEYA"
@@ -4102,8 +4034,7 @@ msgid "Save Certificate in your Address Book"
msgstr "Sertifikaları Adres Defterine Kaydet"
#: compose-mimp.php:205 compose-mimp.php:208 compose-mimp.php:254
-#: templates/imp/compose/compose.html:24
-#: templates/imp/compose/compose.html:206
+#: templates/imp/compose/compose.html:24 templates/imp/compose/compose.html:206
#: templates/mimp/compose/compose.html:52
msgid "Save Draft"
msgstr "Taslağı Kaydet"
@@ -4294,8 +4225,7 @@ msgstr "Anahtarı Açık Anahtar Sunucusuna Gönder"
msgid "Send Latest Information"
msgstr "Son Bilgileri Gönder"
-#: templates/imp/compose/compose.html:21
-#: templates/imp/compose/compose.html:203
+#: templates/imp/compose/compose.html:21 templates/imp/compose/compose.html:203
msgid "Send Message"
msgstr "İleti Gönder"
@@ -5384,17 +5314,12 @@ msgstr "Çöp"
msgid "Trash folder:"
msgstr "Çöp Kutusu:"
-#: lib/Mime/Viewer/Itip.php:187
-msgid "Trying to import the event instead."
-msgstr ""
-
#: templates/imp/search/search.html:93
msgid "Type:"
msgstr "Tip:"
#: lib/Quota/Command.php:92 lib/Quota/Hook.php:42 lib/Quota/Imap.php:52
-#: lib/Quota/Maildir.php:64 lib/Quota/Mdaemon.php:65
-#: lib/Quota/Mercury32.php:70
+#: lib/Quota/Maildir.php:64 lib/Quota/Mdaemon.php:65 lib/Quota/Mercury32.php:70
msgid "Unable to retrieve quota"
msgstr "Kota belirlenemedi"
@@ -5525,8 +5450,7 @@ msgid "Video part"
msgstr "Video Kısmı"
#: templates/prefs/pgpprivatekey.html:19 templates/prefs/pgpprivatekey.html:30
-#: templates/prefs/pgppublickey.html:13
-#: templates/prefs/smimeprivatekey.html:19
+#: templates/prefs/pgppublickey.html:13 templates/prefs/smimeprivatekey.html:19
#: templates/prefs/smimeprivatekey.html:27
#: templates/prefs/smimepublickey.html:13
msgid "View"
@@ -5747,8 +5671,8 @@ msgstr "Siz"
#: templates/imp/folders/folders_confirm.html:11
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr "Seçilmiş dizinlerdeki bütün iletileri silmeye çalışıyorsunuz."
#: templates/imp/folders/folders_confirm.html:10
@@ -5797,11 +5721,6 @@ msgstr "Yeniden adlandırılan dizin:"
msgid "You are replying to a mailing list"
msgstr "E-posta listesine cevapla"
-#: templates/dimp/javascript_defs.php:185
-#, php-format
-msgid "You can snooze it for %s or %s dismiss %s it entirely"
-msgstr ""
-
#: templates/prefs/stationery.html:44
msgid ""
"You can use the following placeholders in the stationery text: %c for the "
diff --git a/locale/uk/LC_MESSAGES/imp.mo b/locale/uk/LC_MESSAGES/imp.mo
index eca95af0a..0099475b6 100644
Binary files a/locale/uk/LC_MESSAGES/imp.mo and b/locale/uk/LC_MESSAGES/imp.mo differ
diff --git a/locale/uk/LC_MESSAGES/imp.po b/locale/uk/LC_MESSAGES/imp.po
index dc1ca550e..d03ffc48e 100644
--- a/locale/uk/LC_MESSAGES/imp.po
+++ b/locale/uk/LC_MESSAGES/imp.po
@@ -1,7 +1,7 @@
# IMP Ukrainian translation.
# Copyright
# Andriy Kopystyansky , 2015
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: IMP 7.0.0\n"
@@ -171,16 +171,6 @@ msgstr "%s для '%s'"
msgid "%s has cancelled \"%s\"."
msgstr "%s скасував \"%s\"."
-#: lib/Mime/Viewer/Itip.php:380
-#, php-format
-msgid "%s has cancelled an instance of the recurring \"%s\"."
-msgstr ""
-
-#: lib/Mime/Viewer/Itip.php:375
-#, php-format
-msgid "%s has cancelled multiple instances of the recurring \"%s\"."
-msgstr ""
-
#: lib/Mime/Viewer/Itip.php:207
#, php-format
msgid "%s has replied to a free/busy request."
@@ -241,11 +231,6 @@ msgstr "%s успішно додано до \"%s\"."
msgid "%s was successfully added to your address book."
msgstr "%s успішно доданий до Вашого адресника."
-#: lib/Mime/Viewer/Itip.php:336
-#, php-format
-msgid "%s wishes to amend \"%s\"."
-msgstr ""
-
#: lib/Mime/Viewer/Itip.php:712
#, php-format
msgid "%s wishes to assign you \"%s\"."
@@ -535,14 +520,6 @@ msgstr "Дозволити перегляд папок?"
msgid "Allow mailbox creation?"
msgstr "Дозволити створення скриньок?"
-#: lib/Perms.php:45
-msgid "Allow remote account access?"
-msgstr ""
-
-#: lib/Perms.php:103
-msgid "Allow viewing of message source?"
-msgstr ""
-
#: config/prefs.php:1084
msgid "Always prompt"
msgstr "Завжди питати"
@@ -745,15 +722,10 @@ msgstr "Очікування відповіді"
msgid "Back to Multiple Message View Index"
msgstr "Назад до огляду списку листів"
-#: lib/Perms.php:116
-msgid "Backends"
-msgstr ""
-
#: lib/Basic/Contacts.php:99 lib/Basic/Search.php:71
#: templates/contacts/contacts.html.php:37
#: templates/dynamic/compose.html.php:130
-#: templates/dynamic/mailbox.html.php:152
-#: templates/dynamic/message.html.php:96
+#: templates/dynamic/mailbox.html.php:152 templates/dynamic/message.html.php:96
msgid "Bcc"
msgstr "Bcc"
@@ -767,12 +739,6 @@ msgstr "Перед '%s'"
msgid "Between '%s' and '%s'"
msgstr "Між '%s' i '%s'"
-#: lib/Mime/Viewer/Html.php:180
-msgid ""
-"Beware of following any links in it or of providing the sender with any "
-"personal information."
-msgstr ""
-
#: lib/Dynamic/Mailbox.php:326 lib/Dynamic/Mailbox.php:427
msgid "Blacklist"
msgstr "Чорний список"
@@ -810,9 +776,8 @@ msgstr "Листи-сміття"
msgid "Can't attach contact information: %s"
msgstr "Не можу причепити Вашу контактну інформацію: %s"
-#: templates/contacts/contacts.html.php:58
-#: templates/pgp/import_key.html.php:69 templates/prefs/remote.html.php:80
-#: templates/saveimage/saveimage.html.php:20
+#: templates/contacts/contacts.html.php:58 templates/pgp/import_key.html.php:69
+#: templates/prefs/remote.html.php:80 templates/saveimage/saveimage.html.php:20
#: templates/search/search.html.php:102
#: templates/smartmobile/compose.html.php:50
#: templates/smartmobile/copymove.html.php:20
@@ -870,8 +835,7 @@ msgstr "Не можу врізати частину, оскільки скрин
#: lib/Contents/View.php:221 lib/Smartmobile.php:172
#: templates/contacts/contacts.html.php:36
#: templates/dynamic/compose.html.php:122
-#: templates/dynamic/mailbox.html.php:148
-#: templates/dynamic/message.html.php:92
+#: templates/dynamic/mailbox.html.php:148 templates/dynamic/message.html.php:92
msgid "Cc"
msgstr "Cc"
@@ -1034,10 +998,6 @@ msgstr "Колір"
msgid "Color Picker"
msgstr "Піпетка кольору"
-#: config/prefs.php:1530
-msgid "Combine all namespaces"
-msgstr ""
-
#: lib/Pgp.php:760 templates/prefs/pgpprivatekey.html.php:65
msgid "Comment"
msgstr "Коментар"
@@ -1060,10 +1020,6 @@ msgstr "Створення чернеток"
msgid "Compose Templates mailbox:"
msgstr "Скринька шаблонів створення:"
-#: lib/Dynamic/Compose/Common.php:254
-msgid "Compose action completed. You may now safely close this window."
-msgstr ""
-
#: config/prefs.php:472
msgid "Composition"
msgstr "Створення"
@@ -1196,8 +1152,8 @@ msgstr "Не можу показати дані додатку."
msgid "Could not find remote server configuration."
msgstr "Не можу знайти конфігурацію віддаленого сервера."
-#: lib/Basic/Listinfo.php:36 lib/Basic/Saveimage.php:43
-#: lib/Basic/Thread.php:48 lib/Dynamic/Maillog.php:59
+#: lib/Basic/Listinfo.php:36 lib/Basic/Saveimage.php:43 lib/Basic/Thread.php:48
+#: lib/Dynamic/Maillog.php:59
msgid "Could not load message."
msgstr "Не можу завантажити листа."
@@ -1324,8 +1280,7 @@ msgstr "Дані"
#: config/prefs.php:1438 lib/Basic/Search.php:91 lib/Compose.php:2715
#: lib/Contents/View.php:218 lib/Dynamic/Mailbox.php:199
-#: templates/dynamic/mailbox.html.php:136
-#: templates/dynamic/message.html.php:75
+#: templates/dynamic/mailbox.html.php:136 templates/dynamic/message.html.php:75
msgid "Date"
msgstr "Дата"
@@ -1375,9 +1330,9 @@ msgstr "Делеговані"
#: lib/Dynamic/Compose/Common.php:178 lib/Dynamic/Mailbox.php:329
#: lib/Dynamic/Mailbox.php:359 lib/Imap/Acl.php:196
-#: templates/dynamic/mailbox.html.php:51
-#: templates/dynamic/message.html.php:29 templates/prefs/acl.html.php:44
-#: templates/prefs/acl.html.php:79 templates/prefs/pgppublickey.html.php:22
+#: templates/dynamic/mailbox.html.php:51 templates/dynamic/message.html.php:29
+#: templates/prefs/acl.html.php:44 templates/prefs/acl.html.php:79
+#: templates/prefs/pgppublickey.html.php:22
#: templates/prefs/smimepublickey.html.php:24
#: templates/smartmobile/mailbox.html.php:37
#: templates/smartmobile/mailbox.html.php:45
@@ -1531,8 +1486,8 @@ msgstr "Не показувати частини"
msgid "Don't Show"
msgstr "Не показувати"
-#: lib/Contents.php:834 lib/Mime/Viewer/Tgz.php:120
-#: lib/Mime/Viewer/Zip.php:130 templates/mime/compressed.html.php:10
+#: lib/Contents.php:834 lib/Mime/Viewer/Tgz.php:120 lib/Mime/Viewer/Zip.php:130
+#: templates/mime/compressed.html.php:10
msgid "Download"
msgstr "Скачати"
@@ -1578,8 +1533,7 @@ msgstr "Опустіть файл сюди, щоб прикріпити."
msgid "E-Mail"
msgstr "E-пошта"
-#: templates/prefs/pgpprivatekey.html.php:76
-#: templates/prefs/remote.html.php:9
+#: templates/prefs/pgpprivatekey.html.php:76 templates/prefs/remote.html.php:9
msgid "E-mail Address"
msgstr "Адреса е-пошти"
@@ -1944,15 +1898,6 @@ msgstr "Помічено для слідування"
msgid "Flags"
msgstr "Мітки"
-#: lib/Indices.php:739
-#, php-format
-msgid ""
-"Flags were not changed for at least one message in the mailbox \"%s\" "
-"because the flags were altered by another connection to the mailbox prior to "
-"this request. You may redo the flag action if desired; this warning is "
-"precautionary to ensure you don't overwrite flag changes."
-msgstr ""
-
#: lib/Mailbox.php:1765
msgid "Folder"
msgstr "Папка"
@@ -2033,10 +1978,8 @@ msgstr "Відповідь на запит вільний/занятий"
#: lib/Dynamic/Mailbox.php:179 lib/Dynamic/Mailbox.php:258
#: lib/Dynamic/Mailbox.php:489 lib/Smartmobile.php:175
#: templates/dynamic/compose.html.php:102
-#: templates/dynamic/mailbox.html.php:140
-#: templates/dynamic/message.html.php:84
-#: templates/smartmobile/search.html.php:11
-#: templates/thread/thread.html.php:21
+#: templates/dynamic/mailbox.html.php:140 templates/dynamic/message.html.php:84
+#: templates/smartmobile/search.html.php:11 templates/thread/thread.html.php:21
msgid "From"
msgstr "Від"
@@ -2279,8 +2222,7 @@ msgstr "Дані про персональний публічний сертиф
msgid "Information on Personal Public Key"
msgstr "Дані про персональний публічний ключ"
-#: templates/dynamic/mailbox.html.php:41
-#: templates/dynamic/message.html.php:24
+#: templates/dynamic/mailbox.html.php:41 templates/dynamic/message.html.php:24
#: templates/smartmobile/mailbox.html.php:39
#: templates/smartmobile/mailbox.html.php:51
#: templates/smartmobile/message.html.php:65
@@ -2398,11 +2340,6 @@ msgstr "Остання сторінка"
msgid "List"
msgstr "Список"
-#: lib/Dynamic/Mailbox.php:465 templates/dynamic/message.html.php:63
-#: templates/dynamic/message.html.php:65
-msgid "List Info"
-msgstr ""
-
#: templates/dynamic/header.html.php:8
msgid "Load All Addresses"
msgstr "Завантажити всі адреси"
@@ -2426,8 +2363,7 @@ msgstr "Завантаження стилів листів..."
#: lib/Basic/Search.php:493 lib/Dynamic/Compose/Common.php:259
#: lib/Dynamic/Mailbox.php:533 lib/Mime/Viewer/Html.php:81
#: lib/Mime/Viewer/Images.php:131 templates/dynamic/compose-base.html.php:4
-#: templates/dynamic/compose.html.php:214
-#: templates/dynamic/mailbox.html.php:2
+#: templates/dynamic/compose.html.php:214 templates/dynamic/mailbox.html.php:2
#: templates/dynamic/mailbox.html.php:303
#: templates/dynamic/mailbox_subinfo.html.php:5
#: templates/dynamic/message.html.php:4 templates/dynamic/sidebar.html.php:1
@@ -2650,12 +2586,6 @@ msgstr "Листа успішно відіслано, але не записан
msgid "Message sent successfully."
msgstr "Листа успішно відіслано."
-#: lib/Mime/Viewer/Html.php:233
-msgid ""
-"Message styling has been suppressed in this message part since the style "
-"data lives on a remote server."
-msgstr ""
-
#: lib/Dynamic/Mailbox.php:550
#, php-format
msgid "Messages %d - %d"
@@ -2762,10 +2692,6 @@ msgstr "Вкажіть хоча б одного адресата."
msgid "Needs Action"
msgstr "Потребує Дії"
-#: templates/prefs/acl.html.php:32
-msgid "Negative Right"
-msgstr ""
-
#: config/prefs.php:847 config/prefs.php:1178 config/prefs.php:1269
#: config/prefs.php:1306 lib/Pgp.php:796
msgid "Never"
@@ -2924,8 +2850,7 @@ msgstr "Не учасник"
#: lib/Compose/Ui.php:56 lib/Mime/Viewer/Itip.php:419
#: lib/Mime/Viewer/Itip.php:592 lib/Mime/Viewer/Itip.php:754 lib/Pgp.php:798
#: lib/Pgp.php:799 templates/prefs/acl.html.php:39
-#: templates/prefs/acl.html.php:74
-#: templates/prefs/composetemplates.html.php:7
+#: templates/prefs/acl.html.php:74 templates/prefs/composetemplates.html.php:7
#: templates/prefs/drafts.html.php:7 templates/prefs/sentmail.html.php:7
#: templates/prefs/spam.html.php:7 templates/prefs/trash.html.php:7
msgid "None"
@@ -2965,8 +2890,7 @@ msgid "OK"
msgstr "ОК"
#: lib/Basic/Search.php:499 lib/Search/Element/Or.php:39
-#: templates/pgp/import_key.html.php:49
-#: templates/smime/import_key.html.php:34
+#: templates/pgp/import_key.html.php:49 templates/smime/import_key.html.php:34
msgid "OR"
msgstr "АБО"
@@ -2978,11 +2902,6 @@ msgstr "Старі скриньки відісланих листів знище
msgid "Older Than"
msgstr "Старші ніж"
-#: lib/Search/Element/Daterange.php:113
-#, php-format
-msgid "On '%s'"
-msgstr ""
-
#: lib/Block/Summary.php:52
msgid "Only display mailboxes with unread messages in them?"
msgstr "Показувати тільки скриньки з нечитаними листами?"
@@ -3003,8 +2922,7 @@ msgstr "Необов'язковий учасник"
msgid "Other"
msgstr "Інші"
-#: templates/dynamic/compose.html.php:92
-#: templates/dynamic/mailbox.html.php:86
+#: templates/dynamic/compose.html.php:92 templates/dynamic/mailbox.html.php:86
#: templates/dynamic/mailbox.html.php:124
msgid "Other Options"
msgstr "Інші Опції"
@@ -3043,10 +2961,6 @@ msgstr "Публічний ключ PGP для \"%s (%s)\" успішно дод
msgid "PGP Public Key for \"%s\" was successfully deleted."
msgstr "Публічний ключ PGP для \"%s\" успішно знищено."
-#: templates/prefs/pgppublickey.html.php:4
-msgid "PGP Public Keyring"
-msgstr ""
-
#: lib/Pgp.php:78
msgid "PGP Sign Message"
msgstr "PGP підпис листа"
@@ -3118,18 +3032,6 @@ msgstr "Пароль"
msgid "Password for %s:"
msgstr "Пароль для %s:"
-#: templates/pgp/import_key.html.php:19
-msgid ""
-"Paste PGP public keys into the textarea, upload a file containing PGP public "
-"keys, or combine both methods. Multiple keys are supported."
-msgstr ""
-
-#: templates/pgp/import_key.html.php:21
-msgid ""
-"Paste your PGP private key into the textarea or upload a file containing "
-"your key."
-msgstr ""
-
#: templates/itip/action.html.php:47
msgid "Percent complete"
msgstr "Відсоток завершення"
@@ -3242,15 +3144,6 @@ msgstr "Портал"
msgid "Possible Conflicts"
msgstr "Можливі конфлікти"
-#: lib/Imap/Acl.php:180 templates/prefs/acl.html.php:41
-#: templates/prefs/acl.html.php:76
-msgid "Post"
-msgstr ""
-
-#: lib/Imap/Acl.php:179
-msgid "Post to this mailbox (not enforced by IMAP)"
-msgstr ""
-
#: config/prefs.php:62
msgid "Precede your text signature with dashes ('-- ')?"
msgstr "Ставити пунктир перед Вашим текстовим підписом ('-- ')?"
@@ -3508,14 +3401,6 @@ msgstr "Відповісти Списку"
msgid "Reply to Sender"
msgstr "Відповісти відправнику"
-#: lib/Mime/Viewer/Itip.php:244 lib/Mime/Viewer/Itip.php:253
-msgid "Reply with Not Supported Message"
-msgstr ""
-
-#: lib/Mime/Viewer/Itip.php:251
-msgid "Reply with free/busy for next 2 months."
-msgstr ""
-
#: lib/Mime/Viewer/Itip.php:250
msgid "Reply with requested free/busy information."
msgstr "Відповісти з замовленою інформацією вільний/занятий."
@@ -3588,10 +3473,6 @@ msgstr "Поновити Чернетку"
msgid "Resume Editing"
msgstr "Поновити редагування"
-#: templates/dynamic/mailbox.html.php:68
-msgid "Retry"
-msgstr ""
-
#: lib/Basic/Search.php:508
#, php-format
msgid "Return to %s"
@@ -3644,10 +3525,6 @@ msgstr ""
msgid "S/MIME Public Key for \"%s\" was successfully deleted."
msgstr "Публічний ключ S/MIME для \"%s\" успішно знищено."
-#: templates/prefs/smimepublickey.html.php:4
-msgid "S/MIME Public Keyring"
-msgstr ""
-
#: lib/Basic/Smime.php:96
msgid "S/MIME Public/Private Keypair successfully added."
msgstr "Пара приватний/публічний ключ S/MIME успішно додана."
@@ -3795,10 +3672,9 @@ msgstr "Збереження шаблону невдале: не можу ств
msgid "Saving the template failed: no template mailbox exists."
msgstr "Збереження шаблону невдале: не існує скриньки шаблонів."
-#: lib/Application.php:338 lib/Basic/Search.php:515
-#: lib/Dynamic/Mailbox.php:230 lib/Dynamic/Mailbox.php:368
-#: lib/Dynamic/Mailbox.php:546 templates/contacts/contacts.html.php:21
-#: templates/search/search.html.php:11
+#: lib/Application.php:338 lib/Basic/Search.php:515 lib/Dynamic/Mailbox.php:230
+#: lib/Dynamic/Mailbox.php:368 lib/Dynamic/Mailbox.php:546
+#: templates/contacts/contacts.html.php:21 templates/search/search.html.php:11
#: templates/smartmobile/mailbox.html.php:22
#: templates/smartmobile/search.html.php:3
msgid "Search"
@@ -4070,8 +3946,7 @@ msgid "Sort"
msgstr "Сортувати"
#: lib/Mailbox.php:1715 lib/Mailbox.php:1797
-#: templates/dynamic/mailbox.html.php:36
-#: templates/dynamic/message.html.php:19
+#: templates/dynamic/mailbox.html.php:36 templates/dynamic/message.html.php:19
#: templates/smartmobile/mailbox.html.php:38
#: templates/smartmobile/mailbox.html.php:48
#: templates/smartmobile/message.html.php:60
@@ -4577,11 +4452,6 @@ msgstr "Трапилась помилка оновлення завдання: %
msgid "This action is not supported."
msgstr "Ця дія не підтримується."
-#: lib/Mime/Viewer/Audio.php:74
-#, php-format
-msgid "This audio file is reported to be %s in length."
-msgstr ""
-
#: lib/Mime/Viewer/Pgp.php:440
msgid "This digitally signed message is broken."
msgstr "Цей лист з цифровим підписом є зламаний."
@@ -4654,11 +4524,6 @@ msgstr "Цей лист містить додаток, який не можна
msgid "This part contains no message contents."
msgstr "Ця частина не містить жодного контенту."
-#: lib/Mime/Viewer/Video.php:94
-#, php-format
-msgid "This video file is reported to be %s in length."
-msgstr ""
-
#: config/prefs.php:1443 lib/Dynamic/Mailbox.php:261
msgid "Thread"
msgstr "Рубрика"
@@ -4684,8 +4549,8 @@ msgstr "Огляд рубрик"
#: lib/Dynamic/Mailbox.php:259 lib/Smartmobile.php:187
#: templates/contacts/contacts.html.php:34
#: templates/dynamic/compose.html.php:114
-#: templates/dynamic/mailbox.html.php:144
-#: templates/dynamic/message.html.php:88 templates/thread/thread.html.php:21
+#: templates/dynamic/mailbox.html.php:144 templates/dynamic/message.html.php:88
+#: templates/thread/thread.html.php:21
msgid "To"
msgstr "До"
@@ -4754,8 +4619,7 @@ msgstr "Не можу показати листа в панелі перегля
msgid "Undelete"
msgstr "Відновити"
-#: lib/Basic/Thread.php:291 lib/Contents/Message.php:297
-#: lib/Mailbox/Ui.php:80
+#: lib/Basic/Thread.php:291 lib/Contents/Message.php:297 lib/Mailbox/Ui.php:80
msgid "Undisclosed Recipients"
msgstr "Невикриті отримувачі"
@@ -4764,8 +4628,7 @@ msgstr "Невикриті отримувачі"
msgid "Unhandled component of type: %s"
msgstr "Непідтримуваний тип компонента: %s"
-#: lib/Mime/Viewer/Itip.php:845 lib/Pgp.php:800 lib/Pgp.php:801
-#: lib/Pgp.php:802
+#: lib/Mime/Viewer/Itip.php:845 lib/Pgp.php:800 lib/Pgp.php:801 lib/Pgp.php:802
msgid "Unknown"
msgstr "Невідомий"
@@ -4825,8 +4688,7 @@ msgstr "Оновити статус респондента"
msgid "Update this event on my calendar"
msgstr "Оновити цю подію в моєму календарі"
-#: templates/pgp/import_key.html.php:58
-#: templates/smime/import_key.html.php:44
+#: templates/pgp/import_key.html.php:58 templates/smime/import_key.html.php:44
msgid "Upload"
msgstr "Закачати"
@@ -4920,8 +4782,7 @@ msgstr "Огляд %s"
msgid "View %s Public Key"
msgstr "Переглянути %s Публічний ключ"
-#: templates/dynamic/message.html.php:55
-#: templates/dynamic/message.html.php:57
+#: templates/dynamic/message.html.php:55 templates/dynamic/message.html.php:57
msgid "View All Parts"
msgstr "Показати всі частини"
@@ -4955,8 +4816,7 @@ msgid "View Personal Public Key"
msgstr "Проглянути Персональний публічний ключ"
#: lib/Dynamic/Mailbox.php:333 lib/Dynamic/Mailbox.php:462
-#: templates/dynamic/message.html.php:41
-#: templates/dynamic/message.html.php:43
+#: templates/dynamic/message.html.php:41 templates/dynamic/message.html.php:43
msgid "View Source"
msgstr "Анатомія"
@@ -5108,10 +4968,6 @@ msgstr "Вчора, %s"
msgid "Yesterday, %s %s"
msgstr "Вчора, %s %s"
-#: templates/dynamic/compose.html.php:173
-msgid "You are"
-msgstr ""
-
#: lib/Mailbox.php:737
msgid "You are not allowed to create mailboxes."
msgstr "Вам не можна створювати скриньки."
@@ -5192,16 +5048,6 @@ msgstr ""
"вказано. Ви не зможете витирати листи, доки не визначите Смітник у своїх "
"налаштуваннях."
-#: lib/Dynamic/Compose/Common.php:252
-msgid ""
-"You have edited your signature. Change the identity and lose your changes?"
-msgstr ""
-
-#: lib/Dynamic/Compose/Common.php:261
-msgid ""
-"You have reached the limit for the number of attachments in this message."
-msgstr ""
-
#: lib/Ajax/Application/Handler/Dynamic.php:52
#, php-format
msgid "You may not create child mailboxes in \"%s\"."
@@ -5239,12 +5085,6 @@ msgstr "Слід ввести пароль для декриптування ц
msgid "You must select an address first."
msgstr "Спершу слід вказати адресу."
-#: lib/Dynamic/Base.php:192
-msgid ""
-"You need to either use the keyboard (Ctrl/Cmd + C) or right click on the "
-"selected address to access the Copy command."
-msgstr ""
-
#: lib/Maillog/Log/Redirect.php:82
#, php-format
msgid "You redirected this message on %s to: %s."
@@ -5342,26 +5182,10 @@ msgid ""
msgstr ""
"Ваші додаткові адреси: (опціонально, вводьте кожну з нового рядка)"
-#: lib/Ajax/Application/Handler/ComposeAttach.php:57
-#: lib/Ajax/Application/Handler/Dynamic.php:1091
-msgid ""
-"Your attachment was not uploaded. Most likely, the file exceeded the maximum "
-"size allowed by the server configuration."
-msgstr ""
-
-#: lib/Dynamic/Compose/Common.php:260
-msgid "Your attachment(s) are too large and cannot be uploaded."
-msgstr ""
-
#: lib/Mime/Viewer/Images.php:154
msgid "Your browser does not support inline display of this image type."
msgstr "Ваш броузер не може показати зоображення цього типу по тексту."
-#: lib/Dynamic/Base.php:192
-msgid ""
-"Your browser security settings don't permit direct access to the clipboard."
-msgstr ""
-
#: templates/prefs/encrypt.html.php:3
msgid "Your default encryption method for sending messages:"
msgstr "Типовий метод криптування при відсиланні листів:"
@@ -5376,15 +5200,6 @@ msgstr ""
"отримувача. Клацніть на це поле для повернення до попередньої іпостасі. "
"Іпостась не буде перевірена під час цієї дії створення листа."
-#: lib/Compose/LinkedAttachment.php:217
-msgid "Your linked attachment has been downloaded by at least one user."
-msgstr ""
-
-#: lib/Compose.php:760
-#, php-format
-msgid "Your message body has exceeded the limit by body size by %d characters."
-msgstr ""
-
#: lib/Mime/Viewer/Status.php:143
msgid "Your message was successfully delivered."
msgstr "Ваш лист був успішно доручений."
@@ -5473,14 +5288,6 @@ msgstr "файл поштової скриньки"
msgid "maximum total image size is %s"
msgstr "Максимальний загальний розмір зображення є %s"
-#: lib/Search/Element/Contacts.php:62
-msgid "messages from a personal contact"
-msgstr ""
-
-#: lib/Search/Element/Contacts.php:61
-msgid "messages not from a personal contact"
-msgstr ""
-
#: lib/Search/Element/Attachment.php:52
msgid "messages with attachment(s)"
msgstr "листів з додатком(ми)"
@@ -5504,11 +5311,6 @@ msgstr "ім'я"
msgid "not"
msgstr "не"
-#: lib/Contents/View.php:67
-#, php-format
-msgid "part %s"
-msgstr ""
-
#: templates/dynamic/compose.html.php:173
msgid "replying to ALL"
msgstr "відповідаємо ВСІМ"
diff --git a/locale/zh_CN/LC_MESSAGES/imp.mo b/locale/zh_CN/LC_MESSAGES/imp.mo
index e5b55bcd7..35cd186ea 100644
Binary files a/locale/zh_CN/LC_MESSAGES/imp.mo and b/locale/zh_CN/LC_MESSAGES/imp.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/imp.po b/locale/zh_CN/LC_MESSAGES/imp.po
index c521a4427..1bb17370c 100644
--- a/locale/zh_CN/LC_MESSAGES/imp.po
+++ b/locale/zh_CN/LC_MESSAGES/imp.po
@@ -636,8 +636,8 @@ msgstr "无效或格式错误的请求。服务器回应：%s"
msgid "Bad request: %s"
msgstr "无效请求：%s"
-#: lib/Search.php:665 lib/UI/Message.php:28
-#: templates/contacts/contacts.html:43 templates/login/recompose.html:32
+#: lib/Search.php:665 lib/UI/Message.php:28 templates/contacts/contacts.html:43
+#: templates/login/recompose.html:32
msgid "Bcc"
msgstr "密件抄送"
@@ -742,8 +742,8 @@ msgid ""
"mailbox."
msgstr "无法显示 - 仅在当前邮箱中看到此邮件的 %s(共 %s)。"
-#: lib/Search.php:661 lib/UI/Message.php:27
-#: templates/contacts/contacts.html:42 templates/login/recompose.html:23
+#: lib/Search.php:661 lib/UI/Message.php:27 templates/contacts/contacts.html:42
+#: templates/login/recompose.html:23
msgid "Cc"
msgstr "抄送"
@@ -2269,8 +2269,7 @@ msgid "Message Date"
msgstr "邮件日期"
#: config/prefs.php.dist:53 config/prefs.php.dist:71 config/prefs.php.dist:86
-#: config/prefs.php.dist:95 config/prefs.php.dist:103
-#: config/prefs.php.dist:111
+#: config/prefs.php.dist:95 config/prefs.php.dist:103 config/prefs.php.dist:111
msgid "Message Options"
msgstr "邮件选项"
@@ -3241,9 +3240,9 @@ msgstr "返回文件夹视图"
msgid "Return to Message Composition"
msgstr "返回写邮件页面"
-#: filterprefs.php:57 templates/smime/smime.html:102
-#: templates/pgp/pgp.html:153 templates/acl/acl.html:35
-#: templates/acl/acl.html:81 templates/acl/acl.html:95
+#: filterprefs.php:57 templates/smime/smime.html:102 templates/pgp/pgp.html:153
+#: templates/acl/acl.html:35 templates/acl/acl.html:81
+#: templates/acl/acl.html:95
msgid "Return to Options"
msgstr "返回选项"
@@ -4714,8 +4713,8 @@ msgstr "您正从下列帐户获取邮件："
#: templates/folders/folders_confirm.html:10
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr "您正尝试删除下列文件夹中的所有邮件。"
#: templates/folders/folders_confirm.html:9
diff --git a/locale/zh_TW/LC_MESSAGES/imp.mo b/locale/zh_TW/LC_MESSAGES/imp.mo
index d10bb0a81..0749acdb6 100644
Binary files a/locale/zh_TW/LC_MESSAGES/imp.mo and b/locale/zh_TW/LC_MESSAGES/imp.mo differ
diff --git a/locale/zh_TW/LC_MESSAGES/imp.po b/locale/zh_TW/LC_MESSAGES/imp.po
index c8e1fb8c3..4fe6c931e 100644
--- a/locale/zh_TW/LC_MESSAGES/imp.po
+++ b/locale/zh_TW/LC_MESSAGES/imp.po
@@ -679,8 +679,8 @@ msgstr "錯誤的請求. 伺服器回應: %s"
msgid "Bad request: %s"
msgstr "錯誤的請求: %s"
-#: lib/Search.php:670 lib/UI/Message.php:28
-#: templates/contacts/contacts.html:43 templates/login/recompose.html:32
+#: lib/Search.php:670 lib/UI/Message.php:28 templates/contacts/contacts.html:43
+#: templates/login/recompose.html:32
msgid "Bcc"
msgstr "秘件副本"
@@ -809,8 +809,8 @@ msgstr "無法顯示 - 在目前的信件匣中只找到 %2$s 個中的 %1$s 個
msgid "Cannot retrieve public key from cache."
msgstr "無法自 cache 取得公開金鑰."
-#: lib/Search.php:666 lib/UI/Message.php:27
-#: templates/contacts/contacts.html:42 templates/login/recompose.html:23
+#: lib/Search.php:666 lib/UI/Message.php:27 templates/contacts/contacts.html:42
+#: templates/login/recompose.html:23
msgid "Cc"
msgstr "副本"
@@ -3718,8 +3718,8 @@ msgstr "儲存草稿失敗. 未指定草稿匣."
#: lib/Compose.php:210
#, php-format
msgid ""
-"Saving the draft failed. The %s header contains an invalid e-mail address: %"
-"s."
+"Saving the draft failed. The %s header contains an invalid e-mail address: "
+"%s."
msgstr "儲存草稿失敗. %s 表頭包含一組無效的 e-mail 住址: %s."
#: lib/Compose.php:247
@@ -4836,9 +4836,9 @@ msgstr "垃圾箱:"
msgid "Unable to connect to SQL server."
msgstr "無法連結 SQL 伺服器."
-#: lib/Quota/mercury32.php:78 lib/Quota/command.php:93
-#: lib/Quota/logfile.php:87 lib/Quota/imap.php:42 lib/Quota/mdaemon.php:45
-#: lib/Quota/maildir.php:113 lib/Quota/hook.php:52
+#: lib/Quota/mercury32.php:78 lib/Quota/command.php:93 lib/Quota/logfile.php:87
+#: lib/Quota/imap.php:42 lib/Quota/mdaemon.php:45 lib/Quota/maildir.php:113
+#: lib/Quota/hook.php:52
msgid "Unable to retrieve quota"
msgstr "無法讀取磁碟配置資料"
@@ -5161,8 +5161,8 @@ msgstr "你正在嚐試由下列帳號收取外部郵件:"
#: templates/folders/folders_confirm.html:11
msgid ""
-"You are attempting to delete all messages contained in the following folder"
-"(s)."
+"You are attempting to delete all messages contained in the following "
+"folder(s)."
msgstr "你正在嚐試刪除下列信件匣中的所有郵件."
#: templates/folders/folders_confirm.html:10
diff --git a/migration/1_imp_base_tables.php b/migration/1_imp_base_tables.php
index c082b2a50..210862f56 100644
--- a/migration/1_imp_base_tables.php
+++ b/migration/1_imp_base_tables.php
@@ -22,20 +22,20 @@ public function up()
// Create: imp_sentmail
$tableList = $this->tables();
if (!in_array('imp_sentmail', $tableList)) {
- $t = $this->createTable('imp_sentmail', array('autoincrementKey' => false));
- $t->column('sentmail_id', 'bigint', array('null' => false));
- $t->column('sentmail_who', 'string', array('limit' => 255, 'null' => false));
- $t->column('sentmail_ts', 'bigint', array('null' => false));
- $t->column('sentmail_messageid', 'string', array('limit' => 255, 'null' => false));
- $t->column('sentmail_action', 'string', array('limit' => 32, 'null' => false));
- $t->column('sentmail_recipient', 'string', array('limit' => 255, 'null' => false));
- $t->column('sentmail_success', 'integer', array('null' => false));
- $t->primaryKey(array('sentmail_id'));
+ $t = $this->createTable('imp_sentmail', ['autoincrementKey' => false]);
+ $t->column('sentmail_id', 'bigint', ['null' => false]);
+ $t->column('sentmail_who', 'string', ['limit' => 255, 'null' => false]);
+ $t->column('sentmail_ts', 'bigint', ['null' => false]);
+ $t->column('sentmail_messageid', 'string', ['limit' => 255, 'null' => false]);
+ $t->column('sentmail_action', 'string', ['limit' => 32, 'null' => false]);
+ $t->column('sentmail_recipient', 'string', ['limit' => 255, 'null' => false]);
+ $t->column('sentmail_success', 'integer', ['null' => false]);
+ $t->primaryKey(['sentmail_id']);
$t->end();
- $this->addIndex('imp_sentmail', array('sentmail_ts'));
- $this->addIndex('imp_sentmail', array('sentmail_who'));
- $this->addIndex('imp_sentmail', array('sentmail_success'));
+ $this->addIndex('imp_sentmail', ['sentmail_ts']);
+ $this->addIndex('imp_sentmail', ['sentmail_who']);
+ $this->addIndex('imp_sentmail', ['sentmail_success']);
}
}
@@ -46,5 +46,4 @@ public function down()
{
$this->dropTable('imp_sentmail');
}
-
}
diff --git a/migration/2_imp_autoincrement_sentmail.php b/migration/2_imp_autoincrement_sentmail.php
index 69c937e34..46889b487 100644
--- a/migration/2_imp_autoincrement_sentmail.php
+++ b/migration/2_imp_autoincrement_sentmail.php
@@ -31,7 +31,6 @@ public function up()
*/
public function down()
{
- $this->changeColumn('imp_sentmail', 'sentmail_id', 'bigint', array('autoincrement' => false));
+ $this->changeColumn('imp_sentmail', 'sentmail_id', 'bigint', ['autoincrement' => false]);
}
-
}
diff --git a/migration/3_imp_maillog_update.php b/migration/3_imp_maillog_update.php
index d05ca22a5..fda10d5e9 100644
--- a/migration/3_imp_maillog_update.php
+++ b/migration/3_imp_maillog_update.php
@@ -28,7 +28,7 @@ public function up()
$this->announce('Updating entries. This may take some time.');
foreach ($rows as $row) {
$row['object_uid'] = implode(':', explode('.', $row['object_uid'], 3));
- $this->_connection->update($sql, array($row['object_uid'], $row['history_id']));
+ $this->_connection->update($sql, [$row['object_uid'], $row['history_id']]);
}
}
}
@@ -47,9 +47,8 @@ public function down()
$this->announce('Updating entries. This may take some time.');
foreach ($rows as $row) {
$row['object_uid'] = implode('.', explode(':', $row['object_uid'], 3));
- $this->_connection->update($sql, array($row['object_uid'], $row['history_id']));
+ $this->_connection->update($sql, [$row['object_uid'], $row['history_id']]);
}
}
}
-
}
diff --git a/migration/4_imp_smime.php b/migration/4_imp_smime.php
new file mode 100644
index 000000000..ae721287a
--- /dev/null
+++ b/migration/4_imp_smime.php
@@ -0,0 +1,75 @@
+
+ * @category Horde
+ * @license http://www.horde.org/licenses/gpl GPL
+ * @package IMP
+ */
+class ImpSMIME extends Horde_Db_Migration_Base
+{
+ /**
+ * Upgrade.
+ */
+ public function up()
+ {
+ // Create: imp_smime_extrakeys
+ $tableList = $this->tables();
+ if (!in_array('imp_smime_extrakeys', $tableList)) {
+ $t = $this->createTable('imp_smime_extrakeys', ['autoincrementKey' => 'private_key_id']);
+ $t->column('pref_name', 'string', ['limit' => 50, 'null' => false]);
+ $t->column('user_name', 'string', ['limit' => 50,'null' => false]);
+ $t->column('private_key', 'binary', ['null' => false]);
+ $t->column('public_key', 'binary', ['null' => true]);
+ $t->column('privatekey_passwd', 'string', ['limit' => 50,'null' => true]);
+ $t->column('alias', 'string', ['limit' => 50,'null' => true]);
+ $t->column('identity', 'string', ['limit' => 50,'0' => true]);
+ $t->column('identity_used', 'bool', ['limit' => 50,'false' => true]); // how to set a default boolean?
+ $t->end();
+ }
+
+ // Check if 'horde_prefs' table exists before trying to access it.
+ if (in_array('horde_prefs', $tableList)) {
+ // Get all 'smime_private_key' data from 'horde_prefs' using a native SQL query.
+ $sql = "SELECT * FROM horde_prefs WHERE pref_name = 'smime_private_key'";
+ $smimePrivateKeyData = $this->_connection->selectAll($sql);
+
+ // Now, insert the 'smime_private_key' data into 'imp_smime_extrakeys'.
+ foreach ($smimePrivateKeyData as $record) {
+ $prefUid = $record['pref_uid'];
+
+ // Retrieve the corresponding 'smime_public_key' for the 'pref_uid' using another native SQL query.
+ $sql = "SELECT * FROM horde_prefs WHERE pref_name = 'smime_public_key' AND pref_uid = ?";
+ $smimePublicKeyRecord = $this->_connection->selectAll($sql, [$prefUid]);
+
+ if ($smimePublicKeyRecord) {
+ $insertSql = "INSERT INTO imp_smime_extrakeys (pref_name, user_name, private_key, public_key, privatekey_passwd, alias, identity, identity_used)
+ VALUES (?, ?, ?, ?, NULL, NULL, ?, ?)";
+ $this->_connection->insert($insertSql, [
+ $record['pref_name'],
+ $prefUid,
+ $record['pref_value'],
+ $smimePublicKeyRecord[0]['pref_value'],
+ 0, # default identity is 0
+ 0, # defautl identitity used is also 0
+ ]);
+ }
+
+ }
+ }
+ }
+
+ /**
+ * Downgrade.
+ */
+ public function down()
+ {
+ $this->dropTable('imp_smime_extrakeys');
+ }
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index e85ec4fea..ece0f79c3 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,12 +1,13 @@
-
-
-
+
+
+
+ lib
-
-
+
+
-
- test
+
+ test/Imp
-
\ No newline at end of file
+
diff --git a/templates/prefs/smimeidentities.html.php b/templates/prefs/smimeidentities.html.php
new file mode 100644
index 000000000..88069f7e9
--- /dev/null
+++ b/templates/prefs/smimeidentities.html.php
@@ -0,0 +1,16 @@
+
+
+
+
\ No newline at end of file
diff --git a/templates/prefs/smimeprivatekey.html.php b/templates/prefs/smimeprivatekey.html.php
index a07f7c0c5..abbbcec71 100644
--- a/templates/prefs/smimeprivatekey.html.php
+++ b/templates/prefs/smimeprivatekey.html.php
@@ -1,95 +1,295 @@
+ aliasexists != false) {
+ printf(_('Current alias for your Certificate Set: %s'), $this->aliasexists);
+ } else {
+ echo _('Set Alias for your certificate: ');
+ }
+ ?>
+
+
+ [alias ?>]
+
+
+
+
+ privatekeyexits) {
+ printf(_('The ID of your Certificate Set: %s'), $this->privatekeyexits);
+ } else {
+ echo _('The ID of your Sign Certificate Set: not set in database');
+ }
+ ?>
+
+ signaliasexists != false) {
+ printf (_('Current alias for your Certificate Set: %s'), $this->signaliasexists);
+ } else {
+ echo _('Set Alias for your certificate: ');
+ }
+ ?>
+
+
+ [alias_sign ?>]
+
+
+
+
+ signkeyexits) {
+ printf (_('The ID of your Sign Certificate Set: %s'), $this->signkeyexits);
+ } else {
+ echo _('The ID of your Sign Certificate Set: not set in database');
+ }?>
+