Merge branch 'pre-release-0.2.0' into release-0.2.0

This merge contains today's state of develop branch,
minus soledad and email components.

1 files changed, 15 insertions, 7 deletions

diff --git a/src/leap/base/specs.py b/src/leap/base/specs.py
index b4bb8dcf..f57d7e9c 100644
--- a/src/leap/base/specs.py
+++ b/src/leap/base/specs.py
@@ -2,28 +2,36 @@ leap_provider_spec = {
     'description': 'provider definition',
     'type': 'object',
     'properties': {
-        'serial': {
-            'type': int,
-            'default': 1,
-            'required': True,
-        },
+        #'serial': {
+            #'type': int,
+            #'default': 1,
+            #'required': True,
+        #},
         'version': {
             'type': unicode,
             'default': '0.1.0'
             #'required': True
         },
+        "default_language": {
+            'type': unicode,
+            'default': 'en'
+        },
         'domain': {
             'type': unicode,  # XXX define uri type
             'default': 'testprovider.example.org'
             #'required': True,
         },
-        'display_name': {
-            'type': dict,  # XXX multilingual object?
+        'name': {
+            #'type': LEAPTranslatable,
+            'type': dict,
+            'format': 'translatable',
             'default': {u'en': u'Test Provider'}
             #'required': True
         },
         'description': {
+            #'type': LEAPTranslatable,
             'type': dict,
+            'format': 'translatable',
             'default': {u'en': u'Test provider'}
         },
         'enrollment_policy': {