* Fixed several bad formed literal strings

* Updated translations

server/documentation/_build/html/_downloads/SampleProvider.py

@@ -115,7 +115,7 @@ class Provider(ServiceProvider):
     #: Is Methuselah istill alive?
     methAlive = gui.CheckBoxField(order = 4,
                     label = translatable('Is Methuselah still alive?'),
-                    tooltip = translatable('If you fails, this will not get saved :-)'),
+                    tooltip = translatable('If you fail, this will not get saved :-)'),
                     required = True, #: Also means nothing. Check boxes has always a value
                     defvalue = gui.TRUE #: By default, at new item, check this
                 ) 

server/documentation/_build/html/development/samples/services/Provider.html

@@ -406,7 +406,7 @@ want to provide a new one.</p>
     <span class="c">#: Is Methuselah istill alive?</span>
     <span class="n">methAlive</span> <span class="o">=</span> <span class="n">gui</span><span class="o">.</span><span class="n">CheckBoxField</span><span class="p">(</span><span class="n">order</span> <span class="o">=</span> <span class="mi">4</span><span class="p">,</span>
                     <span class="n">label</span> <span class="o">=</span> <span class="n">translatable</span><span class="p">(</span><span class="s">&#39;Is Methuselah still alive?&#39;</span><span class="p">),</span>
-                    <span class="n">tooltip</span> <span class="o">=</span> <span class="n">translatable</span><span class="p">(</span><span class="s">&#39;If you fails, this will not get saved :-)&#39;</span><span class="p">),</span>
+                    <span class="n">tooltip</span> <span class="o">=</span> <span class="n">translatable</span><span class="p">(</span><span class="s">&#39;If you fail, this will not get saved :-)&#39;</span><span class="p">),</span>
                     <span class="n">required</span> <span class="o">=</span> <span class="bp">True</span><span class="p">,</span> <span class="c">#: Also means nothing. Check boxes has always a value</span>
                     <span class="n">defvalue</span> <span class="o">=</span> <span class="n">gui</span><span class="o">.</span><span class="n">TRUE</span> <span class="c">#: By default, at new item, check this</span>
                 <span class="p">)</span> 

server/documentation/_downloads/samples/services/SampleProvider.py

@@ -115,7 +115,7 @@ class Provider(ServiceProvider):
     #: Is Methuselah istill alive?
     methAlive = gui.CheckBoxField(order = 4,
                     label = translatable('Is Methuselah still alive?'),
-                    tooltip = translatable('If you fails, this will not get saved :-)'),
+                    tooltip = translatable('If you fail, this will not get saved :-)'),
                     required = True, #: Also means nothing. Check boxes has always a value
                     defvalue = gui.TRUE #: By default, at new item, check this
                 ) 

server/src/uds/REST/methods/authenticators.py

@@ -58,7 +58,7 @@ class Authenticators(ModelHandler):
         {'name': {'title': _('Name'), 'visible': True, 'type': 'iconType'}},
         {'comments': {'title': _('Comments')}},
         {'priority': {'title': _('Priority'), 'type': 'numeric', 'width': '5em'}},
-        {'small_name': {'title': _('Small name')}},
+        {'small_name': {'title': _('Tag')}},
         {'users_count': {'title': _('Users'), 'type': 'numeric', 'width': '5em'}}
     ]
 

server/src/uds/REST/methods/osmanagers.py

@@ -54,9 +54,9 @@ class OsManagers(ModelHandler):
 
     table_title = _('Current OS Managers')
     table_fields = [
-            {'name': {'title': _('Name'), 'visible': True, 'type': 'iconType'}},
-            {'comments': {'title': _('Comments')}},
-            {'deployed_count': {'title': _('Used by'), 'type': 'numeric', 'width': '8em'}}
+        {'name': {'title': _('Name'), 'visible': True, 'type': 'iconType'}},
+        {'comments': {'title': _('Comments')}},
+        {'deployed_count': {'title': _('Used by'), 'type': 'numeric', 'width': '8em'}}
     ]
 
     @staticmethod
@@ -75,11 +75,11 @@ class OsManagers(ModelHandler):
 
     def checkDelete(self, item):
         if item.deployedServices.count() > 0:
-            raise RequestError(ugettext('Can\'t delete an OSManager with deployed services associated'))
+            raise RequestError(ugettext('Can\'t delete an OS Manager with services pools associated'))
 
     def checkSave(self, item):
         if item.deployedServices.count() > 0 and settings.DEBUG is False:
-            raise RequestError(ugettext('Can\'t modify an OSManager with deployed services associated'))
+            raise RequestError(ugettext('Can\'t modify an OS Manager with services pools associated'))
 
     # Types related
     def enum_types(self):

server/src/uds/REST/methods/services_pools.py

@@ -155,7 +155,7 @@ class ServicesPools(ModelHandler):
             'value': '0',
             'minValue': '0',
             'label': ugettext('Services to keep in cache'),
-            'tooltip': ugettext('Services keeped in cache for improved user service assignation'),
+            'tooltip': ugettext('Services kept in cache for improved user service assignation'),
             'type': gui.InputField.NUMERIC_TYPE,
             'order': 104,
         }, {
@@ -163,7 +163,7 @@ class ServicesPools(ModelHandler):
             'value': '0',
             'minValue': '0',
             'label': ugettext('Services to keep in L2 cache'),
-            'tooltip': ugettext('Services keeped in cache of level2 for improved service generation'),
+            'tooltip': ugettext('Services kept in cache of level2 for improved service generation'),
             'type': gui.InputField.NUMERIC_TYPE,
             'order': 105,
         }, {
@@ -193,7 +193,7 @@ class ServicesPools(ModelHandler):
                 service = Service.objects.get(uuid=fields['service_id'])
                 fields['service_id'] = service.id
             except:
-                raise RequestError(ugettext('Base service does not exists anymore'))
+                raise RequestError(ugettext('Base service does not exist anymore'))
 
             try:
                 serviceType = service.getType()
@@ -212,7 +212,7 @@ class ServicesPools(ModelHandler):
                         fields[k] = 0
 
             except Exception:
-                raise RequestError(ugettext('This service requires an os manager'))
+                raise RequestError(ugettext('This service requires an OS Manager'))
 
             imgId = fields['image_id']
             fields['image_id'] = None

server/src/uds/REST/methods/transports.py

@@ -51,10 +51,10 @@ class Transports(ModelHandler):
 
     table_title = _('Current Transports')
     table_fields = [
-            {'priority': {'title': _('Priority'), 'type': 'numeric', 'width': '6em'}},
-            {'name': {'title': _('Name'), 'visible': True, 'type': 'iconType'}},
-            {'comments': {'title': _('Comments')}},
-            {'deployed_count': {'title': _('Used by'), 'type': 'numeric', 'width': '8em'}}
+        {'priority': {'title': _('Priority'), 'type': 'numeric', 'width': '6em'}},
+        {'name': {'title': _('Name'), 'visible': True, 'type': 'iconType'}},
+        {'comments': {'title': _('Comments')}},
+        {'deployed_count': {'title': _('Used by'), 'type': 'numeric', 'width': '8em'}}
     ]
 
     def enum_types(self):
@@ -62,23 +62,24 @@ class Transports(ModelHandler):
 
     def getGui(self, type_):
         try:
-            return self.addField(self.addField(self.addDefaultFields(factory().lookup(type_).guiDescription(), ['name', 'comments', 'priority']), {
-                       'name': 'nets_positive',
-                       'value': True,
-                       'label': ugettext('Network access'),
-                       'tooltip': ugettext('If ACTIVE, the transport will be enabled for the selected networks.If INACTIVE, trans port will be disabled for selected networks'),
-                       'type': 'checkbox',
-                       'order': 100,  # At end
-                   }), {
-                        'name': 'networks',
-                        'value': [],
-                        'values': sorted([{'id': x.id, 'text': x.name} for x in Network.objects.all()], key=lambda x: x['text'].lower()),  # TODO: We will fix this behavior after current admin client is fully removed
-                        'label': ugettext('Networks'),
-                        'tooltip': ugettext('Networks associated with this transport. If No network selected, will mean "all networks"'),
-                        'type': 'multichoice',
-                        'order': 101
-                  })
-        except:
+            return self.addField(
+                self.addField(self.addDefaultFields(factory().lookup(type_).guiDescription(), ['name', 'comments', 'priority']), {
+                    'name': 'nets_positive',
+                    'value': True,
+                    'label': ugettext('Network access'),
+                    'tooltip': ugettext('If checked, the transport will be enabled for the selected networks.If unchecked, transport will be disabled for selected networks'),
+                    'type': 'checkbox',
+                    'order': 100,  # At end
+                }), {
+                    'name': 'networks',
+                    'value': [],
+                    'values': sorted([{'id': x.id, 'text': x.name} for x in Network.objects.all()], key=lambda x: x['text'].lower()),  # TODO: We will fix this behavior after current admin client is fully removed
+                    'label': ugettext('Networks'),
+                    'tooltip': ugettext('Networks associated with this transport. If No network selected, will mean "all networks"'),
+                    'type': 'multichoice',
+                    'order': 101
+                })
+        except Exception:
             self.invalidItemException()
 
     def item_as_dict(self, item):

server/src/uds/REST/methods/user_services.py

@@ -104,7 +104,7 @@ class AssignedService(DetailHandler):
             {'ip': {'title': _('IP')}},
             {'friendly_name': {'title': _('Friendly name')}},
             {'state': {'title': _('state'), 'type': 'dict', 'dict': State.dictionary()}},
-            {'state_date': {'title': _('State date'), 'type': 'datetime'}},
+            {'state_date': {'title': _('Status date'), 'type': 'datetime'}},
             {'in_use': {'title': _('In Use')}},
             {'source_host': {'title': _('Src Host')}},
             {'source_ip': {'title': _('Src Ip')}},

server/src/uds/admin/views.py

@@ -41,7 +41,7 @@ from uds.core.util.decorators import denyBrowsers
 
 import logging
 
-__updated__ = '2014-09-15'
+__updated__ = '2015-02-02'
 
 logger = logging.getLogger(__name__)
 
@@ -66,7 +66,7 @@ def tmpl(request, template):
         resp = t.render(c)
     except Exception as e:
         logger.debug('Exception getting template: {0}'.format(e))
-        resp = _('requested a template that do not exists')
+        resp = _('requested a template that do not exist')
     return HttpResponse(resp, content_type="text/plain")
 
 

server/src/uds/auths/InternalDB/Authenticator.py

@@ -43,7 +43,7 @@ from uds.core.util.State import State
 import dns
 import logging
 
-__updated__ = '2014-10-30'
+__updated__ = '2015-02-02'
 
 logger = logging.getLogger(__name__)
 
@@ -51,7 +51,7 @@ logger = logging.getLogger(__name__)
 class InternalDBAuth(Authenticator):
     typeName = _('Internal Database')
     typeType = 'InternalDBAuth'
-    typeDescription = _('Internal dabasase authenticator. Doesn\'t uses external sources')
+    typeDescription = _('Internal dabasase authenticator. Doesn\'t use external sources')
     iconFile = 'auth.png'
 
     # If we need to enter the password for this user

server/src/uds/auths/RegexLdap/Authenticator.py

@@ -44,7 +44,7 @@ import ldap.filter
 import re
 import logging
 
-__updated__ = '2015-01-23'
+__updated__ = '2015-02-02'
 
 logger = logging.getLogger(__name__)
 
@@ -54,12 +54,12 @@ LDAP_RESULT_LIMIT = 50
 class RegexLdap(auths.Authenticator):
 
     host = gui.TextField(length=64, label=_('Host'), order=1, tooltip=_('Ldap Server Host'), required=True)
-    port = gui.NumericField(length=5, label=_('Port'), defvalue='389', order=2, tooltip=_('Ldap port (389 for non ssl, 636 for ssl normally'), required=True)
-    ssl = gui.CheckBoxField(label=_('Use SSL'), order=3, tooltip=_('If checked, will use a ssl connection to ldap (if port is 389, will use in fact port 636)'))
+    port = gui.NumericField(length=5, label=_('Port'), defvalue='389', order=2, tooltip=_('Ldap port (usually 389 for non ssl and 636 for ssl)'), required=True)
+    ssl = gui.CheckBoxField(label=_('Use SSL'), order=3, tooltip=_('If checked, the connection will be ssl, using port 636 instead of 389'))
     username = gui.TextField(length=64, label=_('Ldap User'), order=4, tooltip=_('Username with read privileges on the base selected'), required=True)
     password = gui.PasswordField(lenth=32, label=_('Password'), order=5, tooltip=_('Password of the ldap user'), required=True)
-    timeout = gui.NumericField(length=3, label=_('Timeout'), defvalue='10', order=6, tooltip=_('Timeout in seconds of connection to LDAP'), required=True)
-    ldapBase = gui.TextField(length=64, label=_('Base'), order=7, tooltip=_('Common search base (used for "users" and "groups"'), required=True)
+    timeout = gui.NumericField(length=3, label=_('Timeout'), defvalue='10', order=6, tooltip=_('Timeout in seconds of connection to LDAP'), required=True, minValue=1)
+    ldapBase = gui.TextField(length=64, label=_('Base'), order=7, tooltip=_('Common search base (used for "users" and "groups")'), required=True)
     userClass = gui.TextField(length=64, label=_('User class'), defvalue='posixAccount', order=8, tooltip=_('Class for LDAP users (normally posixAccount)'), required=True)
     userIdAttr = gui.TextField(length=64, label=_('User Id Attr'), defvalue='uid', order=9, tooltip=_('Attribute that contains the user id'), required=True)
     userNameAttr = gui.TextField(length=640, label=_('User Name Attr'), multiline=2, defvalue='uid', order=10, tooltip=_('Attributes that contains the user name (list of comma separated values)'), required=True)

server/src/uds/auths/Sample/SampleAuth.py

@@ -36,7 +36,7 @@ from uds.core import auths
 
 import logging
 
-__updated__ = '2014-02-19'
+__updated__ = '2015-02-02'
 
 logger = logging.getLogger(__name__)
 
@@ -123,7 +123,7 @@ class SampleAuth(auths.Authenticator):
         # unserialization, and at this point all will be default values
         # so self.groups.value will be []
         if values is not None and len(self.groups.value) < 2:
-            raise auths.Authenticator.ValidationException(_('We need more that two items!'))
+            raise auths.Authenticator.ValidationException(_('We need more than two items!'))
 
     def searchUsers(self, pattern):
         '''
@@ -135,7 +135,7 @@ class SampleAuth(auths.Authenticator):
         facility for users. In our case, we will simply return a list of users
         (array of dictionaries with ids and names) with the pattern plus 1..10
         '''
-        return [ { 'id' : '{0}-{1}'.format(pattern, a), 'name' : '{0} number {1}'.format(pattern, a) } for a in range(1, 10)]
+        return [{'id': '{0}-{1}'.format(pattern, a), 'name': '{0} number {1}'.format(pattern, a)} for a in range(1, 10)]
 
     def searchGroups(self, pattern):
         '''
@@ -149,7 +149,7 @@ class SampleAuth(auths.Authenticator):
         res = []
         for g in self.groups.value:
             if g.lower().find(pattern) != -1:
-                res.append({'id' : g, 'name' : ''})
+                res.append({'id': g, 'name': ''})
         return res
 
     def authenticate(self, username, credentials, groupsManager):

server/src/uds/auths/SimpleLDAP/Authenticator.py

@@ -45,7 +45,7 @@ import ldap
 import logging
 import six
 
-__updated__ = '2015-01-15'
+__updated__ = '2015-02-02'
 
 logger = logging.getLogger(__name__)
 
@@ -55,12 +55,12 @@ LDAP_RESULT_LIMIT = 50
 class SimpleLDAPAuthenticator(Authenticator):
 
     host = gui.TextField(length=64, label=_('Host'), order=1, tooltip=_('Ldap Server IP or Hostname'), required=True)
-    port = gui.NumericField(length=5, label=_('Port'), defvalue='389', order=2, tooltip=_('Ldap port (389 for non ssl, 636 for ssl normally'), required=True)
-    ssl = gui.CheckBoxField(label=_('Use SSL'), order=3, tooltip=_('If checked, will use a ssl connection to ldap (if port is 389, will use in fact port 636)'))
+    port = gui.NumericField(length=5, label=_('Port'), defvalue='389', order=2, tooltip=_('Ldap port (usually 389 for non ssl and 636 for ssl)'), required=True)
+    ssl = gui.CheckBoxField(label=_('Use SSL'), order=3, tooltip=_('If checked, the connection will be ssl, using port 636 instead of 389'))
     username = gui.TextField(length=64, label=_('Ldap User'), order=4, tooltip=_('Username with read privileges on the base selected'), required=True)
     password = gui.PasswordField(lenth=32, label=_('Password'), order=5, tooltip=_('Password of the ldap user'), required=True)
-    timeout = gui.NumericField(length=3, label=_('Timeout'), defvalue='10', order=6, tooltip=_('Timeout in seconds of connection to LDAP'), required=True)
-    ldapBase = gui.TextField(length=64, label=_('Base'), order=7, tooltip=_('Common search base (used for "users" and "groups"'), required=True)
+    timeout = gui.NumericField(length=3, label=_('Timeout'), defvalue='10', order=6, tooltip=_('Timeout in seconds of connection to LDAP'), required=True, minValue=1)
+    ldapBase = gui.TextField(length=64, label=_('Base'), order=7, tooltip=_('Common search base (used for "users" and "groups")'), required=True)
     userClass = gui.TextField(length=64, label=_('User class'), defvalue='posixAccount', order=8, tooltip=_('Class for LDAP users (normally posixAccount)'), required=True)
     userIdAttr = gui.TextField(length=64, label=_('User Id Attr'), defvalue='uid', order=9, tooltip=_('Attribute that contains the user id'), required=True)
     userNameAttr = gui.TextField(length=64, label=_('User Name Attr'), defvalue='uid', order=10, tooltip=_('Attributes that contains the user name (list of comma separated values)'), required=True)

server/src/uds/core/managers/UserServiceManager.py

@@ -305,7 +305,7 @@ class UserServiceManager(object):
         uService = UserService.objects.get(pk=uService.id)
         logger.debug('Canceling uService {0} creation'.format(uService))
         if uService.isPreparing() is False:
-            logger.info(_('Cancel requested for a non running operation, doing remove instead'))
+            logger.info('Cancel requested for a non running operation, performing removal instead')
             return self.remove(uService)
 
         ui = uService.getInstance()
@@ -337,7 +337,7 @@ class UserServiceManager(object):
         elif uService.isPreparing():
             return self.cancel(uService)
         else:
-            raise OperationException(_('Can\'t remove nor cancel {0} cause its states doesn\'t allows it'))
+            raise OperationException(_('Can\'t remove nor cancel {0} cause its states don\'t allow it'))
 
     def removeInfoItems(self, dsp):
         with transaction.atomic():

server/src/uds/locale/de/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 05:07+0100\n"
+"POT-Creation-Date: 2015-02-02 11:31+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"
@@ -321,8 +321,7 @@ msgstr "OSManager löschen Fehler"
 msgid "In Maintenance"
 msgstr "In der Pflege"
 
-#: static/tmp_js/gui-d-services.js:67 static/tmp_js/gui-d-services.js.c:133
-#: static/tmp_js/gui-d-services.js:150
+#: static/tmp_js/gui-d-services.js:67
 msgid "Enabled"
 msgstr "Aktiviert"
 
@@ -496,11 +495,12 @@ msgid "Transport removal error"
 msgstr "Transportfehler entfernen"
 
 #: static/tmp_js/gui-d-servicespools.js:317
+#: static/tmp_js/gui-d-servicespools.js:336
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: static/tmp_js/gui-d-servicespools.js:320
-#: static/tmp_js/gui-d-servicespools.js:340
+#: static/tmp_js/gui-d-servicespools.js:346
 msgid "Publish"
 msgstr "Veröffentlichen"
 
@@ -508,57 +508,61 @@ msgstr "Veröffentlichen"
 msgid "Cancel publication"
 msgstr "Veröffentlichung einzustellen"
 
-#: static/tmp_js/gui-d-servicespools.js:340
+#: static/tmp_js/gui-d-servicespools.js:334
+msgid "Force Cancel"
+msgstr "Kraft \"Abbrechen\""
+
+#: static/tmp_js/gui-d-servicespools.js:346
 msgid "Launch new publication?"
 msgstr "Starten neue Publikation zu?"
 
-#: static/tmp_js/gui-d-servicespools.js:344
+#: static/tmp_js/gui-d-servicespools.js:350
 msgid "Failed creating publication"
 msgstr "Fehler beim Erstellen von Publikation"
 
-#: static/tmp_js/gui-d-servicespools.js:366
+#: static/tmp_js/gui-d-servicespools.js:372
 msgid "undefined"
 msgstr "undefiniert"
 
-#: static/tmp_js/gui-d-servicespools.js:373
+#: static/tmp_js/gui-d-servicespools.js:379
 msgid "Restrained"
 msgstr "Zurückhaltend"
 
-#: static/tmp_js/gui-d-servicespools.js:380
+#: static/tmp_js/gui-d-servicespools.js:386
 msgid "unknown (needs reload)"
 msgstr "unbekannt (muss neu laden)"
 
-#: static/tmp_js/gui-d-servicespools.js:384
+#: static/tmp_js/gui-d-servicespools.js:390
 msgid "New service pool"
 msgstr "Neue Service-pool"
 
-#: static/tmp_js/gui-d-servicespools.js:384
+#: static/tmp_js/gui-d-servicespools.js:390
 msgid "creation error"
 msgstr "Fehler beim Erstellen"
 
-#: static/tmp_js/gui-d-servicespools.js:393
+#: static/tmp_js/gui-d-servicespools.js:399
 msgid "Publish on creation"
 msgstr "Bei der Erstellung zu veröffentlichen"
 
-#: static/tmp_js/gui-d-servicespools.js:394
+#: static/tmp_js/gui-d-servicespools.js:400
 msgid "If selected, will initiate the publication inmediatly after creation"
 msgstr ""
 "Wenn ausgewählt, wird die Publikation Inmediatly nach Erstellung einleiten."
 
-#: static/tmp_js/gui-d-servicespools.js:406 static/tmp_js/gui.js:40
+#: static/tmp_js/gui-d-servicespools.js:412 static/tmp_js/gui.js:40
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: static/tmp_js/gui-d-servicespools.js:406
+#: static/tmp_js/gui-d-servicespools.js:412
 msgid "saving error"
 msgstr "Speichern von Fehler"
 
-#: static/tmp_js/gui-d-servicespools.js:407 static/tmp_js/gui.js:44
+#: static/tmp_js/gui-d-servicespools.js:413 static/tmp_js/gui.js:44
 #: static/tmp_js/gui.js.c:360
 msgid "Delete"
 msgstr "Löschen"
 
-#: static/tmp_js/gui-d-servicespools.js:407
+#: static/tmp_js/gui-d-servicespools.js:413
 msgid "deletion error"
 msgstr "Fehler löschen"
 
@@ -731,5 +735,5 @@ msgid "Are you sure do you want to delete "
 msgstr "Bist du sicher wollen Sie löschen "
 
 #: static/tmp_js/gui.js:366
-msgid "Item deleted"
-msgstr "Element gelöscht"
+msgid "Sucess"
+msgstr "Erfolg"

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: 2015-01-13 05:07+0100\n"
+"POT-Creation-Date: 2015-02-02 11:31+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"
@@ -320,8 +320,7 @@ msgstr ""
 msgid "In Maintenance"
 msgstr ""
 
-#: static/tmp_js/gui-d-services.js:67 static/tmp_js/gui-d-services.js.c:133
-#: static/tmp_js/gui-d-services.js:150
+#: static/tmp_js/gui-d-services.js:67
 msgid "Enabled"
 msgstr ""
 
@@ -495,11 +494,12 @@ msgid "Transport removal error"
 msgstr ""
 
 #: static/tmp_js/gui-d-servicespools.js:317
+#: static/tmp_js/gui-d-servicespools.js:336
 msgid "Cancel"
 msgstr ""
 
 #: static/tmp_js/gui-d-servicespools.js:320
-#: static/tmp_js/gui-d-servicespools.js:340
+#: static/tmp_js/gui-d-servicespools.js:346
 msgid "Publish"
 msgstr ""
 
@@ -507,56 +507,60 @@ msgstr ""
 msgid "Cancel publication"
 msgstr ""
 
-#: static/tmp_js/gui-d-servicespools.js:340
+#: static/tmp_js/gui-d-servicespools.js:334
+msgid "Force Cancel"
+msgstr ""
+
+#: static/tmp_js/gui-d-servicespools.js:346
 msgid "Launch new publication?"
 msgstr ""
 
-#: static/tmp_js/gui-d-servicespools.js:344
+#: static/tmp_js/gui-d-servicespools.js:350
 msgid "Failed creating publication"
 msgstr ""
 
-#: static/tmp_js/gui-d-servicespools.js:366
+#: static/tmp_js/gui-d-servicespools.js:372
 msgid "undefined"
 msgstr ""
 
-#: static/tmp_js/gui-d-servicespools.js:373
+#: static/tmp_js/gui-d-servicespools.js:379
 msgid "Restrained"
 msgstr ""
 
-#: static/tmp_js/gui-d-servicespools.js:380
+#: static/tmp_js/gui-d-servicespools.js:386
 msgid "unknown (needs reload)"
 msgstr ""
 
-#: static/tmp_js/gui-d-servicespools.js:384
+#: static/tmp_js/gui-d-servicespools.js:390
 msgid "New service pool"
 msgstr ""
 
-#: static/tmp_js/gui-d-servicespools.js:384
+#: static/tmp_js/gui-d-servicespools.js:390
 msgid "creation error"
 msgstr ""
 
-#: static/tmp_js/gui-d-servicespools.js:393
+#: static/tmp_js/gui-d-servicespools.js:399
 msgid "Publish on creation"
 msgstr ""
 
-#: static/tmp_js/gui-d-servicespools.js:394
+#: static/tmp_js/gui-d-servicespools.js:400
 msgid "If selected, will initiate the publication inmediatly after creation"
 msgstr ""
 
-#: static/tmp_js/gui-d-servicespools.js:406 static/tmp_js/gui.js:40
+#: static/tmp_js/gui-d-servicespools.js:412 static/tmp_js/gui.js:40
 msgid "Edit"
 msgstr ""
 
-#: static/tmp_js/gui-d-servicespools.js:406
+#: static/tmp_js/gui-d-servicespools.js:412
 msgid "saving error"
 msgstr ""
 
-#: static/tmp_js/gui-d-servicespools.js:407 static/tmp_js/gui.js:44
+#: static/tmp_js/gui-d-servicespools.js:413 static/tmp_js/gui.js:44
 #: static/tmp_js/gui.js.c:360
 msgid "Delete"
 msgstr ""
 
-#: static/tmp_js/gui-d-servicespools.js:407
+#: static/tmp_js/gui-d-servicespools.js:413
 msgid "deletion error"
 msgstr ""
 
@@ -729,5 +733,5 @@ msgid "Are you sure do you want to delete "
 msgstr ""
 
 #: static/tmp_js/gui.js:366
-msgid "Item deleted"
+msgid "Sucess"
 msgstr ""

server/src/uds/locale/es/LC_MESSAGES/djangojs.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 05:07+0100\n"
+"POT-Creation-Date: 2015-02-02 11:31+0100\n"
 "PO-Revision-Date: 2014-06-03 11:17+0000\n"
 "Last-Translator: blafuente <blafuente@virtualcable.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/openuds/language/"
@@ -325,8 +325,7 @@ msgstr "Error en la eliminación del OSManager"
 msgid "In Maintenance"
 msgstr "En mantenimiento"
 
-#: static/tmp_js/gui-d-services.js:67 static/tmp_js/gui-d-services.js.c:133
-#: static/tmp_js/gui-d-services.js:150
+#: static/tmp_js/gui-d-services.js:67
 msgid "Enabled"
 msgstr "Habilitado"
 
@@ -500,11 +499,12 @@ msgid "Transport removal error"
 msgstr "Error en la desasignación del transporte"
 
 #: static/tmp_js/gui-d-servicespools.js:317
+#: static/tmp_js/gui-d-servicespools.js:336
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: static/tmp_js/gui-d-servicespools.js:320
-#: static/tmp_js/gui-d-servicespools.js:340
+#: static/tmp_js/gui-d-servicespools.js:346
 msgid "Publish"
 msgstr "Publicar"
 
@@ -512,58 +512,62 @@ msgstr "Publicar"
 msgid "Cancel publication"
 msgstr "Cancelar la publicación"
 
-#: static/tmp_js/gui-d-servicespools.js:340
+#: static/tmp_js/gui-d-servicespools.js:334
+msgid "Force Cancel"
+msgstr "Cancelar la fuerza"
+
+#: static/tmp_js/gui-d-servicespools.js:346
 msgid "Launch new publication?"
 msgstr "¿Lanzar nueva publicación?"
 
-#: static/tmp_js/gui-d-servicespools.js:344
+#: static/tmp_js/gui-d-servicespools.js:350
 msgid "Failed creating publication"
 msgstr "No se pudo crear la publicación"
 
-#: static/tmp_js/gui-d-servicespools.js:366
+#: static/tmp_js/gui-d-servicespools.js:372
 msgid "undefined"
 msgstr "indefinido"
 
-#: static/tmp_js/gui-d-servicespools.js:373
+#: static/tmp_js/gui-d-servicespools.js:379
 msgid "Restrained"
 msgstr "Contenido"
 
-#: static/tmp_js/gui-d-servicespools.js:380
+#: static/tmp_js/gui-d-servicespools.js:386
 msgid "unknown (needs reload)"
 msgstr "desconocido (necesita recargar)"
 
-#: static/tmp_js/gui-d-servicespools.js:384
+#: static/tmp_js/gui-d-servicespools.js:390
 msgid "New service pool"
 msgstr "Nuevo Pool de Servicios"
 
-#: static/tmp_js/gui-d-servicespools.js:384
+#: static/tmp_js/gui-d-servicespools.js:390
 msgid "creation error"
 msgstr "error de creación"
 
-#: static/tmp_js/gui-d-servicespools.js:393
+#: static/tmp_js/gui-d-servicespools.js:399
 msgid "Publish on creation"
 msgstr "Publicar en creación"
 
-#: static/tmp_js/gui-d-servicespools.js:394
+#: static/tmp_js/gui-d-servicespools.js:400
 msgid "If selected, will initiate the publication inmediatly after creation"
 msgstr ""
 "Si se selecciona, se iniciará la publicación inmediatamente después de la "
 "creación"
 
-#: static/tmp_js/gui-d-servicespools.js:406 static/tmp_js/gui.js:40
+#: static/tmp_js/gui-d-servicespools.js:412 static/tmp_js/gui.js:40
 msgid "Edit"
 msgstr "Editar"
 
-#: static/tmp_js/gui-d-servicespools.js:406
+#: static/tmp_js/gui-d-servicespools.js:412
 msgid "saving error"
 msgstr "error al guardar"
 
-#: static/tmp_js/gui-d-servicespools.js:407 static/tmp_js/gui.js:44
+#: static/tmp_js/gui-d-servicespools.js:413 static/tmp_js/gui.js:44
 #: static/tmp_js/gui.js.c:360
 msgid "Delete"
 msgstr "Borrar"
 
-#: static/tmp_js/gui-d-servicespools.js:407
+#: static/tmp_js/gui-d-servicespools.js:413
 msgid "deletion error"
 msgstr "error al eliminar"
 
@@ -737,5 +741,5 @@ msgid "Are you sure do you want to delete "
 msgstr "¿Estás seguro que lo quieres eliminar?"
 
 #: static/tmp_js/gui.js:366
-msgid "Item deleted"
-msgstr "Elemento eliminado"
+msgid "Sucess"
+msgstr "Éxito"

server/src/uds/locale/fr/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 05:07+0100\n"
+"POT-Creation-Date: 2015-02-02 11:31+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"
@@ -322,8 +322,7 @@ msgstr "Erreur de suppression de OSManager"
 msgid "In Maintenance"
 msgstr "Dans l'entretien"
 
-#: static/tmp_js/gui-d-services.js:67 static/tmp_js/gui-d-services.js.c:133
-#: static/tmp_js/gui-d-services.js:150
+#: static/tmp_js/gui-d-services.js:67
 msgid "Enabled"
 msgstr "Activé"
 
@@ -497,11 +496,12 @@ msgid "Transport removal error"
 msgstr "Erreur de suppression de transport"
 
 #: static/tmp_js/gui-d-servicespools.js:317
+#: static/tmp_js/gui-d-servicespools.js:336
 msgid "Cancel"
 msgstr "Annuler"
 
 #: static/tmp_js/gui-d-servicespools.js:320
-#: static/tmp_js/gui-d-servicespools.js:340
+#: static/tmp_js/gui-d-servicespools.js:346
 msgid "Publish"
 msgstr "Publier"
 
@@ -509,56 +509,60 @@ msgstr "Publier"
 msgid "Cancel publication"
 msgstr "Annuler la publication"
 
-#: static/tmp_js/gui-d-servicespools.js:340
+#: static/tmp_js/gui-d-servicespools.js:334
+msgid "Force Cancel"
+msgstr "Force Cancel"
+
+#: static/tmp_js/gui-d-servicespools.js:346
 msgid "Launch new publication?"
 msgstr "Lancement nouvelle publication ?"
 
-#: static/tmp_js/gui-d-servicespools.js:344
+#: static/tmp_js/gui-d-servicespools.js:350
 msgid "Failed creating publication"
 msgstr "Échec de création de publication"
 
-#: static/tmp_js/gui-d-servicespools.js:366
+#: static/tmp_js/gui-d-servicespools.js:372
 msgid "undefined"
 msgstr "indéfini"
 
-#: static/tmp_js/gui-d-servicespools.js:373
+#: static/tmp_js/gui-d-servicespools.js:379
 msgid "Restrained"
 msgstr "Retenu"
 
-#: static/tmp_js/gui-d-servicespools.js:380
+#: static/tmp_js/gui-d-servicespools.js:386
 msgid "unknown (needs reload)"
 msgstr "inconnu (doit recharger)"
 
-#: static/tmp_js/gui-d-servicespools.js:384
+#: static/tmp_js/gui-d-servicespools.js:390
 msgid "New service pool"
 msgstr "Nouvelle piscine service"
 
-#: static/tmp_js/gui-d-servicespools.js:384
+#: static/tmp_js/gui-d-servicespools.js:390
 msgid "creation error"
 msgstr "erreur de création"
 
-#: static/tmp_js/gui-d-servicespools.js:393
+#: static/tmp_js/gui-d-servicespools.js:399
 msgid "Publish on creation"
 msgstr "Publier sur création"
 
-#: static/tmp_js/gui-d-servicespools.js:394
+#: static/tmp_js/gui-d-servicespools.js:400
 msgid "If selected, will initiate the publication inmediatly after creation"
 msgstr "Si sélectionné, lancera la publication immédiatement après création"
 
-#: static/tmp_js/gui-d-servicespools.js:406 static/tmp_js/gui.js:40
+#: static/tmp_js/gui-d-servicespools.js:412 static/tmp_js/gui.js:40
 msgid "Edit"
 msgstr "Edit"
 
-#: static/tmp_js/gui-d-servicespools.js:406
+#: static/tmp_js/gui-d-servicespools.js:412
 msgid "saving error"
 msgstr "erreur de sauvegarde"
 
-#: static/tmp_js/gui-d-servicespools.js:407 static/tmp_js/gui.js:44
+#: static/tmp_js/gui-d-servicespools.js:413 static/tmp_js/gui.js:44
 #: static/tmp_js/gui.js.c:360
 msgid "Delete"
 msgstr "Supprimer"
 
-#: static/tmp_js/gui-d-servicespools.js:407
+#: static/tmp_js/gui-d-servicespools.js:413
 msgid "deletion error"
 msgstr "erreur de suppression"
 
@@ -731,5 +735,5 @@ msgid "Are you sure do you want to delete "
 msgstr "Êtes-vous sûr que vous souhaitez supprimer "
 
 #: static/tmp_js/gui.js:366
-msgid "Item deleted"
-msgstr "Élément supprimé"
+msgid "Sucess"
+msgstr "Sucess"

server/src/uds/locale/it/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 05:07+0100\n"
+"POT-Creation-Date: 2015-02-02 11:31+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"
@@ -321,8 +321,7 @@ msgstr "OSManager errore di omissione"
 msgid "In Maintenance"
 msgstr "In manutenzione"
 
-#: static/tmp_js/gui-d-services.js:67 static/tmp_js/gui-d-services.js.c:133
-#: static/tmp_js/gui-d-services.js:150
+#: static/tmp_js/gui-d-services.js:67
 msgid "Enabled"
 msgstr "Abilitato"
 
@@ -496,11 +495,12 @@ msgid "Transport removal error"
 msgstr "Trasporto rimozione errore"
 
 #: static/tmp_js/gui-d-servicespools.js:317
+#: static/tmp_js/gui-d-servicespools.js:336
 msgid "Cancel"
 msgstr "Annulla"
 
 #: static/tmp_js/gui-d-servicespools.js:320
-#: static/tmp_js/gui-d-servicespools.js:340
+#: static/tmp_js/gui-d-servicespools.js:346
 msgid "Publish"
 msgstr "Pubblicare"
 
@@ -508,56 +508,60 @@ msgstr "Pubblicare"
 msgid "Cancel publication"
 msgstr "Annullare la pubblicazione"
 
-#: static/tmp_js/gui-d-servicespools.js:340
+#: static/tmp_js/gui-d-servicespools.js:334
+msgid "Force Cancel"
+msgstr "Forza Annulla"
+
+#: static/tmp_js/gui-d-servicespools.js:346
 msgid "Launch new publication?"
 msgstr "Lancio nuova pubblicazione?"
 
-#: static/tmp_js/gui-d-servicespools.js:344
+#: static/tmp_js/gui-d-servicespools.js:350
 msgid "Failed creating publication"
 msgstr "Fallita creazione pubblicazione"
 
-#: static/tmp_js/gui-d-servicespools.js:366
+#: static/tmp_js/gui-d-servicespools.js:372
 msgid "undefined"
 msgstr "non definito"
 
-#: static/tmp_js/gui-d-servicespools.js:373
+#: static/tmp_js/gui-d-servicespools.js:379
 msgid "Restrained"
 msgstr "Trattenuto"
 
-#: static/tmp_js/gui-d-servicespools.js:380
+#: static/tmp_js/gui-d-servicespools.js:386
 msgid "unknown (needs reload)"
 msgstr "sconosciuto (ha bisogno di ricaricare)"
 
-#: static/tmp_js/gui-d-servicespools.js:384
+#: static/tmp_js/gui-d-servicespools.js:390
 msgid "New service pool"
 msgstr "Nuovo servizio piscina"
 
-#: static/tmp_js/gui-d-servicespools.js:384
+#: static/tmp_js/gui-d-servicespools.js:390
 msgid "creation error"
 msgstr "errore di creazione"
 
-#: static/tmp_js/gui-d-servicespools.js:393
+#: static/tmp_js/gui-d-servicespools.js:399
 msgid "Publish on creation"
 msgstr "Pubblicare sulla creazione"
 
-#: static/tmp_js/gui-d-servicespools.js:394
+#: static/tmp_js/gui-d-servicespools.js:400
 msgid "If selected, will initiate the publication inmediatly after creation"
 msgstr "Se selezionata, avvia la pubblicazione inmediatly dopo la creazione"
 
-#: static/tmp_js/gui-d-servicespools.js:406 static/tmp_js/gui.js:40
+#: static/tmp_js/gui-d-servicespools.js:412 static/tmp_js/gui.js:40
 msgid "Edit"
 msgstr "Modifica"
 
-#: static/tmp_js/gui-d-servicespools.js:406
+#: static/tmp_js/gui-d-servicespools.js:412
 msgid "saving error"
 msgstr "errore di risparmio"
 
-#: static/tmp_js/gui-d-servicespools.js:407 static/tmp_js/gui.js:44
+#: static/tmp_js/gui-d-servicespools.js:413 static/tmp_js/gui.js:44
 #: static/tmp_js/gui.js.c:360
 msgid "Delete"
 msgstr "Eliminare"
 
-#: static/tmp_js/gui-d-servicespools.js:407
+#: static/tmp_js/gui-d-servicespools.js:413
 msgid "deletion error"
 msgstr "errore di omissione"
 
@@ -730,5 +734,5 @@ msgid "Are you sure do you want to delete "
 msgstr "Sei sicuro che si desidera eliminare "
 
 #: static/tmp_js/gui.js:366
-msgid "Item deleted"
-msgstr "Elemento eliminato"
+msgid "Sucess"
+msgstr "Successo"

server/src/uds/locale/pt/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-13 05:07+0100\n"
+"POT-Creation-Date: 2015-02-02 11:31+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"
@@ -327,8 +327,7 @@ msgstr ""
 "TranslateApiException: AppId is over the quota : ID=5641.V2_Json."
 "Translate.22213748"
 
-#: static/tmp_js/gui-d-services.js:67 static/tmp_js/gui-d-services.js.c:133
-#: static/tmp_js/gui-d-services.js:150
+#: static/tmp_js/gui-d-services.js:67
 msgid "Enabled"
 msgstr "Habilitado"
 
@@ -506,11 +505,12 @@ msgid "Transport removal error"
 msgstr "Erro de remoção de transporte"
 
 #: static/tmp_js/gui-d-servicespools.js:317
+#: static/tmp_js/gui-d-servicespools.js:336
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: static/tmp_js/gui-d-servicespools.js:320
-#: static/tmp_js/gui-d-servicespools.js:340
+#: static/tmp_js/gui-d-servicespools.js:346
 msgid "Publish"
 msgstr "Publicar"
 
@@ -518,56 +518,60 @@ msgstr "Publicar"
 msgid "Cancel publication"
 msgstr "Cancelar a publicação"
 
-#: static/tmp_js/gui-d-servicespools.js:340
+#: static/tmp_js/gui-d-servicespools.js:334
+msgid "Force Cancel"
+msgstr "Força cancelar"
+
+#: static/tmp_js/gui-d-servicespools.js:346
 msgid "Launch new publication?"
 msgstr "Lançamento nova publicação?"
 
-#: static/tmp_js/gui-d-servicespools.js:344
+#: static/tmp_js/gui-d-servicespools.js:350
 msgid "Failed creating publication"
 msgstr "Não conseguiu criar publicação"
 
-#: static/tmp_js/gui-d-servicespools.js:366
+#: static/tmp_js/gui-d-servicespools.js:372
 msgid "undefined"
 msgstr "indefinido"
 
-#: static/tmp_js/gui-d-servicespools.js:373
+#: static/tmp_js/gui-d-servicespools.js:379
 msgid "Restrained"
 msgstr "Contido"
 
-#: static/tmp_js/gui-d-servicespools.js:380
+#: static/tmp_js/gui-d-servicespools.js:386
 msgid "unknown (needs reload)"
 msgstr "desconhecido (precisa de recarregar)"
 
-#: static/tmp_js/gui-d-servicespools.js:384
+#: static/tmp_js/gui-d-servicespools.js:390
 msgid "New service pool"
 msgstr "Novo pool de serviço"
 
-#: static/tmp_js/gui-d-servicespools.js:384
+#: static/tmp_js/gui-d-servicespools.js:390
 msgid "creation error"
 msgstr "erro de criação"
 
-#: static/tmp_js/gui-d-servicespools.js:393
+#: static/tmp_js/gui-d-servicespools.js:399
 msgid "Publish on creation"
 msgstr "Publicar na criação"
 
-#: static/tmp_js/gui-d-servicespools.js:394
+#: static/tmp_js/gui-d-servicespools.js:400
 msgid "If selected, will initiate the publication inmediatly after creation"
 msgstr "Se selecionado, irá iniciar a publicação imediatamente após a criação"
 
-#: static/tmp_js/gui-d-servicespools.js:406 static/tmp_js/gui.js:40
+#: static/tmp_js/gui-d-servicespools.js:412 static/tmp_js/gui.js:40
 msgid "Edit"
 msgstr "Editar"
 
-#: static/tmp_js/gui-d-servicespools.js:406
+#: static/tmp_js/gui-d-servicespools.js:412
 msgid "saving error"
 msgstr "salvando o erro"
 
-#: static/tmp_js/gui-d-servicespools.js:407 static/tmp_js/gui.js:44
+#: static/tmp_js/gui-d-servicespools.js:413 static/tmp_js/gui.js:44
 #: static/tmp_js/gui.js.c:360
 msgid "Delete"
 msgstr "Excluir"
 
-#: static/tmp_js/gui-d-servicespools.js:407
+#: static/tmp_js/gui-d-servicespools.js:413
 msgid "deletion error"
 msgstr "erro de exclusão"
 
@@ -742,5 +746,5 @@ msgid "Are you sure do you want to delete "
 msgstr "Você tem certeza que quer excluir "
 
 #: static/tmp_js/gui.js:366
-msgid "Item deleted"
-msgstr "Item excluído"
+msgid "Sucess"
+msgstr "Sucesso"

server/src/uds/osmanagers/LinuxOsManager/LinuxOsManager.py

@@ -56,7 +56,7 @@ class LinuxOsManager(osmanagers.OSManager):
         label=_('On Logout'),
         order=10,
         rdonly=False,
-        tooltip=_('What to do when user logout from service'),
+        tooltip=_('What to do when user logs out from service'),
         values=[
             {'id': 'keep', 'text': _('Keep service assigned')},
             {'id': 'remove', 'text': _('Remove service')}

server/src/uds/osmanagers/WindowsOsManager/WinDomainOsManager.py

@@ -136,7 +136,7 @@ class WinDomainOsManager(WindowsOsManager):
             #  res = l.search_ext_s(base = self._ou, scope = ldap.SCOPE_SUBTREE,
             #                       filterstr = _filter)[0]
             l.delete('cn={0},{1}'.format(service.friendly_name, self._ou))
-        except:
+        except Exception:
             logger.exception('Not found: ')
 
     def check(self):
@@ -145,7 +145,7 @@ class WinDomainOsManager(WindowsOsManager):
         except ldap.LDAPError as e:
             return _('Check error: {0}').format(self.__getLdapError(e))
         except dns.resolver.NXDOMAIN:
-            return [True, _('Could not find server parameters (_ldap._tcp.{0} can\'r be resolved)').format(self._domain)]
+            return [True, _('Could not find server parameters (_ldap._tcp.{0} can\'t be resolved)').format(self._domain)]
         except Exception as e:
             logger.exception('Exception ')
             return [False, str(e)]
@@ -186,7 +186,7 @@ class WinDomainOsManager(WindowsOsManager):
             logger.exception('Exception ')
             return [False, str(e)]
 
-        return [True, _("All parameters seems to work fine.")]
+        return [True, _("All parameters seem to work fine.")]
 
     def infoVal(self, service):
         return 'domain:{0}\t{1}\t{2}\t{3}\t{4}'.format(self.getName(service), self._domain, self._ou, self._account, self._password)

server/src/uds/osmanagers/WindowsOsManager/WindowsOsManager.py

@@ -48,7 +48,7 @@ class WindowsOsManager(osmanagers.OSManager):
         label=_('On Logout'),
         order=10,
         rdonly=False,
-        tooltip=_('What to do when user logout from service'),
+        tooltip=_('What to do when user logs out from service'),
         values=[
             {'id': 'keep', 'text': _('Keep service assigned')},
             {'id': 'remove', 'text': _('Remove service')}
@@ -57,7 +57,7 @@ class WindowsOsManager(osmanagers.OSManager):
     )
 
     idle = gui.NumericField(label=_("Max.Idle time"), length=4, defvalue=-1, rdonly=False, order=11,
-                            tooltip=_('Maximum idle time (in seconds) before session is automaticatlly closed to the user (<= 0 means no max idle time).'), required=True)
+                            tooltip=_('Maximum idle time (in seconds) before session is automaticatlly closed to the user (<= 0 means no max. idle time)'), required=True)
 
     @staticmethod
     def validateLen(length):

server/src/uds/services/OVirt/OVirtLinkedService.py

@@ -33,8 +33,8 @@
 
 from django.utils.translation import ugettext_noop as _, ugettext
 from uds.core.services import Service
-from OVirtPublication import OVirtPublication
-from OVirtLinkedDeployment import OVirtLinkedDeployment
+from .OVirtPublication import OVirtPublication
+from .OVirtLinkedDeployment import OVirtLinkedDeployment
 
 from uds.core.ui import gui
 
@@ -42,14 +42,12 @@ import logging
 
 logger = logging.getLogger(__name__)
 
-from Helpers import oVirtHelpers
+from .Helpers import oVirtHelpers
 
 
 class OVirtLinkedService(Service):
     '''
     oVirt Linked clones service. This is based on creating a template from selected vm, and then use it to
-
-
     '''
     # : Name to show the administrator. This string will be translated BEFORE
     # : sending it to administration interface, so don't forget to
@@ -121,10 +119,10 @@ class OVirtLinkedService(Service):
     baseName = gui.TextField(label=_('Machine Names'), rdonly=False, order=6, tooltip=('Base name for clones from this machine'), required=True)
 
     lenName = gui.NumericField(length=1, label=_('Name Length'), defvalue=5, order=7,
-                               tooltip=_('Length of numeric part for the names of this machines (betwen 3 and 6'), required=True)
+                               tooltip=_('Size of numeric part for the names of these machines (between 3 and 6)'), required=True)
 
     display = gui.ChoiceField(label=_('Display'), rdonly=False, order=8,
-                              tooltip=_('Display type (only for administration pourposses)'),
+                              tooltip=_('Display type (only for administration purposes)'),
                               values=[gui.choiceItem('spice', 'Spice'),
                                       gui.choiceItem('vnc', 'Vnc')
                                       ],

server/src/uds/services/OVirt/OVirtProvider.py

@@ -96,7 +96,7 @@ class Provider(ServiceProvider):
     password = gui.PasswordField(lenth=32, label=_('Password'), order=4, tooltip=_('Password of the user of oVirt'), required=True)
     timeout = gui.NumericField(length=3, label=_('Timeout'), defvalue='10', order=5, tooltip=_('Timeout in seconds of connection to VC'), required=True)
     macsRange = gui.TextField(length=36, label=_('Macs range'), defvalue='52:54:00:00:00:00-52:54:00:FF:FF:FF', order=6, rdonly=True,
-                              tooltip=_('Range of valids macs for created machines'), required=True)
+                              tooltip=_('Range of valid macs for created machines'), required=True)
 
     # oVirt engine, right now, only permits a connection to one server and only one per instance
     # If we want to connect to more than one server, we need keep locked access to api, change api server, etc..

server/src/uds/services/PhysicalMachines/IPMachinesService.py

@@ -48,7 +48,7 @@ class IPMachinesService(services.Service):
     ipList = gui.EditableList(label=_('List of IPS'))
 
     # Description of service
-    typeName = _('Physical machines accesed by ip')
+    typeName = _('Physical machines accessed by ip')
     typeType = 'IPMachinesService'
     typeDescription = _('This service provides access to POWERED-ON Machines by ip')
     iconFile = 'machine.png'

server/src/uds/services/Sample/SampleProvider.py

@@ -115,7 +115,7 @@ class Provider(ServiceProvider):
     #: Is Methuselah istill alive?
     methAlive = gui.CheckBoxField(order=4,
         label=_('Is Methuselah still alive?'),
-        tooltip=_('If you fails, this will not get saved :-)'),
+        tooltip=_('If you fail, this will not get saved :-)'),
         required=True,  #: Also means nothing. Check boxes has always a value
         defvalue=gui.TRUE  #: By default, at new item, check this
     )

server/src/uds/services/Xen/XenProvider.py

@@ -99,7 +99,7 @@ class Provider(ServiceProvider):
     username = gui.TextField(length=32, label=_('Username'), order=2, tooltip=_('User with valid privileges on XenServer'), required=True, defvalue='root')
     password = gui.PasswordField(lenth=32, label=_('Password'), order=3, tooltip=_('Password of the user of XenServer'), required=True)
     macsRange = gui.TextField(length=36, label=_('Macs range'), defvalue='02:46:00:00:00:00-02:46:00:FF:FF:FF', order=4, rdonly=True,
-                              tooltip=_('Range of valids macs for created machines'), required=True)
+                              tooltip=_('Range of valid macs for created machines'), required=True)
 
     # XenServer engine, right now, only permits a connection to one server and only one per instance
     # If we want to connect to more than one server, we need keep locked access to api, change api server, etc..

server/src/uds/templates/uds/html5/about.html

@@ -11,7 +11,7 @@
 <div class="row">
   <div class="col-md-8 col-md-offset-2">
     <p>{% trans 'You can access UDS Open Source code at' %} <a href="http://www.openuds.org" target="_blank">OpenUDS</a></p>
-    <p><h3>{% trans 'UDS has been developed using theese components:' %}</h3></p>
+    <p><h3>{% trans 'UDS has been developed using these components:' %}</h3></p>
     <ul>
       <li><a href="http://www.eclipse.org" target="_blank">Eclipse</a> as IDE with <a href="http://pydev.org/" target="_blank">pyDev</a></li>
       <li><a href="https://www.djangoproject.com/" target="_blank">Django</a></li>

server/src/uds/templates/uds/html5/service_not_ready.html

@@ -12,7 +12,7 @@
           <h1> {% trans 'The service is not ready' %}</h1>
           <br />
           <p>{% trans 'The service is not ready at this moment. Please, try it again after a few seconds.' %}</p>
-          <h5>{% trans 'The service you has requested was not ready, and is being created right now. It will be availabe shortly' %}</h5>
+          <h5>{% trans 'The service you have requested was not ready, and it is being created right now. It will be availabe shortly' %}</h5>
           <br />
           <a href="{% url 'uds.web.views.index' %}" class="btn btn-lg btn-info"><i class="fa fa-home"></i> {% trans "Back" %}</a>
         </div>

server/src/uds/transports/NX/NXTransport.py

@@ -63,7 +63,7 @@ class NXTransport(Transport):
     useEmptyCreds = gui.CheckBoxField(label=_('Empty creds'), order=1, tooltip=_('If checked, the credentials used to connect will be emtpy'))
     fixedName = gui.TextField(label=_('Username'), order=2, tooltip=_('If not empty, this username will be always used as credential'))
     fixedPassword = gui.PasswordField(label=_('Password'), order=3, tooltip=_('If not empty, this password will be always used as credential'))
-    listenPort = gui.NumericField(label=_('Listen port'), length=5, order=4, tooltip=_('Listening port of NX (ssh) at client machine'), defvalue='22')
+    listenPort = gui.NumericField(label=_('Listening port'), length=5, order=4, tooltip=_('Listening port of NX (ssh) at client machine'), defvalue='22')
     connection = gui.ChoiceField(label=_('Connection'), order=6, tooltip=_('Connection speed for this transport (quality)'),
                                  values=[
                                      {'id': 'modem', 'text': 'modem'},
@@ -87,7 +87,7 @@ class NXTransport(Transport):
                                     {'id': '256', 'text': '256 Mb'},
                                     {'id': '512', 'text': '512 Mb'},
     ])
-    cacheMem = gui.ChoiceField(label=_('Memory Cache'), order=9, tooltip=_('Cache size en Mb keept at memory'),
+    cacheMem = gui.ChoiceField(label=_('Memory Cache'), order=9, tooltip=_('Cache size en Mb kept at memory'),
                                values=[
                                        {'id': '4', 'text': '4 Mb'},
                                        {'id': '8', 'text': '8 Mb'},

server/src/uds/transports/RDP/TSRDPTransport.py

@@ -63,7 +63,7 @@ class TSRDPTransport(BaseRDPTransport):
     needsJava = True  # If this transport needs java for rendering
     protocol = protocols.RDP
 
-    tunnelServer = gui.TextField(label=_('Tunnel server'), order=1, tooltip=_('IP or Hostname of tunnel server send to client device ("public" ip) and port. (use HOST:PORT format)'))
+    tunnelServer = gui.TextField(label=_('Tunnel server'), order=1, tooltip=_('IP or Hostname of tunnel server sent to client device ("public" ip) and port. (use HOST:PORT format)'))
     tunnelCheckServer = gui.TextField(label=_('Tunnel host check'), order=2, tooltip=_('If not empty, this server will be used to check if service is running before assigning it to user. (use HOST:PORT format)'))
 
     useEmptyCreds = BaseRDPTransport.useEmptyCreds

server/src/uds/transports/TSNX/TSNXTransport.py

@@ -65,13 +65,13 @@ class TSNXTransport(Transport):
     supportedOss = ['Windows', 'Macintosh', 'Linux']
     protocol = protocols.NX
 
-    tunnelServer = gui.TextField(label=_('Tunnel server'), order=1, tooltip=_('IP or Hostname of tunnel server send to client device ("public" ip) and port. (use HOST:PORT format)'))
+    tunnelServer = gui.TextField(label=_('Tunnel server'), order=1, tooltip=_('IP or Hostname of tunnel server sent to client device ("public" ip) and port. (use HOST:PORT format)'))
     tunnelCheckServer = gui.TextField(label=_('Tunnel host check'), order=2, tooltip=_('If not empty, this server will be used to check if service is running before assigning it to user. (use HOST:PORT format)'))
 
     useEmptyCreds = gui.CheckBoxField(label=_('Empty creds'), order=3, tooltip=_('If checked, the credentials used to connect will be emtpy'))
     fixedName = gui.TextField(label=_('Username'), order=4, tooltip=_('If not empty, this username will be always used as credential'))
     fixedPassword = gui.PasswordField(label=_('Password'), order=5, tooltip=_('If not empty, this password will be always used as credential'))
-    listenPort = gui.NumericField(label=_('Listen port'), length=5, order=6, tooltip=_('Listening port of NX (ssh) at client machine'), defvalue='22')
+    listenPort = gui.NumericField(label=_('Listening port'), length=5, order=6, tooltip=_('Listening port of NX (ssh) at client machine'), defvalue='22')
     connection = gui.ChoiceField(label=_('Connection'), order=7, tooltip=_('Connection speed for this transport (quality)'),
                                  values=[
                                      {'id': 'modem', 'text': 'modem'},
@@ -95,7 +95,7 @@ class TSNXTransport(Transport):
                                     {'id': '256', 'text': '256 Mb'},
                                     {'id': '512', 'text': '512 Mb'},
     ])
-    cacheMem = gui.ChoiceField(label=_('Memory Cache'), order=10, tooltip=_('Cache size en Mb keept at memory'),
+    cacheMem = gui.ChoiceField(label=_('Memory Cache'), order=10, tooltip=_('Cache size en Mb kept at memory'),
                                values=[
                                    {'id': '4', 'text': '4 Mb'},
                                    {'id': '8', 'text': '8 Mb'},

server/src/uds/web/views/auth.py

@@ -131,7 +131,7 @@ def authInfo(request, authName):
 
         return HttpResponse(info)
     except Exception:
-        return HttpResponse(_('Authenticator does not provides information'))
+        return HttpResponse(_('Authenticator does not provide information'))
 
 
 @webLoginRequired

server/src/uds/web/views/login.py

@@ -72,7 +72,7 @@ def login(request, smallName=None):
                 except Exception:  # There is no authenticators yet, simply allow global login to nowhere.. :-)
                     smallName = None
 
-    logger.debug('Small name: {0}'.format(smallName))
+    logger.debug('Tag: {0}'.format(smallName))
 
     logger.debug(request.method)
     if request.method == 'POST':