Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-02-01 10:41:52 +01:00
commit 66ef57387f
3 changed files with 940 additions and 939 deletions

View File

@ -113,7 +113,8 @@ namespace Acacia
// Create the watcher
Watcher = new ZPushWatcher(Instance);
OutlookUI.Watcher = Watcher;
if (OutlookUI != null)
OutlookUI.Watcher = Watcher;
// Allow to features to register whatever they need
Features = new List<Feature>();
@ -155,9 +156,6 @@ namespace Acacia
Acacia.Features.DebugSupport.Statistics.StartupTime.Stop();
foreach (Feature feature in Features)
feature.AfterStartup();
// [KOE-148] Initial send receive
Instance.SendReceive();
}
catch (System.Exception e)
{

View File

@ -77,6 +77,9 @@ namespace Acacia.ZPush
Tasks.Task(null, null, "AccountCheckDone", () =>
{
_watcher.OnAccountsScanned();
// [KOE-148] Initial send receive
ThisAddIn.Instance.SendReceive();
});
// Register for account changes

View File

@ -4,8 +4,7 @@ msgstr ""
"POT-Creation-Date: \n"
"PO-Revision-Date: 2018-01-31 13:12+0000\n"
"Last-Translator: Jan <jengelh@inai.de>\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"
@ -1419,3 +1418,4 @@ msgstr "Outlook wird neugestartet um die neuen Postfächer zu öffnen"
msgctxt "AcaciaZPushPlugin\\Properties\\Resources\\SharedFolders_WholeStoreRestart_Title"
msgid "Open stores"
msgstr "Postfächer öffnen"