diff --git a/server/src/uds/locale/ar/LC_MESSAGES/django.po b/server/src/uds/locale/ar/LC_MESSAGES/django.po
index ee6f3284b..4c3f01bac 100644
--- a/server/src/uds/locale/ar/LC_MESSAGES/django.po
+++ b/server/src/uds/locale/ar/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:22+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/openuds/openuds/language/"
@@ -61,7 +61,7 @@ msgstr "الاسم"
 #: REST/methods/providers.py:67 REST/methods/services.py:190
 #: REST/methods/services_pool_groups.py:65 REST/methods/transports.py:58
 #: REST/methods/user_services.py:262 REST/methods/users_groups.py:114
-#: REST/methods/users_groups.py:258 REST/model.py:139
+#: REST/methods/users_groups.py:258 REST/model.py:140
 #: templates/uds/admin/tmpl/calendar_rule.html:14
 #: templates/uds/admin/tmpl/group.html:49 templates/uds/admin/tmpl/user.html:40
 msgid "Comments"
@@ -69,12 +69,12 @@ msgstr "تعليقات"
 
 #: REST/methods/authenticators.py:61 REST/methods/services_pool_calendars.py:89
 #: REST/methods/services_pool_groups.py:62 REST/methods/transports.py:56
-#: REST/methods/user_services.py:259 REST/model.py:148
+#: REST/methods/user_services.py:259 REST/model.py:149
 #: templates/uds/admin/tmpl/pool_add_access.html:5
 msgid "Priority"
 msgstr "الأولوية"
 
-#: REST/methods/authenticators.py:62 REST/model.py:159
+#: REST/methods/authenticators.py:62 REST/model.py:160
 msgid "Label"
 msgstr "التسمية"
 
@@ -706,40 +706,40 @@ msgstr "العلامات"
 msgid "Tags for this element"
 msgstr "العلامات لهذا العنصر"
 
-#: REST/model.py:133
+#: REST/model.py:134
 msgid "Name of this element"
 msgstr "اسم هذا العنصر"
 
-#: REST/model.py:140
+#: REST/model.py:141
 msgid "Comments for this element"
 msgstr "تعليقات لهذا العنصر"
 
-#: REST/model.py:149
+#: REST/model.py:150
 msgid ""
 "Selects the priority of this element (lower number means higher priority)"
 msgstr "تحديد أولوية هذا العنصر (انخفاض عدد الوسائل أولوية عليا)"
 
-#: REST/model.py:160
+#: REST/model.py:161
 msgid "Label for this element"
 msgstr "تسمية لهذا العنصر"
 
-#: REST/model.py:245
+#: REST/model.py:246
 msgid "Invalid Request"
 msgstr "طلب غير صالح"
 
-#: REST/model.py:252
+#: REST/model.py:253
 msgid "Method not found in {}: {}"
 msgstr "تعذر العثور على الأسلوب في {}: {}"
 
-#: REST/model.py:258
+#: REST/model.py:259
 msgid "Item not found"
 msgstr "تعذر العثور على عنصر"
 
-#: REST/model.py:263 web/errors.py:75
+#: REST/model.py:264 web/errors.py:75
 msgid "Access denied"
 msgstr "تم رفض الوصول"
 
-#: REST/model.py:266
+#: REST/model.py:267
 msgid "Operation not supported"
 msgstr "العملية غير معتمدة"
 
@@ -2835,11 +2835,11 @@ msgstr "المهلة بالثواني لاتصال Openstack"
 msgid "OpenStack test connection passed"
 msgstr "مر اختبار الاتصال Openstack."
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:610
+#: services/OpenStack/openStack/UDSOpenStackClient.py:609
 msgid "Authentication error"
 msgstr "خطأ مصادقة"
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:612
+#: services/OpenStack/openStack/UDSOpenStackClient.py:611
 msgid ""
 "Openstack does not support identity API 3.2 or newer. This OpenStack server "
 "is not compatible with UDS."
@@ -3307,6 +3307,12 @@ msgstr "نظرة عامة"
 msgid "Authenticators"
 msgstr "المصادقون "
 
+#: templates/uds/admin/snippets/navbar.html:24
+#, fuzzy
+#| msgid "OS Manager"
+msgid "Os Managers"
+msgstr "إدارة نظام التشغيل"
+
 #: templates/uds/admin/snippets/navbar.html:25
 #: templates/uds/admin/tmpl/connectivity.html:4
 #: templates/uds/admin/tmpl/connectivity.html:7
@@ -3584,6 +3590,12 @@ msgstr "سيتم تغيير حجم الصورة ل"
 msgid "Max file size for uploading is 256Kb"
 msgstr "الحد الأقصى لحجم الملف للتحميل هو 256KB"
 
+#: templates/uds/admin/tmpl/osmanagers.html:4
+#, fuzzy
+#| msgid "OS Manager"
+msgid "OS Managers"
+msgstr "إدارة نظام التشغيل"
+
 #: templates/uds/admin/tmpl/permissions.html:14
 msgid "Revoke user permission"
 msgstr "إلغاء إذن المستخدم"
@@ -3650,6 +3662,7 @@ msgid "There was an error requesting data from server, please, try again"
 msgstr "كان هناك خطأ طلب البيانات من الخادم، من فضلك، حاول مرة أخرى"
 
 #: templates/uds/admin/tmpl/request_failed.html:9
+#: templates/uds/html5/snippets/navbar.html:48
 #: templates/uds/semantic/snippets/user-menu.html:13
 msgid "Dashboard"
 msgstr "لوحة القيادة"
@@ -4047,6 +4060,11 @@ msgstr "حول"
 msgid "Preferences"
 msgstr "التفضيلات"
 
+#: templates/uds/html5/snippets/navbar.html:43
+#: templates/uds/semantic/snippets/user-menu.html:10
+msgid "UDS Plugin"
+msgstr "مساعد UDS "
+
 #: templates/uds/html5/templates/base.html:61
 #: templates/uds/semantic/templates/base.html:33
 msgid ""
@@ -4123,10 +4141,6 @@ msgstr "الخدمة حاليا في صيانة ولا يمكن الوصول إ
 msgid "Log In"
 msgstr "تسجيل الدخول"
 
-#: templates/uds/semantic/snippets/user-menu.html:10
-msgid "UDS Plugin"
-msgstr "مساعد UDS "
-
 #: templates/uds/semantic/tmpl/items.html:12
 msgid "Session in use"
 msgstr "دورة في طور الإستخدام."
@@ -4239,61 +4253,91 @@ msgstr ""
 "إن لم يكن فارغا، وهذا مجال وسوف تستخدم دائما الاعتماد (كما تستخدم المجال \\ "
 "المستخدم)"
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid "Show wallpaper"
+msgstr "اظهر خلفية."
+
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid ""
+"If checked, the wallpaper and themes will be shown on machine (better user "
+"experience, more bandwidth)"
+msgstr ""
+"إذا تم، سيكون ليتم عرض خلفية والمواضيع على الجهاز (تجربة أفضل للمستخدم، "
+"والمزيد من عرض النطاق الترددي)"
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "Allow Desk.Comp."
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "If checked, desktop composition will be allowed"
+msgstr "إذا تم، سيكون يسمح تكوين سطح المكتب."
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "Font Smoothing"
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "If checked, fonts smoothing will be allowed (windows clients only)"
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid "Enable Audio"
 msgstr "تمكين الصوت"
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid ""
 "If checked, the audio will be redirected to client (if client browser "
 "supports it)"
 msgstr ""
 "إذا تحققت، سيتم إعادة توجيه الصوت إلى العميل (إذا مستعرض العميل يعتمد عليه)"
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid "Enable Printing"
 msgstr "تمكين الطباعة"
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid ""
 "If checked, the printing will be redirected to client (if client browser "
 "supports it)"
 msgstr ""
 "إذا تحققت، سيتم إعادة توجيه الطباعة إلى العميل (إذا مستعرض العميل يعتمد عليه)"
 
-#: transports/HTML5RDP/HTML5RDP.py:80
+#: transports/HTML5RDP/HTML5RDP.py:83
 msgid "Layout"
 msgstr "نسق"
 
-#: transports/HTML5RDP/HTML5RDP.py:81
+#: transports/HTML5RDP/HTML5RDP.py:84
 msgid "Keyboards Layout of server"
 msgstr "لوحات مفاتيح الخادم."
 
-#: transports/HTML5RDP/HTML5RDP.py:84
+#: transports/HTML5RDP/HTML5RDP.py:87
 msgid "English (US) keyboard"
 msgstr "الإنجليزية (الولايات المتحدة) لوحة المفاتيح"
 
-#: transports/HTML5RDP/HTML5RDP.py:85
+#: transports/HTML5RDP/HTML5RDP.py:88
 msgid "German keyboard (qwertz)"
 msgstr "لوحة المفاتيح الألمانية (QWERTZ)"
 
-#: transports/HTML5RDP/HTML5RDP.py:86
+#: transports/HTML5RDP/HTML5RDP.py:89
 msgid "French keyboard (azerty)"
 msgstr "لوحة المفاتيح الفرنسية (AZERTY)"
 
-#: transports/HTML5RDP/HTML5RDP.py:87
+#: transports/HTML5RDP/HTML5RDP.py:90
 msgid "Italian keyboard"
 msgstr "لوحة المفاتيح الإيطالية"
 
-#: transports/HTML5RDP/HTML5RDP.py:88
+#: transports/HTML5RDP/HTML5RDP.py:91
 msgid "Swedish keyboard"
 msgstr "لوحة المفاتيح السويدية"
 
-#: transports/HTML5RDP/HTML5RDP.py:89
+#: transports/HTML5RDP/HTML5RDP.py:92
 msgid "Failsafe"
 msgstr "فشل آمن"
 
-#: transports/HTML5RDP/HTML5RDP.py:101
+#: transports/HTML5RDP/HTML5RDP.py:104
 msgid "The server must be http or https"
 msgstr "يجب أن يكون خادم HTTP أو HTTPS"
 
@@ -4372,14 +4416,12 @@ msgstr ""
 "IP أو اسم المضيف لخادم نفق إرسالها إلى جهاز العميل (\"العام\" الملكية "
 "الفكرية) والميناء. (استخدام HOST: تنسيق PORT)."
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid "Tunnel host check"
 msgstr "اختيار المضيف النفق"
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid ""
 "If not empty, this server will be used to check if service is running before "
@@ -4388,8 +4430,8 @@ msgstr ""
 "إن لم يكن فارغا، سيتم استخدام هذا الخادم للتحقق مما إذا الخدمة قيد التشغيل "
 "قبل تعيين إلى المستخدم. (استخدام HOST: تنسيق PORT)."
 
-#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:93
-#: transports/RDS_enterprise/TRDSTransport.py:86
+#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:96
+#: transports/RDS_enterprise/TRDSTransport.py:89
 #: transports/RGS_enterprise/TRGSTransport.py:78
 #: transports/SPICE/TSPICETransport.py:75 transports/X2GO/TX2GOTransport.py:82
 msgid "Must use HOST:PORT in Tunnel Server Field"
@@ -4458,18 +4500,6 @@ msgstr "السماح للمنافذ التسلسلية"
 msgid "If checked, this transport will allow the use of user serial ports"
 msgstr "إذا تم، سيكون هذا النقل تسمح باستخدام المنافذ التسلسلية المستخدم"
 
-#: transports/RDP/BaseRDPTransport.py:70
-msgid "Show wallpaper"
-msgstr "اظهر خلفية."
-
-#: transports/RDP/BaseRDPTransport.py:70
-msgid ""
-"If checked, the wallpaper and themes will be shown on machine (better user "
-"experience, more bandwidth)"
-msgstr ""
-"إذا تم، سيكون ليتم عرض خلفية والمواضيع على الجهاز (تجربة أفضل للمستخدم، "
-"والمزيد من عرض النطاق الترددي)"
-
 #: transports/RDP/BaseRDPTransport.py:71
 msgid "Multiple monitors"
 msgstr "أجهزة عرض متعددة"
@@ -4481,24 +4511,6 @@ msgid ""
 msgstr ""
 "إذا تحققت، سوف تستخدم كافة أجهزة العميل لعرض (يعمل فقط على عملاء ويندوز)."
 
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "Allow Desk.Comp."
-msgstr ""
-
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "If checked, desktop composition will be allowed"
-msgstr "إذا تم، سيكون يسمح تكوين سطح المكتب."
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "Font Smoothing"
-msgstr ""
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "If checked, fonts smoothing will be allowed (windows clients only)"
-msgstr ""
-
 #: transports/RDP/BaseRDPTransport.py:74
 #: transports/RDS_enterprise/BaseRDSTransport.py:74
 msgid "Multimedia sync"
@@ -4538,6 +4550,18 @@ msgstr "RDP النقل (نفق)"
 msgid "RDP Transport with tunneled connection"
 msgstr "النقل RDP مع اتصال النفق"
 
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+#, fuzzy
+#| msgid "Tunnel host check"
+msgid "Tunnel wait time"
+msgstr "اختيار المضيف النفق"
+
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+msgid "Maximum time to wait before closing the tunnel listener"
+msgstr ""
+
 #: transports/RDP/__init__.py:40 transports/RDS_enterprise/__init__.py:40
 msgid "Remote Desktop Protocol"
 msgstr "بروتوكول سطح المكتب البعيد"
diff --git a/server/src/uds/locale/ar/LC_MESSAGES/djangojs.po b/server/src/uds/locale/ar/LC_MESSAGES/djangojs.po
index f05e294e2..377b57b18 100644
--- a/server/src/uds/locale/ar/LC_MESSAGES/djangojs.po
+++ b/server/src/uds/locale/ar/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:19+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: Arabic (http://www.transifex.com/openuds/openuds/language/"
diff --git a/server/src/uds/locale/de/LC_MESSAGES/django.po b/server/src/uds/locale/de/LC_MESSAGES/django.po
index 934ec2594..cbfc27970 100644
--- a/server/src/uds/locale/de/LC_MESSAGES/django.po
+++ b/server/src/uds/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:19+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: German (http://www.transifex.com/openuds/openuds/language/"
@@ -60,7 +60,7 @@ msgstr "Name"
 #: REST/methods/providers.py:67 REST/methods/services.py:190
 #: REST/methods/services_pool_groups.py:65 REST/methods/transports.py:58
 #: REST/methods/user_services.py:262 REST/methods/users_groups.py:114
-#: REST/methods/users_groups.py:258 REST/model.py:139
+#: REST/methods/users_groups.py:258 REST/model.py:140
 #: templates/uds/admin/tmpl/calendar_rule.html:14
 #: templates/uds/admin/tmpl/group.html:49 templates/uds/admin/tmpl/user.html:40
 msgid "Comments"
@@ -68,12 +68,12 @@ msgstr "Kommentare"
 
 #: REST/methods/authenticators.py:61 REST/methods/services_pool_calendars.py:89
 #: REST/methods/services_pool_groups.py:62 REST/methods/transports.py:56
-#: REST/methods/user_services.py:259 REST/model.py:148
+#: REST/methods/user_services.py:259 REST/model.py:149
 #: templates/uds/admin/tmpl/pool_add_access.html:5
 msgid "Priority"
 msgstr "Priorität"
 
-#: REST/methods/authenticators.py:62 REST/model.py:159
+#: REST/methods/authenticators.py:62 REST/model.py:160
 msgid "Label"
 msgstr "Etikett"
 
@@ -714,42 +714,42 @@ msgstr "Markierungen"
 msgid "Tags for this element"
 msgstr "Tags für dieses element"
 
-#: REST/model.py:133
+#: REST/model.py:134
 msgid "Name of this element"
 msgstr "Name dieses Elements"
 
-#: REST/model.py:140
+#: REST/model.py:141
 msgid "Comments for this element"
 msgstr "Kommentare für dieses element"
 
-#: REST/model.py:149
+#: REST/model.py:150
 msgid ""
 "Selects the priority of this element (lower number means higher priority)"
 msgstr ""
 "Bestimmt die Priorität dieses Elements (niedrigere Zahl bedeutet höhere "
 "Priorität)"
 
-#: REST/model.py:160
+#: REST/model.py:161
 msgid "Label for this element"
 msgstr "Bezeichnung für dieses element"
 
-#: REST/model.py:245
+#: REST/model.py:246
 msgid "Invalid Request"
 msgstr "Ungültige Anforderung"
 
-#: REST/model.py:252
+#: REST/model.py:253
 msgid "Method not found in {}: {}"
 msgstr "Methode nicht gefunden in {}: {}"
 
-#: REST/model.py:258
+#: REST/model.py:259
 msgid "Item not found"
 msgstr "Element nicht gefunden"
 
-#: REST/model.py:263 web/errors.py:75
+#: REST/model.py:264 web/errors.py:75
 msgid "Access denied"
 msgstr "Zugriff verweigert"
 
-#: REST/model.py:266
+#: REST/model.py:267
 msgid "Operation not supported"
 msgstr "Vorgang wird nicht unterstützt"
 
@@ -2892,11 +2892,11 @@ msgstr "Timeout in Sekunden der Verbindung zum OpenStack"
 msgid "OpenStack test connection passed"
 msgstr "OpenStack Testverbindung übergeben"
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:610
+#: services/OpenStack/openStack/UDSOpenStackClient.py:609
 msgid "Authentication error"
 msgstr "Authentifizierungsfehler"
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:612
+#: services/OpenStack/openStack/UDSOpenStackClient.py:611
 msgid ""
 "Openstack does not support identity API 3.2 or newer. This OpenStack server "
 "is not compatible with UDS."
@@ -3375,6 +3375,11 @@ msgstr "Übersicht"
 msgid "Authenticators"
 msgstr "Authentifikatoren"
 
+#: templates/uds/admin/snippets/navbar.html:24
+#| msgid "OS Manager"
+msgid "Os Managers"
+msgstr "OS-Manager"
+
 #: templates/uds/admin/snippets/navbar.html:25
 #: templates/uds/admin/tmpl/connectivity.html:4
 #: templates/uds/admin/tmpl/connectivity.html:7
@@ -3653,6 +3658,11 @@ msgstr "Bild wird verkleinert werden "
 msgid "Max file size for uploading is 256Kb"
 msgstr "Max. Größe der Datei für den Upload beträgt 256 KByte"
 
+#: templates/uds/admin/tmpl/osmanagers.html:4
+#| msgid "OS Manager"
+msgid "OS Managers"
+msgstr "OS-Manager"
+
 #: templates/uds/admin/tmpl/permissions.html:14
 msgid "Revoke user permission"
 msgstr "Benutzer die Berechtigung zu widerrufen"
@@ -3719,6 +3729,7 @@ msgid "There was an error requesting data from server, please, try again"
 msgstr "Fehler beim anfordern, dass Daten vom Server, bitte erneut versuchen"
 
 #: templates/uds/admin/tmpl/request_failed.html:9
+#: templates/uds/html5/snippets/navbar.html:48
 #: templates/uds/semantic/snippets/user-menu.html:13
 msgid "Dashboard"
 msgstr "Dashboard"
@@ -4136,6 +4147,11 @@ msgstr "Über"
 msgid "Preferences"
 msgstr "Einstellungen"
 
+#: templates/uds/html5/snippets/navbar.html:43
+#: templates/uds/semantic/snippets/user-menu.html:10
+msgid "UDS Plugin"
+msgstr "UDS-Plugin"
+
 #: templates/uds/html5/templates/base.html:61
 #: templates/uds/semantic/templates/base.html:33
 msgid ""
@@ -4216,10 +4232,6 @@ msgstr ""
 msgid "Log In"
 msgstr "Anmelden"
 
-#: templates/uds/semantic/snippets/user-menu.html:10
-msgid "UDS Plugin"
-msgstr "UDS-Plugin"
-
 #: templates/uds/semantic/tmpl/items.html:12
 msgid "Session in use"
 msgstr "Sitzung im Einsatz"
@@ -4338,11 +4350,43 @@ msgstr ""
 "Wenn nicht leer ist, dieser Domäne immer verwendet werden als "
 "Anmeldeinformationen (als DOMAIN verwendet\\Benutzer)"
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid "Show wallpaper"
+msgstr "Zeigen wallpaper"
+
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid ""
+"If checked, the wallpaper and themes will be shown on machine (better user "
+"experience, more bandwidth)"
+msgstr ""
+"Wenn diese Option aktiviert ist, be die Tapete und Themen Maschine (bessere "
+"User will shown Erfahrung, mehr Bandbreite)"
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "Allow Desk.Comp."
+msgstr "Desk.Comp zu ermöglichen."
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "If checked, desktop composition will be allowed"
+msgstr "Wenn aktiviert, wird die Desktopgestaltung zugelassen"
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "Font Smoothing"
+msgstr "Schriftglättung"
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "If checked, fonts smoothing will be allowed (windows clients only)"
+msgstr ""
+"Wenn diese Option aktiviert, werden Schriftarten-Glättung (nur für Windows-"
+"Clients) dürfen"
+
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid "Enable Audio"
 msgstr "Audio aktivieren"
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid ""
 "If checked, the audio will be redirected to client (if client browser "
 "supports it)"
@@ -4350,11 +4394,11 @@ msgstr ""
 "Wenn aktiviert, werden die Audiodaten auf Client weitergeleitet (wenn Client-"
 "Browser Es unterstützt)"
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid "Enable Printing"
 msgstr "Drucken aktivieren"
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid ""
 "If checked, the printing will be redirected to client (if client browser "
 "supports it)"
@@ -4362,39 +4406,39 @@ msgstr ""
 "Wenn diese Option aktiviert, wird der Druck auf Client weitergeleitet (wenn "
 "Client-Browser Es unterstützt)"
 
-#: transports/HTML5RDP/HTML5RDP.py:80
+#: transports/HTML5RDP/HTML5RDP.py:83
 msgid "Layout"
 msgstr "Layout"
 
-#: transports/HTML5RDP/HTML5RDP.py:81
+#: transports/HTML5RDP/HTML5RDP.py:84
 msgid "Keyboards Layout of server"
 msgstr "Keyboard-Layout des Servers"
 
-#: transports/HTML5RDP/HTML5RDP.py:84
+#: transports/HTML5RDP/HTML5RDP.py:87
 msgid "English (US) keyboard"
 msgstr "Englisch (USA) Tastatur"
 
-#: transports/HTML5RDP/HTML5RDP.py:85
+#: transports/HTML5RDP/HTML5RDP.py:88
 msgid "German keyboard (qwertz)"
 msgstr "Deutsche Tastatur (Qwertz)"
 
-#: transports/HTML5RDP/HTML5RDP.py:86
+#: transports/HTML5RDP/HTML5RDP.py:89
 msgid "French keyboard (azerty)"
 msgstr "Französische Tastatur (Azerty)"
 
-#: transports/HTML5RDP/HTML5RDP.py:87
+#: transports/HTML5RDP/HTML5RDP.py:90
 msgid "Italian keyboard"
 msgstr "Italienische Tastatur"
 
-#: transports/HTML5RDP/HTML5RDP.py:88
+#: transports/HTML5RDP/HTML5RDP.py:91
 msgid "Swedish keyboard"
 msgstr "Schwedische Tastatur"
 
-#: transports/HTML5RDP/HTML5RDP.py:89
+#: transports/HTML5RDP/HTML5RDP.py:92
 msgid "Failsafe"
 msgstr "Failsafe"
 
-#: transports/HTML5RDP/HTML5RDP.py:101
+#: transports/HTML5RDP/HTML5RDP.py:104
 msgid "The server must be http or https"
 msgstr "Der Server muss http oder Https sein."
 
@@ -4473,14 +4517,12 @@ msgstr ""
 "IP-Adresse oder Hostname des Tunnel-Server geschickt, um Client-Gerät "
 "(\"öffentliche\" IP-Adresse) und Port. (verwenden Sie HOST: PORT-Format)"
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid "Tunnel host check"
 msgstr "Tunnel Host-Prüfung"
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid ""
 "If not empty, this server will be used to check if service is running before "
@@ -4490,8 +4532,8 @@ msgstr ""
 "ausgeführt wird, bevor Sie verwendet werden Benutzer zuweisen. (verwenden "
 "Sie HOST: PORT-Format)"
 
-#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:93
-#: transports/RDS_enterprise/TRDSTransport.py:86
+#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:96
+#: transports/RDS_enterprise/TRDSTransport.py:89
 #: transports/RGS_enterprise/TRGSTransport.py:78
 #: transports/SPICE/TSPICETransport.py:75 transports/X2GO/TX2GOTransport.py:82
 msgid "Must use HOST:PORT in Tunnel Server Field"
@@ -4571,18 +4613,6 @@ msgstr ""
 "Wenn aktiviert, wird dieser Transport die Verwendung des Benutzers erlauben "
 "serielle ports"
 
-#: transports/RDP/BaseRDPTransport.py:70
-msgid "Show wallpaper"
-msgstr "Zeigen wallpaper"
-
-#: transports/RDP/BaseRDPTransport.py:70
-msgid ""
-"If checked, the wallpaper and themes will be shown on machine (better user "
-"experience, more bandwidth)"
-msgstr ""
-"Wenn diese Option aktiviert ist, be die Tapete und Themen Maschine (bessere "
-"User will shown Erfahrung, mehr Bandbreite)"
-
 #: transports/RDP/BaseRDPTransport.py:71
 msgid "Multiple monitors"
 msgstr "Mehrere Monitore"
@@ -4595,26 +4625,6 @@ msgstr ""
 "Wenn diese Option aktiviert, werden alle Clientmonitore für anzeigen "
 "(funktioniert nur auf verwendet Windows-Clients)"
 
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "Allow Desk.Comp."
-msgstr "Desk.Comp zu ermöglichen."
-
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "If checked, desktop composition will be allowed"
-msgstr "Wenn aktiviert, wird die Desktopgestaltung zugelassen"
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "Font Smoothing"
-msgstr "Schriftglättung"
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "If checked, fonts smoothing will be allowed (windows clients only)"
-msgstr ""
-"Wenn diese Option aktiviert, werden Schriftarten-Glättung (nur für Windows-"
-"Clients) dürfen"
-
 #: transports/RDP/BaseRDPTransport.py:74
 #: transports/RDS_enterprise/BaseRDSTransport.py:74
 msgid "Multimedia sync"
@@ -4656,6 +4666,17 @@ msgstr "RDP-Verkehr (Tunneling)"
 msgid "RDP Transport with tunneled connection"
 msgstr "RDP-Transport mit getunnelten Verbindung"
 
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+#| msgid "Tunnel host check"
+msgid "Tunnel wait time"
+msgstr "Tunnel-Wartezeit"
+
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+msgid "Maximum time to wait before closing the tunnel listener"
+msgstr "Maximale Wartezeit vor dem Schließen des Tunnel-Hörers"
+
 #: transports/RDP/__init__.py:40 transports/RDS_enterprise/__init__.py:40
 msgid "Remote Desktop Protocol"
 msgstr "Remote Desktop-Protokoll"
diff --git a/server/src/uds/locale/de/LC_MESSAGES/djangojs.po b/server/src/uds/locale/de/LC_MESSAGES/djangojs.po
index fe3e0760a..d8d9ae3bf 100644
--- a/server/src/uds/locale/de/LC_MESSAGES/djangojs.po
+++ b/server/src/uds/locale/de/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:19+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: German (http://www.transifex.com/openuds/openuds/language/"
diff --git a/server/src/uds/locale/en/LC_MESSAGES/django.po b/server/src/uds/locale/en/LC_MESSAGES/django.po
index 7d9e3c115..7594e7318 100644
--- a/server/src/uds/locale/en/LC_MESSAGES/django.po
+++ b/server/src/uds/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -58,7 +58,7 @@ msgstr ""
 #: REST/methods/providers.py:67 REST/methods/services.py:190
 #: REST/methods/services_pool_groups.py:65 REST/methods/transports.py:58
 #: REST/methods/user_services.py:262 REST/methods/users_groups.py:114
-#: REST/methods/users_groups.py:258 REST/model.py:139
+#: REST/methods/users_groups.py:258 REST/model.py:140
 #: templates/uds/admin/tmpl/calendar_rule.html:14
 #: templates/uds/admin/tmpl/group.html:49 templates/uds/admin/tmpl/user.html:40
 msgid "Comments"
@@ -66,12 +66,12 @@ msgstr ""
 
 #: REST/methods/authenticators.py:61 REST/methods/services_pool_calendars.py:89
 #: REST/methods/services_pool_groups.py:62 REST/methods/transports.py:56
-#: REST/methods/user_services.py:259 REST/model.py:148
+#: REST/methods/user_services.py:259 REST/model.py:149
 #: templates/uds/admin/tmpl/pool_add_access.html:5
 msgid "Priority"
 msgstr ""
 
-#: REST/methods/authenticators.py:62 REST/model.py:159
+#: REST/methods/authenticators.py:62 REST/model.py:160
 msgid "Label"
 msgstr ""
 
@@ -693,40 +693,40 @@ msgstr ""
 msgid "Tags for this element"
 msgstr ""
 
-#: REST/model.py:133
+#: REST/model.py:134
 msgid "Name of this element"
 msgstr ""
 
-#: REST/model.py:140
+#: REST/model.py:141
 msgid "Comments for this element"
 msgstr ""
 
-#: REST/model.py:149
+#: REST/model.py:150
 msgid ""
 "Selects the priority of this element (lower number means higher priority)"
 msgstr ""
 
-#: REST/model.py:160
+#: REST/model.py:161
 msgid "Label for this element"
 msgstr ""
 
-#: REST/model.py:245
+#: REST/model.py:246
 msgid "Invalid Request"
 msgstr ""
 
-#: REST/model.py:252
+#: REST/model.py:253
 msgid "Method not found in {}: {}"
 msgstr ""
 
-#: REST/model.py:258
+#: REST/model.py:259
 msgid "Item not found"
 msgstr ""
 
-#: REST/model.py:263 web/errors.py:75
+#: REST/model.py:264 web/errors.py:75
 msgid "Access denied"
 msgstr ""
 
-#: REST/model.py:266
+#: REST/model.py:267
 msgid "Operation not supported"
 msgstr ""
 
@@ -2779,11 +2779,11 @@ msgstr ""
 msgid "OpenStack test connection passed"
 msgstr ""
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:610
+#: services/OpenStack/openStack/UDSOpenStackClient.py:609
 msgid "Authentication error"
 msgstr ""
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:612
+#: services/OpenStack/openStack/UDSOpenStackClient.py:611
 msgid ""
 "Openstack does not support identity API 3.2 or newer. This OpenStack server "
 "is not compatible with UDS."
@@ -3241,6 +3241,10 @@ msgstr ""
 msgid "Authenticators"
 msgstr ""
 
+#: templates/uds/admin/snippets/navbar.html:24
+msgid "Os Managers"
+msgstr ""
+
 #: templates/uds/admin/snippets/navbar.html:25
 #: templates/uds/admin/tmpl/connectivity.html:4
 #: templates/uds/admin/tmpl/connectivity.html:7
@@ -3518,6 +3522,10 @@ msgstr ""
 msgid "Max file size for uploading is 256Kb"
 msgstr ""
 
+#: templates/uds/admin/tmpl/osmanagers.html:4
+msgid "OS Managers"
+msgstr ""
+
 #: templates/uds/admin/tmpl/permissions.html:14
 msgid "Revoke user permission"
 msgstr ""
@@ -3584,6 +3592,7 @@ msgid "There was an error requesting data from server, please, try again"
 msgstr ""
 
 #: templates/uds/admin/tmpl/request_failed.html:9
+#: templates/uds/html5/snippets/navbar.html:48
 #: templates/uds/semantic/snippets/user-menu.html:13
 msgid "Dashboard"
 msgstr ""
@@ -3972,6 +3981,11 @@ msgstr ""
 msgid "Preferences"
 msgstr ""
 
+#: templates/uds/html5/snippets/navbar.html:43
+#: templates/uds/semantic/snippets/user-menu.html:10
+msgid "UDS Plugin"
+msgstr ""
+
 #: templates/uds/html5/templates/base.html:61
 #: templates/uds/semantic/templates/base.html:33
 msgid ""
@@ -4041,10 +4055,6 @@ msgstr ""
 msgid "Log In"
 msgstr ""
 
-#: templates/uds/semantic/snippets/user-menu.html:10
-msgid "UDS Plugin"
-msgstr ""
-
 #: templates/uds/semantic/tmpl/items.html:12
 msgid "Session in use"
 msgstr ""
@@ -4151,59 +4161,87 @@ msgid ""
 "\\user)"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid "Show wallpaper"
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid ""
+"If checked, the wallpaper and themes will be shown on machine (better user "
+"experience, more bandwidth)"
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "Allow Desk.Comp."
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "If checked, desktop composition will be allowed"
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "Font Smoothing"
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "If checked, fonts smoothing will be allowed (windows clients only)"
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid "Enable Audio"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid ""
 "If checked, the audio will be redirected to client (if client browser "
 "supports it)"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid "Enable Printing"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid ""
 "If checked, the printing will be redirected to client (if client browser "
 "supports it)"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:80
+#: transports/HTML5RDP/HTML5RDP.py:83
 msgid "Layout"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:81
+#: transports/HTML5RDP/HTML5RDP.py:84
 msgid "Keyboards Layout of server"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:84
+#: transports/HTML5RDP/HTML5RDP.py:87
 msgid "English (US) keyboard"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:85
+#: transports/HTML5RDP/HTML5RDP.py:88
 msgid "German keyboard (qwertz)"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:86
+#: transports/HTML5RDP/HTML5RDP.py:89
 msgid "French keyboard (azerty)"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:87
+#: transports/HTML5RDP/HTML5RDP.py:90
 msgid "Italian keyboard"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:88
+#: transports/HTML5RDP/HTML5RDP.py:91
 msgid "Swedish keyboard"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:89
+#: transports/HTML5RDP/HTML5RDP.py:92
 msgid "Failsafe"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:101
+#: transports/HTML5RDP/HTML5RDP.py:104
 msgid "The server must be http or https"
 msgstr ""
 
@@ -4280,22 +4318,20 @@ msgid ""
 "port. (use HOST:PORT format)"
 msgstr ""
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid "Tunnel host check"
 msgstr ""
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid ""
 "If not empty, this server will be used to check if service is running before "
 "assigning it to user. (use HOST:PORT format)"
 msgstr ""
 
-#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:93
-#: transports/RDS_enterprise/TRDSTransport.py:86
+#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:96
+#: transports/RDS_enterprise/TRDSTransport.py:89
 #: transports/RGS_enterprise/TRGSTransport.py:78
 #: transports/SPICE/TSPICETransport.py:75 transports/X2GO/TX2GOTransport.py:82
 msgid "Must use HOST:PORT in Tunnel Server Field"
@@ -4363,16 +4399,6 @@ msgstr ""
 msgid "If checked, this transport will allow the use of user serial ports"
 msgstr ""
 
-#: transports/RDP/BaseRDPTransport.py:70
-msgid "Show wallpaper"
-msgstr ""
-
-#: transports/RDP/BaseRDPTransport.py:70
-msgid ""
-"If checked, the wallpaper and themes will be shown on machine (better user "
-"experience, more bandwidth)"
-msgstr ""
-
 #: transports/RDP/BaseRDPTransport.py:71
 msgid "Multiple monitors"
 msgstr ""
@@ -4383,24 +4409,6 @@ msgid ""
 "windows clients)"
 msgstr ""
 
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "Allow Desk.Comp."
-msgstr ""
-
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "If checked, desktop composition will be allowed"
-msgstr ""
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "Font Smoothing"
-msgstr ""
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "If checked, fonts smoothing will be allowed (windows clients only)"
-msgstr ""
-
 #: transports/RDP/BaseRDPTransport.py:74
 #: transports/RDS_enterprise/BaseRDSTransport.py:74
 msgid "Multimedia sync"
@@ -4438,6 +4446,16 @@ msgstr ""
 msgid "RDP Transport with tunneled connection"
 msgstr ""
 
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+msgid "Tunnel wait time"
+msgstr ""
+
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+msgid "Maximum time to wait before closing the tunnel listener"
+msgstr ""
+
 #: transports/RDP/__init__.py:40 transports/RDS_enterprise/__init__.py:40
 msgid "Remote Desktop Protocol"
 msgstr ""
diff --git a/server/src/uds/locale/en/LC_MESSAGES/djangojs.po b/server/src/uds/locale/en/LC_MESSAGES/djangojs.po
index 75006edea..a08e8d348 100644
--- a/server/src/uds/locale/en/LC_MESSAGES/djangojs.po
+++ b/server/src/uds/locale/en/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/server/src/uds/locale/es/LC_MESSAGES/django.po b/server/src/uds/locale/es/LC_MESSAGES/django.po
index 6d4a1a665..53f4ffe4f 100644
--- a/server/src/uds/locale/es/LC_MESSAGES/django.po
+++ b/server/src/uds/locale/es/LC_MESSAGES/django.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:19+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/openuds/openuds/language/"
@@ -65,7 +65,7 @@ msgstr "Nombre"
 #: REST/methods/providers.py:67 REST/methods/services.py:190
 #: REST/methods/services_pool_groups.py:65 REST/methods/transports.py:58
 #: REST/methods/user_services.py:262 REST/methods/users_groups.py:114
-#: REST/methods/users_groups.py:258 REST/model.py:139
+#: REST/methods/users_groups.py:258 REST/model.py:140
 #: templates/uds/admin/tmpl/calendar_rule.html:14
 #: templates/uds/admin/tmpl/group.html:49 templates/uds/admin/tmpl/user.html:40
 msgid "Comments"
@@ -73,12 +73,12 @@ msgstr "Comentarios"
 
 #: REST/methods/authenticators.py:61 REST/methods/services_pool_calendars.py:89
 #: REST/methods/services_pool_groups.py:62 REST/methods/transports.py:56
-#: REST/methods/user_services.py:259 REST/model.py:148
+#: REST/methods/user_services.py:259 REST/model.py:149
 #: templates/uds/admin/tmpl/pool_add_access.html:5
 msgid "Priority"
 msgstr "Prioridad"
 
-#: REST/methods/authenticators.py:62 REST/model.py:159
+#: REST/methods/authenticators.py:62 REST/model.py:160
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -716,41 +716,41 @@ msgstr "Etiquetas"
 msgid "Tags for this element"
 msgstr "Etiquetas para este elemento"
 
-#: REST/model.py:133
+#: REST/model.py:134
 msgid "Name of this element"
 msgstr "Nombre de este elemento"
 
-#: REST/model.py:140
+#: REST/model.py:141
 msgid "Comments for this element"
 msgstr "Comentarios para este elemento"
 
-#: REST/model.py:149
+#: REST/model.py:150
 msgid ""
 "Selects the priority of this element (lower number means higher priority)"
 msgstr ""
 "Selecciona la prioridad de este elemento (a menor número, mayor prioridad)"
 
-#: REST/model.py:160
+#: REST/model.py:161
 msgid "Label for this element"
 msgstr "Etiqueta para este elemento"
 
-#: REST/model.py:245
+#: REST/model.py:246
 msgid "Invalid Request"
 msgstr "Solicitud no válida"
 
-#: REST/model.py:252
+#: REST/model.py:253
 msgid "Method not found in {}: {}"
 msgstr "Método no encontrado en {}: {}"
 
-#: REST/model.py:258
+#: REST/model.py:259
 msgid "Item not found"
 msgstr "Elemento no encontrado"
 
-#: REST/model.py:263 web/errors.py:75
+#: REST/model.py:264 web/errors.py:75
 msgid "Access denied"
 msgstr "Acceso denegado"
 
-#: REST/model.py:266
+#: REST/model.py:267
 msgid "Operation not supported"
 msgstr "Operación no soportada"
 
@@ -2894,11 +2894,11 @@ msgstr "Tiempo de espera en segundos de conexión a OpenStack"
 msgid "OpenStack test connection passed"
 msgstr "Prueba de conexión a OpenStack superada"
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:610
+#: services/OpenStack/openStack/UDSOpenStackClient.py:609
 msgid "Authentication error"
 msgstr "Error de autenticación"
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:612
+#: services/OpenStack/openStack/UDSOpenStackClient.py:611
 msgid ""
 "Openstack does not support identity API 3.2 or newer. This OpenStack server "
 "is not compatible with UDS."
@@ -3379,6 +3379,11 @@ msgstr "Resumen"
 msgid "Authenticators"
 msgstr "Autenticadores"
 
+#: templates/uds/admin/snippets/navbar.html:24
+#| msgid "OS Manager"
+msgid "Os Managers"
+msgstr "Os administradores"
+
 #: templates/uds/admin/snippets/navbar.html:25
 #: templates/uds/admin/tmpl/connectivity.html:4
 #: templates/uds/admin/tmpl/connectivity.html:7
@@ -3658,6 +3663,11 @@ msgstr "Imagen será redimensionada a "
 msgid "Max file size for uploading is 256Kb"
 msgstr "Tamaño máximo del archivo para cargar es de 256Kb"
 
+#: templates/uds/admin/tmpl/osmanagers.html:4
+#| msgid "OS Manager"
+msgid "OS Managers"
+msgstr "OS administradores"
+
 #: templates/uds/admin/tmpl/permissions.html:14
 msgid "Revoke user permission"
 msgstr "Revocar el permiso de usuario"
@@ -3725,6 +3735,7 @@ msgstr ""
 "Hubo un error al solicitar los datos del servidor, por favor, pruebe otra vez"
 
 #: templates/uds/admin/tmpl/request_failed.html:9
+#: templates/uds/html5/snippets/navbar.html:48
 #: templates/uds/semantic/snippets/user-menu.html:13
 msgid "Dashboard"
 msgstr "Panel de control"
@@ -4139,6 +4150,11 @@ msgstr "Acerca de"
 msgid "Preferences"
 msgstr "Preferencias"
 
+#: templates/uds/html5/snippets/navbar.html:43
+#: templates/uds/semantic/snippets/user-menu.html:10
+msgid "UDS Plugin"
+msgstr "Plugin UDS"
+
 #: templates/uds/html5/templates/base.html:61
 #: templates/uds/semantic/templates/base.html:33
 msgid ""
@@ -4218,10 +4234,6 @@ msgstr ""
 msgid "Log In"
 msgstr "Inicia sesión"
 
-#: templates/uds/semantic/snippets/user-menu.html:10
-msgid "UDS Plugin"
-msgstr "Plugin UDS"
-
 #: templates/uds/semantic/tmpl/items.html:12
 msgid "Session in use"
 msgstr "Sesión en uso"
@@ -4337,11 +4349,42 @@ msgstr ""
 "Si no está vacío, este dominio se utilizará siempre como parte de las "
 "credenciales (como DOMINIO\\usuario)"
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid "Show wallpaper"
+msgstr "Mostrar fondo de pantalla "
+
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid ""
+"If checked, the wallpaper and themes will be shown on machine (better user "
+"experience, more bandwidth)"
+msgstr ""
+"Si está marcada, el fondo de pantalla y los temas aparecerán en la máquina "
+"(mayor ancho de banda, mejor experiencia de usuario)"
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "Allow Desk.Comp."
+msgstr "Permite Desk.Comp."
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "If checked, desktop composition will be allowed"
+msgstr "Si está marcada, se permitirá la composición de escritorio"
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "Font Smoothing"
+msgstr "Suavizado de fuentes"
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "If checked, fonts smoothing will be allowed (windows clients only)"
+msgstr ""
+"Si está marcada, suavizado de fuentes permitirá (sólo clientes windows)"
+
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid "Enable Audio"
 msgstr "Activar el sonido"
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid ""
 "If checked, the audio will be redirected to client (if client browser "
 "supports it)"
@@ -4349,11 +4392,11 @@ msgstr ""
 "Si está activado, el audio se redirigirá al cliente (si el explorador "
 "cliente lo soporta)"
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid "Enable Printing"
 msgstr "Habilitar la impresión"
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid ""
 "If checked, the printing will be redirected to client (if client browser "
 "supports it)"
@@ -4361,39 +4404,39 @@ msgstr ""
 "Si está activada, la impresión se redireccionará al cliente (si el "
 "explorador cliente lo soporta)"
 
-#: transports/HTML5RDP/HTML5RDP.py:80
+#: transports/HTML5RDP/HTML5RDP.py:83
 msgid "Layout"
 msgstr "Distribución"
 
-#: transports/HTML5RDP/HTML5RDP.py:81
+#: transports/HTML5RDP/HTML5RDP.py:84
 msgid "Keyboards Layout of server"
 msgstr "Distribución de los teclados del servidor"
 
-#: transports/HTML5RDP/HTML5RDP.py:84
+#: transports/HTML5RDP/HTML5RDP.py:87
 msgid "English (US) keyboard"
 msgstr "Teclado en inglés (Estados Unidos)"
 
-#: transports/HTML5RDP/HTML5RDP.py:85
+#: transports/HTML5RDP/HTML5RDP.py:88
 msgid "German keyboard (qwertz)"
 msgstr "Teclado en alemán (qwertz)"
 
-#: transports/HTML5RDP/HTML5RDP.py:86
+#: transports/HTML5RDP/HTML5RDP.py:89
 msgid "French keyboard (azerty)"
 msgstr "Teclado en francés (azerty)"
 
-#: transports/HTML5RDP/HTML5RDP.py:87
+#: transports/HTML5RDP/HTML5RDP.py:90
 msgid "Italian keyboard"
 msgstr "Teclado en italiano"
 
-#: transports/HTML5RDP/HTML5RDP.py:88
+#: transports/HTML5RDP/HTML5RDP.py:91
 msgid "Swedish keyboard"
 msgstr "Teclado en sueco"
 
-#: transports/HTML5RDP/HTML5RDP.py:89
+#: transports/HTML5RDP/HTML5RDP.py:92
 msgid "Failsafe"
 msgstr "A prueba de fallos"
 
-#: transports/HTML5RDP/HTML5RDP.py:101
+#: transports/HTML5RDP/HTML5RDP.py:104
 msgid "The server must be http or https"
 msgstr "El servidor debe ser http o https"
 
@@ -4472,14 +4515,12 @@ msgstr ""
 "IP o nombre de host del servidor túnel enviada al dispositivo cliente (ip "
 "\"pública\") y puerto. (utilice el formato HOST: Puerto)"
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid "Tunnel host check"
 msgstr "Verificación de host del túnel"
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid ""
 "If not empty, this server will be used to check if service is running before "
@@ -4489,8 +4530,8 @@ msgstr ""
 "se está ejecutando antes de asignárselo al usuario. (utilice el formato "
 "HOST: PUERTO)"
 
-#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:93
-#: transports/RDS_enterprise/TRDSTransport.py:86
+#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:96
+#: transports/RDS_enterprise/TRDSTransport.py:89
 #: transports/RGS_enterprise/TRGSTransport.py:78
 #: transports/SPICE/TSPICETransport.py:75 transports/X2GO/TX2GOTransport.py:82
 msgid "Must use HOST:PORT in Tunnel Server Field"
@@ -4567,18 +4608,6 @@ msgstr ""
 "Si está seleccionado, este transporte permitirá el uso de series de puertos "
 "de usuario"
 
-#: transports/RDP/BaseRDPTransport.py:70
-msgid "Show wallpaper"
-msgstr "Mostrar fondo de pantalla "
-
-#: transports/RDP/BaseRDPTransport.py:70
-msgid ""
-"If checked, the wallpaper and themes will be shown on machine (better user "
-"experience, more bandwidth)"
-msgstr ""
-"Si está marcada, el fondo de pantalla y los temas aparecerán en la máquina "
-"(mayor ancho de banda, mejor experiencia de usuario)"
-
 #: transports/RDP/BaseRDPTransport.py:71
 msgid "Multiple monitors"
 msgstr "Varios monitores"
@@ -4591,25 +4620,6 @@ msgstr ""
 "Si está marcada, todos los monitores cliente se utilizarán para visualizar "
 "(sólo funciona en clientes Windows)"
 
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "Allow Desk.Comp."
-msgstr "Permite Desk.Comp."
-
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "If checked, desktop composition will be allowed"
-msgstr "Si está marcada, se permitirá la composición de escritorio"
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "Font Smoothing"
-msgstr "Suavizado de fuentes"
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "If checked, fonts smoothing will be allowed (windows clients only)"
-msgstr ""
-"Si está marcada, suavizado de fuentes permitirá (sólo clientes windows)"
-
 #: transports/RDP/BaseRDPTransport.py:74
 #: transports/RDS_enterprise/BaseRDSTransport.py:74
 msgid "Multimedia sync"
@@ -4650,6 +4660,17 @@ msgstr "Transporte RDP (vía túnel)"
 msgid "RDP Transport with tunneled connection"
 msgstr "Transporte RDP con conexión de túnel"
 
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+#| msgid "Tunnel host check"
+msgid "Tunnel wait time"
+msgstr "Tiempo de espera de túnel"
+
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+msgid "Maximum time to wait before closing the tunnel listener"
+msgstr "Tiempo máximo de espera antes de cerrar el agente de escucha del túnel"
+
 #: transports/RDP/__init__.py:40 transports/RDS_enterprise/__init__.py:40
 msgid "Remote Desktop Protocol"
 msgstr "Protocolo de Escritorio Remoto (RDP)"
diff --git a/server/src/uds/locale/es/LC_MESSAGES/djangojs.po b/server/src/uds/locale/es/LC_MESSAGES/djangojs.po
index aa51b4105..9e27828f7 100644
--- a/server/src/uds/locale/es/LC_MESSAGES/djangojs.po
+++ b/server/src/uds/locale/es/LC_MESSAGES/djangojs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:19+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/openuds/openuds/language/"
diff --git a/server/src/uds/locale/eu/LC_MESSAGES/django.po b/server/src/uds/locale/eu/LC_MESSAGES/django.po
index ef75e9f01..944c64b6a 100644
--- a/server/src/uds/locale/eu/LC_MESSAGES/django.po
+++ b/server/src/uds/locale/eu/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:18+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: Basque (http://www.transifex.com/openuds/openuds/language/"
@@ -61,7 +61,7 @@ msgstr "Izena"
 #: REST/methods/providers.py:67 REST/methods/services.py:190
 #: REST/methods/services_pool_groups.py:65 REST/methods/transports.py:58
 #: REST/methods/user_services.py:262 REST/methods/users_groups.py:114
-#: REST/methods/users_groups.py:258 REST/model.py:139
+#: REST/methods/users_groups.py:258 REST/model.py:140
 #: templates/uds/admin/tmpl/calendar_rule.html:14
 #: templates/uds/admin/tmpl/group.html:49 templates/uds/admin/tmpl/user.html:40
 msgid "Comments"
@@ -69,12 +69,12 @@ msgstr "Iruzkinak"
 
 #: REST/methods/authenticators.py:61 REST/methods/services_pool_calendars.py:89
 #: REST/methods/services_pool_groups.py:62 REST/methods/transports.py:56
-#: REST/methods/user_services.py:259 REST/model.py:148
+#: REST/methods/user_services.py:259 REST/model.py:149
 #: templates/uds/admin/tmpl/pool_add_access.html:5
 msgid "Priority"
 msgstr "Lehentasuna"
 
-#: REST/methods/authenticators.py:62 REST/model.py:159
+#: REST/methods/authenticators.py:62 REST/model.py:160
 msgid "Label"
 msgstr ""
 
@@ -697,40 +697,40 @@ msgstr ""
 msgid "Tags for this element"
 msgstr ""
 
-#: REST/model.py:133
+#: REST/model.py:134
 msgid "Name of this element"
 msgstr ""
 
-#: REST/model.py:140
+#: REST/model.py:141
 msgid "Comments for this element"
 msgstr ""
 
-#: REST/model.py:149
+#: REST/model.py:150
 msgid ""
 "Selects the priority of this element (lower number means higher priority)"
 msgstr ""
 
-#: REST/model.py:160
+#: REST/model.py:161
 msgid "Label for this element"
 msgstr ""
 
-#: REST/model.py:245
+#: REST/model.py:246
 msgid "Invalid Request"
 msgstr ""
 
-#: REST/model.py:252
+#: REST/model.py:253
 msgid "Method not found in {}: {}"
 msgstr ""
 
-#: REST/model.py:258
+#: REST/model.py:259
 msgid "Item not found"
 msgstr ""
 
-#: REST/model.py:263 web/errors.py:75
+#: REST/model.py:264 web/errors.py:75
 msgid "Access denied"
 msgstr ""
 
-#: REST/model.py:266
+#: REST/model.py:267
 msgid "Operation not supported"
 msgstr ""
 
@@ -2783,11 +2783,11 @@ msgstr ""
 msgid "OpenStack test connection passed"
 msgstr ""
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:610
+#: services/OpenStack/openStack/UDSOpenStackClient.py:609
 msgid "Authentication error"
 msgstr ""
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:612
+#: services/OpenStack/openStack/UDSOpenStackClient.py:611
 msgid ""
 "Openstack does not support identity API 3.2 or newer. This OpenStack server "
 "is not compatible with UDS."
@@ -3245,6 +3245,12 @@ msgstr "Orokorra"
 msgid "Authenticators"
 msgstr ""
 
+#: templates/uds/admin/snippets/navbar.html:24
+#, fuzzy
+#| msgid "OS Manager"
+msgid "Os Managers"
+msgstr "SE kudeatzailea"
+
 #: templates/uds/admin/snippets/navbar.html:25
 #: templates/uds/admin/tmpl/connectivity.html:4
 #: templates/uds/admin/tmpl/connectivity.html:7
@@ -3522,6 +3528,12 @@ msgstr ""
 msgid "Max file size for uploading is 256Kb"
 msgstr ""
 
+#: templates/uds/admin/tmpl/osmanagers.html:4
+#, fuzzy
+#| msgid "OS Manager"
+msgid "OS Managers"
+msgstr "SE kudeatzailea"
+
 #: templates/uds/admin/tmpl/permissions.html:14
 msgid "Revoke user permission"
 msgstr ""
@@ -3588,6 +3600,7 @@ msgid "There was an error requesting data from server, please, try again"
 msgstr ""
 
 #: templates/uds/admin/tmpl/request_failed.html:9
+#: templates/uds/html5/snippets/navbar.html:48
 #: templates/uds/semantic/snippets/user-menu.html:13
 msgid "Dashboard"
 msgstr ""
@@ -3976,6 +3989,11 @@ msgstr ""
 msgid "Preferences"
 msgstr ""
 
+#: templates/uds/html5/snippets/navbar.html:43
+#: templates/uds/semantic/snippets/user-menu.html:10
+msgid "UDS Plugin"
+msgstr ""
+
 #: templates/uds/html5/templates/base.html:61
 #: templates/uds/semantic/templates/base.html:33
 msgid ""
@@ -4045,10 +4063,6 @@ msgstr ""
 msgid "Log In"
 msgstr ""
 
-#: templates/uds/semantic/snippets/user-menu.html:10
-msgid "UDS Plugin"
-msgstr ""
-
 #: templates/uds/semantic/tmpl/items.html:12
 msgid "Session in use"
 msgstr ""
@@ -4155,59 +4169,87 @@ msgid ""
 "\\user)"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid "Show wallpaper"
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid ""
+"If checked, the wallpaper and themes will be shown on machine (better user "
+"experience, more bandwidth)"
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "Allow Desk.Comp."
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "If checked, desktop composition will be allowed"
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "Font Smoothing"
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "If checked, fonts smoothing will be allowed (windows clients only)"
+msgstr ""
+
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid "Enable Audio"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid ""
 "If checked, the audio will be redirected to client (if client browser "
 "supports it)"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid "Enable Printing"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid ""
 "If checked, the printing will be redirected to client (if client browser "
 "supports it)"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:80
+#: transports/HTML5RDP/HTML5RDP.py:83
 msgid "Layout"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:81
+#: transports/HTML5RDP/HTML5RDP.py:84
 msgid "Keyboards Layout of server"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:84
+#: transports/HTML5RDP/HTML5RDP.py:87
 msgid "English (US) keyboard"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:85
+#: transports/HTML5RDP/HTML5RDP.py:88
 msgid "German keyboard (qwertz)"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:86
+#: transports/HTML5RDP/HTML5RDP.py:89
 msgid "French keyboard (azerty)"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:87
+#: transports/HTML5RDP/HTML5RDP.py:90
 msgid "Italian keyboard"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:88
+#: transports/HTML5RDP/HTML5RDP.py:91
 msgid "Swedish keyboard"
 msgstr "Suediar Teklatua"
 
-#: transports/HTML5RDP/HTML5RDP.py:89
+#: transports/HTML5RDP/HTML5RDP.py:92
 msgid "Failsafe"
 msgstr ""
 
-#: transports/HTML5RDP/HTML5RDP.py:101
+#: transports/HTML5RDP/HTML5RDP.py:104
 msgid "The server must be http or https"
 msgstr ""
 
@@ -4284,22 +4326,20 @@ msgid ""
 "port. (use HOST:PORT format)"
 msgstr ""
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid "Tunnel host check"
 msgstr ""
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid ""
 "If not empty, this server will be used to check if service is running before "
 "assigning it to user. (use HOST:PORT format)"
 msgstr ""
 
-#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:93
-#: transports/RDS_enterprise/TRDSTransport.py:86
+#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:96
+#: transports/RDS_enterprise/TRDSTransport.py:89
 #: transports/RGS_enterprise/TRGSTransport.py:78
 #: transports/SPICE/TSPICETransport.py:75 transports/X2GO/TX2GOTransport.py:82
 msgid "Must use HOST:PORT in Tunnel Server Field"
@@ -4367,16 +4407,6 @@ msgstr ""
 msgid "If checked, this transport will allow the use of user serial ports"
 msgstr ""
 
-#: transports/RDP/BaseRDPTransport.py:70
-msgid "Show wallpaper"
-msgstr ""
-
-#: transports/RDP/BaseRDPTransport.py:70
-msgid ""
-"If checked, the wallpaper and themes will be shown on machine (better user "
-"experience, more bandwidth)"
-msgstr ""
-
 #: transports/RDP/BaseRDPTransport.py:71
 msgid "Multiple monitors"
 msgstr ""
@@ -4387,24 +4417,6 @@ msgid ""
 "windows clients)"
 msgstr ""
 
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "Allow Desk.Comp."
-msgstr ""
-
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "If checked, desktop composition will be allowed"
-msgstr ""
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "Font Smoothing"
-msgstr ""
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "If checked, fonts smoothing will be allowed (windows clients only)"
-msgstr ""
-
 #: transports/RDP/BaseRDPTransport.py:74
 #: transports/RDS_enterprise/BaseRDSTransport.py:74
 msgid "Multimedia sync"
@@ -4442,6 +4454,16 @@ msgstr ""
 msgid "RDP Transport with tunneled connection"
 msgstr ""
 
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+msgid "Tunnel wait time"
+msgstr ""
+
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+msgid "Maximum time to wait before closing the tunnel listener"
+msgstr ""
+
 #: transports/RDP/__init__.py:40 transports/RDS_enterprise/__init__.py:40
 msgid "Remote Desktop Protocol"
 msgstr ""
diff --git a/server/src/uds/locale/eu/LC_MESSAGES/djangojs.po b/server/src/uds/locale/eu/LC_MESSAGES/djangojs.po
index 766f7a122..5a0dd8a08 100644
--- a/server/src/uds/locale/eu/LC_MESSAGES/djangojs.po
+++ b/server/src/uds/locale/eu/LC_MESSAGES/djangojs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:19+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: Basque (http://www.transifex.com/openuds/openuds/language/"
diff --git a/server/src/uds/locale/fr/LC_MESSAGES/django.po b/server/src/uds/locale/fr/LC_MESSAGES/django.po
index e3a68e439..6f639882e 100644
--- a/server/src/uds/locale/fr/LC_MESSAGES/django.po
+++ b/server/src/uds/locale/fr/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:19+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: French (http://www.transifex.com/openuds/openuds/language/"
@@ -61,7 +61,7 @@ msgstr "Nom"
 #: REST/methods/providers.py:67 REST/methods/services.py:190
 #: REST/methods/services_pool_groups.py:65 REST/methods/transports.py:58
 #: REST/methods/user_services.py:262 REST/methods/users_groups.py:114
-#: REST/methods/users_groups.py:258 REST/model.py:139
+#: REST/methods/users_groups.py:258 REST/model.py:140
 #: templates/uds/admin/tmpl/calendar_rule.html:14
 #: templates/uds/admin/tmpl/group.html:49 templates/uds/admin/tmpl/user.html:40
 msgid "Comments"
@@ -69,12 +69,12 @@ msgstr "Commentaires"
 
 #: REST/methods/authenticators.py:61 REST/methods/services_pool_calendars.py:89
 #: REST/methods/services_pool_groups.py:62 REST/methods/transports.py:56
-#: REST/methods/user_services.py:259 REST/model.py:148
+#: REST/methods/user_services.py:259 REST/model.py:149
 #: templates/uds/admin/tmpl/pool_add_access.html:5
 msgid "Priority"
 msgstr "Priorité"
 
-#: REST/methods/authenticators.py:62 REST/model.py:159
+#: REST/methods/authenticators.py:62 REST/model.py:160
 msgid "Label"
 msgstr "Étiquette"
 
@@ -712,42 +712,42 @@ msgstr "Tags"
 msgid "Tags for this element"
 msgstr "Tags pour cet élément"
 
-#: REST/model.py:133
+#: REST/model.py:134
 msgid "Name of this element"
 msgstr "Nom de cet élément"
 
-#: REST/model.py:140
+#: REST/model.py:141
 msgid "Comments for this element"
 msgstr "Commentaires pour cet élément"
 
-#: REST/model.py:149
+#: REST/model.py:150
 msgid ""
 "Selects the priority of this element (lower number means higher priority)"
 msgstr ""
 "Sélectionne la priorité de cet élément (priorité supérieure de moyens nombre "
 "inférieur)"
 
-#: REST/model.py:160
+#: REST/model.py:161
 msgid "Label for this element"
 msgstr "Étiquette pour cet élément"
 
-#: REST/model.py:245
+#: REST/model.py:246
 msgid "Invalid Request"
 msgstr "Requête non valide"
 
-#: REST/model.py:252
+#: REST/model.py:253
 msgid "Method not found in {}: {}"
 msgstr "Méthode introuvable {}: {}"
 
-#: REST/model.py:258
+#: REST/model.py:259
 msgid "Item not found"
 msgstr "Élément introuvable"
 
-#: REST/model.py:263 web/errors.py:75
+#: REST/model.py:264 web/errors.py:75
 msgid "Access denied"
 msgstr "Accès refusé"
 
-#: REST/model.py:266
+#: REST/model.py:267
 msgid "Operation not supported"
 msgstr "Opération non prise en charge"
 
@@ -2907,11 +2907,11 @@ msgstr "Délai d'attente en secondes de connexion à OpenStack"
 msgid "OpenStack test connection passed"
 msgstr "OpenStack test de connexion passée"
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:610
+#: services/OpenStack/openStack/UDSOpenStackClient.py:609
 msgid "Authentication error"
 msgstr "Erreur d'authentification"
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:612
+#: services/OpenStack/openStack/UDSOpenStackClient.py:611
 msgid ""
 "Openstack does not support identity API 3.2 or newer. This OpenStack server "
 "is not compatible with UDS."
@@ -3390,6 +3390,11 @@ msgstr "Vue d'ensemble"
 msgid "Authenticators"
 msgstr "Authentificateurs"
 
+#: templates/uds/admin/snippets/navbar.html:24
+#| msgid "OS Manager"
+msgid "Os Managers"
+msgstr "Gestionnaires de l’OS"
+
 #: templates/uds/admin/snippets/navbar.html:25
 #: templates/uds/admin/tmpl/connectivity.html:4
 #: templates/uds/admin/tmpl/connectivity.html:7
@@ -3667,6 +3672,11 @@ msgstr "Image sera redimensionnée à "
 msgid "Max file size for uploading is 256Kb"
 msgstr "Taille max. du fichier de téléchargement est de 256 Ko"
 
+#: templates/uds/admin/tmpl/osmanagers.html:4
+#| msgid "OS Manager"
+msgid "OS Managers"
+msgstr "Gestionnaires de l’OS"
+
 #: templates/uds/admin/tmpl/permissions.html:14
 msgid "Revoke user permission"
 msgstr "Révoquer l'autorisation de l'utilisateur"
@@ -3735,6 +3745,7 @@ msgstr ""
 "plaît, essaient à nouveau"
 
 #: templates/uds/admin/tmpl/request_failed.html:9
+#: templates/uds/html5/snippets/navbar.html:48
 #: templates/uds/semantic/snippets/user-menu.html:13
 msgid "Dashboard"
 msgstr "Tableau de bord"
@@ -4149,6 +4160,11 @@ msgstr "Sur"
 msgid "Preferences"
 msgstr "Préférences"
 
+#: templates/uds/html5/snippets/navbar.html:43
+#: templates/uds/semantic/snippets/user-menu.html:10
+msgid "UDS Plugin"
+msgstr "Plugin de l’UDS"
+
 #: templates/uds/html5/templates/base.html:61
 #: templates/uds/semantic/templates/base.html:33
 msgid ""
@@ -4229,10 +4245,6 @@ msgstr "Le service est actuellement en maintenance et ne sont pas accessibles."
 msgid "Log In"
 msgstr "Ouvrir une session"
 
-#: templates/uds/semantic/snippets/user-menu.html:10
-msgid "UDS Plugin"
-msgstr "Plugin de l’UDS"
-
 #: templates/uds/semantic/tmpl/items.html:12
 msgid "Session in use"
 msgstr "Session en cours d’utilisation"
@@ -4351,11 +4363,43 @@ msgstr ""
 "Si ce n'est vide, ce domaine sera toujours utilisé comme des titres de "
 "compétences (utilisé comme domaine\\User)"
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid "Show wallpaper"
+msgstr "Voir la papier peint"
+
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid ""
+"If checked, the wallpaper and themes will be shown on machine (better user "
+"experience, more bandwidth)"
+msgstr ""
+"Si coché, le fond d'écran et thèmes seront montrés sur machine (meilleur "
+"utilisateur expérience, plus de bande passante)"
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "Allow Desk.Comp."
+msgstr "Laisser Desk.Comp."
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "If checked, desktop composition will be allowed"
+msgstr "S'il est activé, la composition du bureau sera autorisée"
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "Font Smoothing"
+msgstr "Lissage des polices"
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "If checked, fonts smoothing will be allowed (windows clients only)"
+msgstr ""
+"Si cochée, lissage de polices seront autorisés (seulement pour les clients "
+"windows)"
+
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid "Enable Audio"
 msgstr "Activez l'Audio"
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid ""
 "If checked, the audio will be redirected to client (if client browser "
 "supports it)"
@@ -4363,11 +4407,11 @@ msgstr ""
 "Si coché, le son sera redirigé vers le client (si navigateur client Il prend "
 "en charge)"
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid "Enable Printing"
 msgstr "Activer l'impression"
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid ""
 "If checked, the printing will be redirected to client (if client browser "
 "supports it)"
@@ -4375,39 +4419,39 @@ msgstr ""
 "S'il est activé, l'impression sera redirigée vers le client (si navigateur "
 "client Il prend en charge)"
 
-#: transports/HTML5RDP/HTML5RDP.py:80
+#: transports/HTML5RDP/HTML5RDP.py:83
 msgid "Layout"
 msgstr "Mise en page"
 
-#: transports/HTML5RDP/HTML5RDP.py:81
+#: transports/HTML5RDP/HTML5RDP.py:84
 msgid "Keyboards Layout of server"
 msgstr "Disposition des claviers du serveur"
 
-#: transports/HTML5RDP/HTML5RDP.py:84
+#: transports/HTML5RDP/HTML5RDP.py:87
 msgid "English (US) keyboard"
 msgstr "Clavier anglais (États-Unis)"
 
-#: transports/HTML5RDP/HTML5RDP.py:85
+#: transports/HTML5RDP/HTML5RDP.py:88
 msgid "German keyboard (qwertz)"
 msgstr "Clavier allemand (qwertz)"
 
-#: transports/HTML5RDP/HTML5RDP.py:86
+#: transports/HTML5RDP/HTML5RDP.py:89
 msgid "French keyboard (azerty)"
 msgstr "Clavier Français (azerty)"
 
-#: transports/HTML5RDP/HTML5RDP.py:87
+#: transports/HTML5RDP/HTML5RDP.py:90
 msgid "Italian keyboard"
 msgstr "Clavier italien"
 
-#: transports/HTML5RDP/HTML5RDP.py:88
+#: transports/HTML5RDP/HTML5RDP.py:91
 msgid "Swedish keyboard"
 msgstr "Clavier suédois"
 
-#: transports/HTML5RDP/HTML5RDP.py:89
+#: transports/HTML5RDP/HTML5RDP.py:92
 msgid "Failsafe"
 msgstr "Failsafe"
 
-#: transports/HTML5RDP/HTML5RDP.py:101
+#: transports/HTML5RDP/HTML5RDP.py:104
 msgid "The server must be http or https"
 msgstr "Der Server muss http oder Https sein."
 
@@ -4486,14 +4530,12 @@ msgstr ""
 "Adresse IP ou nom d'hôte du serveur tunnel envoyée au périphérique client "
 "(adresse ip « publique ») et port. (utilisez le format de l'hôte : PORT)"
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid "Tunnel host check"
 msgstr "Tunnel hôte cocher"
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid ""
 "If not empty, this server will be used to check if service is running before "
@@ -4503,8 +4545,8 @@ msgstr ""
 "s'exécute avant assignant à l'utilisateur. (utilisez le format de l'hôte : "
 "PORT)"
 
-#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:93
-#: transports/RDS_enterprise/TRDSTransport.py:86
+#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:96
+#: transports/RDS_enterprise/TRDSTransport.py:89
 #: transports/RGS_enterprise/TRGSTransport.py:78
 #: transports/SPICE/TSPICETransport.py:75 transports/X2GO/TX2GOTransport.py:82
 msgid "Must use HOST:PORT in Tunnel Server Field"
@@ -4579,18 +4621,6 @@ msgid "If checked, this transport will allow the use of user serial ports"
 msgstr ""
 "Si cochée, ce transport permettra l'utilisation de l'utilisateur ports série"
 
-#: transports/RDP/BaseRDPTransport.py:70
-msgid "Show wallpaper"
-msgstr "Voir la papier peint"
-
-#: transports/RDP/BaseRDPTransport.py:70
-msgid ""
-"If checked, the wallpaper and themes will be shown on machine (better user "
-"experience, more bandwidth)"
-msgstr ""
-"Si coché, le fond d'écran et thèmes seront montrés sur machine (meilleur "
-"utilisateur expérience, plus de bande passante)"
-
 #: transports/RDP/BaseRDPTransport.py:71
 msgid "Multiple monitors"
 msgstr "Plusieurs moniteurs"
@@ -4603,26 +4633,6 @@ msgstr ""
 "S'il est activé, tous les moniteurs de client seront utilisés pour "
 "l'affichage (fonctionne uniquement sur clients Windows)"
 
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "Allow Desk.Comp."
-msgstr "Laisser Desk.Comp."
-
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "If checked, desktop composition will be allowed"
-msgstr "S'il est activé, la composition du bureau sera autorisée"
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "Font Smoothing"
-msgstr "Lissage des polices"
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "If checked, fonts smoothing will be allowed (windows clients only)"
-msgstr ""
-"Si cochée, lissage de polices seront autorisés (seulement pour les clients "
-"windows)"
-
 #: transports/RDP/BaseRDPTransport.py:74
 #: transports/RDS_enterprise/BaseRDSTransport.py:74
 msgid "Multimedia sync"
@@ -4662,6 +4672,17 @@ msgstr "Transport de RDP (tunnel)"
 msgid "RDP Transport with tunneled connection"
 msgstr "Transport de RDP avec connexion par tunnel"
 
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+#| msgid "Tunnel host check"
+msgid "Tunnel wait time"
+msgstr "Délai d’attente de tunnel"
+
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+msgid "Maximum time to wait before closing the tunnel listener"
+msgstr "Temps maximum d’attente avant la fermeture de l’auditeur de tunnel"
+
 #: transports/RDP/__init__.py:40 transports/RDS_enterprise/__init__.py:40
 msgid "Remote Desktop Protocol"
 msgstr "Protocole Bureau distant"
diff --git a/server/src/uds/locale/fr/LC_MESSAGES/djangojs.po b/server/src/uds/locale/fr/LC_MESSAGES/djangojs.po
index e9626768e..186278c53 100644
--- a/server/src/uds/locale/fr/LC_MESSAGES/djangojs.po
+++ b/server/src/uds/locale/fr/LC_MESSAGES/djangojs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:19+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: French (http://www.transifex.com/openuds/openuds/language/"
diff --git a/server/src/uds/locale/it/LC_MESSAGES/django.po b/server/src/uds/locale/it/LC_MESSAGES/django.po
index ec491cba9..09de1d018 100644
--- a/server/src/uds/locale/it/LC_MESSAGES/django.po
+++ b/server/src/uds/locale/it/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:19+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: Italian (http://www.transifex.com/openuds/openuds/language/"
@@ -59,7 +59,7 @@ msgstr "Nome"
 #: REST/methods/providers.py:67 REST/methods/services.py:190
 #: REST/methods/services_pool_groups.py:65 REST/methods/transports.py:58
 #: REST/methods/user_services.py:262 REST/methods/users_groups.py:114
-#: REST/methods/users_groups.py:258 REST/model.py:139
+#: REST/methods/users_groups.py:258 REST/model.py:140
 #: templates/uds/admin/tmpl/calendar_rule.html:14
 #: templates/uds/admin/tmpl/group.html:49 templates/uds/admin/tmpl/user.html:40
 msgid "Comments"
@@ -67,12 +67,12 @@ msgstr "Commenti"
 
 #: REST/methods/authenticators.py:61 REST/methods/services_pool_calendars.py:89
 #: REST/methods/services_pool_groups.py:62 REST/methods/transports.py:56
-#: REST/methods/user_services.py:259 REST/model.py:148
+#: REST/methods/user_services.py:259 REST/model.py:149
 #: templates/uds/admin/tmpl/pool_add_access.html:5
 msgid "Priority"
 msgstr "Priorità"
 
-#: REST/methods/authenticators.py:62 REST/model.py:159
+#: REST/methods/authenticators.py:62 REST/model.py:160
 msgid "Label"
 msgstr "Etichetta"
 
@@ -706,42 +706,42 @@ msgstr "Tag"
 msgid "Tags for this element"
 msgstr "Tag per questo elemento"
 
-#: REST/model.py:133
+#: REST/model.py:134
 msgid "Name of this element"
 msgstr "Nome di questo elemento"
 
-#: REST/model.py:140
+#: REST/model.py:141
 msgid "Comments for this element"
 msgstr "Commenti per questo elemento"
 
-#: REST/model.py:149
+#: REST/model.py:150
 msgid ""
 "Selects the priority of this element (lower number means higher priority)"
 msgstr ""
 "Seleziona la priorità di questo elemento (numero significa maggiore priorità "
 "inferiore)"
 
-#: REST/model.py:160
+#: REST/model.py:161
 msgid "Label for this element"
 msgstr "Etichetta per questo elemento"
 
-#: REST/model.py:245
+#: REST/model.py:246
 msgid "Invalid Request"
 msgstr "Richiesta non valida"
 
-#: REST/model.py:252
+#: REST/model.py:253
 msgid "Method not found in {}: {}"
 msgstr "Metodo non trovato in {}: {}"
 
-#: REST/model.py:258
+#: REST/model.py:259
 msgid "Item not found"
 msgstr "Articolo non trovato"
 
-#: REST/model.py:263 web/errors.py:75
+#: REST/model.py:264 web/errors.py:75
 msgid "Access denied"
 msgstr "Accesso negato"
 
-#: REST/model.py:266
+#: REST/model.py:267
 msgid "Operation not supported"
 msgstr "Operazione non supportata"
 
@@ -2874,11 +2874,11 @@ msgstr "Timeout in secondi di connessione a OpenStack"
 msgid "OpenStack test connection passed"
 msgstr "OpenStack test connessione passata"
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:610
+#: services/OpenStack/openStack/UDSOpenStackClient.py:609
 msgid "Authentication error"
 msgstr "Errore di autenticazione"
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:612
+#: services/OpenStack/openStack/UDSOpenStackClient.py:611
 msgid ""
 "Openstack does not support identity API 3.2 or newer. This OpenStack server "
 "is not compatible with UDS."
@@ -3355,6 +3355,11 @@ msgstr "Panoramica"
 msgid "Authenticators"
 msgstr "Autenticatori"
 
+#: templates/uds/admin/snippets/navbar.html:24
+#| msgid "OS Manager"
+msgid "Os Managers"
+msgstr "Gestori di OS"
+
 #: templates/uds/admin/snippets/navbar.html:25
 #: templates/uds/admin/tmpl/connectivity.html:4
 #: templates/uds/admin/tmpl/connectivity.html:7
@@ -3634,6 +3639,11 @@ msgstr "Immagine sarà ridimensionata a "
 msgid "Max file size for uploading is 256Kb"
 msgstr "Dimensione massima del file per l'upload è 256Kb"
 
+#: templates/uds/admin/tmpl/osmanagers.html:4
+#| msgid "OS Manager"
+msgid "OS Managers"
+msgstr "Gestori di OS"
+
 #: templates/uds/admin/tmpl/permissions.html:14
 msgid "Revoke user permission"
 msgstr "Revocare l'autorizzazione utente"
@@ -3700,6 +3710,7 @@ msgid "There was an error requesting data from server, please, try again"
 msgstr "C'era un errore che richiede dati dal server, per favore, riprova"
 
 #: templates/uds/admin/tmpl/request_failed.html:9
+#: templates/uds/html5/snippets/navbar.html:48
 #: templates/uds/semantic/snippets/user-menu.html:13
 msgid "Dashboard"
 msgstr "Cruscotto"
@@ -4111,6 +4122,11 @@ msgstr "Circa"
 msgid "Preferences"
 msgstr "Preferenze"
 
+#: templates/uds/html5/snippets/navbar.html:43
+#: templates/uds/semantic/snippets/user-menu.html:10
+msgid "UDS Plugin"
+msgstr "UDS Plugin"
+
 #: templates/uds/html5/templates/base.html:61
 #: templates/uds/semantic/templates/base.html:33
 msgid ""
@@ -4189,10 +4205,6 @@ msgstr "Il servizio è attualmente in manutenzione e non può essere letta."
 msgid "Log In"
 msgstr "Accedi"
 
-#: templates/uds/semantic/snippets/user-menu.html:10
-msgid "UDS Plugin"
-msgstr "UDS Plugin"
-
 #: templates/uds/semantic/tmpl/items.html:12
 msgid "Session in use"
 msgstr "Sessione in uso"
@@ -4306,11 +4318,43 @@ msgstr ""
 "Se non vuota, questo dominio verrà sempre utilizzato come credenziale (usato "
 "come dominio\\User)"
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid "Show wallpaper"
+msgstr "Visualizza sfondi"
+
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid ""
+"If checked, the wallpaper and themes will be shown on machine (better user "
+"experience, more bandwidth)"
+msgstr ""
+"Se selezionata, la carta da parati e temi verranno mostrati sulla macchina "
+"(migliore utente esperienza, più larghezza di banda)"
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "Allow Desk.Comp."
+msgstr "Consentire Desk.Comp."
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "If checked, desktop composition will be allowed"
+msgstr "Se selezionata, sarà consentito composizione desktop"
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "Font Smoothing"
+msgstr "Smussatura dei caratteri"
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "If checked, fonts smoothing will be allowed (windows clients only)"
+msgstr ""
+"Se selezionata, i font smoothing saranno consentiti (solo per i client "
+"windows)"
+
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid "Enable Audio"
 msgstr "Abilitare Audio"
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid ""
 "If checked, the audio will be redirected to client (if client browser "
 "supports it)"
@@ -4318,11 +4362,11 @@ msgstr ""
 "Se selezionata, l'audio verrà reindirizzato al client (se browser client lo "
 "supporta)"
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid "Enable Printing"
 msgstr "Attivare la stampa"
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid ""
 "If checked, the printing will be redirected to client (if client browser "
 "supports it)"
@@ -4330,39 +4374,39 @@ msgstr ""
 "Se selezionata, la stampa verrà reindirizzata al client (se browser client "
 "lo supporta)"
 
-#: transports/HTML5RDP/HTML5RDP.py:80
+#: transports/HTML5RDP/HTML5RDP.py:83
 msgid "Layout"
 msgstr "Layout"
 
-#: transports/HTML5RDP/HTML5RDP.py:81
+#: transports/HTML5RDP/HTML5RDP.py:84
 msgid "Keyboards Layout of server"
 msgstr "Layout di tastiera del server"
 
-#: transports/HTML5RDP/HTML5RDP.py:84
+#: transports/HTML5RDP/HTML5RDP.py:87
 msgid "English (US) keyboard"
 msgstr "Tastiera inglese (Stati Uniti)"
 
-#: transports/HTML5RDP/HTML5RDP.py:85
+#: transports/HTML5RDP/HTML5RDP.py:88
 msgid "German keyboard (qwertz)"
 msgstr "Tastiera tedesca (qwertz)"
 
-#: transports/HTML5RDP/HTML5RDP.py:86
+#: transports/HTML5RDP/HTML5RDP.py:89
 msgid "French keyboard (azerty)"
 msgstr "Tastiera francese (azerty)"
 
-#: transports/HTML5RDP/HTML5RDP.py:87
+#: transports/HTML5RDP/HTML5RDP.py:90
 msgid "Italian keyboard"
 msgstr "Tastiera italiana"
 
-#: transports/HTML5RDP/HTML5RDP.py:88
+#: transports/HTML5RDP/HTML5RDP.py:91
 msgid "Swedish keyboard"
 msgstr "Tastiera svedese"
 
-#: transports/HTML5RDP/HTML5RDP.py:89
+#: transports/HTML5RDP/HTML5RDP.py:92
 msgid "Failsafe"
 msgstr "Failsafe"
 
-#: transports/HTML5RDP/HTML5RDP.py:101
+#: transports/HTML5RDP/HTML5RDP.py:104
 msgid "The server must be http or https"
 msgstr "Il server deve essere http o https"
 
@@ -4441,14 +4485,12 @@ msgstr ""
 "IP o l'Hostname del server di tunnel inviato a un dispositivo client (ip "
 "\"pubblico\") e porto. (utilizzare il formato HOST: PORT)"
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid "Tunnel host check"
 msgstr "Controllo host tunnel"
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid ""
 "If not empty, this server will be used to check if service is running before "
@@ -4458,8 +4500,8 @@ msgstr ""
 "in esecuzione prima di assegnandolo all'utente. (utilizzare il formato HOST: "
 "PORT)"
 
-#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:93
-#: transports/RDS_enterprise/TRDSTransport.py:86
+#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:96
+#: transports/RDS_enterprise/TRDSTransport.py:89
 #: transports/RGS_enterprise/TRGSTransport.py:78
 #: transports/SPICE/TSPICETransport.py:75 transports/X2GO/TX2GOTransport.py:82
 msgid "Must use HOST:PORT in Tunnel Server Field"
@@ -4534,18 +4576,6 @@ msgstr ""
 "Se selezionata, questo trasporto consentirà l'utilizzo dell'utente porte "
 "seriali"
 
-#: transports/RDP/BaseRDPTransport.py:70
-msgid "Show wallpaper"
-msgstr "Visualizza sfondi"
-
-#: transports/RDP/BaseRDPTransport.py:70
-msgid ""
-"If checked, the wallpaper and themes will be shown on machine (better user "
-"experience, more bandwidth)"
-msgstr ""
-"Se selezionata, la carta da parati e temi verranno mostrati sulla macchina "
-"(migliore utente esperienza, più larghezza di banda)"
-
 #: transports/RDP/BaseRDPTransport.py:71
 msgid "Multiple monitors"
 msgstr "Monitor multipli"
@@ -4558,26 +4588,6 @@ msgstr ""
 "Se selezionata, tutti i client monitor verranno utilizzati per la "
 "visualizzazione (funziona solo su client Windows)"
 
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "Allow Desk.Comp."
-msgstr "Consentire Desk.Comp."
-
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "If checked, desktop composition will be allowed"
-msgstr "Se selezionata, sarà consentito composizione desktop"
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "Font Smoothing"
-msgstr "Smussatura dei caratteri"
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "If checked, fonts smoothing will be allowed (windows clients only)"
-msgstr ""
-"Se selezionata, i font smoothing saranno consentiti (solo per i client "
-"windows)"
-
 #: transports/RDP/BaseRDPTransport.py:74
 #: transports/RDS_enterprise/BaseRDSTransport.py:74
 msgid "Multimedia sync"
@@ -4618,6 +4628,17 @@ msgstr "Trasporto di RDP (con tunnel)"
 msgid "RDP Transport with tunneled connection"
 msgstr "Trasporto di RDP con connessione con tunnel"
 
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+#| msgid "Tunnel host check"
+msgid "Tunnel wait time"
+msgstr "Tempo di attesa del traforo"
+
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+msgid "Maximum time to wait before closing the tunnel listener"
+msgstr "Tempo massimo di attesa prima di chiudere il listener di tunnel"
+
 #: transports/RDP/__init__.py:40 transports/RDS_enterprise/__init__.py:40
 msgid "Remote Desktop Protocol"
 msgstr "Remote Desktop Protocol"
diff --git a/server/src/uds/locale/it/LC_MESSAGES/djangojs.po b/server/src/uds/locale/it/LC_MESSAGES/djangojs.po
index 691cdc234..2fd95fde8 100644
--- a/server/src/uds/locale/it/LC_MESSAGES/djangojs.po
+++ b/server/src/uds/locale/it/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:19+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: Italian (http://www.transifex.com/openuds/openuds/language/"
diff --git a/server/src/uds/locale/pt/LC_MESSAGES/django.po b/server/src/uds/locale/pt/LC_MESSAGES/django.po
index c7e43efa2..b05721cf8 100644
--- a/server/src/uds/locale/pt/LC_MESSAGES/django.po
+++ b/server/src/uds/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:19+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/openuds/openuds/language/"
@@ -60,7 +60,7 @@ msgstr "Nome"
 #: REST/methods/providers.py:67 REST/methods/services.py:190
 #: REST/methods/services_pool_groups.py:65 REST/methods/transports.py:58
 #: REST/methods/user_services.py:262 REST/methods/users_groups.py:114
-#: REST/methods/users_groups.py:258 REST/model.py:139
+#: REST/methods/users_groups.py:258 REST/model.py:140
 #: templates/uds/admin/tmpl/calendar_rule.html:14
 #: templates/uds/admin/tmpl/group.html:49 templates/uds/admin/tmpl/user.html:40
 msgid "Comments"
@@ -68,12 +68,12 @@ msgstr "Comentários"
 
 #: REST/methods/authenticators.py:61 REST/methods/services_pool_calendars.py:89
 #: REST/methods/services_pool_groups.py:62 REST/methods/transports.py:56
-#: REST/methods/user_services.py:259 REST/model.py:148
+#: REST/methods/user_services.py:259 REST/model.py:149
 #: templates/uds/admin/tmpl/pool_add_access.html:5
 msgid "Priority"
 msgstr "Prioridade"
 
-#: REST/methods/authenticators.py:62 REST/model.py:159
+#: REST/methods/authenticators.py:62 REST/model.py:160
 msgid "Label"
 msgstr "Rótulo"
 
@@ -712,42 +712,42 @@ msgstr "Etiquetas"
 msgid "Tags for this element"
 msgstr "Tags para este elemento."
 
-#: REST/model.py:133
+#: REST/model.py:134
 msgid "Name of this element"
 msgstr "Nome deste elemento"
 
-#: REST/model.py:140
+#: REST/model.py:141
 msgid "Comments for this element"
 msgstr "Comentários para este elemento"
 
-#: REST/model.py:149
+#: REST/model.py:150
 msgid ""
 "Selects the priority of this element (lower number means higher priority)"
 msgstr ""
 "Seleciona a prioridade deste elemento (número significa maior prioridade "
 "mais baixa)"
 
-#: REST/model.py:160
+#: REST/model.py:161
 msgid "Label for this element"
 msgstr "Rótulo para este elemento"
 
-#: REST/model.py:245
+#: REST/model.py:246
 msgid "Invalid Request"
 msgstr "Pedido inválido"
 
-#: REST/model.py:252
+#: REST/model.py:253
 msgid "Method not found in {}: {}"
 msgstr "Método não encontrado em {}: {}"
 
-#: REST/model.py:258
+#: REST/model.py:259
 msgid "Item not found"
 msgstr "Item não encontrado"
 
-#: REST/model.py:263 web/errors.py:75
+#: REST/model.py:264 web/errors.py:75
 msgid "Access denied"
 msgstr "Acesso negado"
 
-#: REST/model.py:266
+#: REST/model.py:267
 msgid "Operation not supported"
 msgstr "Operação não suportada"
 
@@ -2883,11 +2883,11 @@ msgstr "Tempo limite em segundos de conexão para OpenStack"
 msgid "OpenStack test connection passed"
 msgstr "Conexão de teste OpenStack passado"
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:610
+#: services/OpenStack/openStack/UDSOpenStackClient.py:609
 msgid "Authentication error"
 msgstr "Erro de autenticação"
 
-#: services/OpenStack/openStack/UDSOpenStackClient.py:612
+#: services/OpenStack/openStack/UDSOpenStackClient.py:611
 msgid ""
 "Openstack does not support identity API 3.2 or newer. This OpenStack server "
 "is not compatible with UDS."
@@ -3364,6 +3364,11 @@ msgstr "Visão geral"
 msgid "Authenticators"
 msgstr "Autenticadores"
 
+#: templates/uds/admin/snippets/navbar.html:24
+#| msgid "OS Manager"
+msgid "Os Managers"
+msgstr "Os gerentes"
+
 #: templates/uds/admin/snippets/navbar.html:25
 #: templates/uds/admin/tmpl/connectivity.html:4
 #: templates/uds/admin/tmpl/connectivity.html:7
@@ -3642,6 +3647,11 @@ msgstr "Imagem será redimensionada para "
 msgid "Max file size for uploading is 256Kb"
 msgstr "Tamanho máximo de arquivo para upload é 256Kb"
 
+#: templates/uds/admin/tmpl/osmanagers.html:4
+#| msgid "OS Manager"
+msgid "OS Managers"
+msgstr "OS gerentes"
+
 #: templates/uds/admin/tmpl/permissions.html:14
 msgid "Revoke user permission"
 msgstr "Revogar a permissão de usuário"
@@ -3709,6 +3719,7 @@ msgstr ""
 "Houve um erro solicitando dados do servidor, por favor, tente novamente"
 
 #: templates/uds/admin/tmpl/request_failed.html:9
+#: templates/uds/html5/snippets/navbar.html:48
 #: templates/uds/semantic/snippets/user-menu.html:13
 msgid "Dashboard"
 msgstr "Painel de controle"
@@ -4119,6 +4130,11 @@ msgstr "Sobre"
 msgid "Preferences"
 msgstr "Preferências"
 
+#: templates/uds/html5/snippets/navbar.html:43
+#: templates/uds/semantic/snippets/user-menu.html:10
+msgid "UDS Plugin"
+msgstr "Plugin UDS"
+
 #: templates/uds/html5/templates/base.html:61
 #: templates/uds/semantic/templates/base.html:33
 msgid ""
@@ -4198,10 +4214,6 @@ msgstr "O serviço está em manutenção e não pode ser acessado."
 msgid "Log In"
 msgstr "Iniciar sessão"
 
-#: templates/uds/semantic/snippets/user-menu.html:10
-msgid "UDS Plugin"
-msgstr "Plugin UDS"
-
 #: templates/uds/semantic/tmpl/items.html:12
 msgid "Session in use"
 msgstr "Sessão em uso"
@@ -4315,11 +4327,43 @@ msgstr ""
 "Se não for vazio, este domínio será sempre utilizado como credencial (usado "
 "como domínio\\User)"
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid "Show wallpaper"
+msgstr "Mostrar o papel de parede"
+
+#: transports/HTML5RDP/HTML5RDP.py:77 transports/RDP/BaseRDPTransport.py:70
+msgid ""
+"If checked, the wallpaper and themes will be shown on machine (better user "
+"experience, more bandwidth)"
+msgstr ""
+"Se marcada, o papel de parede e temas serão mostrados máquina (usuário "
+"melhor experiência, mais largura de banda)"
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "Allow Desk.Comp."
+msgstr "Permita Desk.Comp."
+
+#: transports/HTML5RDP/HTML5RDP.py:78 transports/RDP/BaseRDPTransport.py:72
+msgid "If checked, desktop composition will be allowed"
+msgstr "Se marcada, composição desktop será permitida"
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "Font Smoothing"
+msgstr "Suavização de fonte"
+
+#: transports/HTML5RDP/HTML5RDP.py:79 transports/RDP/BaseRDPTransport.py:73
+#: transports/RDS_enterprise/BaseRDSTransport.py:73
+msgid "If checked, fonts smoothing will be allowed (windows clients only)"
+msgstr ""
+"Se marcada, suavização de fontes serão permitidos (somente clientes de "
+"windows)"
+
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid "Enable Audio"
 msgstr "Ativar o áudio"
 
-#: transports/HTML5RDP/HTML5RDP.py:77
+#: transports/HTML5RDP/HTML5RDP.py:80
 msgid ""
 "If checked, the audio will be redirected to client (if client browser "
 "supports it)"
@@ -4327,11 +4371,11 @@ msgstr ""
 "Se marcada, o áudio será redirecionado para o cliente (se o navegador "
 "cliente suporta)"
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid "Enable Printing"
 msgstr "Permitir a impressão"
 
-#: transports/HTML5RDP/HTML5RDP.py:78
+#: transports/HTML5RDP/HTML5RDP.py:81
 msgid ""
 "If checked, the printing will be redirected to client (if client browser "
 "supports it)"
@@ -4339,39 +4383,39 @@ msgstr ""
 "Se marcada, a impressão será redirecionado para o cliente (se o navegador "
 "cliente suporta)"
 
-#: transports/HTML5RDP/HTML5RDP.py:80
+#: transports/HTML5RDP/HTML5RDP.py:83
 msgid "Layout"
 msgstr "Layout de"
 
-#: transports/HTML5RDP/HTML5RDP.py:81
+#: transports/HTML5RDP/HTML5RDP.py:84
 msgid "Keyboards Layout of server"
 msgstr "Layout de teclado do servidor"
 
-#: transports/HTML5RDP/HTML5RDP.py:84
+#: transports/HTML5RDP/HTML5RDP.py:87
 msgid "English (US) keyboard"
 msgstr "Teclado inglês (Estados Unidos)"
 
-#: transports/HTML5RDP/HTML5RDP.py:85
+#: transports/HTML5RDP/HTML5RDP.py:88
 msgid "German keyboard (qwertz)"
 msgstr "Teclado alemão (qwertz)"
 
-#: transports/HTML5RDP/HTML5RDP.py:86
+#: transports/HTML5RDP/HTML5RDP.py:89
 msgid "French keyboard (azerty)"
 msgstr "Teclado francês (azerty)"
 
-#: transports/HTML5RDP/HTML5RDP.py:87
+#: transports/HTML5RDP/HTML5RDP.py:90
 msgid "Italian keyboard"
 msgstr "Teclado italiano"
 
-#: transports/HTML5RDP/HTML5RDP.py:88
+#: transports/HTML5RDP/HTML5RDP.py:91
 msgid "Swedish keyboard"
 msgstr "Teclado Sueco"
 
-#: transports/HTML5RDP/HTML5RDP.py:89
+#: transports/HTML5RDP/HTML5RDP.py:92
 msgid "Failsafe"
 msgstr "À prova de falhas"
 
-#: transports/HTML5RDP/HTML5RDP.py:101
+#: transports/HTML5RDP/HTML5RDP.py:104
 msgid "The server must be http or https"
 msgstr "O servidor deve ser http ou https"
 
@@ -4450,14 +4494,12 @@ msgstr ""
 "IP ou nome do host do servidor de túnel, enviado para o dispositivo cliente "
 "(ip \"público\") e Port. (usar formato HOST: PORT)"
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid "Tunnel host check"
 msgstr "Seleção de anfitrião do túnel"
 
-#: transports/NX/TSNXTransport.py:72 transports/RDP/TRDPTransport.py:72
-#: transports/RDS_enterprise/TRDSTransport.py:70
+#: transports/NX/TSNXTransport.py:72
 #: transports/RGS_enterprise/TRGSTransport.py:52
 msgid ""
 "If not empty, this server will be used to check if service is running before "
@@ -4466,8 +4508,8 @@ msgstr ""
 "Se não for vazio, este servidor será usado para verificar se o serviço está "
 "sendo executado antes atribuí-la ao usuário. (usar formato HOST: PORT)"
 
-#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:93
-#: transports/RDS_enterprise/TRDSTransport.py:86
+#: transports/NX/TSNXTransport.py:115 transports/RDP/TRDPTransport.py:96
+#: transports/RDS_enterprise/TRDSTransport.py:89
 #: transports/RGS_enterprise/TRGSTransport.py:78
 #: transports/SPICE/TSPICETransport.py:75 transports/X2GO/TX2GOTransport.py:82
 msgid "Must use HOST:PORT in Tunnel Server Field"
@@ -4539,18 +4581,6 @@ msgid "If checked, this transport will allow the use of user serial ports"
 msgstr ""
 "Se marcada, este transporte permitirá a utilização do usuário portas seriais"
 
-#: transports/RDP/BaseRDPTransport.py:70
-msgid "Show wallpaper"
-msgstr "Mostrar o papel de parede"
-
-#: transports/RDP/BaseRDPTransport.py:70
-msgid ""
-"If checked, the wallpaper and themes will be shown on machine (better user "
-"experience, more bandwidth)"
-msgstr ""
-"Se marcada, o papel de parede e temas serão mostrados máquina (usuário "
-"melhor experiência, mais largura de banda)"
-
 #: transports/RDP/BaseRDPTransport.py:71
 msgid "Multiple monitors"
 msgstr "Vários monitores"
@@ -4563,26 +4593,6 @@ msgstr ""
 "Se marcada, todos os monitores do cliente serão usados para exibição (só "
 "funciona no clientes do Windows)"
 
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "Allow Desk.Comp."
-msgstr "Permita Desk.Comp."
-
-#: transports/RDP/BaseRDPTransport.py:72
-msgid "If checked, desktop composition will be allowed"
-msgstr "Se marcada, composição desktop será permitida"
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "Font Smoothing"
-msgstr "Suavização de fonte"
-
-#: transports/RDP/BaseRDPTransport.py:73
-#: transports/RDS_enterprise/BaseRDSTransport.py:73
-msgid "If checked, fonts smoothing will be allowed (windows clients only)"
-msgstr ""
-"Se marcada, suavização de fontes serão permitidos (somente clientes de "
-"windows)"
-
 #: transports/RDP/BaseRDPTransport.py:74
 #: transports/RDS_enterprise/BaseRDSTransport.py:74
 msgid "Multimedia sync"
@@ -4621,6 +4631,17 @@ msgstr "Transporte de RDP (um túnel)"
 msgid "RDP Transport with tunneled connection"
 msgstr "Transporte de RDP com ligação em túnel"
 
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+#| msgid "Tunnel host check"
+msgid "Tunnel wait time"
+msgstr "Tempo de espera do túnel"
+
+#: transports/RDP/TRDPTransport.py:74
+#: transports/RDS_enterprise/TRDSTransport.py:72
+msgid "Maximum time to wait before closing the tunnel listener"
+msgstr "Tempo máximo de espera antes de fechar o ouvinte de túnel"
+
 #: transports/RDP/__init__.py:40 transports/RDS_enterprise/__init__.py:40
 msgid "Remote Desktop Protocol"
 msgstr "Protocolo de área de trabalho remoto"
diff --git a/server/src/uds/locale/pt/LC_MESSAGES/djangojs.po b/server/src/uds/locale/pt/LC_MESSAGES/djangojs.po
index d3eb37a0d..1f6510071 100644
--- a/server/src/uds/locale/pt/LC_MESSAGES/djangojs.po
+++ b/server/src/uds/locale/pt/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-02-02 00:22+0100\n"
+"POT-Creation-Date: 2017-02-09 20:00+0100\n"
 "PO-Revision-Date: 2017-02-01 23:19+0000\n"
 "Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/openuds/openuds/language/"
diff --git a/server/src/uds/templates/uds/admin/snippets/navbar.html b/server/src/uds/templates/uds/admin/snippets/navbar.html
index 1dc9a897a..3702163b3 100644
--- a/server/src/uds/templates/uds/admin/snippets/navbar.html
+++ b/server/src/uds/templates/uds/admin/snippets/navbar.html
@@ -13,7 +13,7 @@
             <!-- <span>Universal Desktop Services</span> -->
           </a>
 			</div>
-            
+
     <!-- Side bar -->
      <div class="collapse navbar-collapse navbar-ex1-collapse">
         <div class="side-nav">
@@ -21,7 +21,7 @@
               <li><a class="lnk-dashboard" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/dashboard-monitor.png"/> <span class="menu-lnk">{% trans 'Overview' %}</span></a></li>
               <li><a class="lnk-service_providers" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/providers.png"/> <span class="menu-lnk">{% trans 'Services' %}</span></a></li>
               <li><a class="lnk-authenticators" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/authenticators.png"/> <span class="menu-lnk">{% trans 'Authenticators' %}</span></a></li>
-              <li><a class="lnk-osmanagers" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/osmanagers.png"/> <span class="menu-lnk">Os Managers</span></a></li>
+              <li><a class="lnk-osmanagers" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/osmanagers.png"/> <span class="menu-lnk">{% trans 'Os Managers' %}</span></a></li>
               <li><a class="lnk-connectivity" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/transports.png"/> <span class="menu-lnk">{% trans 'Connectivity' %}</span></a></li>
               <li><a class="lnk-calendars" href="#"><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/calendars.png"/> <span class="menu-lnk">{% trans 'Calendars' %}</span></a></li>
               <li><a class="lnk-deployed_services" href=""><img class="icon" src="{{ STATIC_URL }}/adm/img/icons/pools.png"/> <span class="menu-lnk">{% trans 'Service Pools' %}</span></a></li>
@@ -39,7 +39,7 @@
               {% endif %}
             </ul>
           </div>
-        
+
           <ul class="nav navbar-nav navbar-right navbar-user">
           </ul>
           <form id="form_language" action="{% url "django.views.i18n.set_language" %}" method="post">
@@ -73,7 +73,7 @@
 
           </ul>
           </form>
-          
+
        </div>
-			
+
 		</nav>
diff --git a/server/src/uds/templates/uds/admin/tmpl/osmanagers.html b/server/src/uds/templates/uds/admin/tmpl/osmanagers.html
index 441b8a73f..906a9a30a 100644
--- a/server/src/uds/templates/uds/admin/tmpl/osmanagers.html
+++ b/server/src/uds/templates/uds/admin/tmpl/osmanagers.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <div class="row">
   <div class="col-xs-12">
-    <h1>Os Managers</h1>
+    <h1>{% endverbatim %}{% trans 'OS Managers' %}{% verbatim %}</h1>
     <!-- <ol class="breadcrumb">
       <li><a class="lnk-dashboard" href="#">Dashboard</a></li>
       <li>OS Managers</li>
@@ -14,9 +14,9 @@
     {% for message in messages %}
     <div class="alert alert-danger alert-dismissable">
       <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-       {{ message }}  
+       {{ message }}
     </div>
-    {% endfor %}       
+    {% endfor %}
   </div>
 </div>
 {% endif %}
@@ -29,7 +29,7 @@
     <div class="col-xs-12">
         <ul class="bottom_tabs nav nav-tabs">
             <li class="active"><a href="#{{ osmanager_info }}" data-toggle="tab">{% endverbatim %}{% trans 'Overview' %}{% verbatim %}</a></li>
-        </ul>    
+        </ul>
         <div class="tab-content">
             <div class="tab-pane fade in active" id="{{ osmanager_info }}">
               <div class="row">
@@ -37,9 +37,9 @@
                   <div class="well">
                   </div>
                 </div>
-              </div>              
+              </div>
             </div>
         </div>
     </div>
 </div>
-{% endverbatim %}
\ No newline at end of file
+{% endverbatim %}
diff --git a/server/src/uds/templates/uds/html5/snippets/navbar.html b/server/src/uds/templates/uds/html5/snippets/navbar.html
index da2c83abb..9f5ceeb22 100644
--- a/server/src/uds/templates/uds/html5/snippets/navbar.html
+++ b/server/src/uds/templates/uds/html5/snippets/navbar.html
@@ -40,12 +40,12 @@
                         {% if show_prefs and user.id != rootid %}
                         <li><a href="{% url "uds.web.views.prefs" %}"><span class="fa fa-edit"></span> {% trans 'Preferences' %}</a></li>
                         {% endif %}
-                        <li><a href="{% url 'ClientDownload' %}"><span class="fa fa-download"></span> UDS Plugin</a></li>
+                        <li><a href="{% url 'ClientDownload' %}"><span class="fa fa-download"></span> {% trans 'UDS Plugin' %}</a></li>
                     {% if user.staff_member or user.is_admin %}
                         <li><a href="{% url "uds.web.views.download" idDownload='' %}"><span class="fa fa-download"></span> {% trans "Downloads" %}</a></li>
                         {% ifbrowser ie<8 %}
                         {% else %}
-                        <li><a href="{% url "uds.admin.views.index" %}"><span class="fa fa-dashboard"></span> Dashboard</a></li>
+                        <li><a href="{% url "uds.admin.views.index" %}"><span class="fa fa-dashboard"></span> {% trans "Dashboard" %}</a></li>
                         {% endifbrowser %}
                     {% endif %}
                         <li><a href="{% url 'uds.web.views.logout' %}"><span class="fa fa-power-off text-danger"></span> {% trans 'Logout' %}</a></li>