mirror of
https://github.com/Kopano-dev/kopano-ol-extension.git
synced 2023-10-10 13:37:40 +02:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
81f0d0e3f2
@ -121,9 +121,20 @@ namespace Acacia.Features.SendAs
|
||||
}
|
||||
private static readonly BoolOption OPTION_GAB_LOOKUP = new BoolOption("GABLookup", true);
|
||||
|
||||
[AcaciaOption("Enables local resolving look ups for senders. This is disabled by default, as it seems " +
|
||||
"local contacts may lead to wrong senders.")]
|
||||
public bool ResolveLocal
|
||||
{
|
||||
get { return GetOption(OPTION_RESOLVE_LOCAL); }
|
||||
set { SetOption(OPTION_RESOLVE_LOCAL, value); }
|
||||
}
|
||||
private static readonly BoolOption OPTION_RESOLVE_LOCAL = new BoolOption("ResolveLocal", false);
|
||||
|
||||
internal IRecipient FindSendAsSender(ZPushAccount zpush, GABUser user)
|
||||
{
|
||||
// First try a simple resolve, this will work if the username is unique
|
||||
if (ResolveLocal)
|
||||
{
|
||||
IRecipient recip = ThisAddIn.Instance.ResolveRecipient(user.UserName);
|
||||
if (recip != null)
|
||||
{
|
||||
@ -139,6 +150,7 @@ namespace Acacia.Features.SendAs
|
||||
recip.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Search through GAB to find the user
|
||||
if (GABLookup)
|
||||
|
@ -4,8 +4,7 @@ msgstr ""
|
||||
"POT-Creation-Date: \n"
|
||||
"PO-Revision-Date: 2018-03-19 11:40+0000\n"
|
||||
"Last-Translator: Hans-Peter <h.stradinger@kopano.com>\n"
|
||||
"Language-Team: German <http://translate.kopano.io/projects/kopano/kopano-ol-"
|
||||
"extension/de/>\n"
|
||||
"Language-Team: German <http://translate.kopano.io/projects/kopano/kopano-ol-extension/de/>\n"
|
||||
"Language: de\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@ -1485,3 +1484,4 @@ msgstr "Übernehmen"
|
||||
msgctxt "AcaciaZPushPlugin\\Features\\SyncState\\SyncStateDialog\\buttonResetTimeFrame.Text"
|
||||
msgid "Reset"
|
||||
msgstr "Zurücksetzen"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user