diff --git a/README.md b/README.md index fb9a52a9e538c8b354d579ab637750b460dc21a3..cc6263f2f14f4fd0d5aec47e87f3db0d0cc1543a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ <img src="docs/nmaas-logo-blue.png" alt="Logo" width="206" height="48"> </a> - <h3 align="center">NMaaS Platform (Back-end)</h3> + <h3 align="center">nmaas Platform (Back-end)</h3> <h4 align="center">Open-source multi-tenant platform for effortless, orchestrated deployment of software tools and applications on top of Kubernetes</h4> @@ -17,13 +17,13 @@ </p> </div> -NMaaS is an open-source framework developed within the GÉANT project for orchestration of on-demand deployment of applications in a multi-tenant Kubernetes-based cloud environment. +nmaas is an open-source framework developed within the GÉANT project for orchestration of on-demand deployment of applications in a multi-tenant Kubernetes-based cloud environment. -With a simple self-service web interface, NMaaS applications are easily deployed within an isolated tenant environment assigned to a given user institution or team. +With a simple self-service web interface, nmaas applications are easily deployed within an isolated tenant environment assigned to a given user institution or team. An application’s lifecycle (configuration updates and re-deployments) is fully managed following a GitOps approach: a specific Git repository is tightly associated with every deployed application and a set of CI/CD pipelines ensure proper re-deployments of the applications following every update on the Git master branch. -NMaaS applications are containerized and deployed using [Helm charts](https://helm.sh/). +nmaas applications are containerized and deployed using [Helm charts](https://helm.sh/). ## Screenshots @@ -41,18 +41,18 @@ NMaaS applications are containerized and deployed using [Helm charts](https://he  -## NMaaS Platform Component +## nmaas Platform Component -[NMaaS Platform](https://github.com/nmaas-platform/nmaas-platform) is the central NMaaS component, exposing a REST API consumed by the NMaaS Portal. It stores the application catalog, the users, as well as information about any deployed applications. Upon a new request for an application deployment, it connects to the NMaaS Helm component and executes the necessary Helm command via an SSH connection. It also communicates with a self-hosted instance of GitLab, in order to provision boilerplate configuration files for the deployed application instances by the users, allowing them to make any additional configuration changes exclusively through Git. +[nmaas Platform](https://github.com/nmaas-platform/nmaas-platform) is the central nmaas component, exposing a REST API consumed by the nmaas Portal. It stores the application catalog, the users, as well as information about any deployed applications. Upon a new request for an application deployment, it connects to the nmaas Helm component and executes the necessary Helm command via an SSH connection. It also communicates with a self-hosted instance of GitLab, in order to provision boilerplate configuration files for the deployed application instances by the users, allowing them to make any additional configuration changes exclusively through Git. -### NMaaS Platform Development +### nmaas Platform Development -Explore the NMaaS Platform [development and deployment](docs/DEVELOPMENT.md) documentation. +Explore the nmaas Platform [development and deployment](docs/DEVELOPMENT.md) documentation. ## Get in Touch -Interested users can use the following mailing lists to subscribe to news about NMaaS, get in touch with the NMaaS development team, or other NMaaS users: +Interested users can use the following mailing lists to subscribe to news about nmaas, get in touch with the nmaas development team, or other nmaas users: -- [nmaas-announce@lists.geant.org](mailto:nmaas-announce@lists.geant.org) - public mailing list for announcements shared by the NMaaS team with the community ([subscribe here](https://lists.geant.org/sympa/info/nmaas-announce)) -- [nmaas@lists.geant.org](mailto:nmaas@lists.geant.org) - private mailing list for contacting the NMaaS core team members -- [nmaas-users@lists.geant.org](mailto:nmaas-users@lists.geant.org) - public mailing lists for discussions related to NMaaS usage and development ([subscribe here](https://lists.geant.org/sympa/info/nmaas-users)) +- [nmaas-announce@lists.geant.org](mailto:nmaas-announce@lists.geant.org) - public mailing list for announcements shared by the nmaas team with the community ([subscribe here](https://lists.geant.org/sympa/info/nmaas-announce)) +- [nmaas@lists.geant.org](mailto:nmaas@lists.geant.org) - private mailing list for contacting the nmaas core team members +- [nmaas-users@lists.geant.org](mailto:nmaas-users@lists.geant.org) - public mailing lists for discussions related to nmaas usage and development ([subscribe here](https://lists.geant.org/sympa/info/nmaas-users)) diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md index b65894b9e75d204393afac22be7aec325419a43d..70135398e855324f4ba4c539a8666e973f52a5e5 100644 --- a/docs/DEVELOPMENT.md +++ b/docs/DEVELOPMENT.md @@ -1,4 +1,4 @@ -# NMaaS Platform +# nmaas Platform ### Technologies @@ -10,48 +10,48 @@ * Flyway * Kubernetes API client from fabric8 -### Running NMaaS Platform on local machine +### Running nmaas Platform on local machine #### Prerequisites Install Java 11 jdk #### Running the software -In order to build and run the NMaaS Platform software locally execute *./gradlew bootRun* in project root directory. +In order to build and run the nmaas Platform software locally execute *./gradlew bootRun* in project root directory. By default, the REST API will be exposed at *http://localhost:9000/api*. -### Running NMaaS Platform on dedicated server machine +### Running nmaas Platform on dedicated server machine -To run the NMaaS Platform on a dedicated machine, perform the following steps: -+ Build the NMaaS Platform with *./gradlew clean build* command project root directory. +To run the nmaas Platform on a dedicated machine, perform the following steps: ++ Build the nmaas Platform with *./gradlew clean build* command project root directory. + Retrieve the output executable *nmaas-platform-x.x.x.jar* file from *build/libs* directory. -+ Run the NMaaS Platform with *java -jar nmaas-platform-x.x.x.jar* and optional arguments: ++ Run the nmaas Platform with *java -jar nmaas-platform-x.x.x.jar* and optional arguments: + *--Dlog4j.configurationFile* specifying the name of logger (Log4j2) configuration file (located in the same directory as the jar file) to be loaded instead of the built-in one. Please be advised that you have to add that parameter before the *-jar* parameter. + *--spring.config.name* specifying the name of the properties file (located in the same directory as the jar file) to be loaded instead of the built-in one. -### Swagger documentation of the NMaaS Platform REST API +### Swagger documentation of the nmaas Platform REST API -NMaaS Platform by default exposes two endpoints documenting the REST API: +nmaas Platform by default exposes two endpoints documenting the REST API: + */api-docs/spec* - Open API specification of the API + */api-docs/ui.html* - Swagger UI The Swagger endpoint can be disabled in properties file. -### Populating NMaaS Platform database with initial data +### Populating nmaas Platform database with initial data -To initialize the NMaaS Platform database with a default set of data run *src/test/shell/init.sh* script. +To initialize the nmaas Platform database with a default set of data run *src/test/shell/init.sh* script. Script will load the following data: + set of content translation data (from *src/test/shell/data/i18n*) + set of default email templates (from *src/test/shell/data/mails*) + set of default contact form templates (from *src/test/shell/data/form_types*) -+ set of test NMaaS user domains (from *src/test/shell/data/domains*) -+ set of NMaaS-compatible application definitions with test subscriptions and comments (from *src/test/shell/data/apps*) ++ set of test nmaas user domains (from *src/test/shell/data/domains*) ++ set of nmaas-compatible application definitions with test subscriptions and comments (from *src/test/shell/data/apps*) ### Complete deployment environment setup for Kubernetes -A dedicated Helm chart has been developed to ease the NMaaS installation inside a Kubernetes cluster. -This way both the supported network management applications and the NMaaS core components can be installed within a single K8s cluster. +A dedicated Helm chart has been developed to ease the nmaas installation inside a Kubernetes cluster. +This way both the supported network management applications and the nmaas core components can be installed within a single K8s cluster. For more information please contact the [NMaaS Team](mailto:nmaas-team@lists.geant.org). diff --git a/src/integrationTest/java/net/geant/nmaas/portal/service/impl/BulkDomainServiceIntTest.java b/src/integrationTest/java/net/geant/nmaas/portal/service/impl/BulkDomainServiceIntTest.java index 041d616899392147ff969b14105f2ac645d1638f..391174b4992d9c03d239b53d169c7594e3bc4c0a 100644 --- a/src/integrationTest/java/net/geant/nmaas/portal/service/impl/BulkDomainServiceIntTest.java +++ b/src/integrationTest/java/net/geant/nmaas/portal/service/impl/BulkDomainServiceIntTest.java @@ -3,10 +3,13 @@ package net.geant.nmaas.portal.service.impl; import net.geant.nmaas.portal.api.bulk.BulkDeploymentViewS; import net.geant.nmaas.portal.api.bulk.BulkType; import net.geant.nmaas.portal.api.bulk.CsvDomain; +import net.geant.nmaas.portal.api.configuration.ConfigurationView; import net.geant.nmaas.portal.api.domain.UserViewMinimal; import net.geant.nmaas.portal.persistent.entity.BulkDeployment; import net.geant.nmaas.portal.persistent.entity.BulkDeploymentState; +import net.geant.nmaas.portal.persistent.entity.Configuration; import net.geant.nmaas.portal.persistent.repositories.BulkDeploymentRepository; +import net.geant.nmaas.portal.persistent.repositories.ConfigurationRepository; import net.geant.nmaas.portal.persistent.repositories.UserRepository; import net.geant.nmaas.portal.persistent.repositories.UserRoleRepository; import net.geant.nmaas.portal.service.BulkDomainService; @@ -14,6 +17,7 @@ import net.geant.nmaas.portal.service.UserService; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.modelmapper.ModelMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; @@ -44,6 +48,12 @@ public class BulkDomainServiceIntTest { @Autowired private UserRepository userRepository; + @Autowired + private ConfigurationRepository configurationRepository; + + @Autowired + private ModelMapper modelMapper; + @MockBean private UserRoleRepository userRoleRepository; @@ -63,6 +73,7 @@ public class BulkDomainServiceIntTest { UserViewMinimal creator = new UserViewMinimal(); creator.setId(1L); creator.setUsername("admin"); + BulkDeploymentViewS result = bulkDomainService.handleBulkCreation(input, creator); assertEquals(BulkDeploymentState.COMPLETED, result.getState()); @@ -77,6 +88,30 @@ public class BulkDomainServiceIntTest { assertThat(userRepository.findByEmail("user3@test.com").orElseThrow().getSamlToken()).isEqualTo("user3@test.com"); } + @Test + void shouldHandleBulkCreationOfUsersWithSsoEnabledFlagWhenDisabledGlobally() { + CsvDomain csvDomain1 = new CsvDomain("test4", "user1", "user1@test.com", null, "group1", true); + CsvDomain csvDomain2 = new CsvDomain("test5", "user2", "user2@test.com", null, "group1", false); + List<CsvDomain> input = List.of(csvDomain1, csvDomain2); + configurationRepository.save(modelMapper.map( + ConfigurationView.builder().id(1L).defaultLanguage("en").bulkDomainsAllowForSsoAccounts(false).build(), Configuration.class)); + UserViewMinimal creator = new UserViewMinimal(); + creator.setId(1L); + creator.setUsername("admin"); + + BulkDeploymentViewS result = bulkDomainService.handleBulkCreation(input, creator); + + assertEquals(BulkDeploymentState.COMPLETED, result.getState()); + List<BulkDeployment> bulkDeployments = bulkDeploymentRepository.findAll(); + assertEquals(1, bulkDeployments.size()); + BulkDeployment bulkDeployment = bulkDeployments.get(0); + assertEquals(1, bulkDeployment.getCreatorId()); + assertEquals(BulkType.DOMAIN, bulkDeployment.getType()); + assertEquals(4, bulkDeployment.getEntries().size()); + assertThat(userRepository.findByEmail("user1@test.com").orElseThrow().getSamlToken()).isNull(); + assertThat(userRepository.findByEmail("user2@test.com").orElseThrow().getSamlToken()).isNull(); + } + @Test void shouldHandleBulkCreationOfDomainWithUniqueCodenames() { CsvDomain csvDomain1 = new CsvDomain("Test.Domain.100", "user1", "user1@test.com", null, "group1", null); diff --git a/src/integrationTest/resources/application.properties b/src/integrationTest/resources/application.properties index bc50f32921b49271d14e150fabaa98521ffaa81f..619a3ea9ce203bfd342515637b7dc74403df893c 100644 --- a/src/integrationTest/resources/application.properties +++ b/src/integrationTest/resources/application.properties @@ -97,7 +97,7 @@ sso.key=sso_shared_secret_key # ------------------ # # Helm configuration # # ------------------ # -helm.update.async.enabled=true +helm.update.async.enabled=false helm.update.async.cron=0 * * * * ? helm.address=10.134.241.6 helm.username=nmaas diff --git a/src/main/java/net/geant/nmaas/portal/service/impl/BulkDomainServiceImpl.java b/src/main/java/net/geant/nmaas/portal/service/impl/BulkDomainServiceImpl.java index 3cd2bad8d9f8765d645413dc80bec28f0aa180fd..5c931595007185038b5d37254619a2b61a648870 100644 --- a/src/main/java/net/geant/nmaas/portal/service/impl/BulkDomainServiceImpl.java +++ b/src/main/java/net/geant/nmaas/portal/service/impl/BulkDomainServiceImpl.java @@ -7,7 +7,6 @@ import net.geant.nmaas.dcn.deployment.entities.DcnDeploymentState; import net.geant.nmaas.dcn.deployment.entities.DcnInfo; import net.geant.nmaas.externalservices.kubernetes.KubernetesClusterIngressManager; import net.geant.nmaas.portal.api.bulk.BulkDeploymentViewS; -import net.geant.nmaas.portal.api.bulk.BulkType; import net.geant.nmaas.portal.api.bulk.CsvDomain; import net.geant.nmaas.portal.api.domain.DomainDcnDetailsView; import net.geant.nmaas.portal.api.domain.DomainGroupView; @@ -18,13 +17,13 @@ import net.geant.nmaas.portal.api.domain.UserViewMinimal; import net.geant.nmaas.portal.api.exception.MissingElementException; import net.geant.nmaas.portal.persistent.entity.BulkDeployment; import net.geant.nmaas.portal.persistent.entity.BulkDeploymentEntry; -import net.geant.nmaas.portal.persistent.entity.BulkDeploymentState; import net.geant.nmaas.portal.persistent.entity.Domain; import net.geant.nmaas.portal.persistent.entity.User; import net.geant.nmaas.portal.persistent.entity.UserRole; import net.geant.nmaas.portal.persistent.repositories.BulkDeploymentRepository; import net.geant.nmaas.portal.persistent.repositories.UserRoleRepository; import net.geant.nmaas.portal.service.BulkDomainService; +import net.geant.nmaas.portal.service.ConfigurationManager; import net.geant.nmaas.portal.service.DomainGroupService; import net.geant.nmaas.portal.service.DomainService; import net.geant.nmaas.portal.service.UserService; @@ -48,8 +47,11 @@ import static net.geant.nmaas.portal.api.bulk.BulkDeploymentEntryView.BULK_ENTRY import static net.geant.nmaas.portal.api.bulk.BulkDeploymentEntryView.BULK_ENTRY_DETAIL_KEY_USER_EMAIL; import static net.geant.nmaas.portal.api.bulk.BulkDeploymentEntryView.BULK_ENTRY_DETAIL_KEY_USER_ID; import static net.geant.nmaas.portal.api.bulk.BulkDeploymentEntryView.BULK_ENTRY_DETAIL_KEY_USER_NAME; -import static net.geant.nmaas.portal.api.bulk.BulkType.*; -import static net.geant.nmaas.portal.persistent.entity.BulkDeploymentState.*; +import static net.geant.nmaas.portal.api.bulk.BulkType.DOMAIN; +import static net.geant.nmaas.portal.api.bulk.BulkType.USER; +import static net.geant.nmaas.portal.persistent.entity.BulkDeploymentState.COMPLETED; +import static net.geant.nmaas.portal.persistent.entity.BulkDeploymentState.FAILED; +import static net.geant.nmaas.portal.persistent.entity.BulkDeploymentState.PENDING; import static net.geant.nmaas.portal.persistent.entity.Role.ROLE_DOMAIN_ADMIN; import static net.geant.nmaas.portal.persistent.entity.Role.ROLE_VL_DOMAIN_ADMIN; @@ -66,6 +68,7 @@ public class BulkDomainServiceImpl implements BulkDomainService { private final ModelMapper modelMapper; private final UserRoleRepository userRoleRepository; + private final ConfigurationManager configurationManager; private final int domainCodenameMaxLength; @@ -77,7 +80,8 @@ public class BulkDomainServiceImpl implements BulkDomainService { KubernetesClusterIngressManager kubernetesClusterIngressManager, ModelMapper modelMapper, UserRoleRepository userRoleRepository, - @Value("${nmaas.portal.domains.codename.length}") int domainCodenameMaxLength) { + @Value("${nmaas.portal.domains.codename.length}") int domainCodenameMaxLength, + ConfigurationManager configurationManager) { this.domainService = domainService; this.domainGroupService = domainGroupService; this.userService = userService; @@ -86,6 +90,7 @@ public class BulkDomainServiceImpl implements BulkDomainService { this.modelMapper = modelMapper; this.domainCodenameMaxLength = domainCodenameMaxLength; this.userRoleRepository = userRoleRepository; + this.configurationManager = configurationManager; } public BulkDeploymentViewS handleBulkCreation(List<CsvDomain> domainSpecs, UserViewMinimal creator) { @@ -216,9 +221,11 @@ public class BulkDomainServiceImpl implements BulkDomainService { user.setNewRoles(ImmutableSet.of(new UserRole(user, domain, ROLE_DOMAIN_ADMIN))); userUpdateRequired = true; } - if (csvDomain.getSsoEnabled() != null && csvDomain.getSsoEnabled()) { - if (StringUtils.isEmpty(user.getSamlToken())) { - user.setSamlToken(csvDomain.getEmail()); + if (configurationManager.getConfiguration().isBulkDomainsAllowForSsoAccounts()) { + if (csvDomain.getSsoEnabled() != null && csvDomain.getSsoEnabled()) { + if (StringUtils.isEmpty(user.getSamlToken())) { + user.setSamlToken(csvDomain.getEmail()); + } } } if (userUpdateRequired) { diff --git a/src/main/java/net/geant/nmaas/portal/service/impl/UserServiceImpl.java b/src/main/java/net/geant/nmaas/portal/service/impl/UserServiceImpl.java index f22d6a0f751cb990da5162e61a002fad7926fa48..3d9d3d27cbc9e2c6ed9b130c880b5b9c1fdfdb53 100644 --- a/src/main/java/net/geant/nmaas/portal/service/impl/UserServiceImpl.java +++ b/src/main/java/net/geant/nmaas/portal/service/impl/UserServiceImpl.java @@ -169,8 +169,10 @@ public class UserServiceImpl implements UserService { newUser.setNewRoles(ImmutableSet.of(new UserRole(newUser, domain, ROLE_DOMAIN_ADMIN))); } // set user saml_token to email address if a sso account requested - if (csvUser.getSsoEnabled() != null && csvUser.getSsoEnabled()) { - newUser.setSamlToken(csvUser.getEmail()); + if (configurationManager.getConfiguration().isBulkDomainsAllowForSsoAccounts()) { + if (csvUser.getSsoEnabled() != null && csvUser.getSsoEnabled()) { + newUser.setSamlToken(csvUser.getEmail()); + } } userRepository.save(newUser); return newUser; diff --git a/src/test/java/net/geant/nmaas/portal/service/impl/BulkDomainServiceImplTest.java b/src/test/java/net/geant/nmaas/portal/service/impl/BulkDomainServiceImplTest.java index f0369c1656c641e7927fb76958c975ae85ee30b5..1b6b7b62f2a5911e6271a3b1ce5de472881f93ed 100644 --- a/src/test/java/net/geant/nmaas/portal/service/impl/BulkDomainServiceImplTest.java +++ b/src/test/java/net/geant/nmaas/portal/service/impl/BulkDomainServiceImplTest.java @@ -5,6 +5,7 @@ import net.geant.nmaas.dcn.deployment.entities.DomainDcnDetails; import net.geant.nmaas.externalservices.kubernetes.KubernetesClusterIngressManager; import net.geant.nmaas.portal.api.bulk.BulkType; import net.geant.nmaas.portal.api.bulk.CsvDomain; +import net.geant.nmaas.portal.api.configuration.ConfigurationView; import net.geant.nmaas.portal.api.domain.UserViewMinimal; import net.geant.nmaas.portal.persistent.entity.BulkDeployment; import net.geant.nmaas.portal.persistent.entity.BulkDeploymentEntry; @@ -14,6 +15,7 @@ import net.geant.nmaas.portal.persistent.entity.User; import net.geant.nmaas.portal.persistent.repositories.BulkDeploymentRepository; import net.geant.nmaas.portal.persistent.repositories.UserRoleRepository; import net.geant.nmaas.portal.service.BulkDomainService; +import net.geant.nmaas.portal.service.ConfigurationManager; import net.geant.nmaas.portal.service.DomainGroupService; import net.geant.nmaas.portal.service.DomainService; import net.geant.nmaas.portal.service.UserService; @@ -42,9 +44,10 @@ public class BulkDomainServiceImplTest { private final BulkDeploymentRepository bulkDeploymentRepository = mock(BulkDeploymentRepository.class); private final KubernetesClusterIngressManager kubernetesClusterIngressManager = mock(KubernetesClusterIngressManager.class); private final UserRoleRepository userRoleRepository = mock(UserRoleRepository.class); + private final ConfigurationManager configurationManager = mock(ConfigurationManager.class); final BulkDomainService bulkDomainService = new BulkDomainServiceImpl(domainService, domainGroupService, userService, - bulkDeploymentRepository, kubernetesClusterIngressManager, new ModelMapper(), userRoleRepository, 12); + bulkDeploymentRepository, kubernetesClusterIngressManager, new ModelMapper(), userRoleRepository, 12, configurationManager); @Test void shouldHandleBulkCreationWhenAllCreated() { @@ -62,6 +65,7 @@ public class BulkDomainServiceImplTest { when(userService.findByUsername("user1")).thenReturn(Optional.of(user)); when(userService.hasPrivilege((User) any(),any(),any())).thenReturn(true); when(bulkDeploymentRepository.save(any())).thenReturn(new BulkDeployment()); + when(configurationManager.getConfiguration()).thenReturn(new ConfigurationView()); bulkDomainService.handleBulkCreation(List.of(csvDomain), testUser()); @@ -94,6 +98,7 @@ public class BulkDomainServiceImplTest { when(userService.findByUsername("user1")).thenReturn(Optional.of(user)); when(userService.hasPrivilege((User) any(),any(),any())).thenReturn(true); when(bulkDeploymentRepository.save(any())).thenReturn(new BulkDeployment()); + when(configurationManager.getConfiguration()).thenReturn(new ConfigurationView()); bulkDomainService.handleBulkCreation(List.of(csvDomain), testUser()); diff --git a/src/test/shell/data/apps/app06-grafana.json b/src/test/shell/data/apps/app06-grafana.json index 95c02291b264963de57eb0ac8d0dc35938b1522d..80ff42fea3610baa4fbecc6fe9121f6911ac38cb 100644 --- a/src/test/shell/data/apps/app06-grafana.json +++ b/src/test/shell/data/apps/app06-grafana.json @@ -7,7 +7,7 @@ "wwwUrl": "https://grafana.com/", "sourceUrl": "https://github.com/grafana/grafana", "issuesUrl": "https://github.com/grafana/grafana/issues", - "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/NMaaS+Tools#NMaaSTools-Grafana", + "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/nmaas+Tools#nmaasTools-Grafana", "descriptions": [ { "language": "en", @@ -103,7 +103,7 @@ "optionsLabelPosition": "right", "values": [ { - "label": "NMaaS Prometheus instance", + "label": "nmaas Prometheus instance", "value": "inCluster" }, { diff --git a/src/test/shell/data/apps/app07-bastion.json b/src/test/shell/data/apps/app07-bastion.json index 1e231d7f5cf8d66aeeda111bc8af7b17e8d695cf..c31ad50314ca09f38ea16611f6765d663e1c94b9 100644 --- a/src/test/shell/data/apps/app07-bastion.json +++ b/src/test/shell/data/apps/app07-bastion.json @@ -7,7 +7,7 @@ "wwwUrl": "https://github.com/nmaas-platform/nmaas-bastion-ng", "sourceUrl": "https://github.com/nmaas-platform/nmaas-bastion-ng", "issuesUrl": "https://github.com/nmaas-platform/nmaas-bastion-ng/issues", - "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/NMaaS+Tools#Bastion-NG", + "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/nmaas+Tools#Bastion-NG", "descriptions": [ { "language": "en", diff --git a/src/test/shell/data/apps/app27-netbox.json b/src/test/shell/data/apps/app27-netbox.json index 4e25ae064a718d2ff09183b89b929b82fd8ac50b..34f6a9fdc0e3cd12f754ed62717b2b81132e29de 100644 --- a/src/test/shell/data/apps/app27-netbox.json +++ b/src/test/shell/data/apps/app27-netbox.json @@ -7,7 +7,7 @@ "wwwUrl": "https://netbox.readthedocs.io/", "sourceUrl": "https://github.com/netbox-community/netbox/", "issuesUrl": "https://github.com/netbox-community/netbox/issues", - "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/NMaaS+Tools#NMaaSTools-NetBox", + "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/nmaas+Tools#nmaasTools-NetBox", "descriptions": [ { "language": "en", diff --git a/src/test/shell/data/apps/app30-healthchecks.json b/src/test/shell/data/apps/app30-healthchecks.json index dc0c642af640be0c862ca32ea9ffe25a25c115ac..fbe1193c1952c62d8fdab1518cfb17f4872455c0 100644 --- a/src/test/shell/data/apps/app30-healthchecks.json +++ b/src/test/shell/data/apps/app30-healthchecks.json @@ -7,7 +7,7 @@ "wwwUrl": "https://healthchecks.io/", "sourceUrl": "https://github.com/healthchecks/healthchecks", "issuesUrl": "https://github.com/healthchecks/healthchecks/issues", - "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/NMaaS+Tools#NMaaSTools-Healthchecks", + "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/nmaas+Tools#NMaaSTools-Healthchecks", "descriptions": [ { "language": "en", diff --git a/src/test/shell/data/apps/app31-ctfd.json b/src/test/shell/data/apps/app31-ctfd.json index 773ed98a788b8f9cb2394254a1c665818381629e..64fbd3391ea8eb51ab42286e028013b1a264f617 100644 --- a/src/test/shell/data/apps/app31-ctfd.json +++ b/src/test/shell/data/apps/app31-ctfd.json @@ -7,7 +7,7 @@ "wwwUrl": "https://ctfd.io/", "sourceUrl": "https://github.com/CTFd/CTFd", "issuesUrl": "https://github.com/CTFd/CTFd/issues", - "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/NMaaS+Tools#NMaaSTools-CTFD", + "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/nmaas+Tools#nmaasTools-CTFD", "descriptions": [ { "language": "en", diff --git a/src/test/shell/data/apps/app32-juiceshop.json b/src/test/shell/data/apps/app32-juiceshop.json index e8ed402cff5c24bf620e3b0b4ca21c5ba2d179f9..396f10c31a3a17f2f74e540c384e987bf981579f 100644 --- a/src/test/shell/data/apps/app32-juiceshop.json +++ b/src/test/shell/data/apps/app32-juiceshop.json @@ -7,7 +7,7 @@ "wwwUrl": "https://owasp-juice.shop/", "sourceUrl": "https://github.com/juice-shop/juice-shop", "issuesUrl": "https://github.com/juice-shop/juice-shop/issues", - "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/NMaaS+Tools#NMaaSTools-JuiceShop", + "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/nmaas+Tools#nmaasTools-JuiceShop", "descriptions": [ { "language": "en", diff --git a/src/test/shell/data/apps/app35-changedetectionio.json b/src/test/shell/data/apps/app35-changedetectionio.json index 535a8814bc87d48b6b3de616280773b332c97eaf..15f166b7aa94e74dd9f7d56b2732fb997387aa4a 100644 --- a/src/test/shell/data/apps/app35-changedetectionio.json +++ b/src/test/shell/data/apps/app35-changedetectionio.json @@ -7,7 +7,7 @@ "wwwUrl": "https://github.com/dgtlmoon/changedetection.io", "sourceUrl": "https://github.com/dgtlmoon/changedetection.io", "issuesUrl": "https://github.com/dgtlmoon/changedetection.io/issues", - "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/NMaaS+Tools#NMaaSTools-changedetection.io", + "nmaasDocumentationUrl": "https://wiki.geant.org/display/NMAAS/nmaas+Tools#nmaasTools-changedetection.io", "descriptions": [ { "language": "en", diff --git a/src/test/shell/data/i18n/de.json b/src/test/shell/data/i18n/de.json index 08d087d1b2da978feeb84b3c18bc1dd13a9cfe49..b53cc62f3ab466ec1dee1f402e8306a1350de876 100644 --- a/src/test/shell/data/i18n/de.json +++ b/src/test/shell/data/i18n/de.json @@ -32,7 +32,7 @@ "REGISTER": "Registrieren", "TITLE1": "Network Management as a Service", "TITLE2": "stellt ein Portfolio an Netzwerk-Management-Anwendungen bereit welche als dedizierte Instanzen pro Benutzer in der Cloud ausgeführt werden.", - "INTRO_TEXT": "Der nmaas-Dienst von GÉANT umfasst drei Aspekte: Bereitstellung, Verwaltung und Wartung der Infrastruktur des nmaas Service Portals, der Plattform und ausgewählter Tools. Der Benutzer wird in der Verwendung des Systems und der ausgewählten Tools unterstützt um sein eigenes Netzwerk via NMaaS zu überwachen. Es werden ebenfalls Anwender unterstützt, welche ihre Software über das NMaaS System bereitstellen möchten.", + "INTRO_TEXT": "Der nmaas-Dienst von GÉANT umfasst drei Aspekte: Bereitstellung, Verwaltung und Wartung der Infrastruktur des nmaas Service Portals, der Plattform und ausgewählter Tools. Der Benutzer wird in der Verwendung des Systems und der ausgewählten Tools unterstützt um sein eigenes Netzwerk via nmaas zu überwachen. Es werden ebenfalls Anwender unterstützt, welche ihre Software über das nmaas System bereitstellen möchten.", "TARGET_USERS_HEADER": "Zielgruppe", "TARGET_USERS_TEXT": "nmaas-Nutzer sind Organisationen, die keine eigene NMS-Infrastruktur besitzen und/oder das Netzwerkmanagement auslagern wollen, sowie Organisationen und/oder Einzelpersonen, die nach qualitativ hochwertiger Netzwerkmanagement-Software suchen oder ihre Software innerhalb der Community teilen möchten.", "MARKETPLACE_HEADER": "nmaas Marketplace", @@ -325,8 +325,10 @@ "LANGUAGE_DISABLED": "Deaktiviert", "TEST_INSTANCE": "Als Test-nmaas-Instanz markieren", "SEND_APP_INSTANCE_FAILURE_EMAILS": "Send emails when app instance fails to deploy", - "SEND_APP_INSTANCE_FAILURE_EMAILS_LIST": "Emails list", - "DOMAIN_SELECTION_ENABLED" : "Domainauswahl während der Registrierung" + "SEND_APP_INSTANCE_FAILURE_EMAILS_LIST": "Recipients of app deployment failed emails", + "DOMAIN_SELECTION_ENABLED" : "Domainauswahl während der Registrierung", + "BULK_DOMAINS_ALLOW_FOR_SSO_ACCOUNTS" : "Allow for creation or update of a SSO-enabled account in bulk process", + "BULK_DOMAINS_SEND_EMAIL_FOR_NEW_ACCOUNTS" : "Send notification email for new accounts created in bulk process" }, "DOMAIN_DETAILS": { "TITLE": "Domain Details", @@ -386,7 +388,7 @@ } }, "GIT_INFO": { - "HEADER": "NMaaS Versionsinformation", + "HEADER": "nmaas Versionsinformation", "VERSION": "Version", "BUILD_TIME": "Zeitpunkt des Builds", "LAST_COMMIT": "Letzter Commit", @@ -550,7 +552,7 @@ "STATE": "Status", "DEFAULT_ERROR_STATE": "Etwas ist schief gelaufen", "DETAILS": "Details", - "DEFAULT_ERROR_MESSAGE": "Die Anwendungsbereitstellung ist aufgrund eines unerwarteten Fehlers fehlgeschlagen. Das NMaaS-Supportteam wurde bereits benachrichtigt.<br>Um ein Problem zu melden, verwenden Sie das <a href=\"about?type=ISSUE_REPORT\">Kontaktformular</a>." + "DEFAULT_ERROR_MESSAGE": "Die Anwendungsbereitstellung ist aufgrund eines unerwarteten Fehlers fehlgeschlagen. Das nmaas-Supportteam wurde bereits benachrichtigt.<br>Um ein Problem zu melden, verwenden Sie das <a href=\"about?type=ISSUE_REPORT\">Kontaktformular</a>." }, "DEPLOYMENT_HISTORY": { "HEADER": "Installationshistorie", @@ -563,7 +565,7 @@ "ADVANCED_TAB": "Erweitert", "ADDITIONAL_TAB": "Erweiterte Parameter", "STORAGE_SPACE": "Speicherplatz", - "NMAAS_TOOLS": "NMaaS Tools Seite", + "NMAAS_TOOLS": "nmaas Tools Seite", "DOCUMENTATION_INFO": "Detaillierte Feldbeschreibungen finden Sie unter", "PREVIEW": "Configuration preview" }, @@ -618,17 +620,17 @@ "APP_UPGRADE_FAILED": "Anwendungsaktualisierung fehlgeschlagen" }, "USER_FRIENDLY": { - "REQUESTED": "NMaaS bearbeitet Ihre Anfrage", - "VALIDATION": "NMaaS prüft verfügbare Ressourcen", - "PREPARATION": "NMaaS bereitet die Installationsumgebung für Ihre Anwendung vor", - "CONNECTING": "NMaaS richtet eine sichere Verbindungen zu Ihren Geräten ein", + "REQUESTED": "nmaas bearbeitet Ihre Anfrage", + "VALIDATION": "nmaas prüft verfügbare Ressourcen", + "PREPARATION": "nmaas bereitet die Installationsumgebung für Ihre Anwendung vor", + "CONNECTING": "nmaas richtet eine sichere Verbindungen zu Ihren Geräten ein", "CONFIGURATION_AWAITING": "Ihre Anwendungsinstanz wurde erfolgreich bereitgestellt. <br>Um fortzufahren, geben Sie die Erstkonfiguration über die Aktionsschaltfläche <i>Konfigurieren</i> ein", "DEPLOYING": "Anwendung wird aktiviert. Dieser Vorgang kann bis zu mehreren Minuten dauern. <br>Sie werden per E-Mail benachrichtigt, sobald Ihre Instanz fertig ist", "RUNNING": "Ihre Anwendung ist jetzt aktiv. Sie können mit der Option <i>Zugriff</i> im Menü <i>Aktionen</i> darauf zugreifen. <br>Verwenden Sie die Optionen <i>Konfigurieren</i> und <i>Mitglieder</i>, um die Konfiguration bzw. die Liste der Anwendungsbenutzer zu aktualisieren.", "UNDEPLOYING": "Die Anwendung wird entfernt. Dieser Vorgang kann bis zu mehreren Minuten dauern", "DONE": "Anwendung erfolgreich entfernt", "FAILURE": "", - "UNKNOWN": "Unbekannter Anwendungszustand - Kontakt mit dem NMaaS-Team über das Kontaktformular auf der Unterseite \" Über \"", + "UNKNOWN": "Unbekannter Anwendungszustand - Kontakt mit dem nmaas-Team über das Kontaktformular auf der Unterseite \" Über \"", "REMOVED": "Anwendung nach Fehler erfolgreich aufgehoben" }, "SHOW_VERSIONS_LABEL": "Show available versions", @@ -693,11 +695,11 @@ }, "RESET_PASSWORD": { "FORGOT_PASSWORD_BUTTON": "Passwort vergessen", - "TEXT": "Um Ihr Passwort zurückzusetzen geben Sie Ihre E-Mail Adresse an, welche Sie für die Registrierung bei NMaaS verwendet haben.", + "TEXT": "Um Ihr Passwort zurückzusetzen geben Sie Ihre E-Mail Adresse an, welche Sie für die Registrierung bei nmaas verwendet haben.", "SUBMIT_BUTTON": "Senden", "EMAIL": "Email", "INVALID_TOKEN": "Ihr Link ist bereits abgelaufen. Bitte füllen Sie das Formular für das vergessene Passwort erneut aus.", - "GO_BACK": "Zurück zur NMaaS Seite", + "GO_BACK": "Zurück zur nmaas Seite", "MODAL": { "HEADER": "Bitte überprüfen Sie Ihre E-Mails", "BODY": "Wenn Sie eine gültige E-Mail Adresse angegeben haben, werden wir Ihnen einen Link für das Zurücksetzen des Passworts senden. Bitte beachten Sie, dass Sie das Kennwort nur für das lokale Konto zurücksetzen können.", @@ -767,7 +769,7 @@ "UPDATE_CONFIG_WIZARD_PREVIEW_HEADER": "Aktualisiere Konfigurationsassistenten Vorschau" }, "APPS_WIZARD": { - "FIRST_PAGE_MESSAGE": "You are about to fill in a request for adding new application to the NMaaS portfolio. You will be guided through a few step process of providing all necessary information about the application, its description, deployment and configuration details. Once the request is submitted it will be reviewed by administrator and either approved or rejected with a proper comment send via email. By checking the box below you confirm that you have the right to publish this application in NMaaS.", + "FIRST_PAGE_MESSAGE": "You are about to fill in a request for adding new application to the nmaas portfolio. You will be guided through a few step process of providing all necessary information about the application, its description, deployment and configuration details. Once the request is submitted it will be reviewed by administrator and either approved or rejected with a proper comment send via email. By checking the box below you confirm that you have the right to publish this application in nmaas.", "ACCEPT_RULES_CHECKBOX": "I read the general instructions above", "NEXT_BUTTON": "Weiter", "SUBMIT_BUTTON": "Sende", @@ -800,7 +802,7 @@ "UPDATE_CONFIG_WIZARD_TEMPLATE_LABEL": "Anwendungskonfigurationsupdateassistent Vorlage", "NEW_APP_MODAL": { "HEADER": "Neue Anwendung ordnungsgemäß eingereicht", - "BODY": "Vielen Dank für das Einreichen der neuen Anwendung. Ihre Anfrage muss nun vom NMaaS-Team geprüft werden. Dies benötigt etwas Zeit.", + "BODY": "Vielen Dank für das Einreichen der neuen Anwendung. Ihre Anfrage muss nun vom nmaas-Team geprüft werden. Dies benötigt etwas Zeit.", "BACK_TO_APP_MANAGEMENT_BUTTON": "Zurück" }, "EDIT_APP_MODAL": { @@ -820,23 +822,23 @@ "ACCEPT_RULES_TOOLTIP": "Sie müssen den Bedingungen zustimmen!", "NAME_TOOLTIP": "Offizieller Anwendungsname.", "VERSION_TOOLTIP": "Aktuelle Release-Nummer der Anwendung.", - "LICENSE_TOOLTIP": "Geben Sie den Namen der Lizenz ein, unter der die Anwendung verteilt wird. Bitte vergewissern Sie sich, dass die Anwendung in NMaaS verwendet werden kann.", + "LICENSE_TOOLTIP": "Geben Sie den Namen der Lizenz ein, unter der die Anwendung verteilt wird. Bitte vergewissern Sie sich, dass die Anwendung in nmaas verwendet werden kann.", "LICENSE_URL_TOOLTIP": "Um dem Benutzer mehr Informationen über die Lizenz und die zu verwendenden Berechtigungen zu geben, geben Sie einen Link zur Lizenzbeschreibung an.", "PROJECT_WEBSITE_TOOLTIP": "Um dem Benutzer mehr Informationen über das gesamte Projekt zu geben, geben Sie einen Link zur Projekt-Website an.", "SOURCE_CODE_TOOLTIP": "URL zum Source Code des Projekts z.B. github.com/project.", "PROJECT_ISSUES_TOOLTIP": "Um sicherzustellen, dass Benutzer immer eine Möglichkeit haben, Fehler an das für das Tool verantwortliche Team zu melden, stellen Sie einen Link zur Verfügung, z.B. github.com/project/issues.", "TAGS_TOOLTIP": "Bitte wählen Sie Tags aus, welche die Anwendung beschreiben. Das hilft Benutzern die Anwendungen schneller zu finden.", "NEW_TAGS_TOOLTIP": "Sie können Ihrer Anwendungen neue Tags hinzufügen, falls bereits exisiterende Tags ihre Anwendung nicht ausreichend beschreiben. Schreiben Sie den Tag-Name und drücken Sie Enter um einen neuen Tag hinzuzufügen.", - "BRIEF_DESCRIPTION_TOOLTIP": "Geben Sie eine kurze Beschreibung der Anwendung ein. Dieser Text wird auf der NMaaS Market Seite sichtbar sein.", + "BRIEF_DESCRIPTION_TOOLTIP": "Geben Sie eine kurze Beschreibung der Anwendung ein. Dieser Text wird auf der nmaas Market Seite sichtbar sein.", "FULL_DESCRIPTION_TOOLTIP": "Geben Sie eine volle Beschreibung der Anwendung ein. Dieser Text wird auf der Seite der Anwendungsdetails sichtbar sein.", - "CHART_NAME_TOOLTIP": "Geben Sie den Namen des Charts ein, welcher in NMaaS benutzt werden soll.", - "CHART_VERSION_TOOLTIP": "Geben Sie die Version des Charts ein, welche in NMaaS benutzt werden soll.", + "CHART_NAME_TOOLTIP": "Geben Sie den Namen des Charts ein, welcher in nmaas benutzt werden soll.", + "CHART_VERSION_TOOLTIP": "Geben Sie die Version des Charts ein, welche in nmaas benutzt werden soll.", "HELM_CHART_REPOSITORY_NAME_TOOLTIP": "Enter Helm Chart Repository Name", "HELM_CHART_REPOSITORY_URL_TOOLTIP": "Enter Helm Chart URL address", "MAIN_DEPLOYMENT_NAME_TOOLTIP": "Enter the name of main component deployed by this chart.", "DEFAULT_STORAGE_SPACE_TOOLTIP": "Geben Sie den standard Speicherplatz (in GB) ein.", - "DEPLOY_PARAMETER_TOOLTIP": "Einige Anwendungen dürfen globale NMaaS Einstellungen verwenden. Wenn Sie einige davon benutzen möchten, spezifizieren Sie bitte wie wir die Variable übergeben sollen.", - "REPOSITORY_REQUIRED_TOOLTIP": "NMaaS kann GitLab für die Konfiguration jeder Instanz verwenden.", + "DEPLOY_PARAMETER_TOOLTIP": "Einige Anwendungen dürfen globale nmaas Einstellungen verwenden. Wenn Sie einige davon benutzen möchten, spezifizieren Sie bitte wie wir die Variable übergeben sollen.", + "REPOSITORY_REQUIRED_TOOLTIP": "nmaas kann GitLab für die Konfiguration jeder Instanz verwenden.", "DISABLED_NEXT_BUTTON_TOOLTIP": "Sie müssen alle benötigten Felder ausfüllen!", "DEPLOY_PARAMETERS_DROPDOWN": "Wählen Sie globale Installationsparamter aus", "CONFIG_FILENAME_LABEL": "Name der Konfigurationsdatei", @@ -855,8 +857,8 @@ "BASIC_APP_INFO_STEP_INFO": "Basic set of information about the application. Application can be filtered by tag. Select an existing tag or create a new one if none is suitable.", "LOGO_AND_SCREENSHOTS_STEP_INFO": "Application logo is displayed in various views in the application. A set of screenshots should give a nice overview of the application's UI.", "APP_DESCRIPTIONS_STEP_INFO": "Brief and full descriptions of the application should provide a basic (limited length) and comprehensive information about the nature and purpose of the application. Descriptions should be provided in as many supported languages as possible.", - "APP_DEPLOYMENT_SPEC_STEP_INFO": "Applications offered through NMaaS are deployed in Kubernetes as Helm charts. Basic information about the chart is required with additional set of optional parameters to be passed during the installation process.", - "CONFIG_TEMPLATES_STEP_INFO": "NMaaS applications are populated with basic configuration parameters provided by users using a wizard. The list of configuration files (with parameterized content) to be used and loaded by the application at startup should be provided. Those need to be complemented with the definition of the wizard component dedicated for particular application allowing user to provide all necessary parameters used to populate configuration files. ", "BASIC_AUTH_LABEL": "Benötigt Grundberechtigung", + "APP_DEPLOYMENT_SPEC_STEP_INFO": "Applications offered through nmaas are deployed in Kubernetes as Helm charts. Basic information about the chart is required with additional set of optional parameters to be passed during the installation process.", + "CONFIG_TEMPLATES_STEP_INFO": "nmaas applications are populated with basic configuration parameters provided by users using a wizard. The list of configuration files (with parameterized content) to be used and loaded by the application at startup should be provided. Those need to be complemented with the definition of the wizard component dedicated for particular application allowing user to provide all necessary parameters used to populate configuration files. ", "BASIC_AUTH_LABEL": "Benötigt Grundberechtigung", "BASIC_AUTH_TOOLTIP": "Sie können eine Grundberechtigung für Ihre Anwendung hinzufügen, indem Sie einfach dieses Kontrollkästchen markieren.", "TERMS_ACCEPTANCE_LABEL": "Terms acceptance required", "TERMS_ACCEPTANCE_TOOLTIP": "If application has some special license requirements, you can provide them", @@ -880,8 +882,8 @@ "CONFIG_UPDATE_ENABLED": "Enable configuration updates", "STATIC_GLOBAL_DEPLOY_PARAMETERS": "Static global deploy parameters", "DEPLOY_PARAMETERS": "Global deploy parameters", - "PROJECT_NMAAS_DOCUMENTATION_LABEL": "NMaaS Documentation URL", - "PROJECT_NMAAS_DOCUMENTATION_TOOLTIP": "Provide URL to NMaaS Documentatnion (NMaaS Tools)", + "PROJECT_NMAAS_DOCUMENTATION_LABEL": "nmaas Documentation URL", + "PROJECT_NMAAS_DOCUMENTATION_TOOLTIP": "Provide URL to nmaas Documentatnion (nmaas Tools)", "RAW_JSON": "Raw JSON format", "FORM_BUILDER": "Form builder", "FORM_DEFINITION": "Form definition", @@ -937,8 +939,8 @@ "ABOUT": { "CONTACT_TITLE": "Kontaktieren Sie uns", "CHANGELOG_TITLE": "Aktuelle Softwareversion und Änderungsprotokoll", - "CONTACT_DESC": "Das Kontaktformular bietet eine einfache Möglichkeit, mit dem NMaaS-Team in Kontakt zu treten. Wählen Sie den Formulartyp, der für Ihre Anfrage am besten geeignet ist.", - "CHANGELOG_DESC": "Im Folgenden finden Sie detaillierte Informationen zur aktuellen NMaaS-Version und eine Zusammenfassung der Änderungen, die in früheren Softwareversionen vorgenommen wurden." + "CONTACT_DESC": "Das Kontaktformular bietet eine einfache Möglichkeit, mit dem nmaas-Team in Kontakt zu treten. Wählen Sie den Formulartyp, der für Ihre Anfrage am besten geeignet ist.", + "CHANGELOG_DESC": "Im Folgenden finden Sie detaillierte Informationen zur aktuellen nmaas-Version und eine Zusammenfassung der Änderungen, die in früheren Softwareversionen vorgenommen wurden." }, "CHANGELOG": { "CHANGELOG_LAST": "Letzte Veröffentlichung", @@ -968,17 +970,17 @@ "DOMAIN_CODENAME_DESCRIPTION": "Kurzfassung des Domainnamens (bis zu 12 Zeichen)", "DOMAIN_CODENAME_ERROR": "Ungültiger Domain-Codename", "JUSTIFICATION": "Bitte um Begründung", - "JUSTIFICATION_DESCRIPTION": "Kurze Begründung für die Erstellung der neuen Domain, einschließlich des Namens der anfragenden Institution und des Hauptzwecks für die Bereitstellung von NMaaS-Anwendungen", + "JUSTIFICATION_DESCRIPTION": "Kurze Begründung für die Erstellung der neuen Domain, einschließlich des Namens der anfragenden Institution und des Hauptzwecks für die Bereitstellung von nmaas-Anwendungen", "VPN_OPTION": "VPN solution", "VPN_OPTION_DESCRIPTION": "Two types of software-based VPN solutions are currently supported. Select the preferred one", "VPN_USER_IP": "Public IP for VPN tunnel setup", "VPN_USER_IP_DESCRIPTION": "Public IP for VPN tunnel termination on user end", "VPN_USER_SUBNETS": "Monitored user subnets", - "VPN_USER_SUBNETS_DESCRIPTION": "List of monitored subnets that should be reachable from your application deployed on NMaaS", + "VPN_USER_SUBNETS_DESCRIPTION": "List of monitored subnets that should be reachable from your application deployed on nmaas", "VPN_USER_SUBNETS_ADD": "Add subnet", "VPN_USER_SUBNETS_SUBNET": "Subnet", "ADDITIONAL_VPN_SUBNETS": "Additional subnets", - "ADDITIONAL_VPN_SUBNETS_DESCRIPTION": "Additional IP ranges that should be reachable from your NMaaS applications, outside those specified above (e.g. some public services)", + "ADDITIONAL_VPN_SUBNETS_DESCRIPTION": "Additional IP ranges that should be reachable from your nmaas applications, outside those specified above (e.g. some public services)", "TECH_CONTACT": "Technical contact", "TECH_CONTACT_DESCRIPTION": "Person to be contacted to further discuss technical matters related with VPN setup", "TECH_CONTACT_PLACEHOLDER": "Name and email", @@ -993,7 +995,7 @@ }, "MODAL": { "TITLE": "Mail wurde versendet", - "MESSAGE": "Das NMaaS Team wird bald antworten.", + "MESSAGE": "Das nmaas Team wird bald antworten.", "CLOSE_BUTTON": "Schließen" }, "SELECT_CATEGORY": "Select category", diff --git a/src/test/shell/data/i18n/en.json b/src/test/shell/data/i18n/en.json index 8fe5123e1fb5650110c2ec9ca8bd995362a9f72c..1ab6473b1134c39b50b0154be63494964baa6eb6 100644 --- a/src/test/shell/data/i18n/en.json +++ b/src/test/shell/data/i18n/en.json @@ -32,28 +32,28 @@ "REGISTER": "Register", "TITLE1": "Network Management as a Service", "TITLE2": "provides a portfolio of network management applications run as dedicated per-user instances in the cloud.", - "INTRO_TEXT": "GÉANT’s NMaaS service includes three aspects: providing, managing and maintaining the infrastructure of the NMaaS service portal, platform and selected tools, supporting users in using the system, and the selected tools for monitoring their networks via NMaaS, as well as supporting users that contribute their software to NMaaS system.", + "INTRO_TEXT": "GÉANT’s nmaas service includes three aspects: providing, managing and maintaining the infrastructure of the nmaas service portal, platform and selected tools, supporting users in using the system, and the selected tools for monitoring their networks via nmaas, as well as supporting users that contribute their software to nmaas system.", "TARGET_USERS_HEADER": "Target users", - "TARGET_USERS_TEXT": "NMaaS users are organisations that do not want to own NMS infrastructure themselves and/or want to outsource network management, as well as organisations and/or individuals that are searching for quality network management software or who want to share their software within the community.", - "MARKETPLACE_HEADER": "NMaaS Marketplace", - "MARKETPLACE_TEXT": "NMaaS Marketplace is a catalogue of available open source tools, supported by community, distributed free, chosen by administration. There is also place for your application choice - you can propose new applications. ", + "TARGET_USERS_TEXT": "nmaas users are organisations that do not want to own NMS infrastructure themselves and/or want to outsource network management, as well as organisations and/or individuals that are searching for quality network management software or who want to share their software within the community.", + "MARKETPLACE_HEADER": "nmaas Marketplace", + "MARKETPLACE_TEXT": "nmaas Marketplace is a catalogue of available open source tools, supported by community, distributed free, chosen by administration. There is also place for your application choice - you can propose new applications. ", "COST_REDUCTION_HEADER": "Cost reduction", - "COST_REDUCTION_TEXT": "With NMaaS, users do not have to bear the ownership costs and risks related to maintenance and control of the network management infrastructure.", + "COST_REDUCTION_TEXT": "With nmaas, users do not have to bear the ownership costs and risks related to maintenance and control of the network management infrastructure.", "SECURITY_HEADER": "Security", - "SECURITY_TEXT": "With NMaaS, you don't have to worry about security. We provide safe connection to separated instances by VPN to your network - to allow institutions and projects to safe management of network.", + "SECURITY_TEXT": "With nmaas, you don't have to worry about security. We provide safe connection to separated instances by VPN to your network - to allow institutions and projects to safe management of network.", "SCALING_HEADER": "Flexible scaling", - "SCALING_TEXT": "If You need some horizontal scaling - there is no problem with that on NMaaS. You can very easily scale Your instances in few minutes.", - "NMAAS_FEATURES_HEADER": "NMaaS Features", + "SCALING_TEXT": "If You need some horizontal scaling - there is no problem with that on nmaas. You can very easily scale Your instances in few minutes.", + "NMAAS_FEATURES_HEADER": "nmaas Features", "APP_MARKET_HEADER": "Application Market", "APP_MARKET_TEXT": "At store You can find top picked applications to manage and maintain Your network infrastructure, chosen by administrators and community.", "OWN_APPS_HEADER": "Own applications", - "OWN_APPS_TEXT": "You want to share your own application with the community? NMaaS is open for addition of new applications.", + "OWN_APPS_TEXT": "You want to share your own application with the community? nmaas is open for addition of new applications.", "EDUGAIN_SUPPORT_HEADER": "eduGAIN support", "EDUGAIN_SUPPORT_TEXT": "You don't need to create a new account. Login using an existing account from you identity provider federated under eduGAIN.", "FAST_DEPLOYMENT_HEADER": "Fast & easy deployment", "FAST_DEPLOYMENT_TEXT": "Upon your request applications are deployed within minutes with custom configuration provided through a simple wizard.", "WEB_PORTAL_HEADER": "Modern user interface", - "WEB_PORTAL_TEXT": "NMaaS provides a modern web-based user portal that follows reactive design principle.", + "WEB_PORTAL_TEXT": "nmaas provides a modern web-based user portal that follows reactive design principle.", "KUBERNETES_HEADER": "Kubernetes deployment", "KUBERNETES_TEXT": "User application instances are deployed in Kubernetes cluster run on top of dedicated hardware infrastructure assuring high performance and reliability.", "TECHNOLOGIES_USED_HEADER": "Technologies used", @@ -94,8 +94,8 @@ "USER_DISABLED_MESSAGE": "User is disabled" }, "TEST_INSTANCE_MODAL": { - "HEADER": "NMaaS test instance", - "BODY": "Please be aware that this is a test NMaaS instance. The user isolation and data security measures are not so strict as on the production instance. Do not use this instance to monitor real equipment.", + "HEADER": "nmaas test instance", + "BODY": "Please be aware that this is a test nmaas instance. The user isolation and data security measures are not so strict as on the production instance. Do not use this instance to monitor real equipment.", "OK_BUTTON": "OK" }, "PROVIDE_SSH_KEY_MODAL": { @@ -323,11 +323,12 @@ "LANGUAGE_SUPPORT": "Supported languages", "LANGUAGE_ENABLED": "Enabled", "LANGUAGE_DISABLED": "Disabled", - "TEST_INSTANCE": "Mark as test NMaaS instance", + "TEST_INSTANCE": "Mark as test nmaas instance", "SEND_APP_INSTANCE_FAILURE_EMAILS": "Send emails when app instance fails to deploy", - "SEND_APP_INSTANCE_FAILURE_EMAILS_LIST": "Emails list", - "DOMAIN_SELECTION_ENABLED" : "Domain selection during registration" - + "SEND_APP_INSTANCE_FAILURE_EMAILS_LIST": "Recipients of app deployment failed emails", + "DOMAIN_SELECTION_ENABLED" : "Domain selection during registration", + "BULK_DOMAINS_ALLOW_FOR_SSO_ACCOUNTS" : "Allow for creation or update of a SSO-enabled account in bulk process", + "BULK_DOMAINS_SEND_EMAIL_FOR_NEW_ACCOUNTS" : "Send notification email for new accounts created in bulk process" }, "DOMAIN_DETAILS": { "TITLE": "Domain details", @@ -387,7 +388,7 @@ } }, "GIT_INFO": { - "HEADER": "NMaaS version information", + "HEADER": "nmaas version information", "VERSION": "Version", "BUILD_TIME": "Build time", "LAST_COMMIT": "Last commit", @@ -551,7 +552,7 @@ "STATE": "State", "DEFAULT_ERROR_STATE": "Something went wrong", "DETAILS": "Details", - "DEFAULT_ERROR_MESSAGE": "Application deployment failed due to an unexpected error. NMaaS support team has been notified already.<br>In order to raise an issue use the <a href=\"about?type=ISSUE_REPORT\">contact form</a>." + "DEFAULT_ERROR_MESSAGE": "Application deployment failed due to an unexpected error. nmaas support team has been notified already.<br>In order to raise an issue use the <a href=\"about?type=ISSUE_REPORT\">contact form</a>." }, "DEPLOYMENT_HISTORY": { "HEADER": "Deployment history", @@ -564,7 +565,7 @@ "ADVANCED_TAB": "Advanced", "ADDITIONAL_TAB": "Additional parameters", "STORAGE_SPACE": "Storage space", - "NMAAS_TOOLS": "NMaaS Tools Page", + "NMAAS_TOOLS": "nmaas Tools Page", "DOCUMENTATION_INFO": "Detailed field descriptions are available at", "PREVIEW": "Configuration preview" }, @@ -694,11 +695,11 @@ }, "RESET_PASSWORD": { "FORGOT_PASSWORD_BUTTON": "Forgot password", - "TEXT": "To reset your password, enter the email address you used to sign in to NMaaS.", + "TEXT": "To reset your password, enter the email address you used to sign in to nmaas.", "SUBMIT_BUTTON": "Submit", "EMAIL": "Email", "INVALID_TOKEN": "Your link has already expired. Please fill out forget password form again.", - "GO_BACK": "Go back to the NMaaS page", + "GO_BACK": "Go back to the nmaas page", "MODAL": { "HEADER": "Please check your email", "BODY": "If you have provided valid email we will send to you link for resetting password. Please be advised that you can only reset password for local account.", @@ -768,7 +769,7 @@ "UPDATE_CONFIG_WIZARD_PREVIEW_HEADER": "Update configuration wizard preview" }, "APPS_WIZARD": { - "FIRST_PAGE_MESSAGE": "You are about to fill in a request for adding new application to the NMaaS portfolio. You will be guided through a few step process of providing all necessary information about the application, its description, deployment and configuration details. Once the request is submitted it will be reviewed by administrator and either approved or rejected with a proper comment send via email. By checking the box below you confirm that you have the right to publish this application in NMaaS.", + "FIRST_PAGE_MESSAGE": "You are about to fill in a request for adding new application to the nmaas portfolio. You will be guided through a few step process of providing all necessary information about the application, its description, deployment and configuration details. Once the request is submitted it will be reviewed by administrator and either approved or rejected with a proper comment send via email. By checking the box below you confirm that you have the right to publish this application in nmaas.", "ACCEPT_RULES_CHECKBOX": "I read the general instructions above", "NEXT_BUTTON": "Next", "SUBMIT_BUTTON": "Submit", diff --git a/src/test/shell/data/i18n/fr.json b/src/test/shell/data/i18n/fr.json index a4f5ae7b7f24b50f1e44b13d8e63fd5d34e7e8cb..e259068d4fdbbc92231f78763f06d8cb9bf3cd0f 100644 --- a/src/test/shell/data/i18n/fr.json +++ b/src/test/shell/data/i18n/fr.json @@ -325,8 +325,10 @@ "LANGUAGE_DISABLED": "Désactivé", "TEST_INSTANCE": "Marquer comme instance de test NMaaS", "SEND_APP_INSTANCE_FAILURE_EMAILS": "Send emails when app instance fails to deploy", - "SEND_APP_INSTANCE_FAILURE_EMAILS_LIST": "Emails list", - "DOMAIN_SELECTION_ENABLED" : "Sélection de domaine lors de l'enregistrement" + "SEND_APP_INSTANCE_FAILURE_EMAILS_LIST": "Recipients of app deployment failed emails", + "DOMAIN_SELECTION_ENABLED" : "Sélection de domaine lors de l'enregistrement", + "BULK_DOMAINS_ALLOW_FOR_SSO_ACCOUNTS" : "Allow for creation or update of a SSO-enabled account in bulk process", + "BULK_DOMAINS_SEND_EMAIL_FOR_NEW_ACCOUNTS" : "Send notification email for new accounts created in bulk process" }, "DOMAIN_DETAILS": { "TITLE": "Détails de l'organisation", diff --git a/src/test/shell/data/i18n/pl.json b/src/test/shell/data/i18n/pl.json index 497fbc047ddda2606cc12b401c403160aa968a63..aa680650c7fa13b0f2120eb18cfb7f55d4b93a53 100644 --- a/src/test/shell/data/i18n/pl.json +++ b/src/test/shell/data/i18n/pl.json @@ -32,28 +32,28 @@ "REGISTER": "Rejestracja", "TITLE1": "Network Management as a Service", "TITLE2": "oferuje dostęp do portfolio aplikacji do zarządzania siecią uruchamianych na żądanie użytkownika w chmurze.", - "INTRO_TEXT": "Usługa NMaaS oferowana przez GÉANT obejmuje trzy aspekty: dostarczenie, zarządzanie i utrzymanie Portalu i oprogramowania NMaaS oraz wybranych aplikacji, wsparcie użytkowników w korzystaniu z systemu oraz wybranych przez siebie aplikacji jak również wparcie użytkowników planujących udostępnić swoje aplikacje w ramach NMaaS.", + "INTRO_TEXT": "Usługa nmaas oferowana przez GÉANT obejmuje trzy aspekty: dostarczenie, zarządzanie i utrzymanie Portalu i oprogramowania nmaas oraz wybranych aplikacji, wsparcie użytkowników w korzystaniu z systemu oraz wybranych przez siebie aplikacji jak również wparcie użytkowników planujących udostępnić swoje aplikacje w ramach nmaas.", "TARGET_USERS_HEADER": "Użytkownicy", - "TARGET_USERS_TEXT": "NMaaS jest dogodnym rozwiązaniem dla organizacji, które nie chcą utrzymywać własnej infrastruktury na potrzeby systemu zarządzania siecią lub/oraz planują zlecenie czynności związanych z zarządzaniem siecią firmie zewnętrznej jak również dla użytkowników, którzy szukają wysokiej jakości narzędzi do zarządzania siecią lub chcą udostępnić swoje oprogramowanie innymi.", - "MARKETPLACE_HEADER": "Sklep NMaaS", - "MARKETPLACE_TEXT": "Sklep NMaaS oferuje zestaw narzędzi open source, wpieranych przez społeczność, rozpowszechnianych za darmo i wybranych przez administratorów. W Sklepie jest również miejsce na aplikacje użytkowników - zaproponuj jaką aplikację możemy dodać.", + "TARGET_USERS_TEXT": "nmaas jest dogodnym rozwiązaniem dla organizacji, które nie chcą utrzymywać własnej infrastruktury na potrzeby systemu zarządzania siecią lub/oraz planują zlecenie czynności związanych z zarządzaniem siecią firmie zewnętrznej jak również dla użytkowników, którzy szukają wysokiej jakości narzędzi do zarządzania siecią lub chcą udostępnić swoje oprogramowanie innymi.", + "MARKETPLACE_HEADER": "Sklep nmaas", + "MARKETPLACE_TEXT": "Sklep nmaas oferuje zestaw narzędzi open source, wpieranych przez społeczność, rozpowszechnianych za darmo i wybranych przez administratorów. W Sklepie jest również miejsce na aplikacje użytkowników - zaproponuj jaką aplikację możemy dodać.", "COST_REDUCTION_HEADER": "Redukcja kosztów", - "COST_REDUCTION_TEXT": "Korzystając z NMaaS użytkownicy nie ponoszą kosztów związanych z posiadaniem oraz ryzyka związanego z koniecznością utrzymania i kontrolowania infrastruktury systemu zarządzania siecią.", + "COST_REDUCTION_TEXT": "Korzystając z nmaas użytkownicy nie ponoszą kosztów związanych z posiadaniem oraz ryzyka związanego z koniecznością utrzymania i kontrolowania infrastruktury systemu zarządzania siecią.", "SECURITY_HEADER": "Bezpieczeństwo", - "SECURITY_TEXT": "Użytkownicy korzystający z NMaaS nie muszą się martwić o bezpieczeństwo danych zbieranych z monitorowanych urządzeń. NMaaS zapewnia bezpieczne połączenie między aplikacjami działającymi w chmurze a siecią użytkownika z wykorzystaniem stosownej technologii VPN.", + "SECURITY_TEXT": "Użytkownicy korzystający z nmaas nie muszą się martwić o bezpieczeństwo danych zbieranych z monitorowanych urządzeń. nmaas zapewnia bezpieczne połączenie między aplikacjami działającymi w chmurze a siecią użytkownika z wykorzystaniem stosownej technologii VPN.", "SCALING_HEADER": "Skalowanie", "SCALING_TEXT": "Treść zostanie dodana wkrótce.", - "NMAAS_FEATURES_HEADER": "Możliwości NMaaS", + "NMAAS_FEATURES_HEADER": "Możliwości nmaas", "APP_MARKET_HEADER": "Sklep z aplikacjami", "APP_MARKET_TEXT": "W sklepie znajdziesz wybrane aplikacje do zarządzania i utrzymania Twojej infrastruktury sieciowej - wybrane przez administratorów i społeczność.", "OWN_APPS_HEADER": "Własne aplikacje", - "OWN_APPS_TEXT": "Chcesz się podzielić swoją aplikację ze społecznością? NMaaS jest otwarty na nowe aplikacje.", + "OWN_APPS_TEXT": "Chcesz się podzielić swoją aplikację ze społecznością? nmaas jest otwarty na nowe aplikacje.", "EDUGAIN_SUPPORT_HEADER": "Wsparcie dla eduGAIN", "EDUGAIN_SUPPORT_TEXT": "Nie musisz tworzyć nowego konta. Zaloguj się korzystając z konta u Twojego IdP zrzeszonego w ramach eduGAIN.", "FAST_DEPLOYMENT_HEADER": "Szybkie i proste uruchomienie", "FAST_DEPLOYMENT_TEXT": "Od momentu wysłania żądania uruchomienia aplikacje są dostępne w ciągu kilku minut z podstawową konfiguracją wprowadzoną w prostym kreatorze.", "WEB_PORTAL_HEADER": "Nowoczesny interfejs użytkownika", - "WEB_PORTAL_TEXT": "Dostęp do funkcjonalności NMaaS jest realizowany przez nowoczesny, reaktywny i przyjazny portal webowy.", + "WEB_PORTAL_TEXT": "Dostęp do funkcjonalności nmaas jest realizowany przez nowoczesny, reaktywny i przyjazny portal webowy.", "KUBERNETES_HEADER": "Kubernetes", "KUBERNETES_TEXT": "Aplikacje użytkowników są uruchamiane w klastrze Kubernetesa skonfigurowanym na dedykowanej infrastrukturze fizycznej w celu zapewnienia wysokiej wydajności i niezawodności.", "TECHNOLOGIES_USED_HEADER": "Użyte technologie", @@ -94,8 +94,8 @@ "USER_DISABLED_MESSAGE": "Użytkownik jest nieaktywny" }, "TEST_INSTANCE_MODAL": { - "HEADER": "Instancja testowa NMaaS", - "BODY": "Pamiętaj, że jest to testowa instancja NMaaS. Izolacja użytkowników oraz środki zabezpieczenia danych nie są tak rygorystyczne, jak w przypadku instancji produkcyjnej. Nie używaj tej instancji do monitorowania rzeczywistych urządzeń.", + "HEADER": "Instancja testowa nmaas", + "BODY": "Pamiętaj, że jest to testowa instancja nmaas. Izolacja użytkowników oraz środki zabezpieczenia danych nie są tak rygorystyczne, jak w przypadku instancji produkcyjnej. Nie używaj tej instancji do monitorowania rzeczywistych urządzeń.", "OK_BUTTON": "OK" }, "PROVIDE_SSH_KEY_MODAL": { @@ -323,10 +323,12 @@ "LANGUAGE_SUPPORT": "Aktywowane języki", "LANGUAGE_ENABLED": "Aktywny", "LANGUAGE_DISABLED": "Nieaktywny", - "TEST_INSTANCE": "Oznacz jako instancję testową NMaaS", + "TEST_INSTANCE": "Oznacz jako instancję testową nmaas", "SEND_APP_INSTANCE_FAILURE_EMAILS": "Wyślij email gdy instalacja aplikacji nie powiedzie się", - "SEND_APP_INSTANCE_FAILURE_EMAILS_LIST": "Lista adresów email", - "DOMAIN_SELECTION_ENABLED" : "Wybór domeny podczas rejestracji" + "SEND_APP_INSTANCE_FAILURE_EMAILS_LIST": "Odbiorcy wiadomości email o problemie z instalacją aplikacji", + "DOMAIN_SELECTION_ENABLED" : "Wybór domeny podczas rejestracji", + "BULK_DOMAINS_ALLOW_FOR_SSO_ACCOUNTS" : "Allow for creation or update of a SSO-enabled account in bulk process", + "BULK_DOMAINS_SEND_EMAIL_FOR_NEW_ACCOUNTS" : "Send notification email for new accounts created in bulk process" }, "DOMAIN_DETAILS": { "TITLE": "Szczegóły domeny", @@ -386,7 +388,7 @@ } }, "GIT_INFO": { - "HEADER": "Informacje o wersji NMaaS", + "HEADER": "Informacje o wersji nmaas", "VERSION": "Wersja", "BUILD_TIME": "Ostatnie budowanie", "LAST_COMMIT": "Ostatni commit", @@ -550,7 +552,7 @@ "STATE": "Stan", "DEFAULT_ERROR_STATE": "Coś poszło nie tak", "DETAILS": "Szczegóły", - "DEFAULT_ERROR_MESSAGE": "Aktywacja aplikacji nie powiodła się z powodu nieoczekiwanego błędu. Zespół NMaaS został już powiadomiony.<br>Aby zgłosić problem, skorzystaj z <a href=\"about?type=ISSUE_REPORT\">formularza kontaktowego</a>." + "DEFAULT_ERROR_MESSAGE": "Aktywacja aplikacji nie powiodła się z powodu nieoczekiwanego błędu. Zespół nmaas został już powiadomiony.<br>Aby zgłosić problem, skorzystaj z <a href=\"about?type=ISSUE_REPORT\">formularza kontaktowego</a>." }, "DEPLOYMENT_HISTORY": { "HEADER": "Historia uruchomienia aplikacji", @@ -563,7 +565,7 @@ "ADVANCED_TAB": "Zaawansowana", "ADDITIONAL_TAB": "Rozszerzona", "STORAGE_SPACE": "Przestrzeń dyskowa", - "NMAAS_TOOLS": "NMaaS Tools Page", + "NMAAS_TOOLS": "nmaas Tools Page", "DOCUMENTATION_INFO": "Detailed field descriptions are available at", "PREVIEW": "Podgląd konfiguracji" }, @@ -618,17 +620,17 @@ "APP_UPGRADE_FAILED": "Aktualizacja aplikacji nie powiodła się" }, "USER_FRIENDLY": { - "REQUESTED": "NMaaS przetwarza Twoje żądanie", - "VALIDATION": "NMaaS weryfikuje dostępne zasoby", - "PREPARATION": "NMaaS przygotowuje środowisko wdrażania dla Twojej aplikacji", - "CONNECTING": "NMaaS nawiązuje bezpieczne połączenie", + "REQUESTED": "nmaas przetwarza Twoje żądanie", + "VALIDATION": "nmaas weryfikuje dostępne zasoby", + "PREPARATION": "nmaas przygotowuje środowisko wdrażania dla Twojej aplikacji", + "CONNECTING": "nmaas nawiązuje bezpieczne połączenie", "CONFIGURATION_AWAITING": "Twoja aplikacja została pomyślnie zainstalowana. <br>Teraz możesz wprowadzić pierwszą konfigurację korzystając z akcji <i>Konfiguruj</i>", "DEPLOYING": "Aplikacja jest aktywowana. Ten proces może potrwać do kilku minut. <br>Zostaniesz powiadomiony e-mailem gdy aplikacja będzie gotowa", "RUNNING": "Twoja aplikacja jest aktywna. <br>Możesz teraz uzyskać dostęp do swojej aplikacji korzystając z opcji <i>Dostęp</i> z menu <i>Akcje</i>.", "UNDEPLOYING": "Aplikacja jest deaktywowana. Ten proces może potrwać do kilku minut", "DONE": "Aplikacja została pomyślnie deaktywowana", "FAILURE": "", - "UNKNOWN": "Nieznany stan aplikacji - skontaktuj się z zespołem NMaaS za pomocą formularza kontaktowego dostępnego na podstronie \"O nas\"", + "UNKNOWN": "Nieznany stan aplikacji - skontaktuj się z zespołem nmaas za pomocą formularza kontaktowego dostępnego na podstronie \"O nas\"", "REMOVED": "Aplikacja została pomyślnie usunięta" }, "SHOW_VERSIONS_LABEL": "Pokaż dostępne wersje", @@ -697,7 +699,7 @@ "SUBMIT_BUTTON": "Prześlij", "EMAIL": "Email", "INVALID_TOKEN": "Twój link wygasł. Proszę ponownie wypełnij formularz resetowania hasła.", - "GO_BACK": "Powrót do strony NMaaS", + "GO_BACK": "Powrót do strony nmaas", "MODAL": { "HEADER": "Proszę sprawdź skrzynkę pocztową", "BODY": "Jeśli wprowadziłeś poprawny adres mailowy, link do zresetowania hasła został przesłany. Reset hasła dotyczy jedynie kont lokalnych.", @@ -767,7 +769,7 @@ "UPDATE_CONFIG_WIZARD_PREVIEW_HEADER": "Podgląd formularza do aktualizacji konfiguracji aplikacji" }, "APPS_WIZARD": { - "FIRST_PAGE_MESSAGE": "You are about to fill in a request for adding new application to the NMaaS portfolio. You will be guided through a few step process of providing all necessary information about the application, its description, deployment and configuration details. Once the request is submitted it will be reviewed by administrator and either approved or rejected with a proper comment send via email. By checking the box below you confirm that you have the right to publish this application in NMaaS.", + "FIRST_PAGE_MESSAGE": "You are about to fill in a request for adding new application to the nmaas portfolio. You will be guided through a few step process of providing all necessary information about the application, its description, deployment and configuration details. Once the request is submitted it will be reviewed by administrator and either approved or rejected with a proper comment send via email. By checking the box below you confirm that you have the right to publish this application in nmaas.", "ACCEPT_RULES_CHECKBOX": "Zapoznałem się z instrukcją powyżej", "NEXT_BUTTON": "Następne", "SUBMIT_BUTTON": "Wyślij", @@ -800,7 +802,7 @@ "UPDATE_CONFIG_WIZARD_TEMPLATE_LABEL": "Formularz do aktualizacji konfiguracji aplikacji", "NEW_APP_MODAL": { "HEADER": "Nowa aplikacja została wysłana poprawnie", - "BODY": "Dziękujemy za przesłanie nowej aplikacji. Twoje zgłoszenie musi zostać teraz sprawdzona przez zespół NMaaS. To może chwile zająć.", + "BODY": "Dziękujemy za przesłanie nowej aplikacji. Twoje zgłoszenie musi zostać teraz sprawdzona przez zespół nmaas. To może chwile zająć.", "BACK_TO_APP_MANAGEMENT_BUTTON": "Powrót" }, "EDIT_APP_MODAL": { @@ -820,23 +822,23 @@ "ACCEPT_RULES_TOOLTIP": "Musisz zaakceptować zasady korzystania!", "NAME_TOOLTIP": "Oficjalna nazwa aplikacji.", "VERSION_TOOLTIP": "Numer bieżącego wydania aplikacji.", - "LICENSE_TOOLTIP": "Podaj nazwę licencji, na której aplikacja została wydana. Upewnij się że licencja ta pozwala na wykorzystanie aplikacji w systemie NMaaS.", + "LICENSE_TOOLTIP": "Podaj nazwę licencji, na której aplikacja została wydana. Upewnij się że licencja ta pozwala na wykorzystanie aplikacji w systemie nmaas.", "LICENSE_URL_TOOLTIP": "Podaj link do opisu licencji, aby użytkownicy mogli uzyskać więcej informacji o niej i prawach do wykorzystania aplikacji.", "PROJECT_WEBSITE_TOOLTIP": "Podaj link do strony projektu, aby użytkownicy mogli uzyskać więcej informacji o całym projekcie.", "SOURCE_CODE_TOOLTIP": "Link do kodu źródłowego na przykład github.com/project.", "PROJECT_ISSUES_TOOLTIP": "Podaj link do issues projektu, aby użytkownicy mogli łatwo znaleźć sposób na zgłoszenie problemu z tym narzędziem.", "TAGS_TOOLTIP": "Wybierz tagi, które najlepiej opisują aplikacje. Pomoże to użytkownikom w bardziej efektywnym wyszukiwaniu aplikacji, których potrzebują.", "NEW_TAGS_TOOLTIP": "Dodaj tagi, jeśli uważasz że obecnie istniejące nie pasują do Twojej aplikacji. Wpisz nazwę tagu i wciśnij enter aby dodać nowy tag.", - "BRIEF_DESCRIPTION_TOOLTIP": "Podaj krótki opis aplikacji. Tekst ten będzie widoczny na stronie marketu NMaaS.", + "BRIEF_DESCRIPTION_TOOLTIP": "Podaj krótki opis aplikacji. Tekst ten będzie widoczny na stronie marketu nmaas.", "FULL_DESCRIPTION_TOOLTIP": "Podaj pełny opis aplikacji. Tekst ten będzie widoczny w widoku szczegółowym aplikacji.", - "CHART_NAME_TOOLTIP": "Podaj nazwę chart, który będzie wykorzystywany w systemie NMaaS.", - "CHART_VERSION_TOOLTIP": "Podaj wersję Helm chart, która będzie wykorzystywana w systemie NMaaS.", + "CHART_NAME_TOOLTIP": "Podaj nazwę chart, który będzie wykorzystywany w systemie nmaas.", + "CHART_VERSION_TOOLTIP": "Podaj wersję Helm chart, która będzie wykorzystywana w systemie nmaas.", "HELM_CHART_REPOSITORY_NAME_TOOLTIP": "Podaj nazwę repozytorium Helm Chart", "HELM_CHART_REPOSITORY_URL_TOOLTIP": "Podaj adres URL repozytorium Helm Chart", "MAIN_DEPLOYMENT_NAME_TOOLTIP": "Podaj nazwę głównego komponentu instalowanego w ramach chartu", "DEFAULT_STORAGE_SPACE_TOOLTIP": "Podaj domyślną przestrzeń dyskową (w gigabajtach).", - "DEPLOY_PARAMETER_TOOLTIP": "Niektóre aplikacje wykorzystują globalne ustawienia systemu NMaaS. Jeśli chcesz wykorzystać jedną z nich podaj klucz, pod którym powinniśmy podać te ustawienia.", - "REPOSITORY_REQUIRED_TOOLTIP": "NMaaS może wykorzystać GitLab aby zachować konfiguracje każdej instancji.", + "DEPLOY_PARAMETER_TOOLTIP": "Niektóre aplikacje wykorzystują globalne ustawienia systemu nmaas. Jeśli chcesz wykorzystać jedną z nich podaj klucz, pod którym powinniśmy podać te ustawienia.", + "REPOSITORY_REQUIRED_TOOLTIP": "nmaas może wykorzystać GitLab aby zachować konfiguracje każdej instancji.", "DISABLED_NEXT_BUTTON_TOOLTIP": "Musisz wypełnić wszystkie wymagane pola!", "DEPLOY_PARAMETERS_DROPDOWN": "Wybierz parametry globalne", "CONFIG_FILENAME_LABEL": "Nazwa pliku konfiguracyjnego", @@ -855,8 +857,8 @@ "BASIC_APP_INFO_STEP_INFO": "Basic set of information about the application. Application can be filtered by tag. Select an existing tag or create a new one if none is suitable.", "LOGO_AND_SCREENSHOTS_STEP_INFO": "Application logo is displayed in various views in the application. A set of screenshots should give a nice overview of the application's UI.", "APP_DESCRIPTIONS_STEP_INFO": "Brief and full descriptions of the application should provide a basic (limited length) and comprehensive information about the nature and purpose of the application. Descriptions should be provided in as many supported languages as possible.", - "APP_DEPLOYMENT_SPEC_STEP_INFO": "Applications offered through NMaaS are deployed in Kubernetes as Helm charts. Basic information about the chart is required with additional set of optional parameters to be passed during the installation process.", - "CONFIG_TEMPLATES_STEP_INFO": "NMaaS applications are populated with basic configuration parameters provided by users using a wizard. The list of configuration files (with parameterized content) to be used and loaded by the application at startup should be provided. Those need to be complemented with the definition of the wizard component dedicated for particular application allowing user to provide all necessary parameters used to populate configuration files. ", + "APP_DEPLOYMENT_SPEC_STEP_INFO": "Applications offered through nmaas are deployed in Kubernetes as Helm charts. Basic information about the chart is required with additional set of optional parameters to be passed during the installation process.", + "CONFIG_TEMPLATES_STEP_INFO": "nmaas applications are populated with basic configuration parameters provided by users using a wizard. The list of configuration files (with parameterized content) to be used and loaded by the application at startup should be provided. Those need to be complemented with the definition of the wizard component dedicated for particular application allowing user to provide all necessary parameters used to populate configuration files. ", "BASIC_AUTH_LABEL": "Wymaga podstawowego uwierzytelnienia", "BASIC_AUTH_TOOLTIP": "Możesz dodać podstawowe uwierzytelnienie do Twojej aplikacji zaznaczając tą opcję.", "TERMS_ACCEPTANCE_LABEL": "Terms acceptance required", @@ -881,8 +883,8 @@ "CONFIG_UPDATE_ENABLED": "Zezwól na aktualizowanie konfiguracji", "STATIC_GLOBAL_DEPLOY_PARAMETERS": "Static global deploy parameters", "DEPLOY_PARAMETERS": "Global deploy parameters", - "PROJECT_NMAAS_DOCUMENTATION_LABEL": "NMaaS Documentation URL", - "PROJECT_NMAAS_DOCUMENTATION_TOOLTIP": "Provide URL to NMaaS Documentatnion (NMaaS Tools)", + "PROJECT_NMAAS_DOCUMENTATION_LABEL": "nmaas Documentation URL", + "PROJECT_NMAAS_DOCUMENTATION_TOOLTIP": "Provide URL to nmaas Documentatnion (nmaas Tools)", "RAW_JSON": "Format JSON", "FORM_BUILDER": "Tworzenie formularza", "FORM_DEFINITION": "Definicja formularza", @@ -938,8 +940,8 @@ "ABOUT": { "CONTACT_TITLE": "Skontaktuj się z nami", "CHANGELOG_TITLE": "Aktualna wersja oprogramowanie oraz wykaz zmian", - "CONTACT_DESC": "Formularz kontaktowy umożliwia łatwy kontakt z zespołem NMaaS. Wybierz typ formularza, który jest najbardziej odpowiedni dla Twojego zgłoszenia.", - "CHANGELOG_DESC": "Poniżej znajdziesz szczegółowe informacje o aktualnej wersji NMaaS oraz podsumowanie zmian wprowadzonych w poprzednich wersjach oprogramowania." + "CONTACT_DESC": "Formularz kontaktowy umożliwia łatwy kontakt z zespołem nmaas. Wybierz typ formularza, który jest najbardziej odpowiedni dla Twojego zgłoszenia.", + "CHANGELOG_DESC": "Poniżej znajdziesz szczegółowe informacje o aktualnej wersji nmaas oraz podsumowanie zmian wprowadzonych w poprzednich wersjach oprogramowania." }, "CHANGELOG": { "CHANGELOG_LAST": "Ostatnia wersja", @@ -969,17 +971,17 @@ "DOMAIN_CODENAME_DESCRIPTION": "Skrócona nazwa domeny (do 12 znaków)", "DOMAIN_CODENAME_ERROR": "Niewłaściwy kod domeny", "JUSTIFICATION": "Uzasadnienie prośby", - "JUSTIFICATION_DESCRIPTION": "Krótkie uzasadnienie prośby zawierajace informację o zamierzonym sposobie wykorzystania usługi NMaaS", + "JUSTIFICATION_DESCRIPTION": "Krótkie uzasadnienie prośby zawierajace informację o zamierzonym sposobie wykorzystania usługi nmaas", "VPN_OPTION": "Rozwiązanie VPN", "VPN_OPTION_DESCRIPTION": "Dwa rozwiązania VPN są aktualnie wpierane. Wybierz preferowaną opcję", "VPN_USER_IP": "Public IP for VPN tunnel setup", "VPN_USER_IP_DESCRIPTION": "Public IP for VPN tunnel termination on user end", "VPN_USER_SUBNETS": "Monitored user subnets", - "VPN_USER_SUBNETS_DESCRIPTION": "List of monitored subnets that should be reachable from your application deployed on NMaaS", + "VPN_USER_SUBNETS_DESCRIPTION": "List of monitored subnets that should be reachable from your application deployed on nmaas", "VPN_USER_SUBNETS_ADD": "Nowa podsieć", "VPN_USER_SUBNETS_SUBNET": "Podsieć", "ADDITIONAL_VPN_SUBNETS": "Dodatkowe podsieci", - "ADDITIONAL_VPN_SUBNETS_DESCRIPTION": "Additional IP ranges that should be reachable from your NMaaS applications, outside those specified above (e.g. some public services)", + "ADDITIONAL_VPN_SUBNETS_DESCRIPTION": "Additional IP ranges that should be reachable from your nmaas applications, outside those specified above (e.g. some public services)", "TECH_CONTACT": "Kontakt techniczny", "TECH_CONTACT_DESCRIPTION": "Person to be contacted to further discuss technical matters related with VPN setup", "TECH_CONTACT_PLACEHOLDER": "Nazwisko oraz adres email", @@ -994,7 +996,7 @@ }, "MODAL": { "TITLE": "Mail został wysłany", - "MESSAGE": "Zespół NMaaS odpowie jak tylko będzie to możliwe.", + "MESSAGE": "Zespół nmaas odpowie jak tylko będzie to możliwe.", "CLOSE_BUTTON": "Zamknij" }, "SELECT_CATEGORY": "Wybierz kategorię",