forked from extern/egroupware
mail add anf fix missing translations in mail-prefs
This commit is contained in:
parent
ea9e56ce36
commit
3abb719bfa
@ -954,9 +954,9 @@ class mail_compose
|
||||
// ON tOP OR BELOW? pREF CAN TELL
|
||||
/*
|
||||
Signature behavior preference changed. New default, if not set -> 0
|
||||
'0' => 'After reply, visible during compose',
|
||||
'1' => 'Before reply, visible during compose',
|
||||
'no_belowaftersend' => 'Appened after reply before sending',
|
||||
'0' => 'after reply, visible during compose',
|
||||
'1' => 'before reply, visible during compose',
|
||||
'no_belowaftersend' => 'appended after reply before sending',
|
||||
*/
|
||||
$insertSigOnTop = ($insertSigOnTop?$insertSigOnTop:($this->mailPreferences['insertSignatureAtTopOfMessage']?$this->mailPreferences['insertSignatureAtTopOfMessage']:'below'));
|
||||
$sigText = mail_bo::merge($signature['ident_signature'],array($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')));
|
||||
@ -2111,9 +2111,9 @@ class mail_compose
|
||||
$signature = $_signature['ident_signature'];
|
||||
/*
|
||||
Signature behavior preference changed. New default, if not set -> 0
|
||||
'0' => 'After reply, visible during compose',
|
||||
'1' => 'Before reply, visible during compose',
|
||||
'no_belowaftersend' => 'Appened after reply before sending',
|
||||
'0' => 'after reply, visible during compose',
|
||||
'1' => 'before reply, visible during compose',
|
||||
'no_belowaftersend' => 'appended after reply before sending',
|
||||
*/
|
||||
$sigAlreadyThere = $this->mailPreferences['insertSignatureAtTopOfMessage']!='no_belowaftersend'?1:0;
|
||||
if ($sigAlreadyThere)
|
||||
|
@ -319,9 +319,9 @@ class mail_hooks
|
||||
'help' => 'Should signature be inserted after (standard) or before a reply or inline forward, and should signature be visible and changeable during compose.',
|
||||
'name' => 'insertSignatureAtTopOfMessage',
|
||||
'values' => array(
|
||||
'0' => 'After reply, visible during compose',
|
||||
'1' => 'Before reply, visible during compose',
|
||||
'no_belowaftersend' => 'Appened after reply before sending',
|
||||
'0' => lang('after reply, visible during compose'),
|
||||
'1' => lang('before reply, visible during compose'),
|
||||
'no_belowaftersend' => lang('appended after reply before sending'),
|
||||
),
|
||||
'xmlrpc' => True,
|
||||
'default'=> '0',
|
||||
|
@ -18,6 +18,7 @@ add a new folder to %1: mail de Einen neuen Ordner erstellen unter: %1
|
||||
add all my aliases mail de Alle Alias Adressen hinzufügen
|
||||
add folder mail de Neuer Ordner
|
||||
add to addressbook mail de zum Adressbuch hinzufügen
|
||||
after reply, visible during compose mail de Nach dem zitierten Text, sichtbar während der Bearbeitung
|
||||
aliases+forwards mail de Aliase+Weiterleitungen
|
||||
all mail de alle
|
||||
all adresses: mail de Alle Adressen
|
||||
@ -37,12 +38,14 @@ and the rule with priority %1, now got the priority %2 mail de Die Regel mit Pri
|
||||
any of mail de mit einem
|
||||
any status mail de Alle Status
|
||||
append mail de hinzufügen
|
||||
appended after reply before sending mail de Einfügen nach dem zitierten Text im Zuge des Versendens
|
||||
attach users vcard at compose to every new mail mail de Füge die VCard des aktiven Benutzers an jede neue E-Mail an
|
||||
attach vcard mail de vCard hinzufügen
|
||||
attachment mail de Anhang
|
||||
attachments mail de Dateien
|
||||
authentication mail de Authentifizierung
|
||||
available personal email-accounts/profiles mail de verfügbare persönliche E-Mail Konten bzw. Profile
|
||||
before reply, visible during compose mail de Vor dem zitierten Text, sichtbar während der Bearbeitung
|
||||
but check shared folders mail de aber explizite Überprüfung der Ordner unterhalb der (Benutzer-)Freigaben
|
||||
by date mail de nach Datum
|
||||
can not open imap connection mail de Keine Verbindung zum Mailserver möglich
|
||||
@ -375,6 +378,7 @@ set / remove flags mail de Markierung
|
||||
set / remove labels mail de Schlagworte setzen / entfernen
|
||||
set it as default: mail de als Vorgabe speichern
|
||||
should new messages show up on the home page mail de Wie sollen Nachrichten auf der Startseite angezeigt werden?
|
||||
should signature be inserted after (standard) or before a reply or inline forward, and should signature be visible and changeable during compose. mail de Soll die Signatur Hinter (gemäß Standart) oder Vor dem zitierten Text einer email eingefügt werden, und soll diese bearbeitbar sein?
|
||||
show all folders mail de Darstellung aller E-Mail Ordner
|
||||
show all folders, (subscribed and unsubscribed) in main screen folder pane mail de Zeige alle Ordner, die in Ihrem Postfach eingerichtet sind. Expliziere Deaktivierung des Abonnement-Funktion des E-Mail Programms. Dies kann sich negativ auf die Performance Ihrer EGroupware auswirken.
|
||||
show new messages on home page mail de Anzeigen von neuen E-Mails auf der Startseite
|
||||
|
@ -18,6 +18,7 @@ add a new folder to %1: mail en Add a new Folder to %1:
|
||||
add all my aliases mail en Add all my aliases
|
||||
add folder mail en Add Folder
|
||||
add to addressbook mail en add to addressbook
|
||||
after reply, visible during compose mail en After reply, visible during compose
|
||||
aliases+forwards mail en Aliases+Forwards
|
||||
all mail en all
|
||||
all adresses: mail en All Adresses:
|
||||
@ -37,12 +38,14 @@ and the rule with priority %1, now got the priority %2 mail en And the rule with
|
||||
any of mail en any of
|
||||
any status mail en any status
|
||||
append mail en append
|
||||
appended after reply before sending mail en Appended after reply before sending
|
||||
attach users vcard at compose to every new mail mail en attach users VCard at compose to every new mail
|
||||
attach vcard mail en Attach vCard
|
||||
attachment mail en Attachment
|
||||
attachments mail en Attachments
|
||||
authentication mail en Authentication
|
||||
available personal email-accounts/profiles mail en available personal EMail-Accounts/Profiles
|
||||
before reply, visible during compose mail en Before reply, visible during compose
|
||||
but check shared folders mail en but check shared folders
|
||||
by date mail en By date
|
||||
can not open imap connection mail en Can not open IMAP connection
|
||||
@ -375,6 +378,7 @@ set / remove flags mail en Set / Remove Flags
|
||||
set / remove labels mail en Set / Remove Labels
|
||||
set it as default: mail en set it as default:
|
||||
should new messages show up on the home page mail en Should new messages show up on the Home page
|
||||
should signature be inserted after (standard) or before a reply or inline forward, and should signature be visible and changeable during compose. mail en Should signature be inserted after (standard) or before a reply or inline forward, and should signature be visible and changeable during compose.
|
||||
show all folders mail en show all Folders
|
||||
show all folders, (subscribed and unsubscribed) in main screen folder pane mail en show all folders, (subscribed AND unsubscribed) in Main Screen Folder Pane
|
||||
show new messages on home page mail en show new messages on home page
|
||||
|
Loading…
Reference in New Issue
Block a user