Use ngx-translate exclusively instead of i18n

ogWebconsole/angular.json

@@ -4,12 +4,6 @@
   "newProjectRoot": "projects",
   "projects": {
     "ogWebconsole": {
-      "i18n": {
-        "sourceLocale": "es",
-        "locales": {
-          "en": "src/locale/en.json"
-        }
-      },
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
@@ -41,20 +35,23 @@
             ],
             "tsConfig": "tsconfig.app.json",
             "assets": [
-  "src/favicon.ico",
+              "src/favicon.ico",
-  "src/assets",
+              "src/assets",
-  {
+              {
-    "glob": "**/*",
+                "glob": "**/*",
-    "input": "src/locale",
+                "input": "src/locale",
-    "output": "/locale"
+                "output": "/locale"
-  }
+              }
-],
+            ],
             "styles": [
               "src/custom-theme.scss",
               "src/styles.css",
               "node_modules/ngx-toastr/toastr.css"
             ],
-            "scripts": []
+            "scripts": [],
+            "allowedCommonJsDependencies": [
+              "rfdc"
+            ]
           },
           "configurations": {
             "production": {
@@ -66,7 +63,7 @@
                 },
                 {
                   "type": "anyComponentStyle",
-                  "maximumWarning": "4kb",
+                  "maximumWarning": "7kb",
                   "maximumError": "10kb"
                 }
               ],
@@ -114,12 +111,6 @@
           },
           "defaultConfiguration": "development"
         },
-        "extract-i18n": {
-          "builder": "@ngx-env/builder:extract-i18n",
-          "options": {
-            "buildTarget": "ogWebconsole:build"
-          }
-        },
         "test": {
           "builder": "@ngx-env/builder:karma",
           "options": {
@@ -146,4 +137,4 @@
   "cli": {
     "analytics": "95fac95c-8936-41a8-8c9c-1fae82fe6912"
   }
-}
+}

ogWebconsole/src/app/layout/header/header.component.html

@@ -1,6 +1,5 @@
 <mat-toolbar>
-  <span class="navbar-title" i18n="@@webConsoleTitle" matTooltip="Consola web de administración de Opengnsys"
+  <span class="navbar-title" matTooltip="Consola web de administración de Opengnsys" matTooltipShowDelay="1000">
-    matTooltipShowDelay="1000">
     Opengnsys webconsole
   </span>
 
@@ -10,39 +9,38 @@
   </button>
 
   <div class="navbar-actions-row">
-    <button class="trace-button" routerLink="/commands-logs" mat-button
+    <button class="trace-button" routerLink="/commands-logs" mat-button><mat-icon>notifications</mat-icon></button>
-      i18n="@@admin"><mat-icon>notifications</mat-icon></button>
 
     <div class="navbar-buttons-row">
-      <button class="ordinary-button" *ngIf="isSuperAdmin" [matMenuTriggerFor]="menu" i18n="@@admin"
+      <button class="ordinary-button" *ngIf="isSuperAdmin" [matMenuTriggerFor]="menu"
         matTooltip="Gestión de usuarios y roles de la aplicación" matTooltipShowDelay="1000">
-        Administración
+        {{ 'Administration' | translate }}
       </button>
 
-      <button class="ordinary-button" *ngIf="!isSuperAdmin" (click)="editUser()" i18n="@@editUser"
+      <button class="ordinary-button" *ngIf="!isSuperAdmin" (click)="editUser()"
         matTooltip="Editar tu información de usuario" matTooltipShowDelay="1000">
-        Cambiar contraseña
+        {{ 'changePassword' | translate }}
       </button>
 
-      <button class="logout-button" routerLink="/auth/login" i18n="@@logout"
+      <button class="logout-button" routerLink="/auth/login" matTooltip="Cerrar sesión y salir de la aplicación"
-        matTooltip="Cerrar sesión y salir de la aplicación" matTooltipShowDelay="1000">
+        matTooltipShowDelay="1000">
-        Salir
+        {{ 'logout' | translate }}
       </button>
     </div>
 
     <mat-menu #menu="matMenu">
-      <button mat-menu-item routerLink="/users" i18n="@@usersMenuItem" matTooltip="Ver y gestionar todos los usuarios"
+      <button mat-menu-item routerLink="/users" matTooltip="Ver y gestionar todos los usuarios"
         matTooltipShowDelay="1000">
-        Usuarios
+        {{ 'labelUsers' | translate }}
       </button>
-      <button mat-menu-item routerLink="/user-groups" i18n="@@rolesMenuItem" matTooltip="Gestionar roles de usuario"
+      <button mat-menu-item routerLink="/user-groups" matTooltip="Gestionar roles de usuario"
         matTooltipShowDelay="1000">
-        Roles
+        {{ 'labelRoles' | translate }}
       </button>
-      <button mat-menu-item routerLink="/env-vars" i18n="@@rolesMenuItem" matTooltip="Gestionar variables de entorno"
+      <button mat-menu-item routerLink="/env-vars" matTooltip="Gestionar variables de entorno"
         matTooltipShowDelay="1000">
-        Variables de entorno
+        {{ 'labelEnvVars' | translate }}
       </button>
     </mat-menu>
   </div>
-</mat-toolbar>
+</mat-toolbar>

ogWebconsole/src/locale/en-US.json

@@ -1,466 +0,0 @@
-{
-  "loginlabelUsername": "Enter your username",
-  "loginlabelPassword": "Enter your password",
-  "buttonLogin": "Login",
-  "welcomeMessage": "Welcome {{username}}",
-  "loginError": "Login error: {{error}}",
-  "labelUsers": "Users",
-  "labelRoles": "Roles",
-  "adminImagesTitle": "Manage images",
-  "addUser": "Add users",
-  "searchLabel": "Search image name",
-  "searchPlaceholder": "Search",
-  "searchHint": "Press 'enter' to search",
-  "columnActions": "Actions",
-  "dialogTitleAddUser": "Add User",
-  "addUserlabelUsername": "Username",
-  "addUserlabelPassword": "Password",
-  "labelRole": "Role",
-  "labelOrganizationalUnit": "Organizational Unit",
-  "buttonCancel": "Cancel",
-  "buttonAdd": "Add",
-  "addButton": "Add",
-  "addClientDialogTitle": "Add Client",
-  "dialogTitleEditUser": "Editar usuario",
-  "dialogTitleChangePassword": "Change password",
-  "labelCurrentPassword": "Current password",
-  "labelNewPassword": "New password",
-  "labelRepeatPassword": "Repeat password",
-  "errorPasswordMismatch": "Passwords do not match",
-  "buttonEdit": "Edit",
-  "adminRolesTitle": "Manage Roles",
-  "addRole": "Add role",
-  "searchRoleLabel": "Search role name",
-  "dialogTitleAddRole": "Add Role",
-  "labelRoleName": "Name",
-  "sectionTitlePermissions": "Permissions:",
-  "checkboxSuperAdmin": "Super Admin",
-  "checkboxOrgAdmin": "Organizational Unit Admin",
-  "checkboxOrgOperator": "Organizational Unit Operator",
-  "checkboxOrgMinimal": "Minimal Organizational Unit",
-  "checkboxUserRole": "User",
-  "groupsTitleStepText": "On this screen, you can manage the main organizational units (Faculties, Classrooms, Classroom Groups, and clients).",
-  "titleStepText": "On this screen, you can manage the calendars of remote teams connected to the UDS service",
-  "groupsAddStepText": "Click to add a new organizational unit or client.",
-  "adminCalendarsTitle": "Manage calendars",
-  "addButtonStepText": "Click here to add a new calendar.",
-  "addCalendar": "Add calendar",
-  "searchStepText": "Use this search bar to filter existing calendars.",
-  "searchCalendarLabel": "Search calendar name",
-  "tableStepText": "Here are the existing calendars with their characteristics and settings.",
-  "actionsStepText": "Access the available actions for each calendar here.",
-  "editCalendar": "Edit calendar",
-  "remoteAvailability": "Remote availability?",
-  "selectWeekDays": "Select the days of the week",
-  "startTime": "Start time",
-  "startTimePlaceholder": "Select start time",
-  "endTime": "End time",
-  "endTimePlaceholder": "Select end time",
-  "reasonLabel": "Reason",
-  "reasonPlaceholder": "Reason for the exception",
-  "startDate": "Start date",
-  "endDate": "End date",
-  "buttonSave": "Save",
-  "adminCommandGroupsTitle": "Manage Command Groups",
-  "addCommandGroupStepText": "Click to add a new command group.",
-  "addCommandGroup": "Add Command Group",
-  "searchGroupNameLabel": "Search group name",
-  "loadingStepText": "Wait while the command groups are loading.",
-  "viewCommands": "View commands",
-  "paginationStepText": "Navigate between command group pages using the paginator.",
-  "commandGroupDetailsTitle": "Command Group Details",
-  "createdBy": "Created by",
-  "groupId": "Group ID",
-  "creationDate": "Creation Date",
-  "includedCommands": "Included Commands",
-  "nameColumn": "Name",
-  "selectClients": "Select clients:",
-  "clientsLabel": "Clients",
-  "selectAtLeastOneClient": "You must select at least one client.",
-  "execute": "Execute",
-  "scheduleExecution": "Schedule Execution",
-  "editCommandGroup": "Edit command group",
-  "createCommandGroup": "Create command group",
-  "groupNameLabel": "Group Name",
-  "enabledToggle": "Enabled",
-  "availableCommandsTitle": "Available Commands",
-  "selectedCommandsTitle": "Selected Commands",
-  "manageTasksTitle": "Manage Tasks",
-  "addTaskStepText": "Click to add a new task.",
-  "addTask": "Add Task",
-  "searchTaskLabel": "Search task",
-  "idColumn": "Id",
-  "infoColumn": "Info",
-  "createdByColumn": "Created by",
-  "executionDateColumn": "Execution Date",
-  "statusColumn": "Status",
-  "enabled": "Enabled",
-  "disabled": "Disabled",
-  "adminCommandsTitle": "Command and procedure traces",
-  "resetFiltersStepText": "Click to reset the applied filters and see all traces.",
-  "resetFilters": "Reset filters",
-  "clientSelectStepText": "Select a client to see the associated traces.",
-  "filterClientPlaceholder": "Filter by client",
-  "commandSelectStepText": "Select a command to see the specific traces of that command.",
-  "filterCommandPlaceholder": "Filter by command",
-  "taskDetailsTitle": "Task Details",
-  "taskId": "Task ID",
-  "status": "Status",
-  "notes": "Notes",
-  "includedCommandGroups": "Included Command Groups",
-  "commandGroupColumn": "Command Group",
-  "commandsToExecute": "Commands to execute",
-  "group": "Group",
-  "commandColumn": "Command",
-  "editTask": "Edit Task",
-  "createTask": "Create Task",
-  "informationSectionTitle": "Information",
-  "informationLabel": "Information",
-  "notesPlaceholder": "Enter your notes here",
-  "commandSelectionSectionTitle": "Command selection",
-  "selectCommandsLabel": "Select Commands",
-  "requiredFieldError": "This field is required",
-  "executionDateTimeSectionTitle": "Execution date and time",
-  "executionDateLabel": "Execution Date",
-  "selectDatePlaceholder": "Select a date",
-  "executionTimeLabel": "Execution Time",
-  "selectTimePlaceholder": "Select a time",
-  "destinationSelectionSectionTitle": "Select destination",
-  "selectOrganizationalUnitLabel": "Select Organizational Unit",
-  "selectClassroomLabel": "Select Classroom",
-  "selectAllClients": "Select all",
-  "addCommand": "Add Command",
-  "searchCommandLabel": "Search command name",
-  "executeCommandTitle": "Execute Command",
-  "subOrganizationalUnitLabel": "Sub-organizational Unit",
-  "noClientsAvailable": "No clients available",
-  "buttonExecute": "Execute",
-  "commandDetailsTitle": "Command Details",
-  "nameLabel": "Name",
-  "commentsLabel": "Comments",
-  "createdByLabel": "Created by",
-  "creationDateLabel": "Creation Date",
-  "scriptLabel": "Script",
-  "selectClientsTitle": "Select clients:",
-  "selectAtLeastOneClientError": "You must select at least one client.",
-  "editCommandTitle": "Edit Command",
-  "createCommandTitle": "Create Command",
-  "commandNamePlaceholder": "Command name",
-  "commandScriptPlaceholder": "Command script",
-  "readOnlyLabel": "Read only",
-  "enabledLabel": "Enabled",
-  "cancelButton": "Cancel",
-  "saveButton": "Save",
-  "generalTabLabel": "General",
-  "tabsStepText": "Use the tabs to access different viewing and search options for organizational units and clients.",
-  "adminGroupsTitle": "Manage groups",
-  "newOrganizationalUnitTooltip": "Open modal to create organizational units of any type (Center, Classroom, Classroom Group, or Client Group)",
-  "newOrganizationalUnitButton": "New Organizational Unit",
-  "newClientButton": "New Client",
-  "newSingleClientButton": "Add single client",
-  "newMultipleClientButton": "Add numerous clients",
-  "keyStepText": "The legend will show you the types of organizational units and their corresponding icons",
-  "legendButton": "Legend",
-  "unitStepText": "This is the section where 'Center' type organizational units will be displayed",
-  "organizationalUnitTitle": "Centers",
-  "elementsStepText": "This is the section to view internal units of the selected center and navigate through them.",
-  "internalElementsTitle": "Internal elements",
-  "noInternalElementsMessage": "No internal elements",
-  "viewTreeTooltip": "View unit as a tree",
-  "viewTreeMenu": "View organizational chart",
-  "editUnitTooltip": "Edit this organizational unit",
-  "viewUnitTooltip": "View organizational unit details",
-  "viewUnitMenu": "View data",
-  "addInternalUnitTooltip": "Create a new internal organizational unit",
-  "addClientTooltip": "Register a client in this organizational unit",
-  "deleteElementTooltip": "Delete this element",
-  "deleteElementMenu": "Delete element",
-  "executeCommandTooltip": "Execute command on this element",
-  "advancedSearchTabLabel": "Advanced search",
-  "clientsTabLabel": "Clients",
-  "organizationalUnitsTabLabel": "Organizational units",
-  "viewTreeTitle": "View organizational unit tree",
-  "toggleNodeAriaLabel": "Toggle node",
-  "closeButton": "Close",
-  "inputDetails": "Input details",
-  "excludeParentChanges": "Exclude parent changes",
-  "orgUnitPropertiesTitle": "Organizational unit properties",
-  "generalDataTab": "General data",
-  "propertyHeader": "Property",
-  "valueHeader": "Value",
-  "classroomNetworkPropertiesTab": "Classroom and network properties",
-  "editOrgUnitTitle": "Edit Organizational Unit",
-  "generalStepLabel": "General",
-  "typeLabel": "Type",
-  "editOrgUnitParentLabel": "Parent",
-  "descriptionLabel": "Description",
-  "nextButton": "Next",
-  "classroomInfoStepLabel": "Classroom Information",
-  "locationLabel": "Location",
-  "projectorToggle": "Projector",
-  "boardToggle": "Board",
-  "capacityLabel": "Capacity",
-  "associatedCalendarLabel": "Associated Calendar",
-  "backButton": "Back",
-  "additionalInfoStepLabel": "Additional Information",
-  "networkSettingsStepLabel": "Network Settings",
-  "proxyUrlLabel": "Proxy server URL",
-  "dnsIpLabel": "DNS server IP",
-  "netmaskLabel": "Netmask",
-  "routerLabel": "Router",
-  "ntpIpLabel": "NTP server IP",
-  "p2pModeLabel": "P2P Mode",
-  "p2pTimeLabel": "P2P Time",
-  "mcastIpLabel": "Multicast IP",
-  "mcastSpeedLabel": "Multicast Speed",
-  "mcastPortLabel": "Multicast Port",
-  "mcastModeLabel": "Multicast Mode",
-  "menuUrlLabel": "Menu URL",
-  "menuLabel": "Menu",
-  "hardwareProfileLabel": "Hardware Profile",
-  "urlFormatError": "Invalid URL format.",
-  "validationToggle": "Validation",
-  "addOUSubmitButton": "Add",
-  "editOUSubmitButton": "Edit",
-  "addOrgUnitTitle": "Add Organizational Unit",
-  "createOrgUnitparentLabel": "Parent organizational unit",
-  "noParentOption": "--",
-  "nextServerLabel": "NextServer",
-  "bootFileNameLabel": "bootFileName",
-  "orgUnitTitle": "Organizational unit",
-  "classroomGroupsTitle": "Classroom groups",
-  "classroomTitle": "Classroom",
-  "clientGroupsTitle": "Client groups",
-  "clientTitle": "Client",
-  "executeCommandOrGroupTitle": "Execute Command or Command Group",
-  "selectCommandLabel": "Select Command",
-  "selectCommandGroupLabel": "Select Command Group",
-  "noClientsMessage": "No clients available",
-  "editClientDialogTitle": "Edit Client",
-  "organizationalUnitLabel": "Parent",
-  "ogLiveLabel": "OgLive",
-  "serialNumberLabel": "Serial Number",
-  "netifaceLabel": "Network interface",
-  "netDriverLabel": "Network driver",
-  "macLabel": "MAC",
-  "macError": "Invalid MAC format. Valid example: 00:11:22:33:44:55",
-  "ipLabel": "IP Address",
-  "ipError": "Invalid IP address format. Valid example: 127.0.0.1",
-  "templateLabel": "PXE Template",
-  "digitalBoard": "Digital board",
-  "projectorAlt": "Projector",
-  "clientAlt": "Client",
-  "saveDispositionButton": "Save disposition",
-  "actionsModalTitle": "Actions",
-  "adminOuTitle": "Manage organizational units",
-  "resetFiltersButton": "Reset filters",
-  "addOUButton": "Add OU",
-  "searchLabelOu": "Search OU name",
-  "macHint": "Example: 00:11:22:33:44:55",
-  "ipHint": "Example: 123.1.1.1",
-  "allOption": "All",
-  "centerOption": "Center",
-  "classroomsGroupOption": "Classroom Groups",
-  "classroomOption": "Classroom",
-  "clientsGroupOption": "PC Groups",
-  "roomMapOption": "Classroom map",
-  "clientDetailsTitle": "Client details",
-  "commandsButton": "Commands",
-  "networkPropertiesTab": "Network properties",
-  "disksPartitionsTitle": "Disks/Partitions",
-  "diskTitle": "Disk",
-  "diskUsedLabel": "Used",
-  "diskTotalLabel": "Total",
-  "diskImageAssistantTitle": "Disk image assistant",
-  "deployImage": "Deploy image",
-  "partitionColumn": "Partition",
-  "isoImageColumn": "ISO Image",
-  "ogliveColumn": "OgLive",
-  "selectImageOption": "Select image",
-  "selectOgLiveOption": "Select OgLive",
-  "repositoryTitle": "Admin Repository",
-  "saveAssociationsButton": "Save Associations",
-  "partitionAssistantTitle": "Partition assistant",
-  "diskSizeLabel": "Size",
-  "partitionTypeColumn": "Partition type",
-  "partitionSizeColumn": "Size (MB)",
-  "usageColumn": "Usage (%)",
-  "formatColumn": "Format",
-  "remotePcLabel": "Remote PC",
-  "globalImageLabel": "Global image",
-  "ntfsOption": "NTFS",
-  "linuxOption": "LINUX",
-  "cacheOption": "CACHE",
-  "deleteButton": "Delete",
-  "searchTitle": "Advanced search",
-  "selectFilterLabel": "Select filter",
-  "gridViewButton": "Grid",
-  "listViewButton": "List",
-  "selectOptionLabel": "Select an option",
-  "namePlaceholder": "Organizational unit",
-  "selectAllButton": "Select/Deselect All",
-  "saveFiltersButton": "Save Filters",
-  "sendFiltersButton": "Send Action",
-  "addPxeButton": "Add PXE file",
-  "repositoryLabel": "Repositories",
-  "internalUnits": "Internal units",
-  "imageNameLabel": "Image name",
-  "noResultsMessage": "No results to display.",
-  "imagesTitle": "Manage images",
-  "addImageButton": "Add image",
-  "searchNameDescription": "Search images by name to quickly find a specific image.",
-  "searchDefaultDescription": "Filter images to show only default or non-default images.",
-  "searchDefaultLabel": "Default image",
-  "searchInstalledDescription": "Filter images to show only those installed on the OgBoot server.",
-  "searchInstalledLabel": "Installed on OgBoot server",
-  "tableDescription": "Here is the list of available images to manage.",
-  "actionsColumnHeader": "Actions",
-  "viewIcon": "visibility",
-  "editIcon": "edit",
-  "installOption": "Install",
-  "uninstallOption": "Uninstall",
-  "setDefaultOption": "Set as default image",
-  "paginationDescription": "Navigate between image pages using the paginator.",
-  "detailsTitle": "Details of {{ name }}",
-  "editTemplateTitle": "Edit template",
-  "addTemplateTitle": "Add template",
-  "templateNameLabel": "Template Name",
-  "templateNamePlaceholder": "Enter the template name",
-  "templateContentPlaceholder": "Enter the template content",
-  "loadTemplateModelButton": "Load model template",
-  "diskModel": "Disk boot",
-  "createButton": "Create",
-  "manageClientsTitle": "Manage clients",
-  "syncIcon": "sync",
-  "addClientsTitle": "Add clients to {{ subnetName }}",
-  "selectedClientsTitle": "Selected clients:",
-  "editClientTitle": "Edit Client",
-  "addClientTitle": "Add Client",
-  "advancedNetbootTitle": "Advanced netboot",
-  "selectUnitLabel": "Select Organizational Unit",
-  "loadingUnitsOption": "Loading units...",
-  "selectClassLabel": "Select classroom",
-  "applyToAllLabel": "Select template to apply to all clients",
-  "saveButtonLabel": "Save",
-  "idColumnHeader": "Id",
-  "nameColumnHeader": "Name",
-  "templateColumnHeader": "Template",
-  "pxeImageTitle": "Information on ogBoot server",
-  "serverInfoDescription": "Access information and synchronization options on the OgBoot server.",
-  "syncDatabaseButton": "Sync database",
-  "viewInfoButton": "View Information",
-  "adminImagesDescription": "From here you can manage the images configured on the OgBoot server.",
-  "actionsDescription": "Manage each image with options to view, edit, delete, and more.",
-  "addClientButton": "Add client",
-  "searchClientNameLabel": "Search client name",
-  "searchIPLabel": "Search IP",
-  "searchMACLabel": "Search MAC",
-  "diskUsageTitle": "Disk Usage",
-  "ogBootServerStatus": "OgBoot Server Status",
-  "servicesTitle": "Services",
-  "Legend": "Legend",
-  "totalLabel": "Total",
-  "usedLabel": "Used",
-  "freeLabel": "Free",
-  "availableLabel": "Available",
-  "InstalledOglivesTitle": "Installed OgLives",
-  "idLabel": "ID",
-  "KernelLabel": "Kernel",
-  "architectureLabel": "Architecture",
-  "revisionLabel": "Revision",
-  "serverInfoTitle": "Server Information",
-  "adminPxeTitle": "Manage PXE Files",
-  "createdOgBootLabel": "Created in OgBoot",
-  "selectOptionPlaceholder": "Select an option",
-  "yesOption": "Yes",
-  "noOption": "No",
-  "actionsColumn": "Actions",
-  "createServerButton": "Create Server",
-  "labelName": "Name",
-  "diskUsageDescription": "Here is the disk usage of the server.",
-  "servicesStatusDescription": "Here is the status of the server services.",
-  "oglivesDescription": "Here are the OgLives installed on the server.",
-  "addImageButtonDescription": "Click to add a new image.",
-  "adminPxeDescription": "From here you can manage the PXE templates of the server.",
-  "addTemplateButtonDescription": "Add PXE Template",
-  "addTemplateButton": "Add Template",
-  "searchSyncDescription": "Filter PXE templates to show only synchronized or unsynchronized ones.",
-  "advancedNetbootDescription": "From here you can configure the advanced netboot of the clients.",
-  "selectUnitDescription": "Select the organizational unit to which the clients belong.",
-  "selectClassDescription": "Select the classroom to which the clients belong.",
-  "applyToAllDescription": "Select a template to apply to all clients.",
-  "saveButtonDescription": "Save the changes made.",
-  "welcomeUser": "Welcome {{username}}",
-  "TOOLTIP_WELCOME_USER": "Welcome, {{username}}",
-  "groups": "Groups",
-  "TOOLTIP_GROUPS": "Manage user groups",
-  "actions": "Actions",
-  "TOOLTIP_ACTIONS": "View and execute predefined actions",
-  "commands": "Commands",
-  "TOOLTIP_COMMANDS": "List of available commands",
-  "commandGroups": "Groups",
-  "TOOLTIP_COMMAND_GROUPS": "Manage command groups",
-  "tasks": "Tasks",
-  "TOOLTIP_TASKS": "View and manage scheduled tasks",
-  "dhcp": "DHCP",
-  "TOOLTIP_DHCP": "Configure and manage DHCP",
-  "TOOLTIP_DHCP_STATUS": "Current status of the DHCP service",
-  "subnets": "Subnets",
-  "TOOLTIP_SUBNETS": "Manage and create subnets",
-  "boot": "Boot",
-  "TOOLTIP_BOOT": "Configure and manage boot options",
-  "ogLive": "ogLive",
-  "TOOLTIP_PXE_IMAGES": "View available PXE boot images",
-  "pxeTemplates": "PXE Templates",
-  "pxeTemplate" : "Plantilla",
-  "TOOLTIP_PXE_TEMPLATES": "Manage PXE boot templates",
-  "pxeBootFiles": "PXE Boot Files",
-  "TOOLTIP_PXE_BOOT_FILES": "Configure PXE boot files",
-  "calendars": "Calendars",
-  "TOOLTIP_CALENDARS": "Manage remotePC calendars",
-  "software": "Software",
-  "TOOLTIP_SOFTWARE": "Manage software configurations",
-  "softwareList": "List",
-  "TOOLTIP_SOFTWARE_LIST": "View list of available software",
-  "softwareProfiles": "Profiles",
-  "TOOLTIP_SOFTWARE_PROFILES": "Manage software profiles",
-  "operativeSystems": "Operating Systems",
-  "TOOLTIP_OPERATIVE_SYSTEMS": "Configure operating systems",
-  "images": "Images",
-  "TOOLTIP_IMAGES": "Manage system images",
-  "repositories": "Repositories",
-  "TOOLTIP_REPOSITORIES": "View and manage software repositories",
-  "menus": "Menus",
-  "TOOLTIP_MENUS": "Menu management (option disabled)",
-  "search": "Search",
-  "TOOLTIP_SEARCH": "Search function (option disabled)",
-  "detailsOf": "Details of",
-  "editUnitMenu": "Edit",
-  "addInternalUnitMenu": "Add",
-  "addClientMenu": "Add client",
-  "filters": "Filters",
-  "searchClient": "Search client",
-  "searchTree": "Search organizational unit",
-  "filterByType": "Filter by type",
-  "all": "All",
-  "classroomsGroup": "Classroom groups",
-  "classrooms": "Classrooms",
-  "computerGroups": "PC groups",
-  "executeCommand": "Execute command",
-  "roomMap": "Classroom map",
-  "addOrganizationalUnit": "Add organizational unit",
-  "edit": "Edit",
-  "delete": "Delete",
-  "clients": "Clients",
-  "sync": "Sync",
-  "viewDetails": "View details",
-  "name": "Name",
-  "maintenance": "Maintenance",
-  "subnet": "Subnet",
-  "parent": "Parent",
-  "adminUsersTitle": "Manage users",
-  "filtersPanelStepText": "Use these filters to search or load configurations.",
-  "organizationalUnitsStepText": "List of Organizational Units. Click on one to view details.",
-  "defaultMenuLabel": "Main menu",
-  "noClients": "No clients"
-}

ogWebconsole/src/locale/en.json

@@ -1,11 +1,13 @@
 {
+  "Administration": "Administration",
+  "changePassword": "Change password",
+  "logout": "Logout",
   "loginlabelUsername": "Enter your username",
   "loginlabelPassword": "Enter your password",
   "buttonLogin": "Login",
-  "welcomeMessage": "Welcome {{username}}",
-  "loginError": "Login error: {{error}}",
   "labelUsers": "Users",
   "labelRoles": "Roles",
+  "labelEnvVars": "Environment variables",
   "adminImagesTitle": "Manage images",
   "addUser": "Add users",
   "searchLabel": "Search image name",
@@ -19,7 +21,6 @@
   "labelOrganizationalUnit": "Organizational Unit",
   "buttonCancel": "Cancel",
   "buttonAdd": "Add",
-  "addButton": "Add",
   "addClientDialogTitle": "Add Client",
   "dialogTitleEditUser": "Editar usuario",
   "dialogTitleChangePassword": "Change password",
@@ -298,7 +299,6 @@
   "listViewButton": "List",
   "selectOptionLabel": "Select an option",
   "namePlaceholder": "Organizational unit",
-  "selectAllButton": "Select/Deselect All",
   "saveFiltersButton": "Save Filters",
   "sendFiltersButton": "Send Action",
   "addPxeButton": "Add PXE file",
@@ -338,7 +338,6 @@
   "addClientTitle": "Add Client",
   "advancedNetbootTitle": "Advanced netboot",
   "selectUnitLabel": "Select Organizational Unit",
-  "loadingUnitsOption": "Loading units...",
   "selectClassLabel": "Select classroom",
   "applyToAllLabel": "Select template to apply to all clients",
   "saveButtonLabel": "Save",
@@ -370,7 +369,6 @@
   "revisionLabel": "Revision",
   "serverInfoTitle": "Server Information",
   "adminPxeTitle": "Manage PXE Files",
-  "createdOgBootLabel": "Created in OgBoot",
   "selectOptionPlaceholder": "Select an option",
   "yesOption": "Yes",
   "noOption": "No",
@@ -391,7 +389,6 @@
   "applyToAllDescription": "Select a template to apply to all clients.",
   "saveButtonDescription": "Save the changes made.",
   "welcomeUser": "Welcome {{username}}",
-  "TOOLTIP_WELCOME_USER": "Welcome, {{username}}",
   "groups": "Groups",
   "TOOLTIP_GROUPS": "Manage user groups",
   "actions": "Actions",
@@ -412,7 +409,7 @@
   "ogLive": "ogLive",
   "TOOLTIP_PXE_IMAGES": "View available PXE boot images",
   "pxeTemplates": "PXE Templates",
-  "pxeTemplate" : "Plantilla",
+  "pxeTemplate": "Plantilla",
   "TOOLTIP_PXE_TEMPLATES": "Manage PXE boot templates",
   "pxeBootFiles": "PXE Boot Files",
   "TOOLTIP_PXE_BOOT_FILES": "Configure PXE boot files",
@@ -463,4 +460,4 @@
   "organizationalUnitsStepText": "List of Organizational Units. Click on one to view details.",
   "defaultMenuLabel": "Main menu",
   "noClients": "No clients"
-}
+}

ogWebconsole/src/locale/es.json

@@ -1,11 +1,13 @@
 {
+  "Administration": "Administración",
+  "changePassword": "Cambiar contraseña",
+  "logout": "Salir",
   "loginlabelUsername": "Introduce tu usuario",
   "loginlabelPassword": "Introduce tu contraseña",
   "buttonLogin": "Login",
-  "welcomeMessage": "Bienvenido {{username}}",
-  "loginError": "Login error: {{error}}",
   "labelUsers": "Usuarios",
   "labelRoles": "Roles",
+  "labelEnvVars": "Variables de entorno",
   "adminImagesTitle": "Administrar OgLives",
   "addUser": "Añadir usuarios",
   "searchLabel": "Buscar nombre de imagen",
@@ -19,7 +21,6 @@
   "labelOrganizationalUnit": "Unidad organizativa",
   "buttonCancel": "Cancelar",
   "buttonAdd": "Añadir",
-  "addButton": "Añadir",
   "addClientDialogTitle": "Añadir Cliente",
   "dialogTitleEditUser": "Editar usuario",
   "dialogTitleChangePassword": "Change password",
@@ -297,7 +298,6 @@
   "listViewButton": "Lista",
   "selectOptionLabel": "Selecciona una opción",
   "namePlaceholder": "Unidad organizativa",
-  "selectAllButton": "Seleccionar/Deseleccionar Todos",
   "saveFiltersButton": "Guardar Filtros",
   "sendFiltersButton": "Enviar Acción",
   "addPxeButton": "Añadir fichero PXE",
@@ -338,7 +338,6 @@
   "addClientTitle": "Añadir Cliente",
   "advancedNetbootTitle": "Netboot avanzado",
   "selectUnitLabel": "Selecciona Unidad Organizacional",
-  "loadingUnitsOption": "Cargando unidades...",
   "selectClassLabel": "Selecciona aula",
   "applyToAllLabel": "Seleccione plantilla para aplicar a todos los clientes",
   "saveButtonLabel": "Guardar",
@@ -370,7 +369,6 @@
   "revisionLabel": "Revisión",
   "serverInfoTitle": "Información del servidor",
   "adminPxeTitle": "Administrar ficheros PXE",
-  "createdOgBootLabel": "Creado en OgBoot",
   "selectOptionPlaceholder": "Selecciona una opción",
   "yesOption": "Sí",
   "noOption": "No",
@@ -392,7 +390,6 @@
   "applyToAllDescription": "Selecciona una plantilla para aplicar a todos los clientes.",
   "saveButtonDescription": "Guarda los cambios realizados.",
   "welcomeUser": "Bienvenido {{username}}",
-  "TOOLTIP_WELCOME_USER": "Bienvenido, {{username}}",
   "groups": "Grupos",
   "TOOLTIP_GROUPS": "Gestionar grupos de usuarios",
   "actions": "Acciones",