fix more translate

idhub/admin/views.py

@@ -161,7 +161,7 @@ class PeopleEditView(PeopleView, UpdateView):
 
 class PeopleRegisterView(NotifyActivateUserByEmail, People, CreateView):
     template_name = "idhub/admin/people_register.html"
-    subtitle = _('People Register')
+    subtitle = _('Add user')
     icon = 'bi bi-person'
     model = User
     fields = ('first_name', 'last_name', 'email')
@@ -330,7 +330,7 @@ class PeopleRolDeleteView(PeopleView):
 
 class RolesView(AccessControl):
     template_name = "idhub/admin/roles.html"
-    subtitle = _('Role Management')
+    subtitle = _('Manage roles')
     icon = ''
 
     def get_context_data(self, **kwargs):
@@ -393,7 +393,7 @@ class RolDeleteView(AccessControl):
 
 class ServicesView(AccessControl):
     template_name = "idhub/admin/services.html"
-    subtitle = _('Service management')
+    subtitle = _('Manage services')
     icon = ''
 
     def get_context_data(self, **kwargs):
@@ -456,7 +456,7 @@ class ServiceDeleteView(AccessControl):
 
 class CredentialsView(Credentials):
     template_name = "idhub/admin/credentials.html"
-    subtitle = _('Credential list')
+    subtitle = _('View credentials')
     icon = ''
 
     def get_context_data(self, **kwargs):
@@ -542,7 +542,7 @@ class DeleteCredentialsView(Credentials):
 
 class DidsView(Credentials):
     template_name = "idhub/admin/dids.html"
-    subtitle = _('Organization Identities (DID)')
+    subtitle = _('Manage Identities (DID)')
     icon = 'bi bi-patch-check-fill'
     wallet = True
 
@@ -610,7 +610,7 @@ class DidDeleteView(Credentials, DeleteView):
 
 class WalletCredentialsView(Credentials):
     template_name = "idhub/admin/wallet_credentials.html"
-    subtitle = _('Credential management')
+    subtitle = _('View org. credentials')
     icon = 'bi bi-patch-check-fill'
     wallet = True
 
@@ -756,7 +756,7 @@ class SchemasImportAddView(SchemasMix):
 
 class ImportView(ImportExport, TemplateView):
     template_name = "idhub/admin/import.html"
-    subtitle = _('Import')
+    subtitle = _('Import data')
     icon = ''
 
     def get_context_data(self, **kwargs):

idhub/templates/idhub/base.html

@@ -66,29 +66,29 @@
               <li class="nav-item">
                 <a class="nav-link {% if section == 'Home' %}active {% endif %}fw-bold" aria-current="page" href="{% url 'idhub:user_dashboard' %}">
                   <i class="bi bi-house-door icon_sidebar"></i>
-                  Home
+                  {% trans 'Dashboard' %}
                 </a>
                 <hr />
               </li>
               <li class="nav-item">
                 <span class="nav-link {% if section == 'MyProfile' %}active {% endif %}fw-bold">
                   <i class="fa-regular fa-user icon_sidebar"></i>
-                  My datas
+                  {% trans 'My information' %}
                 </span>
                 <ul class="flex-column mb-2 ul_sidebar">
                   <li class="nav-item">
                     <a class="nav-link {% if path == 'user_profile' %}active2{% endif %}" href="{% url 'idhub:user_profile' %}">
-                      My personal data
+                      {% trans 'My personal information' %}
                     </a>
                   </li>
                   <li class="nav-item">
                     <a class="nav-link {% if path == 'user_roles' %}active2{% endif %}" href="{% url 'idhub:user_roles' %}">
-                      My roles
+                      {% trans 'My roles' %}
                     </a>
                   </li>
                   <li class="nav-item">
                     <a class="nav-link {% if path == 'user_gdpr' %}active2{% endif %}" href="{% url 'idhub:user_gdpr' %}">
-                      GDPR info
+                      {% trans 'GDPR info' %}
                     </a>
                   </li>
                 </ul>
@@ -96,27 +96,27 @@
               <li class="nav-item">
                 <span class="nav-link {% if section == 'MyWallet' %}active {% endif %}fw-bold" href="#">
                   <i class="bi bi-patch-check icon_sidebar"></i>
-                  My Wallet
+                  {% trans 'My wallet' %}
                 </span>
                 <ul class="flex-column mb-2 ul_sidebar">
                   <li class="nav-item">
                     <a class="nav-link {% if path == 'user_dids' %}active2{% endif %}" href="{% url 'idhub:user_dids' %}">
-                      Identities (DID)
+                      {% trans 'Identities (DIDs)' %}
                     </a>
                   </li>
                   <li class="nav-item">
                     <a class="nav-link {% if path == 'user_credentials' %}active2{% endif %}" href="{% url 'idhub:user_credentials' %}">
-                      Credentials
+                      {% trans 'My credentials' %}
                     </a>
                   </li>
                   <li class="nav-item">
                     <a class="nav-link {% if path == 'user_credentials_request' %}active2{% endif %}" href="{% url 'idhub:user_credentials_request' %}">
-                      Credentials request
+                      {% trans 'Request a credential' %}
                     </a>
                   </li>
                   <li class="nav-item">
                     <a class="nav-link {% if path == 'user_credentials_presentation' %}active2{% endif %}" href="{% url 'idhub:user_credentials_presentation' %}">
-                      Credentials Presentation
+                      {% trans 'Present a credential' %}
                     </a>
                   </li>
                 </ul>

idhub/templates/idhub/base_admin.html

@@ -66,24 +66,24 @@
               <li class="nav-item">
                   <a class="admin nav-link {% if section == 'Home' %}active {% endif %}fw-bold" href="{% url 'idhub:admin_dashboard' %}">
                   <i class="bi bi-house-door icon_sidebar"></i>
-                  Home
+                  {% trans 'Dashboard' %}
                 </a>
                 <hr />
               </li>
               <li class="nav-item">
                 <a class="admin {% if section == 'People' %}active {% endif %}nav-link fw-bold" data-bs-toggle="collapse" data-bs-target="#people" aria-expanded="false" aria-controls="people" href="javascript:void()">
                   <i class="bi bi-people icon_sidebar"></i>
-                  People
+                  {% trans 'User managament' %}
                 </a>
                 <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if section == 'People' %}expanded{% else %}collapse{% endif %}" id="people" data-bs-parent="#sidebarMenu">
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'admin_people_list' %} active2{% endif %}" href="{% url 'idhub:admin_people_list' %}">
-                      People list
+                      {% trans 'View users' %}
                     </a>
                   </li>
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'admin_people_new' %} active2{% endif %}" href="{% url 'idhub:admin_people_new' %}">
-                      Register a new user
+                      {% trans 'Add user' %}
                     </a>
                   </li>
                 </ul>
@@ -91,50 +91,50 @@
               <li class="nav-item">
                 <a class="admin nav-link {% if section == 'AccessControl' %}active {% endif %}fw-bold" data-bs-toggle="collapse" data-bs-target="#control-access" aria-expanded="false" aria-controls="control-access" href="javascript:void()">
                   <i class="fa-solid fa-arrow-right-from-bracket icon_sidebar"></i>
-                  Access Control
+                  {% trans 'Access control managament' %}
                 </a>
                 <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if section == 'AccessControl' %}expanded{% else %}collapse{% endif %}" id="control-access" data-bs-parent="#sidebarMenu">
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'admin_roles' %} active2{% endif %}" href="{% url 'idhub:admin_roles' %}">
-                      roles
+                      {% trans 'Manage roles' %}
                     </a>
                   </li>
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'admin_services' %} active2{% endif %}" href="{% url 'idhub:admin_services' %}">
-                      Services
+                      {% trans 'Manage services' %}
                     </a>
                   </li>
                 </ul>
               </li>
               <li class="nav-item">
-                <a class="admin nav-link {% if section == 'Credentials' %}active {% endif %}fw-bold" data-bs-toggle="collapse" data-bs-target="#credentials" aria-expanded="false" aria-controls="credentials" href="javascript:void()">
+                <a class="admin nav-link {% if section == 'Credential' %}active {% endif %}fw-bold" data-bs-toggle="collapse" data-bs-target="#credential" aria-expanded="false" aria-controls="credential" href="javascript:void()">
                   <i class="bi bi-patch-check icon_sidebar"></i>
-                  Credentials
+                  {% trans 'Credential management' %}
                 </a>
-                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if section == 'Credentials' %}expanded{% else %}collapse{% endif %}" id="credentials" data-bs-parent="#sidebarMenu">
+                <ul class="flex-column mb-2 ul_sidebar accordion-collapse {% if section == 'Credential' %}expanded{% else %}collapse{% endif %}" id="credential" data-bs-parent="#sidebarMenu">
                   <li class="nav-item">
                     <a class="nav-link{% if path == 'admin_credentials' %} active2{% endif %}" href="{% url 'idhub:admin_credentials' %}">
-                      Credentials list
+                      {% trans 'View credentials' %}
                     </a>
                   </li>
                   <li class="nav-item">
                     <a id="wallet" class="nav-link" data-bs-toggle="collapse" data-bs-target="#lwallet" aria-expanded="false" aria-controls="lwallet" href="javascript:void()">
-                      Wallet
+                      {% trans "Organization's wallet" %}
                     </a>
                     <ul class="flex-column mb-2 accordion-collapse {% if wallet %}expanded{% else %}collapse{% endif %}" id="lwallet" data-bs-parent="#wallet">
                       <li class="nav-item">
                         <a class="nav-link{% if path == 'admin_dids' %} active2{% endif %}" href="{% url 'idhub:admin_dids' %}">
-                          Identities (DID)
+                          {% trans 'Manage Identities (DIDs)' %}
                         </a>
                       </li>
                       <li class="nav-item">
                         <a class="nav-link{% if path == 'admin_wallet_credentials' %} active2{% endif %}" href="{% url 'idhub:admin_wallet_credentials' %}">
-                          Credentials
+                          {% trans 'View org. credentials' %}
                         </a>
                       </li>
                       <li class="nav-item">
                         <a class="nav-link{% if path == 'admin_wallet_config_issue' %} active2{% endif %}" href="{% url 'idhub:admin_wallet_config_issue' %}">
-                          Configure Issue
+                          {% trans 'Configure credential issuance' %}
                         </a>
                       </li>
                     </ul>
@@ -144,13 +144,13 @@
               <li class="nav-item">
                 <a class="admin nav-link {% if section == 'Templates' %}active {% endif %}fw-bold" href="{% url 'idhub:admin_schemas' %}">
                   <i class="bi bi-file-earmark-text icon_sidebar"></i>
-                  Templates
+                  {% trans 'Credential template management' %}
                 </a>
               </li>
               <li class="nav-item">
                 <a class="admin nav-link {% if section == 'ImportExport' %}active {% endif %}fw-bold" href="{% url 'idhub:admin_import' %}">
                   <i class="bi bi-arrow-down-square icon_sidebar"></i>
-                  Import Datas
+                  {% trans 'Import data' %}
                 </a>
               </li>
             </ul>

locale/ca_ES/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-13 10:13+0100\n"
+"POT-Creation-Date: 2023-11-13 11:11+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"
@@ -1537,7 +1537,8 @@ msgstr ""
 msgid "The user does not exist!"
 msgstr ""
 
-#: idhub/admin/views.py:43 idhub/user/views.py:33
+#: idhub/admin/views.py:43 idhub/templates/idhub/base.html:69
+#: idhub/templates/idhub/base_admin.html:69 idhub/user/views.py:33
 msgid "Dashboard"
 msgstr ""
 
@@ -1566,7 +1567,7 @@ msgstr ""
 msgid "Data file management"
 msgstr ""
 
-#: idhub/admin/views.py:82
+#: idhub/admin/views.py:82 idhub/templates/idhub/base_admin.html:81
 msgid "View users"
 msgstr ""
 
@@ -1586,8 +1587,8 @@ msgstr ""
 msgid "The account is updated successfully"
 msgstr ""
 
-#: idhub/admin/views.py:164
+#: idhub/admin/views.py:164 idhub/templates/idhub/base_admin.html:86
-msgid "People Register"
+msgid "Add user"
 msgstr ""
 
 #: idhub/admin/views.py:179
@@ -1610,8 +1611,8 @@ msgstr ""
 msgid "Modify a user role to access a service"
 msgstr ""
 
-#: idhub/admin/views.py:333
+#: idhub/admin/views.py:333 idhub/templates/idhub/base_admin.html:99
-msgid "Role Management"
+msgid "Manage roles"
 msgstr ""
 
 #: idhub/admin/views.py:345 idhub/templates/idhub/admin/roles.html:31
@@ -1635,8 +1636,8 @@ msgstr ""
 msgid "Role deleted successfully"
 msgstr ""
 
-#: idhub/admin/views.py:396
+#: idhub/admin/views.py:396 idhub/templates/idhub/base_admin.html:104
-msgid "Service management"
+msgid "Manage services"
 msgstr ""
 
 #: idhub/admin/views.py:408
@@ -1659,8 +1660,8 @@ msgstr ""
 msgid "Service deleted successfully"
 msgstr ""
 
-#: idhub/admin/views.py:459
+#: idhub/admin/views.py:459 idhub/templates/idhub/base_admin.html:117
-msgid "Credential list"
+msgid "View credentials"
 msgstr ""
 
 #: idhub/admin/views.py:472
@@ -1675,8 +1676,8 @@ msgstr ""
 msgid "Credential deleted successfully"
 msgstr ""
 
-#: idhub/admin/views.py:545 idhub/admin/views.py:577 idhub/admin/views.py:596
+#: idhub/admin/views.py:545
-msgid "Organization Identities (DID)"
+msgid "Manage Identities (DID)"
 msgstr ""
 
 #: idhub/admin/views.py:558
@@ -1687,6 +1688,10 @@ msgstr ""
 msgid "DID created successfully"
 msgstr ""
 
+#: idhub/admin/views.py:577 idhub/admin/views.py:596
+msgid "Organization Identities (DID)"
+msgstr ""
+
 #: idhub/admin/views.py:591 idhub/user/views.py:218
 msgid "DID updated successfully"
 msgstr ""
@@ -1695,11 +1700,11 @@ msgstr ""
 msgid "DID delete successfully"
 msgstr ""
 
-#: idhub/admin/views.py:613 idhub/user/views.py:75
+#: idhub/admin/views.py:613 idhub/templates/idhub/base_admin.html:132
-msgid "Credential management"
+msgid "View org. credentials"
 msgstr ""
 
-#: idhub/admin/views.py:620
+#: idhub/admin/views.py:620 idhub/templates/idhub/base_admin.html:137
 msgid "Configure credential issuance"
 msgstr ""
 
@@ -1731,7 +1736,12 @@ msgstr ""
 msgid "The schema was added sucessfully"
 msgstr ""
 
-#: idhub/admin/views.py:759 idhub/admin/views.py:772 idhub/admin/views.py:785
+#: idhub/admin/views.py:759 idhub/templates/idhub/admin/import.html:31
+#: idhub/templates/idhub/base_admin.html:153
+msgid "Import data"
+msgstr ""
+
+#: idhub/admin/views.py:772 idhub/admin/views.py:785
 msgid "Import"
 msgstr ""
 
@@ -2167,10 +2177,6 @@ msgstr ""
 msgid "Created at"
 msgstr ""
 
-#: idhub/templates/idhub/admin/import.html:31
-msgid "Import data"
-msgstr ""
-
 #: idhub/templates/idhub/admin/issue_credentials.html:14
 #: idhub/templates/idhub/admin/issue_credentials.html:72
 msgid "Revoke"
@@ -2336,6 +2342,67 @@ msgstr ""
 msgid "Add membership"
 msgstr ""
 
+#: idhub/templates/idhub/base.html:76
+msgid "My information"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:81
+msgid "My personal information"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:86 idhub/user/views.py:63
+msgid "My roles"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:91 idhub/user/views.py:69
+msgid "GDPR info"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:99 idhub/user/views.py:27
+msgid "My wallet"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:104 idhub/user/views.py:170
+#: idhub/user/views.py:204 idhub/user/views.py:223
+msgid "Identities (DIDs)"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:109
+msgid "My credentials"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:114
+msgid "Request a credential"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:119
+msgid "Present a credential"
+msgstr ""
+
+#: idhub/templates/idhub/base_admin.html:76
+msgid "User managament"
+msgstr ""
+
+#: idhub/templates/idhub/base_admin.html:94
+msgid "Access control managament"
+msgstr ""
+
+#: idhub/templates/idhub/base_admin.html:112 idhub/user/views.py:75
+msgid "Credential management"
+msgstr ""
+
+#: idhub/templates/idhub/base_admin.html:122
+msgid "Organization's wallet"
+msgstr ""
+
+#: idhub/templates/idhub/base_admin.html:127
+msgid "Manage Identities (DIDs)"
+msgstr ""
+
+#: idhub/templates/idhub/base_admin.html:147
+msgid "Credential template management"
+msgstr ""
+
 #: idhub/templates/idhub/user/credentials_presentation.html:30
 msgid "Send"
 msgstr ""
@@ -2661,22 +2728,10 @@ msgstr ""
 msgid "My profile"
 msgstr ""
 
-#: idhub/user/views.py:27
-msgid "My wallet"
-msgstr ""
-
 #: idhub/user/views.py:41
 msgid "My personal data"
 msgstr ""
 
-#: idhub/user/views.py:63
-msgid "My roles"
-msgstr ""
-
-#: idhub/user/views.py:69
-msgid "GDPR info"
-msgstr ""
-
 #: idhub/user/views.py:88
 msgid "Credential"
 msgstr ""
@@ -2705,10 +2760,6 @@ msgstr ""
 msgid "Error sending credential!"
 msgstr ""
 
-#: idhub/user/views.py:170 idhub/user/views.py:204 idhub/user/views.py:223
-msgid "Identities (DIDs)"
-msgstr ""
-
 #: idhub/user/views.py:183
 msgid "Add a new Identity (DID)"
 msgstr ""

locale/es/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-10 16:23+0100\n"
+"POT-Creation-Date: 2023-11-13 11:12+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"
@@ -1533,209 +1533,223 @@ msgstr ""
 msgid "show this help message and exit"
 msgstr ""
 
-#: idhub/admin/forms.py:107
+#: idhub/admin/forms.py:106
 msgid "The user does not exist!"
-msgstr "No existe el usuario!"
-
-#: idhub/admin/views.py:44 idhub/user/views.py:33
-msgid "Dashboard"
-msgstr "Panel"
-
-#: idhub/admin/views.py:45 idhub/user/views.py:34
-msgid "Success"
-msgstr "Éxito"
-
-#: idhub/admin/views.py:57
-msgid "User Management"
-msgstr "Gestión de usuarios"
-
-#: idhub/admin/views.py:62
-msgid "Access control management"
-msgstr "Gestión de control de acceso"
-
-#: idhub/admin/views.py:67
-msgid "Credential Management"
-msgstr "Gestión de credenciales"
-
-#: idhub/admin/views.py:72
-msgid "Templates Management"
 msgstr ""
 
-#: idhub/admin/views.py:77
+#: idhub/admin/views.py:43 idhub/templates/idhub/base.html:69
+#: idhub/templates/idhub/base_admin.html:69 idhub/user/views.py:33
+msgid "Dashboard"
+msgstr ""
+
+#: idhub/admin/views.py:44 idhub/templates/idhub/admin/import.html:17
+#: idhub/user/views.py:34
+msgid "Success"
+msgstr ""
+
+#: idhub/admin/views.py:56
+msgid "User Management"
+msgstr ""
+
+#: idhub/admin/views.py:61
+msgid "Access control management"
+msgstr ""
+
+#: idhub/admin/views.py:66
+msgid "Credential Management"
+msgstr ""
+
+#: idhub/admin/views.py:71
+msgid "Template Management"
+msgstr ""
+
+#: idhub/admin/views.py:76
 msgid "Data file management"
 msgstr ""
 
-#: idhub/admin/views.py:83
+#: idhub/admin/views.py:82 idhub/templates/idhub/base_admin.html:81
 msgid "View users"
 msgstr ""
 
-#: idhub/admin/views.py:96
+#: idhub/admin/views.py:95
 msgid "User personal information"
 msgstr ""
 
-#: idhub/admin/views.py:120
+#: idhub/admin/views.py:119
-msgid "It was not possible deactivate the account!"
+msgid "Is not possible deactivate your account!"
 msgstr ""
 
-#: idhub/admin/views.py:144 idhub/admin/views.py:262
+#: idhub/admin/views.py:143 idhub/admin/views.py:261
-msgid "It was not possible delete the account!"
+msgid "Is not possible delete your account!"
 msgstr ""
 
-#: idhub/admin/views.py:156
+#: idhub/admin/views.py:155
 msgid "The account is updated successfully"
 msgstr ""
 
-#: idhub/admin/views.py:165
+#: idhub/admin/views.py:164 idhub/templates/idhub/base_admin.html:86
-msgid "Add a user"
+msgid "Add user"
 msgstr ""
 
-#: idhub/admin/views.py:180
+#: idhub/admin/views.py:179
 msgid "The account was created successfully"
 msgstr ""
 
-#: idhub/admin/views.py:194 idhub/admin/views.py:231
+#: idhub/admin/views.py:193
 msgid "Associate a membership to the user"
 msgstr ""
 
-#: idhub/admin/views.py:269
+#: idhub/admin/views.py:230
+msgid "People add membership"
+msgstr ""
+
+#: idhub/admin/views.py:268
 msgid "Add a user role to access a service"
 msgstr ""
 
-#: idhub/admin/views.py:299
+#: idhub/admin/views.py:298
 msgid "Modify a user role to access a service"
 msgstr ""
 
-#: idhub/admin/views.py:334
+#: idhub/admin/views.py:333 idhub/templates/idhub/base_admin.html:99
-msgid "Role Management"
+msgid "Manage roles"
 msgstr ""
 
-#: idhub/admin/views.py:346 idhub/templates/idhub/admin/roles.html:31
+#: idhub/admin/views.py:345 idhub/templates/idhub/admin/roles.html:31
 #: idhub/templates/idhub/admin/user_edit.html:93
 msgid "Add Role"
 msgstr ""
 
-#: idhub/admin/views.py:355
+#: idhub/admin/views.py:354
 msgid "Role created successfully"
 msgstr ""
 
-#: idhub/admin/views.py:362
+#: idhub/admin/views.py:361
 msgid "Edit Role"
 msgstr ""
 
-#: idhub/admin/views.py:377
+#: idhub/admin/views.py:376
 msgid "Role updated successfully"
 msgstr ""
 
-#: idhub/admin/views.py:390
+#: idhub/admin/views.py:389
 msgid "Role deleted successfully"
 msgstr ""
 
-#: idhub/admin/views.py:397
+#: idhub/admin/views.py:396 idhub/templates/idhub/base_admin.html:104
-msgid "Service management"
+msgid "Manage services"
 msgstr ""
 
-#: idhub/admin/views.py:409 idhub/templates/idhub/admin/services.html:35
+#: idhub/admin/views.py:408
-msgid "Add Service"
+msgid "Add service"
 msgstr ""
 
-#: idhub/admin/views.py:418
+#: idhub/admin/views.py:417
 msgid "Service created successfully"
 msgstr ""
 
-#: idhub/admin/views.py:425
+#: idhub/admin/views.py:424
-msgid "Modify Service"
+msgid "Modify service"
 msgstr ""
 
-#: idhub/admin/views.py:440
+#: idhub/admin/views.py:439
 msgid "Service updated successfully"
 msgstr ""
 
-#: idhub/admin/views.py:453
+#: idhub/admin/views.py:452
 msgid "Service deleted successfully"
 msgstr ""
 
-#: idhub/admin/views.py:460
+#: idhub/admin/views.py:459 idhub/templates/idhub/base_admin.html:117
-msgid "Credential list"
+msgid "View credentials"
 msgstr ""
 
-#: idhub/admin/views.py:473
+#: idhub/admin/views.py:472
 msgid "Change status of Credential"
 msgstr ""
 
-#: idhub/admin/views.py:515
+#: idhub/admin/views.py:514
 msgid "Credential revoked successfully"
 msgstr ""
 
-#: idhub/admin/views.py:537
+#: idhub/admin/views.py:536
 msgid "Credential deleted successfully"
 msgstr ""
 
-#: idhub/admin/views.py:546 idhub/admin/views.py:578 idhub/admin/views.py:597
+#: idhub/admin/views.py:545
-msgid "Organization Identities (DID)"
+msgid "Manage Identities (DID)"
 msgstr ""
 
-#: idhub/admin/views.py:559
+#: idhub/admin/views.py:558
 msgid "Add a new Organization Identities (DID)"
 msgstr ""
 
-#: idhub/admin/views.py:571 idhub/user/views.py:195
+#: idhub/admin/views.py:570 idhub/user/views.py:195
 msgid "DID created successfully"
 msgstr ""
 
-#: idhub/admin/views.py:592 idhub/user/views.py:218
+#: idhub/admin/views.py:577 idhub/admin/views.py:596
+msgid "Organization Identities (DID)"
+msgstr ""
+
+#: idhub/admin/views.py:591 idhub/user/views.py:218
 msgid "DID updated successfully"
 msgstr ""
 
-#: idhub/admin/views.py:608 idhub/user/views.py:234
+#: idhub/admin/views.py:607 idhub/user/views.py:234
 msgid "DID delete successfully"
 msgstr ""
 
-#: idhub/admin/views.py:614 idhub/templates/idhub/user/profile.html:46
+#: idhub/admin/views.py:613 idhub/templates/idhub/base_admin.html:132
-#: idhub/user/views.py:75
+msgid "View org. credentials"
-msgid "Credential management"
 msgstr ""
 
-#: idhub/admin/views.py:621
+#: idhub/admin/views.py:620 idhub/templates/idhub/base_admin.html:137
 msgid "Configure credential issuance"
 msgstr ""
 
-#: idhub/admin/views.py:628
+#: idhub/admin/views.py:627
 msgid "View credential templates"
 msgstr ""
 
-#: idhub/admin/views.py:662
+#: idhub/admin/views.py:661
 msgid "Upload template"
 msgstr ""
 
-#: idhub/admin/views.py:678
+#: idhub/admin/views.py:677
 msgid "There are some errors in the file"
 msgstr ""
 
-#: idhub/admin/views.py:692
+#: idhub/admin/views.py:691
 msgid "This template already exists!"
 msgstr ""
 
-#: idhub/admin/views.py:698 idhub/admin/views.py:743
+#: idhub/admin/views.py:697 idhub/admin/views.py:742
 msgid "This is not a schema valid!"
 msgstr ""
 
-#: idhub/admin/views.py:707
+#: idhub/admin/views.py:706
 msgid "Import template"
 msgstr ""
 
-#: idhub/admin/views.py:735
+#: idhub/admin/views.py:734
 msgid "The schema was added sucessfully"
 msgstr ""
 
-#: idhub/admin/views.py:760 idhub/admin/views.py:773 idhub/admin/views.py:786
+#: idhub/admin/views.py:759 idhub/templates/idhub/admin/import.html:31
+#: idhub/templates/idhub/base_admin.html:153
+msgid "Import data"
+msgstr ""
+
+#: idhub/admin/views.py:772 idhub/admin/views.py:785
 msgid "Import"
 msgstr ""
 
-#: idhub/admin/views.py:799
+#: idhub/admin/views.py:798
 msgid "The file import was successfully!"
 msgstr ""
 
-#: idhub/admin/views.py:804
+#: idhub/admin/views.py:803
 msgid "Error importing the file!"
 msgstr ""
 
@@ -1867,7 +1881,8 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: idhub/models.py:439
+#: idhub/models.py:439 idhub/templates/idhub/admin/credentials.html:17
+#: idhub/templates/idhub/user/credentials.html:17
 msgid "Issued"
 msgstr ""
 
@@ -1908,7 +1923,7 @@ msgid "End date"
 msgstr ""
 
 #: idhub/models.py:512
-msgid " What date will the membership end?"
+msgid "What date will the membership end?"
 msgstr ""
 
 #: idhub/models.py:564
@@ -2055,11 +2070,6 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: idhub/templates/idhub/admin/credentials.html:17
-#: idhub/templates/idhub/user/credentials.html:17
-msgid "Issued"
-msgstr ""
-
 #: idhub/templates/idhub/admin/credentials.html:18
 #: idhub/templates/idhub/user/credentials.html:18
 msgid "Status"
@@ -2149,7 +2159,6 @@ msgid "Remove"
 msgstr ""
 
 #: idhub/templates/idhub/admin/dids.html:35
-#: idhub/templates/idhub/user/dids.html:35
 msgid "Add identity"
 msgstr ""
 
@@ -2168,14 +2177,6 @@ msgstr ""
 msgid "Created at"
 msgstr ""
 
-#: idhub/templates/idhub/admin/import.html:17
-msgid "Success"
-msgstr ""
-
-#: idhub/templates/idhub/admin/import.html:31
-msgid "Import data"
-msgstr ""
-
 #: idhub/templates/idhub/admin/issue_credentials.html:14
 #: idhub/templates/idhub/admin/issue_credentials.html:72
 msgid "Revoke"
@@ -2218,6 +2219,11 @@ msgid "Membership"
 msgstr ""
 
 #: idhub/templates/idhub/admin/people.html:17
+#: idhub/templates/idhub/admin/roles.html:15
+#: idhub/templates/idhub/admin/services.html:17
+#: idhub/templates/idhub/admin/user.html:87
+#: idhub/templates/idhub/admin/user_edit.html:73
+#: idhub/templates/idhub/user/roles.html:15
 msgid "Role"
 msgstr ""
 
@@ -2259,14 +2265,6 @@ msgstr ""
 msgid "User activation on %(site)s"
 msgstr ""
 
-#: idhub/templates/idhub/admin/roles.html:15
-#: idhub/templates/idhub/admin/services.html:17
-#: idhub/templates/idhub/admin/user.html:87
-#: idhub/templates/idhub/admin/user_edit.html:73
-#: idhub/templates/idhub/user/roles.html:15
-msgid "Role"
-msgstr ""
-
 #: idhub/templates/idhub/admin/schemas.html:16
 msgid "Template file"
 msgstr ""
@@ -2277,6 +2275,7 @@ msgid "Name"
 msgstr ""
 
 #: idhub/templates/idhub/admin/schemas.html:37
+#: idhub/templates/idhub/admin/schemas_import.html:29
 msgid "Add template"
 msgstr ""
 
@@ -2296,10 +2295,6 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: idhub/templates/idhub/admin/schemas_import.html:29
-msgid "Add template"
-msgstr ""
-
 #: idhub/templates/idhub/admin/services.html:15
 #: idhub/templates/idhub/admin/user.html:89
 #: idhub/templates/idhub/admin/user_edit.html:75
@@ -2307,6 +2302,10 @@ msgstr ""
 msgid "Service"
 msgstr ""
 
+#: idhub/templates/idhub/admin/services.html:35
+msgid "Add Service"
+msgstr ""
+
 #: idhub/templates/idhub/admin/user.html:13
 msgid "Modify"
 msgstr ""
@@ -2343,6 +2342,67 @@ msgstr ""
 msgid "Add membership"
 msgstr ""
 
+#: idhub/templates/idhub/base.html:76
+msgid "My information"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:81
+msgid "My personal information"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:86 idhub/user/views.py:63
+msgid "My roles"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:91 idhub/user/views.py:69
+msgid "GDPR info"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:99 idhub/user/views.py:27
+msgid "My wallet"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:104 idhub/user/views.py:170
+#: idhub/user/views.py:204 idhub/user/views.py:223
+msgid "Identities (DIDs)"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:109
+msgid "My credentials"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:114
+msgid "Request a credential"
+msgstr ""
+
+#: idhub/templates/idhub/base.html:119
+msgid "Present a credential"
+msgstr ""
+
+#: idhub/templates/idhub/base_admin.html:76
+msgid "User managament"
+msgstr ""
+
+#: idhub/templates/idhub/base_admin.html:94
+msgid "Access control managament"
+msgstr ""
+
+#: idhub/templates/idhub/base_admin.html:112 idhub/user/views.py:75
+msgid "Credential management"
+msgstr ""
+
+#: idhub/templates/idhub/base_admin.html:122
+msgid "Organization's wallet"
+msgstr ""
+
+#: idhub/templates/idhub/base_admin.html:127
+msgid "Manage Identities (DIDs)"
+msgstr ""
+
+#: idhub/templates/idhub/base_admin.html:147
+msgid "Credential template management"
+msgstr ""
+
 #: idhub/templates/idhub/user/credentials_presentation.html:30
 msgid "Send"
 msgstr ""
@@ -2351,6 +2411,10 @@ msgstr ""
 msgid "Request"
 msgstr ""
 
+#: idhub/templates/idhub/user/dids.html:35
+msgid "Add Identity"
+msgstr ""
+
 #: idhub/templates/idhub/user/profile.html:13
 msgid "ARCO Forms"
 msgstr ""
@@ -2359,6 +2423,10 @@ msgstr ""
 msgid "Notice of Privacy"
 msgstr ""
 
+#: idhub/templates/idhub/user/profile.html:46
+msgid "Credentials"
+msgstr ""
+
 #: idhub/templates/templates/musician/address_check_delete.html:7
 #, python-format
 msgid "Are you sure that you want remove the address: \"%(address_name)s\"?"
@@ -2660,22 +2728,10 @@ msgstr ""
 msgid "My profile"
 msgstr ""
 
-#: idhub/user/views.py:27
-msgid "My wallet"
-msgstr ""
-
 #: idhub/user/views.py:41
 msgid "My personal data"
 msgstr ""
 
-#: idhub/user/views.py:63
-msgid "My roles"
-msgstr ""
-
-#: idhub/user/views.py:69
-msgid "GDPR info"
-msgstr ""
-
 #: idhub/user/views.py:88
 msgid "Credential"
 msgstr ""
@@ -2704,10 +2760,6 @@ msgstr ""
 msgid "Error sending credential!"
 msgstr ""
 
-#: idhub/user/views.py:170 idhub/user/views.py:204 idhub/user/views.py:223
-msgid "Identities (DIDs)"
-msgstr ""
-
 #: idhub/user/views.py:183
 msgid "Add a new Identity (DID)"
-msgstr "Añadir una nueva Identidad (DID)"
+msgstr ""