diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3a0c8eb..f000ac4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="e7c9c2bb-66f1-4e37-904c-d33d8c113bde" name="Default" comment="" />
+    <list default="true" id="e7c9c2bb-66f1-4e37-904c-d33d8c113bde" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/backend/.htaccess" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Makefile" afterPath="$PROJECT_DIR$/Makefile" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.xml" afterPath="$PROJECT_DIR$/build.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/changelog.txt" afterPath="$PROJECT_DIR$/changelog.txt" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config.php" afterPath="$PROJECT_DIR$/config.php" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/ABOUT.js" afterPath="$PROJECT_DIR$/js/ABOUT.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/data/Actions.js" afterPath="$PROJECT_DIR$/js/data/Actions.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/data/ResponseHandler.js" afterPath="$PROJECT_DIR$/js/data/ResponseHandler.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/data/timezones.js" afterPath="$PROJECT_DIR$/js/data/timezones.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/dialogs/ImportContentPanel.js" afterPath="$PROJECT_DIR$/js/dialogs/ImportContentPanel.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/dialogs/ImportPanel.js" afterPath="$PROJECT_DIR$/js/dialogs/ImportPanel.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/plugin.calendarimporter.js" afterPath="$PROJECT_DIR$/js/plugin.calendarimporter.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/settings/SettingsCalSyncWidget.js" afterPath="$PROJECT_DIR$/js/settings/SettingsCalSyncWidget.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/settings/SettingsWidget.js" afterPath="$PROJECT_DIR$/js/settings/SettingsWidget.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/settings/dialogs/CalSyncEditContentPanel.js" afterPath="$PROJECT_DIR$/js/settings/dialogs/CalSyncEditContentPanel.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/settings/dialogs/CalSyncEditPanel.js" afterPath="$PROJECT_DIR$/js/settings/dialogs/CalSyncEditPanel.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/settings/ui/CalSyncGrid.js" afterPath="$PROJECT_DIR$/js/settings/ui/CalSyncGrid.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/settings/ui/CalSyncPanel.js" afterPath="$PROJECT_DIR$/js/settings/ui/CalSyncPanel.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/ui/ContextMenu.js" afterPath="$PROJECT_DIR$/js/ui/ContextMenu.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/manifest.xml" afterPath="$PROJECT_DIR$/manifest.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/php/download.php" afterPath="$PROJECT_DIR$/php/download.php" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/php/module.calendar.php" afterPath="$PROJECT_DIR$/php/module.calendar.php" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/php/plugin.calendarimporter.php" afterPath="$PROJECT_DIR$/php/plugin.calendarimporter.php" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/php/upload.php" afterPath="$PROJECT_DIR$/php/upload.php" />
+    </list>
     <ignored path="calendarimporter.iws" />
     <ignored path=".idea/workspace.xml" />
     <ignored path=".idea/dataSources.local.xml" />
@@ -20,104 +46,70 @@
     <favorites_list name="calendarimporter" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="CalSyncEditPanel.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/settings/dialogs/CalSyncEditPanel.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1480">
-              <caret line="101" column="30" selection-start-line="101" selection-start-column="30" selection-end-line="101" selection-end-column="30" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CalSyncGrid.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/settings/ui/CalSyncGrid.js">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="ContextMenu.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/ui/ContextMenu.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="504">
-              <caret line="85" column="59" selection-start-line="85" selection-start-column="59" selection-end-line="85" selection-end-column="59" />
+              <caret line="101" column="8" selection-start-line="101" selection-start-column="8" selection-end-line="104" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="SettingsCalSyncWidget.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/settings/SettingsCalSyncWidget.js">
+      <file leaf-file-name="plugin.calendarimporter.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/js/plugin.calendarimporter.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="729">
-              <caret line="104" column="16" selection-start-line="104" selection-start-column="16" selection-end-line="104" selection-end-column="142" />
+              <caret line="320" column="54" selection-start-line="320" selection-start-column="31" selection-end-line="320" selection-end-column="54" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="sync.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/backend/sync.php">
+      <file leaf-file-name="module.calendar.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/php/module.calendar.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="360">
-              <caret line="24" column="47" selection-start-line="24" selection-start-column="47" selection-end-line="24" selection-end-column="47" />
+            <state relative-caret-position="301">
+              <caret line="329" column="17" selection-start-line="329" selection-start-column="17" selection-end-line="329" selection-end-column="17" />
               <folding>
-                <element signature="e#21#926#0#PHP" expanded="true" />
+                <element signature="e#6#914#0#PHP" expanded="true" />
+                <element signature="n#__construct#0;n#CalendarModule#0;n#!!top" expanded="false" />
+                <element signature="n#execute#0;n#CalendarModule#0;n#!!top" expanded="false" />
+                <element signature="n#randomstring#0;n#CalendarModule#0;n#!!top" expanded="false" />
+                <element signature="n#getDurationStringFromMintues#0;n#CalendarModule#0;n#!!top" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="changelog.txt" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/changelog.txt">
+      <file leaf-file-name="Makefile" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Makefile">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
+            <state relative-caret-position="15">
+              <caret line="1" column="92" selection-start-line="1" selection-start-column="92" selection-end-line="1" selection-end-column="92" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="manifest.xml" pinned="false" current-in-tab="false">
+      <file leaf-file-name="download.php" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/php/download.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="144">
+              <caret line="28" column="35" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
+              <folding>
+                <element signature="e#7#908#0#PHP" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="manifest.xml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/manifest.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="functions.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/backend/functions.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="75">
-              <caret line="5" column="26" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="README.txt" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/backend/README.txt">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="config.php" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/backend/config.php">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="CalSyncEditContentPanel.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/js/settings/dialogs/CalSyncEditContentPanel.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="63" selection-start-line="0" selection-start-column="63" selection-end-line="0" selection-end-column="63" />
+            <state relative-caret-position="135">
+              <caret line="9" column="62" selection-start-line="9" selection-start-column="62" selection-end-line="9" selection-end-column="62" />
               <folding />
             </state>
           </provider>
@@ -138,21 +130,33 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/php/plugin.calendarimporter.php" />
-        <option value="$PROJECT_DIR$/config.php" />
-        <option value="$PROJECT_DIR$/js/plugin.calendarimporter.js" />
-        <option value="$PROJECT_DIR$/php/module.calendar.php" />
         <option value="$PROJECT_DIR$/js/data/CalendarHelper.js" />
-        <option value="$PROJECT_DIR$/js/data/Actions.js" />
-        <option value="$PROJECT_DIR$/js/dialogs/ImportPanel.js" />
-        <option value="$PROJECT_DIR$/js/settings/dialogs/CalSyncEditContentPanel.js" />
-        <option value="$PROJECT_DIR$/js/settings/SettingsWidget.js" />
-        <option value="$PROJECT_DIR$/js/settings/SettingsCalSyncWidget.js" />
-        <option value="$PROJECT_DIR$/js/settings/ui/CalSyncGrid.js" />
-        <option value="$PROJECT_DIR$/js/settings/dialogs/CalSyncEditPanel.js" />
         <option value="$PROJECT_DIR$/backend/sync.php" />
         <option value="$PROJECT_DIR$/backend/functions.php" />
         <option value="$PROJECT_DIR$/changelog.txt" />
+        <option value="$PROJECT_DIR$/Makefile" />
+        <option value="$PROJECT_DIR$/manifest.xml" />
+        <option value="$PROJECT_DIR$/php/upload.php" />
+        <option value="$PROJECT_DIR$/php/download.php" />
+        <option value="$PROJECT_DIR$/php/plugin.calendarimporter.php" />
+        <option value="$PROJECT_DIR$/build.xml" />
+        <option value="$PROJECT_DIR$/js/ABOUT.js" />
+        <option value="$PROJECT_DIR$/js/ui/ContextMenu.js" />
+        <option value="$PROJECT_DIR$/js/settings/SettingsWidget.js" />
+        <option value="$PROJECT_DIR$/js/settings/SettingsCalSyncWidget.js" />
+        <option value="$PROJECT_DIR$/js/settings/ui/CalSyncGrid.js" />
+        <option value="$PROJECT_DIR$/js/settings/ui/CalSyncPanel.js" />
+        <option value="$PROJECT_DIR$/js/settings/dialogs/CalSyncEditPanel.js" />
+        <option value="$PROJECT_DIR$/js/settings/dialogs/CalSyncEditContentPanel.js" />
+        <option value="$PROJECT_DIR$/js/dialogs/ImportPanel.js" />
+        <option value="$PROJECT_DIR$/js/dialogs/ImportContentPanel.js" />
+        <option value="$PROJECT_DIR$/js/data/ResponseHandler.js" />
+        <option value="$PROJECT_DIR$/js/data/Actions.js" />
+        <option value="$PROJECT_DIR$/js/data/timezones.js" />
+        <option value="$PROJECT_DIR$/backend/.htaccess" />
+        <option value="$PROJECT_DIR$/config.php" />
+        <option value="$PROJECT_DIR$/js/plugin.calendarimporter.js" />
+        <option value="$PROJECT_DIR$/php/module.calendar.php" />
       </list>
     </option>
   </component>
@@ -162,6 +166,9 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
+  <component name="PhpServers">
+    <servers />
+  </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds">
     <option name="x" value="65" />
@@ -213,6 +220,20 @@
               <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="calendarimporter" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="calendarimporter" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="php" />
+              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="calendarimporter" />
@@ -245,86 +266,6 @@
               <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="calendarimporter" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="calendarimporter" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="js" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="settings" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="calendarimporter" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="calendarimporter" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="js" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="settings" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="ui" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="calendarimporter" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="calendarimporter" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="js" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="settings" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dialogs" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="calendarimporter" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="calendarimporter" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="js" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="dialogs" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="calendarimporter" />
@@ -343,20 +284,6 @@
               <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="calendarimporter" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="calendarimporter" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="backend" />
-              <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
       <pane id="Scope" />
@@ -386,6 +313,12 @@
       <method />
     </configuration>
     <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+      <node-interpreter>project</node-interpreter>
+      <node-options />
+      <gulpfile />
+      <tasks />
+      <arguments />
+      <envs />
       <method />
     </configuration>
     <configuration default="true" type="js.build_tools.npm" factoryName="npm">
@@ -412,6 +345,9 @@
   <component name="ShelveChangesManager" show_recycled="false">
     <option name="remove_strategy" value="false" />
   </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="e7c9c2bb-66f1-4e37-904c-d33d8c113bde" name="Default" comment="" />
@@ -419,12 +355,13 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1477949602474</updated>
-      <workItem from="1477949603566" duration="9042000" />
+      <workItem from="1477949603566" duration="9204000" />
+      <workItem from="1480441197414" duration="4152000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9042000" />
+    <option name="totallyTimeSpent" value="13356000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="65" y="24" width="1792" height="999" extended-state="6" />
@@ -432,19 +369,19 @@
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
     </layout>
@@ -467,131 +404,17 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Makefile">
+    <entry file="file://$PROJECT_DIR$/js/settings/dialogs/CalSyncEditPanel.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/php/composer.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/php/upload.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/data/ResponseHandler.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-456">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="n#!!doc" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/php/module.calendar.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1057">
-          <caret line="467" column="64" selection-start-line="467" selection-start-column="64" selection-end-line="467" selection-end-column="64" />
-          <folding>
-            <element signature="n#__construct#0;n#CalendarModule#0;n#!!top" expanded="false" />
-            <element signature="n#execute#0;n#CalendarModule#0;n#!!top" expanded="false" />
-            <element signature="n#randomstring#0;n#CalendarModule#0;n#!!top" expanded="false" />
-            <element signature="n#getDurationStringFromMintues#0;n#CalendarModule#0;n#!!top" expanded="false" />
-            <element signature="n#exportCalendar#0;n#CalendarModule#0;n#!!top" expanded="false" />
-            <element signature="n#importCalendar#0;n#CalendarModule#0;n#!!top" expanded="false" />
-            <element signature="n#getAttachmentPath#0;n#CalendarModule#0;n#!!top" expanded="false" />
-            <element signature="n#loadCalendar#0;n#CalendarModule#0;n#!!top" expanded="false" />
-            <element signature="n#parseCalendarToArray#0;n#CalendarModule#0;n#!!top" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/config.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="60" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="60" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/php/plugin.calendarimporter.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="569">
-          <caret line="82" column="40" selection-start-line="82" selection-start-column="29" selection-end-line="82" selection-end-column="40" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/dialogs/ImportContentPanel.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-171">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="n#!!doc" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/data/CalendarHelper.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/dialogs/ImportPanel.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="332">
-          <caret line="245" column="12" selection-start-line="245" selection-start-column="12" selection-end-line="245" selection-end-column="226" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/data/Actions.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="133" column="67" selection-start-line="133" selection-start-column="22" selection-end-line="133" selection-end-column="67" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/settings/SettingsWidget.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="83" column="82" selection-start-line="83" selection-start-column="82" selection-end-line="83" selection-end-column="82" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/js/plugin.calendarimporter.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-51">
-          <caret line="262" column="12" selection-start-line="262" selection-start-column="12" selection-end-line="262" selection-end-column="12" />
+        <state relative-caret-position="1515">
+          <caret line="101" column="30" selection-start-line="101" selection-start-column="30" selection-end-line="101" selection-end-column="30" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/js/settings/ui/CalSyncGrid.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="504">
+        <state relative-caret-position="1275">
           <caret line="85" column="59" selection-start-line="85" selection-start-column="59" selection-end-line="85" selection-end-column="59" />
           <folding />
         </state>
@@ -599,12 +422,62 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/js/settings/SettingsCalSyncWidget.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="729">
+        <state relative-caret-position="1560">
           <caret line="104" column="16" selection-start-line="104" selection-start-column="16" selection-end-line="104" selection-end-column="142" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/backend/sync.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="24" column="47" selection-start-line="24" selection-start-column="47" selection-end-line="24" selection-end-column="47" />
+          <folding>
+            <element signature="e#21#926#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/changelog.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/manifest.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/backend/functions.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="75">
+          <caret line="5" column="26" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/backend/README.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/backend/config.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/js/settings/dialogs/CalSyncEditContentPanel.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -613,14 +486,14 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/js/settings/dialogs/CalSyncEditPanel.js">
+    <entry file="file://$PROJECT_DIR$/php/composer.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1480">
-          <caret line="101" column="30" selection-start-line="101" selection-start-column="30" selection-end-line="101" selection-end-column="30" />
-          <folding />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/js/data/CalendarHelper.js" />
     <entry file="file://$PROJECT_DIR$/backend/functions.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="75">
@@ -637,6 +510,139 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/backend/sync.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="24" column="47" selection-start-line="24" selection-start-column="47" selection-end-line="24" selection-end-column="47" />
+          <folding>
+            <element signature="e#21#926#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/changelog.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="56" selection-start-line="2" selection-start-column="56" selection-end-line="2" selection-end-column="56" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/ABOUT.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="744">
+          <caret line="61" column="71" selection-start-line="61" selection-start-column="71" selection-end-line="61" selection-end-column="71" />
+          <folding>
+            <marker date="1480442383471" expanded="true" signature="1214:1218" ph="&lt;" />
+            <marker date="1480442383471" expanded="true" signature="1244:1248" ph="&gt;" />
+            <marker date="1480442383471" expanded="true" signature="2881:2885" ph="&lt;" />
+            <marker date="1480442383471" expanded="true" signature="2905:2909" ph="&gt;" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/settings/SettingsCalSyncWidget.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="945">
+          <caret line="63" column="55" selection-start-line="63" selection-start-column="55" selection-end-line="63" selection-end-column="55" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/settings/ui/CalSyncGrid.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="435">
+          <caret line="44" column="93" selection-start-line="44" selection-start-column="57" selection-end-line="44" selection-end-column="93" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/settings/ui/CalSyncPanel.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="744">
+          <caret line="65" column="17" selection-start-line="65" selection-start-column="17" selection-end-line="65" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/settings/SettingsWidget.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="20" selection-end-column="3" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/settings/dialogs/CalSyncEditContentPanel.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="624">
+          <caret line="48" column="55" selection-start-line="48" selection-start-column="55" selection-end-line="48" selection-end-column="55" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/external/Ext.util.base64.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/settings/dialogs/CalSyncEditPanel.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="585">
+          <caret line="147" column="28" selection-start-line="147" selection-start-column="28" selection-end-line="147" selection-end-column="64" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/dialogs/ImportContentPanel.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="774">
+          <caret line="63" column="2" selection-start-line="63" selection-start-column="2" selection-end-line="63" selection-end-column="2" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/dialogs/ImportPanel.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/data/ResponseHandler.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/data/timezones.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-9350">
+          <caret line="90" column="87" selection-start-line="90" selection-start-column="87" selection-end-line="90" selection-end-column="87" />
+          <folding>
+            <element signature="n#!!doc" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/backend/README.txt">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -645,28 +651,111 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/backend/sync.php">
+    <entry file="file://$PROJECT_DIR$/backend/.htaccess">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="360">
-          <caret line="24" column="47" selection-start-line="24" selection-start-column="47" selection-end-line="24" selection-end-column="47" />
+        <state relative-caret-position="0">
+          <caret line="0" column="13" selection-start-line="0" selection-start-column="13" selection-end-line="0" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="0">
+            <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+            <folding />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/config.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="59" selection-start-line="2" selection-start-column="54" selection-end-line="2" selection-end-column="59" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/php/plugin.calendarimporter.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-90">
+          <caret line="36" column="5" selection-start-line="36" selection-start-column="5" selection-end-line="36" selection-end-column="5" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/php/upload.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-314">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
-            <element signature="e#21#926#0#PHP" expanded="true" />
+            <element signature="e#6#905#0#PHP" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/js/ui/ContextMenu.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="504">
+          <caret line="101" column="8" selection-start-line="101" selection-start-column="8" selection-end-line="104" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/php/download.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="28" column="35" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" />
+          <folding>
+            <element signature="e#7#908#0#PHP" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/data/Actions.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1191">
+          <caret line="45" column="63" selection-start-line="45" selection-start-column="63" selection-end-line="45" selection-end-column="63" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/js/plugin.calendarimporter.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="729">
+          <caret line="320" column="54" selection-start-line="320" selection-start-column="31" selection-end-line="320" selection-end-column="54" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/php/module.calendar.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="301">
+          <caret line="329" column="17" selection-start-line="329" selection-start-column="17" selection-end-line="329" selection-end-column="17" />
+          <folding>
+            <element signature="e#6#914#0#PHP" expanded="true" />
+            <element signature="n#__construct#0;n#CalendarModule#0;n#!!top" expanded="false" />
+            <element signature="n#execute#0;n#CalendarModule#0;n#!!top" expanded="false" />
+            <element signature="n#randomstring#0;n#CalendarModule#0;n#!!top" expanded="false" />
+            <element signature="n#getDurationStringFromMintues#0;n#CalendarModule#0;n#!!top" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Makefile">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="92" selection-start-line="1" selection-start-column="92" selection-end-line="1" selection-end-column="92" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/manifest.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/changelog.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
+        <state relative-caret-position="135">
+          <caret line="9" column="62" selection-start-line="9" selection-start-column="62" selection-end-line="9" selection-end-column="62" />
           <folding />
         </state>
       </provider>
diff --git a/Makefile b/Makefile
index fd5d35c..e903675 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,2 @@
 default:
-	ant deploy; cp -r /home/osboxes/Documents/kopano-webapp-3.2.0.285/deploy/plugins/calendarimporter /usr/share/kopano-webapp/plugins/
+	rm -rf /home/osboxes/Documents/kopano-webapp-3.2.0.285/deploy/plugins/calendarimporter; ant deploy; cp -r /home/osboxes/Documents/kopano-webapp-3.2.0.285/deploy/plugins/calendarimporter /usr/share/kopano-webapp/plugins/
diff --git a/backend/.htaccess b/backend/.htaccess
new file mode 100644
index 0000000..3418e55
--- /dev/null
+++ b/backend/.htaccess
@@ -0,0 +1 @@
+deny from all
\ No newline at end of file
diff --git a/build.xml b/build.xml
index dba3f1c..6b92c49 100644
--- a/build.xml
+++ b/build.xml
@@ -1,200 +1,247 @@
 <project default="all">
-	<property environment="env"/>
-	<property name="root-folder" value="${basedir}/../../"/>
-	<property name="tools-folder" value="${root-folder}/tools/"/>
-	<property name="target-folder" value="${root-folder}/deploy/plugins"/>
-	<property name="server-folder" value="${root-folder}/server"/>
+    <property environment="env"/>
+    <property name="root-folder" value="${basedir}/../.."/>
+    <property name="tools-folder" value="${root-folder}/tools/"/>
+    <property name="target-folder" value="${root-folder}/deploy/plugins"/>
+    <property name="server-folder" value="${root-folder}/server"/>
+    <property name="language-folder" value="${basedir}/languages"/>
 
-	<import file="${tools-folder}/antutil.xml"/>
+    <import file="${tools-folder}/antutil.xml"/>
 
-	<typedef file="${tools-folder}/antlib.xml">
-		<classpath>
-			<pathelement location="${tools-folder}/tools.jar"/>
-		</classpath>
-	</typedef>
+    <typedef file="${tools-folder}/antlib.xml">
+        <classpath>
+            <pathelement location="${tools-folder}/tools.jar"/>
+        </classpath>
+    </typedef>
 
-	<taskdef resource="net/sf/antcontrib/antcontrib.properties">
-		<classpath>
-			<pathelement location="${tools-folder}/lib/ant-contrib-1.0b3.jar"/>
-		</classpath>
-	</taskdef>
+    <taskdef resource="net/sf/antcontrib/antlib.xml">
+        <classpath>
+            <pathelement location="${tools-folder}/lib/ant-contrib-1.0b3.jar"/>
+        </classpath>
+    </taskdef>
 
-	<!-- Determine plugin name -->
-	<basename file="${basedir}" property="plugin"/>
+    <!-- Determine plugin name -->
+    <basename file="${basedir}" property="plugin"/>
 
-	<!-- The Plugin distribution files -->
-	<property name="plugin-folder" value="${plugin}"/>
-	<property name="plugin-debugfile" value="${plugin}-debug.js"/>
-	<property name="plugin-file" value="${plugin}.js"/>
+    <!-- The Plugin distribution files -->
+    <property name="plugin-folder" value="${plugin}"/>
+    <property name="plugin-debugfile" value="${plugin}-debug.js"/>
+    <property name="plugin-file" value="${plugin}.js"/>
 
-	<!-- The Plugin CSS files -->
-	<property name="plugin-css-folder" value="resources/css"/>
-	<property name="plugin-css-file" value="${plugin}.css"/>
+    <!-- The Plugin CSS files -->
+    <property name="plugin-css-folder" value="resources/css"/>
+    <property name="plugin-css-file" value="${plugin}.css"/>
 
-	<!-- Meta target -->
-	<target name="all" depends="concat, compress"/>
+    <!-- Meta target -->
+    <target name="all" depends="concat, compress"/>
 
-	<!-- Clean -->
-	<target name="clean">
-		<delete includeemptydirs="true" failonerror="false">
-			<!-- Delete the Plugin files -->
-			<fileset dir="${target-folder}/${plugin-folder}/js">
-				<include name="${plugin-file}"/>
-				<include name="${plugin-debugfile}"/>
-			</fileset>
-		</delete>
-	</target>
+    <!-- Clean -->
+    <target name="clean">
+        <delete includeemptydirs="true" failonerror="false">
+            <!-- Delete the Plugin files -->
+            <fileset dir="${target-folder}/${plugin-folder}/js">
+                <include name="${plugin-file}"/>
+                <include name="${plugin-debugfile}"/>
+            </fileset>
+        </delete>
+    </target>
 
-	<!-- Concatenates JavaScript files with automatic dependency generation -->
-	<target name="concat">
-		<!-- Concatenate plugin JS file -->
-		<if>
-			<available file="js" type="dir" />
-			<then>
-				<mkdir dir="${target-folder}/${plugin-folder}/js"/>
-				<echo message="Concatenating: ${plugin-debugfile}"/>
-				<zConcat outputFolder="${target-folder}/${plugin-folder}/js" outputFile="${plugin-debugfile}" prioritize="\w+">
-					<concatfiles>
-						<fileset dir="js" includes="**/*.js" />
-					</concatfiles>
-				</zConcat>
-			</then>
-		</if>
+    <!-- Concatenates JavaScript files with automatic dependency generation -->
+    <target name="concat">
+        <!-- Concatenate plugin JS file -->
+        <if>
+            <available file="js" type="dir"/>
+            <then>
+                <mkdir dir="${target-folder}/${plugin-folder}/js"/>
+                <echo message="Concatenating: ${plugin-debugfile}"/>
+                <zConcat outputFolder="${target-folder}/${plugin-folder}/js" outputFile="${plugin-debugfile}"
+                         prioritize="\w+">
+                    <concatfiles>
+                        <fileset dir="js" includes="**/*.js"/>
+                    </concatfiles>
+                </zConcat>
+            </then>
+        </if>
 
-		<!-- Concatenate plugin CSS files -->
-		<if>
-			<available file="${plugin-css-folder}" type="dir" />
-			<then>
-				<mkdir dir="${target-folder}/${plugin-folder}/${plugin-css-folder}"/>
-				<echo message="Concatenating: ${plugin-css-file}"/>
-				<zConcat outputFolder="${target-folder}/${plugin-folder}/${plugin-css-folder}" outputFile="${plugin-css-file}">
-					<concatfiles>
-						<fileset dir="${plugin-css-folder}" includes="**/*.css" />
-					</concatfiles>
-				</zConcat>
-			</then>
-		</if>
-	</target>
+        <!-- Concatenate plugin CSS files -->
+        <if>
+            <available file="${plugin-css-folder}" type="dir"/>
+            <then>
+                <mkdir dir="${target-folder}/${plugin-folder}/${plugin-css-folder}"/>
+                <echo message="Concatenating: ${plugin-css-file}"/>
+                <zConcat outputFolder="${target-folder}/${plugin-folder}/${plugin-css-folder}"
+                         outputFile="${plugin-css-file}">
+                    <concatfiles>
+                        <fileset dir="${plugin-css-folder}" includes="**/*.css"/>
+                    </concatfiles>
+                </zConcat>
+            </then>
+        </if>
+    </target>
 
-	<!-- Preformat the Concatenated Javascript files to improve compilation -->
-	<target name="preformat" depends="concat">
-		<if>
-			<available file="${target-folder}/${plugin-folder}/js/${plugin-debugfile}" type="file" />
-			<then>
-				<echo message="Preformatting: ${plugin-debugfile}"/>
-				<replaceregexp byline="true">
-					<regexp pattern="(^[ ,\t]*\*[ ,\t]@.*)\{(.*)\[\]\}"/>
-					<substitution expression="\1{\2\|Array}"/>
-					<fileset dir="${target-folder}/${plugin-folder}/js" includes="${plugin-debugfile}"/>
-				</replaceregexp>
-			</then>
-		</if>
-	</target>
+    <!-- Preformat the Concatenated Javascript files to improve compilation -->
+    <target name="preformat" depends="concat">
+        <if>
+            <available file="${target-folder}/${plugin-folder}/js/${plugin-debugfile}" type="file"/>
+            <then>
+                <echo message="Preformatting: ${plugin-debugfile}"/>
+                <replaceregexp byline="true">
+                    <regexp pattern="(^[ ,\t]*\*[ ,\t]@.*)\{(.*)\[\]\}"/>
+                    <substitution expression="\1{\2\|Array}"/>
+                    <fileset dir="${target-folder}/${plugin-folder}/js" includes="${plugin-debugfile}"/>
+                </replaceregexp>
+            </then>
+        </if>
+    </target>
 
-	<!-- Compress JavaScript -->
-	<target name="compress" depends="preformat">
-		<if>
-			<available file="${target-folder}/${plugin-folder}/js/${plugin-debugfile}" type="file" />
-			<then>
-				<echo message="Compiling: ${plugin-debugfile}" />
-				<zCompile inputFolder="${target-folder}/${plugin-folder}/js" inputFile="${plugin-debugfile}" outputFolder="${target-folder}/${plugin-folder}/js" outputFile="${plugin-file}">
-					<externs>
-						var Ext = {};
-						var Zarafa = {};
-						var container = {};
-						var _ = function(key, domain) {};
-						var dgettext = function(domain, msgid) {};
-						var dngettext = function(domain, msgid, msgid_plural, count) {};
-						var dnpgettext = function(domain, msgctxt, msgid, msgid_plural, count) {};
-						var dpgettext = function(domain, msgctxt, msgid) {};
-						var ngettext = function(msgid, msgid_plural, count) {};
-						var npgettext = function(msgctxt, msgid, msgid_plural, count) {};
-						var pgettext = function(msgctxt, msgid) {};
-					</externs>
-				</zCompile>
-			</then>
-		</if>
-	</target>
+    <!-- Compress JavaScript -->
+    <target name="compress" depends="preformat">
+        <if>
+            <available file="${target-folder}/${plugin-folder}/js/${plugin-debugfile}" type="file"/>
+            <then>
+                <echo message="Compiling: ${plugin-debugfile}"/>
+                <zCompile inputFolder="${target-folder}/${plugin-folder}/js" inputFile="${plugin-debugfile}"
+                          outputFolder="${target-folder}/${plugin-folder}/js" outputFile="${plugin-file}">
+                    <externs>
+                        var Ext = {};
+                        var Zarafa = {};
+                        var container = {};
+                        var _ = function(key, domain) {};
+                        var dgettext = function(domain, msgid) {};
+                        var dngettext = function(domain, msgid, msgid_plural, count) {};
+                        var dnpgettext = function(domain, msgctxt, msgid, msgid_plural, count) {};
+                        var dpgettext = function(domain, msgctxt, msgid) {};
+                        var ngettext = function(msgid, msgid_plural, count) {};
+                        var npgettext = function(msgctxt, msgid, msgid_plural, count) {};
+                        var pgettext = function(msgctxt, msgid) {};
+                    </externs>
+                </zCompile>
+            </then>
+        </if>
+    </target>
 
-	<!-- syntax check all PHP files -->
-	<target name="validate">
-		<if>
-			<available file="php" filepath="${env.PATH}" />
-			<then>
-				<if>
-					<available file="config.php" type="file" />
-					<then>
-						<antcall target="syntax-check">
-							<param name="file" value="config.php"/>
-						</antcall>
-					</then>
-				</if>
-				<if>
-					<available file="php" type="dir" />
-					<then>
-						<foreach target="syntax-check" param="file">
-							<path>
-								<fileset dir=".">
-									<exclude name="php/vendor/**" />
-									<include name="**/*.php"/>
-								</fileset>
-							</path>
-						</foreach>
-					</then>
-				</if>
-			</then>
-			<else>
-				<echo message="WARNING: PHP not available, not performing syntax-check on php files"/>
-			</else>
-		</if>
-	</target>
+    <!-- syntax check all PHP files -->
+    <target name="validate">
+        <if>
+            <available file="php" filepath="${env.PATH}"/>
+            <then>
+                <if>
+                    <available file="config.php" type="file"/>
+                    <then>
+                        <antcall target="syntax-check">
+                            <param name="file" value="config.php"/>
+                        </antcall>
+                    </then>
+                </if>
+                <if>
+                    <available file="php" type="dir"/>
+                    <then>
+                        <foreach target="syntax-check" param="file">
+                            <path>
+                                <fileset dir=".">
+                                    <exclude name="php/vendor/**"/>
+                                    <include name="**/*.php"/>
+                                </fileset>
+                            </path>
+                        </foreach>
+                    </then>
+                </if>
+            </then>
+            <else>
+                <echo message="WARNING: PHP not available, not performing syntax-check on php files"/>
+            </else>
+        </if>
+    </target>
 
-	<target name="syntax-check">
-		<echo message="validating ${file}"/>
-		<exec executable="php" failonerror="true">
-			<arg value="-l"/>
-			<arg value="${file}"/>
-		</exec>
-	</target>
+    <target name="syntax-check">
+        <echo message="validating ${file}"/>
+        <exec executable="php" failonerror="true">
+            <arg value="-l"/>
+            <arg value="${file}"/>
+        </exec>
+    </target>
 
-	<!-- Install all files into the target folder -->
-	<target name="deploy" depends="compress, validate">
-		<mkdir dir="${target-folder}/${plugin-folder}"/>
+    <!-- Generate language files -->
+    <target name="language">
+        <if>
+            <available file="msgfmt" filepath="${env.PATH}"/>
+            <then>
+                <for param="file" parallel="true">
+                    <fileset dir="${language-folder}">
+                        <include name="**/LC_MESSAGES/*.po"/>
+                    </fileset>
+                    <sequential>
+                        <antcall target="msgfmt">
+                            <param name="file" value="@{file}"/>
+                        </antcall>
+                    </sequential>
+                </for>
+            </then>
+            <else>
+                <echo message="WARNING: msgfmt not available, not generating *.mo files for translations"/>
+                <!-- just copy files -->
+                <copy todir="${target-folder}/${plugin-folder}">
+                    <fileset dir=".">
+                        <include name="languages/**/*.mo"/>
+                        <include name="languages/**/*.txt"/>
+                    </fileset>
+                </copy>
+            </else>
+        </if>
+    </target>
 
-		<!-- Copy (and validate) manifest.xml -->
-		<if>
-			<available file="xmllint" filepath="${env.PATH}" />
-			<then>
-				<exec executable="xmllint" output="${target-folder}/${plugin-folder}/manifest.xml" failonerror="true">
-					<arg value="--valid"/>
-					<arg value="--path"/>
-					<arg value="${server-folder}"/>
-					<arg value="manifest.xml"/>
-				</exec>
-			</then>
-			<else>
-				<echo message="WARNING: xmllint not available, not performing syntax-check on manifest.xml"/>
-				<!-- xmllint is not available, so we must copy the file manually -->
-				<copy todir="${target-folder}/${plugin-folder}">
-					<fileset dir=".">
-						<include name="manifest.xml"/>
-					</fileset>
-				</copy>
-			</else>
-		</if>
+    <target name="msgfmt">
+        <propertyregex property="outfile" input="${file}" regexp=".*\/(languages\/.*)\.po"
+                       replace="${target-folder}/${plugin-folder}/\1\.mo"/>
+        <echo message="Converting ${file} to ${outfile}"/>
+        <dirname property="outdir" file="${outfile}"/>
+        <mkdir dir="${outdir}"/>
+        <exec executable="msgfmt" failonerror="true">
+            <arg value="-v"/>
+            <arg value="-o"/>
+            <arg value="${outfile}"/>
+            <arg value="${file}"/>
+        </exec>
+    </target>
 
-		<!-- copy files -->
-		<copy todir="${target-folder}/${plugin-folder}">
-			<fileset dir=".">
-				<include name="resources/**/*.*"/>
-				<include name="external/**/*.*"/>
-				<include name="php/**/*.php"/>
-				<include name="config.php"/>
-				<!-- exclude the ant script -->
-				<exclude name="build.xml"/>
-				<!-- CSS is generated during build -->
-				<exclude name="resources/css/*.*"/>
-			</fileset>
-		</copy>
-	</target>
+    <!-- Install all files into the target folder -->
+    <target name="deploy" depends="compress, validate, language">
+        <mkdir dir="${target-folder}/${plugin-folder}"/>
+
+        <!-- Copy (and validate) manifest.xml -->
+        <if>
+            <available file="xmllint" filepath="${env.PATH}"/>
+            <then>
+                <exec executable="xmllint" output="${target-folder}/${plugin-folder}/manifest.xml" failonerror="true">
+                    <arg value="--valid"/>
+                    <arg value="--path"/>
+                    <arg value="${server-folder}"/>
+                    <arg value="manifest.xml"/>
+                </exec>
+            </then>
+            <else>
+                <echo message="WARNING: xmllint not available, not performing syntax-check on manifest.xml"/>
+                <!-- xmllint is not available, so we must copy the file manually -->
+                <copy todir="${target-folder}/${plugin-folder}">
+                    <fileset dir=".">
+                        <include name="manifest.xml"/>
+                    </fileset>
+                </copy>
+            </else>
+        </if>
+
+        <!-- copy files -->
+        <copy todir="${target-folder}/${plugin-folder}">
+            <fileset dir=".">
+                <include name="resources/**/*.*"/>
+                <include name="external/**/*.*"/>
+                <include name="php/**/*.php"/>
+                <include name="config.php"/>
+                <!-- exclude the ant script -->
+                <exclude name="build.xml"/>
+                <!-- CSS is generated during build -->
+                <exclude name="resources/css/*.*"/>
+            </fileset>
+        </copy>
+    </target>
 </project>
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index 1e2a725..92fe510 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+calendarimporter 2.2.1:
+ - finally supporting Kopano Webapp 3.1.x
+ - translation to german added
+
 calendarimporter 2.2.0:
  - support for Kopano Webapp 3.1.1
  - Code rework
diff --git a/config.php b/config.php
index a1b8f1b..2aabcd8 100644
--- a/config.php
+++ b/config.php
@@ -1,13 +1,12 @@
 <?php
-	/** Disable the import plugin for all clients */
-	define('PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE', true);
-	/** Disable the sync feature for all clients */
-	define('PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE_SYNC', true); // not yet implemented
-	
-	/** The default calendar to import to*/
-	define('PLUGIN_CALENDARIMPORTER_DEFAULT', "Kalender");
-	define('PLUGIN_CALENDARIMPORTER_DEFAULT_TIMEZONE', "Europe/Vienna");
-	
-	/** Tempory path for uploaded files... */
-	define('PLUGIN_CALENDARIMPORTER_TMP_UPLOAD', "/var/lib/kopano-webapp/tmp/");
-?>
+/** Disable the import plugin for all clients */
+define('PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE', false);
+/** Disable the sync feature for all clients */
+define('PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE_SYNC', true);
+
+/** The default calendar to import to*/
+define('PLUGIN_CALENDARIMPORTER_DEFAULT', "Kalender");
+define('PLUGIN_CALENDARIMPORTER_DEFAULT_TIMEZONE', "Europe/Vienna");
+
+/** Tempory path for uploaded files... */
+define('PLUGIN_CALENDARIMPORTER_TMP_UPLOAD', "/var/lib/kopano-webapp/tmp/");
diff --git a/js/ABOUT.js b/js/ABOUT.js
index 984c28b..b422e4d 100644
--- a/js/ABOUT.js
+++ b/js/ABOUT.js
@@ -1,5 +1,5 @@
 /**
- * ABOUT.js zarafa calender to ics im/exporter
+ * ABOUT.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
  * Copyright (C) 2012-2016 Christoph Haas
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
- 
+
 Ext.namespace('Zarafa.plugins.calendarimporter');
 
 /**
@@ -29,38 +29,38 @@ Ext.namespace('Zarafa.plugins.calendarimporter');
  * The copyright string holding the copyright notice for the Zarafa calendarimporter Plugin.
  */
 Zarafa.plugins.calendarimporter.ABOUT = ""
-	+ "<p>Copyright (C) 2012-2016  Christoph Haas &lt;christoph.h@sprinternet.at&gt;</p>"
+    + "<p>Copyright (C) 2012-2016  Christoph Haas &lt;christoph.h@sprinternet.at&gt;</p>"
 
-	+ "<p>This program is free software; you can redistribute it and/or "
-	+ "modify it under the terms of the GNU Lesser General Public "
-	+ "License as published by the Free Software Foundation; either "
-	+ "version 2.1 of the License, or (at your option) any later version.</p>"
+    + "<p>This program is free software; you can redistribute it and/or "
+    + "modify it under the terms of the GNU Lesser General Public "
+    + "License as published by the Free Software Foundation; either "
+    + "version 2.1 of the License, or (at your option) any later version.</p>"
 
-	+ "<p>This program is distributed in the hope that it will be useful, "
-	+ "but WITHOUT ANY WARRANTY; without even the implied warranty of "
-	+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
-	+ "Lesser General Public License for more details.</p>"
+    + "<p>This program is distributed in the hope that it will be useful, "
+    + "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+    + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU "
+    + "Lesser General Public License for more details.</p>"
 
-	+ "<p>You should have received a copy of the GNU Lesser General Public "
-	+ "License along with this program; if not, write to the Free Software "
-	+ "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</p>"
+    + "<p>You should have received a copy of the GNU Lesser General Public "
+    + "License along with this program; if not, write to the Free Software "
+    + "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</p>"
 
-	+ "<hr />"
+    + "<hr />"
 
-	+ "<p>The calendarimporter plugin contains the following third-party components:</p>"
-	
-	+ "<h1>iCalcreator v2.16.12</h1>"
+    + "<p>The calendarimporter plugin contains the following third-party components:</p>"
 
-	+ "<p>Copyright 2007-2013 Kjell-Inge Gustafsson kigkonsult</p>"
+    + "<h1>iCalcreator v2.16.12</h1>"
 
-	+ "<p>This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.</p>"
-	
-	+ "<p>This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.</p>"
-	
-	+ "<h1>Ics-parser</h1>"
+    + "<p>Copyright 2007-2013 Kjell-Inge Gustafsson kigkonsult</p>"
 
-	+ "<p>Copyright 2002-2007 Martin Thoma <info@martin-thoma.de></p>"
+    + "<p>This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.</p>"
 
-	+ "<p>Licensed under the MIT License.</p>"
-	
-	+ "<p>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p>";
\ No newline at end of file
+    + "<p>This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.</p>"
+
+    + "<h1>Ics-parser</h1>"
+
+    + "<p>Copyright 2002-2007 Martin Thoma &lt;info@martin-thoma.de&gt;</p>"
+
+    + "<p>Licensed under the MIT License.</p>"
+
+    + "<p>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p>";
\ No newline at end of file
diff --git a/js/data/Actions.js b/js/data/Actions.js
index 33c7fd4..f52f6d2 100644
--- a/js/data/Actions.js
+++ b/js/data/Actions.js
@@ -34,96 +34,96 @@ Ext.namespace('Zarafa.plugins.calendarimporter.data');
  * @singleton
  */
 Zarafa.plugins.calendarimporter.data.Actions = {
-	/**
-	 * Callback for the export request.
-	 * @param {Object} response
-	 */
-	downloadICS: function (response) {
-		if (response.status == false) {
-			Zarafa.common.dialogs.MessageBox.show({
-				title  : dgettext('plugin_files', 'Warning'),
-				msg    : dgettext('plugin_files', response.message),
-				icon   : Zarafa.common.dialogs.MessageBox.WARNING,
-				buttons: Zarafa.common.dialogs.MessageBox.OK
-			});
-		} else {
-			var downloadFrame = Ext.getBody().createChild({
-				tag: 'iframe',
-				cls: 'x-hidden'
-			});
+    /**
+     * Callback for the export request.
+     * @param {Object} response
+     */
+    downloadICS: function (response) {
+        if (response.status == false) {
+            Zarafa.common.dialogs.MessageBox.show({
+                title: dgettext('plugin_calendarimporter', 'Warning'),
+                msg: response.message,
+                icon: Zarafa.common.dialogs.MessageBox.WARNING,
+                buttons: Zarafa.common.dialogs.MessageBox.OK
+            });
+        } else {
+            var downloadFrame = Ext.getBody().createChild({
+                tag: 'iframe',
+                cls: 'x-hidden'
+            });
 
-			var url = document.URL;
-			var link = url.substring(0, url.lastIndexOf('/') + 1);
+            var url = document.URL;
+            var link = url.substring(0, url.lastIndexOf('/') + 1);
 
-			link += "index.php?sessionid=" + container.getUser().getSessionId() + "&load=custom&name=download_ics";
-			link = Ext.urlAppend(link, "token=" + encodeURIComponent(response.download_token));
-			link = Ext.urlAppend(link, "filename=" + encodeURIComponent(response.filename));
+            link += "index.php?sessionid=" + container.getUser().getSessionId() + "&load=custom&name=download_ics";
+            link = Ext.urlAppend(link, "token=" + encodeURIComponent(response.download_token));
+            link = Ext.urlAppend(link, "filename=" + encodeURIComponent(response.filename));
 
-			downloadFrame.dom.contentWindow.location = link;
-		}
-	},
+            downloadFrame.dom.contentWindow.location = link;
+        }
+    },
 
-	/**
-	 * Get all calendar folders.
-	 * @param {boolean} asDropdownStore If true, a simple array store will be returned.
-	 * @returns {*}
-	 */
-	getAllCalendarFolders: function (asDropdownStore) {
-		asDropdownStore = Ext.isEmpty(asDropdownStore) ? false : asDropdownStore;
+    /**
+     * Get all calendar folders.
+     * @param {boolean} asDropdownStore If true, a simple array store will be returned.
+     * @returns {*}
+     */
+    getAllCalendarFolders: function (asDropdownStore) {
+        asDropdownStore = Ext.isEmpty(asDropdownStore) ? false : asDropdownStore;
 
-		var allFolders = [];
+        var allFolders = [];
 
-		var inbox = container.getHierarchyStore().getDefaultStore();
-		var pub = container.getHierarchyStore().getPublicStore();
+        var inbox = container.getHierarchyStore().getDefaultStore();
+        var pub = container.getHierarchyStore().getPublicStore();
 
-		if (!Ext.isEmpty(inbox.subStores) && inbox.subStores.folders.totalLength > 0) {
-			for (var i = 0; i < inbox.subStores.folders.totalLength; i++) {
-				var folder = inbox.subStores.folders.getAt(i);
-				if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Appointment") {
-					if (asDropdownStore) {
-						allFolders.push([
-							folder.get("entryid"),
-							folder.get("display_name")
-						]);
-					} else {
-						allFolders.push({
-							display_name : folder.get("display_name"),
-							entryid      : folder.get("entryid"),
-							store_entryid: folder.get("store_entryid"),
-							is_public    : false
-						});
-					}
-				}
-			}
-		}
+        if (!Ext.isEmpty(inbox.subStores) && inbox.subStores.folders.totalLength > 0) {
+            for (var i = 0; i < inbox.subStores.folders.totalLength; i++) {
+                var folder = inbox.subStores.folders.getAt(i);
+                if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Appointment") {
+                    if (asDropdownStore) {
+                        allFolders.push([
+                            folder.get("entryid"),
+                            folder.get("display_name")
+                        ]);
+                    } else {
+                        allFolders.push({
+                            display_name: folder.get("display_name"),
+                            entryid: folder.get("entryid"),
+                            store_entryid: folder.get("store_entryid"),
+                            is_public: false
+                        });
+                    }
+                }
+            }
+        }
 
-		if (!Ext.isEmpty(pub.subStores) && pub.subStores.folders.totalLength > 0) {
-			for (var j = 0; j < pub.subStores.folders.totalLength; j++) {
-				var folder = pub.subStores.folders.getAt(j);
-				if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Appointment") {
-					if (asDropdownStore) {
-						allFolders.push([
-							folder.get("entryid"),
-							folder.get("display_name") + " (Public)"
-						]);
-					} else {
-						allFolders.push({
-							display_name : folder.get("display_name"),
-							entryid      : folder.get("entryid"),
-							store_entryid: folder.get("store_entryid"),
-							is_public    : true
-						});
-					}
-				}
-			}
-		}
+        if (!Ext.isEmpty(pub.subStores) && pub.subStores.folders.totalLength > 0) {
+            for (var j = 0; j < pub.subStores.folders.totalLength; j++) {
+                var folder = pub.subStores.folders.getAt(j);
+                if (!Ext.isEmpty(folder) && folder.get("container_class") == "IPF.Appointment") {
+                    if (asDropdownStore) {
+                        allFolders.push([
+                            folder.get("entryid"),
+                            folder.get("display_name") + " (Public)"
+                        ]);
+                    } else {
+                        allFolders.push({
+                            display_name: folder.get("display_name"),
+                            entryid: folder.get("entryid"),
+                            store_entryid: folder.get("store_entryid"),
+                            is_public: true
+                        });
+                    }
+                }
+            }
+        }
 
-		if (asDropdownStore) {
-			return allFolders.sort(Zarafa.plugins.calendarimporter.data.Actions.dynamicSort(1));
-		} else {
-			return allFolders;
-		}
-	},
+        if (asDropdownStore) {
+            return allFolders.sort(Zarafa.plugins.calendarimporter.data.Actions.dynamicSort(1));
+        } else {
+            return allFolders;
+        }
+    },
 
     /**
      * Return a calendar folder element by name.
@@ -159,20 +159,20 @@ Zarafa.plugins.calendarimporter.data.Actions = {
         return container.getHierarchyStore().getDefaultFolder('calendar');
     },
 
-	/**
-	 * Dynamic sort function, sorts by property name.
-	 * @param {string|int} property
-	 * @returns {Function}
-	 */
-	dynamicSort: function (property) {
-		var sortOrder = 1;
-		if (property[0] === "-") {
-			sortOrder = -1;
-			property = property.substr(1);
-		}
-		return function (a, b) {
-			var result = (a[property].toLowerCase() < b[property].toLowerCase()) ? -1 : (a[property].toLowerCase() > b[property].toLowerCase()) ? 1 : 0;
-			return result * sortOrder;
-		}
-	}
+    /**
+     * Dynamic sort function, sorts by property name.
+     * @param {string|int} property
+     * @returns {Function}
+     */
+    dynamicSort: function (property) {
+        var sortOrder = 1;
+        if (property[0] === "-") {
+            sortOrder = -1;
+            property = property.substr(1);
+        }
+        return function (a, b) {
+            var result = (a[property].toLowerCase() < b[property].toLowerCase()) ? -1 : (a[property].toLowerCase() > b[property].toLowerCase()) ? 1 : 0;
+            return result * sortOrder;
+        }
+    }
 };
diff --git a/js/data/ResponseHandler.js b/js/data/ResponseHandler.js
index 0a2b823..54365a4 100644
--- a/js/data/ResponseHandler.js
+++ b/js/data/ResponseHandler.js
@@ -1,5 +1,5 @@
 /**
- * ResponseHandler.js zarafa calender to ics im/exporter
+ * ResponseHandler.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
  * Copyright (C) 2012-2016 Christoph Haas
@@ -34,52 +34,52 @@ Ext.namespace('Zarafa.plugins.calendarimporter.data');
  * Calendar specific response handler.
  */
 Zarafa.plugins.calendarimporter.data.ResponseHandler = Ext.extend(Zarafa.core.data.AbstractResponseHandler, {
-	/**
-	 * @cfg {Function} successCallback The function which
-	 * will be called after success request.
-	 */
-	successCallback: null,
+    /**
+     * @cfg {Function} successCallback The function which
+     * will be called after success request.
+     */
+    successCallback: null,
 
-	/**
-	 * Call the successCallback callback function.
-	 * @param {Object} response Object contained the response data.
-	 */
-	doExport: function (response) {
-		this.successCallback(response);
-	},
+    /**
+     * Call the successCallback callback function.
+     * @param {Object} response Object contained the response data.
+     */
+    doExport: function (response) {
+        this.successCallback(response);
+    },
 
-	/**
-	 * Call the successCallback callback function.
-	 * @param {Object} response Object contained the response data.
-	 */
-	doLoad: function (response) {
-		this.successCallback(response);
-	},
+    /**
+     * Call the successCallback callback function.
+     * @param {Object} response Object contained the response data.
+     */
+    doLoad: function (response) {
+        this.successCallback(response);
+    },
 
-	/**
-	 * Call the successCallback callback function.
-	 * @param {Object} response Object contained the response data.
-	 */
-	doImport: function (response) {
-		this.successCallback(response);
-	},
+    /**
+     * Call the successCallback callback function.
+     * @param {Object} response Object contained the response data.
+     */
+    doImport: function (response) {
+        this.successCallback(response);
+    },
 
-	/**
-	 * Call the successCallback callback function.
-	 * @param {Object} response Object contained the response data.
-	 */
-	doImportattachment: function (response) {
-		this.successCallback(response);
-	},
+    /**
+     * Call the successCallback callback function.
+     * @param {Object} response Object contained the response data.
+     */
+    doImportattachment: function (response) {
+        this.successCallback(response);
+    },
 
-	/**
-	 * In case exception happened on server, server will return
-	 * exception response with the code of exception.
-	 * @param {Object} response Object contained the response data.
-	 */
-	doError: function (response) {
-		alert("error response code: " + response.error.info.code);
-	}
+    /**
+     * In case exception happened on server, server will return
+     * exception response with the code of exception.
+     * @param {Object} response Object contained the response data.
+     */
+    doError: function (response) {
+        alert("error response code: " + response.error.info.code);
+    }
 });
 
 Ext.reg('calendarimporter.calendarresponsehandler', Zarafa.plugins.calendarimporter.data.ResponseHandler);
\ No newline at end of file
diff --git a/js/data/timezones.js b/js/data/timezones.js
index 3e36004..d4d869d 100644
--- a/js/data/timezones.js
+++ b/js/data/timezones.js
@@ -1,5 +1,5 @@
 /**
- * timezones.js zarafa calender to ics im/exporter
+ * timezones.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
  * Copyright (C) 2012-2016 Christoph Haas
@@ -29,739 +29,739 @@ Ext.namespace("Zarafa.plugins.calendarimporter.data");
 
 Zarafa.plugins.calendarimporter.data.Timezones = Ext.extend(Object, {
 
-	store: [
-		['Pacific/Midway', '(UTC -11:00) Midway, Niue, Pago Pago', -660],
-		['Pacific/Fakaofo', '(UTC -10:00) Adak, Fakaofo, Honolulu, Johnston, Rarotonga, Tahiti', -600],
-		['Pacific/Marquesas', '(UTC -09:30) Marquesas', -570],
-		['America/Anchorage', '(UTC -09:00) Gambier, Anchorage, Juneau, Nome, Sitka, Yakutat', -540],
-		['America/Dawson', '(UTC -08:00) Dawson, Los Angeles, Tijuana, Vancouver, Whitehorse, Santa Isabel, Metlakatla, Pitcairn', -480],
-		['America/Dawson_Creek', '(UTC -07:00) Dawson Creek, Hermosillo, Phoenix, Chihuahua, Mazatlan, Boise, Cambridge Bay, Denver, Edmonton, Inuvik, Ojinaga, Shiprock, Yellowknife', -420],
-		['America/Chicago', '(UTC -06:00) Beulah, Center, Chicago, Knox, Matamoros, Menominee, New Salem, Rainy River, Rankin Inlet, Resolute, Tell City, Winnipeg', -360],
-		['America/Belize', '(UTC -06:00) Belize, Costa Rica, El Salvador, Galapagos, Guatemala, Managua, Regina, Swift Current, Tegucigalpa', -360],
-		['Pacific/Easter', '(UTC -06:00) Easter', -360],
-		['America/Bahia_Banderas', '(UTC -06:00) Bahia Banderas, Cancun, Merida, Mexico City, Monterrey', -360],
-		['America/Detroit', '(UTC -05:00) Detroit, Grand Turk, Indianapolis, Iqaluit, Louisville, Marengo, Monticello, Montreal, Nassau, New York, Nipigon, Pangnirtung, Petersburg, Thunder Bay, Toronto, Vevay, Vincennes, Winamac', -300],
-		['America/Atikokan', '(UTC -05:00) Atikokan, Bogota, Cayman, Guayaquil, Jamaica, Lima, Panama, Port-au-Prince', -300],
-		['America/Havana', '(UTC -05:00) Havana', -300],
-		['America/Caracas', '(UTC -04:30) Caracas', -270],
-		['America/Glace_Bay', '(UTC -04:00) Bermuda, Glace Bay, Goose Bay, Halifax, Moncton, Thule', -240],
-		['Atlantic/Stanley', '(UTC -04:00) Stanley', -240],
-		['America/Santiago', '(UTC -04:00) Palmer, Santiago', -240],
-		['America/Anguilla', '(UTC -04:00) Anguilla, Antigua, Aruba, Barbados, Blanc-Sablon, Boa Vista, Curacao, Dominica, Eirunepe, Grenada, Guadeloupe, Guyana, Kralendijk, La Paz, Lower Princes, Manaus, Marigot, Martinique, Montserrat, Port of Spain, Porto Velho, Puerto Rico, Rio Branco, Santo Domingo, St Barthelemy, St Kitts, St Lucia, St Thomas, St Vincent, Tortola', -240],
-		['America/Campo_Grande', '(UTC -04:00) Campo Grande, Cuiaba', -240],
-		['America/Asuncion', '(UTC -04:00) Asuncion', -240],
-		['America/St_Johns', '(UTC -03:30) St Johns', -210],
-		['America/Sao_Paulo', '(UTC -03:00) Sao Paulo', -180],
-		['America/Araguaina', '(UTC -03:00) Araguaina, Bahia, Belem, Buenos Aires, Catamarca, Cayenne, Cordoba, Fortaleza, Jujuy, La Rioja, Maceio, Mendoza, Paramaribo, Recife, Rio Gallegos, Rothera, Salta, San Juan, Santarem, Tucuman, Ushuaia', -180],
-		['America/Montevideo', '(UTC -03:00) Montevideo', -180],
-		['America/Godthab', '(UTC -03:00) Godthab', -180],
-		['America/Argentina/San_Luis', '(UTC -03:00) San Luis', -180],
-		['America/Miquelon', '(UTC -03:00) Miquelon', -180],
-		['America/Noronha', '(UTC -02:00) Noronha, South Georgia', -120],
-		['Atlantic/Cape_Verde', '(UTC -01:00) Cape Verde', -60],
-		['America/Scoresbysund', '(UTC -01:00) Azores, Scoresbysund', -60],
-		['Atlantic/Canary', '(UTC) Canary, Dublin, Faroe, Guernsey, Isle of Man, Jersey, Lisbon, London, Madeira', 0],
-		['Africa/Abidjan', '(UTC) Abidjan, Accra, Bamako, Banjul, Bissau, Casablanca, Conakry, Dakar, Danmarkshavn, El Aaiun, Freetown, Lome, Monrovia, Nouakchott, Ouagadougou, Reykjavik, Sao Tome, St Helena', 0],
-		['Africa/Algiers', '(UTC +01:00) Algiers, Bangui, Brazzaville, Douala, Kinshasa, Lagos, Libreville, Luanda, Malabo, Ndjamena, Niamey, Porto-Novo, Tunis', 60],
-		['Europe/Vienna', '(UTC +01:00) Amsterdam, Andorra, Belgrade, Berlin, Bratislava, Brussels, Budapest, Ceuta, Copenhagen, Gibraltar, Ljubljana, Longyearbyen, Luxembourg, Madrid, Malta, Monaco, Oslo, Paris, Podgorica, Prague, Rome, San Marino, Sarajevo, Skopje, Stockholm, Tirane, Vaduz, Vatican, Vienna, Warsaw, Zagreb, Zurich', 60],
-		['Africa/Windhoek', '(UTC +01:00) Windhoek', 60],
-		['Asia/Damascus', '(UTC +02:00) Damascus', 120],
-		['Asia/Beirut', '(UTC +02:00) Beirut', 120],
-		['Asia/Jerusalem', '(UTC +02:00) Jerusalem', 120],
-		['Asia/Nicosia', '(UTC +02:00) Athens, Bucharest, Chisinau, Helsinki, Istanbul, Mariehamn, Nicosia, Riga, Sofia, Tallinn, Vilnius', 120],
-		['Africa/Blantyre', '(UTC +02:00) Blantyre, Bujumbura, Cairo, Gaborone, Gaza, Harare, Hebron, Johannesburg, Kigali, Lubumbashi, Lusaka, Maputo, Maseru, Mbabane, Tripoli', 120],
-		['Asia/Amman', '(UTC +02:00) Amman', 120],
-		['Africa/Addis_Ababa', '(UTC +03:00) Addis Ababa, Aden, Antananarivo, Asmara, Baghdad, Bahrain, Comoro, Dar es Salaam, Djibouti, Juba, Kaliningrad, Kampala, Khartoum, Kiev, Kuwait, Mayotte, Minsk, Mogadishu, Nairobi, Qatar, Riyadh, Simferopol, Syowa, Uzhgorod, Zaporozhye', 180],
-		['Asia/Tehran', '(UTC +03:30) Tehran', 210],
-		['Asia/Yerevan', '(UTC +04:00) Yerevan', 240],
-		['Asia/Dubai', '(UTC +04:00) Dubai, Mahe, Mauritius, Moscow, Muscat, Reunion, Samara, Tbilisi, Volgograd', 240],
-		['Asia/Baku', '(UTC +04:00) Baku', 240],
-		['Asia/Kabul', '(UTC +04:30) Kabul', 270],
-		['Antarctica/Mawson', '(UTC +05:00) Aqtau, Aqtobe, Ashgabat, Dushanbe, Karachi, Kerguelen, Maldives, Mawson, Oral, Samarkand, Tashkent', 300],
-		['Asia/Colombo', '(UTC +05:30) Colombo, Kolkata', 330],
-		['Asia/Kathmandu', '(UTC +05:45) Kathmandu', 345],
-		['Antarctica/Vostok', '(UTC +06:00) Almaty, Bishkek, Chagos, Dhaka, Qyzylorda, Thimphu, Vostok, Yekaterinburg', 360],
-		['Asia/Rangoon', '(UTC +06:30) Cocos, Rangoon', 390],
-		['Antarctica/Davis', '(UTC +07:00) Bangkok, Christmas, Davis, Ho Chi Minh, Hovd, Jakarta, Novokuznetsk, Novosibirsk, Omsk, Phnom Penh, Pontianak, Vientiane', 420],
-		['Antarctica/Casey', '(UTC +08:00) Brunei, Casey, Choibalsan, Chongqing, Harbin, Hong Kong, Kashgar, Krasnoyarsk, Kuala Lumpur, Kuching, Macau, Makassar, Manila, Perth, Shanghai, Singapore, Taipei, Ulaanbaatar, Urumqi', 480],
-		['Australia/Eucla', '(UTC +08:45) Eucla', 525],
-		['Asia/Dili', '(UTC +09:00) Dili, Irkutsk, Jayapura, Palau, Pyongyang, Seoul, Tokyo', 540],
-		['Australia/Adelaide', '(UTC +09:30) Adelaide, Broken Hill', 570],
-		['Australia/Darwin', '(UTC +09:30) Darwin', 570],
-		['Antarctica/DumontDUrville', '(UTC +10:00) Brisbane, Chuuk, DumontDUrville, Guam, Lindeman, Port Moresby, Saipan, Yakutsk', 600],
-		['Australia/Currie', '(UTC +10:00) Currie, Hobart, Melbourne, Sydney', 600],
-		['Australia/Lord_Howe', '(UTC +10:30) Lord Howe', 630],
-		['Antarctica/Macquarie', '(UTC +11:00) Efate, Guadalcanal, Kosrae, Macquarie, Noumea, Pohnpei, Sakhalin, Vladivostok', 660],
-		['Pacific/Norfolk', '(UTC +11:30) Norfolk', 690],
-		['Antarctica/McMurdo', '(UTC +12:00) Auckland, McMurdo, South Pole', 720],
-		['Asia/Anadyr', '(UTC +12:00) Anadyr, Fiji, Funafuti, Kamchatka, Kwajalein, Magadan, Majuro, Nauru, Tarawa, Wake, Wallis', 720],
-		['Pacific/Chatham', '(UTC +12:45) Chatham', 765],
-		['Pacific/Enderbury', '(UTC +13:00) Enderbury, Tongatapu', 780],
-		['Pacific/Apia', '(UTC +13:00) Apia', 780],
-		['Pacific/Kiritimati', '(UTC +14:00) Kiritimati', 840]
-	],
+    store: [
+        ['Pacific/Midway', '(UTC -11:00) Midway, Niue, Pago Pago', -660],
+        ['Pacific/Fakaofo', '(UTC -10:00) Adak, Fakaofo, Honolulu, Johnston, Rarotonga, Tahiti', -600],
+        ['Pacific/Marquesas', '(UTC -09:30) Marquesas', -570],
+        ['America/Anchorage', '(UTC -09:00) Gambier, Anchorage, Juneau, Nome, Sitka, Yakutat', -540],
+        ['America/Dawson', '(UTC -08:00) Dawson, Los Angeles, Tijuana, Vancouver, Whitehorse, Santa Isabel, Metlakatla, Pitcairn', -480],
+        ['America/Dawson_Creek', '(UTC -07:00) Dawson Creek, Hermosillo, Phoenix, Chihuahua, Mazatlan, Boise, Cambridge Bay, Denver, Edmonton, Inuvik, Ojinaga, Shiprock, Yellowknife', -420],
+        ['America/Chicago', '(UTC -06:00) Beulah, Center, Chicago, Knox, Matamoros, Menominee, New Salem, Rainy River, Rankin Inlet, Resolute, Tell City, Winnipeg', -360],
+        ['America/Belize', '(UTC -06:00) Belize, Costa Rica, El Salvador, Galapagos, Guatemala, Managua, Regina, Swift Current, Tegucigalpa', -360],
+        ['Pacific/Easter', '(UTC -06:00) Easter', -360],
+        ['America/Bahia_Banderas', '(UTC -06:00) Bahia Banderas, Cancun, Merida, Mexico City, Monterrey', -360],
+        ['America/Detroit', '(UTC -05:00) Detroit, Grand Turk, Indianapolis, Iqaluit, Louisville, Marengo, Monticello, Montreal, Nassau, New York, Nipigon, Pangnirtung, Petersburg, Thunder Bay, Toronto, Vevay, Vincennes, Winamac', -300],
+        ['America/Atikokan', '(UTC -05:00) Atikokan, Bogota, Cayman, Guayaquil, Jamaica, Lima, Panama, Port-au-Prince', -300],
+        ['America/Havana', '(UTC -05:00) Havana', -300],
+        ['America/Caracas', '(UTC -04:30) Caracas', -270],
+        ['America/Glace_Bay', '(UTC -04:00) Bermuda, Glace Bay, Goose Bay, Halifax, Moncton, Thule', -240],
+        ['Atlantic/Stanley', '(UTC -04:00) Stanley', -240],
+        ['America/Santiago', '(UTC -04:00) Palmer, Santiago', -240],
+        ['America/Anguilla', '(UTC -04:00) Anguilla, Antigua, Aruba, Barbados, Blanc-Sablon, Boa Vista, Curacao, Dominica, Eirunepe, Grenada, Guadeloupe, Guyana, Kralendijk, La Paz, Lower Princes, Manaus, Marigot, Martinique, Montserrat, Port of Spain, Porto Velho, Puerto Rico, Rio Branco, Santo Domingo, St Barthelemy, St Kitts, St Lucia, St Thomas, St Vincent, Tortola', -240],
+        ['America/Campo_Grande', '(UTC -04:00) Campo Grande, Cuiaba', -240],
+        ['America/Asuncion', '(UTC -04:00) Asuncion', -240],
+        ['America/St_Johns', '(UTC -03:30) St Johns', -210],
+        ['America/Sao_Paulo', '(UTC -03:00) Sao Paulo', -180],
+        ['America/Araguaina', '(UTC -03:00) Araguaina, Bahia, Belem, Buenos Aires, Catamarca, Cayenne, Cordoba, Fortaleza, Jujuy, La Rioja, Maceio, Mendoza, Paramaribo, Recife, Rio Gallegos, Rothera, Salta, San Juan, Santarem, Tucuman, Ushuaia', -180],
+        ['America/Montevideo', '(UTC -03:00) Montevideo', -180],
+        ['America/Godthab', '(UTC -03:00) Godthab', -180],
+        ['America/Argentina/San_Luis', '(UTC -03:00) San Luis', -180],
+        ['America/Miquelon', '(UTC -03:00) Miquelon', -180],
+        ['America/Noronha', '(UTC -02:00) Noronha, South Georgia', -120],
+        ['Atlantic/Cape_Verde', '(UTC -01:00) Cape Verde', -60],
+        ['America/Scoresbysund', '(UTC -01:00) Azores, Scoresbysund', -60],
+        ['Atlantic/Canary', '(UTC) Canary, Dublin, Faroe, Guernsey, Isle of Man, Jersey, Lisbon, London, Madeira', 0],
+        ['Africa/Abidjan', '(UTC) Abidjan, Accra, Bamako, Banjul, Bissau, Casablanca, Conakry, Dakar, Danmarkshavn, El Aaiun, Freetown, Lome, Monrovia, Nouakchott, Ouagadougou, Reykjavik, Sao Tome, St Helena', 0],
+        ['Africa/Algiers', '(UTC +01:00) Algiers, Bangui, Brazzaville, Douala, Kinshasa, Lagos, Libreville, Luanda, Malabo, Ndjamena, Niamey, Porto-Novo, Tunis', 60],
+        ['Europe/Vienna', '(UTC +01:00) Amsterdam, Andorra, Belgrade, Berlin, Bratislava, Brussels, Budapest, Ceuta, Copenhagen, Gibraltar, Ljubljana, Longyearbyen, Luxembourg, Madrid, Malta, Monaco, Oslo, Paris, Podgorica, Prague, Rome, San Marino, Sarajevo, Skopje, Stockholm, Tirane, Vaduz, Vatican, Vienna, Warsaw, Zagreb, Zurich', 60],
+        ['Africa/Windhoek', '(UTC +01:00) Windhoek', 60],
+        ['Asia/Damascus', '(UTC +02:00) Damascus', 120],
+        ['Asia/Beirut', '(UTC +02:00) Beirut', 120],
+        ['Asia/Jerusalem', '(UTC +02:00) Jerusalem', 120],
+        ['Asia/Nicosia', '(UTC +02:00) Athens, Bucharest, Chisinau, Helsinki, Istanbul, Mariehamn, Nicosia, Riga, Sofia, Tallinn, Vilnius', 120],
+        ['Africa/Blantyre', '(UTC +02:00) Blantyre, Bujumbura, Cairo, Gaborone, Gaza, Harare, Hebron, Johannesburg, Kigali, Lubumbashi, Lusaka, Maputo, Maseru, Mbabane, Tripoli', 120],
+        ['Asia/Amman', '(UTC +02:00) Amman', 120],
+        ['Africa/Addis_Ababa', '(UTC +03:00) Addis Ababa, Aden, Antananarivo, Asmara, Baghdad, Bahrain, Comoro, Dar es Salaam, Djibouti, Juba, Kaliningrad, Kampala, Khartoum, Kiev, Kuwait, Mayotte, Minsk, Mogadishu, Nairobi, Qatar, Riyadh, Simferopol, Syowa, Uzhgorod, Zaporozhye', 180],
+        ['Asia/Tehran', '(UTC +03:30) Tehran', 210],
+        ['Asia/Yerevan', '(UTC +04:00) Yerevan', 240],
+        ['Asia/Dubai', '(UTC +04:00) Dubai, Mahe, Mauritius, Moscow, Muscat, Reunion, Samara, Tbilisi, Volgograd', 240],
+        ['Asia/Baku', '(UTC +04:00) Baku', 240],
+        ['Asia/Kabul', '(UTC +04:30) Kabul', 270],
+        ['Antarctica/Mawson', '(UTC +05:00) Aqtau, Aqtobe, Ashgabat, Dushanbe, Karachi, Kerguelen, Maldives, Mawson, Oral, Samarkand, Tashkent', 300],
+        ['Asia/Colombo', '(UTC +05:30) Colombo, Kolkata', 330],
+        ['Asia/Kathmandu', '(UTC +05:45) Kathmandu', 345],
+        ['Antarctica/Vostok', '(UTC +06:00) Almaty, Bishkek, Chagos, Dhaka, Qyzylorda, Thimphu, Vostok, Yekaterinburg', 360],
+        ['Asia/Rangoon', '(UTC +06:30) Cocos, Rangoon', 390],
+        ['Antarctica/Davis', '(UTC +07:00) Bangkok, Christmas, Davis, Ho Chi Minh, Hovd, Jakarta, Novokuznetsk, Novosibirsk, Omsk, Phnom Penh, Pontianak, Vientiane', 420],
+        ['Antarctica/Casey', '(UTC +08:00) Brunei, Casey, Choibalsan, Chongqing, Harbin, Hong Kong, Kashgar, Krasnoyarsk, Kuala Lumpur, Kuching, Macau, Makassar, Manila, Perth, Shanghai, Singapore, Taipei, Ulaanbaatar, Urumqi', 480],
+        ['Australia/Eucla', '(UTC +08:45) Eucla', 525],
+        ['Asia/Dili', '(UTC +09:00) Dili, Irkutsk, Jayapura, Palau, Pyongyang, Seoul, Tokyo', 540],
+        ['Australia/Adelaide', '(UTC +09:30) Adelaide, Broken Hill', 570],
+        ['Australia/Darwin', '(UTC +09:30) Darwin', 570],
+        ['Antarctica/DumontDUrville', '(UTC +10:00) Brisbane, Chuuk, DumontDUrville, Guam, Lindeman, Port Moresby, Saipan, Yakutsk', 600],
+        ['Australia/Currie', '(UTC +10:00) Currie, Hobart, Melbourne, Sydney', 600],
+        ['Australia/Lord_Howe', '(UTC +10:30) Lord Howe', 630],
+        ['Antarctica/Macquarie', '(UTC +11:00) Efate, Guadalcanal, Kosrae, Macquarie, Noumea, Pohnpei, Sakhalin, Vladivostok', 660],
+        ['Pacific/Norfolk', '(UTC +11:30) Norfolk', 690],
+        ['Antarctica/McMurdo', '(UTC +12:00) Auckland, McMurdo, South Pole', 720],
+        ['Asia/Anadyr', '(UTC +12:00) Anadyr, Fiji, Funafuti, Kamchatka, Kwajalein, Magadan, Majuro, Nauru, Tarawa, Wake, Wallis', 720],
+        ['Pacific/Chatham', '(UTC +12:45) Chatham', 765],
+        ['Pacific/Enderbury', '(UTC +13:00) Enderbury, Tongatapu', 780],
+        ['Pacific/Apia', '(UTC +13:00) Apia', 780],
+        ['Pacific/Kiritimati', '(UTC +14:00) Kiritimati', 840]
+    ],
 
-	/* map all citys to the above timezones */
-	map  : {
-		/*-11:00*/
-		'Etc/GMT+11'                      : 'Pacific/Midway',
-		'Pacific/Midway'                  : 'Pacific/Midway',
-		'Pacific/Niue'                    : 'Pacific/Midway',
-		'Pacific/Pago_Pago'               : 'Pacific/Midway',
-		'Pacific/Samoa'                   : 'Pacific/Midway',
-		'US/Samoa'                        : 'Pacific/Midway',
-		/*-10:00*/
-		'America/Adak'                    : 'Pacific/Fakaofo',
-		'America/Atka'                    : 'Pacific/Fakaofo',
-		'Etc/GMT+10'                      : 'Pacific/Fakaofo',
-		'HST'                             : 'Pacific/Fakaofo',
-		'Pacific/Honolulu'                : 'Pacific/Fakaofo',
-		'Pacific/Johnston'                : 'Pacific/Fakaofo',
-		'Pacific/Rarotonga'               : 'Pacific/Fakaofo',
-		'Pacific/Tahiti'                  : 'Pacific/Fakaofo',
-		'SystemV/HST10'                   : 'Pacific/Fakaofo',
-		'US/Aleutian'                     : 'Pacific/Fakaofo',
-		'US/Hawaii'                       : 'Pacific/Fakaofo',
-		/*-9:30*/
-		'Pacific/Marquesas'               : 'Pacific/Marquesas',
-		/*-9:00*/
-		'AST'                             : 'America/Anchorage',
-		'America/Anchorage'               : 'America/Anchorage',
-		'America/Juneau'                  : 'America/Anchorage',
-		'America/Nome'                    : 'America/Anchorage',
-		'America/Sitka'                   : 'America/Anchorage',
-		'America/Yakutat'                 : 'America/Anchorage',
-		'Etc/GMT+9'                       : 'America/Anchorage',
-		'Pacific/Gambier'                 : 'America/Anchorage',
-		'SystemV/YST9'                    : 'America/Anchorage',
-		'SystemV/YST9YDT'                 : 'America/Anchorage',
-		'US/Alaska'                       : 'America/Anchorage',
-		/*-8:00*/
-		'America/Dawson'                  : 'America/Dawson',
-		'America/Ensenada'                : 'America/Dawson',
-		'America/Los_Angeles'             : 'America/Dawson',
-		'America/Metlakatla'              : 'America/Dawson',
-		'America/Santa_Isabel'            : 'America/Dawson',
-		'America/Tijuana'                 : 'America/Dawson',
-		'America/Vancouver'               : 'America/Dawson',
-		'America/Whitehorse'              : 'America/Dawson',
-		'Canada/Pacific'                  : 'America/Dawson',
-		'Canada/Yukon'                    : 'America/Dawson',
-		'Etc/GMT+8'                       : 'America/Dawson',
-		'Mexico/BajaNorte'                : 'America/Dawson',
-		'PST'                             : 'America/Dawson',
-		'PST8PDT'                         : 'America/Dawson',
-		'Pacific/Pitcairn'                : 'America/Dawson',
-		'SystemV/PST8'                    : 'America/Dawson',
-		'SystemV/PST8PDT'                 : 'America/Dawson',
-		'US/Pacific'                      : 'America/Dawson',
-		'US/Pacific-New'                  : 'America/Dawson',
-		/*-7:00*/
-		'America/Boise'                   : 'America/Dawson_Creek',
-		'America/Cambridge_Bay'           : 'America/Dawson_Creek',
-		'America/Chihuahua'               : 'America/Dawson_Creek',
-		'America/Creston'                 : 'America/Dawson_Creek',
-		'America/Dawson_Creek'            : 'America/Dawson_Creek',
-		'America/Denver'                  : 'America/Dawson_Creek',
-		'America/Edmonton'                : 'America/Dawson_Creek',
-		'America/Hermosillo'              : 'America/Dawson_Creek',
-		'America/Inuvik'                  : 'America/Dawson_Creek',
-		'America/Mazatlan'                : 'America/Dawson_Creek',
-		'America/Ojinaga'                 : 'America/Dawson_Creek',
-		'America/Phoenix'                 : 'America/Dawson_Creek',
-		'America/Shiprock'                : 'America/Dawson_Creek',
-		'America/Yellowknife'             : 'America/Dawson_Creek',
-		'Canada/Mountain'                 : 'America/Dawson_Creek',
-		'Etc/GMT+7'                       : 'America/Dawson_Creek',
-		'MST'                             : 'America/Dawson_Creek',
-		'MST7MDT'                         : 'America/Dawson_Creek',
-		'Mexico/BajaSur'                  : 'America/Dawson_Creek',
-		'Navajo'                          : 'America/Dawson_Creek',
-		'PNT'                             : 'America/Dawson_Creek',
-		'SystemV/MST7'                    : 'America/Dawson_Creek',
-		'SystemV/MST7MDT'                 : 'America/Dawson_Creek',
-		'US/Arizona'                      : 'America/Dawson_Creek',
-		'US/Mountain'                     : 'America/Dawson_Creek',
-		/*-6:00*/
-		'America/Bahia_Banderas'          : 'America/Chicago',
-		'America/Belize'                  : 'America/Chicago',
-		'America/Cancun'                  : 'America/Chicago',
-		'America/Chicago'                 : 'America/Chicago',
-		'America/Costa_Rica'              : 'America/Chicago',
-		'America/El_Salvador'             : 'America/Chicago',
-		'America/Guatemala'               : 'America/Chicago',
-		'America/Indiana/Knox'            : 'America/Chicago',
-		'America/Indiana/Tell_City'       : 'America/Chicago',
-		'America/Knox_IN'                 : 'America/Chicago',
-		'America/Managua'                 : 'America/Chicago',
-		'America/Matamoros'               : 'America/Chicago',
-		'America/Menominee'               : 'America/Chicago',
-		'America/Merida'                  : 'America/Chicago',
-		'America/Mexico_City'             : 'America/Chicago',
-		'America/Monterrey'               : 'America/Chicago',
-		'America/North_Dakota/Beulah'     : 'America/Chicago',
-		'America/North_Dakota/Center'     : 'America/Chicago',
-		'America/North_Dakota/New_Salem'  : 'America/Chicago',
-		'America/Rainy_River'             : 'America/Chicago',
-		'America/Rankin_Inlet'            : 'America/Chicago',
-		'America/Regina'                  : 'America/Chicago',
-		'America/Resolute'                : 'America/Chicago',
-		'America/Swift_Current'           : 'America/Chicago',
-		'America/Tegucigalpa'             : 'America/Chicago',
-		'America/Winnipeg'                : 'America/Chicago',
-		'CST'                             : 'America/Chicago',
-		'CST6CDT'                         : 'America/Chicago',
-		'Canada/Central'                  : 'America/Chicago',
-		'Canada/East-Saskatchewan'        : 'America/Chicago',
-		'Canada/Saskatchewan'             : 'America/Chicago',
-		'Chile/EasterIsland'              : 'America/Chicago',
-		'Etc/GMT+6'                       : 'America/Chicago',
-		'Mexico/General'                  : 'America/Chicago',
-		'Pacific/Easter'                  : 'America/Chicago',
-		'Pacific/Galapagos'               : 'America/Chicago',
-		'SystemV/CST6'                    : 'America/Chicago',
-		'SystemV/CST6CDT'                 : 'America/Chicago',
-		'US/Central'                      : 'America/Chicago',
-		'US/Indiana-Starke'               : 'America/Chicago',
-		/*-5:00*/
-		'America/Atikokan'                : 'America/Detroit',
-		'America/Bogota'                  : 'America/Detroit',
-		'America/Cayman'                  : 'America/Detroit',
-		'America/Coral_Harbour'           : 'America/Detroit',
-		'America/Detroit'                 : 'America/Detroit',
-		'America/Fort_Wayne'              : 'America/Detroit',
-		'America/Grand_Turk'              : 'America/Detroit',
-		'America/Guayaquil'               : 'America/Detroit',
-		'America/Havana'                  : 'America/Detroit',
-		'America/Indiana/Indianapolis'    : 'America/Detroit',
-		'America/Indiana/Marengo'         : 'America/Detroit',
-		'America/Indiana/Petersburg'      : 'America/Detroit',
-		'America/Indiana/Vevay'           : 'America/Detroit',
-		'America/Indiana/Vincennes'       : 'America/Detroit',
-		'America/Indiana/Winamac'         : 'America/Detroit',
-		'America/Indianapolis'            : 'America/Detroit',
-		'America/Iqaluit'                 : 'America/Detroit',
-		'America/Jamaica'                 : 'America/Detroit',
-		'America/Kentucky/Louisville'     : 'America/Detroit',
-		'America/Kentucky/Monticello'     : 'America/Detroit',
-		'America/Lima'                    : 'America/Detroit',
-		'America/Louisville'              : 'America/Detroit',
-		'America/Montreal'                : 'America/Detroit',
-		'America/Nassau'                  : 'America/Detroit',
-		'America/New_York'                : 'America/Detroit',
-		'America/Nipigon'                 : 'America/Detroit',
-		'America/Panama'                  : 'America/Detroit',
-		'America/Pangnirtung'             : 'America/Detroit',
-		'America/Port-au-Prince'          : 'America/Detroit',
-		'America/Thunder_Bay'             : 'America/Detroit',
-		'America/Toronto'                 : 'America/Detroit',
-		'Canada/Eastern'                  : 'America/Detroit',
-		'Cuba'                            : 'America/Detroit',
-		'EST'                             : 'America/Detroit',
-		'EST5EDT'                         : 'America/Detroit',
-		'Etc/GMT+5'                       : 'America/Detroit',
-		'IET'                             : 'America/Detroit',
-		'Jamaica'                         : 'America/Detroit',
-		'SystemV/EST5'                    : 'America/Detroit',
-		'SystemV/EST5EDT'                 : 'America/Detroit',
-		'US/East-Indiana'                 : 'America/Detroit',
-		'US/Eastern'                      : 'America/Detroit',
-		'US/Michigan'                     : 'America/Detroit',
-		/*-4:30*/
-		'America/Caracas'                 : 'America/Caracas',
-		/*-4:00*/
-		'America/Anguilla'                : 'America/Santiago',
-		'America/Antigua'                 : 'America/Santiago',
-		'America/Argentina/San_Luis'      : 'America/Santiago',
-		'America/Aruba'                   : 'America/Santiago',
-		'America/Asuncion'                : 'America/Santiago',
-		'America/Barbados'                : 'America/Santiago',
-		'America/Blanc-Sablon'            : 'America/Santiago',
-		'America/Boa_Vista'               : 'America/Santiago',
-		'America/Campo_Grande'            : 'America/Santiago',
-		'America/Cuiaba'                  : 'America/Santiago',
-		'America/Curacao'                 : 'America/Santiago',
-		'America/Dominica'                : 'America/Santiago',
-		'America/Eirunepe'                : 'America/Santiago',
-		'America/Glace_Bay'               : 'America/Santiago',
-		'America/Goose_Bay'               : 'America/Santiago',
-		'America/Grenada'                 : 'America/Santiago',
-		'America/Guadeloupe'              : 'America/Santiago',
-		'America/Guyana'                  : 'America/Santiago',
-		'America/Halifax'                 : 'America/Santiago',
-		'America/Kralendijk'              : 'America/Santiago',
-		'America/La_Paz'                  : 'America/Santiago',
-		'America/Lower_Princes'           : 'America/Santiago',
-		'America/Manaus'                  : 'America/Santiago',
-		'America/Marigot'                 : 'America/Santiago',
-		'America/Martinique'              : 'America/Santiago',
-		'America/Moncton'                 : 'America/Santiago',
-		'America/Montserrat'              : 'America/Santiago',
-		'America/Port_of_Spain'           : 'America/Santiago',
-		'America/Porto_Acre'              : 'America/Santiago',
-		'America/Porto_Velho'             : 'America/Santiago',
-		'America/Puerto_Rico'             : 'America/Santiago',
-		'America/Rio_Branco'              : 'America/Santiago',
-		'America/Santiago'                : 'America/Santiago',
-		'America/Santo_Domingo'           : 'America/Santiago',
-		'America/St_Barthelemy'           : 'America/Santiago',
-		'America/St_Kitts'                : 'America/Santiago',
-		'America/St_Lucia'                : 'America/Santiago',
-		'America/St_Thomas'               : 'America/Santiago',
-		'America/St_Vincent'              : 'America/Santiago',
-		'America/Thule'                   : 'America/Santiago',
-		'America/Tortola'                 : 'America/Santiago',
-		'America/Virgin'                  : 'America/Santiago',
-		'Antarctica/Palmer'               : 'America/Santiago',
-		'Atlantic/Bermuda'                : 'America/Santiago',
-		'Brazil/Acre'                     : 'America/Santiago',
-		'Brazil/West'                     : 'America/Santiago',
-		'Canada/Atlantic'                 : 'America/Santiago',
-		'Chile/Continental'               : 'America/Santiago',
-		'Etc/GMT+4'                       : 'America/Santiago',
-		'PRT'                             : 'America/Santiago',
-		'SystemV/AST4'                    : 'America/Santiago',
-		'SystemV/AST4ADT'                 : 'America/Santiago',
-		/*-3:30*/
-		'America/St_Johns'                : 'America/St_Johns',
-		'CNT'                             : '',
-		'Canada/Newfoundland'             : '',
-		/*-3:00*/
-		'AGT'                             : 'America/Sao_Paulo',
-		'America/Araguaina'               : 'America/Sao_Paulo',
-		'America/Argentina/Buenos_Aires'  : 'America/Sao_Paulo',
-		'America/Argentina/Catamarca'     : 'America/Sao_Paulo',
-		'America/Argentina/ComodRivadavia': 'America/Sao_Paulo',
-		'America/Argentina/Cordoba'       : 'America/Sao_Paulo',
-		'America/Argentina/Jujuy'         : 'America/Sao_Paulo',
-		'America/Argentina/La_Rioja'      : 'America/Sao_Paulo',
-		'America/Argentina/Mendoza'       : 'America/Sao_Paulo',
-		'America/Argentina/Rio_Gallegos'  : 'America/Sao_Paulo',
-		'America/Argentina/Salta'         : 'America/Sao_Paulo',
-		'America/Argentina/San_Juan'      : 'America/Sao_Paulo',
-		'America/Argentina/Tucuman'       : 'America/Sao_Paulo',
-		'America/Argentina/Ushuaia'       : 'America/Sao_Paulo',
-		'America/Bahia'                   : 'America/Sao_Paulo',
-		'America/Belem'                   : 'America/Sao_Paulo',
-		'America/Buenos_Aires'            : 'America/Sao_Paulo',
-		'America/Catamarca'               : 'America/Sao_Paulo',
-		'America/Cayenne'                 : 'America/Sao_Paulo',
-		'America/Cordoba'                 : 'America/Sao_Paulo',
-		'America/Fortaleza'               : 'America/Sao_Paulo',
-		'America/Godthab'                 : 'America/Sao_Paulo',
-		'America/Jujuy'                   : 'America/Sao_Paulo',
-		'America/Maceio'                  : 'America/Sao_Paulo',
-		'America/Mendoza'                 : 'America/Sao_Paulo',
-		'America/Miquelon'                : 'America/Sao_Paulo',
-		'America/Montevideo'              : 'America/Sao_Paulo',
-		'America/Paramaribo'              : 'America/Sao_Paulo',
-		'America/Recife'                  : 'America/Sao_Paulo',
-		'America/Rosario'                 : 'America/Sao_Paulo',
-		'America/Santarem'                : 'America/Sao_Paulo',
-		'America/Sao_Paulo'               : 'America/Sao_Paulo',
-		'Antarctica/Rothera'              : 'America/Sao_Paulo',
-		'Atlantic/Stanley'                : 'America/Sao_Paulo',
-		'BET'                             : 'America/Sao_Paulo',
-		'Brazil/East'                     : 'America/Sao_Paulo',
-		'Etc/GMT+3'                       : 'America/Sao_Paulo',
-		/*-2:00*/
-		'America/Noronha'                 : 'America/Noronha',
-		'Atlantic/South_Georgia'          : 'America/Noronha',
-		'Brazil/DeNoronha'                : 'America/Noronha',
-		'Etc/GMT+2'                       : 'America/Noronha',
-		/*-1:00*/
-		'America/Scoresbysund'            : 'Atlantic/Cape_Verde',
-		'Atlantic/Azores'                 : 'Atlantic/Cape_Verde',
-		'Atlantic/Cape_Verde'             : 'Atlantic/Cape_Verde',
-		'Etc/GMT+1'                       : 'Atlantic/Cape_Verde',
-		/*+0:00*/
-		'Africa/Abidjan'                  : 'Africa/Abidjan',
-		'Africa/Accra'                    : 'Africa/Abidjan',
-		'Africa/Bamako'                   : 'Africa/Abidjan',
-		'Africa/Banjul'                   : 'Africa/Abidjan',
-		'Africa/Bissau'                   : 'Africa/Abidjan',
-		'Africa/Casablanca'               : 'Africa/Abidjan',
-		'Africa/Conakry'                  : 'Africa/Abidjan',
-		'Africa/Dakar'                    : 'Africa/Abidjan',
-		'Africa/El_Aaiun'                 : 'Africa/Abidjan',
-		'Africa/Freetown'                 : 'Africa/Abidjan',
-		'Africa/Lome'                     : 'Africa/Abidjan',
-		'Africa/Monrovia'                 : 'Africa/Abidjan',
-		'Africa/Nouakchott'               : 'Africa/Abidjan',
-		'Africa/Ouagadougou'              : 'Africa/Abidjan',
-		'Africa/Sao_Tome'                 : 'Africa/Abidjan',
-		'Africa/Timbuktu'                 : 'Africa/Abidjan',
-		'America/Danmarkshavn'            : 'Africa/Abidjan',
-		'Atlantic/Canary'                 : 'Africa/Abidjan',
-		'Atlantic/Faeroe'                 : 'Africa/Abidjan',
-		'Atlantic/Faroe'                  : 'Africa/Abidjan',
-		'Atlantic/Madeira'                : 'Africa/Abidjan',
-		'Atlantic/Reykjavik'              : 'Africa/Abidjan',
-		'Atlantic/St_Helena'              : 'Africa/Abidjan',
-		'Eire'                            : 'Africa/Abidjan',
-		'Etc/GMT'                         : 'Africa/Abidjan',
-		'Etc/GMT+0'                       : 'Africa/Abidjan',
-		'Etc/GMT-0'                       : 'Africa/Abidjan',
-		'Etc/GMT0'                        : 'Africa/Abidjan',
-		'Etc/Greenwich'                   : 'Africa/Abidjan',
-		'Etc/UCT'                         : 'Africa/Abidjan',
-		'Etc/UTC'                         : 'Africa/Abidjan',
-		'Etc/Universal'                   : 'Africa/Abidjan',
-		'Etc/Zulu'                        : 'Africa/Abidjan',
-		'Europe/Belfast'                  : 'Africa/Abidjan',
-		'Europe/Dublin'                   : 'Africa/Abidjan',
-		'Europe/Guernsey'                 : 'Africa/Abidjan',
-		'Europe/Isle_of_Man'              : 'Africa/Abidjan',
-		'Europe/Jersey'                   : 'Africa/Abidjan',
-		'Europe/Lisbon'                   : 'Africa/Abidjan',
-		'Europe/London'                   : 'Africa/Abidjan',
-		'GB'                              : 'Africa/Abidjan',
-		'GB-Eire'                         : 'Africa/Abidjan',
-		'GMT'                             : 'Africa/Abidjan',
-		'GMT0'                            : 'Africa/Abidjan',
-		'Greenwich'                       : 'Africa/Abidjan',
-		'Iceland'                         : 'Africa/Abidjan',
-		'Portugal'                        : 'Africa/Abidjan',
-		'UCT'                             : 'Africa/Abidjan',
-		'UTC'                             : 'Africa/Abidjan',
-		'Universal'                       : 'Africa/Abidjan',
-		'WET'                             : 'Africa/Abidjan',
-		'Zulu'                            : 'Africa/Abidjan',
-		/*+1:00*/
-		'Africa/Algiers'                  : 'Europe/Vienna',
-		'Africa/Bangui'                   : 'Europe/Vienna',
-		'Africa/Brazzaville'              : 'Europe/Vienna',
-		'Africa/Ceuta'                    : 'Europe/Vienna',
-		'Africa/Douala'                   : 'Europe/Vienna',
-		'Africa/Kinshasa'                 : 'Europe/Vienna',
-		'Africa/Lagos'                    : 'Europe/Vienna',
-		'Africa/Libreville'               : 'Europe/Vienna',
-		'Africa/Luanda'                   : 'Europe/Vienna',
-		'Africa/Malabo'                   : 'Europe/Vienna',
-		'Africa/Ndjamena'                 : 'Europe/Vienna',
-		'Africa/Niamey'                   : 'Europe/Vienna',
-		'Africa/Porto-Novo'               : 'Europe/Vienna',
-		'Africa/Tunis'                    : 'Europe/Vienna',
-		'Africa/Windhoek'                 : 'Europe/Vienna',
-		'Arctic/Longyearbyen'             : 'Europe/Vienna',
-		'Atlantic/Jan_Mayen'              : 'Europe/Vienna',
-		'CET'                             : 'Europe/Vienna',
-		'ECT'                             : 'Europe/Vienna',
-		'Etc/GMT-1'                       : 'Europe/Vienna',
-		'Europe/Amsterdam'                : 'Europe/Vienna',
-		'Europe/Andorra'                  : 'Europe/Vienna',
-		'Europe/Belgrade'                 : 'Europe/Vienna',
-		'Europe/Berlin'                   : 'Europe/Vienna',
-		'Europe/Bratislava'               : 'Europe/Vienna',
-		'Europe/Brussels'                 : 'Europe/Vienna',
-		'Europe/Budapest'                 : 'Europe/Vienna',
-		'Europe/Copenhagen'               : 'Europe/Vienna',
-		'Europe/Gibraltar'                : 'Europe/Vienna',
-		'Europe/Ljubljana'                : 'Europe/Vienna',
-		'Europe/Luxembourg'               : 'Europe/Vienna',
-		'Europe/Madrid'                   : 'Europe/Vienna',
-		'Europe/Malta'                    : 'Europe/Vienna',
-		'Europe/Monaco'                   : 'Europe/Vienna',
-		'Europe/Oslo'                     : 'Europe/Vienna',
-		'Europe/Paris'                    : 'Europe/Vienna',
-		'Europe/Podgorica'                : 'Europe/Vienna',
-		'Europe/Prague'                   : 'Europe/Vienna',
-		'Europe/Rome'                     : 'Europe/Vienna',
-		'Europe/San_Marino'               : 'Europe/Vienna',
-		'Europe/Sarajevo'                 : 'Europe/Vienna',
-		'Europe/Skopje'                   : 'Europe/Vienna',
-		'Europe/Stockholm'                : 'Europe/Vienna',
-		'Europe/Tirane'                   : 'Europe/Vienna',
-		'Europe/Vaduz'                    : 'Europe/Vienna',
-		'Europe/Vatican'                  : 'Europe/Vienna',
-		'Europe/Vienna'                   : 'Europe/Vienna',
-		'Europe/Warsaw'                   : 'Europe/Vienna',
-		'Europe/Zagreb'                   : 'Europe/Vienna',
-		'Europe/Zurich'                   : 'Europe/Vienna',
-		'MET'                             : 'Europe/Vienna',
-		'Poland'                          : 'Europe/Vienna',
-		/*+2:00*/
-		'ART'                             : 'Asia/Jerusalem',
-		'Africa/Blantyre'                 : 'Asia/Jerusalem',
-		'Africa/Bujumbura'                : 'Asia/Jerusalem',
-		'Africa/Cairo'                    : 'Asia/Jerusalem',
-		'Africa/Gaborone'                 : 'Asia/Jerusalem',
-		'Africa/Harare'                   : 'Asia/Jerusalem',
-		'Africa/Johannesburg'             : 'Asia/Jerusalem',
-		'Africa/Kigali'                   : 'Asia/Jerusalem',
-		'Africa/Lubumbashi'               : 'Asia/Jerusalem',
-		'Africa/Lusaka'                   : 'Asia/Jerusalem',
-		'Africa/Maputo'                   : 'Asia/Jerusalem',
-		'Africa/Maseru'                   : 'Asia/Jerusalem',
-		'Africa/Mbabane'                  : 'Asia/Jerusalem',
-		'Africa/Tripoli'                  : 'Asia/Jerusalem',
-		'Asia/Amman'                      : 'Asia/Jerusalem',
-		'Asia/Beirut'                     : 'Asia/Jerusalem',
-		'Asia/Damascus'                   : 'Asia/Jerusalem',
-		'Asia/Gaza'                       : 'Asia/Jerusalem',
-		'Asia/Hebron'                     : 'Asia/Jerusalem',
-		'Asia/Istanbul'                   : 'Asia/Jerusalem',
-		'Asia/Jerusalem'                  : 'Asia/Jerusalem',
-		'Asia/Nicosia'                    : 'Asia/Jerusalem',
-		'Asia/Tel_Aviv'                   : 'Asia/Jerusalem',
-		'CAT'                             : 'Asia/Jerusalem',
-		'EET'                             : 'Asia/Jerusalem',
-		'Egypt'                           : 'Asia/Jerusalem',
-		'Etc/GMT-2'                       : 'Asia/Jerusalem',
-		'Europe/Athens'                   : 'Asia/Jerusalem',
-		'Europe/Bucharest'                : 'Asia/Jerusalem',
-		'Europe/Chisinau'                 : 'Asia/Jerusalem',
-		'Europe/Helsinki'                 : 'Asia/Jerusalem',
-		'Europe/Istanbul'                 : 'Asia/Jerusalem',
-		'Europe/Kiev'                     : 'Asia/Jerusalem',
-		'Europe/Mariehamn'                : 'Asia/Jerusalem',
-		'Europe/Nicosia'                  : 'Asia/Jerusalem',
-		'Europe/Riga'                     : 'Asia/Jerusalem',
-		'Europe/Simferopol'               : 'Asia/Jerusalem',
-		'Europe/Sofia'                    : 'Asia/Jerusalem',
-		'Europe/Tallinn'                  : 'Asia/Jerusalem',
-		'Europe/Tiraspol'                 : 'Asia/Jerusalem',
-		'Europe/Uzhgorod'                 : 'Asia/Jerusalem',
-		'Europe/Vilnius'                  : 'Asia/Jerusalem',
-		'Europe/Zaporozhye'               : 'Asia/Jerusalem',
-		'Israel'                          : 'Asia/Jerusalem',
-		'Libya'                           : 'Asia/Jerusalem',
-		'Turkey'                          : 'Asia/Jerusalem',
-		/*+3:00*/
-		'Africa/Addis_Ababa'              : 'Africa/Addis_Ababa',
-		'Africa/Asmara'                   : 'Africa/Addis_Ababa',
-		'Africa/Asmera'                   : 'Africa/Addis_Ababa',
-		'Africa/Dar_es_Salaam'            : 'Africa/Addis_Ababa',
-		'Africa/Djibouti'                 : 'Africa/Addis_Ababa',
-		'Africa/Juba'                     : 'Africa/Addis_Ababa',
-		'Africa/Kampala'                  : 'Africa/Addis_Ababa',
-		'Africa/Khartoum'                 : 'Africa/Addis_Ababa',
-		'Africa/Mogadishu'                : 'Africa/Addis_Ababa',
-		'Africa/Nairobi'                  : 'Africa/Addis_Ababa',
-		'Antarctica/Syowa'                : 'Africa/Addis_Ababa',
-		'Asia/Aden'                       : 'Africa/Addis_Ababa',
-		'Asia/Baghdad'                    : 'Africa/Addis_Ababa',
-		'Asia/Bahrain'                    : 'Africa/Addis_Ababa',
-		'Asia/Kuwait'                     : 'Africa/Addis_Ababa',
-		'Asia/Qatar'                      : 'Africa/Addis_Ababa',
-		'Asia/Riyadh'                     : 'Africa/Addis_Ababa',
-		'EAT'                             : 'Africa/Addis_Ababa',
-		'Etc/GMT-3'                       : 'Africa/Addis_Ababa',
-		'Europe/Kaliningrad'              : 'Africa/Addis_Ababa',
-		'Europe/Minsk'                    : 'Africa/Addis_Ababa',
-		'Indian/Antananarivo'             : 'Africa/Addis_Ababa',
-		'Indian/Comoro'                   : 'Africa/Addis_Ababa',
-		'Indian/Mayotte'                  : 'Africa/Addis_Ababa',
-		/*+3:30*/
-		'Asia/Tehran'                     : 'Asia/Tehran',
-		'Iran'                            : 'Asia/Tehran',
-		/*+4:00*/
-		'Asia/Baku'                       : 'Asia/Dubai',
-		'Asia/Dubai'                      : 'Asia/Dubai',
-		'Asia/Muscat'                     : 'Asia/Dubai',
-		'Asia/Tbilisi'                    : 'Asia/Dubai',
-		'Asia/Yerevan'                    : 'Asia/Dubai',
-		'Etc/GMT-4'                       : 'Asia/Dubai',
-		'Europe/Moscow'                   : 'Asia/Dubai',
-		'Europe/Samara'                   : 'Asia/Dubai',
-		'Europe/Volgograd'                : 'Asia/Dubai',
-		'Indian/Mahe'                     : 'Asia/Dubai',
-		'Indian/Mauritius'                : 'Asia/Dubai',
-		'Indian/Reunion'                  : 'Asia/Dubai',
-		'NET'                             : 'Asia/Dubai',
-		'W-SU'                            : 'Asia/Dubai',
-		/*+4:30*/
-		'Asia/Kabul'                      : 'Asia/Kabul',
-		/*+5:00*/
-		'Antarctica/Mawson'               : 'Antarctica/Mawson',
-		'Asia/Aqtau'                      : 'Antarctica/Mawson',
-		'Asia/Aqtobe'                     : 'Antarctica/Mawson',
-		'Asia/Ashgabat'                   : 'Antarctica/Mawson',
-		'Asia/Ashkhabad'                  : 'Antarctica/Mawson',
-		'Asia/Dushanbe'                   : 'Antarctica/Mawson',
-		'Asia/Karachi'                    : 'Antarctica/Mawson',
-		'Asia/Oral'                       : 'Antarctica/Mawson',
-		'Asia/Samarkand'                  : 'Antarctica/Mawson',
-		'Asia/Tashkent'                   : 'Antarctica/Mawson',
-		'Etc/GMT-5'                       : 'Antarctica/Mawson',
-		'Indian/Kerguelen'                : 'Antarctica/Mawson',
-		'Indian/Maldives'                 : 'Antarctica/Mawson',
-		'PLT'                             : 'Antarctica/Mawson',
-		/*+5:30*/
-		'Asia/Calcutta'                   : 'Asia/Colombo',
-		'Asia/Colombo'                    : 'Asia/Colombo',
-		'Asia/Kolkata'                    : 'Asia/Colombo',
-		'IST'                             : 'Asia/Colombo',
-		/*+6:00*/
-		'Antarctica/Vostok'               : 'Antarctica/Vostok',
-		'Asia/Almaty'                     : 'Antarctica/Vostok',
-		'Asia/Bishkek'                    : 'Antarctica/Vostok',
-		'Asia/Dacca'                      : 'Antarctica/Vostok',
-		'Asia/Dhaka'                      : 'Antarctica/Vostok',
-		'Asia/Qyzylorda'                  : 'Antarctica/Vostok',
-		'Asia/Thimbu'                     : 'Antarctica/Vostok',
-		'Asia/Thimphu'                    : 'Antarctica/Vostok',
-		'Asia/Yekaterinburg'              : 'Antarctica/Vostok',
-		'BST'                             : 'Antarctica/Vostok',
-		'Etc/GMT-6'                       : 'Antarctica/Vostok',
-		'Indian/Chagos'                   : 'Antarctica/Vostok',
-		/*+6:30*/
-		'Asia/Rangoon'                    : 'Asia/Rangoon',
-		'Indian/Cocos'                    : 'Asia/Rangoon',
-		/*+7:00*/
-		'Antarctica/Davis'                : 'Antarctica/Davis',
-		'Asia/Bangkok'                    : 'Antarctica/Davis',
-		'Asia/Ho_Chi_Minh'                : 'Antarctica/Davis',
-		'Asia/Hovd'                       : 'Antarctica/Davis',
-		'Asia/Jakarta'                    : 'Antarctica/Davis',
-		'Asia/Novokuznetsk'               : 'Antarctica/Davis',
-		'Asia/Novosibirsk'                : 'Antarctica/Davis',
-		'Asia/Omsk'                       : 'Antarctica/Davis',
-		'Asia/Phnom_Penh'                 : 'Antarctica/Davis',
-		'Asia/Pontianak'                  : 'Antarctica/Davis',
-		'Asia/Saigon'                     : 'Antarctica/Davis',
-		'Asia/Vientiane'                  : 'Antarctica/Davis',
-		'Etc/GMT-7'                       : 'Antarctica/Davis',
-		'Indian/Christmas'                : 'Antarctica/Davis',
-		'VST'                             : 'Antarctica/Davis',
-		/*+8:00*/
-		'Antarctica/Casey'                : 'Antarctica/Casey',
-		'Asia/Brunei'                     : 'Antarctica/Casey',
-		'Asia/Choibalsan'                 : 'Antarctica/Casey',
-		'Asia/Chongqing'                  : 'Antarctica/Casey',
-		'Asia/Chungking'                  : 'Antarctica/Casey',
-		'Asia/Harbin'                     : 'Antarctica/Casey',
-		'Asia/Hong_Kong'                  : 'Antarctica/Casey',
-		'Asia/Kashgar'                    : 'Antarctica/Casey',
-		'Asia/Krasnoyarsk'                : 'Antarctica/Casey',
-		'Asia/Kuala_Lumpur'               : 'Antarctica/Casey',
-		'Asia/Kuching'                    : 'Antarctica/Casey',
-		'Asia/Macao'                      : 'Antarctica/Casey',
-		'Asia/Macau'                      : 'Antarctica/Casey',
-		'Asia/Makassar'                   : 'Antarctica/Casey',
-		'Asia/Manila'                     : 'Antarctica/Casey',
-		'Asia/Shanghai'                   : 'Antarctica/Casey',
-		'Asia/Singapore'                  : 'Antarctica/Casey',
-		'Asia/Taipei'                     : 'Antarctica/Casey',
-		'Asia/Ujung_Pandang'              : 'Antarctica/Casey',
-		'Asia/Ulaanbaatar'                : 'Antarctica/Casey',
-		'Asia/Ulan_Bator'                 : 'Antarctica/Casey',
-		'Asia/Urumqi'                     : 'Antarctica/Casey',
-		'Australia/Perth'                 : 'Antarctica/Casey',
-		'Australia/West'                  : 'Antarctica/Casey',
-		'CTT'                             : 'Antarctica/Casey',
-		'Etc/GMT-8'                       : 'Antarctica/Casey',
-		'Hongkong'                        : 'Antarctica/Casey',
-		'PRC'                             : 'Antarctica/Casey',
-		'Singapore'                       : 'Antarctica/Casey',
-		/*+9:00*/
-		'Asia/Dili'                       : 'Asia/Dili',
-		'Asia/Irkutsk'                    : 'Asia/Dili',
-		'Asia/Jayapura'                   : 'Asia/Dili',
-		'Asia/Pyongyang'                  : 'Asia/Dili',
-		'Asia/Seoul'                      : 'Asia/Dili',
-		'Asia/Tokyo'                      : 'Asia/Dili',
-		'Etc/GMT-9'                       : 'Asia/Dili',
-		'JST'                             : 'Asia/Dili',
-		'Japan'                           : 'Asia/Dili',
-		'Pacific/Palau'                   : 'Asia/Dili',
-		'ROK'                             : 'Asia/Dili',
-		/*+9:30*/
-		'ACT'                             : 'Australia/Darwin',
-		'Australia/Adelaide'              : 'Australia/Darwin',
-		'Australia/Broken_Hill'           : 'Australia/Darwin',
-		'Australia/Darwin'                : 'Australia/Darwin',
-		'Australia/North'                 : 'Australia/Darwin',
-		'Australia/South'                 : 'Australia/Darwin',
-		'Australia/Yancowinna'            : 'Australia/Darwin',
-		/*+10:00*/
-		'AET'                             : 'Australia/Currie',
-		'Antarctica/DumontDUrville'       : 'Australia/Currie',
-		'Asia/Yakutsk'                    : 'Australia/Currie',
-		'Australia/ACT'                   : 'Australia/Currie',
-		'Australia/Brisbane'              : 'Australia/Currie',
-		'Australia/Canberra'              : 'Australia/Currie',
-		'Australia/Currie'                : 'Australia/Currie',
-		'Australia/Hobart'                : 'Australia/Currie',
-		'Australia/Lindeman'              : 'Australia/Currie',
-		'Australia/Melbourne'             : 'Australia/Currie',
-		'Australia/NSW'                   : 'Australia/Currie',
-		'Australia/Queensland'            : 'Australia/Currie',
-		'Australia/Sydney'                : 'Australia/Currie',
-		'Australia/Tasmania'              : 'Australia/Currie',
-		'Australia/Victoria'              : 'Australia/Currie',
-		'Etc/GMT-10'                      : 'Australia/Currie',
-		'Pacific/Chuuk'                   : 'Australia/Currie',
-		'Pacific/Guam'                    : 'Australia/Currie',
-		'Pacific/Port_Moresby'            : 'Australia/Currie',
-		'Pacific/Saipan'                  : 'Australia/Currie',
-		'Pacific/Truk'                    : 'Australia/Currie',
-		'Pacific/Yap'                     : 'Australia/Currie',
-		/*+10:30*/
-		'Australia/LHI'                   : 'Australia/Lord_Howe',
-		'Australia/Lord_Howe'             : 'Australia/Lord_Howe',
-		/*+11:00*/
-		'Antarctica/Macquarie'            : 'Antarctica/Macquarie',
-		'Asia/Sakhalin'                   : 'Antarctica/Macquarie',
-		'Asia/Vladivostok'                : 'Antarctica/Macquarie',
-		'Etc/GMT-11'                      : 'Antarctica/Macquarie',
-		'Pacific/Efate'                   : 'Antarctica/Macquarie',
-		'Pacific/Guadalcanal'             : 'Antarctica/Macquarie',
-		'Pacific/Kosrae'                  : 'Antarctica/Macquarie',
-		'Pacific/Noumea'                  : 'Antarctica/Macquarie',
-		'Pacific/Pohnpei'                 : 'Antarctica/Macquarie',
-		'Pacific/Ponape'                  : 'Antarctica/Macquarie',
-		'SST'                             : 'Antarctica/Macquarie',
-		/*+11:30*/
-		'Pacific/Norfolk'                 : 'Pacific/Norfolk',
-		/*+12:00*/
-		'Antarctica/McMurdo'              : 'Antarctica/McMurdo',
-		'Antarctica/South_Pole'           : 'Antarctica/McMurdo',
-		'Asia/Anadyr'                     : 'Antarctica/McMurdo',
-		'Asia/Kamchatka'                  : 'Antarctica/McMurdo',
-		'Asia/Magadan'                    : 'Antarctica/McMurdo',
-		'Etc/GMT-12'                      : 'Antarctica/McMurdo',
-		'Kwajalein'                       : 'Antarctica/McMurdo',
-		'NST'                             : 'Antarctica/McMurdo',
-		'NZ'                              : 'Antarctica/McMurdo',
-		'Pacific/Auckland'                : 'Antarctica/McMurdo',
-		'Pacific/Fiji'                    : 'Antarctica/McMurdo',
-		'Pacific/Funafuti'                : 'Antarctica/McMurdo',
-		'Pacific/Kwajalein'               : 'Antarctica/McMurdo',
-		'Pacific/Majuro'                  : 'Antarctica/McMurdo',
-		'Pacific/Nauru'                   : 'Antarctica/McMurdo',
-		'Pacific/Tarawa'                  : 'Antarctica/McMurdo',
-		'Pacific/Wake'                    : 'Antarctica/McMurdo',
-		'Pacific/Wallis'                  : 'Antarctica/McMurdo',
-		/*+13:00*/
-		'Etc/GMT-13'                      : 'Pacific/Enderbury',
-		'MIT'                             : 'Pacific/Enderbury',
-		'Pacific/Apia'                    : 'Pacific/Enderbury',
-		'Pacific/Enderbury'               : 'Pacific/Enderbury',
-		'Pacific/Tongatapu'               : 'Pacific/Enderbury',
-		/*+14:00*/
-		'Etc/GMT-14'                      : 'Pacific/Kiritimati',
-		'Pacific/Fakaofo'                 : 'Pacific/Kiritimati',
-		'Pacific/Kiritimati'              : 'Pacific/Kiritimati'
-	},
+    /* map all citys to the above timezones */
+    map: {
+        /*-11:00*/
+        'Etc/GMT+11': 'Pacific/Midway',
+        'Pacific/Midway': 'Pacific/Midway',
+        'Pacific/Niue': 'Pacific/Midway',
+        'Pacific/Pago_Pago': 'Pacific/Midway',
+        'Pacific/Samoa': 'Pacific/Midway',
+        'US/Samoa': 'Pacific/Midway',
+        /*-10:00*/
+        'America/Adak': 'Pacific/Fakaofo',
+        'America/Atka': 'Pacific/Fakaofo',
+        'Etc/GMT+10': 'Pacific/Fakaofo',
+        'HST': 'Pacific/Fakaofo',
+        'Pacific/Honolulu': 'Pacific/Fakaofo',
+        'Pacific/Johnston': 'Pacific/Fakaofo',
+        'Pacific/Rarotonga': 'Pacific/Fakaofo',
+        'Pacific/Tahiti': 'Pacific/Fakaofo',
+        'SystemV/HST10': 'Pacific/Fakaofo',
+        'US/Aleutian': 'Pacific/Fakaofo',
+        'US/Hawaii': 'Pacific/Fakaofo',
+        /*-9:30*/
+        'Pacific/Marquesas': 'Pacific/Marquesas',
+        /*-9:00*/
+        'AST': 'America/Anchorage',
+        'America/Anchorage': 'America/Anchorage',
+        'America/Juneau': 'America/Anchorage',
+        'America/Nome': 'America/Anchorage',
+        'America/Sitka': 'America/Anchorage',
+        'America/Yakutat': 'America/Anchorage',
+        'Etc/GMT+9': 'America/Anchorage',
+        'Pacific/Gambier': 'America/Anchorage',
+        'SystemV/YST9': 'America/Anchorage',
+        'SystemV/YST9YDT': 'America/Anchorage',
+        'US/Alaska': 'America/Anchorage',
+        /*-8:00*/
+        'America/Dawson': 'America/Dawson',
+        'America/Ensenada': 'America/Dawson',
+        'America/Los_Angeles': 'America/Dawson',
+        'America/Metlakatla': 'America/Dawson',
+        'America/Santa_Isabel': 'America/Dawson',
+        'America/Tijuana': 'America/Dawson',
+        'America/Vancouver': 'America/Dawson',
+        'America/Whitehorse': 'America/Dawson',
+        'Canada/Pacific': 'America/Dawson',
+        'Canada/Yukon': 'America/Dawson',
+        'Etc/GMT+8': 'America/Dawson',
+        'Mexico/BajaNorte': 'America/Dawson',
+        'PST': 'America/Dawson',
+        'PST8PDT': 'America/Dawson',
+        'Pacific/Pitcairn': 'America/Dawson',
+        'SystemV/PST8': 'America/Dawson',
+        'SystemV/PST8PDT': 'America/Dawson',
+        'US/Pacific': 'America/Dawson',
+        'US/Pacific-New': 'America/Dawson',
+        /*-7:00*/
+        'America/Boise': 'America/Dawson_Creek',
+        'America/Cambridge_Bay': 'America/Dawson_Creek',
+        'America/Chihuahua': 'America/Dawson_Creek',
+        'America/Creston': 'America/Dawson_Creek',
+        'America/Dawson_Creek': 'America/Dawson_Creek',
+        'America/Denver': 'America/Dawson_Creek',
+        'America/Edmonton': 'America/Dawson_Creek',
+        'America/Hermosillo': 'America/Dawson_Creek',
+        'America/Inuvik': 'America/Dawson_Creek',
+        'America/Mazatlan': 'America/Dawson_Creek',
+        'America/Ojinaga': 'America/Dawson_Creek',
+        'America/Phoenix': 'America/Dawson_Creek',
+        'America/Shiprock': 'America/Dawson_Creek',
+        'America/Yellowknife': 'America/Dawson_Creek',
+        'Canada/Mountain': 'America/Dawson_Creek',
+        'Etc/GMT+7': 'America/Dawson_Creek',
+        'MST': 'America/Dawson_Creek',
+        'MST7MDT': 'America/Dawson_Creek',
+        'Mexico/BajaSur': 'America/Dawson_Creek',
+        'Navajo': 'America/Dawson_Creek',
+        'PNT': 'America/Dawson_Creek',
+        'SystemV/MST7': 'America/Dawson_Creek',
+        'SystemV/MST7MDT': 'America/Dawson_Creek',
+        'US/Arizona': 'America/Dawson_Creek',
+        'US/Mountain': 'America/Dawson_Creek',
+        /*-6:00*/
+        'America/Bahia_Banderas': 'America/Chicago',
+        'America/Belize': 'America/Chicago',
+        'America/Cancun': 'America/Chicago',
+        'America/Chicago': 'America/Chicago',
+        'America/Costa_Rica': 'America/Chicago',
+        'America/El_Salvador': 'America/Chicago',
+        'America/Guatemala': 'America/Chicago',
+        'America/Indiana/Knox': 'America/Chicago',
+        'America/Indiana/Tell_City': 'America/Chicago',
+        'America/Knox_IN': 'America/Chicago',
+        'America/Managua': 'America/Chicago',
+        'America/Matamoros': 'America/Chicago',
+        'America/Menominee': 'America/Chicago',
+        'America/Merida': 'America/Chicago',
+        'America/Mexico_City': 'America/Chicago',
+        'America/Monterrey': 'America/Chicago',
+        'America/North_Dakota/Beulah': 'America/Chicago',
+        'America/North_Dakota/Center': 'America/Chicago',
+        'America/North_Dakota/New_Salem': 'America/Chicago',
+        'America/Rainy_River': 'America/Chicago',
+        'America/Rankin_Inlet': 'America/Chicago',
+        'America/Regina': 'America/Chicago',
+        'America/Resolute': 'America/Chicago',
+        'America/Swift_Current': 'America/Chicago',
+        'America/Tegucigalpa': 'America/Chicago',
+        'America/Winnipeg': 'America/Chicago',
+        'CST': 'America/Chicago',
+        'CST6CDT': 'America/Chicago',
+        'Canada/Central': 'America/Chicago',
+        'Canada/East-Saskatchewan': 'America/Chicago',
+        'Canada/Saskatchewan': 'America/Chicago',
+        'Chile/EasterIsland': 'America/Chicago',
+        'Etc/GMT+6': 'America/Chicago',
+        'Mexico/General': 'America/Chicago',
+        'Pacific/Easter': 'America/Chicago',
+        'Pacific/Galapagos': 'America/Chicago',
+        'SystemV/CST6': 'America/Chicago',
+        'SystemV/CST6CDT': 'America/Chicago',
+        'US/Central': 'America/Chicago',
+        'US/Indiana-Starke': 'America/Chicago',
+        /*-5:00*/
+        'America/Atikokan': 'America/Detroit',
+        'America/Bogota': 'America/Detroit',
+        'America/Cayman': 'America/Detroit',
+        'America/Coral_Harbour': 'America/Detroit',
+        'America/Detroit': 'America/Detroit',
+        'America/Fort_Wayne': 'America/Detroit',
+        'America/Grand_Turk': 'America/Detroit',
+        'America/Guayaquil': 'America/Detroit',
+        'America/Havana': 'America/Detroit',
+        'America/Indiana/Indianapolis': 'America/Detroit',
+        'America/Indiana/Marengo': 'America/Detroit',
+        'America/Indiana/Petersburg': 'America/Detroit',
+        'America/Indiana/Vevay': 'America/Detroit',
+        'America/Indiana/Vincennes': 'America/Detroit',
+        'America/Indiana/Winamac': 'America/Detroit',
+        'America/Indianapolis': 'America/Detroit',
+        'America/Iqaluit': 'America/Detroit',
+        'America/Jamaica': 'America/Detroit',
+        'America/Kentucky/Louisville': 'America/Detroit',
+        'America/Kentucky/Monticello': 'America/Detroit',
+        'America/Lima': 'America/Detroit',
+        'America/Louisville': 'America/Detroit',
+        'America/Montreal': 'America/Detroit',
+        'America/Nassau': 'America/Detroit',
+        'America/New_York': 'America/Detroit',
+        'America/Nipigon': 'America/Detroit',
+        'America/Panama': 'America/Detroit',
+        'America/Pangnirtung': 'America/Detroit',
+        'America/Port-au-Prince': 'America/Detroit',
+        'America/Thunder_Bay': 'America/Detroit',
+        'America/Toronto': 'America/Detroit',
+        'Canada/Eastern': 'America/Detroit',
+        'Cuba': 'America/Detroit',
+        'EST': 'America/Detroit',
+        'EST5EDT': 'America/Detroit',
+        'Etc/GMT+5': 'America/Detroit',
+        'IET': 'America/Detroit',
+        'Jamaica': 'America/Detroit',
+        'SystemV/EST5': 'America/Detroit',
+        'SystemV/EST5EDT': 'America/Detroit',
+        'US/East-Indiana': 'America/Detroit',
+        'US/Eastern': 'America/Detroit',
+        'US/Michigan': 'America/Detroit',
+        /*-4:30*/
+        'America/Caracas': 'America/Caracas',
+        /*-4:00*/
+        'America/Anguilla': 'America/Santiago',
+        'America/Antigua': 'America/Santiago',
+        'America/Argentina/San_Luis': 'America/Santiago',
+        'America/Aruba': 'America/Santiago',
+        'America/Asuncion': 'America/Santiago',
+        'America/Barbados': 'America/Santiago',
+        'America/Blanc-Sablon': 'America/Santiago',
+        'America/Boa_Vista': 'America/Santiago',
+        'America/Campo_Grande': 'America/Santiago',
+        'America/Cuiaba': 'America/Santiago',
+        'America/Curacao': 'America/Santiago',
+        'America/Dominica': 'America/Santiago',
+        'America/Eirunepe': 'America/Santiago',
+        'America/Glace_Bay': 'America/Santiago',
+        'America/Goose_Bay': 'America/Santiago',
+        'America/Grenada': 'America/Santiago',
+        'America/Guadeloupe': 'America/Santiago',
+        'America/Guyana': 'America/Santiago',
+        'America/Halifax': 'America/Santiago',
+        'America/Kralendijk': 'America/Santiago',
+        'America/La_Paz': 'America/Santiago',
+        'America/Lower_Princes': 'America/Santiago',
+        'America/Manaus': 'America/Santiago',
+        'America/Marigot': 'America/Santiago',
+        'America/Martinique': 'America/Santiago',
+        'America/Moncton': 'America/Santiago',
+        'America/Montserrat': 'America/Santiago',
+        'America/Port_of_Spain': 'America/Santiago',
+        'America/Porto_Acre': 'America/Santiago',
+        'America/Porto_Velho': 'America/Santiago',
+        'America/Puerto_Rico': 'America/Santiago',
+        'America/Rio_Branco': 'America/Santiago',
+        'America/Santiago': 'America/Santiago',
+        'America/Santo_Domingo': 'America/Santiago',
+        'America/St_Barthelemy': 'America/Santiago',
+        'America/St_Kitts': 'America/Santiago',
+        'America/St_Lucia': 'America/Santiago',
+        'America/St_Thomas': 'America/Santiago',
+        'America/St_Vincent': 'America/Santiago',
+        'America/Thule': 'America/Santiago',
+        'America/Tortola': 'America/Santiago',
+        'America/Virgin': 'America/Santiago',
+        'Antarctica/Palmer': 'America/Santiago',
+        'Atlantic/Bermuda': 'America/Santiago',
+        'Brazil/Acre': 'America/Santiago',
+        'Brazil/West': 'America/Santiago',
+        'Canada/Atlantic': 'America/Santiago',
+        'Chile/Continental': 'America/Santiago',
+        'Etc/GMT+4': 'America/Santiago',
+        'PRT': 'America/Santiago',
+        'SystemV/AST4': 'America/Santiago',
+        'SystemV/AST4ADT': 'America/Santiago',
+        /*-3:30*/
+        'America/St_Johns': 'America/St_Johns',
+        'CNT': '',
+        'Canada/Newfoundland': '',
+        /*-3:00*/
+        'AGT': 'America/Sao_Paulo',
+        'America/Araguaina': 'America/Sao_Paulo',
+        'America/Argentina/Buenos_Aires': 'America/Sao_Paulo',
+        'America/Argentina/Catamarca': 'America/Sao_Paulo',
+        'America/Argentina/ComodRivadavia': 'America/Sao_Paulo',
+        'America/Argentina/Cordoba': 'America/Sao_Paulo',
+        'America/Argentina/Jujuy': 'America/Sao_Paulo',
+        'America/Argentina/La_Rioja': 'America/Sao_Paulo',
+        'America/Argentina/Mendoza': 'America/Sao_Paulo',
+        'America/Argentina/Rio_Gallegos': 'America/Sao_Paulo',
+        'America/Argentina/Salta': 'America/Sao_Paulo',
+        'America/Argentina/San_Juan': 'America/Sao_Paulo',
+        'America/Argentina/Tucuman': 'America/Sao_Paulo',
+        'America/Argentina/Ushuaia': 'America/Sao_Paulo',
+        'America/Bahia': 'America/Sao_Paulo',
+        'America/Belem': 'America/Sao_Paulo',
+        'America/Buenos_Aires': 'America/Sao_Paulo',
+        'America/Catamarca': 'America/Sao_Paulo',
+        'America/Cayenne': 'America/Sao_Paulo',
+        'America/Cordoba': 'America/Sao_Paulo',
+        'America/Fortaleza': 'America/Sao_Paulo',
+        'America/Godthab': 'America/Sao_Paulo',
+        'America/Jujuy': 'America/Sao_Paulo',
+        'America/Maceio': 'America/Sao_Paulo',
+        'America/Mendoza': 'America/Sao_Paulo',
+        'America/Miquelon': 'America/Sao_Paulo',
+        'America/Montevideo': 'America/Sao_Paulo',
+        'America/Paramaribo': 'America/Sao_Paulo',
+        'America/Recife': 'America/Sao_Paulo',
+        'America/Rosario': 'America/Sao_Paulo',
+        'America/Santarem': 'America/Sao_Paulo',
+        'America/Sao_Paulo': 'America/Sao_Paulo',
+        'Antarctica/Rothera': 'America/Sao_Paulo',
+        'Atlantic/Stanley': 'America/Sao_Paulo',
+        'BET': 'America/Sao_Paulo',
+        'Brazil/East': 'America/Sao_Paulo',
+        'Etc/GMT+3': 'America/Sao_Paulo',
+        /*-2:00*/
+        'America/Noronha': 'America/Noronha',
+        'Atlantic/South_Georgia': 'America/Noronha',
+        'Brazil/DeNoronha': 'America/Noronha',
+        'Etc/GMT+2': 'America/Noronha',
+        /*-1:00*/
+        'America/Scoresbysund': 'Atlantic/Cape_Verde',
+        'Atlantic/Azores': 'Atlantic/Cape_Verde',
+        'Atlantic/Cape_Verde': 'Atlantic/Cape_Verde',
+        'Etc/GMT+1': 'Atlantic/Cape_Verde',
+        /*+0:00*/
+        'Africa/Abidjan': 'Africa/Abidjan',
+        'Africa/Accra': 'Africa/Abidjan',
+        'Africa/Bamako': 'Africa/Abidjan',
+        'Africa/Banjul': 'Africa/Abidjan',
+        'Africa/Bissau': 'Africa/Abidjan',
+        'Africa/Casablanca': 'Africa/Abidjan',
+        'Africa/Conakry': 'Africa/Abidjan',
+        'Africa/Dakar': 'Africa/Abidjan',
+        'Africa/El_Aaiun': 'Africa/Abidjan',
+        'Africa/Freetown': 'Africa/Abidjan',
+        'Africa/Lome': 'Africa/Abidjan',
+        'Africa/Monrovia': 'Africa/Abidjan',
+        'Africa/Nouakchott': 'Africa/Abidjan',
+        'Africa/Ouagadougou': 'Africa/Abidjan',
+        'Africa/Sao_Tome': 'Africa/Abidjan',
+        'Africa/Timbuktu': 'Africa/Abidjan',
+        'America/Danmarkshavn': 'Africa/Abidjan',
+        'Atlantic/Canary': 'Africa/Abidjan',
+        'Atlantic/Faeroe': 'Africa/Abidjan',
+        'Atlantic/Faroe': 'Africa/Abidjan',
+        'Atlantic/Madeira': 'Africa/Abidjan',
+        'Atlantic/Reykjavik': 'Africa/Abidjan',
+        'Atlantic/St_Helena': 'Africa/Abidjan',
+        'Eire': 'Africa/Abidjan',
+        'Etc/GMT': 'Africa/Abidjan',
+        'Etc/GMT+0': 'Africa/Abidjan',
+        'Etc/GMT-0': 'Africa/Abidjan',
+        'Etc/GMT0': 'Africa/Abidjan',
+        'Etc/Greenwich': 'Africa/Abidjan',
+        'Etc/UCT': 'Africa/Abidjan',
+        'Etc/UTC': 'Africa/Abidjan',
+        'Etc/Universal': 'Africa/Abidjan',
+        'Etc/Zulu': 'Africa/Abidjan',
+        'Europe/Belfast': 'Africa/Abidjan',
+        'Europe/Dublin': 'Africa/Abidjan',
+        'Europe/Guernsey': 'Africa/Abidjan',
+        'Europe/Isle_of_Man': 'Africa/Abidjan',
+        'Europe/Jersey': 'Africa/Abidjan',
+        'Europe/Lisbon': 'Africa/Abidjan',
+        'Europe/London': 'Africa/Abidjan',
+        'GB': 'Africa/Abidjan',
+        'GB-Eire': 'Africa/Abidjan',
+        'GMT': 'Africa/Abidjan',
+        'GMT0': 'Africa/Abidjan',
+        'Greenwich': 'Africa/Abidjan',
+        'Iceland': 'Africa/Abidjan',
+        'Portugal': 'Africa/Abidjan',
+        'UCT': 'Africa/Abidjan',
+        'UTC': 'Africa/Abidjan',
+        'Universal': 'Africa/Abidjan',
+        'WET': 'Africa/Abidjan',
+        'Zulu': 'Africa/Abidjan',
+        /*+1:00*/
+        'Africa/Algiers': 'Europe/Vienna',
+        'Africa/Bangui': 'Europe/Vienna',
+        'Africa/Brazzaville': 'Europe/Vienna',
+        'Africa/Ceuta': 'Europe/Vienna',
+        'Africa/Douala': 'Europe/Vienna',
+        'Africa/Kinshasa': 'Europe/Vienna',
+        'Africa/Lagos': 'Europe/Vienna',
+        'Africa/Libreville': 'Europe/Vienna',
+        'Africa/Luanda': 'Europe/Vienna',
+        'Africa/Malabo': 'Europe/Vienna',
+        'Africa/Ndjamena': 'Europe/Vienna',
+        'Africa/Niamey': 'Europe/Vienna',
+        'Africa/Porto-Novo': 'Europe/Vienna',
+        'Africa/Tunis': 'Europe/Vienna',
+        'Africa/Windhoek': 'Europe/Vienna',
+        'Arctic/Longyearbyen': 'Europe/Vienna',
+        'Atlantic/Jan_Mayen': 'Europe/Vienna',
+        'CET': 'Europe/Vienna',
+        'ECT': 'Europe/Vienna',
+        'Etc/GMT-1': 'Europe/Vienna',
+        'Europe/Amsterdam': 'Europe/Vienna',
+        'Europe/Andorra': 'Europe/Vienna',
+        'Europe/Belgrade': 'Europe/Vienna',
+        'Europe/Berlin': 'Europe/Vienna',
+        'Europe/Bratislava': 'Europe/Vienna',
+        'Europe/Brussels': 'Europe/Vienna',
+        'Europe/Budapest': 'Europe/Vienna',
+        'Europe/Copenhagen': 'Europe/Vienna',
+        'Europe/Gibraltar': 'Europe/Vienna',
+        'Europe/Ljubljana': 'Europe/Vienna',
+        'Europe/Luxembourg': 'Europe/Vienna',
+        'Europe/Madrid': 'Europe/Vienna',
+        'Europe/Malta': 'Europe/Vienna',
+        'Europe/Monaco': 'Europe/Vienna',
+        'Europe/Oslo': 'Europe/Vienna',
+        'Europe/Paris': 'Europe/Vienna',
+        'Europe/Podgorica': 'Europe/Vienna',
+        'Europe/Prague': 'Europe/Vienna',
+        'Europe/Rome': 'Europe/Vienna',
+        'Europe/San_Marino': 'Europe/Vienna',
+        'Europe/Sarajevo': 'Europe/Vienna',
+        'Europe/Skopje': 'Europe/Vienna',
+        'Europe/Stockholm': 'Europe/Vienna',
+        'Europe/Tirane': 'Europe/Vienna',
+        'Europe/Vaduz': 'Europe/Vienna',
+        'Europe/Vatican': 'Europe/Vienna',
+        'Europe/Vienna': 'Europe/Vienna',
+        'Europe/Warsaw': 'Europe/Vienna',
+        'Europe/Zagreb': 'Europe/Vienna',
+        'Europe/Zurich': 'Europe/Vienna',
+        'MET': 'Europe/Vienna',
+        'Poland': 'Europe/Vienna',
+        /*+2:00*/
+        'ART': 'Asia/Jerusalem',
+        'Africa/Blantyre': 'Asia/Jerusalem',
+        'Africa/Bujumbura': 'Asia/Jerusalem',
+        'Africa/Cairo': 'Asia/Jerusalem',
+        'Africa/Gaborone': 'Asia/Jerusalem',
+        'Africa/Harare': 'Asia/Jerusalem',
+        'Africa/Johannesburg': 'Asia/Jerusalem',
+        'Africa/Kigali': 'Asia/Jerusalem',
+        'Africa/Lubumbashi': 'Asia/Jerusalem',
+        'Africa/Lusaka': 'Asia/Jerusalem',
+        'Africa/Maputo': 'Asia/Jerusalem',
+        'Africa/Maseru': 'Asia/Jerusalem',
+        'Africa/Mbabane': 'Asia/Jerusalem',
+        'Africa/Tripoli': 'Asia/Jerusalem',
+        'Asia/Amman': 'Asia/Jerusalem',
+        'Asia/Beirut': 'Asia/Jerusalem',
+        'Asia/Damascus': 'Asia/Jerusalem',
+        'Asia/Gaza': 'Asia/Jerusalem',
+        'Asia/Hebron': 'Asia/Jerusalem',
+        'Asia/Istanbul': 'Asia/Jerusalem',
+        'Asia/Jerusalem': 'Asia/Jerusalem',
+        'Asia/Nicosia': 'Asia/Jerusalem',
+        'Asia/Tel_Aviv': 'Asia/Jerusalem',
+        'CAT': 'Asia/Jerusalem',
+        'EET': 'Asia/Jerusalem',
+        'Egypt': 'Asia/Jerusalem',
+        'Etc/GMT-2': 'Asia/Jerusalem',
+        'Europe/Athens': 'Asia/Jerusalem',
+        'Europe/Bucharest': 'Asia/Jerusalem',
+        'Europe/Chisinau': 'Asia/Jerusalem',
+        'Europe/Helsinki': 'Asia/Jerusalem',
+        'Europe/Istanbul': 'Asia/Jerusalem',
+        'Europe/Kiev': 'Asia/Jerusalem',
+        'Europe/Mariehamn': 'Asia/Jerusalem',
+        'Europe/Nicosia': 'Asia/Jerusalem',
+        'Europe/Riga': 'Asia/Jerusalem',
+        'Europe/Simferopol': 'Asia/Jerusalem',
+        'Europe/Sofia': 'Asia/Jerusalem',
+        'Europe/Tallinn': 'Asia/Jerusalem',
+        'Europe/Tiraspol': 'Asia/Jerusalem',
+        'Europe/Uzhgorod': 'Asia/Jerusalem',
+        'Europe/Vilnius': 'Asia/Jerusalem',
+        'Europe/Zaporozhye': 'Asia/Jerusalem',
+        'Israel': 'Asia/Jerusalem',
+        'Libya': 'Asia/Jerusalem',
+        'Turkey': 'Asia/Jerusalem',
+        /*+3:00*/
+        'Africa/Addis_Ababa': 'Africa/Addis_Ababa',
+        'Africa/Asmara': 'Africa/Addis_Ababa',
+        'Africa/Asmera': 'Africa/Addis_Ababa',
+        'Africa/Dar_es_Salaam': 'Africa/Addis_Ababa',
+        'Africa/Djibouti': 'Africa/Addis_Ababa',
+        'Africa/Juba': 'Africa/Addis_Ababa',
+        'Africa/Kampala': 'Africa/Addis_Ababa',
+        'Africa/Khartoum': 'Africa/Addis_Ababa',
+        'Africa/Mogadishu': 'Africa/Addis_Ababa',
+        'Africa/Nairobi': 'Africa/Addis_Ababa',
+        'Antarctica/Syowa': 'Africa/Addis_Ababa',
+        'Asia/Aden': 'Africa/Addis_Ababa',
+        'Asia/Baghdad': 'Africa/Addis_Ababa',
+        'Asia/Bahrain': 'Africa/Addis_Ababa',
+        'Asia/Kuwait': 'Africa/Addis_Ababa',
+        'Asia/Qatar': 'Africa/Addis_Ababa',
+        'Asia/Riyadh': 'Africa/Addis_Ababa',
+        'EAT': 'Africa/Addis_Ababa',
+        'Etc/GMT-3': 'Africa/Addis_Ababa',
+        'Europe/Kaliningrad': 'Africa/Addis_Ababa',
+        'Europe/Minsk': 'Africa/Addis_Ababa',
+        'Indian/Antananarivo': 'Africa/Addis_Ababa',
+        'Indian/Comoro': 'Africa/Addis_Ababa',
+        'Indian/Mayotte': 'Africa/Addis_Ababa',
+        /*+3:30*/
+        'Asia/Tehran': 'Asia/Tehran',
+        'Iran': 'Asia/Tehran',
+        /*+4:00*/
+        'Asia/Baku': 'Asia/Dubai',
+        'Asia/Dubai': 'Asia/Dubai',
+        'Asia/Muscat': 'Asia/Dubai',
+        'Asia/Tbilisi': 'Asia/Dubai',
+        'Asia/Yerevan': 'Asia/Dubai',
+        'Etc/GMT-4': 'Asia/Dubai',
+        'Europe/Moscow': 'Asia/Dubai',
+        'Europe/Samara': 'Asia/Dubai',
+        'Europe/Volgograd': 'Asia/Dubai',
+        'Indian/Mahe': 'Asia/Dubai',
+        'Indian/Mauritius': 'Asia/Dubai',
+        'Indian/Reunion': 'Asia/Dubai',
+        'NET': 'Asia/Dubai',
+        'W-SU': 'Asia/Dubai',
+        /*+4:30*/
+        'Asia/Kabul': 'Asia/Kabul',
+        /*+5:00*/
+        'Antarctica/Mawson': 'Antarctica/Mawson',
+        'Asia/Aqtau': 'Antarctica/Mawson',
+        'Asia/Aqtobe': 'Antarctica/Mawson',
+        'Asia/Ashgabat': 'Antarctica/Mawson',
+        'Asia/Ashkhabad': 'Antarctica/Mawson',
+        'Asia/Dushanbe': 'Antarctica/Mawson',
+        'Asia/Karachi': 'Antarctica/Mawson',
+        'Asia/Oral': 'Antarctica/Mawson',
+        'Asia/Samarkand': 'Antarctica/Mawson',
+        'Asia/Tashkent': 'Antarctica/Mawson',
+        'Etc/GMT-5': 'Antarctica/Mawson',
+        'Indian/Kerguelen': 'Antarctica/Mawson',
+        'Indian/Maldives': 'Antarctica/Mawson',
+        'PLT': 'Antarctica/Mawson',
+        /*+5:30*/
+        'Asia/Calcutta': 'Asia/Colombo',
+        'Asia/Colombo': 'Asia/Colombo',
+        'Asia/Kolkata': 'Asia/Colombo',
+        'IST': 'Asia/Colombo',
+        /*+6:00*/
+        'Antarctica/Vostok': 'Antarctica/Vostok',
+        'Asia/Almaty': 'Antarctica/Vostok',
+        'Asia/Bishkek': 'Antarctica/Vostok',
+        'Asia/Dacca': 'Antarctica/Vostok',
+        'Asia/Dhaka': 'Antarctica/Vostok',
+        'Asia/Qyzylorda': 'Antarctica/Vostok',
+        'Asia/Thimbu': 'Antarctica/Vostok',
+        'Asia/Thimphu': 'Antarctica/Vostok',
+        'Asia/Yekaterinburg': 'Antarctica/Vostok',
+        'BST': 'Antarctica/Vostok',
+        'Etc/GMT-6': 'Antarctica/Vostok',
+        'Indian/Chagos': 'Antarctica/Vostok',
+        /*+6:30*/
+        'Asia/Rangoon': 'Asia/Rangoon',
+        'Indian/Cocos': 'Asia/Rangoon',
+        /*+7:00*/
+        'Antarctica/Davis': 'Antarctica/Davis',
+        'Asia/Bangkok': 'Antarctica/Davis',
+        'Asia/Ho_Chi_Minh': 'Antarctica/Davis',
+        'Asia/Hovd': 'Antarctica/Davis',
+        'Asia/Jakarta': 'Antarctica/Davis',
+        'Asia/Novokuznetsk': 'Antarctica/Davis',
+        'Asia/Novosibirsk': 'Antarctica/Davis',
+        'Asia/Omsk': 'Antarctica/Davis',
+        'Asia/Phnom_Penh': 'Antarctica/Davis',
+        'Asia/Pontianak': 'Antarctica/Davis',
+        'Asia/Saigon': 'Antarctica/Davis',
+        'Asia/Vientiane': 'Antarctica/Davis',
+        'Etc/GMT-7': 'Antarctica/Davis',
+        'Indian/Christmas': 'Antarctica/Davis',
+        'VST': 'Antarctica/Davis',
+        /*+8:00*/
+        'Antarctica/Casey': 'Antarctica/Casey',
+        'Asia/Brunei': 'Antarctica/Casey',
+        'Asia/Choibalsan': 'Antarctica/Casey',
+        'Asia/Chongqing': 'Antarctica/Casey',
+        'Asia/Chungking': 'Antarctica/Casey',
+        'Asia/Harbin': 'Antarctica/Casey',
+        'Asia/Hong_Kong': 'Antarctica/Casey',
+        'Asia/Kashgar': 'Antarctica/Casey',
+        'Asia/Krasnoyarsk': 'Antarctica/Casey',
+        'Asia/Kuala_Lumpur': 'Antarctica/Casey',
+        'Asia/Kuching': 'Antarctica/Casey',
+        'Asia/Macao': 'Antarctica/Casey',
+        'Asia/Macau': 'Antarctica/Casey',
+        'Asia/Makassar': 'Antarctica/Casey',
+        'Asia/Manila': 'Antarctica/Casey',
+        'Asia/Shanghai': 'Antarctica/Casey',
+        'Asia/Singapore': 'Antarctica/Casey',
+        'Asia/Taipei': 'Antarctica/Casey',
+        'Asia/Ujung_Pandang': 'Antarctica/Casey',
+        'Asia/Ulaanbaatar': 'Antarctica/Casey',
+        'Asia/Ulan_Bator': 'Antarctica/Casey',
+        'Asia/Urumqi': 'Antarctica/Casey',
+        'Australia/Perth': 'Antarctica/Casey',
+        'Australia/West': 'Antarctica/Casey',
+        'CTT': 'Antarctica/Casey',
+        'Etc/GMT-8': 'Antarctica/Casey',
+        'Hongkong': 'Antarctica/Casey',
+        'PRC': 'Antarctica/Casey',
+        'Singapore': 'Antarctica/Casey',
+        /*+9:00*/
+        'Asia/Dili': 'Asia/Dili',
+        'Asia/Irkutsk': 'Asia/Dili',
+        'Asia/Jayapura': 'Asia/Dili',
+        'Asia/Pyongyang': 'Asia/Dili',
+        'Asia/Seoul': 'Asia/Dili',
+        'Asia/Tokyo': 'Asia/Dili',
+        'Etc/GMT-9': 'Asia/Dili',
+        'JST': 'Asia/Dili',
+        'Japan': 'Asia/Dili',
+        'Pacific/Palau': 'Asia/Dili',
+        'ROK': 'Asia/Dili',
+        /*+9:30*/
+        'ACT': 'Australia/Darwin',
+        'Australia/Adelaide': 'Australia/Darwin',
+        'Australia/Broken_Hill': 'Australia/Darwin',
+        'Australia/Darwin': 'Australia/Darwin',
+        'Australia/North': 'Australia/Darwin',
+        'Australia/South': 'Australia/Darwin',
+        'Australia/Yancowinna': 'Australia/Darwin',
+        /*+10:00*/
+        'AET': 'Australia/Currie',
+        'Antarctica/DumontDUrville': 'Australia/Currie',
+        'Asia/Yakutsk': 'Australia/Currie',
+        'Australia/ACT': 'Australia/Currie',
+        'Australia/Brisbane': 'Australia/Currie',
+        'Australia/Canberra': 'Australia/Currie',
+        'Australia/Currie': 'Australia/Currie',
+        'Australia/Hobart': 'Australia/Currie',
+        'Australia/Lindeman': 'Australia/Currie',
+        'Australia/Melbourne': 'Australia/Currie',
+        'Australia/NSW': 'Australia/Currie',
+        'Australia/Queensland': 'Australia/Currie',
+        'Australia/Sydney': 'Australia/Currie',
+        'Australia/Tasmania': 'Australia/Currie',
+        'Australia/Victoria': 'Australia/Currie',
+        'Etc/GMT-10': 'Australia/Currie',
+        'Pacific/Chuuk': 'Australia/Currie',
+        'Pacific/Guam': 'Australia/Currie',
+        'Pacific/Port_Moresby': 'Australia/Currie',
+        'Pacific/Saipan': 'Australia/Currie',
+        'Pacific/Truk': 'Australia/Currie',
+        'Pacific/Yap': 'Australia/Currie',
+        /*+10:30*/
+        'Australia/LHI': 'Australia/Lord_Howe',
+        'Australia/Lord_Howe': 'Australia/Lord_Howe',
+        /*+11:00*/
+        'Antarctica/Macquarie': 'Antarctica/Macquarie',
+        'Asia/Sakhalin': 'Antarctica/Macquarie',
+        'Asia/Vladivostok': 'Antarctica/Macquarie',
+        'Etc/GMT-11': 'Antarctica/Macquarie',
+        'Pacific/Efate': 'Antarctica/Macquarie',
+        'Pacific/Guadalcanal': 'Antarctica/Macquarie',
+        'Pacific/Kosrae': 'Antarctica/Macquarie',
+        'Pacific/Noumea': 'Antarctica/Macquarie',
+        'Pacific/Pohnpei': 'Antarctica/Macquarie',
+        'Pacific/Ponape': 'Antarctica/Macquarie',
+        'SST': 'Antarctica/Macquarie',
+        /*+11:30*/
+        'Pacific/Norfolk': 'Pacific/Norfolk',
+        /*+12:00*/
+        'Antarctica/McMurdo': 'Antarctica/McMurdo',
+        'Antarctica/South_Pole': 'Antarctica/McMurdo',
+        'Asia/Anadyr': 'Antarctica/McMurdo',
+        'Asia/Kamchatka': 'Antarctica/McMurdo',
+        'Asia/Magadan': 'Antarctica/McMurdo',
+        'Etc/GMT-12': 'Antarctica/McMurdo',
+        'Kwajalein': 'Antarctica/McMurdo',
+        'NST': 'Antarctica/McMurdo',
+        'NZ': 'Antarctica/McMurdo',
+        'Pacific/Auckland': 'Antarctica/McMurdo',
+        'Pacific/Fiji': 'Antarctica/McMurdo',
+        'Pacific/Funafuti': 'Antarctica/McMurdo',
+        'Pacific/Kwajalein': 'Antarctica/McMurdo',
+        'Pacific/Majuro': 'Antarctica/McMurdo',
+        'Pacific/Nauru': 'Antarctica/McMurdo',
+        'Pacific/Tarawa': 'Antarctica/McMurdo',
+        'Pacific/Wake': 'Antarctica/McMurdo',
+        'Pacific/Wallis': 'Antarctica/McMurdo',
+        /*+13:00*/
+        'Etc/GMT-13': 'Pacific/Enderbury',
+        'MIT': 'Pacific/Enderbury',
+        'Pacific/Apia': 'Pacific/Enderbury',
+        'Pacific/Enderbury': 'Pacific/Enderbury',
+        'Pacific/Tongatapu': 'Pacific/Enderbury',
+        /*+14:00*/
+        'Etc/GMT-14': 'Pacific/Kiritimati',
+        'Pacific/Fakaofo': 'Pacific/Kiritimati',
+        'Pacific/Kiritimati': 'Pacific/Kiritimati'
+    },
 
-	/* return unmapped timezone... */
-	unMap: function (timezone) {
-		return this.map[timezone] !== undefined ? this.map[timezone] : timezone;
-	},
+    /* return unmapped timezone... */
+    unMap: function (timezone) {
+        return this.map[timezone] !== undefined ? this.map[timezone] : timezone;
+    },
 
-	getOffset: function (timezone) {
-		/* find timezone, this needs to be optimized ;) */
-		timezone = this.unMap(timezone);
-		var i = 0;
-		for (i = 0; i < this.store.length; i++) {
-			if (this.store[i][0] == timezone) {
-				return (this.store[i][2] * 60000);
-			}
-		}
+    getOffset: function (timezone) {
+        /* find timezone, this needs to be optimized ;) */
+        timezone = this.unMap(timezone);
+        var i = 0;
+        for (i = 0; i < this.store.length; i++) {
+            if (this.store[i][0] == timezone) {
+                return (this.store[i][2] * 60000);
+            }
+        }
 
-		return 0;	// no offset found...
-	}
+        return 0;	// no offset found...
+    }
 });
 
 Zarafa.plugins.calendarimporter.data.Timezones = new Zarafa.plugins.calendarimporter.data.Timezones();
\ No newline at end of file
diff --git a/js/dialogs/ImportContentPanel.js b/js/dialogs/ImportContentPanel.js
index dbd2e17..37fe4b1 100644
--- a/js/dialogs/ImportContentPanel.js
+++ b/js/dialogs/ImportContentPanel.js
@@ -1,5 +1,5 @@
 /**
- * ImportContentPanel.js zarafa calender to ics im/exporter
+ * ImportContentPanel.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
  * Copyright (C) 2012-2016 Christoph Haas
@@ -19,13 +19,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
- 
+
 /**
  * ImportContentPanel
  *
  * Container for the importpanel.
  */
-Ext.namespace("Zarafa.plugins.calendarimporter.dialogs"); 
+Ext.namespace("Zarafa.plugins.calendarimporter.dialogs");
 
 /**
  * @class Zarafa.plugins.calendarimporter.dialogs.ImportContentPanel
@@ -36,31 +36,31 @@ Ext.namespace("Zarafa.plugins.calendarimporter.dialogs");
  */
 Zarafa.plugins.calendarimporter.dialogs.ImportContentPanel = Ext.extend(Zarafa.core.ui.ContentPanel, {
 
-	/**
-	 * @constructor
-	 * @param config Configuration structure
-	 */
-	constructor : function(config) {
-		config = config || {};
-		Ext.applyIf(config, {
-			layout		: 'fit',
-			title		: _('Import Calendar File'),
-			closeOnSave	: true,
-			width		: 800,
-			height		: 700,
-			//Add panel
-			items : [
-				{
-					xtype	 : 'calendarimporter.importpanel',
-					filename : config.filename,
-					folder  : config.folder
-				}
-			]
-		});
+    /**
+     * @constructor
+     * @param config Configuration structure
+     */
+    constructor: function (config) {
+        config = config || {};
+        Ext.applyIf(config, {
+            layout: 'fit',
+            title: dgettext('plugin_calendarimporter', 'Import Calendar File'),
+            closeOnSave: true,
+            width: 800,
+            height: 700,
+            //Add panel
+            items: [
+                {
+                    xtype: 'calendarimporter.importpanel',
+                    filename: config.filename,
+                    folder: config.folder
+                }
+            ]
+        });
 
-		Zarafa.plugins.calendarimporter.dialogs.ImportContentPanel.superclass.constructor.call(this, config);
-	}
+        Zarafa.plugins.calendarimporter.dialogs.ImportContentPanel.superclass.constructor.call(this, config);
+    }
 
 });
 
-Ext.reg('calendarimporter.contentpanel' ,Zarafa.plugins.calendarimporter.dialogs.ImportContentPanel);
\ No newline at end of file
+Ext.reg('calendarimporter.contentpanel', Zarafa.plugins.calendarimporter.dialogs.ImportContentPanel);
\ No newline at end of file
diff --git a/js/dialogs/ImportPanel.js b/js/dialogs/ImportPanel.js
index abdc201..bda38c6 100644
--- a/js/dialogs/ImportPanel.js
+++ b/js/dialogs/ImportPanel.js
@@ -1,5 +1,5 @@
 /**
- * ImportPanel.js zarafa calender to ics im/exporter
+ * ImportPanel.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
  * Copyright (C) 2012-2016 Christoph Haas
@@ -13,7 +13,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- *	
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -25,7 +25,7 @@
  *
  * The main Panel of the calendarimporter plugin.
  */
-Ext.namespace("Zarafa.plugins.calendarimporter.dialogs"); 
+Ext.namespace("Zarafa.plugins.calendarimporter.dialogs");
 
 /**
  * @class Zarafa.plugins.calendarimporter.dialogs.ImportPanel
@@ -33,530 +33,558 @@ Ext.namespace("Zarafa.plugins.calendarimporter.dialogs");
  */
 Zarafa.plugins.calendarimporter.dialogs.ImportPanel = Ext.extend(Ext.Panel, {
 
-	/* store the imported timezone here... */
-	timezone: null,
-	
-	/* ignore daylight saving time... */
-	ignoredst: null,
-	
-	/* path to ics file on server... */
-	icsfile: null,
-	
-	/* loadmask for timezone/dst changes... */
-	loadMask: null,
-	
-	/* export event buffer */
-	exportResponse: [],
-	
-	/* how many requests are still running? */
-	runningRequests: null,
-	
-	/* The store for the selection grid */
-	store: null,
+    /* store the imported timezone here... */
+    timezone: null,
 
-	/* selected folder */
-	folder : null,
+    /* ignore daylight saving time... */
+    ignoredst: null,
 
-	/**
-	 * @constructor
-	 * @param {object} config
-	 */
-	constructor : function (config) {
-		config = config || {};
-		var self = this;
-		this.timezone = container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/default_timezone");
+    /* path to ics file on server... */
+    icsfile: null,
 
-		if (!Ext.isEmpty(config.filename)) {
-			this.icsfile = config.filename;
-		}
+    /* loadmask for timezone/dst changes... */
+    loadMask: null,
 
-		if (!Ext.isEmpty(config.folder)) {
-			this.folder = config.folder;
-		}
-		
-		// create the data store
-		this.store = new Ext.data.ArrayStore({
-			fields: [
-				{name: 'subject'},
-				{name: 'startdate'},
-				{name: 'enddate'},
-				{name: 'location'},
-				{name: 'body'},
-				{name: 'priority'},
-				{name: 'label'},
-				{name: 'busy'},
-				{name: 'class'},
-				{name: 'organizer'},
-				{name: 'alarms'},
-				{name: 'timezone'},
-				{name: 'record'}
-			]
-		});
-		
-		Ext.apply(config, {
-			xtype     : 'calendarimporter.importpanel',
-			ref		  : "importpanel",
-			id		  : "importpanel",
-			layout    : {
-				type  : 'form',
-				align : 'stretch'
-			},
-			anchor	  : '100%',
-			bodyStyle : 'background-color: inherit;',
-			defaults  : {
-				border      : true,
-				bodyStyle   : 'background-color: inherit; padding: 3px 0px 3px 0px; border-style: none none solid none;'
-			},
-			items : [
-				this.createSelectBox(),
-				this.createTimezoneBox(),
-				this.createDaylightSavingCheckBox(),
-				this.initForm(),
-				this.createGrid()
-			],
-			buttons: [
-				this.createSubmitAllButton(),
-				this.createSubmitButton(),
-				this.createCancelButton()
-			], 
-			listeners: {
-				afterrender: function (cmp) {
-					this.loadMask = new Ext.LoadMask(this.getEl(), {msg:'Loading...'});
-					
-					if(this.icsfile != null) { // if we have got the filename from an attachment
-						this.parseCalendar(this.icsfile, this.timezone, this.ignoredst);
-					}
-				},
-				scope: this
-			}
-		});
-		
-		Zarafa.plugins.calendarimporter.dialogs.ImportPanel.superclass.constructor.call(this, config);
-	},
+    /* export event buffer */
+    exportResponse: [],
 
-	/**
-	 * Init embedded form, this is the form that is
-	 * posted and contains the attachments
-	 * @private
-	 */
-	initForm : function () {
-		return {
-			xtype: 'form',
-			ref: 'addFormPanel',
-			layout : 'column',
-			fileUpload: true,
-			autoWidth: true,
-			autoHeight: true,
-			border: false,
-			bodyStyle: 'padding: 5px;',
-			defaults: {
-				anchor: '95%',
-				border: false,
-				bodyStyle: 'padding: 5px;'
-			},
-			items: [this.createUploadField()]
-		};
-	},
+    /* how many requests are still running? */
+    runningRequests: null,
 
-	/**
-	 * Reloads the data of the grid
-	 * @private
-	 */
-	reloadGridStore: function(eventdata) {
-		var parsedData = [];
-		
-		if(eventdata !== null) {
-			parsedData = new Array(eventdata.events.length);
-			var i = 0;
-			for(i = 0; i < eventdata.events.length; i++) {
-				parsedData[i] = [
-					eventdata.events[i]["subject"],
-					new Date(parseInt(eventdata.events[i]["startdate"]) * 1000),
-					new Date(parseInt(eventdata.events[i]["duedate"]) * 1000),
-					eventdata.events[i]["location"],
-					eventdata.events[i]["body"],
-					eventdata.events[i]["priority"],
-					eventdata.events[i]["label"],
-					eventdata.events[i]["busystatus"],
-					eventdata.events[i]["private"],
-					eventdata.events[i]["organizer"],
-					eventdata.events[i]["alarms"],
-					eventdata.events[i]["timezone"],
-					eventdata.events[i]
-				];
-			}
-		} else {
-			return null;
-		}
+    /* The store for the selection grid */
+    store: null,
 
-		this.store.loadData(parsedData, false);
-	},
-	
-	/**
-	 * Init embedded form, this is the form that is
-	 * posted and contains the attachments
-	 * @private
-	 */
-	createGrid : function() {
-		return {
-			xtype: 'grid',
-			ref: 'eventgrid',
-			id: 'eventgrid',
-			columnWidth: 1.0,
-			store: this.store,
-			width: '100%',
-			height: 300,
-			title: 'Select events to import',
-			frame: false,
-			viewConfig:{
-				forceFit:true
-			},
-			colModel: new Ext.grid.ColumnModel({
-				defaults: {
-					width: 300,
-					sortable: true
-				},
-				columns: [
-					{id: 'Summary', header: 'Title', width: 200, sortable: true, dataIndex: 'subject'},
-					{header: 'Start', width: 200, sortable: true, dataIndex: 'startdate', renderer : Zarafa.common.ui.grid.Renderers.datetime},
-					{header: 'End', width: 200, sortable: true, dataIndex: 'enddate', renderer : Zarafa.common.ui.grid.Renderers.datetime},
-					{header: 'Location', width: 150, sortable: true, dataIndex: 'location'},
-					{header: 'Description', sortable: true, dataIndex: 'body'},
-					{header: "Priority", dataIndex: 'priority', hidden: true},
-					{header: "Label", dataIndex: 'label', hidden: true},
-					{header: "Busystatus", dataIndex: 'busy', hidden: true},
-					{header: "Privacystatus", dataIndex: 'class', hidden: true},
-					{header: "Organizer", dataIndex: 'organizer', hidden: true},
-					{header: "Alarm", dataIndex: 'alarms', hidden: true, renderer : Zarafa.common.ui.grid.Renderers.datetime},
-					{header: "Timezone", dataIndex: 'timezone', hidden: true}
-				]
-			}),
-			sm: new Ext.grid.RowSelectionModel({multiSelect:true})
-		}
-	},
-	
-	createSelectBox: function() {
-		var myStore = Zarafa.plugins.calendarimporter.data.Actions.getAllCalendarFolders(true);
+    /* selected folder */
+    folder: null,
 
-		return {
-			xtype: "selectbox",
-			ref: 'calendarselector',
-			editable: false,
-			name: "choosen_calendar",
-			value: Ext.isEmpty(this.folder) ? Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByName(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/default_calendar")).entryid : this.folder,
-			width: 100,
-			fieldLabel: "Select folder",
-			store: myStore,
-			mode: 'local',
-			labelSeperator: ":",
-			border: false,
-			anchor: "100%",
-			scope: this,
-			hidden        : Ext.isEmpty(this.folder) ? false : true,
-			allowBlank: false
-		}
-	},
-	
-	createTimezoneBox: function() {
-		return {
-			xtype: "selectbox",
-			ref: 'timezoneselector',
-			editable: false,
-			name: "choosen_timezone",
-			value: Zarafa.plugins.calendarimporter.data.Timezones.unMap(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/default_timezone")),
-			width: 100,
-			fieldLabel: "Timezone",
-			store: Zarafa.plugins.calendarimporter.data.Timezones.store,
-			labelSeperator: ":",
-			mode: 'local',
-			border: false,
-			anchor: "100%",
-			scope: this,
-			allowBlank: true,
-			listeners: {
-				select: this.onTimezoneSelected,
-				scope: this
-			}
-		}
-	},
-	
-	createDaylightSavingCheckBox: function() {
-		return {
-			xtype: "checkbox",
-			ref: 'dstcheck',
-			name: "dst_check",
-			width: 100,
-			fieldLabel: "Ignore DST",
-			boxLabel: 'This will ignore "Daylight saving time" offsets.',
-			labelSeperator: ":",
-			border: false,
-			anchor: "100%",
-			scope: this,
-			allowBlank: true,
-			listeners: {
-				check: this.onDstChecked,
-				scope: this
-			}
-		}
-	},
-	
-	createUploadField: function() {
-		return {
-			xtype: "fileuploadfield",
-			ref: 'fileuploadfield',
-			columnWidth: 1.0,
-			id: 'form-file',    
-			name: 'icsdata',
-			emptyText: 'Select an .ics calendar',
-			border: false,
-			anchor: "100%",
-			height     : "30",
-			scope: this,
-			allowBlank: false,
-			listeners: {
-				fileselected: this.onFileSelected,
-				scope: this
-			}
-		}
-	},
-	
-	createSubmitButton: function() {
-		return {
-			xtype: "button",
-			ref: "../submitButton",
-			disabled: true,
-			width: 100,
-			border: false,
-			text: _("Import"),
-			anchor: "100%",
-			handler: this.importCheckedEvents,
-			scope: this
-		}
-	},
-	
-	createSubmitAllButton: function() {
-		return {
-			xtype: "button",
-			ref: "../submitAllButton",
-			disabled: true,
-			width: 100,
-			border: false,
-			text: _("Import All"),
-			anchor: "100%",
-			handler: this.importAllEvents,
-			scope: this
-		}
-	},
-	
-	createCancelButton: function() {
-		return {
-			xtype: "button",
-			width: 100,
-			border: false,
-			text: _("Cancel"),
-			anchor: "100%",
-			handler: this.close,
-			scope: this
-		}
-	},
-	
-	/**
-	 * This is called when a timezone has been seleceted in the timezone dialog
-	 * @param {Ext.form.ComboBox} combo
-	 * @param {Ext.data.Record} record
-	 * @param {Number} index
-	 */
-	onTimezoneSelected : function(combo, record, index) {
-		this.timezone = record.data.field1;
-		
-		if(this.icsfile != null) {
-			this.parseCalendar(this.icsfile, this.timezone, this.ignoredst);
-		}
-	},
-	
-	/**
-	 * This is called when the dst checkbox has been selected
-	 * @param {Ext.form.CheckBox} checkbox
-	 * @param {boolean} checked
-	 */
-	onDstChecked : function(checkbox, checked) {
-		this.ignoredst = checked;
-		
-		if(this.icsfile != null) {
-			this.parseCalendar(this.icsfile, this.timezone, this.ignoredst);
-		}
-	},
-	
-	/**
-	 * This is called when a file has been seleceted in the file dialog
-	 * in the {@link Ext.ux.form.FileUploadField} and the dialog is closed
-	 * @param {Ext.ux.form.FileUploadField} uploadField being added a file to
-	 */
-	onFileSelected : function(uploadField) {
-		var form = this.addFormPanel.getForm();
+    /**
+     * @constructor
+     * @param {object} config
+     */
+    constructor: function (config) {
+        config = config || {};
+        var self = this;
+        this.timezone = container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/default_timezone");
 
-		if (form.isValid()) {
-			form.submit({
-				waitMsg: 'Uploading and parsing calendar...',
-				url: 'plugins/calendarimporter/php/upload.php',
-				failure: function(file, action) {
-					this.submitButton.disable();
-					this.submitAllButton.disable();
-					Zarafa.common.dialogs.MessageBox.show({
-						title   : _('Error'),
-						msg     : _(action.result.error),
-						icon    : Zarafa.common.dialogs.MessageBox.ERROR,
-						buttons : Zarafa.common.dialogs.MessageBox.OK
-					});
-				},
-				success: function(file, action){
-					uploadField.reset();
-					this.icsfile = action.result.ics_file;
-					
-					this.parseCalendar(this.icsfile, this.timezone, this.ignoredst);
-				},
-				scope : this
-			});
-		}
-	},
-	
-	parseCalendar: function (icsPath, timezone, ignoredst) {
-		this.loadMask.show();
+        if (!Ext.isEmpty(config.filename)) {
+            this.icsfile = config.filename;
+        }
 
-		var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
-			successCallback: this.handleParsingResult,
-			scope: this
-		});
-		
-		container.getRequest().singleRequest(
-			'calendarmodule',
-			'load',
-			{
-				ics_filepath: icsPath,
-				timezone: timezone,
-				ignore_dst: ignoredst
-			},
-			responseHandler
-		);
-	},
-	
-	handleParsingResult: function(response) {
-		var self = this.scope;
+        if (!Ext.isEmpty(config.folder)) {
+            this.folder = config.folder;
+        }
 
-		self.loadMask.hide();
-		
-		if(response["status"] == true) {
-			self.submitButton.enable();
-			self.submitAllButton.enable();
+        // create the data store
+        this.store = new Ext.data.ArrayStore({
+            fields: [
+                {name: 'subject'},
+                {name: 'startdate'},
+                {name: 'enddate'},
+                {name: 'location'},
+                {name: 'body'},
+                {name: 'priority'},
+                {name: 'label'},
+                {name: 'busy'},
+                {name: 'class'},
+                {name: 'organizer'},
+                {name: 'alarms'},
+                {name: 'timezone'},
+                {name: 'record'}
+            ]
+        });
 
-			if(typeof response.parsed.calendar["X-WR-TIMEZONE"] !== "undefined") {
-				self.timezone = response.parsed.calendar["X-WR-TIMEZONE"];
-				self.timezoneselector.setValue(Zarafa.plugins.calendarimporter.data.Timezones.unMap(this.timezone));
-			}
-			self.reloadGridStore(response.parsed);
-		} else {
-			self.submitButton.disable();
-			self.submitAllButton.disable();
-			Zarafa.common.dialogs.MessageBox.show({
-				title   : _('Parser Error'),
-				msg     : _(response["message"]),
-				icon    : Zarafa.common.dialogs.MessageBox.ERROR,
-				buttons : Zarafa.common.dialogs.MessageBox.OK
-			});
-		}
-	},
+        Ext.apply(config, {
+            xtype: 'calendarimporter.importpanel',
+            ref: "importpanel",
+            id: "importpanel",
+            layout: {
+                type: 'form',
+                align: 'stretch'
+            },
+            anchor: '100%',
+            bodyStyle: 'background-color: inherit;',
+            defaults: {
+                border: true,
+                bodyStyle: 'background-color: inherit; padding: 3px 0px 3px 0px; border-style: none none solid none;'
+            },
+            items: [
+                this.createSelectBox(),
+                this.createTimezoneBox(),
+                this.createDaylightSavingCheckBox(),
+                this.initForm(),
+                this.createGrid()
+            ],
+            buttons: [
+                this.createSubmitAllButton(),
+                this.createSubmitButton(),
+                this.createCancelButton()
+            ],
+            listeners: {
+                afterrender: function (cmp) {
+                    this.loadMask = new Ext.LoadMask(this.getEl(), {msg: dgettext('plugin_calendarimporter', 'Loading...')});
 
-	close: function () {
-		this.addFormPanel.getForm().reset();
-		this.dialog.close()
-	},
+                    if (this.icsfile != null) { // if we have got the filename from an attachment
+                        this.parseCalendar(this.icsfile, this.timezone, this.ignoredst);
+                    }
+                },
+                scope: this
+            }
+        });
 
-	importCheckedEvents: function () {
-		var newRecords = this.eventgrid.selModel.getSelections();
-		this.importEvents(newRecords);
+        Zarafa.plugins.calendarimporter.dialogs.ImportPanel.superclass.constructor.call(this, config);
     },
 
-	importAllEvents: function () {
-		//receive Records from grid rows
-		this.eventgrid.selModel.selectAll();  // select all entries
-		var newRecords = this.eventgrid.selModel.getSelections();
-		this.importEvents(newRecords);
+    /**
+     * Init embedded form, this is the form that is
+     * posted and contains the attachments
+     * @private
+     */
+    initForm: function () {
+        return {
+            xtype: 'form',
+            ref: 'addFormPanel',
+            layout: 'column',
+            fileUpload: true,
+            autoWidth: true,
+            autoHeight: true,
+            border: false,
+            bodyStyle: 'padding: 5px;',
+            defaults: {
+                anchor: '95%',
+                border: false,
+                bodyStyle: 'padding: 5px;'
+            },
+            items: [this.createUploadField()]
+        };
     },
-	
-	/** 
-	 * This function stores all given events to the appointmentstore 
-	 * @param events
-	 */
-	importEvents: function (events) {
-		//receive existing calendar store
-		var calValue = this.calendarselector.getValue();
 
-		if(Ext.isEmpty(calValue)) { // no calendar choosen
-			Zarafa.common.dialogs.MessageBox.show({
-				title   : _('Error'),
-				msg     : _('You have to choose a calendar!'),
-				icon    : Zarafa.common.dialogs.MessageBox.ERROR,
-				buttons : Zarafa.common.dialogs.MessageBox.OK
-			});
-		} else {
-			if(this.eventgrid.selModel.getCount() < 1) {
-				Zarafa.common.dialogs.MessageBox.show({
-					title   : _('Error'),
-					msg     : _('You have to choose at least one event to import!'),
-					icon    : Zarafa.common.dialogs.MessageBox.ERROR,
-					buttons : Zarafa.common.dialogs.MessageBox.OK
-				});
-			} else {
-				var calendarFolder = Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(calValue);
+    /**
+     * Reloads the data of the grid
+     * @private
+     */
+    reloadGridStore: function (eventdata) {
+        var parsedData = [];
 
-				this.loadMask.show();
-				var uids = [];
+        if (eventdata !== null) {
+            parsedData = new Array(eventdata.events.length);
+            var i = 0;
+            for (i = 0; i < eventdata.events.length; i++) {
+                parsedData[i] = [
+                    eventdata.events[i]["subject"],
+                    new Date(parseInt(eventdata.events[i]["startdate"]) * 1000),
+                    new Date(parseInt(eventdata.events[i]["duedate"]) * 1000),
+                    eventdata.events[i]["location"],
+                    eventdata.events[i]["body"],
+                    eventdata.events[i]["priority"],
+                    eventdata.events[i]["label"],
+                    eventdata.events[i]["busystatus"],
+                    eventdata.events[i]["private"],
+                    eventdata.events[i]["organizer"],
+                    eventdata.events[i]["alarms"],
+                    eventdata.events[i]["timezone"],
+                    eventdata.events[i]
+                ];
+            }
+        } else {
+            return null;
+        }
 
-				//receive Records from grid rows
-				Ext.each(events, function(newRecord) {
-					uids.push(newRecord.data.record.internal_fields.event_uid);
-				}, this);
+        this.store.loadData(parsedData, false);
+    },
 
-				var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
-					successCallback: this.importEventsDone,
-					scope: this
-				});
+    /**
+     * Init embedded form, this is the form that is
+     * posted and contains the attachments
+     * @private
+     */
+    createGrid: function () {
+        return {
+            xtype: 'grid',
+            ref: 'eventgrid',
+            id: 'eventgrid',
+            columnWidth: 1.0,
+            store: this.store,
+            width: '100%',
+            height: 300,
+            title: dgettext('plugin_calendarimporter', 'Select events to import'),
+            frame: false,
+            viewConfig: {
+                forceFit: true
+            },
+            colModel: new Ext.grid.ColumnModel({
+                defaults: {
+                    width: 300,
+                    sortable: true
+                },
+                columns: [
+                    {
+                        id: 'Summary',
+                        header: dgettext('plugin_calendarimporter', 'Title'),
+                        width: 200,
+                        sortable: true,
+                        dataIndex: 'subject'
+                    },
+                    {
+                        header: dgettext('plugin_calendarimporter', 'Start'),
+                        width: 200,
+                        sortable: true,
+                        dataIndex: 'startdate',
+                        renderer: Zarafa.common.ui.grid.Renderers.datetime
+                    },
+                    {
+                        header: dgettext('plugin_calendarimporter', 'End'),
+                        width: 200,
+                        sortable: true,
+                        dataIndex: 'enddate',
+                        renderer: Zarafa.common.ui.grid.Renderers.datetime
+                    },
+                    {
+                        header: dgettext('plugin_calendarimporter', 'Location'),
+                        width: 150,
+                        sortable: true,
+                        dataIndex: 'location'
+                    },
+                    {header: dgettext('plugin_calendarimporter', 'Description'), sortable: true, dataIndex: 'body'},
+                    {header: dgettext('plugin_calendarimporter', 'Priority'), dataIndex: 'priority', hidden: true},
+                    {header: dgettext('plugin_calendarimporter', 'Label'), dataIndex: 'label', hidden: true},
+                    {header: dgettext('plugin_calendarimporter', 'Busystatus'), dataIndex: 'busy', hidden: true},
+                    {header: dgettext('plugin_calendarimporter', 'Privacystatus'), dataIndex: 'class', hidden: true},
+                    {header: dgettext('plugin_calendarimporter', 'Organizer'), dataIndex: 'organizer', hidden: true},
+                    {
+                        header: dgettext('plugin_calendarimporter', 'Alarm'),
+                        dataIndex: 'alarms',
+                        hidden: true,
+                        renderer: Zarafa.common.ui.grid.Renderers.datetime
+                    },
+                    {header: dgettext('plugin_calendarimporter', 'Timezone'), dataIndex: 'timezone', hidden: true}
+                ]
+            }),
+            sm: new Ext.grid.RowSelectionModel({multiSelect: true})
+        }
+    },
 
-				container.getRequest().singleRequest(
-					'calendarmodule',
-					'import',
-					{
-						storeid     : calendarFolder.store_entryid,
-						folderid    : calendarFolder.entryid,
-						uids        : uids,
-						ics_filepath: this.icsfile
-					},
-					responseHandler
-				);
-			}
-		}
-	},
+    createSelectBox: function () {
+        var myStore = Zarafa.plugins.calendarimporter.data.Actions.getAllCalendarFolders(true);
 
-	/**
-	 * Callback for the import request.
-	 * @param {Object} response
-	 */
-	importEventsDone: function (response) {
-		var self = this.scope;
+        return {
+            xtype: "selectbox",
+            ref: 'calendarselector',
+            editable: false,
+            name: "choosen_calendar",
+            value: Ext.isEmpty(this.folder) ? Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByName(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/default_calendar")).entryid : this.folder,
+            width: 100,
+            fieldLabel: dgettext('plugin_calendarimporter', 'Select folder'),
+            store: myStore,
+            mode: 'local',
+            labelSeperator: ":",
+            border: false,
+            anchor: "100%",
+            scope: this,
+            hidden: Ext.isEmpty(this.folder) ? false : true,
+            allowBlank: false
+        }
+    },
 
-		self.loadMask.hide();
-		self.dialog.close();
-		if (response.status == true) {
-			container.getNotifier().notify('info', 'Imported', 'Imported ' + response.count + ' events. Please reload your calendar!');
-		} else {
-			Zarafa.common.dialogs.MessageBox.show({
-				title  : _('Error'),
-				msg    : _('Import failed: ') + response.message,
-				icon   : Zarafa.common.dialogs.MessageBox.ERROR,
-				buttons: Zarafa.common.dialogs.MessageBox.OK
-			});
-		}
-	}
+    createTimezoneBox: function () {
+        return {
+            xtype: "selectbox",
+            ref: 'timezoneselector',
+            editable: false,
+            name: "choosen_timezone",
+            value: Zarafa.plugins.calendarimporter.data.Timezones.unMap(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/default_timezone")),
+            width: 100,
+            fieldLabel: dgettext('plugin_calendarimporter', 'Timezone'),
+            store: Zarafa.plugins.calendarimporter.data.Timezones.store,
+            labelSeperator: ":",
+            mode: 'local',
+            border: false,
+            anchor: "100%",
+            scope: this,
+            allowBlank: true,
+            listeners: {
+                select: this.onTimezoneSelected,
+                scope: this
+            }
+        }
+    },
+
+    createDaylightSavingCheckBox: function () {
+        return {
+            xtype: "checkbox",
+            ref: 'dstcheck',
+            name: "dst_check",
+            width: 100,
+            fieldLabel: dgettext('plugin_calendarimporter', 'Ignore DST'),
+            boxLabel: dgettext('plugin_calendarimporter', 'This will ignore "Daylight saving time" offsets.'),
+            labelSeperator: ":",
+            border: false,
+            anchor: "100%",
+            scope: this,
+            allowBlank: true,
+            listeners: {
+                check: this.onDstChecked,
+                scope: this
+            }
+        }
+    },
+
+    createUploadField: function () {
+        return {
+            xtype: "fileuploadfield",
+            ref: 'fileuploadfield',
+            columnWidth: 1.0,
+            id: 'form-file',
+            name: 'icsdata',
+            emptyText: dgettext('plugin_calendarimporter', 'Select an .ics calendar'),
+            border: false,
+            anchor: "100%",
+            height: "30",
+            scope: this,
+            allowBlank: false,
+            listeners: {
+                fileselected: this.onFileSelected,
+                scope: this
+            }
+        }
+    },
+
+    createSubmitButton: function () {
+        return {
+            xtype: "button",
+            ref: "../submitButton",
+            disabled: true,
+            width: 100,
+            border: false,
+            text: dgettext('plugin_calendarimporter', 'Import'),
+            anchor: "100%",
+            handler: this.importCheckedEvents,
+            scope: this
+        }
+    },
+
+    createSubmitAllButton: function () {
+        return {
+            xtype: "button",
+            ref: "../submitAllButton",
+            disabled: true,
+            width: 100,
+            border: false,
+            text: dgettext('plugin_calendarimporter', 'Import All'),
+            anchor: "100%",
+            handler: this.importAllEvents,
+            scope: this
+        }
+    },
+
+    createCancelButton: function () {
+        return {
+            xtype: "button",
+            width: 100,
+            border: false,
+            text: dgettext('plugin_calendarimporter', 'Cancel'),
+            anchor: "100%",
+            handler: this.close,
+            scope: this
+        }
+    },
+
+    /**
+     * This is called when a timezone has been seleceted in the timezone dialog
+     * @param {Ext.form.ComboBox} combo
+     * @param {Ext.data.Record} record
+     * @param {Number} index
+     */
+    onTimezoneSelected: function (combo, record, index) {
+        this.timezone = record.data.field1;
+
+        if (this.icsfile != null) {
+            this.parseCalendar(this.icsfile, this.timezone, this.ignoredst);
+        }
+    },
+
+    /**
+     * This is called when the dst checkbox has been selected
+     * @param {Ext.form.CheckBox} checkbox
+     * @param {boolean} checked
+     */
+    onDstChecked: function (checkbox, checked) {
+        this.ignoredst = checked;
+
+        if (this.icsfile != null) {
+            this.parseCalendar(this.icsfile, this.timezone, this.ignoredst);
+        }
+    },
+
+    /**
+     * This is called when a file has been seleceted in the file dialog
+     * in the {@link Ext.ux.form.FileUploadField} and the dialog is closed
+     * @param {Ext.ux.form.FileUploadField} uploadField being added a file to
+     */
+    onFileSelected: function (uploadField) {
+        var form = this.addFormPanel.getForm();
+
+        if (form.isValid()) {
+            form.submit({
+                waitMsg: dgettext('plugin_calendarimporter', 'Uploading and parsing calendar...'),
+                url: 'plugins/calendarimporter/php/upload.php',
+                failure: function (file, action) {
+                    this.submitButton.disable();
+                    this.submitAllButton.disable();
+                    Zarafa.common.dialogs.MessageBox.show({
+                        title: _('Error'),
+                        msg: _(action.result.error),
+                        icon: Zarafa.common.dialogs.MessageBox.ERROR,
+                        buttons: Zarafa.common.dialogs.MessageBox.OK
+                    });
+                },
+                success: function (file, action) {
+                    uploadField.reset();
+                    this.icsfile = action.result.ics_file;
+
+                    this.parseCalendar(this.icsfile, this.timezone, this.ignoredst);
+                },
+                scope: this
+            });
+        }
+    },
+
+    parseCalendar: function (icsPath, timezone, ignoredst) {
+        this.loadMask.show();
+
+        var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
+            successCallback: this.handleParsingResult,
+            scope: this
+        });
+
+        container.getRequest().singleRequest(
+            'calendarmodule',
+            'load',
+            {
+                ics_filepath: icsPath,
+                timezone: timezone,
+                ignore_dst: ignoredst
+            },
+            responseHandler
+        );
+    },
+
+    handleParsingResult: function (response) {
+        var self = this.scope;
+
+        self.loadMask.hide();
+
+        if (response["status"] == true) {
+            self.submitButton.enable();
+            self.submitAllButton.enable();
+
+            if (typeof response.parsed.calendar["X-WR-TIMEZONE"] !== "undefined") {
+                self.timezone = response.parsed.calendar["X-WR-TIMEZONE"];
+                self.timezoneselector.setValue(Zarafa.plugins.calendarimporter.data.Timezones.unMap(this.timezone));
+            }
+            self.reloadGridStore(response.parsed);
+        } else {
+            self.submitButton.disable();
+            self.submitAllButton.disable();
+            Zarafa.common.dialogs.MessageBox.show({
+                title: dgettext('plugin_calendarimporter', 'Parser Error'),
+                msg: response["message"],
+                icon: Zarafa.common.dialogs.MessageBox.ERROR,
+                buttons: Zarafa.common.dialogs.MessageBox.OK
+            });
+        }
+    },
+
+    close: function () {
+        this.addFormPanel.getForm().reset();
+        this.dialog.close()
+    },
+
+    importCheckedEvents: function () {
+        var newRecords = this.eventgrid.selModel.getSelections();
+        this.importEvents(newRecords);
+    },
+
+    importAllEvents: function () {
+        //receive Records from grid rows
+        this.eventgrid.selModel.selectAll();  // select all entries
+        var newRecords = this.eventgrid.selModel.getSelections();
+        this.importEvents(newRecords);
+    },
+
+    /**
+     * This function stores all given events to the appointmentstore
+     * @param events
+     */
+    importEvents: function (events) {
+        //receive existing calendar store
+        var calValue = this.calendarselector.getValue();
+
+        if (Ext.isEmpty(calValue)) { // no calendar choosen
+            Zarafa.common.dialogs.MessageBox.show({
+                title: dgettext('plugin_calendarimporter', 'Error'),
+                msg: dgettext('plugin_calendarimporter', 'You have to choose a calendar!'),
+                icon: Zarafa.common.dialogs.MessageBox.ERROR,
+                buttons: Zarafa.common.dialogs.MessageBox.OK
+            });
+        } else {
+            if (this.eventgrid.selModel.getCount() < 1) {
+                Zarafa.common.dialogs.MessageBox.show({
+                    title: dgettext('plugin_calendarimporter', 'Error'),
+                    msg: dgettext('plugin_calendarimporter', 'You have to choose at least one event to import!'),
+                    icon: Zarafa.common.dialogs.MessageBox.ERROR,
+                    buttons: Zarafa.common.dialogs.MessageBox.OK
+                });
+            } else {
+                var calendarFolder = Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(calValue);
+
+                this.loadMask.show();
+                var uids = [];
+
+                //receive Records from grid rows
+                Ext.each(events, function (newRecord) {
+                    uids.push(newRecord.data.record.internal_fields.event_uid);
+                }, this);
+
+                var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
+                    successCallback: this.importEventsDone,
+                    scope: this
+                });
+
+                container.getRequest().singleRequest(
+                    'calendarmodule',
+                    'import',
+                    {
+                        storeid: calendarFolder.store_entryid,
+                        folderid: calendarFolder.entryid,
+                        uids: uids,
+                        ics_filepath: this.icsfile
+                    },
+                    responseHandler
+                );
+            }
+        }
+    },
+
+    /**
+     * Callback for the import request.
+     * @param {Object} response
+     */
+    importEventsDone: function (response) {
+        var self = this.scope;
+
+        self.loadMask.hide();
+        self.dialog.close();
+        if (response.status == true) {
+            container.getNotifier().notify('info', 'Imported', 'Imported ' + response.count + ' events. Please reload your calendar!');
+        } else {
+            Zarafa.common.dialogs.MessageBox.show({
+                title: dgettext('plugin_calendarimporter', 'Error'),
+                msg: String.format(dgettext('plugin_calendarimporter', 'Import failed: {0}'), response.message),
+                icon: Zarafa.common.dialogs.MessageBox.ERROR,
+                buttons: Zarafa.common.dialogs.MessageBox.OK
+            });
+        }
+    }
 });
 
 Ext.reg('calendarimporter.importpanel', Zarafa.plugins.calendarimporter.dialogs.ImportPanel);
diff --git a/js/plugin.calendarimporter.js b/js/plugin.calendarimporter.js
index bb4579d..2e751ae 100644
--- a/js/plugin.calendarimporter.js
+++ b/js/plugin.calendarimporter.js
@@ -1,5 +1,5 @@
 /**
- * plugin.calendarimporter.js zarafa calender to ics im/exporter
+ * plugin.calendarimporter.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
  * Copyright (C) 2012-2016 Christoph Haas
@@ -24,285 +24,291 @@ Ext.namespace("Zarafa.plugins.calendarimporter");									// Assign the right na
 
 Zarafa.plugins.calendarimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {		// create new import plugin
 
-	/**
-	 * @constructor
-	 * @param {Object} config Configuration object
-	 *
-	 */
-	constructor: function (config) {
-		config = config || {};
+    /**
+     * @constructor
+     * @param {Object} config Configuration object
+     *
+     */
+    constructor: function (config) {
+        config = config || {};
 
-		Zarafa.plugins.calendarimporter.ImportPlugin.superclass.constructor.call(this, config);
-	},
+        Zarafa.plugins.calendarimporter.ImportPlugin.superclass.constructor.call(this, config);
+    },
 
-	/**
-	 * initialises insertion point for plugin
-	 * @protected
-	 */
-	initPlugin: function () {
-		Zarafa.plugins.calendarimporter.ImportPlugin.superclass.initPlugin.apply(this, arguments);
+    /**
+     * initialises insertion point for plugin
+     * @protected
+     */
+    initPlugin: function () {
+        Zarafa.plugins.calendarimporter.ImportPlugin.superclass.initPlugin.apply(this, arguments);
 
-		/* our panel */
-		Zarafa.core.data.SharedComponentType.addProperty('plugins.calendarimporter.dialogs.importevents');
+        /* our panel */
+        Zarafa.core.data.SharedComponentType.addProperty('plugins.calendarimporter.dialogs.importevents');
 
-		/* directly import received icals */
-		this.registerInsertionPoint('common.contextmenu.attachment.actions', this.createAttachmentImportButton);
+        /* directly import received icals */
+        this.registerInsertionPoint('common.contextmenu.attachment.actions', this.createAttachmentImportButton);
 
-		/* add settings widget */
-		this.registerInsertionPoint('context.settings.category.calendar', this.createSettingsWidget);
+        /* add settings widget */
+        this.registerInsertionPoint('context.settings.category.calendar', this.createSettingsWidget);
 
-		/* export a calendar entry via rightclick */
-		this.registerInsertionPoint('context.calendar.contextmenu.actions', this.createItemExportInsertionPoint, this);
+        /* export a calendar entry via rightclick */
+        this.registerInsertionPoint('context.calendar.contextmenu.actions', this.createItemExportInsertionPoint, this);
 
-		/* ical sync stuff */
-		if (container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/enable_sync") === true) {
-			/* edit panel */
-			Zarafa.core.data.SharedComponentType.addProperty('plugins.calendarimporter.settings.dialogs.calsyncedit');
+        /* ical sync stuff */
+        if (container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/enable_sync") === true) {
+            /* edit panel */
+            Zarafa.core.data.SharedComponentType.addProperty('plugins.calendarimporter.settings.dialogs.calsyncedit');
 
-			/* enable the settings widget */
-			this.registerInsertionPoint('context.settings.category.calendar', this.createSettingsCalSyncWidget);
-		}
-	},
+            /* enable the settings widget */
+            this.registerInsertionPoint('context.settings.category.calendar', this.createSettingsCalSyncWidget);
+        }
+    },
 
-	/**
-	 * This method hooks to the contact context menu and allows users to export users to vcf.
-	 *
-	 * @param include
-	 * @param btn
-	 * @returns {Object}
-	 */
-	createItemExportInsertionPoint: function (include, btn) {
-		return {
-			text   : dgettext('plugin_files', 'Export Event'),
-			handler: this.exportToICS.createDelegate(this, [btn]),
-			scope  : this,
-			iconCls: 'icon_calendarimporter_export'
-		};
-	},
+    /**
+     * This method hooks to the contact context menu and allows users to export users to vcf.
+     *
+     * @param include
+     * @param btn
+     * @returns {Object}
+     */
+    createItemExportInsertionPoint: function (include, btn) {
+        return {
+            text: dgettext('plugin_calendarimporter', 'Export Event'),
+            handler: this.exportToICS.createDelegate(this, [btn]),
+            scope: this,
+            iconCls: 'icon_calendarimporter_export'
+        };
+    },
 
-	/**
-	 * Generates a request to download the selected records as vCard.
-	 * @param {Ext.Button} btn
-	 */
-	exportToICS: function (btn) {
-		if (btn.records.length == 0) {
-			return; // skip if no records where given!
-		}
+    /**
+     * Generates a request to download the selected records as vCard.
+     * @param {Ext.Button} btn
+     */
+    exportToICS: function (btn) {
+        if (btn.records.length == 0) {
+            return; // skip if no records where given!
+        }
 
-		var recordIds = [];
+        var recordIds = [];
 
-		for (var i = 0; i < btn.records.length; i++) {
-			recordIds.push(btn.records[i].get("entryid"));
-		}
+        for (var i = 0; i < btn.records.length; i++) {
+            recordIds.push(btn.records[i].get("entryid"));
+        }
 
-		var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
-			successCallback: Zarafa.plugins.calendarimporter.data.Actions.downloadICS,
-			scope          : this
-		});
+        var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
+            successCallback: Zarafa.plugins.calendarimporter.data.Actions.downloadICS,
+            scope: this
+        });
 
-		// request attachment preperation
-		container.getRequest().singleRequest(
-			'calendarmodule',
-			'export',
-			{
-				storeid: btn.records[0].get("store_entryid"),
-				records: recordIds
-			},
-			responseHandler
-		);
-	},
+        // Notify user
+        // # TRANSLATORS: {0} will be replaced by the number of contacts that will be exported
+        container.getNotifier().notify('info', dgettext('plugin_contactimporter', 'Calendar Export'), String.format(dgettext('plugin_calendarimporter', 'Exporting {0} events. Please wait...'), recordIds.length));
 
-	/**
-	 * Creates the button
-	 *
-	 * @return {Object} Configuration object for a {@link Ext.Button button}
-	 *
-	 */
-	createSettingsWidget: function () {
-		return [{
-			xtype: 'calendarimporter.settingswidget'
-		}];
-	},
 
-	/**
-	 * Creates the button
-	 *
-	 * @return {Object} Configuration object for a {@link Ext.Button button}
-	 *
-	 */
-	createSettingsCalSyncWidget: function () {
-		return [{
-			xtype: 'calendarimporter.settingscalsyncwidget'
-		}];
-	},
+        // request attachment preperation
+        container.getRequest().singleRequest(
+            'calendarmodule',
+            'export',
+            {
+                storeid: btn.records[0].get("store_entryid"),
+                records: recordIds
+            },
+            responseHandler
+        );
+    },
 
-	/**
-	 * Insert import button in all attachment suggestions
+    /**
+     * Creates the button
+     *
+     * @return {Object} Configuration object for a {@link Ext.Button button}
+     *
+     */
+    createSettingsWidget: function () {
+        return [{
+            xtype: 'calendarimporter.settingswidget'
+        }];
+    },
 
-	 * @return {Object} Configuration object for a {@link Ext.Button button}
-	 */
-	createAttachmentImportButton: function (include, btn) {
-		return {
-			text      : _('Import to Calendar'),
-			handler   : this.getAttachmentFileName.createDelegate(this, [btn]),
-			scope     : this,
-			iconCls   : 'icon_calendarimporter_button',
-			beforeShow: function (item, record) {
-				var extension = record.data.name.split('.').pop().toLowerCase();
+    /**
+     * Creates the button
+     *
+     * @return {Object} Configuration object for a {@link Ext.Button button}
+     *
+     */
+    createSettingsCalSyncWidget: function () {
+        return [{
+            xtype: 'calendarimporter.settingscalsyncwidget'
+        }];
+    },
 
-				if (record.data.filetype == "text/calendar" || extension == "ics" || extension == "ifb" || extension == "ical" || extension == "ifbf") {
-					item.setVisible(true);
-				} else {
-					item.setVisible(false);
-				}
-			}
-		};
-	},
+    /**
+     * Insert import button in all attachment suggestions
 
-	/**
-	 * Callback for getAttachmentFileName
-	 */
-	gotAttachmentFileName: function (response) {
-		if (response.status == true) {
-			this.scope.openImportDialog(response.tmpname);
-		} else {
-			Zarafa.common.dialogs.MessageBox.show({
-				title  : _('Error'),
-				msg    : _(response["message"]),
-				icon   : Zarafa.common.dialogs.MessageBox.ERROR,
-				buttons: Zarafa.common.dialogs.MessageBox.OK
-			});
-		}
-	},
+     * @return {Object} Configuration object for a {@link Ext.Button button}
+     */
+    createAttachmentImportButton: function (include, btn) {
+        return {
+            text: dgettext('plugin_calendarimporter', 'Import to Calendar'),
+            handler: this.getAttachmentFileName.createDelegate(this, [btn]),
+            scope: this,
+            iconCls: 'icon_calendarimporter_button',
+            beforeShow: function (item, record) {
+                var extension = record.data.name.split('.').pop().toLowerCase();
 
-	/**
-	 * Clickhandler for the button
-	 */
-	getAttachmentFileName: function (btn, callback) {
-		Zarafa.common.dialogs.MessageBox.show({
-			title       : 'Please wait',
-			msg         : 'Loading attachment...',
-			progressText: 'Initializing...',
-			width       : 300,
-			progress    : true,
-			closable    : false
-		});
+                if (record.data.filetype == "text/calendar" || extension == "ics" || extension == "ifb" || extension == "ical" || extension == "ifbf") {
+                    item.setVisible(true);
+                } else {
+                    item.setVisible(false);
+                }
+            }
+        };
+    },
 
-		// progress bar... ;)
-		var f = function (v) {
-			return function () {
-				if (v == 100) {
-					Zarafa.common.dialogs.MessageBox.hide();
-				} else {
-					Zarafa.common.dialogs.MessageBox.updateProgress(v / 100, Math.round(v) + '% loaded');
-				}
-			};
-		};
+    /**
+     * Callback for getAttachmentFileName
+     */
+    gotAttachmentFileName: function (response) {
+        if (response.status == true) {
+            this.scope.openImportDialog(response.tmpname);
+        } else {
+            Zarafa.common.dialogs.MessageBox.show({
+                title: dgettext('plugin_calendarimporter', 'Error'),
+                msg: response["message"],
+                icon: Zarafa.common.dialogs.MessageBox.ERROR,
+                buttons: Zarafa.common.dialogs.MessageBox.OK
+            });
+        }
+    },
 
-		for (var i = 1; i < 101; i++) {
-			setTimeout(f(i), 20 * i);
-		}
+    /**
+     * Clickhandler for the button
+     */
+    getAttachmentFileName: function (btn, callback) {
+        Zarafa.common.dialogs.MessageBox.show({
+            title: dgettext('plugin_calendarimporter', 'Please wait'),
+            msg: dgettext('plugin_calendarimporter', 'Loading attachment...'),
+            progressText: dgettext('plugin_calendarimporter', 'Initializing...'),
+            width: 300,
+            progress: true,
+            closable: false
+        });
 
-		/* store the attachment to a temporary folder and prepare it for uploading */
-		var attachmentRecord = btn.records;
-		var attachmentStore = attachmentRecord.store;
+        // progress bar... ;)
+        var f = function (v) {
+            return function () {
+                if (v == 100) {
+                    Zarafa.common.dialogs.MessageBox.hide();
+                } else {
+                    // # TRANSLATORS: {0} will be replaced by the percentage value (0-100)
+                    Zarafa.common.dialogs.MessageBox.updateProgress(v / 100, String.format(dgettext('plugin_calendarimporter', '{0}% loaded'), Math.round(v)));
+                }
+            };
+        };
 
-		var store = attachmentStore.getParentRecord().get('store_entryid');
-		var entryid = attachmentStore.getAttachmentParentRecordEntryId();
-		var attachNum = new Array(1);
-		if (attachmentRecord.get('attach_num') != -1) {
-			attachNum[0] = attachmentRecord.get('attach_num');
-		} else {
-			attachNum[0] = attachmentRecord.get('tmpname');
-		}
-		var dialog_attachments = attachmentStore.getId();
-		var filename = attachmentRecord.data.name;
+        for (var i = 1; i < 101; i++) {
+            setTimeout(f(i), 20 * i);
+        }
 
-		var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
-			successCallback: this.gotAttachmentFileName,
-			scope          : this
-		});
+        /* store the attachment to a temporary folder and prepare it for uploading */
+        var attachmentRecord = btn.records;
+        var attachmentStore = attachmentRecord.store;
 
-		// request attachment preperation
-		container.getRequest().singleRequest(
-			'calendarmodule',
-			'importattachment',
-			{
-				entryid           : entryid,
-				store             : store,
-				attachNum         : attachNum,
-				dialog_attachments: dialog_attachments,
-				filename          : filename
-			},
-			responseHandler
-		);
-	},
+        var store = attachmentStore.getParentRecord().get('store_entryid');
+        var entryid = attachmentStore.getAttachmentParentRecordEntryId();
+        var attachNum = new Array(1);
+        if (attachmentRecord.get('attach_num') != -1) {
+            attachNum[0] = attachmentRecord.get('attach_num');
+        } else {
+            attachNum[0] = attachmentRecord.get('tmpname');
+        }
+        var dialog_attachments = attachmentStore.getId();
+        var filename = attachmentRecord.data.name;
 
-	/**
-	 * Open the import dialog.
-	 * @param {String} filename
-	 */
-	openImportDialog: function (filename) {
-		var componentType = Zarafa.core.data.SharedComponentType['plugins.calendarimporter.dialogs.importevents'];
-		var config = {
-			filename: filename,
-			modal   : true
-		};
+        var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
+            successCallback: this.gotAttachmentFileName,
+            scope: this
+        });
 
-		Zarafa.core.data.UIFactory.openLayerComponent(componentType, undefined, config);
-	},
+        // request attachment preperation
+        container.getRequest().singleRequest(
+            'calendarmodule',
+            'importattachment',
+            {
+                entryid: entryid,
+                store: store,
+                attachNum: attachNum,
+                dialog_attachments: dialog_attachments,
+                filename: filename
+            },
+            responseHandler
+        );
+    },
 
-	/**
-	 * Bid for the type of shared component
-	 * and the given record.
-	 * This will bid on calendar.dialogs.importevents
-	 * @param {Zarafa.core.data.SharedComponentType} type Type of component a context can bid for.
-	 * @param {Ext.data.Record} record Optionally passed record.
-	 * @return {Number} The bid for the shared component
-	 */
-	bidSharedComponent: function (type, record) {
-		var bid = -1;
-		switch (type) {
-			case Zarafa.core.data.SharedComponentType['plugins.calendarimporter.dialogs.importevents']:
-				bid = 2;
-				break;
-			case Zarafa.core.data.SharedComponentType['plugins.calendarimporter.settings.dialogs.calsyncedit']:
-				bid = 2;
-				break;
-			case Zarafa.core.data.SharedComponentType['common.contextmenu']:
-				if (record instanceof Zarafa.core.data.MAPIRecord) {
-					if (record.get('object_type') == Zarafa.core.mapi.ObjectType.MAPI_FOLDER && record.get('container_class') == "IPF.Appointment") {
-						bid = 2;
-					}
-				}
-				break;
-		}
-		return bid;
-	},
+    /**
+     * Open the import dialog.
+     * @param {String} filename
+     */
+    openImportDialog: function (filename) {
+        var componentType = Zarafa.core.data.SharedComponentType['plugins.calendarimporter.dialogs.importevents'];
+        var config = {
+            filename: filename,
+            modal: true
+        };
 
-	/**
-	 * Will return the reference to the shared component.
-	 * Based on the type of component requested a component is returned.
-	 * @param {Zarafa.core.data.SharedComponentType} type Type of component a context can bid for.
-	 * @param {Ext.data.Record} record Optionally passed record.
-	 * @return {Ext.Component} Component
-	 */
-	getSharedComponent: function (type, record) {
-		var component;
-		switch (type) {
-			case Zarafa.core.data.SharedComponentType['plugins.calendarimporter.dialogs.importevents']:
-				component = Zarafa.plugins.calendarimporter.dialogs.ImportContentPanel;
-				break;
-			case Zarafa.core.data.SharedComponentType['plugins.calendarimporter.settings.dialogs.calsyncedit']:
-				component = Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditContentPanel;
-				break;
-			case Zarafa.core.data.SharedComponentType['common.contextmenu']:
-				component = Zarafa.plugins.calendarimporter.ui.ContextMenu;
-				break;
-		}
+        Zarafa.core.data.UIFactory.openLayerComponent(componentType, undefined, config);
+    },
 
-		return component;
-	}
+    /**
+     * Bid for the type of shared component
+     * and the given record.
+     * This will bid on calendar.dialogs.importevents
+     * @param {Zarafa.core.data.SharedComponentType} type Type of component a context can bid for.
+     * @param {Ext.data.Record} record Optionally passed record.
+     * @return {Number} The bid for the shared component
+     */
+    bidSharedComponent: function (type, record) {
+        var bid = -1;
+        switch (type) {
+            case Zarafa.core.data.SharedComponentType['plugins.calendarimporter.dialogs.importevents']:
+                bid = 2;
+                break;
+            case Zarafa.core.data.SharedComponentType['plugins.calendarimporter.settings.dialogs.calsyncedit']:
+                bid = 2;
+                break;
+            case Zarafa.core.data.SharedComponentType['common.contextmenu']:
+                if (record instanceof Zarafa.core.data.MAPIRecord) {
+                    if (record.get('object_type') == Zarafa.core.mapi.ObjectType.MAPI_FOLDER && record.get('container_class') == "IPF.Appointment") {
+                        bid = 2;
+                    }
+                }
+                break;
+        }
+        return bid;
+    },
+
+    /**
+     * Will return the reference to the shared component.
+     * Based on the type of component requested a component is returned.
+     * @param {Zarafa.core.data.SharedComponentType} type Type of component a context can bid for.
+     * @param {Ext.data.Record} record Optionally passed record.
+     * @return {Ext.Component} Component
+     */
+    getSharedComponent: function (type, record) {
+        var component;
+        switch (type) {
+            case Zarafa.core.data.SharedComponentType['plugins.calendarimporter.dialogs.importevents']:
+                component = Zarafa.plugins.calendarimporter.dialogs.ImportContentPanel;
+                break;
+            case Zarafa.core.data.SharedComponentType['plugins.calendarimporter.settings.dialogs.calsyncedit']:
+                component = Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditContentPanel;
+                break;
+            case Zarafa.core.data.SharedComponentType['common.contextmenu']:
+                component = Zarafa.plugins.calendarimporter.ui.ContextMenu;
+                break;
+        }
+
+        return component;
+    }
 });
 
 
@@ -310,10 +316,10 @@ Zarafa.plugins.calendarimporter.ImportPlugin = Ext.extend(Zarafa.core.Plugin, {
  * STARTUP 
  *############################################################################################################################*/
 Zarafa.onReady(function () {
-	container.registerPlugin(new Zarafa.core.PluginMetaData({
-		name             : 'calendarimporter',
-		displayName      : _('Calendarimporter Plugin'),
-		about            : Zarafa.plugins.calendarimporter.ABOUT,
-		pluginConstructor: Zarafa.plugins.calendarimporter.ImportPlugin
-	}));
+    container.registerPlugin(new Zarafa.core.PluginMetaData({
+        name: 'calendarimporter',
+        displayName: dgettext('plugin_calendarimporter', 'Calendarimporter Plugin'),
+        about: Zarafa.plugins.calendarimporter.ABOUT,
+        pluginConstructor: Zarafa.plugins.calendarimporter.ImportPlugin
+    }));
 });
diff --git a/js/settings/SettingsCalSyncWidget.js b/js/settings/SettingsCalSyncWidget.js
index 1c5efac..4f7a19c 100644
--- a/js/settings/SettingsCalSyncWidget.js
+++ b/js/settings/SettingsCalSyncWidget.js
@@ -1,3 +1,25 @@
+/**
+ * SettingsCalSyncWidget.js, Kopano calender to ics im/exporter
+ *
+ * Author: Christoph Haas <christoph.h@sprinternet.at>
+ * Copyright (C) 2012-2016 Christoph Haas
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
 Ext.namespace('Zarafa.plugins.calendarimporter.settings');
 
 /**
@@ -7,108 +29,108 @@ Ext.namespace('Zarafa.plugins.calendarimporter.settings');
  *
  */
 Zarafa.plugins.calendarimporter.settings.SettingsCalSyncWidget = Ext.extend(Zarafa.settings.ui.SettingsWidget, {
-	/**
-	 * @cfg {Zarafa.settings.SettingsContext} settingsContext
-	 */
-	settingsContext : undefined,
+    /**
+     * @cfg {Zarafa.settings.SettingsContext} settingsContext
+     */
+    settingsContext: undefined,
 
-	/**
-	 * @constructor
-	 * @param {Object} config Configuration object
-	 */
-	constructor : function(config) {
-		config = config || {};
-		
-		var store = new Ext.data.JsonStore({
-			fields : [
-				{ name : 'id', type : 'int' },
-				{ name : 'icsurl' },
-				{ name : 'user' },
-				{ name : 'pass' },
-				{ name : 'intervall', type : 'int' },
-				{ name : 'calendar' },
-                { name : 'calendarname' },
-				{ name : 'lastsync' }
-			],
-			sortInfo : {
-				field : 'id',
-				direction : 'ASC'
-			},
-			autoDestroy : true
-		});
+    /**
+     * @constructor
+     * @param {Object} config Configuration object
+     */
+    constructor: function (config) {
+        config = config || {};
 
-		Ext.applyIf(config, {
-			height : 400,
-			title : _('Calendar Sync settings'),
-			xtype : 'calendarimporter.settingscalsyncwidget',
-			layout : {
-				// override from SettingsWidget
-				type : 'fit'
-			},
-			items : [{
-				xtype : 'calendarimporter.calsyncpanel',
-				store : store,
-				ref : 'calsyncPanel'
-			}]
-		});
+        var store = new Ext.data.JsonStore({
+            fields: [
+                {name: 'id', type: 'int'},
+                {name: 'icsurl'},
+                {name: 'user'},
+                {name: 'pass'},
+                {name: 'intervall', type: 'int'},
+                {name: 'calendar'},
+                {name: 'calendarname'},
+                {name: 'lastsync'}
+            ],
+            sortInfo: {
+                field: 'id',
+                direction: 'ASC'
+            },
+            autoDestroy: true
+        });
 
-		Zarafa.plugins.calendarimporter.settings.SettingsCalSyncWidget.superclass.constructor.call(this, config);
-	},
-	
-	/**
-	 * Called by the {@link Zarafa.settings.ui.SettingsCategory Category} when
-	 * it has been called with {@link zarafa.settings.ui.SettingsCategory#update}.
-	 * This is used to load the latest version of the settings from the
-	 * {@link Zarafa.settings.SettingsModel} into the UI of this category.
-	 * @param {Zarafa.settings.SettingsModel} settingsModel The settings to load
-	 */
-	update : function(settingsModel) {
-		this.model = settingsModel;
+        Ext.applyIf(config, {
+            height: 400,
+            title: dgettext('plugin_calendarimporter', 'Calendar Sync settings'),
+            xtype: 'calendarimporter.settingscalsyncwidget',
+            layout: {
+                // override from SettingsWidget
+                type: 'fit'
+            },
+            items: [{
+                xtype: 'calendarimporter.calsyncpanel',
+                store: store,
+                ref: 'calsyncPanel'
+            }]
+        });
 
-		// Convert the signatures into Store data
-		var icslinks = settingsModel.get('zarafa/v1/contexts/calendar/icssync', true);
-		var syncArray = [];
-		for (var key in icslinks) {
-			if(icslinks.hasOwnProperty(key)) { // skip inherited props
-				syncArray.push(Ext.apply({}, icslinks[key], {id: key}));
-			}
-		}
+        Zarafa.plugins.calendarimporter.settings.SettingsCalSyncWidget.superclass.constructor.call(this, config);
+    },
 
-		// Load all icslinks into the GridPanel
-		var store = this.calsyncPanel.calsyncGrid.getStore();
-		store.loadData(syncArray);
-	},
+    /**
+     * Called by the {@link Zarafa.settings.ui.SettingsCategory Category} when
+     * it has been called with {@link zarafa.settings.ui.SettingsCategory#update}.
+     * This is used to load the latest version of the settings from the
+     * {@link Zarafa.settings.SettingsModel} into the UI of this category.
+     * @param {Zarafa.settings.SettingsModel} settingsModel The settings to load
+     */
+    update: function (settingsModel) {
+        this.model = settingsModel;
 
-	/**
-	 * Called by the {@link Zarafa.settings.ui.SettingsCategory Category} when
-	 * it has been called with {@link zarafa.settings.ui.SettingsCategory#updateSettings}.
-	 * This is used to update the settings from the UI into the {@link Zarafa.settings.SettingsModel settings model}.
-	 * @param {Zarafa.settings.SettingsModel} settingsModel The settings to update
-	 */
-	updateSettings : function(settingsModel) {
-		settingsModel.beginEdit();
+        // Convert the signatures into Store data
+        var icslinks = settingsModel.get('zarafa/v1/contexts/calendar/icssync', true);
+        var syncArray = [];
+        for (var key in icslinks) {
+            if (icslinks.hasOwnProperty(key)) { // skip inherited props
+                syncArray.push(Ext.apply({}, icslinks[key], {id: key}));
+            }
+        }
 
-		// Start reading the Grid store and convert the contents back into
-		// an object which can be pushed to the settings.
-		var icslinks = this.calsyncPanel.calsyncGrid.getStore().getRange();
-		var icslinkData = {};
-		for (var i = 0, len = icslinks.length; i < len; i++) {
-			var icslink = icslinks[i];
+        // Load all icslinks into the GridPanel
+        var store = this.calsyncPanel.calsyncGrid.getStore();
+        store.loadData(syncArray);
+    },
 
-			icslinkData[icslink.get('id')] = {
-				'icsurl' : icslink.get('icsurl'),
-				'intervall' : icslink.get('intervall'),
-				'user' : icslink.get('user'),
-				'pass' : icslink.get('pass'),
-				'lastsync' : icslink.get('lastsync'),
-				'calendar' : icslink.get('calendar'),
-                'calendarname' : Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(icslink.get('calendar')).display_name
-			};
-		}
-		settingsModel.set('zarafa/v1/contexts/calendar/icssync', icslinkData);
+    /**
+     * Called by the {@link Zarafa.settings.ui.SettingsCategory Category} when
+     * it has been called with {@link zarafa.settings.ui.SettingsCategory#updateSettings}.
+     * This is used to update the settings from the UI into the {@link Zarafa.settings.SettingsModel settings model}.
+     * @param {Zarafa.settings.SettingsModel} settingsModel The settings to update
+     */
+    updateSettings: function (settingsModel) {
+        settingsModel.beginEdit();
 
-		settingsModel.endEdit();
-	}
+        // Start reading the Grid store and convert the contents back into
+        // an object which can be pushed to the settings.
+        var icslinks = this.calsyncPanel.calsyncGrid.getStore().getRange();
+        var icslinkData = {};
+        for (var i = 0, len = icslinks.length; i < len; i++) {
+            var icslink = icslinks[i];
+
+            icslinkData[icslink.get('id')] = {
+                'icsurl': icslink.get('icsurl'),
+                'intervall': icslink.get('intervall'),
+                'user': icslink.get('user'),
+                'pass': icslink.get('pass'),
+                'lastsync': icslink.get('lastsync'),
+                'calendar': icslink.get('calendar'),
+                'calendarname': Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(icslink.get('calendar')).display_name
+            };
+        }
+        settingsModel.set('zarafa/v1/contexts/calendar/icssync', icslinkData);
+
+        settingsModel.endEdit();
+    }
 });
 
 Ext.reg('calendarimporter.settingscalsyncwidget', Zarafa.plugins.calendarimporter.settings.SettingsCalSyncWidget);
\ No newline at end of file
diff --git a/js/settings/SettingsWidget.js b/js/settings/SettingsWidget.js
index 5d3e7e1..c087fcc 100644
--- a/js/settings/SettingsWidget.js
+++ b/js/settings/SettingsWidget.js
@@ -1,3 +1,25 @@
+/**
+ * SettingsWidget.js, Kopano calender to ics im/exporter
+ *
+ * Author: Christoph Haas <christoph.h@sprinternet.at>
+ * Copyright (C) 2012-2016 Christoph Haas
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
 Ext.namespace('Zarafa.plugins.calendarimporter.settings');
 
 /**
@@ -7,110 +29,109 @@ Ext.namespace('Zarafa.plugins.calendarimporter.settings');
  *
  */
 Zarafa.plugins.calendarimporter.settings.SettingsWidget = Ext.extend(Zarafa.settings.ui.SettingsWidget, {
-	/**
-	 * @cfg {Zarafa.settings.SettingsContext} settingsContext
-	 */
-	settingsContext : undefined,
+    /**
+     * @cfg {Zarafa.settings.SettingsContext} settingsContext
+     */
+    settingsContext: undefined,
 
-	/**
-	 * @constructor
-	 * @param {Object} config Configuration object
-	 */
-	constructor : function(config)
-	{
-		config = config || {};
+    /**
+     * @constructor
+     * @param {Object} config Configuration object
+     */
+    constructor: function (config) {
+        config = config || {};
 
-		Ext.applyIf(config, {
-			title : _('Calendar Import/Export plugin settings'),
-			xtype : 'calendarimporter.settingswidget',
-			items : [
-				{
-					xtype : 'checkbox',
-					name : 'zarafa/v1/plugins/calendarimporter/enable_sync',
-					ref : 'enableSync',
-					fieldLabel : 'Enable ical sync',
-					lazyInit : false
-				},
-				this.createSelectBox(),
-				this.createTimezoneBox()
-			]
-		});
+        Ext.applyIf(config, {
+            title: dgettext('plugin_calendarimporter', 'Calendar Import/Export plugin settings'),
+            xtype: 'calendarimporter.settingswidget',
+            items: [
+                {
+                    xtype: 'checkbox',
+                    name: 'zarafa/v1/plugins/calendarimporter/enable_sync',
+                    ref: 'enableSync',
+                    fieldLabel: dgettext('plugin_calendarimporter', 'Enable ical sync'),
+                    lazyInit: false
+                },
+                this.createSelectBox(),
+                this.createTimezoneBox()
+            ]
+        });
 
-		Zarafa.plugins.calendarimporter.settings.SettingsWidget.superclass.constructor.call(this, config);
-	},
-	
-	createSelectBox: function() {
-		var myStore = Zarafa.plugins.calendarimporter.data.Actions.getAllCalendarFolders(true);
+        Zarafa.plugins.calendarimporter.settings.SettingsWidget.superclass.constructor.call(this, config);
+    },
 
-		return {
-			xtype: "selectbox",
-			ref : 'defaultCalendar',
-			editable: false,
-			name: "zarafa/v1/plugins/calendarimporter/default_calendar",
+    createSelectBox: function () {
+        var myStore = Zarafa.plugins.calendarimporter.data.Actions.getAllCalendarFolders(true);
+
+        return {
+            xtype: "selectbox",
+            ref: 'defaultCalendar',
+            editable: false,
+            name: "zarafa/v1/plugins/calendarimporter/default_calendar",
             value: Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByName(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/default_calendar")).entryid,
-			width: 100,
-			fieldLabel: "Default calender",
-			store: myStore,
-			mode: 'local',
-			labelSeperator: ":",
-			border: false,
-			anchor: "100%",
-			scope: this,
-			allowBlank: false
-		}
-	},
-	
-	createTimezoneBox: function() {
-		return {
-			xtype: "selectbox",
-			ref : 'defaultTimezone',
-			editable: false,
-			name: "zarafa/v1/plugins/calendarimporter/default_timezone",
-			value: Zarafa.plugins.calendarimporter.data.Timezones.unMap(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/default_timezone")),
-			width: 100,
-			fieldLabel: "Default timezone",
-			store: Zarafa.plugins.calendarimporter.data.Timezones.store,
-			labelSeperator: ":",
-			mode: 'local',
-			border: false,
-			anchor: "100%",
-			scope: this,
-			allowBlank: false
-		}
-	},
-	
-	/**
-	 * Called by the {@link Zarafa.settings.ui.SettingsCategory Category} when
-	 * it has been called with {@link zarafa.settings.ui.SettingsCategory#update}.
-	 * This is used to load the latest version of the settings from the
-	 * {@link Zarafa.settings.SettingsModel} into the UI of this category.
-	 * @param {Zarafa.settings.SettingsModel} settingsModel The settings to load
-	 */
-	update : function(settingsModel) {
-		this.enableSync.setValue(settingsModel.get(this.enableSync.name));
-		this.defaultCalendar.setValue(Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByName(settingsModel.get(this.defaultCalendar.name)).entryid);
-		this.defaultTimezone.setValue(settingsModel.get(this.defaultTimezone.name));
-	},
+            width: 100,
+            fieldLabel: dgettext('plugin_calendarimporter', 'Default calender'),
+            store: myStore,
+            mode: 'local',
+            labelSeperator: ":",
+            border: false,
+            anchor: "100%",
+            scope: this,
+            allowBlank: false
+        }
+    },
 
-	/**
-	 * Called by the {@link Zarafa.settings.ui.SettingsCategory Category} when
-	 * it has been called with {@link zarafa.settings.ui.SettingsCategory#updateSettings}.
-	 * This is used to update the settings from the UI into the {@link Zarafa.settings.SettingsModel settings model}.
-	 * @param {Zarafa.settings.SettingsModel} settingsModel The settings to update
-	 */
-	updateSettings : function(settingsModel) {
+    createTimezoneBox: function () {
+        return {
+            xtype: "selectbox",
+            ref: 'defaultTimezone',
+            editable: false,
+            name: "zarafa/v1/plugins/calendarimporter/default_timezone",
+            value: Zarafa.plugins.calendarimporter.data.Timezones.unMap(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/default_timezone")),
+            width: 100,
+            fieldLabel: dgettext('plugin_calendarimporter', 'Default timezone'),
+            store: Zarafa.plugins.calendarimporter.data.Timezones.store,
+            labelSeperator: ":",
+            mode: 'local',
+            border: false,
+            anchor: "100%",
+            scope: this,
+            allowBlank: false
+        }
+    },
+
+    /**
+     * Called by the {@link Zarafa.settings.ui.SettingsCategory Category} when
+     * it has been called with {@link zarafa.settings.ui.SettingsCategory#update}.
+     * This is used to load the latest version of the settings from the
+     * {@link Zarafa.settings.SettingsModel} into the UI of this category.
+     * @param {Zarafa.settings.SettingsModel} settingsModel The settings to load
+     */
+    update: function (settingsModel) {
+        this.enableSync.setValue(settingsModel.get(this.enableSync.name));
+        this.defaultCalendar.setValue(Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByName(settingsModel.get(this.defaultCalendar.name)).entryid);
+        this.defaultTimezone.setValue(settingsModel.get(this.defaultTimezone.name));
+    },
+
+    /**
+     * Called by the {@link Zarafa.settings.ui.SettingsCategory Category} when
+     * it has been called with {@link zarafa.settings.ui.SettingsCategory#updateSettings}.
+     * This is used to update the settings from the UI into the {@link Zarafa.settings.SettingsModel settings model}.
+     * @param {Zarafa.settings.SettingsModel} settingsModel The settings to update
+     */
+    updateSettings: function (settingsModel) {
         // check if the user changed a value
         var changed = false;
 
-        if(settingsModel.get(this.enableSync.name) != this.enableSync.getValue()) {
+        if (settingsModel.get(this.enableSync.name) != this.enableSync.getValue()) {
             changed = true;
-        } else if(settingsModel.get(this.defaultCalendar.name) != Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(this.defaultCalendar.getValue()).display_name) {
+        } else if (settingsModel.get(this.defaultCalendar.name) != Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(this.defaultCalendar.getValue()).display_name) {
             changed = true;
-        } else if(settingsModel.get(this.defaultTimezone.name) != this.defaultTimezone.getValue()) {
+        } else if (settingsModel.get(this.defaultTimezone.name) != this.defaultTimezone.getValue()) {
             changed = true;
         }
 
-        if(changed) {
+        if (changed) {
             // Really save changes
             settingsModel.set(this.enableSync.name, this.enableSync.getValue());
             settingsModel.set(this.defaultCalendar.name, Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(this.defaultCalendar.getValue()).display_name); // store name
@@ -118,7 +139,7 @@ Zarafa.plugins.calendarimporter.settings.SettingsWidget = Ext.extend(Zarafa.sett
 
             this.onUpdateSettings();
         }
-	},
+    },
 
     /**
      * Called after the {@link Zarafa.settings.SettingsModel} fires the {@link Zarafa.settings.SettingsModel#save save}
@@ -126,8 +147,7 @@ Zarafa.plugins.calendarimporter.settings.SettingsWidget = Ext.extend(Zarafa.sett
      * settings which were saved to the server.
      * @private
      */
-    onUpdateSettings : function()
-    {
+    onUpdateSettings: function () {
         var message = _('Your WebApp needs to be reloaded to make the changes visible!');
         message += '<br/><br/>';
         message += _('WebApp will automatically restart in order for these changes to take effect');
@@ -135,17 +155,17 @@ Zarafa.plugins.calendarimporter.settings.SettingsWidget = Ext.extend(Zarafa.sett
 
         Zarafa.common.dialogs.MessageBox.addCustomButtons({
             title: _('Restart WebApp'),
-            msg : message,
+            msg: message,
             icon: Ext.MessageBox.QUESTION,
-            fn : this.restartWebapp,
-            customButton : [{
-                text : _('Restart'),
-                name : 'restart'
+            fn: this.restartWebapp,
+            customButton: [{
+                text: _('Restart'),
+                name: 'restart'
             }, {
-                text : _('Cancel'),
-                name : 'cancel'
+                text: _('Cancel'),
+                name: 'cancel'
             }],
-            scope : this
+            scope: this
         });
 
     },
@@ -156,8 +176,7 @@ Zarafa.plugins.calendarimporter.settings.SettingsWidget = Ext.extend(Zarafa.sett
      * @param {String} button The button which user pressed.
      * @private
      */
-    restartWebapp : function(button)
-    {
+    restartWebapp: function (button) {
         if (button === 'restart') {
             var contextModel = this.ownerCt.settingsContext.getModel();
             var realModel = contextModel.getRealSettingsModel();
@@ -165,7 +184,7 @@ Zarafa.plugins.calendarimporter.settings.SettingsWidget = Ext.extend(Zarafa.sett
             realModel.save();
 
             this.loadMask = new Zarafa.common.ui.LoadMask(Ext.getBody(), {
-                msg : '<b>' + _('Webapp is reloading, Please wait.') + '</b>'
+                msg: '<b>' + _('Webapp is reloading, Please wait.') + '</b>'
             });
             this.loadMask.show();
 
@@ -183,8 +202,7 @@ Zarafa.plugins.calendarimporter.settings.SettingsWidget = Ext.extend(Zarafa.sett
      * settings which were saved to the server.
      * @private
      */
-    onSettingsSave : function(model, parameters)
-    {
+    onSettingsSave: function (model, parameters) {
         this.mun(model, 'save', this.onSettingsSave, this);
         Zarafa.core.Util.reloadWebapp();
     },
@@ -200,8 +218,7 @@ Zarafa.plugins.calendarimporter.settings.SettingsWidget = Ext.extend(Zarafa.sett
      * @param {Object} response The response object as received from the PHP-side
      * @private
      */
-    onSettingsException : function(model, type, action, options, response)
-    {
+    onSettingsException: function (model, type, action, options, response) {
         this.loadMask.hide();
 
         // Remove event handlers
diff --git a/js/settings/dialogs/CalSyncEditContentPanel.js b/js/settings/dialogs/CalSyncEditContentPanel.js
index ce480b0..cfb7fe0 100644
--- a/js/settings/dialogs/CalSyncEditContentPanel.js
+++ b/js/settings/dialogs/CalSyncEditContentPanel.js
@@ -1,3 +1,25 @@
+/**
+ * CalSyncEditContentPanel.js, Kopano calender to ics im/exporter
+ *
+ * Author: Christoph Haas <christoph.h@sprinternet.at>
+ * Copyright (C) 2012-2016 Christoph Haas
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
 Ext.namespace('Zarafa.plugins.calendarimporter.settings.dialogs');
 
 /**
@@ -8,31 +30,31 @@ Ext.namespace('Zarafa.plugins.calendarimporter.settings.dialogs');
  * {@link Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditContentPanel CalSyncEditContentPanel} will be used to edit ics sync entries.
  */
 Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditContentPanel = Ext.extend(Zarafa.core.ui.ContentPanel, {
-	/**
-	 * @constructor
-	 * @param config Configuration structure
-	 */
-	constructor : function(config) {
-		config = config || {};
+    /**
+     * @constructor
+     * @param config Configuration structure
+     */
+    constructor: function (config) {
+        config = config || {};
 
-		// Add in some standard configuration data.
-		Ext.applyIf(config, {
-			// Override from Ext.Component
-			xtype : 'calendarimporter.calsynceditcontentpanel',
-			layout : 'fit',
-			model : true,
-			autoSave : false,
-			width : 400,
-			height : 400,
-			title : _('ICAL Sync'),
-			items : [{
-				xtype : 'calendarimporter.calsynceditpanel',
-				item : config.item
-			}]
-		});
+        // Add in some standard configuration data.
+        Ext.applyIf(config, {
+            // Override from Ext.Component
+            xtype: 'calendarimporter.calsynceditcontentpanel',
+            layout: 'fit',
+            model: true,
+            autoSave: false,
+            width: 400,
+            height: 400,
+            title: dgettext('plugin_calendarimporter', 'ICAL Sync'),
+            items: [{
+                xtype: 'calendarimporter.calsynceditpanel',
+                item: config.item
+            }]
+        });
 
-		Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditContentPanel.superclass.constructor.call(this, config);
-	}
+        Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditContentPanel.superclass.constructor.call(this, config);
+    }
 });
 
 Ext.reg('calendarimporter.calsynceditcontentpanel', Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditContentPanel);
diff --git a/js/settings/dialogs/CalSyncEditPanel.js b/js/settings/dialogs/CalSyncEditPanel.js
index a2d78ac..175961b 100644
--- a/js/settings/dialogs/CalSyncEditPanel.js
+++ b/js/settings/dialogs/CalSyncEditPanel.js
@@ -1,3 +1,25 @@
+/**
+ * CalSyncEditPanel.js, Kopano calender to ics im/exporter
+ *
+ * Author: Christoph Haas <christoph.h@sprinternet.at>
+ * Copyright (C) 2012-2016 Christoph Haas
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
 Ext.namespace('Zarafa.plugins.calendarimporter.settings.dialogs');
 
 /**
@@ -8,195 +30,194 @@ Ext.namespace('Zarafa.plugins.calendarimporter.settings.dialogs');
  * Will generate UI for {@link Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditPanel CalSyncEditPanel}.
  */
 Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditPanel = Ext.extend(Ext.form.FormPanel, {
-	
-	/**
-	 * the id of the currently edited item
-	 */
-	currentItem : undefined,
-	
-	/**
-	 * @constructor
-	 * @param config Configuration structure
-	 */
-	constructor : function(config) {
-		config = config || {};
 
-		if(config.item)
-			this.currentItem = config.item;
+    /**
+     * the id of the currently edited item
+     */
+    currentItem: undefined,
 
-		Ext.applyIf(config, {
-			// Override from Ext.Component
-			xtype : 'calendarimporter.calsynceditpanel',
-			labelAlign : 'top',
-			defaultType: 'textfield',
-			items : this.createPanelItems(config),
-			buttons: [{
-				text: _('Save'),
-				handler: this.doSave,
-				scope: this
-			},
-			{
-				text: _('Cancel'),
-				handler: this.doClose,
-				scope: this
-			}]
-		});
+    /**
+     * @constructor
+     * @param config Configuration structure
+     */
+    constructor: function (config) {
+        config = config || {};
 
-		Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditPanel.superclass.constructor.call(this, config);
-	},
-	
-	/**
-	 * close the dialog
-	 */
-	doClose : function() {
-		this.dialog.close();
-	},
-	
-	/**
-	 * save the data to the store
-	 */
-	doSave : function() {
-		var store = this.dialog.store;
-		var id = 0;
-		var record = undefined;
+        if (config.item)
+            this.currentItem = config.item;
 
-		if(!this.currentItem) {
-			record = new store.recordType({
-				id: this.hashCode(this.icsurl.getValue()),
-				icsurl: this.icsurl.getValue(),
-				intervall: this.intervall.getValue(),
-				user: this.user.getValue(),
-				pass: Ext.util.base64.encode(this.pass.getValue()),
-				calendar: this.calendar.getValue(),
-                calendarname : Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(this.calendar.getValue()).display_name,
-				lastsync: "never"
-			});
-		}
-		
-		if(this.icsurl.isValid()) {
-			if(record) {
-				store.add(record);
-			} else {
-				this.currentItem.set('icsurl', this.icsurl.getValue());
-				this.currentItem.set('intervall', this.intervall.getValue());
-				this.currentItem.set('user', this.user.getValue());
-				this.currentItem.set('pass', Ext.util.base64.encode(this.pass.getValue()));
-				this.currentItem.set('calendar', this.calendar.getValue());
+        Ext.applyIf(config, {
+            // Override from Ext.Component
+            xtype: 'calendarimporter.calsynceditpanel',
+            labelAlign: 'top',
+            defaultType: 'textfield',
+            items: this.createPanelItems(config),
+            buttons: [{
+                text: _('Save'),
+                handler: this.doSave,
+                scope: this
+            },
+                {
+                    text: _('Cancel'),
+                    handler: this.doClose,
+                    scope: this
+                }]
+        });
+
+        Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditPanel.superclass.constructor.call(this, config);
+    },
+
+    /**
+     * close the dialog
+     */
+    doClose: function () {
+        this.dialog.close();
+    },
+
+    /**
+     * save the data to the store
+     */
+    doSave: function () {
+        var store = this.dialog.store;
+        var id = 0;
+        var record = undefined;
+
+        if (!this.currentItem) {
+            record = new store.recordType({
+                id: this.hashCode(this.icsurl.getValue()),
+                icsurl: this.icsurl.getValue(),
+                intervall: this.intervall.getValue(),
+                user: this.user.getValue(),
+                pass: Ext.util.base64.encode(this.pass.getValue()),
+                calendar: this.calendar.getValue(),
+                calendarname: Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(this.calendar.getValue()).display_name,
+                lastsync: "never"
+            });
+        }
+
+        if (this.icsurl.isValid()) {
+            if (record) {
+                store.add(record);
+            } else {
+                this.currentItem.set('icsurl', this.icsurl.getValue());
+                this.currentItem.set('intervall', this.intervall.getValue());
+                this.currentItem.set('user', this.user.getValue());
+                this.currentItem.set('pass', Ext.util.base64.encode(this.pass.getValue()));
+                this.currentItem.set('calendar', this.calendar.getValue());
                 this.currentItem.set('calendarname', Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(this.calendar.getValue()).display_name);
-			}
-			this.dialog.close();
-		}
-	},
+            }
+            this.dialog.close();
+        }
+    },
 
-	/**
-	 * Function will create panel items for {@link Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditPanel CalSyncEditPanel}
-	 * @return {Array} array of items that should be added to panel.
-	 * @private
-	 */
-	createPanelItems : function(config)
-	{
-		var icsurl = "";
-		var intervall = "15";
-		var user = "";
-		var pass = "";
+    /**
+     * Function will create panel items for {@link Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditPanel CalSyncEditPanel}
+     * @return {Array} array of items that should be added to panel.
+     * @private
+     */
+    createPanelItems: function (config) {
+        var icsurl = "";
+        var intervall = "15";
+        var user = "";
+        var pass = "";
         var calendarname = "";
-		var calendar = Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByName(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/default_calendar")).entryid;
+        var calendar = Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByName(container.getSettingsModel().get("zarafa/v1/plugins/calendarimporter/default_calendar")).entryid;
         var myStore = Zarafa.plugins.calendarimporter.data.Actions.getAllCalendarFolders(true);
 
-        if(config.item){
-			icsurl = config.item.get('icsurl');
-			intervall = config.item.get('intervall');
-			user = config.item.get('user');
-			pass = Ext.util.base64.decode(config.item.get('pass'));
-			calendar = config.item.get('calendar');
+        if (config.item) {
+            icsurl = config.item.get('icsurl');
+            intervall = config.item.get('intervall');
+            user = config.item.get('user');
+            pass = Ext.util.base64.decode(config.item.get('pass'));
+            calendar = config.item.get('calendar');
             calendarname = config.item.get('calendarname');
-		}
-		
-				
-		return [{
-			xtype: 'fieldset',
-			title: _('ICAL Information'),
-			defaultType: 'textfield',
-			layout: 'form',
-			flex: 1,
-			defaults: {
-				anchor: '100%',
-				flex: 1
-			},
-			items: [{
-				fieldLabel: 'ICS Url',
-				name: 'icsurl',
-				ref: '../icsurl',
-				value: icsurl,
-				allowBlank: false
-			},
-			{
-				xtype:'selectbox',
-				fieldLabel: _('Destination Calendar'),
-				name: 'calendar',
-				ref: '../calendar',
-				value: calendar,
-				editable: false,
-				store: myStore,
-				mode: 'local',
-				labelSeperator: ":",
-				border: false,
-				anchor: "100%",
-				scope: this,
-				allowBlank: false
-			},
-			{
-				xtype:'numberfield',
-				fieldLabel: _('Sync Intervall (minutes)'),
-				name: 'intervall',
-				ref: '../intervall',
-				value: intervall,
-				allowBlank: false
-			}]
-		},
-		{
-			xtype: 'fieldset',
-			title: _('Authentication (optional)'),
-			defaultType: 'textfield',
-			layout: 'form',
-			defaults: {
-				anchor: '100%'
-			},
-			items: [{
-				fieldLabel: _('Username'),
-				name: 'user',
-				ref: '../user',
-				value: user,
-				allowBlank: true
-			},
-			{
-				fieldLabel: _('Password'),
-				name: 'pass',
-				ref: '../pass',
-				value: pass,
-				inputType: 'password',
-				allowBlank: true
-			}]
-		}];
-	},
-	
-	/**
-	 * Java String.hashCode() implementation
-	 * @private
-	 */
-	hashCode : function(str){
-		var hash = 0;
-		var chr = 0;
-		var i = 0;
+        }
 
-		if (str.length == 0) return hash;
-		for (i = 0; i < str.length; i++) {
-			chr = str.charCodeAt(i);
-			hash = ((hash<<5)-hash)+chr;
-			hash = hash & hash; // Convert to 32bit integer
-		}
-		return Math.abs(hash);
-	}
+
+        return [{
+            xtype: 'fieldset',
+            title: dgettext('plugin_calendarimporter', 'ICAL Information'),
+            defaultType: 'textfield',
+            layout: 'form',
+            flex: 1,
+            defaults: {
+                anchor: '100%',
+                flex: 1
+            },
+            items: [{
+                fieldLabel: dgettext('plugin_calendarimporter', 'ICS Url'),
+                name: 'icsurl',
+                ref: '../icsurl',
+                value: icsurl,
+                allowBlank: false
+            },
+                {
+                    xtype: 'selectbox',
+                    fieldLabel: dgettext('plugin_calendarimporter', 'Destination Calendar'),
+                    name: 'calendar',
+                    ref: '../calendar',
+                    value: calendar,
+                    editable: false,
+                    store: myStore,
+                    mode: 'local',
+                    labelSeperator: ":",
+                    border: false,
+                    anchor: "100%",
+                    scope: this,
+                    allowBlank: false
+                },
+                {
+                    xtype: 'numberfield',
+                    fieldLabel: dgettext('plugin_calendarimporter', 'Sync Intervall (minutes)'),
+                    name: 'intervall',
+                    ref: '../intervall',
+                    value: intervall,
+                    allowBlank: false
+                }]
+        },
+            {
+                xtype: 'fieldset',
+                title: dgettext('plugin_calendarimporter', 'Authentication (optional)'),
+                defaultType: 'textfield',
+                layout: 'form',
+                defaults: {
+                    anchor: '100%'
+                },
+                items: [{
+                    fieldLabel: dgettext('plugin_calendarimporter', 'Username'),
+                    name: 'user',
+                    ref: '../user',
+                    value: user,
+                    allowBlank: true
+                },
+                    {
+                        fieldLabel: dgettext('plugin_calendarimporter', 'Password'),
+                        name: 'pass',
+                        ref: '../pass',
+                        value: pass,
+                        inputType: 'password',
+                        allowBlank: true
+                    }]
+            }];
+    },
+
+    /**
+     * Java String.hashCode() implementation
+     * @private
+     */
+    hashCode: function (str) {
+        var hash = 0;
+        var chr = 0;
+        var i = 0;
+
+        if (str.length == 0) return hash;
+        for (i = 0; i < str.length; i++) {
+            chr = str.charCodeAt(i);
+            hash = ((hash << 5) - hash) + chr;
+            hash = hash & hash; // Convert to 32bit integer
+        }
+        return Math.abs(hash);
+    }
 });
 
 Ext.reg('calendarimporter.calsynceditpanel', Zarafa.plugins.calendarimporter.settings.dialogs.CalSyncEditPanel);
diff --git a/js/settings/ui/CalSyncGrid.js b/js/settings/ui/CalSyncGrid.js
index 6295ac6..909dddc 100644
--- a/js/settings/ui/CalSyncGrid.js
+++ b/js/settings/ui/CalSyncGrid.js
@@ -1,3 +1,25 @@
+/**
+ * CalSyncGrid.js, Kopano calender to ics im/exporter
+ *
+ * Author: Christoph Haas <christoph.h@sprinternet.at>
+ * Copyright (C) 2012-2016 Christoph Haas
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
 Ext.namespace('Zarafa.plugins.calendarimporter.settings.ui');
 
 /**
@@ -7,162 +29,152 @@ Ext.namespace('Zarafa.plugins.calendarimporter.settings.ui');
  *
  */
 Zarafa.plugins.calendarimporter.settings.ui.CalSyncGrid = Ext.extend(Ext.grid.GridPanel, {
-	/**
-	 * @constructor
-	 * @param {Object} config Configuration structure
-	 */
-	constructor : function(config)
-	{
-		config = config || {};
-	
-		Ext.applyIf(config, {
-			xtype : 'calendarimporter.calsyncgrid',
-			border : true,
-			store : config.store,
-			viewConfig : {
-				forceFit : true,
-				emptyText : '<div class=\'emptytext\'>' + _('No ICAL sync entry exists') + '</div>'
-			},
-			loadMask : this.initLoadMask(),
-			columns : this.initColumnModel(),
-			selModel : this.initSelectionModel(),
-			listeners : {
-				viewready : this.onViewReady,
-				rowdblclick : this.onRowDblClick,
-				scope : this
-			}
-		});
+    /**
+     * @constructor
+     * @param {Object} config Configuration structure
+     */
+    constructor: function (config) {
+        config = config || {};
 
-		Zarafa.plugins.calendarimporter.settings.ui.CalSyncGrid.superclass.constructor.call(this, config);
-	},
+        Ext.applyIf(config, {
+            xtype: 'calendarimporter.calsyncgrid',
+            border: true,
+            store: config.store,
+            viewConfig: {
+                forceFit: true,
+                emptyText: '<div class=\'emptytext\'>' + dgettext('plugin_calendarimporter', 'No ICAL sync entry exists') + '</div>'
+            },
+            loadMask: this.initLoadMask(),
+            columns: this.initColumnModel(),
+            selModel: this.initSelectionModel(),
+            listeners: {
+                viewready: this.onViewReady,
+                rowdblclick: this.onRowDblClick,
+                scope: this
+            }
+        });
 
-	/**
-	 * initialize events for the grid panel.
-	 * @private
-	 */
-	initEvents : function()
-	{
-		Zarafa.plugins.calendarimporter.settings.ui.CalSyncGrid.superclass.initEvents.call(this);
+        Zarafa.plugins.calendarimporter.settings.ui.CalSyncGrid.superclass.constructor.call(this, config);
+    },
 
-		// select first icssync when store has finished loading
-		this.mon(this.store, 'load', this.onViewReady, this, {single : true});
-	},
-	
-	/**
-	 * Render function
-	 * @return {String}
-	 * @private
-	 */
-	renderAuthColumn : function(value, p, record)
-	{
-		return value ? "true" : "false";
-	},
+    /**
+     * initialize events for the grid panel.
+     * @private
+     */
+    initEvents: function () {
+        Zarafa.plugins.calendarimporter.settings.ui.CalSyncGrid.superclass.initEvents.call(this);
 
-	/**
-	 * Render function
-	 * @return {String}
-	 * @private
-	 */
-	renderCalendarColumn : function(value, p, record)
-	{
-		return Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(value).display_name;
-	},
+        // select first icssync when store has finished loading
+        this.mon(this.store, 'load', this.onViewReady, this, {single: true});
+    },
 
-	/**
-	 * Creates a column model object, used in {@link #colModel} config
-	 * @return {Ext.grid.ColumnModel} column model object
-	 * @private
-	 */
-	initColumnModel : function()
-	{
-		return [{
-			dataIndex : 'icsurl',
-			header : _('ICS File'),
-			renderer : Zarafa.common.ui.grid.Renderers.text
-		},
-		{
-			dataIndex : 'calendarname',
-			header : _('Destination Calender'),
-			renderer : Zarafa.common.ui.grid.Renderers.text
-		},
-		{
-			dataIndex : 'user',
-			header : _('Authentication'),
-			renderer : this.renderAuthColumn
-		},
-		{
-			dataIndex : 'intervall',
-			header : _('Sync Intervall')
-		},
-		{
-			dataIndex : 'lastsync',
-			header : _('Last Synchronisation'),
-			renderer : Zarafa.common.ui.grid.Renderers.text
-		}]
-	},
+    /**
+     * Render function
+     * @return {String}
+     * @private
+     */
+    renderAuthColumn: function (value, p, record) {
+        return value ? "true" : "false";
+    },
 
-	/**
-	 * Creates a selection model object, used in {@link #selModel} config
-	 * @return {Ext.grid.RowSelectionModel} selection model object
-	 * @private
-	 */
-	initSelectionModel : function()
-	{
-		return new Ext.grid.RowSelectionModel({
-			singleSelect : true
-		});
-	},
+    /**
+     * Render function
+     * @return {String}
+     * @private
+     */
+    renderCalendarColumn: function (value, p, record) {
+        return Zarafa.plugins.calendarimporter.data.Actions.getCalendarFolderByEntryid(value).display_name;
+    },
 
-	/**
-	 * Initialize the {@link Ext.grid.GridPanel.loadMask} field
-	 *
-	 * @return {Ext.LoadMask} The configuration object for {@link Ext.LoadMask}
-	 * @private
-	 */
-	initLoadMask : function()
-	{
-		return {
-			msg : _('Loading ics sync entries') + '...'
-		};
-	},
+    /**
+     * Creates a column model object, used in {@link #colModel} config
+     * @return {Ext.grid.ColumnModel} column model object
+     * @private
+     */
+    initColumnModel: function () {
+        return [{
+            dataIndex: 'icsurl',
+            header: dgettext('plugin_calendarimporter', 'ICS File'),
+            renderer: Zarafa.common.ui.grid.Renderers.text
+        },
+            {
+                dataIndex: 'calendarname',
+                header: dgettext('plugin_calendarimporter', 'Destination Calender'),
+                renderer: Zarafa.common.ui.grid.Renderers.text
+            },
+            {
+                dataIndex: 'user',
+                header: dgettext('plugin_calendarimporter', 'Authentication'),
+                renderer: this.renderAuthColumn
+            },
+            {
+                dataIndex: 'intervall',
+                header: dgettext('plugin_calendarimporter', 'Sync Intervall')
+            },
+            {
+                dataIndex: 'lastsync',
+                header: dgettext('plugin_calendarimporter', 'Last Synchronisation'),
+                renderer: Zarafa.common.ui.grid.Renderers.text
+            }]
+    },
 
-	/**
-	 * Event handler which is fired when the gridPanel is ready. This will automatically
-	 * select the first row in the grid.
-	 * @private
-	 */
-	onViewReady : function()
-	{
-		this.getSelectionModel().selectFirstRow();
-	},
+    /**
+     * Creates a selection model object, used in {@link #selModel} config
+     * @return {Ext.grid.RowSelectionModel} selection model object
+     * @private
+     */
+    initSelectionModel: function () {
+        return new Ext.grid.RowSelectionModel({
+            singleSelect: true
+        });
+    },
 
-	/**
-	 * Function will be called to remove a ics sync entry.
-	 */
-	removeIcsSyncAs : function()
-	{
-		var icsRecord = this.getSelectionModel().getSelected();
-		if(!icsRecord) {
-			Ext.Msg.alert(_('Alert'), _('Please select a ics sync entry.'));
-			return;
-		}
+    /**
+     * Initialize the {@link Ext.grid.GridPanel.loadMask} field
+     *
+     * @return {Ext.LoadMask} The configuration object for {@link Ext.LoadMask}
+     * @private
+     */
+    initLoadMask: function () {
+        return {
+            msg: dgettext('plugin_calendarimporter', 'Loading ics sync entries...')
+        };
+    },
 
-		this.store.remove(icsRecord);
-	},
-	
-	/**
-	 * Event handler which is fired when the {@link Zarafa.plugins.calendarimporter.settings.ui.CalSyncGrid CalSyncGrid} is double clicked.
-	 * it will call generic function to handle the functionality.
-	 * @private
-	 */
-	onRowDblClick : function(grid, rowIndex)
-	{
-		Zarafa.core.data.UIFactory.openLayerComponent(Zarafa.core.data.SharedComponentType['plugins.calendarimporter.settings.dialogs.calsyncedit'], undefined, {
-			store : grid.getStore(),
-			item : grid.getStore().getAt(rowIndex),
-			manager : Ext.WindowMgr
-		});
-	}
+    /**
+     * Event handler which is fired when the gridPanel is ready. This will automatically
+     * select the first row in the grid.
+     * @private
+     */
+    onViewReady: function () {
+        this.getSelectionModel().selectFirstRow();
+    },
+
+    /**
+     * Function will be called to remove a ics sync entry.
+     */
+    removeIcsSyncAs: function () {
+        var icsRecord = this.getSelectionModel().getSelected();
+        if (!icsRecord) {
+            Ext.Msg.alert(dgettext('plugin_calendarimporter', 'Alert'), dgettext('plugin_calendarimporter', 'Please select a ics sync entry.'));
+            return;
+        }
+
+        this.store.remove(icsRecord);
+    },
+
+    /**
+     * Event handler which is fired when the {@link Zarafa.plugins.calendarimporter.settings.ui.CalSyncGrid CalSyncGrid} is double clicked.
+     * it will call generic function to handle the functionality.
+     * @private
+     */
+    onRowDblClick: function (grid, rowIndex) {
+        Zarafa.core.data.UIFactory.openLayerComponent(Zarafa.core.data.SharedComponentType['plugins.calendarimporter.settings.dialogs.calsyncedit'], undefined, {
+            store: grid.getStore(),
+            item: grid.getStore().getAt(rowIndex),
+            manager: Ext.WindowMgr
+        });
+    }
 });
 
 Ext.reg('calendarimporter.calsyncgrid', Zarafa.plugins.calendarimporter.settings.ui.CalSyncGrid);
diff --git a/js/settings/ui/CalSyncPanel.js b/js/settings/ui/CalSyncPanel.js
index c9e6cf8..4761e90 100644
--- a/js/settings/ui/CalSyncPanel.js
+++ b/js/settings/ui/CalSyncPanel.js
@@ -1,3 +1,25 @@
+/**
+ * CalSyncPanel.js, Kopano calender to ics im/exporter
+ *
+ * Author: Christoph Haas <christoph.h@sprinternet.at>
+ * Copyright (C) 2012-2016 Christoph Haas
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
 Ext.namespace('Zarafa.plugins.calendarimporter.settings.ui');
 
 /**
@@ -8,151 +30,143 @@ Ext.namespace('Zarafa.plugins.calendarimporter.settings.ui');
  */
 Zarafa.plugins.calendarimporter.settings.ui.CalSyncPanel = Ext.extend(Ext.Panel, {
 
-	// store
-	store : undefined,
+    // store
+    store: undefined,
 
-	/**
-	 * @constructor
-	 * @param config Configuration structure
-	 */
-	constructor : function(config)
-	{
-		config = config || {};
-		if(config.store)
-			this.store = config.store;
+    /**
+     * @constructor
+     * @param config Configuration structure
+     */
+    constructor: function (config) {
+        config = config || {};
+        if (config.store)
+            this.store = config.store;
 
-		Ext.applyIf(config, {
-			// Override from Ext.Component
-			xtype : 'calendarimporter.calsyncpanel',
-			border : false,
-			layout : {
-				type : 'vbox',
-				align : 'stretch',
-				pack  : 'start'
-			},
-			items : this.createPanelItems(this.store)
-		});
+        Ext.applyIf(config, {
+            // Override from Ext.Component
+            xtype: 'calendarimporter.calsyncpanel',
+            border: false,
+            layout: {
+                type: 'vbox',
+                align: 'stretch',
+                pack: 'start'
+            },
+            items: this.createPanelItems(this.store)
+        });
 
-		Zarafa.plugins.calendarimporter.settings.ui.CalSyncPanel.superclass.constructor.call(this, config);
-	},
-	
-	/**
-	 * Function will create panel items for {@link Zarafa.plugins.calendarimporter.settings.ui.CalSyncPanel CalSyncPanel}
-	 * @return {Array} array of items that should be added to panel.
-	 * @private
-	 */
-	createPanelItems : function(store)
-	{
-		return [{
-			xtype : 'displayfield',
-			value : _('Setup calendars you want to subscribe to.'),
-			fieldClass : 'x-form-display-field'
-		}, {
-			xtype : 'container',
-			flex : 1,
-			layout : {
-				type : 'hbox',
-				align : 'stretch',
-				pack  : 'start'
-			},
-			items : [{
-				xtype : 'calendarimporter.calsyncgrid',
-				ref : '../calsyncGrid',
-				store : store,
-				flex : 1
-			}, {
-				xtype : 'container',
-				width : 160,
-				defaults : {
-					width : 140
-				},
-				layout : {
-					type : 'vbox',
-					align : 'center',
-					pack  : 'start'
-				},
-				items : [{
-					xtype : 'button',
-					text : _('Add') + '...',
-					handler : this.onCalSyncAdd,
-					ref : '../../addButton',
-					scope : this
-				}, {
-					xtype : 'spacer',
-					height : 20
-				}, {
-					xtype : 'button',
-					text : _('Remove') + '...',
-					disabled : true,
-					ref : '../../removeButton',
-					handler : this.onCalSyncRemove,
-					scope : this
-				}]
-			}]
-		}];
-	},
+        Zarafa.plugins.calendarimporter.settings.ui.CalSyncPanel.superclass.constructor.call(this, config);
+    },
 
-	/**
-	 * initialize events for the panel.
-	 * @private
-	 */
-	initEvents : function()
-	{
-		Zarafa.plugins.calendarimporter.settings.ui.CalSyncPanel.superclass.initEvents.call(this);
+    /**
+     * Function will create panel items for {@link Zarafa.plugins.calendarimporter.settings.ui.CalSyncPanel CalSyncPanel}
+     * @return {Array} array of items that should be added to panel.
+     * @private
+     */
+    createPanelItems: function (store) {
+        return [{
+            xtype: 'displayfield',
+            value: dgettext('plugin_calendarimporter', 'Setup calendars you want to subscribe to.'),
+            fieldClass: 'x-form-display-field'
+        }, {
+            xtype: 'container',
+            flex: 1,
+            layout: {
+                type: 'hbox',
+                align: 'stretch',
+                pack: 'start'
+            },
+            items: [{
+                xtype: 'calendarimporter.calsyncgrid',
+                ref: '../calsyncGrid',
+                store: store,
+                flex: 1
+            }, {
+                xtype: 'container',
+                width: 160,
+                defaults: {
+                    width: 140
+                },
+                layout: {
+                    type: 'vbox',
+                    align: 'center',
+                    pack: 'start'
+                },
+                items: [{
+                    xtype: 'button',
+                    text: _('Add') + '...',
+                    handler: this.onCalSyncAdd,
+                    ref: '../../addButton',
+                    scope: this
+                }, {
+                    xtype: 'spacer',
+                    height: 20
+                }, {
+                    xtype: 'button',
+                    text: _('Remove') + '...',
+                    disabled: true,
+                    ref: '../../removeButton',
+                    handler: this.onCalSyncRemove,
+                    scope: this
+                }]
+            }]
+        }];
+    },
 
-		// register event to enable/disable buttons
-		this.mon(this.calsyncGrid.getSelectionModel(), 'selectionchange', this.onGridSelectionChange, this);
-	},
+    /**
+     * initialize events for the panel.
+     * @private
+     */
+    initEvents: function () {
+        Zarafa.plugins.calendarimporter.settings.ui.CalSyncPanel.superclass.initEvents.call(this);
 
-	/**
-	 * Handler function will be called when user clicks on 'Add' button.
-	 * @private
-	 */
-	onCalSyncAdd : function()
-	{
-		Zarafa.core.data.UIFactory.openLayerComponent(Zarafa.core.data.SharedComponentType['plugins.calendarimporter.settings.dialogs.calsyncedit'], undefined, {
-			store : this.store,
-			item : undefined,
-			manager : Ext.WindowMgr
-		});
-	},
+        // register event to enable/disable buttons
+        this.mon(this.calsyncGrid.getSelectionModel(), 'selectionchange', this.onGridSelectionChange, this);
+    },
 
-	/**
-	 * Event handler will be called when selection in {@link Zarafa.plugins.calendarimporter.settings.ui.CalSyncGrid CalSyncGrid}
-	 * has been changed
-	 * @param {Ext.grid.RowSelectionModel} selectionModel selection model that fired the event
-	 */
-	onGridSelectionChange : function(selectionModel)
-	{
-		var noSelection = (selectionModel.hasSelection() === false);
+    /**
+     * Handler function will be called when user clicks on 'Add' button.
+     * @private
+     */
+    onCalSyncAdd: function () {
+        Zarafa.core.data.UIFactory.openLayerComponent(Zarafa.core.data.SharedComponentType['plugins.calendarimporter.settings.dialogs.calsyncedit'], undefined, {
+            store: this.store,
+            item: undefined,
+            manager: Ext.WindowMgr
+        });
+    },
 
-		this.removeButton.setDisabled(noSelection);
-	},
+    /**
+     * Event handler will be called when selection in {@link Zarafa.plugins.calendarimporter.settings.ui.CalSyncGrid CalSyncGrid}
+     * has been changed
+     * @param {Ext.grid.RowSelectionModel} selectionModel selection model that fired the event
+     */
+    onGridSelectionChange: function (selectionModel) {
+        var noSelection = (selectionModel.hasSelection() === false);
 
-	/**
-	 * Handler function will be called when user clicks on 'Remove' button.
-	 * @private
-	 */
-	onCalSyncRemove : function()
-	{
-		this.calsyncGrid.removeIcsSyncAs();
-	},
+        this.removeButton.setDisabled(noSelection);
+    },
 
-	/**
-	 * Function will be used to reload data in the store.
-	 */
-	discardChanges : function()
-	{
-		this.store.load();
-	},
+    /**
+     * Handler function will be called when user clicks on 'Remove' button.
+     * @private
+     */
+    onCalSyncRemove: function () {
+        this.calsyncGrid.removeIcsSyncAs();
+    },
 
-	/**
-	 * Function will be used to save changes in the store.
-	 */
-	saveChanges : function()
-	{
-		this.store.save();
-	}
+    /**
+     * Function will be used to reload data in the store.
+     */
+    discardChanges: function () {
+        this.store.load();
+    },
+
+    /**
+     * Function will be used to save changes in the store.
+     */
+    saveChanges: function () {
+        this.store.save();
+    }
 });
 
 Ext.reg('calendarimporter.calsyncpanel', Zarafa.plugins.calendarimporter.settings.ui.CalSyncPanel);
diff --git a/js/ui/ContextMenu.js b/js/ui/ContextMenu.js
index f66c90c..3eb82da 100644
--- a/js/ui/ContextMenu.js
+++ b/js/ui/ContextMenu.js
@@ -1,5 +1,5 @@
 /**
- * ContectMenu.js zarafa calender to ics im/exporter
+ * ContectMenu.js, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
  * Copyright (C) 2012-2016 Christoph Haas
@@ -29,101 +29,105 @@ Ext.namespace('Zarafa.plugins.calendarimporter.ui');
  */
 Zarafa.plugins.calendarimporter.ui.ContextMenu = Ext.extend(Zarafa.hierarchy.ui.ContextMenu, {
 
-	/**
-	 * @constructor
-	 * @param {Object} config Configuration object
-	 */
-	constructor: function (config) {
-		config = config || {};
+    /**
+     * @constructor
+     * @param {Object} config Configuration object
+     */
+    constructor: function (config) {
+        config = config || {};
 
-		if (config.contextNode) {
-			config.contextTree = config.contextNode.getOwnerTree();
-		}
+        if (config.contextNode) {
+            config.contextTree = config.contextNode.getOwnerTree();
+        }
 
-		Zarafa.plugins.calendarimporter.ui.ContextMenu.superclass.constructor.call(this, config);
+        Zarafa.plugins.calendarimporter.ui.ContextMenu.superclass.constructor.call(this, config);
 
-		// add item to menu
-		var additionalItems = this.createAdditionalContextMenuItems(config);
-		for (var i = 0; i < additionalItems.length; i++) {
-			config.items[0].push(additionalItems[i]);
-		}
+        // add item to menu
+        var additionalItems = this.createAdditionalContextMenuItems(config);
+        for (var i = 0; i < additionalItems.length; i++) {
+            config.items[0].push(additionalItems[i]);
+        }
 
-		Zarafa.plugins.calendarimporter.ui.ContextMenu.superclass.constructor.call(this, config); // redo ... otherwise menu does not get published
-	},
+        Zarafa.plugins.calendarimporter.ui.ContextMenu.superclass.constructor.call(this, config); // redo ... otherwise menu does not get published
+    },
 
-	/**
-	 * Create the Action context menu items.
-	 * @param {Object} config Configuration object for the {@link Zarafa.plugins.calendarimporter.ui.ContextMenu ContextMenu}
-	 * @return {Zarafa.core.ui.menu.ConditionalItem[]} The list of Action context menu items
-	 * @private
-	 *
-	 * Note: All handlers are called within the scope of {@link Zarafa.plugins.calendarimporter.ui.ContextMenu HierarchyContextMenu}
-	 */
-	createAdditionalContextMenuItems: function (config) {
-		return [{
-			xtype: 'menuseparator'
-		}, {
-			text      : _('Import Calendar'),
-			iconCls   : 'icon_calendarimporter_import',
-			handler   : this.onContextItemImport,
-			beforeShow: function (item, record) {
-				var access = record.get('access') & Zarafa.core.mapi.Access.ACCESS_MODIFY;
-				if (!access || (record.isIPMSubTree() && !record.getMAPIStore().isDefaultStore())) {
-					item.setDisabled(true);
-				} else {
-					item.setDisabled(false);
-				}
-			}
-		}, {
-			text      : _('Export Calendar'),
-			iconCls   : 'icon_calendarimporter_export',
-			handler   : this.onContextItemExport,
-			beforeShow: function (item, record) {
-				var access = record.get('access') & Zarafa.core.mapi.Access.ACCESS_READ;
-				if (!access || (record.isIPMSubTree() && !record.getMAPIStore().isDefaultStore())) {
-					item.setDisabled(true);
-				} else {
-					item.setDisabled(false);
-				}
-			}
-		}];
-	},
+    /**
+     * Create the Action context menu items.
+     * @param {Object} config Configuration object for the {@link Zarafa.plugins.calendarimporter.ui.ContextMenu ContextMenu}
+     * @return {Zarafa.core.ui.menu.ConditionalItem[]} The list of Action context menu items
+     * @private
+     *
+     * Note: All handlers are called within the scope of {@link Zarafa.plugins.calendarimporter.ui.ContextMenu HierarchyContextMenu}
+     */
+    createAdditionalContextMenuItems: function (config) {
+        return [{
+            xtype: 'menuseparator'
+        }, {
+            text: dgettext('plugin_calendarimporter', 'Import Calendar'),
+            iconCls: 'icon_calendarimporter_import',
+            handler: this.onContextItemImport,
+            beforeShow: function (item, record) {
+                var access = record.get('access') & Zarafa.core.mapi.Access.ACCESS_MODIFY;
+                if (!access || (record.isIPMSubTree() && !record.getMAPIStore().isDefaultStore())) {
+                    item.setDisabled(true);
+                } else {
+                    item.setDisabled(false);
+                }
+            }
+        }, {
+            text: dgettext('plugin_calendarimporter', 'Export Calendar'),
+            iconCls: 'icon_calendarimporter_export',
+            handler: this.onContextItemExport,
+            beforeShow: function (item, record) {
+                var access = record.get('access') & Zarafa.core.mapi.Access.ACCESS_READ;
+                if (!access || (record.isIPMSubTree() && !record.getMAPIStore().isDefaultStore())) {
+                    item.setDisabled(true);
+                } else {
+                    item.setDisabled(false);
+                }
+            }
+        }];
+    },
 
-	/**
-	 * Fires on selecting 'Open' menu option from {@link Zarafa.plugins.calendarimporter.ui.ContextMenu ContextMenu}
-	 * @private
-	 */
-	onContextItemExport: function () {
-		var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
-			successCallback: Zarafa.plugins.calendarimporter.data.Actions.downloadICS,
-			scope          : this
-		});
+    /**
+     * Fires on selecting 'Open' menu option from {@link Zarafa.plugins.calendarimporter.ui.ContextMenu ContextMenu}
+     * @private
+     */
+    onContextItemExport: function () {
+        var responseHandler = new Zarafa.plugins.calendarimporter.data.ResponseHandler({
+            successCallback: Zarafa.plugins.calendarimporter.data.Actions.downloadICS,
+            scope: this
+        });
 
-		// request attachment preperation
-		container.getRequest().singleRequest(
-			'calendarmodule',
-			'export',
-			{
-				storeid: this.records.get("store_entryid"),
-				folder : this.records.get("entryid")
-			},
-			responseHandler
-		);
-	},
+        // Notify user
+        // # TRANSLATORS: {0} will be replaced by the number of contacts that will be exported
+        container.getNotifier().notify('info', dgettext('plugin_contactimporter', 'Calendar Export'), String.format(dgettext('plugin_calendarimporter', 'Exporting {0} events. Please wait...'), this.records.get('content_count')));
 
-	/**
-	 * Fires on selecting 'Open' menu option from {@link Zarafa.plugins.calendarimporter.ui.ContextMenu ContextMenu}
-	 * @private
-	 */
-	onContextItemImport: function () {
-		var componentType = Zarafa.core.data.SharedComponentType['plugins.calendarimporter.dialogs.importevents'];
-		var config = {
-			modal : true,
-			folder: this.records.get("entryid")
-		};
+        // request attachment preperation
+        container.getRequest().singleRequest(
+            'calendarmodule',
+            'export',
+            {
+                storeid: this.records.get("store_entryid"),
+                folder: this.records.get("entryid")
+            },
+            responseHandler
+        );
+    },
 
-		Zarafa.core.data.UIFactory.openLayerComponent(componentType, undefined, config);
-	}
+    /**
+     * Fires on selecting 'Open' menu option from {@link Zarafa.plugins.calendarimporter.ui.ContextMenu ContextMenu}
+     * @private
+     */
+    onContextItemImport: function () {
+        var componentType = Zarafa.core.data.SharedComponentType['plugins.calendarimporter.dialogs.importevents'];
+        var config = {
+            modal: true,
+            folder: this.records.get("entryid")
+        };
+
+        Zarafa.core.data.UIFactory.openLayerComponent(componentType, undefined, config);
+    }
 });
 
 Ext.reg('calendarimporter.hierarchycontextmenu', Zarafa.plugins.calendarimporter.ui.ContextMenu);
\ No newline at end of file
diff --git a/languages/de_DE.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo b/languages/de_DE.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo
new file mode 100644
index 0000000..a6e9596
Binary files /dev/null and b/languages/de_DE.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo differ
diff --git a/languages/de_DE.UTF-8/LC_MESSAGES/plugin_calendarimporter.po b/languages/de_DE.UTF-8/LC_MESSAGES/plugin_calendarimporter.po
new file mode 100644
index 0000000..b72cf4b
--- /dev/null
+++ b/languages/de_DE.UTF-8/LC_MESSAGES/plugin_calendarimporter.po
@@ -0,0 +1,350 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Plugin Calendarimporter\n"
+"POT-Creation-Date: 2016-11-29 19:49+0100\n"
+"PO-Revision-Date: 2016-11-29 19:49+0100\n"
+"Last-Translator: \n"
+"Language-Team: Christoph Haas <christoph.h@sprinternet.at>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.7.1\n"
+"X-Poedit-Basepath: ../../..\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SearchPath-0: php\n"
+"X-Poedit-SearchPath-1: js\n"
+
+#: js/data/Actions.js:44
+msgid "Warning"
+msgstr "Warnung"
+
+#: js/dialogs/ImportContentPanel.js:47
+msgid "Import Calendar File"
+msgstr "Kalender Datei importieren"
+
+#: js/dialogs/ImportPanel.js:124
+msgid "Loading..."
+msgstr "Lade..."
+
+#: js/dialogs/ImportPanel.js:209
+msgid "Select events to import"
+msgstr "Termine zum importieren auswählen"
+
+#: js/dialogs/ImportPanel.js:222
+msgid "Title"
+msgstr "Titel"
+
+#: js/dialogs/ImportPanel.js:228
+msgid "Start"
+msgstr "Beginn"
+
+#: js/dialogs/ImportPanel.js:235
+msgid "End"
+msgstr "Ende"
+
+#: js/dialogs/ImportPanel.js:242
+msgid "Location"
+msgstr "Ort"
+
+#: js/dialogs/ImportPanel.js:247
+msgid "Description"
+msgstr "Beschreibung"
+
+#: js/dialogs/ImportPanel.js:248
+msgid "Priority"
+msgstr "Priorität"
+
+#: js/dialogs/ImportPanel.js:249
+msgid "Label"
+msgstr "Label"
+
+#: js/dialogs/ImportPanel.js:250
+msgid "Busystatus"
+msgstr "Beschäftigt"
+
+#: js/dialogs/ImportPanel.js:251
+msgid "Privacystatus"
+msgstr "Privat"
+
+#: js/dialogs/ImportPanel.js:252
+msgid "Organizer"
+msgstr "Ersteller"
+
+#: js/dialogs/ImportPanel.js:254
+msgid "Alarm"
+msgstr "Erinnerung"
+
+#: js/dialogs/ImportPanel.js:259 js/dialogs/ImportPanel.js:296
+msgid "Timezone"
+msgstr "Zeitzone"
+
+#: js/dialogs/ImportPanel.js:276
+msgid "Select folder"
+msgstr "Ordner auswählen"
+
+#: js/dialogs/ImportPanel.js:317
+msgid "Ignore DST"
+msgstr "DST ignorieren"
+
+#: js/dialogs/ImportPanel.js:318
+msgid "This will ignore \"Daylight saving time\" offsets."
+msgstr ""
+"Durch diese Einstellung wird die Sommer bzw. Winterzeit Abweichung ignoriert."
+
+#: js/dialogs/ImportPanel.js:338
+msgid "Select an .ics calendar"
+msgstr ".ics Kalender Datei wählen"
+
+#: js/dialogs/ImportPanel.js:358
+msgid "Import"
+msgstr "Importieren"
+
+#: js/dialogs/ImportPanel.js:372
+msgid "Import All"
+msgstr "Alle Importieren"
+
+#: js/dialogs/ImportPanel.js:384 js/settings/SettingsWidget.js:165
+#: js/settings/dialogs/CalSyncEditPanel.js:61
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: js/dialogs/ImportPanel.js:428
+msgid "Uploading and parsing calendar..."
+msgstr "Kalender wird hochgeladen und verarbeitet..."
+
+#: js/dialogs/ImportPanel.js:434 js/dialogs/ImportPanel.js:524
+#: js/dialogs/ImportPanel.js:532 js/dialogs/ImportPanel.js:581
+#: js/plugin.calendarimporter.js:175
+msgid "Error"
+msgstr "Fehler"
+
+#: js/dialogs/ImportPanel.js:489
+msgid "Parser Error"
+msgstr "Verarbeitungsfehler"
+
+#: js/dialogs/ImportPanel.js:525
+msgid "You have to choose a calendar!"
+msgstr "Es muss ein Kalender ausgewählt werden!"
+
+#: js/dialogs/ImportPanel.js:533
+msgid "You have to choose at least one event to import!"
+msgstr "Es muss mindestens ein Termin zum Importieren ausgewählt werden."
+
+#: js/dialogs/ImportPanel.js:582
+msgid "Import failed: {0}"
+msgstr "Importieren fehlgeschalgen: {0}"
+
+#: js/plugin.calendarimporter.js:76
+msgid "Export Event"
+msgstr "Termin exportieren"
+
+#. TRANSLATORS: {0} will be replaced by the number of contacts that will be exported
+#. TRANSLATORS: {0} will be replaced by the number of contacts that will be exported
+#: js/plugin.calendarimporter.js:105 js/ui/ContextMenu.js:104
+msgid "Calendar Export"
+msgstr "Kalenderexport"
+
+#: js/plugin.calendarimporter.js:105 js/ui/ContextMenu.js:104
+msgid "Exporting {0} events. Please wait..."
+msgstr "Exportiere {0} Termine. Bitte warten..."
+
+#: js/plugin.calendarimporter.js:151
+msgid "Import to Calendar"
+msgstr "Kalender importieren"
+
+#: js/plugin.calendarimporter.js:188
+msgid "Please wait"
+msgstr "Bitte warten"
+
+#: js/plugin.calendarimporter.js:189
+msgid "Loading attachment..."
+msgstr "Lade Anhang..."
+
+#: js/plugin.calendarimporter.js:190
+msgid "Initializing..."
+msgstr "Initialisierung..."
+
+#. TRANSLATORS: {0} will be replaced by the percentage value (0-100)
+#: js/plugin.calendarimporter.js:203
+msgid "{0}% loaded"
+msgstr "{0}% geladen"
+
+#: js/plugin.calendarimporter.js:321
+msgid "Calendarimporter Plugin"
+msgstr "Kalender Plugin"
+
+#: js/settings/SettingsCalSyncWidget.js:64
+msgid "Calendar Sync settings"
+msgstr "Kalender Synchronisierung - Einstellungen"
+
+#: js/settings/SettingsWidget.js:45
+msgid "Calendar Import/Export plugin settings"
+msgstr "Kalender Import/Export Einstellungen"
+
+#: js/settings/SettingsWidget.js:52
+msgid "Enable ical sync"
+msgstr "iCAL Synchronisierung aktivieren"
+
+#: js/settings/SettingsWidget.js:73
+msgid "Default calender"
+msgstr "Standard Kalender"
+
+#: js/settings/SettingsWidget.js:92
+msgid "Default timezone"
+msgstr "Standard Zeitzone"
+
+#: js/settings/SettingsWidget.js:151
+msgid "Your WebApp needs to be reloaded to make the changes visible!"
+msgstr "Your WebApp needs to be reloaded to make the changes visible!"
+
+#: js/settings/SettingsWidget.js:153
+msgid ""
+"WebApp will automatically restart in order for these changes to take effect"
+msgstr ""
+"WebApp will automatically restart in order for these changes to take effect"
+
+#: js/settings/SettingsWidget.js:157
+msgid "Restart WebApp"
+msgstr "Restart WebApp"
+
+#: js/settings/SettingsWidget.js:162
+msgid "Restart"
+msgstr "Restart"
+
+#: js/settings/SettingsWidget.js:187
+msgid "Webapp is reloading, Please wait."
+msgstr "Webapp is reloading, Please wait."
+
+#: js/settings/dialogs/CalSyncEditContentPanel.js:49
+msgid "ICAL Sync"
+msgstr "iCAL Synchronisierung"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:56
+msgid "Save"
+msgstr "Save"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:139
+msgid "ICAL Information"
+msgstr "iCAL Informationen"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:148
+msgid "ICS Url"
+msgstr "ICS Url"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:156
+msgid "Destination Calendar"
+msgstr "Ziel-Kalender"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:171
+msgid "Sync Intervall (minutes)"
+msgstr "Synchronisationsintervall (Minuten)"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:180
+msgid "Authentication (optional)"
+msgstr "Anmelden (optional)"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:187
+msgid "Username"
+msgstr "Benutzername"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:194
+msgid "Password"
+msgstr "Passwort"
+
+#: js/settings/ui/CalSyncGrid.js:45
+msgid "No ICAL sync entry exists"
+msgstr "Es existiert kein Synchronisierungs Eintrag"
+
+#: js/settings/ui/CalSyncGrid.js:97
+msgid "ICS File"
+msgstr "ICS Datei"
+
+#: js/settings/ui/CalSyncGrid.js:102
+msgid "Destination Calender"
+msgstr "Ziel-Kalender"
+
+#: js/settings/ui/CalSyncGrid.js:107
+msgid "Authentication"
+msgstr "Anmeldung"
+
+#: js/settings/ui/CalSyncGrid.js:112
+msgid "Sync Intervall"
+msgstr "Synchronisierungs Intervall"
+
+#: js/settings/ui/CalSyncGrid.js:116
+msgid "Last Synchronisation"
+msgstr "Letzte Synchronisation"
+
+#: js/settings/ui/CalSyncGrid.js:140
+msgid "Loading ics sync entries..."
+msgstr "Lade Synchronisierungseinträge..."
+
+#: js/settings/ui/CalSyncGrid.js:159
+msgid "Alert"
+msgstr "Achtung"
+
+#: js/settings/ui/CalSyncGrid.js:159
+msgid "Please select a ics sync entry."
+msgstr "Bitte einen Eintrag auswählen."
+
+#: js/settings/ui/CalSyncPanel.js:68
+msgid "Setup calendars you want to subscribe to."
+msgstr "Kalender zur Synchronisation verwalten."
+
+#: js/settings/ui/CalSyncPanel.js:96
+msgid "Add"
+msgstr "Add"
+
+#: js/settings/ui/CalSyncPanel.js:105
+msgid "Remove"
+msgstr "Remove"
+
+#: js/ui/ContextMenu.js:66
+msgid "Import Calendar"
+msgstr "Kalender importieren"
+
+#: js/ui/ContextMenu.js:78
+msgid "Export Calendar"
+msgstr "Kalender exportieren"
+
+#. TRANSLATORS: Filename suffix for exported files
+#: php/module.calendar.php:341
+msgid "_events.ics"
+msgstr "_Termine.ics"
+
+#: php/module.calendar.php:344
+msgid "No events found. Export skipped!"
+msgstr "Keine Termine gefunden. Export abgebrochen!"
+
+#: php/module.calendar.php:456
+msgid "ICS file empty!"
+msgstr "ICS enthält keine Termine!"
+
+#: php/module.calendar.php:594
+msgid "Store could not be opened!"
+msgstr "Datenbank kann nicht geöffnet werden!"
+
+#: php/module.calendar.php:600
+msgid "Wrong call, store and entryid have to be set!"
+msgstr "Inkorrekter Aufruf!"
+
+#: php/module.calendar.php:634
+msgid "No event in ics file"
+msgstr "ICS enthält keine Termine!"
+
+#: php/module.calendar.php:647
+msgid "File could not be read by server"
+msgstr "Datei konnte vom Server nicht gelesen werden"
+
+#: php/upload.php:69
+msgid ""
+"File could not be moved to TMP path! Check plugin config and folder "
+"permissions!"
+msgstr "Temporärer Pfad ist nicht beschreibbar!"
+
+#: php/upload.php:72
+msgid "File could not be read by server, upload error!"
+msgstr ""
+"Datei konnte vom Server nicht gelesen werden. Hochladen fehlgeschlagen!"
diff --git a/languages/de_DE.UTF-8/language.txt b/languages/de_DE.UTF-8/language.txt
new file mode 100644
index 0000000..1149b6b
--- /dev/null
+++ b/languages/de_DE.UTF-8/language.txt
@@ -0,0 +1,2 @@
+Deutsch
+deu_DEU
diff --git a/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo b/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo
new file mode 100644
index 0000000..8ac4365
Binary files /dev/null and b/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.mo differ
diff --git a/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po b/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po
new file mode 100644
index 0000000..b0d2086
--- /dev/null
+++ b/languages/en_US.UTF-8/LC_MESSAGES/plugin_calendarimporter.po
@@ -0,0 +1,349 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: Plugin Calendarimporter\n"
+"POT-Creation-Date: 2016-11-29 19:21+0100\n"
+"PO-Revision-Date: 2016-11-29 19:39+0100\n"
+"Last-Translator: \n"
+"Language-Team: Christoph Haas <christoph.h@sprinternet.at>\n"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.7.1\n"
+"X-Poedit-Basepath: ../../..\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SearchPath-0: php\n"
+"X-Poedit-SearchPath-1: js\n"
+
+#: js/data/Actions.js:44
+msgid "Warning"
+msgstr "Warning"
+
+#: js/dialogs/ImportContentPanel.js:47
+msgid "Import Calendar File"
+msgstr "Import Calendar File"
+
+#: js/dialogs/ImportPanel.js:124
+msgid "Loading..."
+msgstr "Loading..."
+
+#: js/dialogs/ImportPanel.js:209
+msgid "Select events to import"
+msgstr "Select events to import"
+
+#: js/dialogs/ImportPanel.js:222
+msgid "Title"
+msgstr "Title"
+
+#: js/dialogs/ImportPanel.js:228
+msgid "Start"
+msgstr "Start"
+
+#: js/dialogs/ImportPanel.js:235
+msgid "End"
+msgstr "End"
+
+#: js/dialogs/ImportPanel.js:242
+msgid "Location"
+msgstr "Location"
+
+#: js/dialogs/ImportPanel.js:247
+msgid "Description"
+msgstr "Description"
+
+#: js/dialogs/ImportPanel.js:248
+msgid "Priority"
+msgstr "Priority"
+
+#: js/dialogs/ImportPanel.js:249
+msgid "Label"
+msgstr "Label"
+
+#: js/dialogs/ImportPanel.js:250
+msgid "Busystatus"
+msgstr "Busystatus"
+
+#: js/dialogs/ImportPanel.js:251
+msgid "Privacystatus"
+msgstr "Privacystatus"
+
+#: js/dialogs/ImportPanel.js:252
+msgid "Organizer"
+msgstr "Organizer"
+
+#: js/dialogs/ImportPanel.js:254
+msgid "Alarm"
+msgstr "Alarm"
+
+#: js/dialogs/ImportPanel.js:259 js/dialogs/ImportPanel.js:296
+msgid "Timezone"
+msgstr "Timezone"
+
+#: js/dialogs/ImportPanel.js:276
+msgid "Select folder"
+msgstr "Select folder"
+
+#: js/dialogs/ImportPanel.js:317
+msgid "Ignore DST"
+msgstr "Ignore DST"
+
+#: js/dialogs/ImportPanel.js:318
+msgid "This will ignore \"Daylight saving time\" offsets."
+msgstr "This will ignore \"Daylight saving time\" offsets."
+
+#: js/dialogs/ImportPanel.js:338
+msgid "Select an .ics calendar"
+msgstr "Select an .ics calendar"
+
+#: js/dialogs/ImportPanel.js:358
+msgid "Import"
+msgstr "Import"
+
+#: js/dialogs/ImportPanel.js:372
+msgid "Import All"
+msgstr "Import All"
+
+#: js/dialogs/ImportPanel.js:384 js/settings/SettingsWidget.js:165
+#: js/settings/dialogs/CalSyncEditPanel.js:61
+msgid "Cancel"
+msgstr "Cancel"
+
+#: js/dialogs/ImportPanel.js:428
+msgid "Uploading and parsing calendar..."
+msgstr "Uploading and parsing calendar..."
+
+#: js/dialogs/ImportPanel.js:434 js/dialogs/ImportPanel.js:524
+#: js/dialogs/ImportPanel.js:532 js/dialogs/ImportPanel.js:581
+#: js/plugin.calendarimporter.js:170
+msgid "Error"
+msgstr "Error"
+
+#: js/dialogs/ImportPanel.js:489
+msgid "Parser Error"
+msgstr "Parser Error"
+
+#: js/dialogs/ImportPanel.js:525
+msgid "You have to choose a calendar!"
+msgstr "You have to choose a calendar!"
+
+#: js/dialogs/ImportPanel.js:533
+msgid "You have to choose at least one event to import!"
+msgstr "You have to choose at least one event to import!"
+
+#: js/dialogs/ImportPanel.js:582
+msgid "Import failed: {0}"
+msgstr "Import failed: {0}"
+
+#: js/plugin.calendarimporter.js:76
+msgid "Export Event"
+msgstr "Export Event"
+
+#: js/plugin.calendarimporter.js:146
+msgid "Import to Calendar"
+msgstr "Import to Calendar"
+
+#: js/plugin.calendarimporter.js:183
+msgid "Please wait"
+msgstr "Please wait"
+
+#: js/plugin.calendarimporter.js:184
+msgid "Loading attachment..."
+msgstr "Loading attachment..."
+
+#: js/plugin.calendarimporter.js:185
+msgid "Initializing..."
+msgstr "Initializing..."
+
+#. TRANSLATORS: {0} will be replaced by the percentage value (0-100)
+#: js/plugin.calendarimporter.js:198
+msgid "{0}% loaded"
+msgstr "{0}% loaded"
+
+#: js/plugin.calendarimporter.js:316
+msgid "Calendarimporter Plugin"
+msgstr "Calendarimporter Plugin"
+
+#: js/settings/SettingsCalSyncWidget.js:64
+msgid "Calendar Sync settings"
+msgstr "Calendar Sync settings"
+
+#: js/settings/SettingsWidget.js:45
+msgid "Calendar Import/Export plugin settings"
+msgstr "Calendar Import/Export plugin settings"
+
+#: js/settings/SettingsWidget.js:52
+msgid "Enable ical sync"
+msgstr "Enable ical sync"
+
+#: js/settings/SettingsWidget.js:73
+msgid "Default calender"
+msgstr "Default calender"
+
+#: js/settings/SettingsWidget.js:92
+msgid "Default timezone"
+msgstr "Default timezone"
+
+#: js/settings/SettingsWidget.js:151
+msgid "Your WebApp needs to be reloaded to make the changes visible!"
+msgstr "Your WebApp needs to be reloaded to make the changes visible!"
+
+#: js/settings/SettingsWidget.js:153
+msgid ""
+"WebApp will automatically restart in order for these changes to take effect"
+msgstr ""
+"WebApp will automatically restart in order for these changes to take effect"
+
+#: js/settings/SettingsWidget.js:157
+msgid "Restart WebApp"
+msgstr "Restart WebApp"
+
+#: js/settings/SettingsWidget.js:162
+msgid "Restart"
+msgstr "Restart"
+
+#: js/settings/SettingsWidget.js:187
+msgid "Webapp is reloading, Please wait."
+msgstr "Webapp is reloading, Please wait."
+
+#: js/settings/dialogs/CalSyncEditContentPanel.js:49
+msgid "ICAL Sync"
+msgstr "ICAL Sync"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:56
+msgid "Save"
+msgstr "Save"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:139
+msgid "ICAL Information"
+msgstr "ICAL Information"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:148
+msgid "ICS Url"
+msgstr "ICS Url"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:156
+msgid "Destination Calendar"
+msgstr "Destination Calendar"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:171
+msgid "Sync Intervall (minutes)"
+msgstr "Sync Intervall (minutes)"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:180
+msgid "Authentication (optional)"
+msgstr "Authentication (optional)"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:187
+msgid "Username"
+msgstr "Username"
+
+#: js/settings/dialogs/CalSyncEditPanel.js:194
+msgid "Password"
+msgstr "Password"
+
+#: js/settings/ui/CalSyncGrid.js:45
+msgid "No ICAL sync entry exists"
+msgstr "No ICAL sync entry exists"
+
+#: js/settings/ui/CalSyncGrid.js:97
+msgid "ICS File"
+msgstr "ICS File"
+
+#: js/settings/ui/CalSyncGrid.js:102
+msgid "Destination Calender"
+msgstr "Destination Calender"
+
+#: js/settings/ui/CalSyncGrid.js:107
+msgid "Authentication"
+msgstr "Authentication"
+
+#: js/settings/ui/CalSyncGrid.js:112
+msgid "Sync Intervall"
+msgstr "Sync Intervall"
+
+#: js/settings/ui/CalSyncGrid.js:116
+msgid "Last Synchronisation"
+msgstr "Last Synchronisation"
+
+#: js/settings/ui/CalSyncGrid.js:140
+msgid "Loading ics sync entries..."
+msgstr "Loading ics sync entries..."
+
+#: js/settings/ui/CalSyncGrid.js:159
+msgid "Alert"
+msgstr "Alert"
+
+#: js/settings/ui/CalSyncGrid.js:159
+msgid "Please select a ics sync entry."
+msgstr "Please select a ics sync entry."
+
+#: js/settings/ui/CalSyncPanel.js:68
+msgid "Setup calendars you want to subscribe to."
+msgstr "Setup calendars you want to subscribe to."
+
+#: js/settings/ui/CalSyncPanel.js:96
+msgid "Add"
+msgstr "Add"
+
+#: js/settings/ui/CalSyncPanel.js:105
+msgid "Remove"
+msgstr "Remove"
+
+#: js/ui/ContextMenu.js:66
+msgid "Import Calendar"
+msgstr "Import Calendar"
+
+#: js/ui/ContextMenu.js:78
+msgid "Export Calendar"
+msgstr "Export Calendar"
+
+#. TRANSLATORS: {0} will be replaced by the number of contacts that will be exported
+#: js/ui/ContextMenu.js:104
+msgid "Calendar Export"
+msgstr "Calendar Export"
+
+#: js/ui/ContextMenu.js:104
+msgid "Exporting {0} events. Please wait..."
+msgstr "Exporting {0} events. Please wait..."
+
+#. TRANSLATORS: Filename suffix for exported files
+#: php/module.calendar.php:341
+msgid "_events.ics"
+msgstr "_events.ics"
+
+#: php/module.calendar.php:344
+msgid "No events found. Export skipped!"
+msgstr "No events found. Export skipped!"
+
+#: php/module.calendar.php:456
+msgid "ICS file empty!"
+msgstr "ICS file empty!"
+
+#: php/module.calendar.php:594
+msgid "Store could not be opened!"
+msgstr "Store could not be opened!"
+
+#: php/module.calendar.php:600
+msgid "Wrong call, store and entryid have to be set!"
+msgstr "Wrong call, store and entryid have to be set!"
+
+#: php/module.calendar.php:634
+msgid "No event in ics file"
+msgstr "No event in ics file"
+
+#: php/module.calendar.php:647
+msgid "File could not be read by server"
+msgstr "File could not be read by server"
+
+#: php/upload.php:69
+msgid ""
+"File could not be moved to TMP path! Check plugin config and folder "
+"permissions!"
+msgstr ""
+"File could not be moved to TMP path! Check plugin config and folder "
+"permissions!"
+
+#: php/upload.php:72
+msgid "File could not be read by server, upload error!"
+msgstr "File could not be read by server, upload error!"
diff --git a/languages/en_US.UTF-8/language.txt b/languages/en_US.UTF-8/language.txt
new file mode 100644
index 0000000..ea7e1f6
--- /dev/null
+++ b/languages/en_US.UTF-8/language.txt
@@ -0,0 +1,2 @@
+English (US)
+eng_USA
diff --git a/manifest.xml b/manifest.xml
index 00e0852..d01eb47 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,49 +1,52 @@
 <?xml version="1.0"?>
 <!DOCTYPE plugin SYSTEM "manifest.dtd">
 <plugin version="2">
-	<info>
-		<version>2.2.0</version>
-		<name>calendarimporter</name>
-		<title>ICS Calendar Importer/Exporter</title>
-		<author>Christoph Haas</author>
-		<authorURL>http://www.sprinternet.at</authorURL>
-		<description>Import or Export a ICS file to/from the zarafa calendar</description>
-	</info>
-	<config>
-		<configfile>config.php</configfile>
-	</config>
-	<components>
-		<component>
-			<files>
-				<server>
-					<serverfile>php/plugin.calendarimporter.php</serverfile>
-					<serverfile type="module" module="calendarmodule">php/module.calendar.php</serverfile>
-				</server>
-				<client>
-					<clientfile load="release">js/calendarimporter-debug.js</clientfile>
-					<clientfile load="debug">js/calendarimporter-debug.js</clientfile>
-					
-					<clientfile load="source">js/data/timezones.js</clientfile>
-					<clientfile load="source">js/data/Actions.js</clientfile>
-					<clientfile load="source">js/data/ResponseHandler.js</clientfile>
-					<clientfile load="source">js/external/Ext.util.base64.js</clientfile>
-					<clientfile load="source">js/ui/ContextMenu.js</clientfile>
-					<clientfile load="source">js/dialogs/ImportContentPanel.js</clientfile>
-					<clientfile load="source">js/dialogs/ImportPanel.js</clientfile>
-					<clientfile load="source">js/dialogs/settings/SettingsWidget.js</clientfile>
-					<clientfile load="source">js/dialogs/settings/SettingsCalSyncWidget.js</clientfile>
-					<clientfile load="source">js/dialogs/settings/ui/CalSyncGrid.js</clientfile>
-					<clientfile load="source">js/dialogs/settings/ui/CalSyncPanel.js</clientfile>
-					<clientfile load="source">js/dialogs/settings/dialogs/CalSyncEditContentPanel.js</clientfile>
-					<clientfile load="source">js/dialogs/settings/dialogs/CalSyncEditPanel.js</clientfile>
-					<clientfile load="source">js/plugin.calendarimporter.js</clientfile>
-				</client>
-				<resources>
-					<resourcefile load="release">resources/css/calendarimporter.css</resourcefile>
-					<resourcefile load="debug">resources/css/calendarimporter.css</resourcefile>
-					<resourcefile load="source">resources/css/calendarimporter-main.css</resourcefile>
-				</resources>
-			</files>
-		</component>
-	</components>
+    <info>
+        <version>2.2.1</version>
+        <name>calendarimporter</name>
+        <title>ICS Calendar Importer/Exporter</title>
+        <author>Christoph Haas</author>
+        <authorURL>http://www.sprinternet.at</authorURL>
+        <description>Import or Export a ICS file to/from the Kopano calendar</description>
+    </info>
+    <translations>
+        <translationsdir>languages</translationsdir>
+    </translations>
+    <config>
+        <configfile>config.php</configfile>
+    </config>
+    <components>
+        <component>
+            <files>
+                <server>
+                    <serverfile>php/plugin.calendarimporter.php</serverfile>
+                    <serverfile type="module" module="calendarmodule">php/module.calendar.php</serverfile>
+                </server>
+                <client>
+                    <clientfile load="release">js/calendarimporter-debug.js</clientfile>
+                    <clientfile load="debug">js/calendarimporter-debug.js</clientfile>
+
+                    <clientfile load="source">js/data/timezones.js</clientfile>
+                    <clientfile load="source">js/data/Actions.js</clientfile>
+                    <clientfile load="source">js/data/ResponseHandler.js</clientfile>
+                    <clientfile load="source">js/external/Ext.util.base64.js</clientfile>
+                    <clientfile load="source">js/ui/ContextMenu.js</clientfile>
+                    <clientfile load="source">js/dialogs/ImportContentPanel.js</clientfile>
+                    <clientfile load="source">js/dialogs/ImportPanel.js</clientfile>
+                    <clientfile load="source">js/dialogs/settings/SettingsWidget.js</clientfile>
+                    <clientfile load="source">js/dialogs/settings/SettingsCalSyncWidget.js</clientfile>
+                    <clientfile load="source">js/dialogs/settings/ui/CalSyncGrid.js</clientfile>
+                    <clientfile load="source">js/dialogs/settings/ui/CalSyncPanel.js</clientfile>
+                    <clientfile load="source">js/dialogs/settings/dialogs/CalSyncEditContentPanel.js</clientfile>
+                    <clientfile load="source">js/dialogs/settings/dialogs/CalSyncEditPanel.js</clientfile>
+                    <clientfile load="source">js/plugin.calendarimporter.js</clientfile>
+                </client>
+                <resources>
+                    <resourcefile load="release">resources/css/calendarimporter.css</resourcefile>
+                    <resourcefile load="debug">resources/css/calendarimporter.css</resourcefile>
+                    <resourcefile load="source">resources/css/calendarimporter-main.css</resourcefile>
+                </resources>
+            </files>
+        </component>
+    </components>
 </plugin>
diff --git a/php/download.php b/php/download.php
index 8f64548..75829ef 100644
--- a/php/download.php
+++ b/php/download.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * download.php, zarafa calendar to ics im/exporter
+ * download.php, Kopano calendar to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
  * Copyright (C) 2012-2016 Christoph Haas
@@ -25,50 +25,49 @@ namespace calendarimporter;
 
 class DownloadHandler
 {
-	/**
-	 * Download the given vcf file.
-	 * @return bool
-	 */
-	public static function doDownload()
-	{
-		if (isset($_GET["token"])) {
-			$token = $_GET["token"];
-		} else {
-			return false;
-		}
+    /**
+     * Download the given vcf file.
+     */
+    public static function doDownload()
+    {
+        if (isset($_GET["token"])) {
+            $token = $_GET["token"];
+        } else {
+            return false;
+        }
 
-		if (isset($_GET["filename"])) {
-			$filename = $_GET["filename"];
-		} else {
-			return false;
-		}
+        if (isset($_GET["filename"])) {
+            $filename = $_GET["filename"];
+        } else {
+            return false;
+        }
 
-		// validate token
-		if (!ctype_alnum($token)) { // token is a md5 hash
-			return false;
-		}
+        // validate token
+        if (!ctype_alnum($token)) { // token is a md5 hash
+            return false;
+        }
 
-		$file = PLUGIN_CALENDARIMPORTER_TMP_UPLOAD . "ics_" . $token . ".ics";
+        $file = PLUGIN_CALENDARIMPORTER_TMP_UPLOAD . "ics_" . $token . ".ics";
 
-		if (!file_exists($file)) { // invalid token
-			return false;
-		}
+        if (!file_exists($file)) { // invalid token
+            return false;
+        }
 
-		// set headers here
-		header('Content-Disposition: attachment; filename="' . $filename . '"');
+        // set headers here
+        header('Content-Disposition: attachment; filename="' . $filename . '"');
 
-		// no caching
-		header('Expires: 0'); // set expiration time
-		header('Content-Description: File Transfer');
-		header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-		header('Content-Length: ' . filesize($file));
-		header('Content-Type: application/octet-stream');
-		header('Pragma: public');
-		flush();
+        // no caching
+        header('Expires: 0'); // set expiration time
+        header('Content-Description: File Transfer');
+        header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+        header('Content-Length: ' . filesize($file));
+        header('Content-Type: application/octet-stream');
+        header('Pragma: public');
+        flush();
 
-		// print the downloaded file
-		readfile($file);
-		ignore_user_abort(true);
-		unlink($file);
-	}
+        // print the downloaded file
+        readfile($file);
+        ignore_user_abort(true);
+        unlink($file);
+    }
 }
\ No newline at end of file
diff --git a/php/module.calendar.php b/php/module.calendar.php
index ea1f07f..7a4e3cc 100644
--- a/php/module.calendar.php
+++ b/php/module.calendar.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * module.calendar.php, zarafa calender to ics im/exporter
+ * module.calendar.php, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2014 Christoph Haas
+ * Copyright (C) 2012-2016 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,702 +28,699 @@ use Sabre\VObject;
 class CalendarModule extends Module
 {
 
-	private $DEBUG = true;    // enable error_log debugging
-
-	private $busystates = null;
-
-	private $labels = null;
-
-	private $attendeetype = null;
-
-	/**
-	 * @constructor
-	 * @param $id
-	 * @param $data
-	 */
-	public function __construct($id, $data)
-	{
-		parent::__construct($id, $data);
-
-		// init default timezone
-		date_default_timezone_set(PLUGIN_CALENDARIMPORTER_DEFAULT_TIMEZONE);
-
-		// init mappings
-		$this->busystates = array(
-			"FREE",
-			"TENTATIVE",
-			"BUSY",
-			"OOF"
-		);
-
-		$this->labels = array(
-			"NONE",
-			"IMPORTANT",
-			"WORK",
-			"PERSONAL",
-			"HOLIDAY",
-			"REQUIRED",
-			"TRAVEL REQUIRED",
-			"PREPARATION REQUIERED",
-			"BIRTHDAY",
-			"SPECIAL DATE",
-			"PHONE INTERVIEW"
-		);
-
-		$this->attendeetype = array(
-			"NON-PARTICIPANT", // needed as zarafa starts counting at 1
-			"REQ-PARTICIPANT",
-			"OPT-PARTICIPANT",
-			"NON-PARTICIPANT"
-		);
-	}
-
-	/**
-	 * Executes all the actions in the $data variable.
-	 * Exception part is used for authentication errors also
-	 * @return boolean true on success or false on failure.
-	 */
-	public function execute()
-	{
-		$result = false;
-
-		if (!$this->DEBUG) {
-			/* disable error printing - otherwise json communication might break... */
-			ini_set('display_errors', '0');
-		}
-
-		foreach ($this->data as $actionType => $actionData) {
-			if (isset($actionType)) {
-				try {
-					if ($this->DEBUG) {
-						error_log("exec: " . $actionType);
-					}
-					switch ($actionType) {
-						case "load":
-							$result = $this->loadCalendar($actionType, $actionData);
-							break;
-						case "export":
-							$result = $this->exportCalendar($actionType, $actionData);
-							break;
-						case "import":
-							$result = $this->importCalendar($actionType, $actionData);
-							break;
-						case "importattachment":
-							$result = $this->getAttachmentPath($actionType, $actionData);
-							break;
-						default:
-							$this->handleUnknownActionType($actionType);
-					}
-
-				} catch (MAPIException $e) {
-					if ($this->DEBUG) {
-						error_log("mapi exception: " . $e->getMessage());
-					}
-				} catch (Exception $e) {
-					if ($this->DEBUG) {
-						error_log("exception: " . $e->getMessage());
-					}
-				}
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Generates a random string with variable length.
-	 * @param $length the lenght of the generated string
-	 * @return string a random string
-	 */
-	private function randomstring($length = 6)
-	{
-		// $chars - all allowed charakters
-		$chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
-
-		srand((double)microtime() * 1000000);
-		$i = 0;
-		$pass = "";
-		while ($i < $length) {
-			$num = rand() % strlen($chars);
-			$tmp = substr($chars, $num, 1);
-			$pass = $pass . $tmp;
-			$i++;
-		}
-		return $pass;
-	}
-
-	/**
-	 * Get a property from the array.
-	 * @param $props
-	 * @param $propname
-	 * @return string
-	 */
-	private function getProp($props, $propname)
-	{
-		if (isset($props["props"][$propname])) {
-			return $props["props"][$propname];
-		}
-		return "";
-	}
-
-	private function getDurationStringFromMintues($minutes, $pos = false) {
-		$pos = $pos === true ? "+" : "-";
-		$str = $pos . "P";
-
-
-
-		// variables for holding values
-		$mins = intval($minutes);
-		$hours = 0;
-		$days  = 0;
-		$weeks = 0;
-
-		// calculations
-		if ( $mins >= 60 ) {
-			$hours = (int)($mins / 60);
-			$mins = $mins % 60;
-		}
-		if ( $hours >= 24 ) {
-			$days = (int)($hours / 24);
-			$hours = $hours % 60;
-		}
-		if ( $days >= 7 ) {
-			$weeks = (int)($days / 7);
-			$days = $days % 7;
-		}
-
-		// format result
-		if ( $weeks ) {
-			$str .= "{$weeks}W";
-		}
-		if ( $days ) {
-			$str .= "{$days}D";
-		}
-		if ( $hours ) {
-			$str .= "{$hours}H";
-		}
-		if ( $mins ) {
-			$str .= "{$mins}M";
-		}
-
-		return $str;
-	}
-
-	/**
-	 * The main export function, creates the ics file for download
-	 * @param $actionType
-	 * @param $actionData
-	 */
-	private function exportCalendar($actionType, $actionData)
-	{
-		// Get store id
-		$storeid = false;
-		if (isset($actionData["storeid"])) {
-			$storeid = $actionData["storeid"];
-		}
-
-		// Get records
-		$records = array();
-		if (isset($actionData["records"])) {
-			$records = $actionData["records"];
-		}
-
-		// Get folders
-		$folder = false;
-		if (isset($actionData["folder"])) {
-			$folder = $actionData["folder"];
-		}
-
-		$response = array();
-		$error = false;
-		$error_msg = "";
-
-		// write csv
-		$token = $this->randomstring(16);
-		$file = PLUGIN_CALENDARIMPORTER_TMP_UPLOAD . "ics_" . $token . ".ics";
-		file_put_contents($file, "");
-
-		$store = $GLOBALS["mapisession"]->openMessageStore(hex2bin($storeid));
-		if ($store) {
-			// load folder first
-			if ($folder !== false) {
-				$mapifolder = mapi_msgstore_openentry($store, hex2bin($folder));
-
-				$table = mapi_folder_getcontentstable($mapifolder);
-				$list = mapi_table_queryallrows($table, array(PR_ENTRYID));
-
-				foreach ($list as $item) {
-					$records[] = bin2hex($item[PR_ENTRYID]);
-				}
-			}
-
-			$vcalendar = new VObject\Component\VCalendar();
-
-			// Add static stuff to vcalendar
-			$vcalendar->add('METHOD', 'PUBLISH');
-			$vcalendar->add('X-WR-CALDESC', 'Exported Zarafa Calendar');
-			$vcalendar->add('X-WR-TIMEZONE', date_default_timezone_get());
-
-			// TODO: add VTIMEZONE object to ical.
-
-			for ($index = 0, $count = count($records); $index < $count; $index++) {
-				$message = mapi_msgstore_openentry($store, hex2bin($records[$index]));
-
-				// get message properties.
-				$properties = $GLOBALS['properties']->getAppointmentProperties();
-				$plaintext = true;
-				$messageProps = $GLOBALS['operations']->getMessageProps($store, $message, $properties, $plaintext);
-
-				$vevent = $vcalendar->add('VEVENT', [
-					'SUMMARY' => $this->getProp($messageProps, "subject"),
-					'DTSTART' => date_timestamp_set(new DateTime(), $this->getProp($messageProps, "startdate")),
-					'DTEND' => date_timestamp_set(new DateTime(), $this->getProp($messageProps, "duedate")),
-					'CREATED' => date_timestamp_set(new DateTime(), $this->getProp($messageProps, "creation_time")),
-					'LAST-MODIFIED' => date_timestamp_set(new DateTime(), $this->getProp($messageProps, "last_modification_time")),
-					'PRIORITY' => $this->getProp($messageProps, "importance"),
-					'X-MICROSOFT-CDO-INTENDEDSTATUS' => $this->busystates[intval($this->getProp($messageProps, "busystatus"))], // both seem to be valid...
-					'X-MICROSOFT-CDO-BUSYSTATUS' => $this->busystates[intval($this->getProp($messageProps, "busystatus"))], // both seem to be valid...
-					'X-ZARAFA-LABEL' => $this->labels[intval($this->getProp($messageProps, "label"))],
-					'CLASS' => $this->getProp($messageProps, "private") ? "PRIVATE" : "PUBLIC",
-					'COMMENT' => "eid:" . $records[$index]
-				]);
-
-				// Add organizer
-				$vevent->add('ORGANIZER','mailto:' . $this->getProp($messageProps, "sender_email_address"));
-				$vevent->ORGANIZER['CN'] = $this->getProp($messageProps, "sender_name");
-
-				// Add Attendees
-				if(isset($messageProps["recipients"]) && count($messageProps["recipients"]["item"]) > 0) {
-					foreach($messageProps["recipients"]["item"] as $attendee) {
-						$att = $vevent->add('ATTENDEE', "mailto:" . $this->getProp($attendee, "email_address"));
-						$att["CN"] = $this->getProp($attendee, "display_name");
-						$att["ROLE"] = $this->attendeetype[intval($this->getProp($attendee, "recipient_type"))];
-					}
-				}
-
-				// Add alarms
-				if(!empty($this->getProp($messageProps, "reminder")) && $this->getProp($messageProps, "reminder") == 1) {
-					$valarm = $vevent->add('VALARM', [
-						'ACTION' => 'DISPLAY',
-						'DESCRIPTION' => $this->getProp($messageProps, "subject") // reuse the event summary
-					]);
-
-					// Add trigger
-					$durationValue = $this->getDurationStringFromMintues($this->getProp($messageProps, "reminder_minutes"), false);
-					$valarm->add('TRIGGER', $durationValue); // default trigger type is duration (see 4.8.6.3)
-
-					/*
-					$valarm->add('TRIGGER', date_timestamp_set(new DateTime(), $this->getProp($messageProps, "reminder_time"))); // trigger type "DATE-TIME"
-					$valarm->TRIGGER['VALUE'] = 'DATE-TIME';
-					*/
-				}
-
-				// Add location
-				if(!empty($this->getProp($messageProps, "location"))) {
-					$vevent->add('LOCATION',$this->getProp($messageProps, "location"));
-				}
-
-				// Add description
-				$body = $this->getProp($messageProps, "isHTML") ? $this->getProp($messageProps, "html_body") : $this->getProp($messageProps, "body");
-				if(!empty($body)) {
-					$vevent->add('DESCRIPTION',$body);
-				}
-			}
-
-			// write combined ics file
-			file_put_contents($file, file_get_contents($file) . $vcalendar->serialize());
-		}
-
-		if (count($records) > 0) {
-			$response['status'] = true;
-			$response['download_token'] = $token;
-			$response['filename'] = count($records) . "events.ics";
-		} else {
-			$response['status'] = false;
-			$response['message'] = "No events found. Export skipped!";
-		}
-
-		$this->addActionData($actionType, $response);
-		$GLOBALS["bus"]->addData($this->getResponseData());
-	}
-
-	/**
-	 * The main import function, parses the uploaded ics file
-	 * @param $actionType
-	 * @param $actionData
-	 */
-	private function importCalendar($actionType, $actionData)
-	{
-		// Get uploaded vcf path
-		$icsfile = false;
-		if (isset($actionData["ics_filepath"])) {
-			$icsfile = $actionData["ics_filepath"];
-		}
-
-		// Get store id
-		$storeid = false;
-		if (isset($actionData["storeid"])) {
-			$storeid = $actionData["storeid"];
-		}
-
-		// Get folder entryid
-		$folderid = false;
-		if (isset($actionData["folderid"])) {
-			$folderid = $actionData["folderid"];
-		}
-
-		// Get uids
-		$uids = array();
-		if (isset($actionData["uids"])) {
-			$uids = $actionData["uids"];
-		}
-
-		$response = array();
-		$error = false;
-		$error_msg = "";
-
-		// parse the ics file a last time...
-		$parser = null;
-		try {
-			$parser = VObject\Reader::read(
-				fopen($icsfile,'r')
-			);
-		} catch (Exception $e) {
-			$error = true;
-			$error_msg = $e->getMessage();
-		}
-
-		$events = array();
-		if (count($parser->VEVENT) > 0) {
-			$events = $this->parseCalendarToArray($parser);
-			$store = $GLOBALS["mapisession"]->openMessageStore(hex2bin($storeid));
-			$folder = mapi_msgstore_openentry($store, hex2bin($folderid));
-
-			$importall = false;
-			if (count($uids) == count($events)) {
-				$importall = true;
-			}
-
-			$propValuesMAPI = array();
-			$properties = $GLOBALS['properties']->getAppointmentProperties();
-			// extend properties...
-			$properties["body"] = PR_BODY;
-
-			$count = 0;
-
-			// iterate through all events and import them :)
-			foreach ($events as $event) {
-				if (isset($event["startdate"]) && ($importall || in_array($event["internal_fields"]["event_uid"], $uids))) {
-
-					$message = mapi_folder_createmessage($folder);
-
-					// parse the arraykeys
-					foreach ($event as $key => $value) {
-						if ($key !== "internal_fields") {
-							if(isset($properties[$key])) {
-								$propValuesMAPI[$properties[$key]] = $value;
-							}
-						}
-					}
-
-					$propValuesMAPI[$properties["commonstart"]] = $propValuesMAPI[$properties["startdate"]];
-					$propValuesMAPI[$properties["commonend"]] = $propValuesMAPI[$properties["duedate"]];
-					$propValuesMAPI[$properties["duration"]] = ($propValuesMAPI[$properties["duedate"]] - $propValuesMAPI[$properties["startdate"]]) / 60; // Minutes needed
-					$propValuesMAPI[$properties["reminder"]] = false; // needed, overwritten if there is a timer
-
-					$propValuesMAPI[$properties["message_class"]] = "IPM.Appointment";
-					$propValuesMAPI[$properties["icon_index"]] = "1024";
-
-					// TODO: set attendees and alarms
-
-					mapi_setprops($message, $propValuesMAPI);
-					mapi_savechanges($message);
-					if ($this->DEBUG) {
-						error_log("New event added: \"" . $event["subject"] . "\".\n");
-					}
-					$count++;
-				}
-			}
-
-			$response['status'] = true;
-			$response['count'] = $count;
-			$response['message'] = "";
-
-		} else {
-			$response['status'] = false;
-			$response['count'] = 0;
-			$response['message'] = $error ? $error_msg : "ICS file empty!";
-		}
-
-		$this->addActionData($actionType, $response);
-		$GLOBALS["bus"]->addData($this->getResponseData());
-	}
-
-	/**
-	 * Store the file to a temporary directory, prepare it for oc upload
-	 * @param $actionType
-	 * @param $actionData
-	 * @private
-	 */
-	private function getAttachmentPath($actionType, $actionData)
-	{
-		// Get store id
-		$storeid = false;
-		if (isset($actionData["store"])) {
-			$storeid = $actionData["store"];
-		}
-
-		// Get message entryid
-		$entryid = false;
-		if (isset($actionData["entryid"])) {
-			$entryid = $actionData["entryid"];
-		}
-
-		// Check which type isset
-		$openType = "attachment";
-
-		// Get number of attachment which should be opened.
-		$attachNum = false;
-		if (isset($actionData["attachNum"])) {
-			$attachNum = $actionData["attachNum"];
-		}
-
-		// Check if storeid and entryid isset
-		if ($storeid && $entryid) {
-			// Open the store
-			$store = $GLOBALS["mapisession"]->openMessageStore(hex2bin($storeid));
-
-			if ($store) {
-				// Open the message
-				$message = mapi_msgstore_openentry($store, hex2bin($entryid));
-
-				if ($message) {
-					$attachment = false;
-
-					// Check if attachNum isset
-					if ($attachNum) {
-						// Loop through the attachNums, message in message in message ...
-						for ($i = 0; $i < (count($attachNum) - 1); $i++) {
-							// Open the attachment
-							$tempattach = mapi_message_openattach($message, (int)$attachNum[$i]);
-							if ($tempattach) {
-								// Open the object in the attachment
-								$message = mapi_attach_openobj($tempattach);
-							}
-						}
-
-						// Open the attachment
-						$attachment = mapi_message_openattach($message, (int)$attachNum[(count($attachNum) - 1)]);
-					}
-
-					// Check if the attachment is opened
-					if ($attachment) {
-
-						// Get the props of the attachment
-						$props = mapi_attach_getprops($attachment, array(PR_ATTACH_LONG_FILENAME, PR_ATTACH_MIME_TAG, PR_DISPLAY_NAME, PR_ATTACH_METHOD));
-						// Content Type
-						$contentType = "application/octet-stream";
-						// Filename
-						$filename = "ERROR";
-
-						// Set filename
-						if (isset($props[PR_ATTACH_LONG_FILENAME])) {
-							$filename = $props[PR_ATTACH_LONG_FILENAME];
-						} else {
-							if (isset($props[PR_ATTACH_FILENAME])) {
-								$filename = $props[PR_ATTACH_FILENAME];
-							} else {
-								if (isset($props[PR_DISPLAY_NAME])) {
-									$filename = $props[PR_DISPLAY_NAME];
-								}
-							}
-						}
-
-						// Set content type
-						if (isset($props[PR_ATTACH_MIME_TAG])) {
-							$contentType = $props[PR_ATTACH_MIME_TAG];
-						} else {
-							// Parse the extension of the filename to get the content type
-							if (strrpos($filename, ".") !== false) {
-								$extension = strtolower(substr($filename, strrpos($filename, ".")));
-								$contentType = "application/octet-stream";
-								if (is_readable("mimetypes.dat")) {
-									$fh = fopen("mimetypes.dat", "r");
-									$ext_found = false;
-									while (!feof($fh) && !$ext_found) {
-										$line = fgets($fh);
-										preg_match("/(\.[a-z0-9]+)[ \t]+([^ \t\n\r]*)/i", $line, $result);
-										if ($extension == $result[1]) {
-											$ext_found = true;
-											$contentType = $result[2];
-										}
-									}
-									fclose($fh);
-								}
-							}
-						}
-
-
-						$tmpname = tempnam(TMP_PATH, stripslashes($filename));
-
-						// Open a stream to get the attachment data
-						$stream = mapi_openpropertytostream($attachment, PR_ATTACH_DATA_BIN);
-						$stat = mapi_stream_stat($stream);
-						// File length =  $stat["cb"]
-
-						$fhandle = fopen($tmpname, 'w');
-						$buffer = null;
-						for ($i = 0; $i < $stat["cb"]; $i += BLOCK_SIZE) {
-							// Write stream
-							$buffer = mapi_stream_read($stream, BLOCK_SIZE);
-							fwrite($fhandle, $buffer, strlen($buffer));
-						}
-						fclose($fhandle);
-
-						$response = array();
-						$response['tmpname'] = $tmpname;
-						$response['filename'] = $filename;
-						$response['status'] = true;
-						$this->addActionData($actionType, $response);
-						$GLOBALS["bus"]->addData($this->getResponseData());
-					}
-				}
-			} else {
-				$response['status'] = false;
-				$response['message'] = "Store could not be opened!";
-				$this->addActionData($actionType, $response);
-				$GLOBALS["bus"]->addData($this->getResponseData());
-			}
-		} else {
-			$response['status'] = false;
-			$response['message'] = "Wrong call, store and entryid have to be set!";
-			$this->addActionData($actionType, $response);
-			$GLOBALS["bus"]->addData($this->getResponseData());
-		}
-	}
-
-	/**
-	 * Function that parses the uploaded ics file and posts it via json
-	 * @param $actionType
-	 * @param $actionData
-	 */
-	private function loadCalendar($actionType, $actionData)
-	{
-		$error = false;
-		$error_msg = "";
-
-		if (is_readable($actionData["ics_filepath"])) {
-			$parser = null;
-
-			try {
-				$parser = VObject\Reader::read(
-					fopen($actionData["ics_filepath"],'r')
-				);
-				//error_log(print_r($parser->VTIMEZONE, true));
-			} catch (Exception $e) {
-				$error = true;
-				$error_msg = $e->getMessage();
-			}
-			if ($error) {
-				$response['status'] = false;
-				$response['message'] = $error_msg;
-			} else {
-				if (count($parser->VEVENT) == 0) {
-					$response['status'] = false;
-					$response['message'] = "No event in ics file";
-				} else {
-					$response['status'] = true;
-					$response['parsed_file'] = $actionData["ics_filepath"];
-					$response['parsed'] = array(
-						'events' => $this->parseCalendarToArray($parser),
-						'timezone' => isset($parser->VTIMEZONE->TZID) ? (string)$parser->VTIMEZONE->TZID : (string)$parser->{'X-WR-TIMEZONE'},
-						'calendar' => (string)$parser->PRODID
-					);
-				}
-			}
-		} else {
-			$response['status'] = false;
-			$response['message'] = "File could not be read by server";
-		}
-
-		$this->addActionData($actionType, $response);
-		$GLOBALS["bus"]->addData($this->getResponseData());
-
-		if ($this->DEBUG) {
-			error_log("parsing done, bus data written!");
-		}
-	}
-
-	/**
-	 * Create a array with contacts
-	 *
-	 * @param {VObject} $calendar ics parser object
-	 * @return array parsed events
-	 * @private
-	 */
-	private function parseCalendarToArray($calendar)
-	{
-		$events = array();
-		foreach ($calendar->VEVENT as $Index => $vEvent) {
-			// Sabre\VObject\Parser\XML\Element\VEvent
-			$properties = array();
-
-			//uid - used for front/backend communication
-			$properties["internal_fields"] = array();
-			$properties["internal_fields"]["event_uid"] = base64_encode($Index . $vEvent->UID);
-
-			$properties["startdate"] = (string)$vEvent->DTSTART->getDateTime()->getTimestamp();
-			$properties["duedate"] = (string)$vEvent->DTEND->getDateTime()->getTimestamp();
-			$properties["location"] = (string)$vEvent->LOCATION;
-			$properties["subject"] = (string)$vEvent->SUMMARY;
-			$properties["body"] = (string)$vEvent->DESCRIPTION;
-			$properties["comment"] = (string)$vEvent->COMMENT;
-			$properties["timezone"] = (string)$vEvent->DTSTART["TZID"];
-			$properties["organizer"] = (string)$vEvent->ORGANIZER;
-			$properties["busystatus"] = array_search((string)$vEvent->{'X-MICROSOFT-CDO-INTENDEDSTATUS'}, $this->busystates); // X-MICROSOFT-CDO-BUSYSTATUS
-			$properties["transp"] = (string)$vEvent->TRANSP;
-			//$properties["trigger"] = (string)$vEvent->COMMENT;
-			$properties["priority"] = (string)$vEvent->PRIORITY;
-			$properties["private"] = ((string)$vEvent->CLASS) == "PRIVATE" ? true : false;
-			if(!empty((string)$vEvent->{'X-ZARAFA-LABEL'})) {
-				$properties["label"] = array_search((string)$vEvent->{'X-ZARAFA-LABEL'}, $this->labels);
-			}
-			$properties["last_modification_time"] = (string)$vEvent->{'LAST-MODIFIED'}->getDateTime()->getTimestamp();
-			$properties["creation_time"] = (string)$vEvent->CREATED->getDateTime()->getTimestamp();
-			$properties["rrule"] = (string)$vEvent->RRULE;
-
-			// Attendees
-			$properties["attendees"] = array();
-			if(isset($vEvent->ATTENDEE) && count($vEvent->ATTENDEE) > 0) {
-				foreach($vEvent->ATTENDEE as $attendee) {
-					$properties["attendees"][] = array(
-						"name" => (string)$attendee["CN"],
-						"mail" => (string)$attendee,
-						"status" => (string)$attendee["PARTSTAT"],
-						"role" => (string)$attendee["ROLE"]
-					);
-				}
-			}
-
-			// Alarms
-			$properties["alarms"] = array();
-			if(isset($vEvent->VALARM) && count($vEvent->VALARM) > 0) {
-				foreach($vEvent->VALARM as $alarm) {
-					$properties["alarms"][] = array(
-						"description" => (string)$alarm->DESCRIPTION,
-						"trigger" => (string)$alarm->TRIGGER,
-						"type" => (string)$alarm->TRIGGER["VALUE"]
-					);
-				}
-			}
-
-			array_push($events, $properties);
-		}
-
-		return $events;
-	}
+    private $DEBUG = false;    // enable error_log debugging
+
+    private $busystates = null;
+
+    private $labels = null;
+
+    private $attendeetype = null;
+
+    /**
+     * @constructor
+     * @param $id
+     * @param $data
+     */
+    public function __construct($id, $data)
+    {
+        parent::__construct($id, $data);
+
+        // init default timezone
+        date_default_timezone_set(PLUGIN_CALENDARIMPORTER_DEFAULT_TIMEZONE);
+
+        // init mappings
+        $this->busystates = array(
+            "FREE",
+            "TENTATIVE",
+            "BUSY",
+            "OOF"
+        );
+
+        $this->labels = array(
+            "NONE",
+            "IMPORTANT",
+            "WORK",
+            "PERSONAL",
+            "HOLIDAY",
+            "REQUIRED",
+            "TRAVEL REQUIRED",
+            "PREPARATION REQUIERED",
+            "BIRTHDAY",
+            "SPECIAL DATE",
+            "PHONE INTERVIEW"
+        );
+
+        $this->attendeetype = array(
+            "NON-PARTICIPANT", // needed as zarafa starts counting at 1
+            "REQ-PARTICIPANT",
+            "OPT-PARTICIPANT",
+            "NON-PARTICIPANT"
+        );
+    }
+
+    /**
+     * Executes all the actions in the $data variable.
+     * Exception part is used for authentication errors also
+     * @return boolean true on success or false on failure.
+     */
+    public function execute()
+    {
+        $result = false;
+
+        if (!$this->DEBUG) {
+            /* disable error printing - otherwise json communication might break... */
+            ini_set('display_errors', '0');
+        }
+
+        foreach ($this->data as $actionType => $actionData) {
+            if (isset($actionType)) {
+                try {
+                    if ($this->DEBUG) {
+                        error_log("exec: " . $actionType);
+                    }
+                    switch ($actionType) {
+                        case "load":
+                            $result = $this->loadCalendar($actionType, $actionData);
+                            break;
+                        case "export":
+                            $result = $this->exportCalendar($actionType, $actionData);
+                            break;
+                        case "import":
+                            $result = $this->importCalendar($actionType, $actionData);
+                            break;
+                        case "importattachment":
+                            $result = $this->getAttachmentPath($actionType, $actionData);
+                            break;
+                        default:
+                            $this->handleUnknownActionType($actionType);
+                    }
+
+                } catch (MAPIException $e) {
+                    if ($this->DEBUG) {
+                        error_log("mapi exception: " . $e->getMessage());
+                    }
+                } catch (Exception $e) {
+                    if ($this->DEBUG) {
+                        error_log("exception: " . $e->getMessage());
+                    }
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Generates a random string with variable length.
+     * @param $length the lenght of the generated string
+     * @return string a random string
+     */
+    private function randomstring($length = 6)
+    {
+        // $chars - all allowed charakters
+        $chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
+
+        srand((double)microtime() * 1000000);
+        $i = 0;
+        $pass = "";
+        while ($i < $length) {
+            $num = rand() % strlen($chars);
+            $tmp = substr($chars, $num, 1);
+            $pass = $pass . $tmp;
+            $i++;
+        }
+        return $pass;
+    }
+
+    /**
+     * Get a property from the array.
+     * @param $props
+     * @param $propname
+     * @return string
+     */
+    private function getProp($props, $propname)
+    {
+        if (isset($props["props"][$propname])) {
+            return $props["props"][$propname];
+        }
+        return "";
+    }
+
+    private function getDurationStringFromMintues($minutes, $pos = false)
+    {
+        $pos = $pos === true ? "+" : "-";
+        $str = $pos . "P";
+
+
+        // variables for holding values
+        $mins = intval($minutes);
+        $hours = 0;
+        $days = 0;
+        $weeks = 0;
+
+        // calculations
+        if ($mins >= 60) {
+            $hours = (int)($mins / 60);
+            $mins = $mins % 60;
+        }
+        if ($hours >= 24) {
+            $days = (int)($hours / 24);
+            $hours = $hours % 60;
+        }
+        if ($days >= 7) {
+            $weeks = (int)($days / 7);
+            $days = $days % 7;
+        }
+
+        // format result
+        if ($weeks) {
+            $str .= "{$weeks}W";
+        }
+        if ($days) {
+            $str .= "{$days}D";
+        }
+        if ($hours) {
+            $str .= "{$hours}H";
+        }
+        if ($mins) {
+            $str .= "{$mins}M";
+        }
+
+        return $str;
+    }
+
+    /**
+     * The main export function, creates the ics file for download
+     * @param $actionType
+     * @param $actionData
+     */
+    private function exportCalendar($actionType, $actionData)
+    {
+        // Get store id
+        $storeid = false;
+        if (isset($actionData["storeid"])) {
+            $storeid = $actionData["storeid"];
+        }
+
+        // Get records
+        $records = array();
+        if (isset($actionData["records"])) {
+            $records = $actionData["records"];
+        }
+
+        // Get folders
+        $folder = false;
+        if (isset($actionData["folder"])) {
+            $folder = $actionData["folder"];
+        }
+
+        $response = array();
+        $error = false;
+        $error_msg = "";
+
+        // write csv
+        $token = $this->randomstring(16);
+        $file = PLUGIN_CALENDARIMPORTER_TMP_UPLOAD . "ics_" . $token . ".ics";
+        file_put_contents($file, "");
+
+        $store = $GLOBALS["mapisession"]->openMessageStore(hex2bin($storeid));
+        if ($store) {
+            // load folder first
+            if ($folder !== false) {
+                $mapifolder = mapi_msgstore_openentry($store, hex2bin($folder));
+
+                $table = mapi_folder_getcontentstable($mapifolder);
+                $list = mapi_table_queryallrows($table, array(PR_ENTRYID));
+
+                foreach ($list as $item) {
+                    $records[] = bin2hex($item[PR_ENTRYID]);
+                }
+            }
+
+            $vcalendar = new VObject\Component\VCalendar();
+
+            // Add static stuff to vcalendar
+            $vcalendar->add('METHOD', 'PUBLISH');
+            $vcalendar->add('X-WR-CALDESC', 'Exported Zarafa Calendar');
+            $vcalendar->add('X-WR-TIMEZONE', date_default_timezone_get());
+
+            // TODO: add VTIMEZONE object to ical.
+
+            for ($index = 0, $count = count($records); $index < $count; $index++) {
+                $message = mapi_msgstore_openentry($store, hex2bin($records[$index]));
+
+                // get message properties.
+                $properties = $GLOBALS['properties']->getAppointmentProperties();
+                $plaintext = true;
+                $messageProps = $GLOBALS['operations']->getMessageProps($store, $message, $properties, $plaintext);
+
+                $vevent = $vcalendar->add('VEVENT', [
+                    'SUMMARY' => $this->getProp($messageProps, "subject"),
+                    'DTSTART' => date_timestamp_set(new DateTime(), $this->getProp($messageProps, "startdate")),
+                    'DTEND' => date_timestamp_set(new DateTime(), $this->getProp($messageProps, "duedate")),
+                    'CREATED' => date_timestamp_set(new DateTime(), $this->getProp($messageProps, "creation_time")),
+                    'LAST-MODIFIED' => date_timestamp_set(new DateTime(), $this->getProp($messageProps, "last_modification_time")),
+                    'PRIORITY' => $this->getProp($messageProps, "importance"),
+                    'X-MICROSOFT-CDO-INTENDEDSTATUS' => $this->busystates[intval($this->getProp($messageProps, "busystatus"))], // both seem to be valid...
+                    'X-MICROSOFT-CDO-BUSYSTATUS' => $this->busystates[intval($this->getProp($messageProps, "busystatus"))], // both seem to be valid...
+                    'X-ZARAFA-LABEL' => $this->labels[intval($this->getProp($messageProps, "label"))],
+                    'CLASS' => $this->getProp($messageProps, "private") ? "PRIVATE" : "PUBLIC",
+                    'COMMENT' => "eid:" . $records[$index]
+                ]);
+
+                // Add organizer
+                $vevent->add('ORGANIZER', 'mailto:' . $this->getProp($messageProps, "sender_email_address"));
+                $vevent->ORGANIZER['CN'] = $this->getProp($messageProps, "sender_name");
+
+                // Add Attendees
+                if (isset($messageProps["recipients"]) && count($messageProps["recipients"]["item"]) > 0) {
+                    foreach ($messageProps["recipients"]["item"] as $attendee) {
+                        $att = $vevent->add('ATTENDEE', "mailto:" . $this->getProp($attendee, "email_address"));
+                        $att["CN"] = $this->getProp($attendee, "display_name");
+                        $att["ROLE"] = $this->attendeetype[intval($this->getProp($attendee, "recipient_type"))];
+                    }
+                }
+
+                // Add alarms
+                if (!empty($this->getProp($messageProps, "reminder")) && $this->getProp($messageProps, "reminder") == 1) {
+                    $valarm = $vevent->add('VALARM', [
+                        'ACTION' => 'DISPLAY',
+                        'DESCRIPTION' => $this->getProp($messageProps, "subject") // reuse the event summary
+                    ]);
+
+                    // Add trigger
+                    $durationValue = $this->getDurationStringFromMintues($this->getProp($messageProps, "reminder_minutes"), false);
+                    $valarm->add('TRIGGER', $durationValue); // default trigger type is duration (see 4.8.6.3)
+
+                    /*
+                    $valarm->add('TRIGGER', date_timestamp_set(new DateTime(), $this->getProp($messageProps, "reminder_time"))); // trigger type "DATE-TIME"
+                    $valarm->TRIGGER['VALUE'] = 'DATE-TIME';
+                    */
+                }
+
+                // Add location
+                if (!empty($this->getProp($messageProps, "location"))) {
+                    $vevent->add('LOCATION', $this->getProp($messageProps, "location"));
+                }
+
+                // Add description
+                $body = $this->getProp($messageProps, "isHTML") ? $this->getProp($messageProps, "html_body") : $this->getProp($messageProps, "body");
+                if (!empty($body)) {
+                    $vevent->add('DESCRIPTION', $body);
+                }
+            }
+
+            // write combined ics file
+            file_put_contents($file, file_get_contents($file) . $vcalendar->serialize());
+        }
+
+        if (count($records) > 0) {
+            $response['status'] = true;
+            $response['download_token'] = $token;
+            // TRANSLATORS: Filename suffix for exported files
+            $response['filename'] = count($records) . dgettext("plugin_calendarimporter", "_events.ics");
+        } else {
+            $response['status'] = false;
+            $response['message'] = dgettext("plugin_calendarimporter", "No events found. Export skipped!");
+        }
+
+        $this->addActionData($actionType, $response);
+        $GLOBALS["bus"]->addData($this->getResponseData());
+    }
+
+    /**
+     * The main import function, parses the uploaded ics file
+     * @param $actionType
+     * @param $actionData
+     */
+    private function importCalendar($actionType, $actionData)
+    {
+        // Get uploaded vcf path
+        $icsfile = false;
+        if (isset($actionData["ics_filepath"])) {
+            $icsfile = $actionData["ics_filepath"];
+        }
+
+        // Get store id
+        $storeid = false;
+        if (isset($actionData["storeid"])) {
+            $storeid = $actionData["storeid"];
+        }
+
+        // Get folder entryid
+        $folderid = false;
+        if (isset($actionData["folderid"])) {
+            $folderid = $actionData["folderid"];
+        }
+
+        // Get uids
+        $uids = array();
+        if (isset($actionData["uids"])) {
+            $uids = $actionData["uids"];
+        }
+
+        $response = array();
+        $error = false;
+        $error_msg = "";
+
+        // parse the ics file a last time...
+        $parser = null;
+        try {
+            $parser = VObject\Reader::read(
+                fopen($icsfile, 'r')
+            );
+        } catch (Exception $e) {
+            $error = true;
+            $error_msg = $e->getMessage();
+        }
+
+        $events = array();
+        if (count($parser->VEVENT) > 0) {
+            $events = $this->parseCalendarToArray($parser);
+            $store = $GLOBALS["mapisession"]->openMessageStore(hex2bin($storeid));
+            $folder = mapi_msgstore_openentry($store, hex2bin($folderid));
+
+            $importall = false;
+            if (count($uids) == count($events)) {
+                $importall = true;
+            }
+
+            $propValuesMAPI = array();
+            $properties = $GLOBALS['properties']->getAppointmentProperties();
+            // extend properties...
+            $properties["body"] = PR_BODY;
+
+            $count = 0;
+
+            // iterate through all events and import them :)
+            foreach ($events as $event) {
+                if (isset($event["startdate"]) && ($importall || in_array($event["internal_fields"]["event_uid"], $uids))) {
+
+                    $message = mapi_folder_createmessage($folder);
+
+                    // parse the arraykeys
+                    foreach ($event as $key => $value) {
+                        if ($key !== "internal_fields") {
+                            if (isset($properties[$key])) {
+                                $propValuesMAPI[$properties[$key]] = $value;
+                            }
+                        }
+                    }
+
+                    $propValuesMAPI[$properties["commonstart"]] = $propValuesMAPI[$properties["startdate"]];
+                    $propValuesMAPI[$properties["commonend"]] = $propValuesMAPI[$properties["duedate"]];
+                    $propValuesMAPI[$properties["duration"]] = ($propValuesMAPI[$properties["duedate"]] - $propValuesMAPI[$properties["startdate"]]) / 60; // Minutes needed
+                    $propValuesMAPI[$properties["reminder"]] = false; // needed, overwritten if there is a timer
+
+                    $propValuesMAPI[$properties["message_class"]] = "IPM.Appointment";
+                    $propValuesMAPI[$properties["icon_index"]] = "1024";
+
+                    // TODO: set attendees and alarms
+
+                    mapi_setprops($message, $propValuesMAPI);
+                    mapi_savechanges($message);
+                    if ($this->DEBUG) {
+                        error_log("New event added: \"" . $event["subject"] . "\".\n");
+                    }
+                    $count++;
+                }
+            }
+
+            $response['status'] = true;
+            $response['count'] = $count;
+            $response['message'] = "";
+
+        } else {
+            $response['status'] = false;
+            $response['count'] = 0;
+            $response['message'] = $error ? $error_msg : dgettext("plugin_calendarimporter", "ICS file empty!");
+        }
+
+        $this->addActionData($actionType, $response);
+        $GLOBALS["bus"]->addData($this->getResponseData());
+    }
+
+    /**
+     * Store the file to a temporary directory, prepare it for oc upload
+     * @param $actionType
+     * @param $actionData
+     * @private
+     */
+    private function getAttachmentPath($actionType, $actionData)
+    {
+        // Get store id
+        $storeid = false;
+        if (isset($actionData["store"])) {
+            $storeid = $actionData["store"];
+        }
+
+        // Get message entryid
+        $entryid = false;
+        if (isset($actionData["entryid"])) {
+            $entryid = $actionData["entryid"];
+        }
+
+        // Check which type isset
+        $openType = "attachment";
+
+        // Get number of attachment which should be opened.
+        $attachNum = false;
+        if (isset($actionData["attachNum"])) {
+            $attachNum = $actionData["attachNum"];
+        }
+
+        // Check if storeid and entryid isset
+        if ($storeid && $entryid) {
+            // Open the store
+            $store = $GLOBALS["mapisession"]->openMessageStore(hex2bin($storeid));
+
+            if ($store) {
+                // Open the message
+                $message = mapi_msgstore_openentry($store, hex2bin($entryid));
+
+                if ($message) {
+                    $attachment = false;
+
+                    // Check if attachNum isset
+                    if ($attachNum) {
+                        // Loop through the attachNums, message in message in message ...
+                        for ($i = 0; $i < (count($attachNum) - 1); $i++) {
+                            // Open the attachment
+                            $tempattach = mapi_message_openattach($message, (int)$attachNum[$i]);
+                            if ($tempattach) {
+                                // Open the object in the attachment
+                                $message = mapi_attach_openobj($tempattach);
+                            }
+                        }
+
+                        // Open the attachment
+                        $attachment = mapi_message_openattach($message, (int)$attachNum[(count($attachNum) - 1)]);
+                    }
+
+                    // Check if the attachment is opened
+                    if ($attachment) {
+
+                        // Get the props of the attachment
+                        $props = mapi_attach_getprops($attachment, array(PR_ATTACH_LONG_FILENAME, PR_ATTACH_MIME_TAG, PR_DISPLAY_NAME, PR_ATTACH_METHOD));
+                        // Content Type
+                        $contentType = "application/octet-stream";
+                        // Filename
+                        $filename = "ERROR";
+
+                        // Set filename
+                        if (isset($props[PR_ATTACH_LONG_FILENAME])) {
+                            $filename = $props[PR_ATTACH_LONG_FILENAME];
+                        } else {
+                            if (isset($props[PR_ATTACH_FILENAME])) {
+                                $filename = $props[PR_ATTACH_FILENAME];
+                            } else {
+                                if (isset($props[PR_DISPLAY_NAME])) {
+                                    $filename = $props[PR_DISPLAY_NAME];
+                                }
+                            }
+                        }
+
+                        // Set content type
+                        if (isset($props[PR_ATTACH_MIME_TAG])) {
+                            $contentType = $props[PR_ATTACH_MIME_TAG];
+                        } else {
+                            // Parse the extension of the filename to get the content type
+                            if (strrpos($filename, ".") !== false) {
+                                $extension = strtolower(substr($filename, strrpos($filename, ".")));
+                                $contentType = "application/octet-stream";
+                                if (is_readable("mimetypes.dat")) {
+                                    $fh = fopen("mimetypes.dat", "r");
+                                    $ext_found = false;
+                                    while (!feof($fh) && !$ext_found) {
+                                        $line = fgets($fh);
+                                        preg_match("/(\.[a-z0-9]+)[ \t]+([^ \t\n\r]*)/i", $line, $result);
+                                        if ($extension == $result[1]) {
+                                            $ext_found = true;
+                                            $contentType = $result[2];
+                                        }
+                                    }
+                                    fclose($fh);
+                                }
+                            }
+                        }
+
+
+                        $tmpname = tempnam(TMP_PATH, stripslashes($filename));
+
+                        // Open a stream to get the attachment data
+                        $stream = mapi_openpropertytostream($attachment, PR_ATTACH_DATA_BIN);
+                        $stat = mapi_stream_stat($stream);
+                        // File length =  $stat["cb"]
+
+                        $fhandle = fopen($tmpname, 'w');
+                        $buffer = null;
+                        for ($i = 0; $i < $stat["cb"]; $i += BLOCK_SIZE) {
+                            // Write stream
+                            $buffer = mapi_stream_read($stream, BLOCK_SIZE);
+                            fwrite($fhandle, $buffer, strlen($buffer));
+                        }
+                        fclose($fhandle);
+
+                        $response = array();
+                        $response['tmpname'] = $tmpname;
+                        $response['filename'] = $filename;
+                        $response['status'] = true;
+                        $this->addActionData($actionType, $response);
+                        $GLOBALS["bus"]->addData($this->getResponseData());
+                    }
+                }
+            } else {
+                $response['status'] = false;
+                $response['message'] = dgettext("plugin_calendarimporter", "Store could not be opened!");
+                $this->addActionData($actionType, $response);
+                $GLOBALS["bus"]->addData($this->getResponseData());
+            }
+        } else {
+            $response['status'] = false;
+            $response['message'] = dgettext("plugin_calendarimporter", "Wrong call, store and entryid have to be set!");
+            $this->addActionData($actionType, $response);
+            $GLOBALS["bus"]->addData($this->getResponseData());
+        }
+    }
+
+    /**
+     * Function that parses the uploaded ics file and posts it via json
+     * @param $actionType
+     * @param $actionData
+     */
+    private function loadCalendar($actionType, $actionData)
+    {
+        $error = false;
+        $error_msg = "";
+
+        if (is_readable($actionData["ics_filepath"])) {
+            $parser = null;
+
+            try {
+                $parser = VObject\Reader::read(
+                    fopen($actionData["ics_filepath"], 'r')
+                );
+                //error_log(print_r($parser->VTIMEZONE, true));
+            } catch (Exception $e) {
+                $error = true;
+                $error_msg = $e->getMessage();
+            }
+            if ($error) {
+                $response['status'] = false;
+                $response['message'] = $error_msg;
+            } else {
+                if (count($parser->VEVENT) == 0) {
+                    $response['status'] = false;
+                    $response['message'] = dgettext("plugin_calendarimporter", "No event in ics file");
+                } else {
+                    $response['status'] = true;
+                    $response['parsed_file'] = $actionData["ics_filepath"];
+                    $response['parsed'] = array(
+                        'events' => $this->parseCalendarToArray($parser),
+                        'timezone' => isset($parser->VTIMEZONE->TZID) ? (string)$parser->VTIMEZONE->TZID : (string)$parser->{'X-WR-TIMEZONE'},
+                        'calendar' => (string)$parser->PRODID
+                    );
+                }
+            }
+        } else {
+            $response['status'] = false;
+            $response['message'] = dgettext("plugin_calendarimporter", "File could not be read by server");
+        }
+
+        $this->addActionData($actionType, $response);
+        $GLOBALS["bus"]->addData($this->getResponseData());
+
+        if ($this->DEBUG) {
+            error_log("parsing done, bus data written!");
+        }
+    }
+
+    /**
+     * Create a array with contacts
+     *
+     * @param {VObject} $calendar ics parser object
+     * @return array parsed events
+     * @private
+     */
+    private function parseCalendarToArray($calendar)
+    {
+        $events = array();
+        foreach ($calendar->VEVENT as $Index => $vEvent) {
+            // Sabre\VObject\Parser\XML\Element\VEvent
+            $properties = array();
+
+            //uid - used for front/backend communication
+            $properties["internal_fields"] = array();
+            $properties["internal_fields"]["event_uid"] = base64_encode($Index . $vEvent->UID);
+
+            $properties["startdate"] = (string)$vEvent->DTSTART->getDateTime()->getTimestamp();
+            $properties["duedate"] = (string)$vEvent->DTEND->getDateTime()->getTimestamp();
+            $properties["location"] = (string)$vEvent->LOCATION;
+            $properties["subject"] = (string)$vEvent->SUMMARY;
+            $properties["body"] = (string)$vEvent->DESCRIPTION;
+            $properties["comment"] = (string)$vEvent->COMMENT;
+            $properties["timezone"] = (string)$vEvent->DTSTART["TZID"];
+            $properties["organizer"] = (string)$vEvent->ORGANIZER;
+            $properties["busystatus"] = array_search((string)$vEvent->{'X-MICROSOFT-CDO-INTENDEDSTATUS'}, $this->busystates); // X-MICROSOFT-CDO-BUSYSTATUS
+            $properties["transp"] = (string)$vEvent->TRANSP;
+            //$properties["trigger"] = (string)$vEvent->COMMENT;
+            $properties["priority"] = (string)$vEvent->PRIORITY;
+            $properties["private"] = ((string)$vEvent->CLASS) == "PRIVATE" ? true : false;
+            if (!empty((string)$vEvent->{'X-ZARAFA-LABEL'})) {
+                $properties["label"] = array_search((string)$vEvent->{'X-ZARAFA-LABEL'}, $this->labels);
+            }
+            $properties["last_modification_time"] = (string)$vEvent->{'LAST-MODIFIED'}->getDateTime()->getTimestamp();
+            $properties["creation_time"] = (string)$vEvent->CREATED->getDateTime()->getTimestamp();
+            $properties["rrule"] = (string)$vEvent->RRULE;
+
+            // Attendees
+            $properties["attendees"] = array();
+            if (isset($vEvent->ATTENDEE) && count($vEvent->ATTENDEE) > 0) {
+                foreach ($vEvent->ATTENDEE as $attendee) {
+                    $properties["attendees"][] = array(
+                        "name" => (string)$attendee["CN"],
+                        "mail" => (string)$attendee,
+                        "status" => (string)$attendee["PARTSTAT"],
+                        "role" => (string)$attendee["ROLE"]
+                    );
+                }
+            }
+
+            // Alarms
+            $properties["alarms"] = array();
+            if (isset($vEvent->VALARM) && count($vEvent->VALARM) > 0) {
+                foreach ($vEvent->VALARM as $alarm) {
+                    $properties["alarms"][] = array(
+                        "description" => (string)$alarm->DESCRIPTION,
+                        "trigger" => (string)$alarm->TRIGGER,
+                        "type" => (string)$alarm->TRIGGER["VALUE"]
+                    );
+                }
+            }
+
+            array_push($events, $properties);
+        }
+
+        return $events;
+    }
 }
-
-;
-
-?>
diff --git a/php/plugin.calendarimporter.php b/php/plugin.calendarimporter.php
index bd8aec5..ff54fc0 100644
--- a/php/plugin.calendarimporter.php
+++ b/php/plugin.calendarimporter.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * plugin.calendarimporter.php, zarafa calender to ics im/exporter
+ * plugin.calendarimporter.php, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2014 Christoph Haas
+ * Copyright (C) 2012-2016 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,65 +30,65 @@ require_once __DIR__ . "/download.php";
  */
 class Plugincalendarimporter extends Plugin
 {
-	/**
-	 * Constructor
-	 */
-	function __construct() {}
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+    }
 
-	/**
-	 * Function initializes the Plugin and registers all hooks
-	 *
-	 * @return void
-	 */
-	function init()
-	{
-		$this->registerHook('server.core.settings.init.before');
-		$this->registerHook('server.index.load.custom');
-	}
+    /**
+     * Function initializes the Plugin and registers all hooks
+     *
+     * @return void
+     */
+    function init()
+    {
+        $this->registerHook('server.core.settings.init.before');
+        $this->registerHook('server.index.load.custom');
+    }
 
-	/**
-	 * Function is executed when a hook is triggered by the PluginManager
-	 *
-	 * @param string $eventID the id of the triggered hook
-	 * @param mixed $data object(s) related to the hook
-	 * @return void
-	 */
-	function execute($eventID, &$data)
-	{
-		switch ($eventID) {
-			case 'server.core.settings.init.before' :
-				$this->injectPluginSettings($data);
-				break;
-			case 'server.index.load.custom':
-				if ($data['name'] == 'download_ics') {
-					calendarimporter\DownloadHandler::doDownload();
-				}
-				break;
-		}
-	}
+    /**
+     * Function is executed when a hook is triggered by the PluginManager
+     *
+     * @param string $eventID the id of the triggered hook
+     * @param mixed $data object(s) related to the hook
+     * @return void
+     */
+    function execute($eventID, &$data)
+    {
+        switch ($eventID) {
+            case 'server.core.settings.init.before' :
+                $this->injectPluginSettings($data);
+                break;
+            case 'server.index.load.custom':
+                if ($data['name'] == 'download_ics') {
+                    calendarimporter\DownloadHandler::doDownload();
+                }
+                break;
+        }
+    }
 
-	/**
-	 * Called when the core Settings class is initialized and ready to accept sysadmin default
-	 * settings.
-	 * @param Array $data Reference to the data of the triggered hook
-	 */
-	function injectPluginSettings(&$data)
-	{
-		$data['settingsObj']->addSysAdminDefaults(Array(
-			'zarafa' => Array(
-				'v1' => Array(
-					'plugins' => Array(
-						'calendarimporter' => Array(
-							'enable' => PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE,
-							'enable_sync' => PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE_SYNC,
-							'default_calendar' => PLUGIN_CALENDARIMPORTER_DEFAULT,
-							'default_timezone' => PLUGIN_CALENDARIMPORTER_DEFAULT_TIMEZONE
-						)
-					)
-				)
-			)
-		));
-	}
+    /**
+     * Called when the core Settings class is initialized and ready to accept sysadmin default
+     * settings.
+     * @param Array $data Reference to the data of the triggered hook
+     */
+    function injectPluginSettings(&$data)
+    {
+        $data['settingsObj']->addSysAdminDefaults(Array(
+            'zarafa' => Array(
+                'v1' => Array(
+                    'plugins' => Array(
+                        'calendarimporter' => Array(
+                            'enable' => PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE,
+                            'enable_sync' => PLUGIN_CALENDARIMPORTER_USER_DEFAULT_ENABLE_SYNC,
+                            'default_calendar' => PLUGIN_CALENDARIMPORTER_DEFAULT,
+                            'default_timezone' => PLUGIN_CALENDARIMPORTER_DEFAULT_TIMEZONE
+                        )
+                    )
+                )
+            )
+        ));
+    }
 }
-
-?>
diff --git a/php/upload.php b/php/upload.php
index 1410bcf..bd5f928 100644
--- a/php/upload.php
+++ b/php/upload.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * upload.php, zarafa calender to ics exporter
+ * upload.php, Kopano calender to ics im/exporter
  *
  * Author: Christoph Haas <christoph.h@sprinternet.at>
- * Copyright (C) 2012-2014 Christoph Haas
+ * Copyright (C) 2012-2016 Christoph Haas
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,18 +20,19 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
- 
+
 require_once("../config.php");
 
 /* disable error printing - otherwise json communication might break... */
 ini_set('display_errors', '0');
 
- /**
-  * respond/echo JSON
-  * @param $arr 
-  */
-function respondJSON($arr) {
-	echo json_encode($arr);
+/**
+ * respond/echo JSON
+ * @param $arr
+ */
+function respondJSON($arr)
+{
+    echo json_encode($arr);
 }
 
 /**
@@ -39,34 +40,34 @@ function respondJSON($arr) {
  * @param $length the lenght of the generated string
  * @return string a random string
  */
-function randomstring($length = 6) {
-	// $chars - all allowed charakters
-	$chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
+function randomstring($length = 6)
+{
+    // $chars - all allowed charakters
+    $chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
 
-	srand((double)microtime()*1000000);
-	$i = 0;
-	$pass = "";
-	while ($i < $length) {
-		$num = rand() % strlen($chars);
-		$tmp = substr($chars, $num, 1);
-		$pass = $pass . $tmp;
-		$i++;
-	}
-	return $pass;
+    srand((double)microtime() * 1000000);
+    $i = 0;
+    $pass = "";
+    while ($i < $length) {
+        $num = rand() % strlen($chars);
+        $tmp = substr($chars, $num, 1);
+        $pass = $pass . $tmp;
+        $i++;
+    }
+    return $pass;
 }
 
 $destpath = PLUGIN_CALENDARIMPORTER_TMP_UPLOAD;
 $destpath .= $_FILES['icsdata']['name'] . randomstring();
 
-if(is_readable ($_FILES['icsdata']['tmp_name'])) {
-	$result = move_uploaded_file($_FILES['icsdata']['tmp_name'],$destpath);
-	
-	if($result) {
-		respondJSON(array ('success'=>true, 'ics_file'=>$destpath));
-	} else {
-		respondJSON(array ('success'=>false,'error'=>"File could not be moved to TMP path! Check plugin config and folder permissions!"));
-	}
+if (is_readable($_FILES['icsdata']['tmp_name'])) {
+    $result = move_uploaded_file($_FILES['icsdata']['tmp_name'], $destpath);
+
+    if ($result) {
+        respondJSON(array('success' => true, 'ics_file' => $destpath));
+    } else {
+        respondJSON(array('success' => false, 'error' => dgettext("plugin_calendarimporter", "File could not be moved to TMP path! Check plugin config and folder permissions!")));
+    }
 } else {
-	respondJSON(array ('success'=>false,'error'=>"File could not be read by server, upload error!"));
-}
-?>
\ No newline at end of file
+    respondJSON(array('success' => false, 'error' => dgettext("plugin_calendarimporter", "File could not be read by server, upload error!")));
+}
\ No newline at end of file