refs #1138 Add translate and es-en files

ogWebconsole/src/app/app.module.ts

@@ -116,8 +116,6 @@ import { CreateOperativeSystemComponent } from './components/operative-system/cr
 import { ShowTemplateContentComponent } from './components/ogboot/pxe/show-template-content/show-template-content.component';
 import { AddClientsToPxeComponent } from './components/ogboot/pxe/add-clients-to-pxe/add-clients-to-pxe.component';
 import { ClientsComponent } from './components/ogboot/pxe/clients/clients.component';
-<<<<<<< Updated upstream
-=======
 import { RepositoriesComponent } from './components/repositories/repositories.component';
 import { CreateRepositoryComponent } from './components/repositories/create-repository/create-repository.component';
 import { ExecuteCommandComponent } from './components/commands/main-commands/execute-command/execute-command.component';
@@ -130,7 +128,6 @@ export function HttpLoaderFactory(http: HttpClient) {
   return new TranslateHttpLoader(http, './locale/', '.json');
 }
 
->>>>>>> Stashed changes
 @NgModule({
   declarations: [
     AppComponent,
@@ -204,6 +201,10 @@ export function HttpLoaderFactory(http: HttpClient) {
     ShowTemplateContentComponent,
     AddClientsToPxeComponent,
     ClientsComponent,
+    RepositoriesComponent,
+    CreateRepositoryComponent,
+    ExecuteCommandComponent,
+    ExecuteCommandOuComponent
   ],
   bootstrap: [AppComponent],
     imports: [BrowserModule,
@@ -232,8 +233,6 @@ export function HttpLoaderFactory(http: HttpClient) {
         MatDatepickerModule,
         MatNativeDateModule,
         MatSliderModule,
-<<<<<<< Updated upstream
-=======
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
@@ -242,7 +241,6 @@ export function HttpLoaderFactory(http: HttpClient) {
           }
         }),
         JoyrideModule.forRoot(),
->>>>>>> Stashed changes
         ToastrModule.forRoot(
             {
                 timeOut: 5000,