diff --git a/language/de_DE.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/de_DE.UTF-8/LC_MESSAGES/plugin_mdm.po
index a135296..88c3341 100644
--- a/language/de_DE.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/de_DE.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KC-8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-13 10:48+0000\n"
+"POT-Creation-Date: 2018-02-12 15:34+0100\n"
 "PO-Revision-Date: 2018-01-26 15:49+0100\n"
 "Last-Translator: Jan Engelhardt <jengelh@inai.de>\n"
 "Language-Team: German <http://translate.kopano.io/projects/kopano/kopano-"
@@ -35,7 +35,7 @@ msgstr "Komplette Resynchronisation im Gange"
 msgid "Not Applicable"
 msgstr "Nicht anwendbar"
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr "Ok"
 
@@ -51,7 +51,149 @@ msgstr "Löschauftrag angefordert"
 msgid "Wipe Executed"
 msgstr "Löschauftrag ausgeführt"
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+#, fuzzy
+msgid "Not Available"
+msgstr "Nicht anwendbar"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr "Gerät"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr "User Agent"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+#, fuzzy
+msgid "Last updated"
+msgstr "Letzte Aktualisierung"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr "Mobile Device Management"
 
@@ -71,14 +213,6 @@ msgstr "Geräte"
 msgid "No devices connected to your account"
 msgstr "Es sind keine Geräte mit Ihrem Account verbunden"
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr "Gerät"
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr "User Agent"
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr "Status des Provisioning"
@@ -119,11 +253,11 @@ msgstr "Gerät entfernen"
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr "Kopano WebApp"
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
@@ -131,28 +265,52 @@ msgstr ""
 "Möchten Sie wirklich Ihre Gerät löschen?\n"
 " Bitte geben Sie Ihr Passwort zur Bestätigung ein."
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr "Etwas ging schief."
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr "Konnte nicht mit dem Z-Push Server verbinden. Nicht berechtigt."
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr ""
 "Konnte nicht mit dem Z-Push Server verbinden. Konnte keine Verbindung zum "
 "Host herstellen."
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr "Konnte nicht mit dem Z-Push Server verbinden. Nicht gefunden."
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr "Geräte ID konnte nicht gefunden werden"
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr "Etwas ging schief"
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""
diff --git a/language/es_CA.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/es_CA.UTF-8/LC_MESSAGES/plugin_mdm.po
index 98870eb..4dd54fc 100644
--- a/language/es_CA.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/es_CA.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -19,7 +19,7 @@ msgstr ""
 msgid "Not Applicable"
 msgstr ""
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr ""
 
@@ -35,7 +35,147 @@ msgstr ""
 msgid "Wipe Executed"
 msgstr ""
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+msgid "Not Available"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+msgid "Last updated"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr ""
 
@@ -55,14 +195,6 @@ msgstr ""
 msgid "No devices connected to your account"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr ""
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr ""
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr ""
@@ -103,36 +235,60 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""
diff --git a/language/fi_FI.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/fi_FI.UTF-8/LC_MESSAGES/plugin_mdm.po
index 98870eb..4dd54fc 100644
--- a/language/fi_FI.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/fi_FI.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -19,7 +19,7 @@ msgstr ""
 msgid "Not Applicable"
 msgstr ""
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr ""
 
@@ -35,7 +35,147 @@ msgstr ""
 msgid "Wipe Executed"
 msgstr ""
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+msgid "Not Available"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+msgid "Last updated"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr ""
 
@@ -55,14 +195,6 @@ msgstr ""
 msgid "No devices connected to your account"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr ""
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr ""
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr ""
@@ -103,36 +235,60 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""
diff --git a/language/fr_FR.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/fr_FR.UTF-8/LC_MESSAGES/plugin_mdm.po
index 01321f0..5ab3159 100644
--- a/language/fr_FR.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/fr_FR.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-03 17:53+0000\n"
+"POT-Creation-Date: 2018-02-12 15:34+0100\n"
 "PO-Revision-Date: 2016-08-03 19:35+0000\n"
 "Last-Translator: Raphaël <info@mathelpc.ch>\n"
 "Language-Team: French <http://translate.kopano.io/projects/kopano/mdm/fr/>\n"
@@ -34,7 +34,7 @@ msgstr ""
 msgid "Not Applicable"
 msgstr ""
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr "Ok"
 
@@ -50,7 +50,147 @@ msgstr ""
 msgid "Wipe Executed"
 msgstr ""
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+msgid "Not Available"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+msgid "Last updated"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr ""
 
@@ -70,14 +210,6 @@ msgstr ""
 msgid "No devices connected to your account"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr ""
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr ""
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr ""
@@ -118,36 +250,60 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr "WebApp Kopano"
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""
diff --git a/language/hu_HU.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/hu_HU.UTF-8/LC_MESSAGES/plugin_mdm.po
index ebd4267..2192092 100644
--- a/language/hu_HU.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/hu_HU.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-11 22:26+0000\n"
+"POT-Creation-Date: 2018-02-12 15:34+0100\n"
 "PO-Revision-Date: 2016-08-15 13:16+0000\n"
 "Last-Translator: Zoltan <zoltan.kiss@serverside.hu>\n"
 "Language-Team: Hungarian <http://translate.kopano.io/projects/kopano/kopano-"
@@ -35,7 +35,7 @@ msgstr "Teljes újraszinkronizálás folyamatban"
 msgid "Not Applicable"
 msgstr "Nem alkalmazható"
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr "Ok"
 
@@ -51,7 +51,149 @@ msgstr "Eszköz törlése kérvényezve"
 msgid "Wipe Executed"
 msgstr "Törlés elindítva"
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+#, fuzzy
+msgid "Not Available"
+msgstr "Nem alkalmazható"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr "Eszköz"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr "Felhasználói ügynök"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+#, fuzzy
+msgid "Last updated"
+msgstr "Utolsó frissítés"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr "Mobil eszköz kezelő"
 
@@ -71,14 +213,6 @@ msgstr "Eszközök"
 msgid "No devices connected to your account"
 msgstr "Nincsenek eszközök kapcsolva a fiókjához"
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr "Eszköz"
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr "Felhasználói ügynök"
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr ""
@@ -119,11 +253,11 @@ msgstr "Eszköz eltávolítása"
 msgid "Refresh"
 msgstr "Frissítés"
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr "Kopano WebApp"
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
@@ -131,30 +265,54 @@ msgstr ""
 "Biztosan törölni szeretne minden adatot az eszközről?\n"
 " Adja meg a jelszavát a folytatáshoz!"
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr "Hoppá! Valami hiba történt."
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr ""
 "Nem sikerült csatlakozni a Z-Push szerverhez. Nem megfelelő hitelesítési "
 "adatok."
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr ""
 "Nem sikerült csatlakozni a Z-Push szerverhez. Nem sikerült csatlakozni a "
 "szerverhez."
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr "Nem sikerült csatlakozni a Z-Push szerverhez. A szerver nem található."
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr "Az eszközazonosító nem található"
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr "Hoppá! Valami hiba történt."
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""
diff --git a/language/it_IT.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/it_IT.UTF-8/LC_MESSAGES/plugin_mdm.po
index 6b65969..3659045 100644
--- a/language/it_IT.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/it_IT.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-10 13:56+0000\n"
+"POT-Creation-Date: 2018-02-12 15:34+0100\n"
 "PO-Revision-Date: 2016-11-10 14:07+0000\n"
 "Last-Translator: Michele <m.brodoloni@casalicomputers.com>\n"
 "Language-Team: Italian <http://translate.kopano.io/projects/kopano/mdm/it/>\n"
@@ -34,7 +34,7 @@ msgstr "Resync completo in corso"
 msgid "Not Applicable"
 msgstr "Non applicabile"
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr "Ok"
 
@@ -50,7 +50,149 @@ msgstr "Reinizializzazione richiesta"
 msgid "Wipe Executed"
 msgstr "Reinizializzazione eseguita"
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+#, fuzzy
+msgid "Not Available"
+msgstr "Non applicabile"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr "Dispositivo"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr "User agent"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+#, fuzzy
+msgid "Last updated"
+msgstr "Ultimo aggiornamento"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr "Gestione dispositivi mobili"
 
@@ -70,14 +212,6 @@ msgstr "Dispositivi"
 msgid "No devices connected to your account"
 msgstr "Nessun dispositivo connesso al tuo account"
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr "Dispositivo"
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr "User agent"
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr "Stato provisioning"
@@ -118,11 +252,11 @@ msgstr "Rimuovi"
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr "Kopano WebApp"
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
@@ -130,26 +264,50 @@ msgstr ""
 "Sei sicuro di voler reinizializzare il dispositvo selezionato?\n"
 "Inserisci la tua password per confermare."
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr "Qualcosa è andato storto."
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr "Impossibile connettersi al server Z-Push. Non autorizzato."
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr "Impossibile connettersi al server Z-Push. Server non raggiungibile."
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr "Impossibile connettersi al server Z-Push. Non trovato."
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr "Impossibile trovare l'ID del dispositivo"
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr "Qualcosa è andato storto"
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""
diff --git a/language/ja_JP.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/ja_JP.UTF-8/LC_MESSAGES/plugin_mdm.po
index 3b5f524..813f498 100644
--- a/language/ja_JP.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/ja_JP.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -2,11 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-24 22:54+0000\n"
+"POT-Creation-Date: 2018-02-12 15:34+0100\n"
 "PO-Revision-Date: 2016-09-25 03:41+0000\n"
 "Last-Translator: Nobuyoshi <nobuyoshi.kumada@actplex.com>\n"
-"Language-Team: Japanese <http://translate.kopano.io/projects/kopano/mdm/ja/>"
-"\n"
+"Language-Team: Japanese <http://translate.kopano.io/projects/kopano/mdm/ja/"
+">\n"
 "Language: ja_JP\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "Not Applicable"
 msgstr ""
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr ""
 
@@ -51,7 +51,147 @@ msgstr ""
 msgid "Wipe Executed"
 msgstr ""
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+msgid "Not Available"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+msgid "Last updated"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr ""
 
@@ -71,14 +211,6 @@ msgstr ""
 msgid "No devices connected to your account"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr ""
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr ""
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr ""
@@ -119,36 +251,60 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""
diff --git a/language/nb_NO.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/nb_NO.UTF-8/LC_MESSAGES/plugin_mdm.po
index d231794..808eb72 100644
--- a/language/nb_NO.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/nb_NO.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -2,11 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-10-10 14:49+0000\n"
+"POT-Creation-Date: 2018-02-12 15:34+0100\n"
 "PO-Revision-Date: 2018-02-09 17:33+0000\n"
 "Last-Translator: Klaus <klaus@linuxavdelingen.no>\n"
-"Language-Team: Norwegian Bokmål "
-"<http://translate.kopano.io/projects/kopano/mdm/nb_NO/>\n"
+"Language-Team: Norwegian Bokmål <http://translate.kopano.io/projects/kopano/"
+"mdm/nb_NO/>\n"
 "Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +35,7 @@ msgstr "Fullstendig synkronisering pågår"
 msgid "Not Applicable"
 msgstr "Gjelder ikke"
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr "Greit"
 
@@ -51,7 +51,149 @@ msgstr "Utvisking forespurt"
 msgid "Wipe Executed"
 msgstr "Utvisking utført"
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+#, fuzzy
+msgid "Not Available"
+msgstr "Gjelder ikke"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr "Enhet"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr "Brukeragent"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+#, fuzzy
+msgid "Last updated"
+msgstr "Forrige oppdatering"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr "Mobile device management"
 
@@ -71,14 +213,6 @@ msgstr "Enheter"
 msgid "No devices connected to your account"
 msgstr "Ingen enheter er knyttet til din konto"
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr "Enhet"
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr "Brukeragent"
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr "Klargjøringsstatus"
@@ -119,11 +253,11 @@ msgstr "Fjern enhet"
 msgid "Refresh"
 msgstr "Oppdatere"
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr "Kopano WebApp"
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
@@ -131,26 +265,50 @@ msgstr ""
 "Vil du virkelig utviske enheten?\n"
 " Oppgi ditt passord for bekreftelse."
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr "Noe gikk galt."
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr "Klarte ikke å koble til Z-Push-server. Uautorisert."
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr "Klarte ikke å koble til Z-Push-server. Klarte ikke å koble til server."
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr "Klarte ikke å koble til Z-Push-server. Ikke funnet."
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr "Enhet ID ble ikke funnet"
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr "Noe gikk galt"
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""
diff --git a/language/nl_NL.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/nl_NL.UTF-8/LC_MESSAGES/plugin_mdm.po
index 9a7fc51..d606777 100644
--- a/language/nl_NL.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/nl_NL.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-09 09:49+0000\n"
+"POT-Creation-Date: 2018-02-12 15:34+0100\n"
 "PO-Revision-Date: 2016-07-27 13:31+0000\n"
 "Last-Translator: Bob <b.huisman@zarafa.com>\n"
 "Language-Team: Dutch <http://translate.kopano.io/projects/kopano/mdm/nl/>\n"
@@ -34,7 +34,7 @@ msgstr "Hersychronisatie bezig"
 msgid "Not Applicable"
 msgstr "Niet van toepassing"
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr "Ok"
 
@@ -50,7 +50,149 @@ msgstr "Wissen aangevraagd"
 msgid "Wipe Executed"
 msgstr "Wissen uitgevoerd"
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+#, fuzzy
+msgid "Not Available"
+msgstr "Niet van toepassing"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr "Apparaat"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr "Software versie"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+#, fuzzy
+msgid "Last updated"
+msgstr "Laatst Bijgewerkt"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr "Mobiel apparaat beheer"
 
@@ -70,14 +212,6 @@ msgstr "Apparaten"
 msgid "No devices connected to your account"
 msgstr "Geen apparaten verbonden met het account"
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr "Apparaat"
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr "Software versie"
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr "Configuratie status"
@@ -118,11 +252,11 @@ msgstr "Apparaat verwijderen"
 msgid "Refresh"
 msgstr "Vernieuwen"
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr "Kopano WebApp"
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
@@ -130,26 +264,50 @@ msgstr ""
 "Weet u zeker dat u het apparaat wilt wissen?\n"
 " Voer uw wachtwoord in om te bevestigen."
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr "Er ging iets mis."
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr "Kan niet verbinden met de Z-Push Server. Geen toegang."
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr "Kan niet verbinden met de Z-Push Server. Kon de server niet bereiken."
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr "Kan niet verbinden met de Z-Push Server. Niet gevonden."
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr "Apparaat ID kon niet worden gevonden"
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr "Er ging iets mis"
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""
diff --git a/language/pt_BR.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/pt_BR.UTF-8/LC_MESSAGES/plugin_mdm.po
index 72ec0f4..ec58370 100644
--- a/language/pt_BR.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/pt_BR.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -2,11 +2,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-28 20:33+0000\n"
+"POT-Creation-Date: 2018-02-12 15:34+0100\n"
 "PO-Revision-Date: 2016-07-21 18:38+0000\n"
 "Last-Translator: Craig <informatica-anapolis@mntb.org>\n"
-"Language-Team: Portuguese (Brazil) "
-"<http://translate.kopano.io/projects/kopano/mdm/pt_BR/>\n"
+"Language-Team: Portuguese (Brazil) <http://translate.kopano.io/projects/"
+"kopano/mdm/pt_BR/>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +35,7 @@ msgstr "Ressincronização completa em andamento"
 msgid "Not Applicable"
 msgstr "Não Aplicável"
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr "OK"
 
@@ -51,7 +51,149 @@ msgstr "Limpeza Requisitada"
 msgid "Wipe Executed"
 msgstr "Limpeza Executada"
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+#, fuzzy
+msgid "Not Available"
+msgstr "Não Aplicável"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr "Dispositivo"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr "Agente de Usuário"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+#, fuzzy
+msgid "Last updated"
+msgstr "Última Atualização"
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr "Gerenciamento de Dispositivo Móvel"
 
@@ -71,14 +213,6 @@ msgstr "Dispositivos"
 msgid "No devices connected to your account"
 msgstr "Nenhum dispositivo conectado a sua conta"
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr "Dispositivo"
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr "Agente de Usuário"
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr "Estado de provisionamento"
@@ -119,11 +253,11 @@ msgstr "Remover dispositivo"
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr "WebApp do Kopano"
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
@@ -131,26 +265,50 @@ msgstr ""
 "Quer realmente limpar seu dispositivo?\n"
 "  Digite sua senha para confirmar."
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr "Algo foi errado."
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr "Impossível conectar servidor Z-Push. Não autorizado."
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr "Impossível conectar servidor Z-Push. Falha na conexão com servidor."
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr "Impossível conectar servidor Z-Push. Não encontrado."
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr "ID do dispositivo não encontrada"
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr "Algo foi errado"
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""
diff --git a/language/ru_RU.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/ru_RU.UTF-8/LC_MESSAGES/plugin_mdm.po
index 98870eb..4dd54fc 100644
--- a/language/ru_RU.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/ru_RU.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -19,7 +19,7 @@ msgstr ""
 msgid "Not Applicable"
 msgstr ""
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr ""
 
@@ -35,7 +35,147 @@ msgstr ""
 msgid "Wipe Executed"
 msgstr ""
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+msgid "Not Available"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+msgid "Last updated"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr ""
 
@@ -55,14 +195,6 @@ msgstr ""
 msgid "No devices connected to your account"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr ""
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr ""
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr ""
@@ -103,36 +235,60 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""
diff --git a/language/sl_SI.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/sl_SI.UTF-8/LC_MESSAGES/plugin_mdm.po
index 98870eb..4dd54fc 100644
--- a/language/sl_SI.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/sl_SI.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -19,7 +19,7 @@ msgstr ""
 msgid "Not Applicable"
 msgstr ""
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr ""
 
@@ -35,7 +35,147 @@ msgstr ""
 msgid "Wipe Executed"
 msgstr ""
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+msgid "Not Available"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+msgid "Last updated"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr ""
 
@@ -55,14 +195,6 @@ msgstr ""
 msgid "No devices connected to your account"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr ""
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr ""
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr ""
@@ -103,36 +235,60 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""
diff --git a/language/zh_CN.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/zh_CN.UTF-8/LC_MESSAGES/plugin_mdm.po
index 98870eb..4dd54fc 100644
--- a/language/zh_CN.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/zh_CN.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -19,7 +19,7 @@ msgstr ""
 msgid "Not Applicable"
 msgstr ""
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr ""
 
@@ -35,7 +35,147 @@ msgstr ""
 msgid "Wipe Executed"
 msgstr ""
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+msgid "Not Available"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+msgid "Last updated"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr ""
 
@@ -55,14 +195,6 @@ msgstr ""
 msgid "No devices connected to your account"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr ""
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr ""
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr ""
@@ -103,36 +235,60 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""
diff --git a/language/zh_TW.UTF-8/LC_MESSAGES/plugin_mdm.po b/language/zh_TW.UTF-8/LC_MESSAGES/plugin_mdm.po
index 98870eb..4dd54fc 100644
--- a/language/zh_TW.UTF-8/LC_MESSAGES/plugin_mdm.po
+++ b/language/zh_TW.UTF-8/LC_MESSAGES/plugin_mdm.po
@@ -19,7 +19,7 @@ msgstr ""
 msgid "Not Applicable"
 msgstr ""
 
-#: js/data/ProvisioningStatus.js:56
+#: js/data/ProvisioningStatus.js:56 js/dialogs/MDMDeviceContentPanel.js:39
 msgid "Ok"
 msgstr ""
 
@@ -35,7 +35,147 @@ msgstr ""
 msgid "Wipe Executed"
 msgstr ""
 
-#: js/MDM.js:47
+#: js/data/ProvisioningStatus.js:64
+msgid "Not Available"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:64 js/settings/MDMSettingsWidget.js:36
+msgid "Device"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:68
+msgid "Type"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:71
+msgid "Operating System"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:75
+msgid "ID"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:78 js/settings/MDMSettingsWidget.js:40
+msgid "User Agent"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:100
+msgid "MDM Plugin"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:105
+msgid "Active Sync Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:108
+msgid "Z-Push Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:111
+msgid "Short folder Ids"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:114
+msgid "Policy name"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:137
+msgid "Kopano Outlook Extension"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:142
+msgid "Version"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:145
+msgid "Build"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:148 js/dialogs/MDMDeviceGeneralTab.js:69
+msgid "Last updated"
+msgstr ""
+
+#: js/dialogs/MDMDeviceDetailsTab.js:149 js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "d F Y, H:i"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:66
+msgid "Connected since"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:67
+msgid "d F Y"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:70
+msgid "{0}"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:72
+msgid "Status"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:93
+msgid "Synchronize"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:97
+msgid "Folders"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:112
+msgid "Email"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:115
+msgid "Calendar"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:118
+msgid "Contacts"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:121
+msgid "Notes"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:124
+msgid "Tasks"
+msgstr ""
+
+#: js/dialogs/MDMDeviceGeneralTab.js:162
+msgid "Managed shared Folders"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:37
+msgid "General"
+msgstr ""
+
+#: js/dialogs/MDMDevicePanel.js:42
+msgid "Details"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderContentPanel.js:24
+msgid "Manage Shared Folder"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:46
+msgid "Apply"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:51
+msgid "Cancel"
+msgstr ""
+
+#: js/dialogs/MDMManageSharedFolderPanel.js:80
+msgid "Select folders to sync on your device"
+msgstr ""
+
+#: js/MDM.js:99
+msgid "Z-Push"
+msgstr ""
+
+#: js/MDM.js:108
 msgid "Mobile device management"
 msgstr ""
 
@@ -55,14 +195,6 @@ msgstr ""
 msgid "No devices connected to your account"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:36
-msgid "Device"
-msgstr ""
-
-#: js/settings/MDMSettingsWidget.js:40
-msgid "User Agent"
-msgstr ""
-
 #: js/settings/MDMSettingsWidget.js:44
 msgid "Provisioning Status"
 msgstr ""
@@ -103,36 +235,60 @@ msgstr ""
 msgid "Refresh"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:105
+#: js/settings/MDMSettingsWidget.js:110
 msgid "Kopano WebApp"
 msgstr ""
 
-#: js/settings/MDMSettingsWidget.js:106
+#: js/settings/MDMSettingsWidget.js:111
 msgid ""
 "Do you really want to wipe your device?\n"
 " Enter your password to confirm."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:184
+#: php/class.pluginmdmmodule.php:54
+msgid "version not available"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:208
 msgid "Something went wrong."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:187
+#: php/class.pluginmdmmodule.php:211
 msgid "Unable to connect to Z-Push Server. Unauthorized."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:190
+#: php/class.pluginmdmmodule.php:214
 msgid "Unable to connect to Z-Push Server. Could not connect to host."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:193
+#: php/class.pluginmdmmodule.php:217
 msgid "Unable to connect to Z-Push Server. Not found."
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:196
+#: php/class.pluginmdmmodule.php:224
+msgid ""
+"Folder can not be added because there is already an additional folder with "
+"the same name"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:229
+msgid ""
+"Folder can not be removed because there is no folder known with given folder "
+"id"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:232
 msgid "Device ID could not be found"
 msgstr ""
 
-#: php/class.pluginmdmmodule.php:201
+#: php/class.pluginmdmmodule.php:238
 msgid "Something went wrong"
 msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "Yes"
+msgstr ""
+
+#: php/class.pluginmdmmodule.php:316
+msgid "No"
+msgstr ""