diff options
76 files changed, 680 insertions, 658 deletions
diff --git a/app/assets/javascripts/blob/notebook/index.js b/app/assets/javascripts/blob/notebook/index.js index 071022a9a75..35634d63e4a 100644 --- a/app/assets/javascripts/blob/notebook/index.js +++ b/app/assets/javascripts/blob/notebook/index.js @@ -75,10 +75,10 @@ export default () => { class="text-center" v-if="error"> <span v-if="loadError"> - An error occurred whilst loading the file. Please try again later. + An error occurred while loading the file. Please try again later. </span> <span v-else> - An error occurred whilst parsing the file. + An error occurred while parsing the file. </span> </p> </div> diff --git a/app/assets/javascripts/blob/pdf/index.js b/app/assets/javascripts/blob/pdf/index.js index 7d5f487c4ba..e9a0b3979e6 100644 --- a/app/assets/javascripts/blob/pdf/index.js +++ b/app/assets/javascripts/blob/pdf/index.js @@ -47,10 +47,10 @@ export default () => { class="text-center" v-if="error"> <span v-if="loadError"> - An error occurred whilst loading the file. Please try again later. + An error occurred while loading the file. Please try again later. </span> <span v-else> - An error occurred whilst decoding the file. + An error occurred while decoding the file. </span> </p> </div> diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js index 70a966afa66..76e09f96bd6 100644 --- a/app/assets/javascripts/ide/stores/actions/file.js +++ b/app/assets/javascripts/ide/stores/actions/file.js @@ -89,7 +89,7 @@ export const getFileData = ( .catch(() => { commit(types.TOGGLE_LOADING, { entry: file }); dispatch('setErrorMessage', { - text: __('An error occurred whilst loading the file.'), + text: __('An error occurred while loading the file.'), action: payload => dispatch('getFileData', payload).then(() => dispatch('setErrorMessage', null)), actionText: __('Please try again'), @@ -136,7 +136,7 @@ export const getRawFileData = ({ state, commit, dispatch, getters }, { path }) = }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occurred whilst loading the file content.'), + text: __('An error occurred while loading the file content.'), action: payload => dispatch('getRawFileData', payload).then(() => dispatch('setErrorMessage', null)), actionText: __('Please try again'), diff --git a/app/assets/javascripts/ide/stores/actions/merge_request.js b/app/assets/javascripts/ide/stores/actions/merge_request.js index 806ec38430c..6144452c80b 100644 --- a/app/assets/javascripts/ide/stores/actions/merge_request.js +++ b/app/assets/javascripts/ide/stores/actions/merge_request.js @@ -58,7 +58,7 @@ export const getMergeRequestData = ( }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occurred whilst loading the merge request.'), + text: __('An error occurred while loading the merge request.'), action: payload => dispatch('getMergeRequestData', payload).then(() => dispatch('setErrorMessage', null), @@ -91,7 +91,7 @@ export const getMergeRequestChanges = ( }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occurred whilst loading the merge request changes.'), + text: __('An error occurred while loading the merge request changes.'), action: payload => dispatch('getMergeRequestChanges', payload).then(() => dispatch('setErrorMessage', null), @@ -125,7 +125,7 @@ export const getMergeRequestVersions = ( }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occurred whilst loading the merge request version data.'), + text: __('An error occurred while loading the merge request version data.'), action: payload => dispatch('getMergeRequestVersions', payload).then(() => dispatch('setErrorMessage', null), diff --git a/app/assets/javascripts/ide/stores/actions/project.js b/app/assets/javascripts/ide/stores/actions/project.js index e206f9bee9e..d94dccad962 100644 --- a/app/assets/javascripts/ide/stores/actions/project.js +++ b/app/assets/javascripts/ide/stores/actions/project.js @@ -152,7 +152,7 @@ export const openBranch = ({ dispatch, state, getters }, { projectId, branchId, () => new Error( sprintf( - __('An error occurred whilst getting files for - %{branchId}'), + __('An error occurred while getting files for - %{branchId}'), { branchId: `<strong>${_.escape(projectId)}/${_.escape(branchId)}</strong>`, }, diff --git a/app/assets/javascripts/ide/stores/actions/tree.js b/app/assets/javascripts/ide/stores/actions/tree.js index ba85194b910..828e4ed5eb9 100644 --- a/app/assets/javascripts/ide/stores/actions/tree.js +++ b/app/assets/javascripts/ide/stores/actions/tree.js @@ -77,7 +77,7 @@ export const getFiles = ({ state, commit, dispatch }, payload = {}) => }) .catch(e => { dispatch('setErrorMessage', { - text: __('An error occurred whilst loading all the files.'), + text: __('An error occurred while loading all the files.'), action: actionPayload => dispatch('getFiles', actionPayload).then(() => dispatch('setErrorMessage', null)), actionText: __('Please try again'), diff --git a/app/assets/javascripts/ide/stores/modules/commit/actions.js b/app/assets/javascripts/ide/stores/modules/commit/actions.js index e89ed49318b..73c1bc8b582 100644 --- a/app/assets/javascripts/ide/stores/modules/commit/actions.js +++ b/app/assets/javascripts/ide/stores/modules/commit/actions.js @@ -218,7 +218,7 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState, roo dispatch( 'setErrorMessage', { - text: __('An error occurred whilst committing your changes.'), + text: __('An error occurred while committing your changes.'), action: () => dispatch('commitChanges').then(() => dispatch('setErrorMessage', null, { root: true }), diff --git a/app/assets/javascripts/ide/stores/modules/pipelines/actions.js b/app/assets/javascripts/ide/stores/modules/pipelines/actions.js index 51cf4dede42..9862c556c2e 100644 --- a/app/assets/javascripts/ide/stores/modules/pipelines/actions.js +++ b/app/assets/javascripts/ide/stores/modules/pipelines/actions.js @@ -28,7 +28,7 @@ export const receiveLatestPipelineError = ({ commit, dispatch }, err) => { dispatch( 'setErrorMessage', { - text: __('An error occurred whilst fetching the latest pipeline.'), + text: __('An error occurred while fetching the latest pipeline.'), action: () => dispatch('forcePipelineRequest').then(() => dispatch('setErrorMessage', null, { root: true }), @@ -84,7 +84,7 @@ export const receiveJobsError = ({ commit, dispatch }, stage) => { dispatch( 'setErrorMessage', { - text: __('An error occurred whilst loading the pipelines jobs.'), + text: __('An error occurred while loading the pipelines jobs.'), action: payload => dispatch('fetchJobs', payload).then(() => dispatch('setErrorMessage', null, { root: true }), @@ -123,7 +123,7 @@ export const receiveJobTraceError = ({ commit, dispatch }) => { dispatch( 'setErrorMessage', { - text: __('An error occurred whilst fetching the job trace.'), + text: __('An error occurred while fetching the job trace.'), action: () => dispatch('fetchJobTrace').then(() => dispatch('setErrorMessage', null, { root: true })), actionText: __('Please try again'), diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index b03ee12aef3..2c51252be39 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -370,7 +370,9 @@ export default { > <gl-dropdown id="monitor-environments-dropdown" - class="mb-0 d-flex js-environments-dropdown" + ref="monitorEnvironmentsDropdown" + data-qa-selector="environments_dropdown" + class="mb-0 d-flex" toggle-class="dropdown-menu-toggle" :text="currentEnvironmentName" :disabled="environments.length === 0" diff --git a/app/graphql/types/commit_type.rb b/app/graphql/types/commit_type.rb index 87f84ec576f..994377cabd4 100644 --- a/app/graphql/types/commit_type.rb +++ b/app/graphql/types/commit_type.rb @@ -12,7 +12,7 @@ module Types description: 'ID (global ID) of the commit' field :sha, type: GraphQL::STRING_TYPE, null: false, description: 'SHA1 ID of the commit' - field :title, type: GraphQL::STRING_TYPE, null: true, + field :title, type: GraphQL::STRING_TYPE, null: true, calls_gitaly: true, description: 'Title of the commit message' field :description, type: GraphQL::STRING_TYPE, null: true, description: 'Description of the commit message' diff --git a/db/fixtures/development/26_container_images.rb b/db/fixtures/development/26_container_images.rb new file mode 100644 index 00000000000..5b5879673b9 --- /dev/null +++ b/db/fixtures/development/26_container_images.rb @@ -0,0 +1,65 @@ +# frozen_string_literal: true + +class Gitlab::Seeder::ContainerImages + attr_reader :tmp_dir, :project, :images_count + + DOCKER_FILE_CONTENTS = <<~EOS + FROM scratch + ARG tag + ENV tag=$tag + EOS + + def initialize(project, images_count) + @project = project + @images_count = images_count + initialize_tmp_dir + end + + def seed! + images_count.times do |i| + image_path = "#{project.container_registry_url}:tag_#{i}" + build_image(image_path) + push_image(image_path) + puts '.' + end + ensure + FileUtils.remove_entry tmp_dir + end + + private + + def build_image(image_path) + system(*%W[docker build -t #{image_path} --build-arg tag=gitlab_container_image_seed .], chdir: @tmp_dir) + end + + def push_image(image_path) + system(*%W[docker push #{image_path}], chdir: @tmp_dir) + end + + def initialize_tmp_dir + @tmp_dir = Dir.mktmpdir('gitlab_seeder_container_images') + + File.write(File.join(@tmp_dir, 'Dockerfile'), DOCKER_FILE_CONTENTS) + end +end + +Gitlab::Seeder.quiet do + flag = 'SEED_CONTAINER_IMAGES' + + if ENV[flag] + admin_user = User.admins.first + images_count = Integer(ENV[flag]) + + Project.not_mass_generated.visible_to_user(admin_user).sample(1).each do |project| + puts "\nSeeding #{images_count} container images to the '#{project.full_path}' project." + + seeder = Gitlab::Seeder::ContainerImages.new(project, images_count) + seeder.seed! + rescue => e + puts "\nSeeding container images failed with #{e.message}." + puts "Make sure that the registry is running (https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/howto/registry.md) and that Docker CLI (https://www.docker.com/products/docker-desktop) is installed." + end + else + puts "Skipped. Use the `#{flag}` environment variable to seed container images to the registry." + end +end diff --git a/doc/administration/auth/how_to_configure_ldap_gitlab_ee/index.md b/doc/administration/auth/how_to_configure_ldap_gitlab_ee/index.md index f0eb6c5180b..eab093c1949 100644 --- a/doc/administration/auth/how_to_configure_ldap_gitlab_ee/index.md +++ b/doc/administration/auth/how_to_configure_ldap_gitlab_ee/index.md @@ -108,7 +108,7 @@ gitlab_rails['ldap_servers'] = { ## Conclusion Integration of GitLab with Active Directory (LDAP) reduces the complexity of user management. -It has the advantage of improving user permission controls, whilst easing the deployment of GitLab into an existing [IT environment](https://www.techopedia.com/definition/29199/it-infrastructure). GitLab EE offers advanced group management and multiple LDAP servers. +It has the advantage of improving user permission controls, while easing the deployment of GitLab into an existing [IT environment](https://www.techopedia.com/definition/29199/it-infrastructure). GitLab EE offers advanced group management and multiple LDAP servers. With the assistance of the [GitLab Support](https://about.gitlab.com/support/) team, setting up GitLab with an existing AD/LDAP solution will be a smooth and painless process. diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md index d716325f332..672ae5e7b27 100644 --- a/doc/development/ee_features.md +++ b/doc/development/ee_features.md @@ -835,7 +835,7 @@ information on managing page-specific JavaScript within EE. To separate Vue template differences we should [async import the components](https://vuejs.org/v2/guide/components-dynamic-async.html#Async-Components). -Doing this allows for us to load the correct component in EE whilst in CE +Doing this allows for us to load the correct component in EE while in CE we can load a empty component that renders nothing. This code **should** exist in the CE repository as well as the EE repository. diff --git a/doc/development/fe_guide/droplab/plugins/ajax.md b/doc/development/fe_guide/droplab/plugins/ajax.md index 4b76b207d88..77ba6f739e6 100644 --- a/doc/development/fe_guide/droplab/plugins/ajax.md +++ b/doc/development/fe_guide/droplab/plugins/ajax.md @@ -33,6 +33,6 @@ droplab.addHook(trigger, list, [Ajax], { ``` Optionally you can set `loadingTemplate` to a HTML string. This HTML string will -replace the dropdown list whilst the request is pending. +replace the dropdown list while the request is pending. Additionally, you can set `onError` to a function to catch any XHR errors. diff --git a/doc/install/azure/index.md b/doc/install/azure/index.md index 5baaec79048..764b95299cf 100644 --- a/doc/install/azure/index.md +++ b/doc/install/azure/index.md @@ -105,7 +105,7 @@ ahead and select this one, but please choose the size which best meets your own  -> **Note:** be aware that whilst your VM is active (known as "allocated"), it will incur +> **Note:** be aware that while your VM is active (known as "allocated"), it will incur "compute charges" which, ultimately, you will be billed for. So, even if you're using the free trial credits, you'll likely want to learn [how to properly shutdown an Azure VM to save money](https://buildazure.com/properly-shutdown-azure-vm-to-save-money/). diff --git a/lib/banzai/filter/issuable_state_filter.rb b/lib/banzai/filter/issuable_state_filter.rb index 9dfd77b1759..f9d8bf8a1fa 100644 --- a/lib/banzai/filter/issuable_state_filter.rb +++ b/lib/banzai/filter/issuable_state_filter.rb @@ -3,7 +3,7 @@ module Banzai module Filter # HTML filter that appends state information to issuable links. - # Runs as a post-process filter as issuable state might change whilst + # Runs as a post-process filter as issuable state might change while # Markdown is in the cache. # # This filter supports cross-project references. diff --git a/locale/ar_SA/gitlab.po b/locale/ar_SA/gitlab.po index 322db0c0322..232009dc64b 100644 --- a/locale/ar_SA/gitlab.po +++ b/locale/ar_SA/gitlab.po @@ -1722,37 +1722,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19949,4 +19949,3 @@ msgstr[5] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/bg/gitlab.po b/locale/bg/gitlab.po index 0b6e55cab8e..534ddb38724 100644 --- a/locale/bg/gitlab.po +++ b/locale/bg/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/bn_BD/gitlab.po b/locale/bn_BD/gitlab.po index 291dca380fc..b963e16ce78 100644 --- a/locale/bn_BD/gitlab.po +++ b/locale/bn_BD/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/bn_IN/gitlab.po b/locale/bn_IN/gitlab.po index f95d71eec5d..8dff26ab1ac 100644 --- a/locale/bn_IN/gitlab.po +++ b/locale/bn_IN/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/ca_ES/gitlab.po b/locale/ca_ES/gitlab.po index a30f508f4b6..d90f8eb7f47 100644 --- a/locale/ca_ES/gitlab.po +++ b/locale/ca_ES/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/cs_CZ/gitlab.po b/locale/cs_CZ/gitlab.po index b9fd29985ae..9e3f0c86f43 100644 --- a/locale/cs_CZ/gitlab.po +++ b/locale/cs_CZ/gitlab.po @@ -1632,37 +1632,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19735,4 +19735,3 @@ msgstr[3] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/cy_GB/gitlab.po b/locale/cy_GB/gitlab.po index c09b3a6695c..f0070ff256d 100644 --- a/locale/cy_GB/gitlab.po +++ b/locale/cy_GB/gitlab.po @@ -1722,37 +1722,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19949,4 +19949,3 @@ msgstr[5] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/da_DK/gitlab.po b/locale/da_DK/gitlab.po index 8747bc5c3c2..002a870e684 100644 --- a/locale/da_DK/gitlab.po +++ b/locale/da_DK/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/de/gitlab.po b/locale/de/gitlab.po index 3103adacbf2..b5ff807a229 100644 --- a/locale/de/gitlab.po +++ b/locale/de/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "Beim Aktualisieren des Kommentars ist ein Fehler aufgetreten" msgid "An error occurred while validating username" msgstr "Beim Validieren des Benutzernamens ist ein Fehler aufgetreten" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "Beim Committen deiner Änderungen ist ein Fehler aufgetreten." -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "Beim Abrufen der neuesten Pipeline ist ein Fehler aufgetreten." -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "Beim Abrufen der Dateien für - %{branchId} ist ein Fehler aufgetreten" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "Beim Laden aller Dateien ist ein Fehler aufgetreten." -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "Beim Laden des Dateiinhalts ist ein Fehler aufgetreten." -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "Beim Laden der Datei ist ein Fehler aufgetreten." -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "Beim Laden der Merge-Request-Änderungen ist ein Fehler aufgetreten." -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "Beim Laden der Versionsdaten des Merge-Requests ist ein Fehler aufgetreten." -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "Beim Laden des Merge-Requests ist ein Fehler aufgetreten." -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "Beim Laden der Pipeline-Jobs ist ein Fehler aufgetreten." msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "innerhalb %d Minuten " msgid "yaml invalid" msgstr "" - diff --git a/locale/el_GR/gitlab.po b/locale/el_GR/gitlab.po index e1f4ab78994..e65b8a3f461 100644 --- a/locale/el_GR/gitlab.po +++ b/locale/el_GR/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/eo/gitlab.po b/locale/eo/gitlab.po index e7ac98e864a..91989a1ffac 100644 --- a/locale/eo/gitlab.po +++ b/locale/eo/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/es/gitlab.po b/locale/es/gitlab.po index 851123d9c35..3afb9558c71 100644 --- a/locale/es/gitlab.po +++ b/locale/es/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "Se ha producido un error al actualizar el comentario" msgid "An error occurred while validating username" msgstr "Se ha producido un error al validar el nombre de usuario" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "Se ha producido un error al hacer commit de sus cambios." -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "Se ha producido un error al obtener el log del trabajo." -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "Se ha producido un error al obtener el último pipeline." -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "Se ha producido un error al obtener los archivos de - %{branchId}" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "Se ha producido un error al cargar todos los archivos." -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "Se ha producido un error al cargar el contenido del fichero." -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "Se ha producido un error al cargar el archivo." -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "Se ha producido un error al cargar los cambios del merge request." -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "Se ha producido un error al cargar los datos de versión del merge request." -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "Se ha producido un error al cargar el merge request." -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "Se ha producido un error al cargar los trabajos de lo pipelines." msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "dentro de %d minutos " msgid "yaml invalid" msgstr "El fichero yaml no es válido" - diff --git a/locale/et_EE/gitlab.po b/locale/et_EE/gitlab.po index 7cf77be629a..1dc4e072806 100644 --- a/locale/et_EE/gitlab.po +++ b/locale/et_EE/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/fa_IR/gitlab.po b/locale/fa_IR/gitlab.po index 22519e0bfc0..33f19c214db 100644 --- a/locale/fa_IR/gitlab.po +++ b/locale/fa_IR/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/fil_PH/gitlab.po b/locale/fil_PH/gitlab.po index 150e5733bdc..e3b0e2e311f 100644 --- a/locale/fil_PH/gitlab.po +++ b/locale/fil_PH/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/fr/gitlab.po b/locale/fr/gitlab.po index e1894f867b1..d2968f3bb71 100644 --- a/locale/fr/gitlab.po +++ b/locale/fr/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "Une erreur est survenue lors de la mise à jour du commentaire" msgid "An error occurred while validating username" msgstr "Une erreur s’est produite lors de la validation du nom d’utilisateur" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "dans les %d minutes" msgid "yaml invalid" msgstr "" - diff --git a/locale/gitlab.pot b/locale/gitlab.pot index f905986bf0d..8d3ab24f84b 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1682,6 +1682,9 @@ msgstr "" msgid "An error occurred while checking group path" msgstr "" +msgid "An error occurred while committing your changes." +msgstr "" + msgid "An error occurred while deleting the approvers group" msgstr "" @@ -1745,12 +1748,18 @@ msgstr "" msgid "An error occurred while fetching the job log." msgstr "" +msgid "An error occurred while fetching the job trace." +msgstr "" + msgid "An error occurred while fetching the job." msgstr "" msgid "An error occurred while fetching the jobs." msgstr "" +msgid "An error occurred while fetching the latest pipeline." +msgstr "" + msgid "An error occurred while fetching the pipeline." msgstr "" @@ -1763,6 +1772,9 @@ msgstr "" msgid "An error occurred while generating a username. Please try again." msgstr "" +msgid "An error occurred while getting files for - %{branchId}" +msgstr "" + msgid "An error occurred while getting projects" msgstr "" @@ -1772,6 +1784,9 @@ msgstr "" msgid "An error occurred while initializing path locks" msgstr "" +msgid "An error occurred while loading all the files." +msgstr "" + msgid "An error occurred while loading chart data" msgstr "" @@ -1802,6 +1817,24 @@ msgstr "" msgid "An error occurred while loading the file" msgstr "" +msgid "An error occurred while loading the file content." +msgstr "" + +msgid "An error occurred while loading the file." +msgstr "" + +msgid "An error occurred while loading the merge request changes." +msgstr "" + +msgid "An error occurred while loading the merge request version data." +msgstr "" + +msgid "An error occurred while loading the merge request." +msgstr "" + +msgid "An error occurred while loading the pipelines jobs." +msgstr "" + msgid "An error occurred while loading the subscription details." msgstr "" @@ -1868,39 +1901,6 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." -msgstr "" - -msgid "An error occurred whilst fetching the job trace." -msgstr "" - -msgid "An error occurred whilst fetching the latest pipeline." -msgstr "" - -msgid "An error occurred whilst getting files for - %{branchId}" -msgstr "" - -msgid "An error occurred whilst loading all the files." -msgstr "" - -msgid "An error occurred whilst loading the file content." -msgstr "" - -msgid "An error occurred whilst loading the file." -msgstr "" - -msgid "An error occurred whilst loading the merge request changes." -msgstr "" - -msgid "An error occurred whilst loading the merge request version data." -msgstr "" - -msgid "An error occurred whilst loading the merge request." -msgstr "" - -msgid "An error occurred whilst loading the pipelines jobs." -msgstr "" - msgid "An error occurred. Please try again." msgstr "" @@ -21766,6 +21766,12 @@ msgstr "" msgid "and" msgstr "" +msgid "any-approver for the merge request already exists" +msgstr "" + +msgid "any-approver for the project already exists" +msgstr "" + msgid "archived" msgstr "" diff --git a/locale/gl_ES/gitlab.po b/locale/gl_ES/gitlab.po index 9c5817a6bbc..5bd75b550d2 100644 --- a/locale/gl_ES/gitlab.po +++ b/locale/gl_ES/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/he_IL/gitlab.po b/locale/he_IL/gitlab.po index 40a8dc37d2d..cf64d42b995 100644 --- a/locale/he_IL/gitlab.po +++ b/locale/he_IL/gitlab.po @@ -1632,37 +1632,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19735,4 +19735,3 @@ msgstr[3] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/hi_IN/gitlab.po b/locale/hi_IN/gitlab.po index 9d986e64534..6c583369e13 100644 --- a/locale/hi_IN/gitlab.po +++ b/locale/hi_IN/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/hr_HR/gitlab.po b/locale/hr_HR/gitlab.po index b24fd8c1468..e25c0825418 100644 --- a/locale/hr_HR/gitlab.po +++ b/locale/hr_HR/gitlab.po @@ -1587,37 +1587,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19628,4 +19628,3 @@ msgstr[2] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/hu_HU/gitlab.po b/locale/hu_HU/gitlab.po index 3b25068e22a..1ef02e6578d 100644 --- a/locale/hu_HU/gitlab.po +++ b/locale/hu_HU/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/id_ID/gitlab.po b/locale/id_ID/gitlab.po index 860c508e2bc..dcf357275f4 100644 --- a/locale/id_ID/gitlab.po +++ b/locale/id_ID/gitlab.po @@ -1497,37 +1497,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19414,4 +19414,3 @@ msgstr[0] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/it/gitlab.po b/locale/it/gitlab.po index c1e48014704..bbbf764014d 100644 --- a/locale/it/gitlab.po +++ b/locale/it/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "entro %d minuti " msgid "yaml invalid" msgstr "" - diff --git a/locale/ja/gitlab.po b/locale/ja/gitlab.po index 0f974ba2df7..014f53159e3 100644 --- a/locale/ja/gitlab.po +++ b/locale/ja/gitlab.po @@ -1497,37 +1497,37 @@ msgstr "コメントを更新中にエラーが発生しました。" msgid "An error occurred while validating username" msgstr "ユーザ名の検証中にエラーが発生しました" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "変更のコミット中にエラーが発生しました。" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "ジョブトレースの取得中にエラーが発生しました。" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "最新のパイプラインの取得中にエラーが発生しました。" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "%{branchId} のファイルを取得中にエラーが発生しました" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "すべてのファイルの読込中にエラーが発生しました。" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "ファイルの内容を読込中にエラーが発生しました。" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "ファイルのロード中にエラーが発生しました。" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "マージリクエストの変更を読込中にエラーが発生しました。" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "マージリクエストのバージョン情報を読込中にエラーが発生しました。" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "マージリクエストのロード中にエラーが発生しました。" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "パイプラインジョブのロード中にエラーが発生しました。" msgid "An error occurred. Please try again." @@ -19414,4 +19414,3 @@ msgstr[0] "%d 分以内" msgid "yaml invalid" msgstr "yaml が無効です" - diff --git a/locale/ka_GE/gitlab.po b/locale/ka_GE/gitlab.po index 8f01df42567..1fedf5963b1 100644 --- a/locale/ka_GE/gitlab.po +++ b/locale/ka_GE/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/ko/gitlab.po b/locale/ko/gitlab.po index 67cb7a1a8c0..01e94b78a92 100644 --- a/locale/ko/gitlab.po +++ b/locale/ko/gitlab.po @@ -1497,37 +1497,37 @@ msgstr "댓글을 업데이트하는 중 오류가 발생했습니다." msgid "An error occurred while validating username" msgstr "사용자 이름을 확인하는 중 오류가 발생했습니다" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "내 변경사항을 커밋하던 도중 오류가 발생했습니다." -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "작업 기록을 가져오는 도중 오류가 발생했습니다." -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "가장 최근의 파이프 라인을 가져오는 도중 오류가 발생했습니다." -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "모든 파일을 불러오는 도중에 오류가 발생했습니다." -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "파일 내용을 불러오는 도중 오류가 발생하였습니다." -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "파일을 불러오는 도중 오류가 발생하였습니다." -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "머지 리퀘스트의 변경 사항을 불러오는 도중 오류가 발생 하였습니다." -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "머지 리퀘스트의 버전 데이터를 불러오는 도중 오류가 발생하였습니다." -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "머지 리퀘스트를 불러오는 도중 오류가 발생하였습니다." -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "파이프 라인 작업을 불러오는 도중 오류가 발생하였습니다." msgid "An error occurred. Please try again." @@ -19414,4 +19414,3 @@ msgstr[0] "%d 분 이내 " msgid "yaml invalid" msgstr "" - diff --git a/locale/mn_MN/gitlab.po b/locale/mn_MN/gitlab.po index fa697d18245..d1c0fd5a673 100644 --- a/locale/mn_MN/gitlab.po +++ b/locale/mn_MN/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/nb_NO/gitlab.po b/locale/nb_NO/gitlab.po index 44ff0f9513d..98adc168e26 100644 --- a/locale/nb_NO/gitlab.po +++ b/locale/nb_NO/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/nl_NL/gitlab.po b/locale/nl_NL/gitlab.po index 97128936449..62156c9d48a 100644 --- a/locale/nl_NL/gitlab.po +++ b/locale/nl_NL/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/pa_IN/gitlab.po b/locale/pa_IN/gitlab.po index 9674b40f3cd..a26459b2326 100644 --- a/locale/pa_IN/gitlab.po +++ b/locale/pa_IN/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/pl_PL/gitlab.po b/locale/pl_PL/gitlab.po index 3f3656e9c2b..13d936589c1 100644 --- a/locale/pl_PL/gitlab.po +++ b/locale/pl_PL/gitlab.po @@ -1632,37 +1632,37 @@ msgstr "Wystąpił błąd podczas aktualizacji komentarza" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19735,4 +19735,3 @@ msgstr[3] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/pt_BR/gitlab.po b/locale/pt_BR/gitlab.po index 120127de15f..8e87e710076 100644 --- a/locale/pt_BR/gitlab.po +++ b/locale/pt_BR/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "Ocorreu um erro durante a atualização do comentário" msgid "An error occurred while validating username" msgstr "Erro ao validar o nome de usuário" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "Ocorreu um erro ao confirmar suas alterações." -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "Ocorreu um erro ao buscar o rastreamento do trabalho." -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "Ocorreu um erro ao recuperar o último pipeline." -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "Ocorreu um erro ao obter arquivos para - %{branchId}" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "Erro ao carregar todos os arquivos." -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "Erro ao carregar o conteúdo do arquivo." -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "Erro ao carregar o arquivo." -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "Ocorreu um erro ao carregar as alterações do merge request." -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "Ocorreu um erro ao carregar dados de versão do merge request." -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "Ocorreu um erro ao carregar o merge request." -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "Ocorreu um erro ao carregar os trabalhos de pipelines." msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "dentro de %d minutos " msgid "yaml invalid" msgstr "" - diff --git a/locale/pt_PT/gitlab.po b/locale/pt_PT/gitlab.po index ef265dc1b8c..35bd1b54abb 100644 --- a/locale/pt_PT/gitlab.po +++ b/locale/pt_PT/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "Ocorreu um erro ao atualizar o comentário" msgid "An error occurred while validating username" msgstr "Ocorreu um erro ao validar o nome de utilizador" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "Ocorreu um erro ao enviar as tuas alterações." -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "Ocorreu um erro ao buscar a localização do trabalho." -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "Ocorreu um erro ao buscar o pipeline mais recente." -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "Ocorreu um erro ao obter ficheiros para - %{branchId}" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "Ocorreu um erro durante o carregamento de todos os ficheiros." -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "Ocorreu um erro ao carregar o conteúdo do ficheiro." -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "Ocorreu um erro ao carregar o ficheiro." -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "Ocorreu um erro ao carregar as alterações do pedido de mesclagem." -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "Ocorreu um erro ao carregar os dados da versão do pedido de mesclagem." -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "Ocorreu um erro ao carregar o pedido de mesclagem." -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "Ocorreu um erro ao carregar os trabalhos das pipelines." msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/ro_RO/gitlab.po b/locale/ro_RO/gitlab.po index c433d8f5ba2..22d4464db3b 100644 --- a/locale/ro_RO/gitlab.po +++ b/locale/ro_RO/gitlab.po @@ -1587,37 +1587,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19628,4 +19628,3 @@ msgstr[2] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/ru/gitlab.po b/locale/ru/gitlab.po index 0571d4745a2..1216e1941a5 100644 --- a/locale/ru/gitlab.po +++ b/locale/ru/gitlab.po @@ -1632,37 +1632,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "Произошла ошибка при проверке имени пользователя" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19735,4 +19735,3 @@ msgstr[3] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/sk_SK/gitlab.po b/locale/sk_SK/gitlab.po index a2a7bc42f0c..509f0ff35db 100644 --- a/locale/sk_SK/gitlab.po +++ b/locale/sk_SK/gitlab.po @@ -1632,37 +1632,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19735,4 +19735,3 @@ msgstr[3] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/sq_AL/gitlab.po b/locale/sq_AL/gitlab.po index 072729c9ea2..12a14a9922c 100644 --- a/locale/sq_AL/gitlab.po +++ b/locale/sq_AL/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/sr_CS/gitlab.po b/locale/sr_CS/gitlab.po index d8c8708cdc7..6831693521c 100644 --- a/locale/sr_CS/gitlab.po +++ b/locale/sr_CS/gitlab.po @@ -1587,37 +1587,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19628,4 +19628,3 @@ msgstr[2] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/sr_SP/gitlab.po b/locale/sr_SP/gitlab.po index 8dc6be6c1ea..d7c5cc481ef 100644 --- a/locale/sr_SP/gitlab.po +++ b/locale/sr_SP/gitlab.po @@ -1587,37 +1587,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19628,4 +19628,3 @@ msgstr[2] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/sv_SE/gitlab.po b/locale/sv_SE/gitlab.po index 17699450a60..c60d3c84e07 100644 --- a/locale/sv_SE/gitlab.po +++ b/locale/sv_SE/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/sw_KE/gitlab.po b/locale/sw_KE/gitlab.po index 230cb6fc2e6..83d1d363871 100644 --- a/locale/sw_KE/gitlab.po +++ b/locale/sw_KE/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/tr_TR/gitlab.po b/locale/tr_TR/gitlab.po index 6958899c85d..5a3714d6fd3 100644 --- a/locale/tr_TR/gitlab.po +++ b/locale/tr_TR/gitlab.po @@ -1542,37 +1542,37 @@ msgstr "Yorum güncellenirken bir hata oluştu" msgid "An error occurred while validating username" msgstr "Kullanıcı adı doğrulanırken bir hata oluştu" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "Değişiklikleriniz işlenirken bir hata oluştu." -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "İş izi alınırken bir hata oluştu." -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "En son iş hattı alınırken bir hata oluştu." -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "Tüm dosyalar yüklenirken bir hata oluştu." -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "Dosya içeriği yüklenirken bir hata oluştu." -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "Dosya yüklenirken bir hata oluştu." -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "Birleştirme isteği değişiklikleri yüklenirken bir hata oluştu." -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "Birleştirme isteği sürüm verileri yüklenirken bir hata oluştu." -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "Birleştirme isteği yüklenirken bir hata oluştu." -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "İş hattı işleri yüklenirken bir hata oluştu." msgid "An error occurred. Please try again." @@ -19521,4 +19521,3 @@ msgstr[1] "%d dakika içinde " msgid "yaml invalid" msgstr "" - diff --git a/locale/uk/gitlab.po b/locale/uk/gitlab.po index be2c217ad8e..4ad8237c36b 100644 --- a/locale/uk/gitlab.po +++ b/locale/uk/gitlab.po @@ -1632,37 +1632,37 @@ msgstr "Під час оновлення коментаря сталася по msgid "An error occurred while validating username" msgstr "Сталася помилка під час перевірки імені користувача" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "Помилка при коміті ваших змін." -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "Помилка при отриманні логу завдання." -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "Помилка при отриманні останнього конвеєра." -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "Сталася помилка при отриманні файлів для - %{branchId}" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "Помилка при завантаженні всіх файлів." -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "Помилка при завантаженні вмісту файлу." -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "Помилка при завантаженні файлу." -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "Помилка при завантаженні змін запиту на злиття." -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "Помилка при завантаженні даних версії запиту на злиття." -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "Помилка при завантаженні запиту на злиття." -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "Помилка при завантаженні завдань конвеєру." msgid "An error occurred. Please try again." @@ -19735,4 +19735,3 @@ msgstr[3] "протягом %d хвилин " msgid "yaml invalid" msgstr "yaml недійсний" - diff --git a/locale/vi_VN/gitlab.po b/locale/vi_VN/gitlab.po index 6369e477289..16064290acd 100644 --- a/locale/vi_VN/gitlab.po +++ b/locale/vi_VN/gitlab.po @@ -1497,37 +1497,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19414,4 +19414,3 @@ msgstr[0] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/zh_CN/gitlab.po b/locale/zh_CN/gitlab.po index 2c6a67d6ecc..8b4414f2042 100644 --- a/locale/zh_CN/gitlab.po +++ b/locale/zh_CN/gitlab.po @@ -1497,37 +1497,37 @@ msgstr "更新评论时发生错误" msgid "An error occurred while validating username" msgstr "验证用户名时发生错误" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "提交更改时发生错误。" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "获取作业日志时发生错误。" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "获取最新流水线时发生错误。" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "获取文件 - %{branchId} 时出错" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "加载所有文件时发生错误。" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "加载文件内容时发生错误。" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "加载文件时发生错误。" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "加载合并请求的变更内容时发生错误。" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "加载合并请求的版本数据时发生错误。" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "加载合并请求时发生错误。" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "加载流水线作业时发生错误。" msgid "An error occurred. Please try again." @@ -19414,4 +19414,3 @@ msgstr[0] "在%d分钟内" msgid "yaml invalid" msgstr "yaml无效" - diff --git a/locale/zh_HK/gitlab.po b/locale/zh_HK/gitlab.po index 13f814fe62e..fc281d107d0 100644 --- a/locale/zh_HK/gitlab.po +++ b/locale/zh_HK/gitlab.po @@ -1497,37 +1497,37 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19414,4 +19414,3 @@ msgstr[0] "" msgid "yaml invalid" msgstr "" - diff --git a/locale/zh_TW/gitlab.po b/locale/zh_TW/gitlab.po index f533e52c6f1..d03cb3d73c9 100644 --- a/locale/zh_TW/gitlab.po +++ b/locale/zh_TW/gitlab.po @@ -1497,37 +1497,37 @@ msgstr "更新留言時發生錯誤" msgid "An error occurred while validating username" msgstr "驗證使用者名稱時發生錯誤" -msgid "An error occurred whilst committing your changes." +msgid "An error occurred while committing your changes." msgstr "" -msgid "An error occurred whilst fetching the job trace." +msgid "An error occurred while fetching the job trace." msgstr "" -msgid "An error occurred whilst fetching the latest pipeline." +msgid "An error occurred while fetching the latest pipeline." msgstr "" -msgid "An error occurred whilst getting files for - %{branchId}" +msgid "An error occurred while getting files for - %{branchId}" msgstr "" -msgid "An error occurred whilst loading all the files." +msgid "An error occurred while loading all the files." msgstr "" -msgid "An error occurred whilst loading the file content." +msgid "An error occurred while loading the file content." msgstr "" -msgid "An error occurred whilst loading the file." +msgid "An error occurred while loading the file." msgstr "" -msgid "An error occurred whilst loading the merge request changes." +msgid "An error occurred while loading the merge request changes." msgstr "" -msgid "An error occurred whilst loading the merge request version data." +msgid "An error occurred while loading the merge request version data." msgstr "" -msgid "An error occurred whilst loading the merge request." +msgid "An error occurred while loading the merge request." msgstr "" -msgid "An error occurred whilst loading the pipelines jobs." +msgid "An error occurred while loading the pipelines jobs." msgstr "" msgid "An error occurred. Please try again." @@ -19414,4 +19414,3 @@ msgstr[0] "在 %d 分鐘內 " msgid "yaml invalid" msgstr "" - diff --git a/spec/features/projects/environments/environment_metrics_spec.rb b/spec/features/projects/environments/environment_metrics_spec.rb index d34db5e15cc..150df66bdd7 100644 --- a/spec/features/projects/environments/environment_metrics_spec.rb +++ b/spec/features/projects/environments/environment_metrics_spec.rb @@ -30,9 +30,9 @@ describe 'Environment > Metrics' do click_link('See metrics') expect(page).to have_metrics_path(environment) - expect(page).to have_css('div.js-environments-dropdown') + expect(page).to have_css('[data-qa-selector="environments_dropdown"]') - within('div.js-environments-dropdown') do + within('[data-qa-selector="environments_dropdown"]') do # Click on the dropdown click_on(environment.name) diff --git a/spec/features/projects/files/edit_file_soft_wrap_spec.rb b/spec/features/projects/files/edit_file_soft_wrap_spec.rb index df6bc6883a9..53b1a522a8e 100644 --- a/spec/features/projects/files/edit_file_soft_wrap_spec.rb +++ b/spec/features/projects/files/edit_file_soft_wrap_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe 'Projects > Files > User uses soft wrap whilst editing file', :js do +describe 'Projects > Files > User uses soft wrap while editing file', :js do before do project = create(:project, :repository) user = project.owner diff --git a/spec/frontend/ide/stores/actions/file_spec.js b/spec/frontend/ide/stores/actions/file_spec.js index a8e48f0b85e..a180dd5edc1 100644 --- a/spec/frontend/ide/stores/actions/file_spec.js +++ b/spec/frontend/ide/stores/actions/file_spec.js @@ -389,7 +389,7 @@ describe('IDE store file actions', () => { ) .then(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occurred whilst loading the file.', + text: 'An error occurred while loading the file.', action: expect.any(Function), actionText: 'Please try again', actionPayload: { @@ -500,7 +500,7 @@ describe('IDE store file actions', () => { ) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occurred whilst loading the file content.', + text: 'An error occurred while loading the file content.', action: expect.any(Function), actionText: 'Please try again', actionPayload: { diff --git a/spec/frontend/ide/stores/modules/pipelines/actions_spec.js b/spec/frontend/ide/stores/modules/pipelines/actions_spec.js index b08d1cd01da..71918e7e2c2 100644 --- a/spec/frontend/ide/stores/modules/pipelines/actions_spec.js +++ b/spec/frontend/ide/stores/modules/pipelines/actions_spec.js @@ -78,7 +78,7 @@ describe('IDE pipelines actions', () => { { type: 'setErrorMessage', payload: { - text: 'An error occurred whilst fetching the latest pipeline.', + text: 'An error occurred while fetching the latest pipeline.', action: expect.any(Function), actionText: 'Please try again', actionPayload: null, @@ -207,7 +207,7 @@ describe('IDE pipelines actions', () => { { type: 'setErrorMessage', payload: { - text: 'An error occurred whilst loading the pipelines jobs.', + text: 'An error occurred while loading the pipelines jobs.', action: expect.anything(), actionText: 'Please try again', actionPayload: { id: 1 }, @@ -341,7 +341,7 @@ describe('IDE pipelines actions', () => { { type: 'setErrorMessage', payload: { - text: 'An error occurred whilst fetching the job trace.', + text: 'An error occurred while fetching the job trace.', action: expect.any(Function), actionText: 'Please try again', actionPayload: null, diff --git a/spec/frontend/import_projects/components/import_projects_table_spec.js b/spec/frontend/import_projects/components/import_projects_table_spec.js index deffe22ea77..8f60823ee72 100644 --- a/spec/frontend/import_projects/components/import_projects_table_spec.js +++ b/spec/frontend/import_projects/components/import_projects_table_spec.js @@ -58,7 +58,7 @@ describe('ImportProjectsTable', () => { vm.$destroy(); }); - it('renders a loading icon whilst repos are loading', () => + it('renders a loading icon while repos are loading', () => vm.$nextTick().then(() => { expect(vm.$el.querySelector('.js-loading-button-icon')).not.toBeNull(); })); diff --git a/spec/frontend/monitoring/components/dashboard_spec.js b/spec/frontend/monitoring/components/dashboard_spec.js index d1fcf1800ad..007429a3d02 100644 --- a/spec/frontend/monitoring/components/dashboard_spec.js +++ b/spec/frontend/monitoring/components/dashboard_spec.js @@ -52,6 +52,9 @@ describe('Dashboard', () => { }); }; + const findEnvironmentsDropdown = () => wrapper.find({ ref: 'monitorEnvironmentsDropdown' }); + const findAllEnvironmentsDropdownItems = () => findEnvironmentsDropdown().findAll(GlDropdownItem); + beforeEach(() => { store = createStore(); mock = new MockAdapter(axios); @@ -71,7 +74,7 @@ describe('Dashboard', () => { }); it('shows the environment selector', () => { - expect(wrapper.vm.$el.querySelector('.js-environments-dropdown')).toBeTruthy(); + expect(findEnvironmentsDropdown().exists()).toBe(true); }); }); @@ -83,7 +86,7 @@ describe('Dashboard', () => { }); it('shows the environment selector dropdown', () => { - expect(wrapper.vm.$el.querySelector('.js-environments-dropdown')).toBeTruthy(); + expect(findEnvironmentsDropdown().exists()).toBe(true); }); }); @@ -113,7 +116,7 @@ describe('Dashboard', () => { .$nextTick() .then(() => { expect(wrapper.vm.showEmptyState).toEqual(false); - expect(wrapper.vm.$el.querySelector('.prometheus-panel')).toEqual(null); + expect(wrapper.findAll('.prometheus-panel')).toHaveLength(0); done(); }) @@ -152,9 +155,7 @@ describe('Dashboard', () => { wrapper.vm .$nextTick() .then(() => { - const environmentDropdownItems = wrapper - .find('.js-environments-dropdown') - .findAll(GlDropdownItem); + const environmentDropdownItems = findAllEnvironmentsDropdownItems(); expect(wrapper.vm.environments.length).toEqual(environmentData.length); expect(environmentDropdownItems.length).toEqual(wrapper.vm.environments.length); @@ -176,10 +177,7 @@ describe('Dashboard', () => { wrapper.vm .$nextTick() .then(() => { - const environmentDropdownItems = wrapper - .find('.js-environments-dropdown') - .findAll(GlDropdownItem); - const activeItem = environmentDropdownItems.wrappers.filter(itemWrapper => + const activeItem = findAllEnvironmentsDropdownItems().wrappers.filter(itemWrapper => itemWrapper.find('.active').exists(), ); @@ -205,11 +203,7 @@ describe('Dashboard', () => { wrapper.vm .$nextTick() .then(() => { - const environmentDropdownItems = wrapper - .find('.js-environments-dropdown') - .findAll(GlDropdownItem); - - expect(environmentDropdownItems.length).toEqual(0); + expect(findAllEnvironmentsDropdownItems()).toHaveLength(0); done(); }) .catch(done.fail); diff --git a/spec/frontend/notes/components/comment_form_spec.js b/spec/frontend/notes/components/comment_form_spec.js index ceba31b1a70..a2c7f0b3767 100644 --- a/spec/frontend/notes/components/comment_form_spec.js +++ b/spec/frontend/notes/components/comment_form_spec.js @@ -87,7 +87,7 @@ describe('issue_comment_form component', () => { expect(wrapper.vm.toggleIssueState).toHaveBeenCalled(); }); - it('should disable action button whilst submitting', done => { + it('should disable action button while submitting', done => { const saveNotePromise = Promise.resolve(); wrapper.vm.note = 'hello world'; jest.spyOn(wrapper.vm, 'saveNote').mockReturnValue(saveNotePromise); diff --git a/spec/javascripts/blob/notebook/index_spec.js b/spec/javascripts/blob/notebook/index_spec.js index 6bb5bac007f..db6ca5bd22d 100644 --- a/spec/javascripts/blob/notebook/index_spec.js +++ b/spec/javascripts/blob/notebook/index_spec.js @@ -94,7 +94,7 @@ describe('iPython notebook renderer', () => { it('shows error message', () => { expect(document.querySelector('.md').textContent.trim()).toBe( - 'An error occurred whilst parsing the file.', + 'An error occurred while parsing the file.', ); }); }); @@ -123,7 +123,7 @@ describe('iPython notebook renderer', () => { it('shows error message', () => { expect(document.querySelector('.md').textContent.trim()).toBe( - 'An error occurred whilst loading the file. Please try again later.', + 'An error occurred while loading the file. Please try again later.', ); }); }); diff --git a/spec/javascripts/blob/pdf/index_spec.js b/spec/javascripts/blob/pdf/index_spec.js index 6ea097da742..66769a8aa47 100644 --- a/spec/javascripts/blob/pdf/index_spec.js +++ b/spec/javascripts/blob/pdf/index_spec.js @@ -65,7 +65,7 @@ describe('PDF renderer', () => { it('shows error message', () => { expect(document.querySelector('.md').textContent.trim()).toBe( - 'An error occurred whilst loading the file. Please try again later.', + 'An error occurred while loading the file. Please try again later.', ); }); }); diff --git a/spec/javascripts/ide/stores/actions/merge_request_spec.js b/spec/javascripts/ide/stores/actions/merge_request_spec.js index ca8f33407fd..ee0e51003c5 100644 --- a/spec/javascripts/ide/stores/actions/merge_request_spec.js +++ b/spec/javascripts/ide/stores/actions/merge_request_spec.js @@ -180,7 +180,7 @@ describe('IDE store merge request actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occurred whilst loading the merge request.', + text: 'An error occurred while loading the merge request.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { @@ -253,7 +253,7 @@ describe('IDE store merge request actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occurred whilst loading the merge request changes.', + text: 'An error occurred while loading the merge request changes.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { @@ -323,7 +323,7 @@ describe('IDE store merge request actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occurred whilst loading the merge request version data.', + text: 'An error occurred while loading the merge request version data.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { diff --git a/spec/javascripts/ide/stores/actions/tree_spec.js b/spec/javascripts/ide/stores/actions/tree_spec.js index be350b6f6cc..fabe44ce333 100644 --- a/spec/javascripts/ide/stores/actions/tree_spec.js +++ b/spec/javascripts/ide/stores/actions/tree_spec.js @@ -125,7 +125,7 @@ describe('Multi-file store tree actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occurred whilst loading all the files.', + text: 'An error occurred while loading all the files.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { projectId: 'abc/def', branchId: 'master-testing' }, diff --git a/spec/support/shared_examples/features/discussion_comments_shared_example.rb b/spec/support/shared_examples/features/discussion_comments_shared_example.rb index f8d2fdece7d..257b53b2a7b 100644 --- a/spec/support/shared_examples/features/discussion_comments_shared_example.rb +++ b/spec/support/shared_examples/features/discussion_comments_shared_example.rb @@ -275,13 +275,15 @@ RSpec.shared_examples 'thread comments' do |resource_name| find("#{menu_selector} li", match: :first) items = all("#{menu_selector} li") - expect(items.first).to have_content 'Comment' - expect(items.first).to have_selector '.fa-check' - expect(items.first['class']).to match 'droplab-item-selected' - - expect(items.last).to have_content 'Start thread' - expect(items.last).not_to have_selector '.fa-check' - expect(items.last['class']).not_to match 'droplab-item-selected' + aggregate_failures do + expect(items.first).to have_content 'Comment' + expect(items.first).to have_selector '.fa-check' + expect(items.first['class']).to match 'droplab-item-selected' + + expect(items.last).to have_content 'Start thread' + expect(items.last).not_to have_selector '.fa-check' + expect(items.last['class']).not_to match 'droplab-item-selected' + end end end end |