diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-23 11:04:28 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-23 11:04:28 +0300 |
| commit | 4ad8c9997d8d067cbc5a2f9252f244116cd24759 (patch) | |
| tree | 515f90ed0e00a3dfba92dd1c914c837ad3612a1f | |
| parent | dfa79ebf12aca3d2784c754c53520a2fd34f28a9 (diff) | |
| parent | c1ed00e81df21365bd783da8cb40957e474ed35d (diff) | |
Merge branch 'master' into 37860-pipelines-page
* master: (88 commits)
Fix deletion of container registry or images returning an error
The fog-aliyun gem had a bug in v0.1.0 for file storage creation/update. This merge requests update the gem to v0.2.0 which contains the fix:
Decrease ABC threshold to 54.28
Update VERSION to 10.2.0-pre
Update CHANGELOG.md for 10.1.0
Document `CI_SHARED_ENVIRONMENT` and `CI_DISPOSABLE_ENVIRONMENT`
Fix the external URLs generated for online view of HTML artifacts
Use title as placeholder instead of issue title for reusability
Fix failure in current_settings_spec.rb
Clarify the difference between project_update and project_rename
URI decode Page-Title header to preserve UTF-8 characters
Update Gitaly version to v0.49.0
Decrease Perceived Complexity threshold to 14
Resolve "Remove help text regarding group issues on group issues page (and group merge requests page)"
Force non diff resolved discussion to display when collapse toggled
Added submodule support in multi-file editor
add note about after_script being run separately
Check for element before evaluate_script
Merge branch 'master-i18n' into 'master'
Update Prometheus gem to fix problems with other files overwriting current file
...
307 files changed, 9528 insertions, 2848 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc0d2b71174..87d73fc0c52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,11 +49,11 @@ stages: - gitlab-org .tests-metadata-state: &tests-metadata-state - services: [] + <<: *dedicated-runner variables: - SETUP_DB: "false" - USE_BUNDLE_INSTALL: "false" TESTS_METADATA_S3_BUCKET: "gitlab-ce-cache" + before_script: + - source scripts/utils.sh artifacts: expire_in: 31d paths: @@ -80,6 +80,7 @@ stages: .rspec-metadata: &rspec-metadata <<: *dedicated-runner <<: *pull-cache + <<: *except-docs stage: test script: - JOB_NAME=( $CI_JOB_NAME ) @@ -109,16 +110,15 @@ stages: .rspec-metadata-pg: &rspec-metadata-pg <<: *rspec-metadata <<: *use-pg - <<: *except-docs .rspec-metadata-mysql: &rspec-metadata-mysql <<: *rspec-metadata <<: *use-mysql - <<: *except-docs .spinach-metadata: &spinach-metadata <<: *dedicated-runner <<: *pull-cache + <<: *except-docs stage: test script: - JOB_NAME=( $CI_JOB_NAME ) @@ -141,12 +141,10 @@ stages: .spinach-metadata-pg: &spinach-metadata-pg <<: *spinach-metadata <<: *use-pg - <<: *except-docs .spinach-metadata-mysql: &spinach-metadata-mysql <<: *spinach-metadata <<: *use-mysql - <<: *except-docs .only-canonical-masters: &only-canonical-masters only: @@ -157,12 +155,8 @@ stages: # Trigger a package build in omnibus-gitlab repository build-package: - image: ruby:2.3-alpine + image: ruby:2.4-alpine before_script: [] - services: [] - variables: - SETUP_DB: "false" - USE_BUNDLE_INSTALL: "false" stage: build cache: {} when: manual @@ -183,13 +177,9 @@ build-package: - apk add --update openssl - wget https://gitlab.com/gitlab-org/gitlab-ce/raw/master/scripts/trigger-build-docs - chmod 755 trigger-build-docs - services: [] cache: {} dependencies: [] - artifacts: {} variables: - SETUP_DB: "false" - USE_BUNDLE_INSTALL: "false" GIT_STRATEGY: none when: manual only: @@ -222,7 +212,6 @@ review-docs-cleanup: # Retrieve knapsack and rspec_flaky reports retrieve-tests-metadata: <<: *tests-metadata-state - <<: *dedicated-runner <<: *except-docs stage: prepare cache: @@ -240,7 +229,6 @@ retrieve-tests-metadata: update-tests-metadata: <<: *tests-metadata-state - <<: *dedicated-runner <<: *only-canonical-masters stage: post-test cache: @@ -305,69 +293,69 @@ setup-test-env: - public/assets - tmp/tests -rspec-pg 0 25: *rspec-metadata-pg -rspec-pg 1 25: *rspec-metadata-pg -rspec-pg 2 25: *rspec-metadata-pg -rspec-pg 3 25: *rspec-metadata-pg -rspec-pg 4 25: *rspec-metadata-pg -rspec-pg 5 25: *rspec-metadata-pg -rspec-pg 6 25: *rspec-metadata-pg -rspec-pg 7 25: *rspec-metadata-pg -rspec-pg 8 25: *rspec-metadata-pg -rspec-pg 9 25: *rspec-metadata-pg -rspec-pg 10 25: *rspec-metadata-pg -rspec-pg 11 25: *rspec-metadata-pg -rspec-pg 12 25: *rspec-metadata-pg -rspec-pg 13 25: *rspec-metadata-pg -rspec-pg 14 25: *rspec-metadata-pg -rspec-pg 15 25: *rspec-metadata-pg -rspec-pg 16 25: *rspec-metadata-pg -rspec-pg 17 25: *rspec-metadata-pg -rspec-pg 18 25: *rspec-metadata-pg -rspec-pg 19 25: *rspec-metadata-pg -rspec-pg 20 25: *rspec-metadata-pg -rspec-pg 21 25: *rspec-metadata-pg -rspec-pg 22 25: *rspec-metadata-pg -rspec-pg 23 25: *rspec-metadata-pg -rspec-pg 24 25: *rspec-metadata-pg - -rspec-mysql 0 25: *rspec-metadata-mysql -rspec-mysql 1 25: *rspec-metadata-mysql -rspec-mysql 2 25: *rspec-metadata-mysql -rspec-mysql 3 25: *rspec-metadata-mysql -rspec-mysql 4 25: *rspec-metadata-mysql -rspec-mysql 5 25: *rspec-metadata-mysql -rspec-mysql 6 25: *rspec-metadata-mysql -rspec-mysql 7 25: *rspec-metadata-mysql -rspec-mysql 8 25: *rspec-metadata-mysql -rspec-mysql 9 25: *rspec-metadata-mysql -rspec-mysql 10 25: *rspec-metadata-mysql -rspec-mysql 11 25: *rspec-metadata-mysql -rspec-mysql 12 25: *rspec-metadata-mysql -rspec-mysql 13 25: *rspec-metadata-mysql -rspec-mysql 14 25: *rspec-metadata-mysql -rspec-mysql 15 25: *rspec-metadata-mysql -rspec-mysql 16 25: *rspec-metadata-mysql -rspec-mysql 17 25: *rspec-metadata-mysql -rspec-mysql 18 25: *rspec-metadata-mysql -rspec-mysql 19 25: *rspec-metadata-mysql -rspec-mysql 20 25: *rspec-metadata-mysql -rspec-mysql 21 25: *rspec-metadata-mysql -rspec-mysql 22 25: *rspec-metadata-mysql -rspec-mysql 23 25: *rspec-metadata-mysql -rspec-mysql 24 25: *rspec-metadata-mysql - -spinach-pg 0 5: *spinach-metadata-pg -spinach-pg 1 5: *spinach-metadata-pg -spinach-pg 2 5: *spinach-metadata-pg -spinach-pg 3 5: *spinach-metadata-pg -spinach-pg 4 5: *spinach-metadata-pg - -spinach-mysql 0 5: *spinach-metadata-mysql -spinach-mysql 1 5: *spinach-metadata-mysql -spinach-mysql 2 5: *spinach-metadata-mysql -spinach-mysql 3 5: *spinach-metadata-mysql -spinach-mysql 4 5: *spinach-metadata-mysql +rspec-pg 0 26: *rspec-metadata-pg +rspec-pg 1 26: *rspec-metadata-pg +rspec-pg 2 26: *rspec-metadata-pg +rspec-pg 3 26: *rspec-metadata-pg +rspec-pg 4 26: *rspec-metadata-pg +rspec-pg 5 26: *rspec-metadata-pg +rspec-pg 6 26: *rspec-metadata-pg +rspec-pg 7 26: *rspec-metadata-pg +rspec-pg 8 26: *rspec-metadata-pg +rspec-pg 9 26: *rspec-metadata-pg +rspec-pg 10 26: *rspec-metadata-pg +rspec-pg 11 26: *rspec-metadata-pg +rspec-pg 12 26: *rspec-metadata-pg +rspec-pg 13 26: *rspec-metadata-pg +rspec-pg 14 26: *rspec-metadata-pg +rspec-pg 15 26: *rspec-metadata-pg +rspec-pg 16 26: *rspec-metadata-pg +rspec-pg 17 26: *rspec-metadata-pg +rspec-pg 18 26: *rspec-metadata-pg +rspec-pg 19 26: *rspec-metadata-pg +rspec-pg 20 26: *rspec-metadata-pg +rspec-pg 21 26: *rspec-metadata-pg +rspec-pg 22 26: *rspec-metadata-pg +rspec-pg 23 26: *rspec-metadata-pg +rspec-pg 24 26: *rspec-metadata-pg +rspec-pg 25 26: *rspec-metadata-pg + +rspec-mysql 0 26: *rspec-metadata-mysql +rspec-mysql 1 26: *rspec-metadata-mysql +rspec-mysql 2 26: *rspec-metadata-mysql +rspec-mysql 3 26: *rspec-metadata-mysql +rspec-mysql 4 26: *rspec-metadata-mysql +rspec-mysql 5 26: *rspec-metadata-mysql +rspec-mysql 6 26: *rspec-metadata-mysql +rspec-mysql 7 26: *rspec-metadata-mysql +rspec-mysql 8 26: *rspec-metadata-mysql +rspec-mysql 9 26: *rspec-metadata-mysql +rspec-mysql 10 26: *rspec-metadata-mysql +rspec-mysql 11 26: *rspec-metadata-mysql +rspec-mysql 12 26: *rspec-metadata-mysql +rspec-mysql 13 26: *rspec-metadata-mysql +rspec-mysql 14 26: *rspec-metadata-mysql +rspec-mysql 15 26: *rspec-metadata-mysql +rspec-mysql 16 26: *rspec-metadata-mysql +rspec-mysql 17 26: *rspec-metadata-mysql +rspec-mysql 18 26: *rspec-metadata-mysql +rspec-mysql 19 26: *rspec-metadata-mysql +rspec-mysql 20 26: *rspec-metadata-mysql +rspec-mysql 21 26: *rspec-metadata-mysql +rspec-mysql 22 26: *rspec-metadata-mysql +rspec-mysql 23 26: *rspec-metadata-mysql +rspec-mysql 24 26: *rspec-metadata-mysql +rspec-mysql 25 26: *rspec-metadata-mysql + +spinach-pg 0 4: *spinach-metadata-pg +spinach-pg 1 4: *spinach-metadata-pg +spinach-pg 2 4: *spinach-metadata-pg +spinach-pg 3 4: *spinach-metadata-pg + +spinach-mysql 0 4: *spinach-metadata-mysql +spinach-mysql 1 4: *spinach-metadata-mysql +spinach-mysql 2 4: *spinach-metadata-mysql +spinach-mysql 3 4: *spinach-metadata-mysql # Static analysis jobs .ruby-static-analysis: &ruby-static-analysis diff --git a/.rubocop.yml b/.rubocop.yml index dbeb1880d39..c427f219a0d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -624,7 +624,7 @@ Style/PredicateName: # branches, and conditions. Metrics/AbcSize: Enabled: true - Max: 55.25 + Max: 54.28 # This cop checks if the length of a block exceeds some maximum value. Metrics/BlockLength: @@ -665,7 +665,7 @@ Metrics/ParameterLists: # A complexity metric geared towards measuring complexity for a human reader. Metrics/PerceivedComplexity: Enabled: true - Max: 15 + Max: 14 # Lint ######################################################################## diff --git a/CHANGELOG.md b/CHANGELOG.md index c857efddb15..578651639c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,198 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 10.1.0 (2017-10-22) + +- [SECURITY] Use a timeout on certain git operations. !14872 +- [SECURITY] Move project repositories between namespaces when renaming users. +- [SECURITY] Prevent an open redirect on project pages. +- [SECURITY] Prevent a persistent XSS in user-provided markup. +- [REMOVED] Remove the ability to visit the issue edit form directly. !14523 +- [REMOVED] Remove animate.js and label animation. +- [FIXED] Perform prometheus data endpoint requests in parallel. !14003 +- [FIXED] Escape quotes in git username. !14020 (Brandon Everett) +- [FIXED] Fixed non-UTF-8 valid branch names from causing an error. !14090 +- [FIXED] Read import sources from setting at first initialization. !14141 (Visay Keo) +- [FIXED] Display full pre-receive and post-receive hook output in GitLab UI. !14222 (Robin Bobbitt) +- [FIXED] Fix incorrect X-axis labels in Prometheus graphs. !14258 +- [FIXED] Fix the default branches sorting to actually be 'Last updated'. !14295 +- [FIXED] Fixes project denial of service via gitmodules using Extended ASCII. !14301 +- [FIXED] Fix the filesystem shard health check to check all configured shards. !14341 +- [FIXED] Compare email addresses case insensitively when verifying GPG signatures. !14376 (Tim Bishop) +- [FIXED] Allow the git circuit breaker to correctly handle missing repository storages. !14417 +- [FIXED] Fix `rake gitlab:incoming_email:check` and make it report the actual error. !14423 +- [FIXED] Does not check if an invariant hashed storage path exists on disk when renaming projects. !14428 +- [FIXED] Also reserve refs/replace after importing a project. !14436 +- [FIXED] Fix profile image orientation based on EXIF data gvieira37. !14461 (gvieira37) +- [FIXED] Move the deployment flag content to the left when deployment marker is near the end. !14514 +- [FIXED] Fix notes type created from import. This should fix some missing notes issues from imported projects. !14524 +- [FIXED] Fix bottom spacing for dropdowns that open upwards. !14535 +- [FIXED] Adjusts tag link to avoid underlining spaces. !14544 (Guilherme Vieira) +- [FIXED] Add missing space in Sidekiq memory killer log message. !14553 (Benjamin Drung) +- [FIXED] Ensure no exception is raised when Raven tries to get the current user in API context. !14580 +- [FIXED] Fix edit project service cancel button position. !14596 (Matt Coleman) +- [FIXED] Fix case sensitive email confirmation on signup. !14606 (robdel12) +- [FIXED] Whitelist authorized_keys.lock in the gitlab:check rake task. !14624 +- [FIXED] Allow merge in MR widget with no pipeline but using "Only allow merge requests to be merged if the pipeline succeeds". !14633 +- [FIXED] Fix navigation dropdown close animation on mobile screens. !14649 +- [FIXED] Fix the project import with issues and milestones. !14657 +- [FIXED] Use explicit boolean true attribute for show-disabled-button in Vue files. !14672 +- [FIXED] Make tabs on top scrollable on admin dashboard. !14685 (Takuya Noguchi) +- [FIXED] Fix broken Y-axis scaling in some Prometheus graphs. !14693 +- [FIXED] Search or compare LDAP DNs case-insensitively and ignore excess whitespace. !14697 +- [FIXED] Allow prometheus graphs to correctly handle NaN values. !14741 +- [FIXED] Don't show an "Unsubscribe" link in snippet comment notifications. !14764 +- [FIXED] Fixed duplicate notifications when added multiple labels on an issue. !14798 +- [FIXED] Fix alignment for indeterminate marker in dropdowns. !14809 +- [FIXED] Fix error when updating a forked project with deleted `ForkedProjectLink`. !14916 +- [FIXED] Correctly render asset path for locales with a region. !14924 +- [FIXED] Fix the external URLs generated for online view of HTML artifacts. !14977 +- [FIXED] Reschedule merge request diff background migrations to catch failures from 9.5 run. +- [FIXED] fix merge request widget status icon for failed CI. +- [FIXED] Fix the number representing the amount of commits related to a push event. +- [FIXED] Sync up hover and legend data across all graphs for the prometheus dashboard. +- [FIXED] Fixes mini pipeline graph in commit view. +- [FIXED] Fix comment deletion confirmation dialog typo. +- [FIXED] Fix project snippets breadcrumb link. +- [FIXED] Make usage ping scheduling more robust. +- [FIXED] Make "merge ongoing" check more consistent. +- [FIXED] Add 1000+ counters to job page. +- [FIXED] Fixed issue/merge request breadcrumb titles not having links. +- [FIXED] Fixed commit avatars being centered vertically. +- [FIXED] Tooltips in the commit info box now all face the same direction. (Jedidiah Broadbent) +- [FIXED] Fixed navbar title colors leaking out of the navbar. +- [FIXED] Fix bug that caused merge requests with diff notes imported from Bitbucket to raise errors. +- [FIXED] Correctly detect multiple issue URLs after 'Closes...' in MR descriptions. +- [FIXED] Set default scope on PATs that don't have one set to allow them to be revoked. +- [FIXED] Fix application setting to cache nil object. +- [FIXED] Fix image diff swipe handle offset to correctly align with the frame. +- [FIXED] Force non diff resolved discussion to display when collapse toggled. +- [FIXED] Fix resolved discussions not expanding on side by side view. +- [FIXED] Fixed the sidebar scrollbar overlapping links. +- [FIXED] Issue board tooltips are now the correct width when the column is collapsed. (Jedidiah Broadbent) +- [FIXED] Improve autodevops banner UX and render it only in project page. +- [FIXED] Fix typo in cycle analytics breaking time component. +- [FIXED] Force two up view to load by default for image diffs. +- [FIXED] Fixed milestone breadcrumb links. +- [FIXED] Fixed group sort dropdown defaulting to empty. +- [FIXED] Fixed notes not being scrolled to in merge requests. +- [FIXED] Adds Event polyfill for IE11. +- [FIXED] Update native unicode emojis to always render as normal text (previously could render italicized). (Branka Martinovic) +- [FIXED] Sort JobsController by id, not created_at. +- [FIXED] Fix revision and total size missing for Container Registry. +- [FIXED] Fixed milestone issuable assignee link URL. +- [FIXED] Fixed breadcrumbs container expanding in side-by-side diff view. +- [FIXED] Fixed merge request widget merged & closed date tooltip text. +- [FIXED] Prevent creating multiple ApplicationSetting instances. +- [FIXED] Fix username and ID not logging in production_json.log for Git activity. +- [FIXED] Make Redcarpet Markdown renderer thread-safe. +- [FIXED] Two factor auth messages in settings no longer overlap the button. (Jedidiah Broadbent) +- [FIXED] Made the "remember me" check boxes have consistent styles and alignment. (Jedidiah Broadbent) +- [FIXED] Prevent branches or tags from starting with invalid characters (e.g. -, .). +- [DEPRECATED] Removed two legacy config options. (Daniel Voogsgerd) +- [CHANGED] Show notes number more user-friendly in the graph. !13949 (Vladislav Kaverin) +- [CHANGED] Link SAML users to LDAP by email. !14216 +- [CHANGED] Display whether branch has been merged when deleting protected branch. !14220 +- [CHANGED] Make the labels in the Compare form less confusing. !14225 +- [CHANGED] Confirmation email shows link as text instead of human readable text. !14243 (bitsapien) +- [CHANGED] Return only group's members in user dropdowns on issuables list pages. !14249 +- [CHANGED] Added defaults for protected branches dropdowns on the repository settings. !14278 +- [CHANGED] Show confirmation modal before deleting account. !14360 +- [CHANGED] Allow creating merge requests across a fork network. !14422 +- [CHANGED] Re-arrange <script> tags before <template> tags in .vue files. !14671 +- [CHANGED] Create idea of read-only database. !14688 +- [CHANGED] Add active states to nav bar counters. +- [CHANGED] Add view replaced file link for image diffs. +- [CHANGED] Adjust tooltips to adhere to 8px grid and make them more readable. +- [CHANGED] breadcrumbs receives padding when double lined. +- [CHANGED] Allow developer role to admin milestones. +- [CHANGED] Stop using Sidekiq for updating Key#last_used_at. +- [CHANGED] Include GitLab full name in Slack messages. +- [ADDED] Expose last pipeline details in API response when getting a single commit. !13521 (Mehdi Lahmam (@mehlah)) +- [ADDED] Allow to use same periods for different housekeeping tasks (effectively skipping the lesser task). !13711 (cernvcs) +- [ADDED] Add GitLab-Pages version to Admin Dashboard. !14040 (travismiller) +- [ADDED] Commenting on image diffs. !14061 +- [ADDED] Script to migrate project's repositories to new Hashed Storage. !14067 +- [ADDED] Hide close MR button after merge without reloading page. !14122 (Jacopo Beschi @jacopo-beschi) +- [ADDED] Add Gitaly version to Admin Dashboard. !14313 (Jacopo Beschi @jacopo-beschi) +- [ADDED] Add 'closed_at' attribute to Issues API. !14316 (Vitaliy @blackst0ne Klachkov) +- [ADDED] Add tooltip for milestone due date to issue and merge request lists. !14318 (Vitaliy @blackst0ne Klachkov) +- [ADDED] Improve list of sorting options. !14320 (Vitaliy @blackst0ne Klachkov) +- [ADDED] Add client and call site metadata to Gitaly calls for better traceability. !14332 +- [ADDED] Strip gitlab-runner section markers in build trace HTML view. !14393 +- [ADDED] Add online view of HTML artifacts for public projects. !14399 +- [ADDED] Create Kubernetes cluster on GKE from k8s service. !14470 +- [ADDED] Add support for GPG subkeys in signature verification. !14517 +- [ADDED] Parse and store gitlab-runner timestamped section markers. !14551 +- [ADDED] Add "implements" to the default issue closing message regex. !14612 (Guilherme Vieira) +- [ADDED] Replace `tag: true` into `:tag` in the specs. !14653 (Jacopo Beschi @jacopo-beschi) +- [ADDED] Discussion lock for issues and merge requests. +- [ADDED] Add an API endpoint to determine the forks of a project. +- [ADDED] Add help text to runner edit: tags should be separated by commas. (Brendan O'Leary) +- [ADDED] Only copy old/new code when selecting left/right side of parallel diff. +- [ADDED] Expose avatar_url when requesting list of projects from API with simple=true. +- [ADDED] A confirmation email is now sent when adding a secondary email address. (digitalmoksha) +- [ADDED] Move Custom merge methods from EE. +- [ADDED] Makes @mentions links have a different styling for better separation. +- [ADDED] Added tabs to dashboard/projects to easily switch to personal projects. +- [OTHER] Extract AutocompleteController#users into finder. !13778 (Maxim Rydkin, Mayra Cabrera) +- [OTHER] Replace 'project/wiki.feature' spinach test with an rspec analog. !13856 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Expand docs for changing username or group path. !13914 +- [OTHER] Move `lib/ci` to `lib/gitlab/ci`. !14078 (Maxim Rydkin) +- [OTHER] Decrease Cyclomatic Complexity threshold to 13. !14152 (Maxim Rydkin) +- [OTHER] Decrease Perceived Complexity threshold to 15. !14160 (Maxim Rydkin) +- [OTHER] Replace project/group_links.feature spinach test with an rspec analog. !14169 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the project/milestone.feature spinach test with an rspec analog. !14171 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the profile/emails.feature spinach test with an rspec analog. !14172 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the project/team_management.feature spinach test with an rspec analog. !14173 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog. !14176 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'project/builds/summary.feature' spinach test with an rspec analog. !14177 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Optimize the boards' issues fetching. !14198 +- [OTHER] Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog. !14201 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'project/issues/award_emoji.feature' spinach test with an rspec analog. !14202 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'profile/active_tab.feature' spinach test with an rspec analog. !14239 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'search.feature' spinach test with an rspec analog. !14248 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Load sidebar participants avatars only when visible. !14270 +- [OTHER] Adds gitlab features and components to usage ping data. !14305 +- [OTHER] Replace the 'project/archived.feature' spinach test with an rspec analog. !14322 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'project/commits/revert.feature' spinach test with an rspec analog. !14325 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'project/snippets.feature' spinach test with an rspec analog. !14326 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Add link to OpenID Connect documentation. !14368 (Markus Koller) +- [OTHER] Upgrade doorkeeper-openid_connect. !14372 (Markus Koller) +- [OTHER] Upgrade gitlab-markup gem. !14395 (Markus Koller) +- [OTHER] Index projects on repository storage. !14414 +- [OTHER] Replace the 'project/shortcuts.feature' spinach test with an rspec analog. !14431 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'project/service.feature' spinach test with an rspec analog. !14432 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Improve GitHub import performance. !14445 +- [OTHER] Add basic sprintf implementation to JavaScript. !14506 +- [OTHER] Replace the 'project/merge_requests.feature' spinach test with an rspec analog. !14621 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Update GitLab Pages to v0.6.0. !14630 +- [OTHER] Add documentation to summarise project archiving. !14650 +- [OTHER] Remove 'Repo' prefix from API entites. !14694 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Removes cycle analytics service and store from global namespace. +- [OTHER] Improves i18n for Auto Devops callout. +- [OTHER] Exports common_utils utility functions as modules. +- [OTHER] Use `simple=true` for projects API in Projects dropdown for better search performance. +- [OTHER] Change index on ci_builds to optimize Jobs Controller. +- [OTHER] Add index for merge_requests.merge_commit_sha. +- [OTHER] Add (partial) index on Labels.template. +- [OTHER] Cache issue and MR template names in Redis. +- [OTHER] changed dashed border button color to be darker. +- [OTHER] Speed up permission checks. +- [OTHER] Fix docs for lightweight tag creation via API. +- [OTHER] Clarify artifact download via the API only accepts branch or tag name for ref. +- [OTHER] Change recommended MySQL version to 5.6. +- [OTHER] Bump google-api-client Gem from 0.8.6 to 0.13.6. +- [OTHER] Detect when changelog entries are invalid. +- [OTHER] Use a UNION ALL for getting merge request notes. +- [OTHER] Remove an index on ci_builds meant to be only temporary. +- [OTHER] Remove a SQL query from the todos index page. +- Support custom attributes on users. !13038 (Markus Koller) +- made read-only APIs for public merge requests available without authentication. !13291 (haseebeqx) +- Hide read_registry scope when registry is disabled on instance. !13314 (Robin Bobbitt) +- creation of keys moved to services. !13331 (haseebeqx) +- Add username as GL_USERNAME in hooks. + ## 10.0.4 (2017-10-16) - [SECURITY] Move project repositories between namespaces when renaming users. diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index a758a09aae5..fbaaafa001b 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -0.48.0 +0.49.0
\ No newline at end of file @@ -102,7 +102,7 @@ gem 'fog-google', '~> 0.5' gem 'fog-local', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' -gem 'fog-aliyun', '~> 0.1.0' +gem 'fog-aliyun', '~> 0.2.0' # for Google storage gem 'google-api-client', '~> 0.13.6' @@ -281,7 +281,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus - gem 'prometheus-client-mmap', '~>0.7.0.beta14' + gem 'prometheus-client-mmap', '~>0.7.0.beta17' gem 'raindrops', '~> 0.18' end diff --git a/Gemfile.lock b/Gemfile.lock index 89023b1cbf1..601d5ca16e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -214,7 +214,7 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.1.0) + fog-aliyun (0.2.0) fog-core (~> 1.27) fog-json (~> 1.0) ipaddress (~> 0.8) @@ -623,7 +623,7 @@ GEM parser unparser procto (0.0.3) - prometheus-client-mmap (0.7.0.beta14) + prometheus-client-mmap (0.7.0.beta17) mmap2 (~> 2.2, >= 2.2.7) pry (0.10.4) coderay (~> 1.1.0) @@ -1015,7 +1015,7 @@ DEPENDENCIES flay (~> 2.8.0) flipper (~> 0.10.2) flipper-active_record (~> 0.10.2) - fog-aliyun (~> 0.1.0) + fog-aliyun (~> 0.2.0) fog-aws (~> 1.4) fog-core (~> 1.44) fog-google (~> 0.5) @@ -1106,7 +1106,7 @@ DEPENDENCIES pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.7) - prometheus-client-mmap (~> 0.7.0.beta14) + prometheus-client-mmap (~> 0.7.0.beta17) pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 1efb2a35f6d..5cf9fee1a14 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -1,35 +1,3 @@ # GitLab Maintenance Policy -GitLab follows the [Semantic Versioning](http://semver.org/) for its releases: -`(Major).(Minor).(Patch)` in a [pragmatic way]. - -- **Major version**: Whenever there is something significant or any backwards - incompatible changes are introduced to the public API. -- **Minor version**: When new, backwards compatible functionality is introduced - to the public API or a minor feature is introduced, or when a set of smaller - features is rolled out. -- **Patch number**: When backwards compatible bug fixes are introduced that fix - incorrect behavior. - -The current stable release will receive security patches and bug fixes -(eg. `8.9.0` -> `8.9.1`). Feature releases will mark the next supported stable -release where the minor version is increased numerically by increments of one -(eg. `8.9 -> 8.10`). - -Our current policy is to support one stable release at any given time, but for -medium-level security issues, we may consider [backporting to the previous two -monthly releases][rel-sec]. - -We encourage everyone to run the latest stable release to ensure that you can -easily upgrade to the most secure and feature-rich GitLab experience. In order -to make sure you can easily run the most recent stable release, we are working -hard to keep the update process simple and reliable. - -More information about the release procedures can be found in our -[release-tools documentation][rel]. You may also want to read our -[Responsible Disclosure Policy][disclosure]. - -[rel-sec]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/security.md#backporting -[rel]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/ -[disclosure]: https://about.gitlab.com/disclosure/ -[pragmatic way]: https://gist.github.com/jashkenas/cbd2b088e20279ae2c8e +See [doc/policy/maintenance.md](doc/policy/maintenance.md) @@ -1 +1 @@ -10.1.0-pre +10.2.0-pre diff --git a/app/assets/javascripts/blob/blob_file_dropzone.js b/app/assets/javascripts/blob/blob_file_dropzone.js index ddd1fea3aca..0d590a9dbc4 100644 --- a/app/assets/javascripts/blob/blob_file_dropzone.js +++ b/app/assets/javascripts/blob/blob_file_dropzone.js @@ -1,6 +1,5 @@ /* eslint-disable func-names, object-shorthand, prefer-arrow-callback */ -/* global Dropzone */ - +import Dropzone from 'dropzone'; import '../lib/utils/url_utility'; import { HIDDEN_CLASS } from '../lib/utils/constants'; import csrf from '../lib/utils/csrf'; diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js index 6c78662baa7..c8874e48c09 100644 --- a/app/assets/javascripts/diff.js +++ b/app/assets/javascripts/diff.js @@ -1,5 +1,3 @@ -/* eslint-disable class-methods-use-this */ - import './lib/utils/url_utility'; import FilesCommentButton from './files_comment_button'; import SingleFileDiff from './single_file_diff'; @@ -8,7 +6,7 @@ import imageDiffHelper from './image_diff/helpers/index'; const UNFOLD_COUNT = 20; let isBound = false; -class Diff { +export default class Diff { constructor() { const $diffFile = $('.files .diff-file'); @@ -104,7 +102,7 @@ class Diff { } this.highlightSelectedLine(); } - + // eslint-disable-next-line class-methods-use-this handleParallelLineDown(e) { const line = $(e.currentTarget); const table = line.closest('table'); @@ -116,11 +114,11 @@ class Diff { table.addClass(`${lineClass}-selected`); } } - + // eslint-disable-next-line class-methods-use-this diffViewType() { return $('.inline-parallel-buttons a.active').data('view-type'); } - + // eslint-disable-next-line class-methods-use-this lineNumbers(line) { const children = line.find('.diff-line-num').toArray(); if (children.length !== 2) { @@ -128,7 +126,7 @@ class Diff { } return children.map(elm => parseInt($(elm).data('linenumber'), 10) || 0); } - + // eslint-disable-next-line class-methods-use-this highlightSelectedLine() { const hash = gl.utils.getLocationHash(); const $diffFiles = $('.diff-file'); @@ -141,6 +139,3 @@ class Diff { } } } - -window.gl = window.gl || {}; -window.gl.Diff = Diff; diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 2885923aeda..5ca1708f1b3 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -87,6 +87,7 @@ import U2FAuthenticate from './u2f/authenticate'; import Members from './members'; import memberExpirationDate from './member_expiration_date'; import DueDateSelectors from './due_date_select'; +import Diff from './diff'; (function() { var Dispatcher; @@ -237,7 +238,7 @@ import DueDateSelectors from './due_date_select'; new GLForm($('.milestone-form'), true); break; case 'projects:compare:show': - new gl.Diff(); + new Diff(); initChangesDropdown(); break; case 'projects:branches:new': @@ -273,7 +274,7 @@ import DueDateSelectors from './due_date_select'; } case 'projects:merge_requests:creations:diffs': case 'projects:merge_requests:edit': - new gl.Diff(); + new Diff(); shortcut_handler = new ShortcutsNavigation(); new GLForm($('.merge-request-form'), true); new IssuableForm($('.merge-request-form')); @@ -307,7 +308,7 @@ import DueDateSelectors from './due_date_select'; new GLForm($('.release-form'), true); break; case 'projects:merge_requests:show': - new gl.Diff(); + new Diff(); shortcut_handler = new ShortcutsIssuable(true); new ZenMode(); @@ -323,7 +324,7 @@ import DueDateSelectors from './due_date_select'; new gl.Activities(); break; case 'projects:commit:show': - new gl.Diff(); + new Diff(); new ZenMode(); shortcut_handler = new ShortcutsNavigation(); new MiniPipelineGraph({ diff --git a/app/assets/javascripts/dropzone_input.js b/app/assets/javascripts/dropzone_input.js index bd45da8c422..7a17adcd44e 100644 --- a/app/assets/javascripts/dropzone_input.js +++ b/app/assets/javascripts/dropzone_input.js @@ -1,308 +1,276 @@ -/* eslint-disable func-names, space-before-function-paren, wrap-iife, max-len, one-var, no-var, one-var-declaration-per-line, no-unused-vars, camelcase, quotes, no-useless-concat, prefer-template, quote-props, comma-dangle, object-shorthand, consistent-return, prefer-arrow-callback */ -/* global Dropzone */ +import Dropzone from 'dropzone'; import _ from 'underscore'; import './preview_markdown'; import csrf from './lib/utils/csrf'; -window.DropzoneInput = (function() { - function DropzoneInput(form) { - const divHover = '<div class="div-dropzone-hover"></div>'; - const iconPaperclip = '<i class="fa fa-paperclip div-dropzone-icon"></i>'; - const $attachButton = form.find('.button-attach-file'); - const $attachingFileMessage = form.find('.attaching-file-message'); - const $cancelButton = form.find('.button-cancel-uploading-files'); - const $retryLink = form.find('.retry-uploading-link'); - const $uploadProgress = form.find('.uploading-progress'); - const $uploadingErrorContainer = form.find('.uploading-error-container'); - const $uploadingErrorMessage = form.find('.uploading-error-message'); - const $uploadingProgressContainer = form.find('.uploading-progress-container'); - const uploadsPath = window.uploads_path || null; - const maxFileSize = gon.max_file_size || 10; - const formTextarea = form.find('.js-gfm-input'); - let handlePaste; - let pasteText; - let addFileToForm; - let updateAttachingMessage; - let isImage; - let getFilename; - let uploadFile; - - formTextarea.wrap('<div class="div-dropzone"></div>'); - formTextarea.on('paste', (function(_this) { - return function(event) { - return handlePaste(event); - }; - })(this)); - - // Add dropzone area to the form. - const $mdArea = formTextarea.closest('.md-area'); - form.setupMarkdownPreview(); - const $formDropzone = form.find('.div-dropzone'); - $formDropzone.parent().addClass('div-dropzone-wrapper'); - $formDropzone.append(divHover); - $formDropzone.find('.div-dropzone-hover').append(iconPaperclip); - - if (!uploadsPath) return; - - const dropzone = $formDropzone.dropzone({ - url: uploadsPath, - dictDefaultMessage: '', - clickable: true, - paramName: 'file', - maxFilesize: maxFileSize, - uploadMultiple: false, - headers: csrf.headers, - previewContainer: false, - processing: function() { - return $('.div-dropzone-alert').alert('close'); - }, - dragover: function() { - $mdArea.addClass('is-dropzone-hover'); - form.find('.div-dropzone-hover').css('opacity', 0.7); - }, - dragleave: function() { - $mdArea.removeClass('is-dropzone-hover'); - form.find('.div-dropzone-hover').css('opacity', 0); - }, - drop: function() { - $mdArea.removeClass('is-dropzone-hover'); - form.find('.div-dropzone-hover').css('opacity', 0); - formTextarea.focus(); - }, - success: function(header, response) { - const processingFileCount = this.getQueuedFiles().length + this.getUploadingFiles().length; - const shouldPad = processingFileCount >= 1; - - pasteText(response.link.markdown, shouldPad); - // Show 'Attach a file' link only when all files have been uploaded. - if (!processingFileCount) $attachButton.removeClass('hide'); - addFileToForm(response.link.url); - }, - error: function(file, errorMessage = 'Attaching the file failed.', xhr) { - // If 'error' event is fired by dropzone, the second parameter is error message. - // If the 'errorMessage' parameter is empty, the default error message is set. - // If the 'error' event is fired by backend (xhr) error response, the third parameter is - // xhr object (xhr.responseText is error message). - // On error we hide the 'Attach' and 'Cancel' buttons - // and show an error. - - // If there's xhr error message, let's show it instead of dropzone's one. - const message = xhr ? xhr.responseText : errorMessage; - - $uploadingErrorContainer.removeClass('hide'); - $uploadingErrorMessage.html(message); - $attachButton.addClass('hide'); - $cancelButton.addClass('hide'); - }, - totaluploadprogress: function(totalUploadProgress) { - updateAttachingMessage(this.files, $attachingFileMessage); - $uploadProgress.text(Math.round(totalUploadProgress) + '%'); - }, - sending: function(file) { - // DOM elements already exist. - // Instead of dynamically generating them, - // we just either hide or show them. - $attachButton.addClass('hide'); - $uploadingErrorContainer.addClass('hide'); - $uploadingProgressContainer.removeClass('hide'); - $cancelButton.removeClass('hide'); - }, - removedfile: function() { - $attachButton.removeClass('hide'); - $cancelButton.addClass('hide'); - $uploadingProgressContainer.addClass('hide'); - $uploadingErrorContainer.addClass('hide'); - }, - queuecomplete: function() { - $('.dz-preview').remove(); - $('.markdown-area').trigger('input'); +export default function dropzoneInput(form) { + const divHover = '<div class="div-dropzone-hover"></div>'; + const iconPaperclip = '<i class="fa fa-paperclip div-dropzone-icon"></i>'; + const $attachButton = form.find('.button-attach-file'); + const $attachingFileMessage = form.find('.attaching-file-message'); + const $cancelButton = form.find('.button-cancel-uploading-files'); + const $retryLink = form.find('.retry-uploading-link'); + const $uploadProgress = form.find('.uploading-progress'); + const $uploadingErrorContainer = form.find('.uploading-error-container'); + const $uploadingErrorMessage = form.find('.uploading-error-message'); + const $uploadingProgressContainer = form.find('.uploading-progress-container'); + const uploadsPath = window.uploads_path || null; + const maxFileSize = gon.max_file_size || 10; + const formTextarea = form.find('.js-gfm-input'); + let handlePaste; + let pasteText; + let addFileToForm; + let updateAttachingMessage; + let isImage; + let getFilename; + let uploadFile; + + formTextarea.wrap('<div class="div-dropzone"></div>'); + formTextarea.on('paste', event => handlePaste(event)); + + // Add dropzone area to the form. + const $mdArea = formTextarea.closest('.md-area'); + form.setupMarkdownPreview(); + const $formDropzone = form.find('.div-dropzone'); + $formDropzone.parent().addClass('div-dropzone-wrapper'); + $formDropzone.append(divHover); + $formDropzone.find('.div-dropzone-hover').append(iconPaperclip); + + if (!uploadsPath) return; + + const dropzone = $formDropzone.dropzone({ + url: uploadsPath, + dictDefaultMessage: '', + clickable: true, + paramName: 'file', + maxFilesize: maxFileSize, + uploadMultiple: false, + headers: csrf.headers, + previewContainer: false, + processing: () => $('.div-dropzone-alert').alert('close'), + dragover: () => { + $mdArea.addClass('is-dropzone-hover'); + form.find('.div-dropzone-hover').css('opacity', 0.7); + }, + dragleave: () => { + $mdArea.removeClass('is-dropzone-hover'); + form.find('.div-dropzone-hover').css('opacity', 0); + }, + drop: () => { + $mdArea.removeClass('is-dropzone-hover'); + form.find('.div-dropzone-hover').css('opacity', 0); + formTextarea.focus(); + }, + success(header, response) { + const processingFileCount = this.getQueuedFiles().length + this.getUploadingFiles().length; + const shouldPad = processingFileCount >= 1; + + pasteText(response.link.markdown, shouldPad); + // Show 'Attach a file' link only when all files have been uploaded. + if (!processingFileCount) $attachButton.removeClass('hide'); + addFileToForm(response.link.url); + }, + error: (file, errorMessage = 'Attaching the file failed.', xhr) => { + // If 'error' event is fired by dropzone, the second parameter is error message. + // If the 'errorMessage' parameter is empty, the default error message is set. + // If the 'error' event is fired by backend (xhr) error response, the third parameter is + // xhr object (xhr.responseText is error message). + // On error we hide the 'Attach' and 'Cancel' buttons + // and show an error. + + // If there's xhr error message, let's show it instead of dropzone's one. + const message = xhr ? xhr.responseText : errorMessage; - $uploadingProgressContainer.addClass('hide'); - $cancelButton.addClass('hide'); + $uploadingErrorContainer.removeClass('hide'); + $uploadingErrorMessage.html(message); + $attachButton.addClass('hide'); + $cancelButton.addClass('hide'); + }, + totaluploadprogress(totalUploadProgress) { + updateAttachingMessage(this.files, $attachingFileMessage); + $uploadProgress.text(`${Math.round(totalUploadProgress)}%`); + }, + sending: () => { + // DOM elements already exist. + // Instead of dynamically generating them, + // we just either hide or show them. + $attachButton.addClass('hide'); + $uploadingErrorContainer.addClass('hide'); + $uploadingProgressContainer.removeClass('hide'); + $cancelButton.removeClass('hide'); + }, + removedfile: () => { + $attachButton.removeClass('hide'); + $cancelButton.addClass('hide'); + $uploadingProgressContainer.addClass('hide'); + $uploadingErrorContainer.addClass('hide'); + }, + queuecomplete: () => { + $('.dz-preview').remove(); + $('.markdown-area').trigger('input'); + + $uploadingProgressContainer.addClass('hide'); + $cancelButton.addClass('hide'); + }, + }); + + const child = $(dropzone[0]).children('textarea'); + + // removeAllFiles(true) stops uploading files (if any) + // and remove them from dropzone files queue. + $cancelButton.on('click', (e) => { + const target = e.target.closest('.js-main-target-form').querySelector('.div-dropzone'); + + e.preventDefault(); + e.stopPropagation(); + Dropzone.forElement(target).removeAllFiles(true); + }); + + // If 'error' event is fired, we store a failed files, + // clear dropzone files queue, change status of failed files to undefined, + // and add that files to the dropzone files queue again. + // addFile() adds file to dropzone files queue and upload it. + $retryLink.on('click', (e) => { + const dropzoneInstance = Dropzone.forElement(e.target.closest('.js-main-target-form').querySelector('.div-dropzone')); + const failedFiles = dropzoneInstance.files; + + e.preventDefault(); + + // 'true' parameter of removeAllFiles() cancels + // uploading of files that are being uploaded at the moment. + dropzoneInstance.removeAllFiles(true); + + failedFiles.map((failedFile) => { + const file = failedFile; + + if (file.status === Dropzone.ERROR) { + file.status = undefined; + file.accepted = undefined; } - }); - - const child = $(dropzone[0]).children('textarea'); - - // removeAllFiles(true) stops uploading files (if any) - // and remove them from dropzone files queue. - $cancelButton.on('click', (e) => { - const target = e.target.closest('.js-main-target-form').querySelector('.div-dropzone'); - - e.preventDefault(); - e.stopPropagation(); - Dropzone.forElement(target).removeAllFiles(true); - }); - - // If 'error' event is fired, we store a failed files, - // clear dropzone files queue, change status of failed files to undefined, - // and add that files to the dropzone files queue again. - // addFile() adds file to dropzone files queue and upload it. - $retryLink.on('click', (e) => { - const dropzoneInstance = Dropzone.forElement(e.target.closest('.js-main-target-form').querySelector('.div-dropzone')); - const failedFiles = dropzoneInstance.files; - e.preventDefault(); - - // 'true' parameter of removeAllFiles() cancels uploading of files that are being uploaded at the moment. - dropzoneInstance.removeAllFiles(true); - - failedFiles.map((failedFile, i) => { - const file = failedFile; - - if (file.status === Dropzone.ERROR) { - file.status = undefined; - file.accepted = undefined; - } - - return dropzoneInstance.addFile(file); - }); + return dropzoneInstance.addFile(file); }); - - handlePaste = function(event) { - var filename, image, pasteEvent, text; - pasteEvent = event.originalEvent; - if (pasteEvent.clipboardData && pasteEvent.clipboardData.items) { - image = isImage(pasteEvent); - if (image) { - event.preventDefault(); - filename = getFilename(pasteEvent) || 'image.png'; - text = `{{${filename}}}`; - pasteText(text); - return uploadFile(image.getAsFile(), filename); - } + }); + // eslint-disable-next-line consistent-return + handlePaste = (event) => { + const pasteEvent = event.originalEvent; + if (pasteEvent.clipboardData && pasteEvent.clipboardData.items) { + const image = isImage(pasteEvent); + if (image) { + event.preventDefault(); + const filename = getFilename(pasteEvent) || 'image.png'; + const text = `{{${filename}}}`; + pasteText(text); + return uploadFile(image.getAsFile(), filename); } - }; - - isImage = function(data) { - var i, item; - i = 0; - while (i < data.clipboardData.items.length) { - item = data.clipboardData.items[i]; - if (item.type.indexOf('image') !== -1) { - return item; - } - i += 1; - } - return false; - }; - - pasteText = function(text, shouldPad) { - var afterSelection, beforeSelection, caretEnd, caretStart, textEnd; - var formattedText = text; - if (shouldPad) formattedText += "\n\n"; - const textarea = child.get(0); - caretStart = textarea.selectionStart; - caretEnd = textarea.selectionEnd; - textEnd = $(child).val().length; - beforeSelection = $(child).val().substring(0, caretStart); - afterSelection = $(child).val().substring(caretEnd, textEnd); - $(child).val(beforeSelection + formattedText + afterSelection); - textarea.setSelectionRange(caretStart + formattedText.length, caretEnd + formattedText.length); - textarea.style.height = `${textarea.scrollHeight}px`; - formTextarea.get(0).dispatchEvent(new Event('input')); - return formTextarea.trigger('input'); - }; - - addFileToForm = function(path) { - $(form).append('<input type="hidden" name="files[]" value="' + _.escape(path) + '">'); - }; - - getFilename = function(e) { - var value; - if (window.clipboardData && window.clipboardData.getData) { - value = window.clipboardData.getData('Text'); - } else if (e.clipboardData && e.clipboardData.getData) { - value = e.clipboardData.getData('text/plain'); - } - value = value.split("\r"); - return value[0]; - }; - - const showSpinner = function(e) { - return $uploadingProgressContainer.removeClass('hide'); - }; - - const closeSpinner = function() { - return $uploadingProgressContainer.addClass('hide'); - }; - - const showError = function(message) { - $uploadingErrorContainer.removeClass('hide'); - $uploadingErrorMessage.html(message); - }; - - const closeAlertMessage = function() { - return form.find('.div-dropzone-alert').alert('close'); - }; - - const insertToTextArea = function(filename, url) { - const $child = $(child); - $child.val(function(index, val) { - return val.replace(`{{${filename}}}`, url); - }); - - $child.trigger('change'); - }; - - const appendToTextArea = function(url) { - return $(child).val(function(index, val) { - return val + url + "\n"; - }); - }; - - uploadFile = function(item, filename) { - var formData; - formData = new FormData(); - formData.append('file', item, filename); - return $.ajax({ - url: uploadsPath, - type: 'POST', - data: formData, - dataType: 'json', - processData: false, - contentType: false, - headers: csrf.headers, - beforeSend: function() { - showSpinner(); - return closeAlertMessage(); - }, - success: function(e, textStatus, response) { - return insertToTextArea(filename, response.responseJSON.link.markdown); - }, - error: function(response) { - return showError(response.responseJSON.message); - }, - complete: function() { - return closeSpinner(); - } - }); - }; - - updateAttachingMessage = (files, messageContainer) => { - let attachingMessage; - const filesCount = files.filter(function(file) { - return file.status === 'uploading' || - file.status === 'queued'; - }).length; - - // Dinamycally change uploading files text depending on files number in - // dropzone files queue. - if (filesCount > 1) { - attachingMessage = 'Attaching ' + filesCount + ' files -'; - } else { - attachingMessage = 'Attaching a file -'; + } + }; + + isImage = (data) => { + let i = 0; + while (i < data.clipboardData.items.length) { + const item = data.clipboardData.items[i]; + if (item.type.indexOf('image') !== -1) { + return item; } - - messageContainer.text(attachingMessage); - }; - - form.find('.markdown-selector').click(function(e) { - e.preventDefault(); - $(this).closest('.gfm-form').find('.div-dropzone').click(); - formTextarea.focus(); + i += 1; + } + return false; + }; + + pasteText = (text, shouldPad) => { + let formattedText = text; + if (shouldPad) { + formattedText += '\n\n'; + } + const textarea = child.get(0); + const caretStart = textarea.selectionStart; + const caretEnd = textarea.selectionEnd; + const textEnd = $(child).val().length; + const beforeSelection = $(child).val().substring(0, caretStart); + const afterSelection = $(child).val().substring(caretEnd, textEnd); + $(child).val(beforeSelection + formattedText + afterSelection); + textarea.setSelectionRange(caretStart + formattedText.length, caretEnd + formattedText.length); + textarea.style.height = `${textarea.scrollHeight}px`; + formTextarea.get(0).dispatchEvent(new Event('input')); + return formTextarea.trigger('input'); + }; + + addFileToForm = (path) => { + $(form).append(`<input type="hidden" name="files[]" value="${_.escape(path)}">`); + }; + + getFilename = (e) => { + let value; + if (window.clipboardData && window.clipboardData.getData) { + value = window.clipboardData.getData('Text'); + } else if (e.clipboardData && e.clipboardData.getData) { + value = e.clipboardData.getData('text/plain'); + } + value = value.split('\r'); + return value[0]; + }; + + const showSpinner = () => $uploadingProgressContainer.removeClass('hide'); + + const closeSpinner = () => $uploadingProgressContainer.addClass('hide'); + + const showError = (message) => { + $uploadingErrorContainer.removeClass('hide'); + $uploadingErrorMessage.html(message); + }; + + const closeAlertMessage = () => form.find('.div-dropzone-alert').alert('close'); + + const insertToTextArea = (filename, url) => { + const $child = $(child); + $child.val((index, val) => val.replace(`{{${filename}}}`, url)); + + $child.trigger('change'); + }; + + uploadFile = (item, filename) => { + const formData = new FormData(); + formData.append('file', item, filename); + return $.ajax({ + url: uploadsPath, + type: 'POST', + data: formData, + dataType: 'json', + processData: false, + contentType: false, + headers: csrf.headers, + beforeSend: () => { + showSpinner(); + return closeAlertMessage(); + }, + success: (e, text, response) => { + const md = response.responseJSON.link.markdown; + insertToTextArea(filename, md); + }, + error: response => showError(response.responseJSON.message), + complete: () => closeSpinner(), }); - } - - return DropzoneInput; -})(); + }; + + updateAttachingMessage = (files, messageContainer) => { + let attachingMessage; + const filesCount = files.filter(file => file.status === 'uploading' || file.status === 'queued').length; + + // Dinamycally change uploading files text depending on files number in + // dropzone files queue. + if (filesCount > 1) { + attachingMessage = `Attaching ${filesCount} files -`; + } else { + attachingMessage = 'Attaching a file -'; + } + + messageContainer.text(attachingMessage); + }; + + form.find('.markdown-selector').click(function onMarkdownClick(e) { + e.preventDefault(); + $(this).closest('.gfm-form').find('.div-dropzone').click(); + formTextarea.focus(); + }); +} diff --git a/app/assets/javascripts/files_comment_button.js b/app/assets/javascripts/files_comment_button.js index a00d29a845a..90020344748 100644 --- a/app/assets/javascripts/files_comment_button.js +++ b/app/assets/javascripts/files_comment_button.js @@ -1,6 +1,3 @@ -/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, max-len, one-var, one-var-declaration-per-line, quotes, prefer-template, newline-per-chained-call, comma-dangle, new-cap, no-else-return, consistent-return */ -/* global notes */ - /* Developer beware! Do not add logic to showButton or hideButton * that will force a reflow. Doing so will create a signficant performance * bottleneck for pages with large diffs. For a comprehensive list of what @@ -20,8 +17,10 @@ const DIFF_EXPANDED_CLASS = 'diff-expanded'; export default { init($diffFile) { - /* Caching is used only when the following members are *true*. This is because there are likely to be - * differently configured versions of diffs in the same session. However if these values are true, they + /* Caching is used only when the following members are *true*. + * This is because there are likely to be + * differently configured versions of diffs in the same session. + * However if these values are true, they * will be true in all cases */ if (!this.userCanCreateNote) { diff --git a/app/assets/javascripts/gl_form.js b/app/assets/javascripts/gl_form.js index 48d0c12143a..48cd43d3348 100644 --- a/app/assets/javascripts/gl_form.js +++ b/app/assets/javascripts/gl_form.js @@ -1,7 +1,7 @@ -/* global DropzoneInput */ /* global autosize */ import GfmAutoComplete from './gfm_auto_complete'; +import dropzoneInput from './dropzone_input'; export default class GLForm { constructor(form, enableGFM = false) { @@ -41,7 +41,7 @@ export default class GLForm { mergeRequests: this.enableGFM, labels: this.enableGFM, }); - new DropzoneInput(this.form); // eslint-disable-line no-new + dropzoneInput(this.form); autosize(this.textarea); } // form and textarea event listeners diff --git a/app/assets/javascripts/issue_show/components/fields/title.vue b/app/assets/javascripts/issue_show/components/fields/title.vue index 83af8e1e245..c3abb9fd9d5 100644 --- a/app/assets/javascripts/issue_show/components/fields/title.vue +++ b/app/assets/javascripts/issue_show/components/fields/title.vue @@ -16,15 +16,15 @@ <fieldset> <label class="sr-only" - for="issue-title"> + for="issuable-title"> Title </label> <input - id="issue-title" + id="issuable-title" class="form-control" type="text" - placeholder="Issue title" - aria-label="Issue title" + placeholder="Title" + aria-label="Title" v-model="formState.title" @keydown.meta.enter="updateIssuable" @keydown.ctrl.enter="updateIssuable" /> diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 4cf07e99161..6b13fda0d44 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -50,8 +50,6 @@ import './compare_autocomplete'; import './confirm_danger_modal'; import './copy_as_gfm'; import './copy_to_clipboard'; -import './diff'; -import './files_comment_button'; import Flash, { removeFlashClickListener } from './flash'; import './gl_dropdown'; import './gl_field_error'; diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index df042c7baff..789ccf48190 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -11,8 +11,8 @@ import { handleLocationHash, isMetaClick, } from './lib/utils/common_utils'; - import initDiscussionTab from './image_diff/init_discussion_tab'; +import Diff from './diff'; /* eslint-disable max-len */ // MergeRequestTabs @@ -292,7 +292,7 @@ import initDiscussionTab from './image_diff/init_discussion_tab'; } this.diffsLoaded = true; - new gl.Diff(); + new Diff(); this.scrollToElement('#diffs'); $('.diff-file').each((i, el) => { diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js index 790f78d2e11..9c008da1a5d 100644 --- a/app/assets/javascripts/notes.js +++ b/app/assets/javascripts/notes.js @@ -13,7 +13,6 @@ import $ from 'jquery'; import _ from 'underscore'; import Cookies from 'js-cookie'; import autosize from 'vendor/autosize'; -import Dropzone from 'dropzone'; import 'vendor/jquery.caret'; // required by jquery.atwho import 'vendor/jquery.atwho'; import AjaxCache from '~/lib/utils/ajax_cache'; @@ -22,13 +21,11 @@ import CommentTypeToggle from './comment_type_toggle'; import GLForm from './gl_form'; import loadAwardsHandler from './awards_handler'; import './autosave'; -import './dropzone_input'; import TaskList from './task_list'; import { ajaxPost, isInViewport, getPagePath, scrollToElement, isMetaKey } from './lib/utils/common_utils'; import imageDiffHelper from './image_diff/helpers/index'; window.autosize = autosize; -window.Dropzone = Dropzone; function normalizeNewlines(str) { return str.replace(/\r\n/g, '\n'); diff --git a/app/assets/javascripts/registry/components/collapsible_container.vue b/app/assets/javascripts/registry/components/collapsible_container.vue index 41ea9742406..ac1c3ec253c 100644 --- a/app/assets/javascripts/registry/components/collapsible_container.vue +++ b/app/assets/javascripts/registry/components/collapsible_container.vue @@ -57,7 +57,7 @@ }, showError(message) { - Flash((errorMessages[message])); + Flash(errorMessages[message]); }, }, }; diff --git a/app/assets/javascripts/registry/components/table_registry.vue b/app/assets/javascripts/registry/components/table_registry.vue index 4ce1571b0aa..e917279947e 100644 --- a/app/assets/javascripts/registry/components/table_registry.vue +++ b/app/assets/javascripts/registry/components/table_registry.vue @@ -57,7 +57,7 @@ }, showError(message) { - Flash((errorMessages[message])); + Flash(errorMessages[message]); }, }, }; diff --git a/app/assets/javascripts/registry/stores/actions.js b/app/assets/javascripts/registry/stores/actions.js index 34ed40b8b65..795b39bb3dc 100644 --- a/app/assets/javascripts/registry/stores/actions.js +++ b/app/assets/javascripts/registry/stores/actions.js @@ -29,11 +29,9 @@ export const fetchList = ({ commit }, { repo, page }) => { }); }; -export const deleteRepo = ({ commit }, repo) => Vue.http.delete(repo.destroyPath) - .then(res => res.json()); +export const deleteRepo = ({ commit }, repo) => Vue.http.delete(repo.destroyPath); -export const deleteRegistry = ({ commit }, image) => Vue.http.delete(image.destroyPath) - .then(res => res.json()); +export const deleteRegistry = ({ commit }, image) => Vue.http.delete(image.destroyPath); export const setMainEndpoint = ({ commit }, data) => commit(types.SET_MAIN_ENDPOINT, data); export const toggleLoading = ({ commit }) => commit(types.TOGGLE_MAIN_LOADING); diff --git a/app/assets/javascripts/repo/components/repo_file.vue b/app/assets/javascripts/repo/components/repo_file.vue index c7e69340f17..8c86e87ed3a 100644 --- a/app/assets/javascripts/repo/components/repo_file.vue +++ b/app/assets/javascripts/repo/components/repo_file.vue @@ -28,6 +28,9 @@ marginLeft: `${this.file.level * 16}px`, }; }, + shortId() { + return this.file.id.substr(0, 8); + }, }, methods: { linkClicked(file) { @@ -55,6 +58,17 @@ > {{ file.name }} </a> + <template v-if="file.type === 'submodule' && file.id"> + @ + <span class="commit-sha"> + <a + @click.stop + :href="file.tree_url" + > + {{ shortId }} + </a> + </span> + </template> </td> <template v-if="!isMini"> @@ -69,7 +83,10 @@ </td> <td class="commit-update hidden-xs text-right"> - <span :title="tooltipTitle(file.lastCommit.updatedAt)"> + <span + v-if="file.lastCommit.updatedAt" + :title="tooltipTitle(file.lastCommit.updatedAt)" + > {{ timeFormated(file.lastCommit.updatedAt) }} </span> </td> diff --git a/app/assets/javascripts/repo/components/repo_sidebar.vue b/app/assets/javascripts/repo/components/repo_sidebar.vue index 5832e603907..09dc9ee25d7 100644 --- a/app/assets/javascripts/repo/components/repo_sidebar.vue +++ b/app/assets/javascripts/repo/components/repo_sidebar.vue @@ -74,6 +74,10 @@ export default { if (file.type === 'tree' && file.opened) { Helper.setDirectoryToClosed(file); Store.setActiveLine(lineNumber); + } else if (file.type === 'submodule') { + file.loading = true; + + gl.utils.visitUrl(file.url); } else { const openFile = Helper.getFileFromPath(file.url); diff --git a/app/assets/javascripts/repo/helpers/repo_helper.js b/app/assets/javascripts/repo/helpers/repo_helper.js index dfaf9caaee7..f7b7f93e4b8 100644 --- a/app/assets/javascripts/repo/helpers/repo_helper.js +++ b/app/assets/javascripts/repo/helpers/repo_helper.js @@ -95,7 +95,7 @@ const RepoHelper = { return Service.getContent() .then((response) => { const data = response.data; - if (response.headers && response.headers['page-title']) data.pageTitle = response.headers['page-title']; + if (response.headers && response.headers['page-title']) data.pageTitle = decodeURI(response.headers['page-title']); if (response.headers && response.headers['is-root'] && !Store.isInitialRoot) { Store.isRoot = convertPermissionToBoolean(response.headers['is-root']); Store.isInitialRoot = Store.isRoot; @@ -157,12 +157,14 @@ const RepoHelper = { }, serializeRepoEntity(type, entity, level = 0) { - const { url, name, icon, last_commit } = entity; + const { id, url, name, icon, last_commit, tree_url } = entity; return { + id, type, name, url, + tree_url, level, icon: `fa-${icon}`, files: [], diff --git a/app/assets/javascripts/zen_mode.js b/app/assets/javascripts/zen_mode.js index 99c7644e4d9..cba7b9227cd 100644 --- a/app/assets/javascripts/zen_mode.js +++ b/app/assets/javascripts/zen_mode.js @@ -11,8 +11,6 @@ import Dropzone from 'dropzone'; import 'mousetrap'; import 'mousetrap/plugins/pause/mousetrap-pause'; -window.Dropzone = Dropzone; - // // ### Events // diff --git a/app/assets/stylesheets/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss index 374988bb590..81439c0d2fe 100644 --- a/app/assets/stylesheets/framework/animations.scss +++ b/app/assets/stylesheets/framework/animations.scss @@ -23,6 +23,11 @@ @include webkit-prefix(animation-duration, 2s); } + &.spin { + transform-origin: center; + animation: spin 4s linear infinite; + } + &.flipOutX, &.flipOutY, &.bounceIn, @@ -271,3 +276,9 @@ a { transform: translateX(468px); } } + +@keyframes spin { + 100% { + transform: rotate(360deg); + } +} diff --git a/app/assets/stylesheets/framework/new-sidebar.scss b/app/assets/stylesheets/framework/new-sidebar.scss index 17fa31c450d..7a309f2c8a1 100644 --- a/app/assets/stylesheets/framework/new-sidebar.scss +++ b/app/assets/stylesheets/framework/new-sidebar.scss @@ -6,7 +6,7 @@ $active-background: rgba(0, 0, 0, .04); $active-hover-background: $active-background; $active-hover-color: $gl-text-color; $inactive-badge-background: rgba(0, 0, 0, .08); -$hover-background: $white-light; +$hover-background: rgba(0, 0, 0, .06); $hover-color: $gl-text-color; $inactive-color: $gl-text-color-secondary; $new-sidebar-width: 220px; @@ -330,7 +330,7 @@ $new-sidebar-collapsed-width: 50px; &.active > a:hover, &.is-over > a { - background-color: $white-light; + background-color: $hover-background; } } } @@ -344,7 +344,7 @@ $new-sidebar-collapsed-width: 50px; position: fixed; bottom: 0; padding: 16px; - background-color: $gray-normal; + background-color: $gray-light; border: 0; border-top: 2px solid $border-color; color: $gl-text-color-secondary; diff --git a/app/assets/stylesheets/framework/selects.scss b/app/assets/stylesheets/framework/selects.scss index 50f1445bc2e..621eec4f158 100644 --- a/app/assets/stylesheets/framework/selects.scss +++ b/app/assets/stylesheets/framework/selects.scss @@ -61,6 +61,11 @@ border: 1px solid $dropdown-border-color; min-width: 175px; color: $gl-text-color; + z-index: 999; +} + +.select2-drop-mask { + z-index: 998; } .select2-drop.select2-drop-above.select2-drop-active { diff --git a/app/assets/stylesheets/framework/tooltips.scss b/app/assets/stylesheets/framework/tooltips.scss index 93baf73cb78..98f28987a82 100644 --- a/app/assets/stylesheets/framework/tooltips.scss +++ b/app/assets/stylesheets/framework/tooltips.scss @@ -3,5 +3,5 @@ border-radius: $border-radius-default; line-height: 16px; font-weight: $gl-font-weight-normal; - padding: $gl-btn-padding; + padding: 8px; } diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 967fe39256a..391a0519195 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -349,6 +349,6 @@ class ApplicationController < ActionController::Base def set_page_title_header # Per https://tools.ietf.org/html/rfc5987, headers need to be ISO-8859-1, not UTF-8 - response.headers['Page-Title'] = page_title('GitLab').encode('ISO-8859-1') + response.headers['Page-Title'] = URI.escape(page_title('GitLab')) end end diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index e23a82d01be..bc3e95f1aed 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -141,6 +141,17 @@ class GroupsController < Groups::ApplicationController end def load_events + params[:sort] ||= 'latest_activity_desc' + + options = {} + options[:only_owned] = true if params[:shared] == '0' + options[:only_shared] = true if params[:shared] == '1' + + @projects = GroupProjectsFinder.new(params: params, group: group, options: options, current_user: current_user) + .execute + .includes(:namespace) + .page(params[:page]) + @events = EventCollection .new(@projects, offset: params[:offset].to_i, filter: event_filter) .to_a diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb index 4a841bf2073..d48284a4429 100644 --- a/app/controllers/projects/commits_controller.rb +++ b/app/controllers/projects/commits_controller.rb @@ -48,6 +48,8 @@ class Projects::CommitsController < Projects::ApplicationController private def set_commits + render_404 unless request.format == :atom || @repository.blob_at(@commit.id, @path) || @repository.tree(@commit.id, @path).entries.present? + @limit, @offset = (params[:limit] || 40).to_i, (params[:offset] || 0).to_i search = params[:search] diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 20e050195ea..d085c1a0e57 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -15,7 +15,7 @@ module ProjectsHelper end def link_to_member_avatar(author, opts = {}) - default_opts = { size: 16 } + default_opts = { size: 16, lazy_load: false } opts = default_opts.merge(opts) classes = %W[avatar avatar-inline s#{opts[:size]}] @@ -27,8 +27,26 @@ module ProjectsHelper image_tag(src, width: opts[:size], class: classes, alt: '', "data-src" => avatar) end + def author_content_tag(author, opts = {}) + default_opts = { author_class: 'author', tooltip: false, by_username: false } + opts = default_opts.merge(opts) + + has_tooltip = !opts[:by_username] && opts[:tooltip] + + username = opts[:by_username] ? author.to_reference : author.name + name_tag_options = { class: [opts[:author_class]] } + + if has_tooltip + name_tag_options[:title] = author.to_reference + name_tag_options[:data] = { placement: 'top' } + name_tag_options[:class] << 'has-tooltip' + end + + content_tag(:span, sanitize(username), name_tag_options) + end + def link_to_member(project, author, opts = {}, &block) - default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name", tooltip: false, lazy_load: false } + default_opts = { avatar: true, name: true, title: ":name" } opts = default_opts.merge(opts) return "(deleted)" unless author @@ -39,12 +57,7 @@ module ProjectsHelper author_html << link_to_member_avatar(author, opts) if opts[:avatar] # Build name span tag - if opts[:by_username] - author_html << content_tag(:span, sanitize("@#{author.username}"), class: opts[:author_class]) if opts[:name] - else - tooltip_data = { placement: 'top' } - author_html << content_tag(:span, sanitize(author.name), class: [opts[:author_class], ('has-tooltip' if opts[:tooltip])], title: (author.to_reference if opts[:tooltip]), data: (tooltip_data if opts[:tooltip])) if opts[:name] - end + author_html << author_content_tag(author, opts) if opts[:name] author_html << capture(&block) if block diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index d3b8debb0fd..4dda276bb41 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -203,7 +203,10 @@ class ApplicationSetting < ActiveRecord::Base ensure_cache_setup Rails.cache.fetch(CACHE_KEY) do - ApplicationSetting.last + ApplicationSetting.last.tap do |settings| + # do not cache nils + raise 'missing settings' unless settings + end end rescue # Fall back to an uncached value if there are any problems (e.g. redis down) diff --git a/app/models/ci/artifact_blob.rb b/app/models/ci/artifact_blob.rb index 8b66531ec7b..ec56cc53aea 100644 --- a/app/models/ci/artifact_blob.rb +++ b/app/models/ci/artifact_blob.rb @@ -2,7 +2,7 @@ module Ci class ArtifactBlob include BlobLike - EXTENTIONS_SERVED_BY_PAGES = %w[.html .htm .txt .json].freeze + EXTENSIONS_SERVED_BY_PAGES = %w[.html .htm .txt .json].freeze attr_reader :entry @@ -36,17 +36,22 @@ module Ci def external_url(project, job) return unless external_link?(job) - components = project.full_path_components - components << "-/jobs/#{job.id}/artifacts/file/#{path}" - artifact_path = components[1..-1].join('/') + full_path_parts = project.full_path_components + top_level_group = full_path_parts.shift - "#{pages_config.protocol}://#{components[0]}.#{pages_config.host}/#{artifact_path}" + artifact_path = [ + '-', *full_path_parts, '-', + 'jobs', job.id, + 'artifacts', path + ].join('/') + + "#{pages_config.protocol}://#{top_level_group}.#{pages_config.host}/#{artifact_path}" end def external_link?(job) pages_config.enabled && pages_config.artifacts_server && - EXTENTIONS_SERVED_BY_PAGES.include?(File.extname(name)) && + EXTENSIONS_SERVED_BY_PAGES.include?(File.extname(name)) && job.project.public? end diff --git a/app/serializers/container_tag_entity.rb b/app/serializers/container_tag_entity.rb index 26a68c43807..8f1488e6cbb 100644 --- a/app/serializers/container_tag_entity.rb +++ b/app/serializers/container_tag_entity.rb @@ -4,7 +4,7 @@ class ContainerTagEntity < Grape::Entity expose :name, :location, :revision, :short_revision, :total_size, :created_at expose :destroy_path, if: -> (*) { can_destroy? } do |tag| - project_registry_repository_tag_path(project, tag.repository, tag.name, format: :json) + project_registry_repository_tag_path(project, tag.repository, tag.name) end private diff --git a/app/serializers/submodule_entity.rb b/app/serializers/submodule_entity.rb index 9a7eb5e7880..ed1f1ae0ef0 100644 --- a/app/serializers/submodule_entity.rb +++ b/app/serializers/submodule_entity.rb @@ -7,7 +7,7 @@ class SubmoduleEntity < Grape::Entity 'archive' end - expose :project_url do |blob| + expose :url do |blob| submodule_links(blob, request).first end diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index 19d75ff2efa..81972df9b3c 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -51,7 +51,7 @@ module Projects end def wiki_path - repo_path + '.wiki' + project.wiki.disk_path end def trash_repositories! diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index 578e751ab47..0f03163a2e8 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -44,4 +44,4 @@ = render "discussions/diff_with_notes", discussion: discussion - else .panel.panel-default - = render "discussions/notes", discussion: discussion + = render partial: "discussions/notes", locals: { discussion: discussion, disable_collapse_class: true } diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index 07e64d9aeaf..00909982d59 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -19,13 +19,6 @@ = render 'shared/issuable/search_bar', type: :issues - .row-content-block.second-block - Only issues from the - %strong= @group.name - group are listed here. - - if current_user - To see all issues you should visit #{link_to 'dashboard', issues_dashboard_path} page. - = render 'shared/issues' - else = render 'shared/empty_states/issues', project_select_button: true diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index e56dc1fb9c2..694292aa7c1 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -15,11 +15,4 @@ = render 'shared/issuable/search_bar', type: :merge_requests - .row-content-block.second-block - Only merge requests from - %strong= @group.name - group are listed here. - - if current_user - To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page. - = render 'shared/merge_requests' diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 759d6ff68ea..f82207559a3 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -272,6 +272,11 @@ = sprite_icon('users') %span.nav-item-name Members + %ul.sidebar-sub-level-items.is-fly-out-only + = nav_link(path: %w[members#show], html_options: { class: "fly-out-top-item" } ) do + = link_to project_settings_members_path(@project) do + %strong.fly-out-top-item-name + #{ _('Members') } = render 'shared/sidebar_toggle_button' diff --git a/app/views/shared/icons/_icon_autodevops.svg b/app/views/shared/icons/_icon_autodevops.svg index 7e47c084bde..dde84e14048 100644 --- a/app/views/shared/icons/_icon_autodevops.svg +++ b/app/views/shared/icons/_icon_autodevops.svg @@ -29,7 +29,7 @@ </g> <g fill-rule="nonzero" transform="rotate(15 -315.035 277.714)"> <path fill="#FFFFFF" d="M12.275,10.57 C13.986216,9.15630755 15.921048,8.03765363 18,7.26 L18,5.5 C18,2.463 20.47,0 23.493,0 L26.507,0 C27.9648848,0.000530018716 29.3628038,0.580386367 30.3930274,1.61192286 C31.4232511,2.64345935 32.0013267,4.04211574 32,5.5 L32,7.26 C34.098,8.043 36.03,9.17 37.725,10.57 L39.253,9.688 C41.8816141,8.17268496 45.2407537,9.07039379 46.763,11.695 L48.27,14.305 C48.9984289,15.5678669 49.1951495,17.0684426 48.8168566,18.4763972 C48.4385638,19.8843518 47.5162683,21.0842673 46.253,21.812 L44.728,22.693 C44.907,23.769 45,24.873 45,26 C45,27.127 44.907,28.231 44.728,29.307 L46.253,30.187 C48.8800379,31.705769 49.7822744,35.0642181 48.27,37.695 L46.763,40.305 C46.0335844,41.5673849 44.8323832,42.4881439 43.4238487,42.8645658 C42.0153143,43.2409877 40.5149245,43.0422119 39.253,42.312 L37.725,41.43 C36.013784,42.8436924 34.078952,43.9623464 32,44.74 L32,46.5 C32,49.537 29.53,52 26.507,52 L23.493,52 C22.0351152,51.99947 20.6371962,51.4196136 19.6069726,50.3880771 C18.5767489,49.3565406 17.9986733,47.9578843 18,46.5 L18,44.74 C15.921048,43.9623464 13.986216,42.8436924 12.275,41.43 L10.747,42.312 C8.11838594,43.827315 4.75924629,42.9296062 3.237,40.305 L1.73,37.695 C1.00157113,36.4321331 0.804850523,34.9315574 1.18314337,33.5236028 C1.56143621,32.1156482 2.48373172,30.9157327 3.747,30.188 L5.272,29.307 C5.09051204,28.2140265 4.9995366,27.107939 5,26 C5,24.873 5.093,23.769 5.272,22.693 L3.747,21.813 C1.11996213,20.294231 0.217725591,16.9357819 1.73,14.305 L3.237,11.695 C3.96641559,10.4326151 5.16761682,9.51185609 6.57615125,9.13543417 C7.98468568,8.75901226 9.48507553,8.95778814 10.747,9.688 L12.275,10.57 Z"/> - <path fill="#E1DBF1" d="M17.9996486,7.25963195 L18.0000013,5.49772675 C18.0034459,2.46713881 20.4561478,0.00952173148 23.493,0 L26.507,0 C29.542757,0 32,2.46161709 32,5.5 L32,7.25850184 C34.0799663,8.03664754 36.0149544,9.15559094 37.7260175,10.5694605 L39.2547869,9.68691874 C41.8812087,8.17416302 45.2363972,9.06948854 46.7630175,11.6949424 L48.270687,14.3061027 C48.9989901,15.569417 49.1952874,17.0704122 48.816349,18.4785295 C48.4374106,19.8866468 47.5143145,21.0864021 46.2530682,21.8120114 L44.7278655,22.6926677 C44.9091017,23.7802451 45,24.8850821 45,26 C45,27.1144218 44.9091826,28.218078 44.7278653,29.3073326 L46.2547984,30.1889888 C48.8778516,31.7070439 49.7801588,35.0599752 48.2700175,37.6950576 L46.7625317,40.3058986 C46.0327098,41.5684739 44.8309328,42.4891542 43.4219037,42.8651509 C42.0128746,43.2411475 40.512172,43.0416186 39.2533538,42.312255 L37.7244858,41.4299789 C36.013753,42.8435912 34.0794396,43.9622923 32.0003514,44.7403681 L31.9999987,46.5022733 C31.9965541,49.5328612 29.5438522,51.9904783 26.507,52 L23.493,52 C20.457243,52 18,49.5383829 18,46.5 L18,44.7414988 C15.9200337,43.9633525 13.9850456,42.8444091 12.2739825,41.4305395 L10.7452131,42.3130813 C8.11879127,43.825837 4.76360277,42.9305115 3.23698247,40.3050576 L1.72931303,37.6938973 C1.0010099,36.430583 0.804712603,34.9295878 1.18365098,33.5214705 C1.56258936,32.1133532 2.48568546,30.9135979 3.74693178,30.1879886 L5.27213454,29.3073323 C5.09089825,28.2197549 5,27.114918 5.00000019,26.0008761 C4.99951488,24.8930059 5.0904571,23.7869854 5.27213502,22.6926675 L3.74520157,21.8110112 C1.12214836,20.2929561 0.219841192,16.9400248 1.72998247,14.3049424 L3.23746831,11.6941014 C3.96729024,10.4315261 5.16906725,9.51084579 6.5780963,9.13484913 C7.98712536,8.75885247 9.48782803,8.95838137 10.7466462,9.687745 L12.2748018,10.56961 C14.0209791,9.13635584 15.9392199,8.03072455 17.9996486,7.25963195 Z M13.7518374,14.537862 C13.108069,15.069723 12.2016163,15.1456339 11.4783538,14.728255 L8.74433999,13.1505123 C8.40103903,12.9516035 7.99274958,12.8973186 7.60940137,12.9996143 C7.22605315,13.10191 6.89909107,13.3523954 6.70101753,13.6950576 L5.19724591,16.2994454 C4.78547321,17.0179634 5.03203388,17.9341714 5.74706822,18.3479886 L8.47306822,19.9219886 C9.19530115,20.3390079 9.58295216,21.1604138 9.44574883,21.983032 L9.21798321,23.3486236 C9.07251948,24.2246212 8.99961081,25.111131 9,26 C9,26.8953847 9.0728258,27.7804297 9.21774883,28.649968 L9.44574883,30.016968 C9.58295216,30.8395862 9.19530115,31.6609921 8.47306822,32.0780114 L5.74435077,33.6535776 C5.40046982,33.851417 5.14932721,34.1778291 5.04623114,34.5609292 C4.94313508,34.9440294 4.9965408,35.3523984 5.19401753,35.6949424 L6.69795587,38.2996585 C7.11427713,39.0156351 8.03110189,39.260288 8.7470791,38.8479035 L11.4770791,37.2719035 C12.200376,36.8543519 13.1069795,36.9302031 13.7508374,37.462138 L14.8210499,38.3463136 C16.1898549,39.4774943 17.737648,40.3725891 19.3990866,40.9941596 L20.6990866,41.4791596 C21.4813437,41.7710017 22,42.5180761 22,43.353 L22,46.5 C22,47.3308348 22.6679761,48 23.493,48 L26.5007228,48.0000099 C27.328845,47.9974107 27.99906,47.3258525 28,46.5 L28,43.353 C28,42.5185702 28.5180515,41.771829 29.2996486,41.4796319 L30.599003,40.9938734 C32.261836,40.3715765 33.8093225,39.4764853 35.1790197,38.3444304 L36.2490197,37.4614304 C36.8927697,36.9301861 37.798736,36.8545694 38.5216462,37.271745 L41.25566,38.8494877 C41.598961,39.0483965 42.0072504,39.1026814 42.3905986,39.0003857 C42.7739468,38.89809 43.1009089,38.6476046 43.2989825,38.3049424 L44.8027541,35.7005546 C45.2145268,34.9820366 44.9679661,34.0658286 44.2529318,33.6520114 L41.5269318,32.0780114 C40.8046988,31.6609921 40.4170478,30.8395862 40.5542512,30.016968 L40.7821577,28.6505288 C40.9272286,27.7792134 41,26.8950523 41,26 C41,25.1046153 40.9271742,24.2195703 40.7822512,23.350032 L40.5542512,21.983032 C40.4170478,21.1604138 40.8046988,20.3390079 41.5269318,19.9219886 L44.2556492,18.3464224 C44.5995302,18.148583 44.8506728,17.8221709 44.9537689,17.4390708 C45.0568649,17.0559706 45.0034592,16.6476016 44.8059825,16.3050576 L43.3020441,13.7003415 C42.8857229,12.9843649 41.9688981,12.739712 41.2529209,13.1520965 L38.5229209,14.7280965 C37.799624,15.1456481 36.8930205,15.0697969 36.2491626,14.537862 L35.1789501,13.6536864 C33.8101451,12.5225057 32.262352,11.6274109 30.6021792,11.0063122 L29.3021792,10.5223122 C28.5192618,10.230826 28,9.48341836 28,8.648 L28,5.5 C28,4.66916515 27.3320239,4 26.507,4 L23.4992772,3.99999015 C22.671155,4.00258933 22.00094,4.67414748 22,5.5 L22,8.647 C22,9.48142977 21.4819485,10.228171 20.7003514,10.5203681 L19.400997,11.0061266 C17.738164,11.6284235 16.1906775,12.5235147 14.822142,13.6546103 C14.8121128,13.6628994 14.4553446,13.9573166 13.7518374,14.537862 Z"/> + <path class="animated spin infinite" fill="#E1DBF1" d="M17.9996486,7.25963195 L18.0000013,5.49772675 C18.0034459,2.46713881 20.4561478,0.00952173148 23.493,0 L26.507,0 C29.542757,0 32,2.46161709 32,5.5 L32,7.25850184 C34.0799663,8.03664754 36.0149544,9.15559094 37.7260175,10.5694605 L39.2547869,9.68691874 C41.8812087,8.17416302 45.2363972,9.06948854 46.7630175,11.6949424 L48.270687,14.3061027 C48.9989901,15.569417 49.1952874,17.0704122 48.816349,18.4785295 C48.4374106,19.8866468 47.5143145,21.0864021 46.2530682,21.8120114 L44.7278655,22.6926677 C44.9091017,23.7802451 45,24.8850821 45,26 C45,27.1144218 44.9091826,28.218078 44.7278653,29.3073326 L46.2547984,30.1889888 C48.8778516,31.7070439 49.7801588,35.0599752 48.2700175,37.6950576 L46.7625317,40.3058986 C46.0327098,41.5684739 44.8309328,42.4891542 43.4219037,42.8651509 C42.0128746,43.2411475 40.512172,43.0416186 39.2533538,42.312255 L37.7244858,41.4299789 C36.013753,42.8435912 34.0794396,43.9622923 32.0003514,44.7403681 L31.9999987,46.5022733 C31.9965541,49.5328612 29.5438522,51.9904783 26.507,52 L23.493,52 C20.457243,52 18,49.5383829 18,46.5 L18,44.7414988 C15.9200337,43.9633525 13.9850456,42.8444091 12.2739825,41.4305395 L10.7452131,42.3130813 C8.11879127,43.825837 4.76360277,42.9305115 3.23698247,40.3050576 L1.72931303,37.6938973 C1.0010099,36.430583 0.804712603,34.9295878 1.18365098,33.5214705 C1.56258936,32.1133532 2.48568546,30.9135979 3.74693178,30.1879886 L5.27213454,29.3073323 C5.09089825,28.2197549 5,27.114918 5.00000019,26.0008761 C4.99951488,24.8930059 5.0904571,23.7869854 5.27213502,22.6926675 L3.74520157,21.8110112 C1.12214836,20.2929561 0.219841192,16.9400248 1.72998247,14.3049424 L3.23746831,11.6941014 C3.96729024,10.4315261 5.16906725,9.51084579 6.5780963,9.13484913 C7.98712536,8.75885247 9.48782803,8.95838137 10.7466462,9.687745 L12.2748018,10.56961 C14.0209791,9.13635584 15.9392199,8.03072455 17.9996486,7.25963195 Z M13.7518374,14.537862 C13.108069,15.069723 12.2016163,15.1456339 11.4783538,14.728255 L8.74433999,13.1505123 C8.40103903,12.9516035 7.99274958,12.8973186 7.60940137,12.9996143 C7.22605315,13.10191 6.89909107,13.3523954 6.70101753,13.6950576 L5.19724591,16.2994454 C4.78547321,17.0179634 5.03203388,17.9341714 5.74706822,18.3479886 L8.47306822,19.9219886 C9.19530115,20.3390079 9.58295216,21.1604138 9.44574883,21.983032 L9.21798321,23.3486236 C9.07251948,24.2246212 8.99961081,25.111131 9,26 C9,26.8953847 9.0728258,27.7804297 9.21774883,28.649968 L9.44574883,30.016968 C9.58295216,30.8395862 9.19530115,31.6609921 8.47306822,32.0780114 L5.74435077,33.6535776 C5.40046982,33.851417 5.14932721,34.1778291 5.04623114,34.5609292 C4.94313508,34.9440294 4.9965408,35.3523984 5.19401753,35.6949424 L6.69795587,38.2996585 C7.11427713,39.0156351 8.03110189,39.260288 8.7470791,38.8479035 L11.4770791,37.2719035 C12.200376,36.8543519 13.1069795,36.9302031 13.7508374,37.462138 L14.8210499,38.3463136 C16.1898549,39.4774943 17.737648,40.3725891 19.3990866,40.9941596 L20.6990866,41.4791596 C21.4813437,41.7710017 22,42.5180761 22,43.353 L22,46.5 C22,47.3308348 22.6679761,48 23.493,48 L26.5007228,48.0000099 C27.328845,47.9974107 27.99906,47.3258525 28,46.5 L28,43.353 C28,42.5185702 28.5180515,41.771829 29.2996486,41.4796319 L30.599003,40.9938734 C32.261836,40.3715765 33.8093225,39.4764853 35.1790197,38.3444304 L36.2490197,37.4614304 C36.8927697,36.9301861 37.798736,36.8545694 38.5216462,37.271745 L41.25566,38.8494877 C41.598961,39.0483965 42.0072504,39.1026814 42.3905986,39.0003857 C42.7739468,38.89809 43.1009089,38.6476046 43.2989825,38.3049424 L44.8027541,35.7005546 C45.2145268,34.9820366 44.9679661,34.0658286 44.2529318,33.6520114 L41.5269318,32.0780114 C40.8046988,31.6609921 40.4170478,30.8395862 40.5542512,30.016968 L40.7821577,28.6505288 C40.9272286,27.7792134 41,26.8950523 41,26 C41,25.1046153 40.9271742,24.2195703 40.7822512,23.350032 L40.5542512,21.983032 C40.4170478,21.1604138 40.8046988,20.3390079 41.5269318,19.9219886 L44.2556492,18.3464224 C44.5995302,18.148583 44.8506728,17.8221709 44.9537689,17.4390708 C45.0568649,17.0559706 45.0034592,16.6476016 44.8059825,16.3050576 L43.3020441,13.7003415 C42.8857229,12.9843649 41.9688981,12.739712 41.2529209,13.1520965 L38.5229209,14.7280965 C37.799624,15.1456481 36.8930205,15.0697969 36.2491626,14.537862 L35.1789501,13.6536864 C33.8101451,12.5225057 32.262352,11.6274109 30.6021792,11.0063122 L29.3021792,10.5223122 C28.5192618,10.230826 28,9.48341836 28,8.648 L28,5.5 C28,4.66916515 27.3320239,4 26.507,4 L23.4992772,3.99999015 C22.671155,4.00258933 22.00094,4.67414748 22,5.5 L22,8.647 C22,9.48142977 21.4819485,10.228171 20.7003514,10.5203681 L19.400997,11.0061266 C17.738164,11.6284235 16.1906775,12.5235147 14.822142,13.6546103 C14.8121128,13.6628994 14.4553446,13.9573166 13.7518374,14.537862 Z"/> <g transform="rotate(15 -59.137 82.348)"> <circle cx="8" cy="8" r="8" fill="#FFFFFF" transform="translate(.035 6.008)"/> <path fill="#6B4FBB" d="M7.40192379,14.7679492 C2.98364579,14.7679492 -0.598076211,11.1862272 -0.598076211,6.76794919 C-0.598076211,2.34967119 2.98364579,-1.23205081 7.40192379,-1.23205081 C11.8202018,-1.23205081 15.4019238,2.34967119 15.4019238,6.76794919 C15.4019238,11.1862272 11.8202018,14.7679492 7.40192379,14.7679492 Z M7.40192379,10.7679492 C9.61106279,10.7679492 11.4019238,8.97708819 11.4019238,6.76794919 C11.4019238,4.55881019 9.61106279,2.76794919 7.40192379,2.76794919 C5.19278479,2.76794919 3.40192379,4.55881019 3.40192379,6.76794919 C3.40192379,8.97708819 5.19278479,10.7679492 7.40192379,10.7679492 Z"/> @@ -37,7 +37,7 @@ </g> <g fill-rule="nonzero" transform="rotate(15 -402.968 460.884)"> <path fill="#FFFFFF" d="M9.82,8.53730769 C11.1889728,7.39547918 12.7368384,6.49195101 14.4,5.86384615 L14.4,4.44230769 C14.4,1.98934615 16.376,0 18.7944,0 L21.2056,0 C22.3719078,0.00042809204 23.4902431,0.468773604 24.314422,1.30193769 C25.1386009,2.13510179 25.6010613,3.26478579 25.6,4.44230769 L25.6,5.86384615 C27.2784,6.49626923 28.824,7.40653846 30.18,8.53730769 L31.4024,7.82492308 C33.5052912,6.60101478 36.192603,7.32608729 37.4104,9.44596154 L38.616,11.5540385 C39.1987431,12.5740464 39.3561196,13.7860498 39.0534853,14.9232439 C38.750851,16.060438 38.0130146,17.0296006 37.0024,17.6173846 L35.7824,18.3289615 C35.9256,19.1980385 36,20.0897308 36,21 C36,21.9102692 35.9256,22.8019615 35.7824,23.6710385 L37.0024,24.3818077 C39.1040303,25.6085057 39.8258195,28.3210992 38.616,30.4459615 L37.4104,32.5540385 C36.8268675,33.573657 35.8659065,34.317347 34.739079,34.6213801 C33.6122515,34.9254132 32.4119396,34.7648634 31.4024,34.1750769 L30.18,33.4626923 C28.8110272,34.6045208 27.2631616,35.508049 25.6,36.1361538 L25.6,37.5576923 C25.6,40.0106538 23.624,42 21.2056,42 L18.7944,42 C17.6280922,41.9995719 16.5097569,41.5312264 15.685578,40.6980623 C14.8613991,39.8648982 14.3989387,38.7352142 14.4,37.5576923 L14.4,36.1361538 C12.7368384,35.508049 11.1889728,34.6045208 9.82,33.4626923 L8.5976,34.1750769 C6.49470875,35.3989852 3.80739703,34.6739127 2.5896,32.5540385 L1.384,30.4459615 C0.8012569,29.4259536 0.643880418,28.2139502 0.946514692,27.0767561 C1.24914897,25.939562 1.98698538,24.9703994 2.9976,24.3826154 L4.2176,23.6710385 C4.07240963,22.7882521 3.99962928,21.8948738 4,21 C4,20.0897308 4.0744,19.1980385 4.2176,18.3289615 L2.9976,17.6181923 C0.895969702,16.3914943 0.174180473,13.6789008 1.384,11.5540385 L2.5896,9.44596154 C3.17313247,8.42634297 4.13409345,7.682653 5.260921,7.37861991 C6.38774855,7.07458682 7.58806043,7.23513658 8.5976,7.82492308 L9.82,8.53730769 Z"/> - <path fill="#FEE1D3" d="M14.0000007,5.6038043 L14.0000013,4.44005609 C14.0029906,1.78475013 16.1390906,-0.376211234 18.7944,-0.384615385 L21.2056,-0.384615385 C23.8595941,-0.384615385 26,1.78021801 26,4.44230769 L26,5.60295806 C27.5208716,6.20655954 28.9434678,7.03621848 30.2204219,8.06411282 L31.1970056,7.49492104 C33.4941909,6.15907529 36.4301298,6.95005805 37.7609369,9.26076474 L38.9671983,11.3699991 C39.5988409,12.4761812 39.768854,13.7886936 39.4405746,15.0202941 C39.1116282,16.2543969 38.308799,17.3078735 37.2096539,17.946304 L36.2175721,18.5246428 C36.3390841,19.3401617 36.4,20.1667594 36.4,21 C36.4,21.8329668 36.339124,22.6588262 36.2175401,23.4753391 L37.2113882,24.0547082 C39.4944154,25.3886826 40.276605,28.3232105 38.9665369,30.6311583 L37.7604568,32.7400742 C37.1252608,33.8495148 36.0768547,34.6604208 34.8452776,34.9922248 C33.6111681,35.324711 32.2964469,35.1482289 31.195569,34.5042428 L30.2192355,33.9354047 C28.9426535,34.9630196 27.5206806,35.7924453 25.9999993,36.3961957 L25.9999987,37.5599439 C25.9970094,40.2152499 23.8609094,42.3762112 21.2056,42.3846154 L18.7944,42.3846154 C16.1404059,42.3846154 14,40.219782 14,37.5576923 L14,36.3970419 C12.4791284,35.7934405 11.0565322,34.9637815 9.77957815,33.9358872 L8.80299442,34.505079 C6.50580915,35.8409247 3.56987021,35.049942 2.23906313,32.7392353 L1.03280169,30.6300009 C0.401159146,29.5238188 0.231145999,28.2113064 0.559425405,26.9797059 C0.888371786,25.7456031 1.69120101,24.6921265 2.79034606,24.053696 L3.78242779,23.4753573 C3.66091587,22.6598457 3.60000002,21.8333228 3.60000019,21.0008678 C3.59964068,20.1722851 3.66061719,19.3449468 3.78254167,18.5247085 L2.78861183,17.9452918 C0.505584602,16.6113174 -0.276605002,13.6767895 1.03346313,11.3688417 L2.23954317,9.25992583 C2.87473915,8.15048519 3.92314533,7.33957919 5.15472238,7.00777521 C6.38883187,6.67528896 7.70355311,6.85177112 8.80443097,7.49575721 L9.78076186,8.06459377 C11.0573465,7.03698045 12.4793194,6.20755475 14.0000007,5.6038043 Z M11.2634746,12.0326234 C10.617233,12.5716613 9.7026973,12.6485026 8.97556903,12.2248582 L6.78774825,10.9501716 C6.60754053,10.8447551 6.39506809,10.8162338 6.19527576,10.8700606 C5.99295099,10.9245697 5.8183659,11.0596053 5.71133687,11.246543 L4.50892658,13.3490215 C4.28085652,13.7508163 4.41776119,14.2644394 4.80485394,14.4906191 L6.98565394,15.7619268 C7.70254629,16.1798426 8.08690703,16.9970357 7.95165511,17.8157512 L7.76948523,18.9184706 C7.65638664,19.6061109 7.59969735,20.3020342 7.6,21 C7.6,21.7031066 7.65662064,22.3978283 7.76925511,23.0801334 L7.95165511,24.1842488 C8.08690703,25.0029643 7.70254629,25.8201574 6.98565394,26.2380732 L4.80213007,27.5109659 C4.61772321,27.6180778 4.48116147,27.7972748 4.42448029,28.0099246 C4.36713215,28.2250767 4.39688141,28.454743 4.50573687,28.6453801 L5.70831165,30.7481858 C5.93243371,31.1373303 6.41410538,31.2670993 6.79049373,31.0482253 L8.97449373,29.7753023 C9.7016554,29.3514832 10.6163433,29.4282639 11.2626746,29.9673766 L12.1188867,30.6815536 C13.1796505,31.566598 14.3786867,32.2666727 15.6649769,32.7525215 L16.7049769,33.1442523 C17.4841581,33.4377419 18,34.1832625 18,35.0158846 L18,37.5576923 C18,38.02074 18.3597694,38.3846154 18.7944,38.3846154 L21.1992624,38.3846254 C21.6372484,38.3832375 21.9994819,38.0167881 22,37.5576923 L22,35.0158846 C22,34.18376 22.5152346,33.4385758 23.2937506,33.1447321 L24.3331012,32.7524389 C25.620867,32.2658727 26.8196661,31.5658006 27.8813806,30.679856 L28.7373806,29.9666637 C29.3836087,29.4282468 30.2976553,29.3517028 31.024431,29.7751418 L33.2122517,31.0498284 C33.3924595,31.1552449 33.6049319,31.1837662 33.8047242,31.1299394 C34.007049,31.0754303 34.1816341,30.9403947 34.2886631,30.753457 L35.4910734,28.6509785 C35.7191435,28.2491837 35.5822388,27.7355606 35.1951461,27.5093809 L33.0143461,26.2380732 C32.2974537,25.8201574 31.913093,25.0029643 32.0483449,24.1842488 L32.2306531,23.0806893 C32.3434217,22.3968737 32.4,21.7028459 32.4,21 C32.4,20.2968934 32.3433794,19.6021717 32.2307449,18.9198666 L32.0483449,17.8157512 C31.913093,16.9970357 32.2974537,16.1798426 33.0143461,15.7619268 L35.1978699,14.4890341 C35.3822768,14.3819222 35.5188385,14.2027252 35.5755197,13.9900754 C35.6328679,13.7749233 35.6031186,13.545257 35.4942631,13.3546199 L34.2916883,11.2518142 C34.0675663,10.8626697 33.5858946,10.7329007 33.2095063,10.9517747 L31.0255063,12.2246977 C30.2983446,12.6485168 29.3836567,12.5717361 28.7373254,12.0326234 L27.8811133,11.3184464 C26.8203495,10.433402 25.6213133,9.73332732 24.3362966,9.24795765 L23.2962966,8.85703457 C22.5164499,8.56389992 22,7.81804293 22,6.98492308 L22,4.44230769 C22,3.97925995 21.6402306,3.61538462 21.2056,3.61538462 L18.8007376,3.61537457 C18.3627516,3.61676247 18.0005181,3.98321188 18,4.44230769 L18,6.98411538 C18,7.81623999 17.4847654,8.56142419 16.7062494,8.85526793 L15.6668988,9.24756113 C14.379133,9.73412728 13.1803339,10.4341994 12.1197785,11.3191775 C12.1108094,11.3266617 11.8253748,11.564477 11.2634746,12.0326234 Z"/> + <path class="animated spin infinite" fill="#FEE1D3" d="M14.0000007,5.6038043 L14.0000013,4.44005609 C14.0029906,1.78475013 16.1390906,-0.376211234 18.7944,-0.384615385 L21.2056,-0.384615385 C23.8595941,-0.384615385 26,1.78021801 26,4.44230769 L26,5.60295806 C27.5208716,6.20655954 28.9434678,7.03621848 30.2204219,8.06411282 L31.1970056,7.49492104 C33.4941909,6.15907529 36.4301298,6.95005805 37.7609369,9.26076474 L38.9671983,11.3699991 C39.5988409,12.4761812 39.768854,13.7886936 39.4405746,15.0202941 C39.1116282,16.2543969 38.308799,17.3078735 37.2096539,17.946304 L36.2175721,18.5246428 C36.3390841,19.3401617 36.4,20.1667594 36.4,21 C36.4,21.8329668 36.339124,22.6588262 36.2175401,23.4753391 L37.2113882,24.0547082 C39.4944154,25.3886826 40.276605,28.3232105 38.9665369,30.6311583 L37.7604568,32.7400742 C37.1252608,33.8495148 36.0768547,34.6604208 34.8452776,34.9922248 C33.6111681,35.324711 32.2964469,35.1482289 31.195569,34.5042428 L30.2192355,33.9354047 C28.9426535,34.9630196 27.5206806,35.7924453 25.9999993,36.3961957 L25.9999987,37.5599439 C25.9970094,40.2152499 23.8609094,42.3762112 21.2056,42.3846154 L18.7944,42.3846154 C16.1404059,42.3846154 14,40.219782 14,37.5576923 L14,36.3970419 C12.4791284,35.7934405 11.0565322,34.9637815 9.77957815,33.9358872 L8.80299442,34.505079 C6.50580915,35.8409247 3.56987021,35.049942 2.23906313,32.7392353 L1.03280169,30.6300009 C0.401159146,29.5238188 0.231145999,28.2113064 0.559425405,26.9797059 C0.888371786,25.7456031 1.69120101,24.6921265 2.79034606,24.053696 L3.78242779,23.4753573 C3.66091587,22.6598457 3.60000002,21.8333228 3.60000019,21.0008678 C3.59964068,20.1722851 3.66061719,19.3449468 3.78254167,18.5247085 L2.78861183,17.9452918 C0.505584602,16.6113174 -0.276605002,13.6767895 1.03346313,11.3688417 L2.23954317,9.25992583 C2.87473915,8.15048519 3.92314533,7.33957919 5.15472238,7.00777521 C6.38883187,6.67528896 7.70355311,6.85177112 8.80443097,7.49575721 L9.78076186,8.06459377 C11.0573465,7.03698045 12.4793194,6.20755475 14.0000007,5.6038043 Z M11.2634746,12.0326234 C10.617233,12.5716613 9.7026973,12.6485026 8.97556903,12.2248582 L6.78774825,10.9501716 C6.60754053,10.8447551 6.39506809,10.8162338 6.19527576,10.8700606 C5.99295099,10.9245697 5.8183659,11.0596053 5.71133687,11.246543 L4.50892658,13.3490215 C4.28085652,13.7508163 4.41776119,14.2644394 4.80485394,14.4906191 L6.98565394,15.7619268 C7.70254629,16.1798426 8.08690703,16.9970357 7.95165511,17.8157512 L7.76948523,18.9184706 C7.65638664,19.6061109 7.59969735,20.3020342 7.6,21 C7.6,21.7031066 7.65662064,22.3978283 7.76925511,23.0801334 L7.95165511,24.1842488 C8.08690703,25.0029643 7.70254629,25.8201574 6.98565394,26.2380732 L4.80213007,27.5109659 C4.61772321,27.6180778 4.48116147,27.7972748 4.42448029,28.0099246 C4.36713215,28.2250767 4.39688141,28.454743 4.50573687,28.6453801 L5.70831165,30.7481858 C5.93243371,31.1373303 6.41410538,31.2670993 6.79049373,31.0482253 L8.97449373,29.7753023 C9.7016554,29.3514832 10.6163433,29.4282639 11.2626746,29.9673766 L12.1188867,30.6815536 C13.1796505,31.566598 14.3786867,32.2666727 15.6649769,32.7525215 L16.7049769,33.1442523 C17.4841581,33.4377419 18,34.1832625 18,35.0158846 L18,37.5576923 C18,38.02074 18.3597694,38.3846154 18.7944,38.3846154 L21.1992624,38.3846254 C21.6372484,38.3832375 21.9994819,38.0167881 22,37.5576923 L22,35.0158846 C22,34.18376 22.5152346,33.4385758 23.2937506,33.1447321 L24.3331012,32.7524389 C25.620867,32.2658727 26.8196661,31.5658006 27.8813806,30.679856 L28.7373806,29.9666637 C29.3836087,29.4282468 30.2976553,29.3517028 31.024431,29.7751418 L33.2122517,31.0498284 C33.3924595,31.1552449 33.6049319,31.1837662 33.8047242,31.1299394 C34.007049,31.0754303 34.1816341,30.9403947 34.2886631,30.753457 L35.4910734,28.6509785 C35.7191435,28.2491837 35.5822388,27.7355606 35.1951461,27.5093809 L33.0143461,26.2380732 C32.2974537,25.8201574 31.913093,25.0029643 32.0483449,24.1842488 L32.2306531,23.0806893 C32.3434217,22.3968737 32.4,21.7028459 32.4,21 C32.4,20.2968934 32.3433794,19.6021717 32.2307449,18.9198666 L32.0483449,17.8157512 C31.913093,16.9970357 32.2974537,16.1798426 33.0143461,15.7619268 L35.1978699,14.4890341 C35.3822768,14.3819222 35.5188385,14.2027252 35.5755197,13.9900754 C35.6328679,13.7749233 35.6031186,13.545257 35.4942631,13.3546199 L34.2916883,11.2518142 C34.0675663,10.8626697 33.5858946,10.7329007 33.2095063,10.9517747 L31.0255063,12.2246977 C30.2983446,12.6485168 29.3836567,12.5717361 28.7373254,12.0326234 L27.8811133,11.3184464 C26.8203495,10.433402 25.6213133,9.73332732 24.3362966,9.24795765 L23.2962966,8.85703457 C22.5164499,8.56389992 22,7.81804293 22,6.98492308 L22,4.44230769 C22,3.97925995 21.6402306,3.61538462 21.2056,3.61538462 L18.8007376,3.61537457 C18.3627516,3.61676247 18.0005181,3.98321188 18,4.44230769 L18,6.98411538 C18,7.81623999 17.4847654,8.56142419 16.7062494,8.85526793 L15.6668988,9.24756113 C14.379133,9.73412728 13.1803339,10.4341994 12.1197785,11.3191775 C12.1108094,11.3266617 11.8253748,11.564477 11.2634746,12.0326234 Z"/> <g transform="rotate(15 -47.892 66.043)"> <ellipse cx="6.4" cy="6.462" fill="#FFFFFF" rx="6.4" ry="6.462" transform="translate(.028 4.853)"/> <path fill="#FC6D26" d="M5.92153903,11.9125743 C2.3834711,11.9125743 -0.478460969,9.0231237 -0.478460969,5.4664205 C-0.478460969,1.9097173 2.3834711,-0.979733345 5.92153903,-0.979733345 C9.45960696,-0.979733345 12.321539,1.9097173 12.321539,5.4664205 C12.321539,9.0231237 9.45960696,11.9125743 5.92153903,11.9125743 Z M5.92153903,8.71257435 C7.6854047,8.71257435 9.12153903,7.26263103 9.12153903,5.4664205 C9.12153903,3.67020997 7.6854047,2.22026666 5.92153903,2.22026666 C4.15767337,2.22026666 2.72153903,3.67020997 2.72153903,5.4664205 C2.72153903,7.26263103 4.15767337,8.71257435 5.92153903,8.71257435 Z"/> diff --git a/changelogs/unreleased/13637-show-account-confirmation-link-in-e-mail-text.yml b/changelogs/unreleased/13637-show-account-confirmation-link-in-e-mail-text.yml deleted file mode 100644 index 5f98d0cc766..00000000000 --- a/changelogs/unreleased/13637-show-account-confirmation-link-in-e-mail-text.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Confirmation email shows link as text instead of human readable text -merge_request: 14243 -author: bitsapien -type: changed diff --git a/changelogs/unreleased/13711-allow-same-period-housekeeping.yml b/changelogs/unreleased/13711-allow-same-period-housekeeping.yml deleted file mode 100644 index 607a8683aff..00000000000 --- a/changelogs/unreleased/13711-allow-same-period-housekeeping.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Allow to use same periods for different housekeeping tasks (effectively - skipping the lesser task) -merge_request: 13711 -author: cernvcs -type: added diff --git a/changelogs/unreleased/14395-upgrade-gitlab-markup.yml b/changelogs/unreleased/14395-upgrade-gitlab-markup.yml deleted file mode 100644 index d1f90fe5eb1..00000000000 --- a/changelogs/unreleased/14395-upgrade-gitlab-markup.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade gitlab-markup gem -merge_request: 14395 -author: Markus Koller -type: other diff --git a/changelogs/unreleased/14553-missing-space-in-log-msg.yml b/changelogs/unreleased/14553-missing-space-in-log-msg.yml deleted file mode 100644 index a0420d49770..00000000000 --- a/changelogs/unreleased/14553-missing-space-in-log-msg.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "Add missing space in Sidekiq memory killer log message" -merge_request: 14553 -author: Benjamin Drung -type: fixed diff --git a/changelogs/unreleased/18308-escape-characters.yml b/changelogs/unreleased/18308-escape-characters.yml deleted file mode 100644 index 8766e971490..00000000000 --- a/changelogs/unreleased/18308-escape-characters.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Escape quotes in git username -merge_request: 14020 -author: Brandon Everett -type: fixed diff --git a/changelogs/unreleased/18608-lock-issues.yml b/changelogs/unreleased/18608-lock-issues.yml deleted file mode 100644 index 7d907f744f6..00000000000 --- a/changelogs/unreleased/18608-lock-issues.yml +++ /dev/null @@ -1,4 +0,0 @@ -title: Discussion lock for issues and merge requests -merge_request: -author: -type: added diff --git a/changelogs/unreleased/20049-projects-api-forks.yml b/changelogs/unreleased/20049-projects-api-forks.yml deleted file mode 100644 index c6470620f57..00000000000 --- a/changelogs/unreleased/20049-projects-api-forks.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add an API endpoint to determine the forks of a project -merge_request: -author: -type: added diff --git a/changelogs/unreleased/20824-scope-users-to-members-in-group-issuable-list.yml b/changelogs/unreleased/20824-scope-users-to-members-in-group-issuable-list.yml deleted file mode 100644 index 245b8129de8..00000000000 --- a/changelogs/unreleased/20824-scope-users-to-members-in-group-issuable-list.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Return only group's members in user dropdowns on issuables list pages -merge_request: 14249 -author: -type: changed diff --git a/changelogs/unreleased/21331-improve-confusing-compare-page.yml b/changelogs/unreleased/21331-improve-confusing-compare-page.yml deleted file mode 100644 index 469cc04930b..00000000000 --- a/changelogs/unreleased/21331-improve-confusing-compare-page.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Make the labels in the Compare form less confusing -merge_request: 14225 -author: -type: changed diff --git a/changelogs/unreleased/23888-fix-unsubscription-link-for-snippet-notification.yml b/changelogs/unreleased/23888-fix-unsubscription-link-for-snippet-notification.yml deleted file mode 100644 index 36bed037160..00000000000 --- a/changelogs/unreleased/23888-fix-unsubscription-link-for-snippet-notification.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Don't show an "Unsubscribe" link in snippet comment notifications -merge_request: 14764 -author: -type: fixed diff --git a/changelogs/unreleased/24121_extract_yet_another_users_finder.yml b/changelogs/unreleased/24121_extract_yet_another_users_finder.yml deleted file mode 100644 index e43e97303e2..00000000000 --- a/changelogs/unreleased/24121_extract_yet_another_users_finder.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Extract AutocompleteController#users into finder -merge_request: 13778 -author: Maxim Rydkin, Mayra Cabrera -type: other diff --git a/changelogs/unreleased/26890-fix-default-branches-sorting.yml b/changelogs/unreleased/26890-fix-default-branches-sorting.yml deleted file mode 100644 index cf7060190b3..00000000000 --- a/changelogs/unreleased/26890-fix-default-branches-sorting.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix the default branches sorting to actually be 'Last updated' -merge_request: 14295 -author: -type: fixed diff --git a/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml b/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml new file mode 100644 index 00000000000..1bff4d6930d --- /dev/null +++ b/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml @@ -0,0 +1,5 @@ +--- +title: Decrease ABC threshold to 54.28 +merge_request: 14920 +author: Maxim Rydkin +type: other diff --git a/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step2.yml b/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step2.yml deleted file mode 100644 index 6036e1a43a0..00000000000 --- a/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step2.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Decrease Perceived Complexity threshold to 15 -merge_request: 14160 -author: Maxim Rydkin -type: other diff --git a/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step3.yml b/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step3.yml new file mode 100644 index 00000000000..8ecb832041e --- /dev/null +++ b/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step3.yml @@ -0,0 +1,5 @@ +--- +title: Decrease Perceived Complexity threshold to 14 +merge_request: 14231 +author: Maxim Rydkin +type: other diff --git a/changelogs/unreleased/31362_decrease_cyclomatic_complexity_threshold_step4.yml b/changelogs/unreleased/31362_decrease_cyclomatic_complexity_threshold_step4.yml deleted file mode 100644 index a404456198a..00000000000 --- a/changelogs/unreleased/31362_decrease_cyclomatic_complexity_threshold_step4.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Decrease Cyclomatic Complexity threshold to 13 -merge_request: 14152 -author: Maxim Rydkin -type: other diff --git a/changelogs/unreleased/32163-protected-branch-form-should-have-sane-defaults-for-dropdowns.yml b/changelogs/unreleased/32163-protected-branch-form-should-have-sane-defaults-for-dropdowns.yml deleted file mode 100644 index 6110e245013..00000000000 --- a/changelogs/unreleased/32163-protected-branch-form-should-have-sane-defaults-for-dropdowns.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Added defaults for protected branches dropdowns on the repository settings -merge_request: 14278 -author: -type: changed diff --git a/changelogs/unreleased/33328-usage-ping-for-gitlab-features-and-components.yml b/changelogs/unreleased/33328-usage-ping-for-gitlab-features-and-components.yml deleted file mode 100644 index d3aac241b75..00000000000 --- a/changelogs/unreleased/33328-usage-ping-for-gitlab-features-and-components.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adds gitlab features and components to usage ping data. -merge_request: 14305 -author: -type: other diff --git a/changelogs/unreleased/33493-attempt-to-link-saml-users-to-ldap-by-email.yml b/changelogs/unreleased/33493-attempt-to-link-saml-users-to-ldap-by-email.yml deleted file mode 100644 index 727f3cecd52..00000000000 --- a/changelogs/unreleased/33493-attempt-to-link-saml-users-to-ldap-by-email.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Link SAML users to LDAP by email. -merge_request: 14216 -author: -type: changed diff --git a/changelogs/unreleased/34102-online-view-of-artifacts-fe.yml b/changelogs/unreleased/34102-online-view-of-artifacts-fe.yml deleted file mode 100644 index ce83b140eb6..00000000000 --- a/changelogs/unreleased/34102-online-view-of-artifacts-fe.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add online view of HTML artifacts for public projects -merge_request: 14399 -author: -type: added diff --git a/changelogs/unreleased/34259-project-denial-of-service-via-gitmodules-fix.yml b/changelogs/unreleased/34259-project-denial-of-service-via-gitmodules-fix.yml deleted file mode 100644 index 8260f7fa4b2..00000000000 --- a/changelogs/unreleased/34259-project-denial-of-service-via-gitmodules-fix.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixes project denial of service via gitmodules using Extended ASCII. -merge_request: 14301 -author: -type: fixed diff --git a/changelogs/unreleased/34366-issue-sidebar-don-t-render-participants-in-collapsed-state.yml b/changelogs/unreleased/34366-issue-sidebar-don-t-render-participants-in-collapsed-state.yml deleted file mode 100644 index d34e685b5f5..00000000000 --- a/changelogs/unreleased/34366-issue-sidebar-don-t-render-participants-in-collapsed-state.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Load sidebar participants avatars only when visible -merge_request: 14270 -author: -type: other diff --git a/changelogs/unreleased/34371-cycle-analitcs-global.yml b/changelogs/unreleased/34371-cycle-analitcs-global.yml deleted file mode 100644 index 5e9f0a85e9a..00000000000 --- a/changelogs/unreleased/34371-cycle-analitcs-global.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Removes cycle analytics service and store from global namespace -merge_request: -author: -type: other diff --git a/changelogs/unreleased/34510-board-issues-sql-speedup.yml b/changelogs/unreleased/34510-board-issues-sql-speedup.yml deleted file mode 100644 index 244ff7e9dfa..00000000000 --- a/changelogs/unreleased/34510-board-issues-sql-speedup.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Optimize the boards' issues fetching. -merge_request: 14198 -author: -type: other diff --git a/changelogs/unreleased/3523-i18n-autodevops.yml b/changelogs/unreleased/3523-i18n-autodevops.yml deleted file mode 100644 index 10cb22b42a0..00000000000 --- a/changelogs/unreleased/3523-i18n-autodevops.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improves i18n for Auto Devops callout -merge_request: -author: -type: other diff --git a/changelogs/unreleased/35290_allow_public_project_apis.yml b/changelogs/unreleased/35290_allow_public_project_apis.yml deleted file mode 100644 index 1968eee0a53..00000000000 --- a/changelogs/unreleased/35290_allow_public_project_apis.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: made read-only APIs for public merge requests available without authentication -merge_request: 13291 -author: haseebeqx diff --git a/changelogs/unreleased/35580-cannot-import-project-with-milestones.yml b/changelogs/unreleased/35580-cannot-import-project-with-milestones.yml deleted file mode 100644 index b28105556db..00000000000 --- a/changelogs/unreleased/35580-cannot-import-project-with-milestones.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix the project import with issues and milestones -merge_request: 14657 -author: -type: fixed diff --git a/changelogs/unreleased/35917_create_services_for_keys.yml b/changelogs/unreleased/35917_create_services_for_keys.yml deleted file mode 100644 index e7cad5a11d5..00000000000 --- a/changelogs/unreleased/35917_create_services_for_keys.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: creation of keys moved to services -merge_request: 13331 -author: haseebeqx diff --git a/changelogs/unreleased/3612-update-script-template-order-in-vue-files.yml b/changelogs/unreleased/3612-update-script-template-order-in-vue-files.yml deleted file mode 100644 index cea6cb2e48b..00000000000 --- a/changelogs/unreleased/3612-update-script-template-order-in-vue-files.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Re-arrange <script> tags before <template> tags in .vue files -merge_request: 14671 -author: -type: changed diff --git a/changelogs/unreleased/36160-zindex.yml b/changelogs/unreleased/36160-zindex.yml new file mode 100644 index 00000000000..a836744fb41 --- /dev/null +++ b/changelogs/unreleased/36160-zindex.yml @@ -0,0 +1,5 @@ +--- +title: Decreases z-index of select2 to a lower number of our navigation bar +merge_request: +author: +type: fixed diff --git a/changelogs/unreleased/36255-metrics-that-do-not-have-a-complete-history-are-not-shown-at-all.yml b/changelogs/unreleased/36255-metrics-that-do-not-have-a-complete-history-are-not-shown-at-all.yml deleted file mode 100644 index a820ecee7d2..00000000000 --- a/changelogs/unreleased/36255-metrics-that-do-not-have-a-complete-history-are-not-shown-at-all.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Allow prometheus graphs to correctly handle NaN values -merge_request: 14741 -author: -type: fixed diff --git a/changelogs/unreleased/36549-circuit-breaker-handles-missing-storages.yml b/changelogs/unreleased/36549-circuit-breaker-handles-missing-storages.yml deleted file mode 100644 index f5ccb163d98..00000000000 --- a/changelogs/unreleased/36549-circuit-breaker-handles-missing-storages.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Allow the git circuit breaker to correctly handle missing repository storages -merge_request: 14417 -author: -type: fixed diff --git a/changelogs/unreleased/36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout.yml b/changelogs/unreleased/36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout.yml deleted file mode 100644 index a2e1d07158b..00000000000 --- a/changelogs/unreleased/36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Reschedule merge request diff background migrations to catch failures from - 9.5 run -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/36670-remove-edit-form.yml b/changelogs/unreleased/36670-remove-edit-form.yml deleted file mode 100644 index 4e80b685f67..00000000000 --- a/changelogs/unreleased/36670-remove-edit-form.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove the ability to visit the issue edit form directly -merge_request: 14523 -author: -type: removed diff --git a/changelogs/unreleased/36742-hide-close-mr-button-on-merge.yml b/changelogs/unreleased/36742-hide-close-mr-button-on-merge.yml deleted file mode 100644 index 3d3efcdbcc6..00000000000 --- a/changelogs/unreleased/36742-hide-close-mr-button-on-merge.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Hide close MR button after merge without reloading page -merge_request: 14122 -author: Jacopo Beschi @jacopo-beschi -type: added diff --git a/changelogs/unreleased/36829-add-ability-to-verify-gpg-subkeys.yml b/changelogs/unreleased/36829-add-ability-to-verify-gpg-subkeys.yml deleted file mode 100644 index ee6a7287e86..00000000000 --- a/changelogs/unreleased/36829-add-ability-to-verify-gpg-subkeys.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add support for GPG subkeys in signature verification -merge_request: 14517 -author: -type: added diff --git a/changelogs/unreleased/36884-gitaly-admin-version.yml b/changelogs/unreleased/36884-gitaly-admin-version.yml deleted file mode 100644 index 0b3b9a205b5..00000000000 --- a/changelogs/unreleased/36884-gitaly-admin-version.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add Gitaly version to Admin Dashboard -merge_request: 14313 -author: Jacopo Beschi @jacopo-beschi -type: added diff --git a/changelogs/unreleased/36953-add-gitLab-pages-version-to-admin-dashboard.yml b/changelogs/unreleased/36953-add-gitLab-pages-version-to-admin-dashboard.yml deleted file mode 100644 index 9ac4a0ae7f3..00000000000 --- a/changelogs/unreleased/36953-add-gitLab-pages-version-to-admin-dashboard.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add GitLab-Pages version to Admin Dashboard -merge_request: 14040 -author: travismiller -type: added diff --git a/changelogs/unreleased/37025-error-500-in-non-utf8-branch-names.yml b/changelogs/unreleased/37025-error-500-in-non-utf8-branch-names.yml deleted file mode 100644 index f3118cf0f2f..00000000000 --- a/changelogs/unreleased/37025-error-500-in-non-utf8-branch-names.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Fixed non-UTF-8 valid branch names from causing an error. -merge_request: 14090 -type: fixed diff --git a/changelogs/unreleased/37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsistent.yml b/changelogs/unreleased/37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsistent.yml deleted file mode 100644 index 3364b1d46b3..00000000000 --- a/changelogs/unreleased/37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsistent.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix incorrect X-axis labels in Prometheus graphs -merge_request: 14258 -author: -type: fixed diff --git a/changelogs/unreleased/37220-es-modules.yml b/changelogs/unreleased/37220-es-modules.yml deleted file mode 100644 index de81fa9e74d..00000000000 --- a/changelogs/unreleased/37220-es-modules.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Exports common_utils utility functions as modules -merge_request: -author: -type: other diff --git a/changelogs/unreleased/37229-mr-widget-status-icon.yml b/changelogs/unreleased/37229-mr-widget-status-icon.yml deleted file mode 100644 index 6d84d1964ca..00000000000 --- a/changelogs/unreleased/37229-mr-widget-status-icon.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: fix merge request widget status icon for failed CI -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/37335-counter-active-state.yml b/changelogs/unreleased/37335-counter-active-state.yml deleted file mode 100644 index a9632201a89..00000000000 --- a/changelogs/unreleased/37335-counter-active-state.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add active states to nav bar counters -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/37405-admin-page-runner-tag-help-update.yml b/changelogs/unreleased/37405-admin-page-runner-tag-help-update.yml deleted file mode 100644 index bec7da26b1a..00000000000 --- a/changelogs/unreleased/37405-admin-page-runner-tag-help-update.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'Add help text to runner edit: tags should be separated by commas.' -merge_request: -author: Brendan O'Leary -type: added diff --git a/changelogs/unreleased/37483-activity-log-show-wrong-number-of-commits-per-push.yml b/changelogs/unreleased/37483-activity-log-show-wrong-number-of-commits-per-push.yml deleted file mode 100644 index 225ab9acc44..00000000000 --- a/changelogs/unreleased/37483-activity-log-show-wrong-number-of-commits-per-push.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix the number representing the amount of commits related to a push event -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/37552-replace-js-true-with-js.yml b/changelogs/unreleased/37552-replace-js-true-with-js.yml deleted file mode 100644 index f7b614a8839..00000000000 --- a/changelogs/unreleased/37552-replace-js-true-with-js.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'Replace `tag: true` into `:tag` in the specs' -merge_request: 14653 -author: Jacopo Beschi @jacopo-beschi -type: added diff --git a/changelogs/unreleased/37691-subscription-fires-multiple-notifications.yml b/changelogs/unreleased/37691-subscription-fires-multiple-notifications.yml deleted file mode 100644 index c3c38b35fa7..00000000000 --- a/changelogs/unreleased/37691-subscription-fires-multiple-notifications.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed duplicate notifications when added multiple labels on an issue -merge_request: 14798 -author: -type: fixed diff --git a/changelogs/unreleased/37970-ci-sections-tracking.yml b/changelogs/unreleased/37970-ci-sections-tracking.yml deleted file mode 100644 index a9011b22c6c..00000000000 --- a/changelogs/unreleased/37970-ci-sections-tracking.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Parse and store gitlab-runner timestamped section markers -merge_request: 14551 -author: -type: added diff --git a/changelogs/unreleased/37970-timestamped-ci.yml b/changelogs/unreleased/37970-timestamped-ci.yml deleted file mode 100644 index 2a4797f069a..00000000000 --- a/changelogs/unreleased/37970-timestamped-ci.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Strip gitlab-runner section markers in build trace HTML view -merge_request: 14393 -author: -type: added diff --git a/changelogs/unreleased/37999-fix-circuit-breaker.yml b/changelogs/unreleased/37999-fix-circuit-breaker.yml deleted file mode 100644 index a75315c4988..00000000000 --- a/changelogs/unreleased/37999-fix-circuit-breaker.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix the filesystem shard health check to check all configured shards -merge_request: 14341 -author: -type: fixed diff --git a/changelogs/unreleased/38031-monitoring-hover-info-is-clipped.yml b/changelogs/unreleased/38031-monitoring-hover-info-is-clipped.yml deleted file mode 100644 index 8b3fae2c103..00000000000 --- a/changelogs/unreleased/38031-monitoring-hover-info-is-clipped.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Move the deployment flag content to the left when deployment marker is near - the end -merge_request: 14514 -author: -type: fixed diff --git a/changelogs/unreleased/38036-hover-and-legend-data-should-be-linked.yml b/changelogs/unreleased/38036-hover-and-legend-data-should-be-linked.yml deleted file mode 100644 index 591e542cd17..00000000000 --- a/changelogs/unreleased/38036-hover-and-legend-data-should-be-linked.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Sync up hover and legend data across all graphs for the prometheus dashboard -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/38052-use-simple-api-for-projects.yml b/changelogs/unreleased/38052-use-simple-api-for-projects.yml deleted file mode 100644 index 49c7485861e..00000000000 --- a/changelogs/unreleased/38052-use-simple-api-for-projects.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use `simple=true` for projects API in Projects dropdown for better search performance -merge_request: -author: -type: other diff --git a/changelogs/unreleased/38187-38315-fix-dropdown-open-top-bottom-spacing.yml b/changelogs/unreleased/38187-38315-fix-dropdown-open-top-bottom-spacing.yml deleted file mode 100644 index 579c247c4c2..00000000000 --- a/changelogs/unreleased/38187-38315-fix-dropdown-open-top-bottom-spacing.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix bottom spacing for dropdowns that open upwards -merge_request: 14535 -author: -type: fixed diff --git a/changelogs/unreleased/38197-fix-ImapAuthenticationCheck.yml b/changelogs/unreleased/38197-fix-ImapAuthenticationCheck.yml deleted file mode 100644 index df562077fb3..00000000000 --- a/changelogs/unreleased/38197-fix-ImapAuthenticationCheck.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix `rake gitlab:incoming_email:check` and make it report the actual error -merge_request: 14423 -author: -type: fixed diff --git a/changelogs/unreleased/38202-cannot-rename-a-hashed-project.yml b/changelogs/unreleased/38202-cannot-rename-a-hashed-project.yml deleted file mode 100644 index 768e296fcd7..00000000000 --- a/changelogs/unreleased/38202-cannot-rename-a-hashed-project.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Does not check if an invariant hashed storage path exists on disk when renaming - projects. -merge_request: 14428 -author: -type: fixed diff --git a/changelogs/unreleased/38234-reserve-refs-replace.yml b/changelogs/unreleased/38234-reserve-refs-replace.yml deleted file mode 100644 index 3a5ffbf9db0..00000000000 --- a/changelogs/unreleased/38234-reserve-refs-replace.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Also reserve refs/replace after importing a project -merge_request: 14436 -author: -type: fixed diff --git a/changelogs/unreleased/38389-allow-merge-without-success.yml b/changelogs/unreleased/38389-allow-merge-without-success.yml deleted file mode 100644 index 6a37bcc55fc..00000000000 --- a/changelogs/unreleased/38389-allow-merge-without-success.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Allow merge in MR widget with no pipeline but using "Only allow merge requests - to be merged if the pipeline succeeds" -merge_request: 14633 -author: -type: fixed diff --git a/changelogs/unreleased/38417-use-explicit-boolean-vue-attribute.yml b/changelogs/unreleased/38417-use-explicit-boolean-vue-attribute.yml deleted file mode 100644 index 419e9295d32..00000000000 --- a/changelogs/unreleased/38417-use-explicit-boolean-vue-attribute.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use explicit boolean true attribute for show-disabled-button in Vue files -merge_request: 14672 -author: -type: fixed diff --git a/changelogs/unreleased/38432-fix-notes-type-for-import.yml b/changelogs/unreleased/38432-fix-notes-type-for-import.yml deleted file mode 100644 index db8371f4420..00000000000 --- a/changelogs/unreleased/38432-fix-notes-type-for-import.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Fix notes type created from import. This should fix some missing notes issues - from imported projects -merge_request: 14524 -author: -type: fixed diff --git a/changelogs/unreleased/38502-fix-nav-dropdown-close-animation.yml b/changelogs/unreleased/38502-fix-nav-dropdown-close-animation.yml deleted file mode 100644 index 974adb9ed28..00000000000 --- a/changelogs/unreleased/38502-fix-nav-dropdown-close-animation.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix navigation dropdown close animation on mobile screens -merge_request: 14649 -author: -type: fixed diff --git a/changelogs/unreleased/38534-minigraph.yml b/changelogs/unreleased/38534-minigraph.yml deleted file mode 100644 index eed240eac2d..00000000000 --- a/changelogs/unreleased/38534-minigraph.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixes mini pipeline graph in commit view -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/38571-fix-exception-in-raven-report.yml b/changelogs/unreleased/38571-fix-exception-in-raven-report.yml deleted file mode 100644 index 62e3b8d304c..00000000000 --- a/changelogs/unreleased/38571-fix-exception-in-raven-report.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Ensure no exception is raised when Raven tries to get the current user in API - context -merge_request: 14580 -author: -type: fixed diff --git a/changelogs/unreleased/38619-fix-comment-delete-confirm-text.yml b/changelogs/unreleased/38619-fix-comment-delete-confirm-text.yml deleted file mode 100644 index a203bff8410..00000000000 --- a/changelogs/unreleased/38619-fix-comment-delete-confirm-text.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix comment deletion confirmation dialog typo -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/38635-fix-gitlab-check-git-ssh-config.yml b/changelogs/unreleased/38635-fix-gitlab-check-git-ssh-config.yml deleted file mode 100644 index 49d0671233a..00000000000 --- a/changelogs/unreleased/38635-fix-gitlab-check-git-ssh-config.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Whitelist authorized_keys.lock in the gitlab:check rake task -merge_request: 14624 -author: -type: fixed diff --git a/changelogs/unreleased/38696-fix-project-snippets-breadcrumb-link.yml b/changelogs/unreleased/38696-fix-project-snippets-breadcrumb-link.yml deleted file mode 100644 index 18b1645d7a9..00000000000 --- a/changelogs/unreleased/38696-fix-project-snippets-breadcrumb-link.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix project snippets breadcrumb link -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/38775-scrollable-tabs-on-admin.yml b/changelogs/unreleased/38775-scrollable-tabs-on-admin.yml deleted file mode 100644 index 65a66714bcb..00000000000 --- a/changelogs/unreleased/38775-scrollable-tabs-on-admin.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Make tabs on top scrollable on admin dashboard -merge_request: 14685 -author: Takuya Noguchi -type: fixed diff --git a/changelogs/unreleased/38789-prometheus-graphs-occasionally-have-incorrect-y-scale.yml b/changelogs/unreleased/38789-prometheus-graphs-occasionally-have-incorrect-y-scale.yml deleted file mode 100644 index bbfe5d49a3e..00000000000 --- a/changelogs/unreleased/38789-prometheus-graphs-occasionally-have-incorrect-y-scale.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix broken Y-axis scaling in some Prometheus graphs -merge_request: 14693 -author: -type: fixed diff --git a/changelogs/unreleased/39017-gitlabusagepingworker-is-not-running-on-gitlab-com.yml b/changelogs/unreleased/39017-gitlabusagepingworker-is-not-running-on-gitlab-com.yml deleted file mode 100644 index 89506f88637..00000000000 --- a/changelogs/unreleased/39017-gitlabusagepingworker-is-not-running-on-gitlab-com.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Make usage ping scheduling more robust -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/39032-improve-merge-ongoing-check-consistency.yml b/changelogs/unreleased/39032-improve-merge-ongoing-check-consistency.yml deleted file mode 100644 index 361b6af196a..00000000000 --- a/changelogs/unreleased/39032-improve-merge-ongoing-check-consistency.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Make "merge ongoing" check more consistent -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/39297-remove-help-text-group-lists.yml b/changelogs/unreleased/39297-remove-help-text-group-lists.yml new file mode 100644 index 00000000000..4773d3c5176 --- /dev/null +++ b/changelogs/unreleased/39297-remove-help-text-group-lists.yml @@ -0,0 +1,5 @@ +--- +title: Remove help text from group issues page and group merge requests page +merge_request: 14963 +author: +type: removed diff --git a/changelogs/unreleased/5836-move-lib-ci-into-gitlab-namespace.yml b/changelogs/unreleased/5836-move-lib-ci-into-gitlab-namespace.yml deleted file mode 100644 index 44e16512bae..00000000000 --- a/changelogs/unreleased/5836-move-lib-ci-into-gitlab-namespace.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Move `lib/ci` to `lib/gitlab/ci` -merge_request: 14078 -author: Maxim Rydkin -type: other diff --git a/changelogs/unreleased/add-1000-plus-counters-for-jobs-page.yml b/changelogs/unreleased/add-1000-plus-counters-for-jobs-page.yml deleted file mode 100644 index 5f5a61406da..00000000000 --- a/changelogs/unreleased/add-1000-plus-counters-for-jobs-page.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add 1000+ counters to job page -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/add-ci-builds-index-for-jobscontroller.yml b/changelogs/unreleased/add-ci-builds-index-for-jobscontroller.yml deleted file mode 100644 index 7f098c8f60c..00000000000 --- a/changelogs/unreleased/add-ci-builds-index-for-jobscontroller.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Change index on ci_builds to optimize Jobs Controller -merge_request: -author: -type: other diff --git a/changelogs/unreleased/add-composite-index-on-merge-requests-merge-commit-sha.yml b/changelogs/unreleased/add-composite-index-on-merge-requests-merge-commit-sha.yml deleted file mode 100644 index 9a600282716..00000000000 --- a/changelogs/unreleased/add-composite-index-on-merge-requests-merge-commit-sha.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add index for merge_requests.merge_commit_sha -merge_request: -author: -type: other diff --git a/changelogs/unreleased/add-labels-template-index.yml b/changelogs/unreleased/add-labels-template-index.yml deleted file mode 100644 index 5f66c4ce181..00000000000 --- a/changelogs/unreleased/add-labels-template-index.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add (partial) index on Labels.template -merge_request: -author: -type: other diff --git a/changelogs/unreleased/add-view-replaced-file-link.yml b/changelogs/unreleased/add-view-replaced-file-link.yml deleted file mode 100644 index b5a85f2e0f2..00000000000 --- a/changelogs/unreleased/add-view-replaced-file-link.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add view replaced file link for image diffs -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/add_closed_at_attribute.yml b/changelogs/unreleased/add_closed_at_attribute.yml deleted file mode 100644 index 3afb75e8915..00000000000 --- a/changelogs/unreleased/add_closed_at_attribute.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add 'closed_at' attribute to Issues API -merge_request: 14316 -author: Vitaliy @blackst0ne Klachkov -type: added diff --git a/changelogs/unreleased/add_tooltip_for_milestone_in_issues_list.yml b/changelogs/unreleased/add_tooltip_for_milestone_in_issues_list.yml deleted file mode 100644 index 0470c6519f4..00000000000 --- a/changelogs/unreleased/add_tooltip_for_milestone_in_issues_list.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add tooltip for milestone due date to issue and merge request lists -merge_request: 14318 -author: Vitaliy @blackst0ne Klachkov -type: added diff --git a/changelogs/unreleased/adjusting-tooltips.yml b/changelogs/unreleased/adjusting-tooltips.yml deleted file mode 100644 index 726b75caecd..00000000000 --- a/changelogs/unreleased/adjusting-tooltips.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adjust tooltips to adhere to 8px grid and make them more readable -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/an-popen-deadline.yml b/changelogs/unreleased/an-popen-deadline.yml deleted file mode 100644 index 4b74c63ed5c..00000000000 --- a/changelogs/unreleased/an-popen-deadline.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use a timeout on certain git operations -merge_request: 14872 -author: -type: security diff --git a/changelogs/unreleased/declarative-policy-optimisations.yml b/changelogs/unreleased/animate-auto-devops.yml index dc51c89d575..c572dbdd093 100644 --- a/changelogs/unreleased/declarative-policy-optimisations.yml +++ b/changelogs/unreleased/animate-auto-devops.yml @@ -1,5 +1,5 @@ --- -title: Speed up permission checks +title: Animate auto devops graphic merge_request: author: type: other diff --git a/changelogs/unreleased/breadcrumb-item-links.yml b/changelogs/unreleased/breadcrumb-item-links.yml deleted file mode 100644 index 9b66456efca..00000000000 --- a/changelogs/unreleased/breadcrumb-item-links.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed issue/merge request breadcrumb titles not having links -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/breadcrumbs-line-height-padding.yml b/changelogs/unreleased/breadcrumbs-line-height-padding.yml deleted file mode 100644 index 3ac56c8b593..00000000000 --- a/changelogs/unreleased/breadcrumbs-line-height-padding.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: breadcrumbs receives padding when double lined -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/bugfix-graph-friendly-notes-number.yml b/changelogs/unreleased/bugfix-graph-friendly-notes-number.yml deleted file mode 100644 index 3a99729fb48..00000000000 --- a/changelogs/unreleased/bugfix-graph-friendly-notes-number.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Show notes number more user-friendly in the graph -merge_request: 13949 -author: Vladislav Kaverin -type: changed diff --git a/changelogs/unreleased/bvl-fix-deleting-forked-projects.yml b/changelogs/unreleased/bvl-fix-deleting-forked-projects.yml deleted file mode 100644 index 95f56facc4b..00000000000 --- a/changelogs/unreleased/bvl-fix-deleting-forked-projects.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix error when updating a forked project with deleted `ForkedProjectLink` -merge_request: 14916 -author: -type: fixed diff --git a/changelogs/unreleased/bvl-fix-group-atom-feed.yml b/changelogs/unreleased/bvl-fix-group-atom-feed.yml new file mode 100644 index 00000000000..48f67db7799 --- /dev/null +++ b/changelogs/unreleased/bvl-fix-group-atom-feed.yml @@ -0,0 +1,5 @@ +--- +title: Fix the atom feed for group events +merge_request: 14974 +author: +type: fixed diff --git a/changelogs/unreleased/bvl-fix-locale-path.yml b/changelogs/unreleased/bvl-fix-locale-path.yml deleted file mode 100644 index 97e0e000e3c..00000000000 --- a/changelogs/unreleased/bvl-fix-locale-path.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Correctly render asset path for locales with a region -merge_request: 14924 -author: -type: fixed diff --git a/changelogs/unreleased/bvl-fork-network-schema.yml b/changelogs/unreleased/bvl-fork-network-schema.yml deleted file mode 100644 index 97b2d5acada..00000000000 --- a/changelogs/unreleased/bvl-fork-network-schema.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Allow creating merge requests across a fork network -merge_request: 14422 -author: -type: changed diff --git a/changelogs/unreleased/cache-issuable-template-names.yml b/changelogs/unreleased/cache-issuable-template-names.yml deleted file mode 100644 index 858fdff2db2..00000000000 --- a/changelogs/unreleased/cache-issuable-template-names.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Cache issue and MR template names in Redis -merge_request: -author: -type: other diff --git a/changelogs/unreleased/change-dashed-border-button-color.yml b/changelogs/unreleased/change-dashed-border-button-color.yml deleted file mode 100644 index 038bea79273..00000000000 --- a/changelogs/unreleased/change-dashed-border-button-color.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: changed dashed border button color to be darker -merge_request: !14041 -author: -type: other diff --git a/changelogs/unreleased/close-issue-by-implements.yml b/changelogs/unreleased/close-issue-by-implements.yml deleted file mode 100644 index fe36ce3f7aa..00000000000 --- a/changelogs/unreleased/close-issue-by-implements.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "Add \"implements\" to the default issue closing message regex" -merge_request: 14612 -author: Guilherme Vieira -type: added diff --git a/changelogs/unreleased/commit-row-avatar-align-top.yml b/changelogs/unreleased/commit-row-avatar-align-top.yml deleted file mode 100644 index aa5ab770bd8..00000000000 --- a/changelogs/unreleased/commit-row-avatar-align-top.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed commit avatars being centered vertically -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/consistent-tooltip-direction-on-commits.yml b/changelogs/unreleased/consistent-tooltip-direction-on-commits.yml deleted file mode 100644 index 9e6a429f6f0..00000000000 --- a/changelogs/unreleased/consistent-tooltip-direction-on-commits.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Tooltips in the commit info box now all face the same direction -merge_request: -author: Jedidiah Broadbent -type: fixed diff --git a/changelogs/unreleased/content-title-link-hover-bg.yml b/changelogs/unreleased/content-title-link-hover-bg.yml deleted file mode 100644 index c4c31c2ad06..00000000000 --- a/changelogs/unreleased/content-title-link-hover-bg.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed navbar title colors leaking out of the navbar -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/dm-bitbucket-import-truncated-shas.yml b/changelogs/unreleased/dm-bitbucket-import-truncated-shas.yml deleted file mode 100644 index 057407b78d9..00000000000 --- a/changelogs/unreleased/dm-bitbucket-import-truncated-shas.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Fix bug that caused merge requests with diff notes imported from Bitbucket - to raise errors -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/dm-closing-issue-urls.yml b/changelogs/unreleased/dm-closing-issue-urls.yml deleted file mode 100644 index 059e406b63d..00000000000 --- a/changelogs/unreleased/dm-closing-issue-urls.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Correctly detect multiple issue URLs after 'Closes...' in MR descriptions -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/dm-copy-parallel-diff.yml b/changelogs/unreleased/dm-copy-parallel-diff.yml deleted file mode 100644 index 96a65007661..00000000000 --- a/changelogs/unreleased/dm-copy-parallel-diff.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Only copy old/new code when selecting left/right side of parallel diff -merge_request: -author: -type: added diff --git a/changelogs/unreleased/dm-pat-revoke.yml b/changelogs/unreleased/dm-pat-revoke.yml deleted file mode 100644 index 32ac66056d5..00000000000 --- a/changelogs/unreleased/dm-pat-revoke.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Set default scope on PATs that don't have one set to allow them to be revoked -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/dm-simple-project-avatar-url.yml b/changelogs/unreleased/dm-simple-project-avatar-url.yml deleted file mode 100644 index e517345f5d2..00000000000 --- a/changelogs/unreleased/dm-simple-project-avatar-url.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Expose avatar_url when requesting list of projects from API with simple=true -merge_request: -author: -type: added diff --git a/changelogs/unreleased/docs-17499-documentation-errors-about-creating-a-new-tag.yml b/changelogs/unreleased/docs-17499-documentation-errors-about-creating-a-new-tag.yml deleted file mode 100644 index 3dfe4114cc9..00000000000 --- a/changelogs/unreleased/docs-17499-documentation-errors-about-creating-a-new-tag.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix docs for lightweight tag creation via API -merge_request: -author: -type: other diff --git a/changelogs/unreleased/docs-28814-clarify-artifacts-ref.yml b/changelogs/unreleased/docs-28814-clarify-artifacts-ref.yml deleted file mode 100644 index 3cdcff8caaf..00000000000 --- a/changelogs/unreleased/docs-28814-clarify-artifacts-ref.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Clarify artifact download via the API only accepts branch or tag name for ref -merge_request: -author: -type: other diff --git a/changelogs/unreleased/docs-38152-bump-recommended-mysql-version.yml b/changelogs/unreleased/docs-38152-bump-recommended-mysql-version.yml deleted file mode 100644 index eea679d0814..00000000000 --- a/changelogs/unreleased/docs-38152-bump-recommended-mysql-version.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Change recommended MySQL version to 5.6 -merge_request: -author: -type: other diff --git a/changelogs/unreleased/docs-add-summary-about-project-archiving.yml b/changelogs/unreleased/docs-add-summary-about-project-archiving.yml deleted file mode 100644 index cc1b48a682d..00000000000 --- a/changelogs/unreleased/docs-add-summary-about-project-archiving.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add documentation to summarise project archiving -merge_request: 14650 -author: -type: other diff --git a/changelogs/unreleased/docs-openid-connect.yml b/changelogs/unreleased/docs-openid-connect.yml deleted file mode 100644 index 3989ec53cfa..00000000000 --- a/changelogs/unreleased/docs-openid-connect.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add link to OpenID Connect documentation -merge_request: 14368 -author: Markus Koller -type: other diff --git a/changelogs/unreleased/ee-add-project-repository-storages-index.yml b/changelogs/unreleased/ee-add-project-repository-storages-index.yml deleted file mode 100644 index 8a144783cec..00000000000 --- a/changelogs/unreleased/ee-add-project-repository-storages-index.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Index projects on repository storage -merge_request: 14414 -author: -type: other diff --git a/changelogs/unreleased/expose-last-pipeline-details-in-api-for-single-commit.yml b/changelogs/unreleased/expose-last-pipeline-details-in-api-for-single-commit.yml deleted file mode 100644 index d16e052cd92..00000000000 --- a/changelogs/unreleased/expose-last-pipeline-details-in-api-for-single-commit.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Expose last pipeline details in API response when getting a single commit -merge_request: 13521 -author: Mehdi Lahmam (@mehlah) -type: added diff --git a/changelogs/unreleased/feature-custom-attributes.yml b/changelogs/unreleased/feature-custom-attributes.yml deleted file mode 100644 index 98736bc8d72..00000000000 --- a/changelogs/unreleased/feature-custom-attributes.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Support custom attributes on users -merge_request: 13038 -author: Markus Koller diff --git a/changelogs/unreleased/feature-reliable-rspec-with-eval-script.yml b/changelogs/unreleased/feature-reliable-rspec-with-eval-script.yml new file mode 100644 index 00000000000..1f36d84092a --- /dev/null +++ b/changelogs/unreleased/feature-reliable-rspec-with-eval-script.yml @@ -0,0 +1,5 @@ +--- +title: Get true failure from evalulate_script by checking for element beforehand +merge_request: 14898 +author: +type: fixed diff --git a/changelogs/unreleased/feature-sm-35954-create-kubernetes-cluster-on-gke-from-k8s-service.yml b/changelogs/unreleased/feature-sm-35954-create-kubernetes-cluster-on-gke-from-k8s-service.yml deleted file mode 100644 index 14b35b6daee..00000000000 --- a/changelogs/unreleased/feature-sm-35954-create-kubernetes-cluster-on-gke-from-k8s-service.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Create Kubernetes cluster on GKE from k8s service -merge_request: 14470 -author: -type: added diff --git a/changelogs/unreleased/feature-verify_secondary_emails.yml b/changelogs/unreleased/feature-verify_secondary_emails.yml deleted file mode 100644 index e1ecc527f85..00000000000 --- a/changelogs/unreleased/feature-verify_secondary_emails.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: A confirmation email is now sent when adding a secondary email address -merge_request: -author: digitalmoksha -type: added diff --git a/changelogs/unreleased/ff_port_from_ee.yml b/changelogs/unreleased/ff_port_from_ee.yml deleted file mode 100644 index e1cb7804a47..00000000000 --- a/changelogs/unreleased/ff_port_from_ee.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Move Custom merge methods from EE -merge_request: -author: -type: added diff --git a/changelogs/unreleased/fix-edit-project-service-cancel-button-position.yml b/changelogs/unreleased/fix-edit-project-service-cancel-button-position.yml deleted file mode 100644 index efb993eff71..00000000000 --- a/changelogs/unreleased/fix-edit-project-service-cancel-button-position.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix edit project service cancel button position -merge_request: 14596 -author: Matt Coleman -type: fixed diff --git a/changelogs/unreleased/fix-gpg-case-insensitive.yml b/changelogs/unreleased/fix-gpg-case-insensitive.yml deleted file mode 100644 index 744ec00a4a8..00000000000 --- a/changelogs/unreleased/fix-gpg-case-insensitive.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Compare email addresses case insensitively when verifying GPG signatures -merge_request: 14376 -author: Tim Bishop -type: fixed diff --git a/changelogs/unreleased/fix-image-diff-swipe-handle.yml b/changelogs/unreleased/fix-image-diff-swipe-handle.yml deleted file mode 100644 index a4e0c2e8465..00000000000 --- a/changelogs/unreleased/fix-image-diff-swipe-handle.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix image diff swipe handle offset to correctly align with the frame -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix-multi-line-hook-output.yml b/changelogs/unreleased/fix-multi-line-hook-output.yml deleted file mode 100644 index f625ec2ee6c..00000000000 --- a/changelogs/unreleased/fix-multi-line-hook-output.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Display full pre-receive and post-receive hook output in GitLab UI -merge_request: 14222 -author: Robin Bobbitt -type: fixed diff --git a/changelogs/unreleased/fix-resolved-side-by-side.yml b/changelogs/unreleased/fix-resolved-side-by-side.yml deleted file mode 100644 index 424130c3eb0..00000000000 --- a/changelogs/unreleased/fix-resolved-side-by-side.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix resolved discussions not expanding on side by side view -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix-sidebar-with-scrollbars.yml b/changelogs/unreleased/fix-sidebar-with-scrollbars.yml deleted file mode 100644 index e0b3851b97f..00000000000 --- a/changelogs/unreleased/fix-sidebar-with-scrollbars.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed the sidebar scrollbar overlapping links -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix-system-hook-docs.yml b/changelogs/unreleased/fix-system-hook-docs.yml new file mode 100644 index 00000000000..393c84a2eff --- /dev/null +++ b/changelogs/unreleased/fix-system-hook-docs.yml @@ -0,0 +1,5 @@ +--- +title: Clarify system_hook triggers in documentation +merge_request: 14957 +author: Joe Marty +type: other diff --git a/changelogs/unreleased/fix-tooltip-width-issue-board.yml b/changelogs/unreleased/fix-tooltip-width-issue-board.yml deleted file mode 100644 index a648953c5bd..00000000000 --- a/changelogs/unreleased/fix-tooltip-width-issue-board.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Issue board tooltips are now the correct width when the column is collapsed -merge_request: -author: Jedidiah Broadbent -type: fixed diff --git a/changelogs/unreleased/fix-update-doorkeeper-openid-connect.yml b/changelogs/unreleased/fix-update-doorkeeper-openid-connect.yml deleted file mode 100644 index c57fceec92f..00000000000 --- a/changelogs/unreleased/fix-update-doorkeeper-openid-connect.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade doorkeeper-openid_connect -merge_request: 14372 -author: Markus Koller -type: other diff --git a/changelogs/unreleased/fl-autodevops-fix.yml b/changelogs/unreleased/fl-autodevops-fix.yml deleted file mode 100644 index 21b739231a8..00000000000 --- a/changelogs/unreleased/fl-autodevops-fix.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improve autodevops banner UX and render it only in project page -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fl-fix-ca-time-component.yml b/changelogs/unreleased/fl-fix-ca-time-component.yml deleted file mode 100644 index ecd377409ca..00000000000 --- a/changelogs/unreleased/fl-fix-ca-time-component.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix typo in cycle analytics breaking time component -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/force-two-up-view.yml b/changelogs/unreleased/force-two-up-view.yml deleted file mode 100644 index 1074eb384bb..00000000000 --- a/changelogs/unreleased/force-two-up-view.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Force two up view to load by default for image diffs -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/gem-sm-bump-google-api-client-gem-from-0-8-6-to-0-13-6.yml b/changelogs/unreleased/gem-sm-bump-google-api-client-gem-from-0-8-6-to-0-13-6.yml deleted file mode 100644 index 13ec113167f..00000000000 --- a/changelogs/unreleased/gem-sm-bump-google-api-client-gem-from-0-8-6-to-0-13-6.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Bump google-api-client Gem from 0.8.6 to 0.13.6 -merge_request: -author: -type: other diff --git a/changelogs/unreleased/gitaly_feature_flag_metadata.yml b/changelogs/unreleased/gitaly_feature_flag_metadata.yml deleted file mode 100644 index 58e42ef9324..00000000000 --- a/changelogs/unreleased/gitaly_feature_flag_metadata.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add client and call site metadata to Gitaly calls for better traceability -merge_request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14332 -author: -type: added diff --git a/changelogs/unreleased/group-milestones-breadcrumb.yml b/changelogs/unreleased/group-milestones-breadcrumb.yml deleted file mode 100644 index 87085759fda..00000000000 --- a/changelogs/unreleased/group-milestones-breadcrumb.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed milestone breadcrumb links -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/group-sort-dropdown-blank.yml b/changelogs/unreleased/group-sort-dropdown-blank.yml deleted file mode 100644 index dd16892be4d..00000000000 --- a/changelogs/unreleased/group-sort-dropdown-blank.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed group sort dropdown defaulting to empty -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/hash-mr-scroll-load.yml b/changelogs/unreleased/hash-mr-scroll-load.yml deleted file mode 100644 index 7e3965add03..00000000000 --- a/changelogs/unreleased/hash-mr-scroll-load.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed notes not being scrolled to in merge requests -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/hashed-storage-migration-path.yml b/changelogs/unreleased/hashed-storage-migration-path.yml deleted file mode 100644 index 5890eb09c38..00000000000 --- a/changelogs/unreleased/hashed-storage-migration-path.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Script to migrate project's repositories to new Hashed Storage -merge_request: 14067 -author: -type: added diff --git a/changelogs/unreleased/hide-read-registry-scope-when-registry-disabled.yml b/changelogs/unreleased/hide-read-registry-scope-when-registry-disabled.yml deleted file mode 100644 index 22ac9b9073f..00000000000 --- a/changelogs/unreleased/hide-read-registry-scope-when-registry-disabled.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Hide read_registry scope when registry is disabled on instance -merge_request: 13314 -author: Robin Bobbitt diff --git a/changelogs/unreleased/ie-event-polyfill.yml b/changelogs/unreleased/ie-event-polyfill.yml deleted file mode 100644 index eaab089a47e..00000000000 --- a/changelogs/unreleased/ie-event-polyfill.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adds Event polyfill for IE11 -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/import-sources-fix.yml b/changelogs/unreleased/import-sources-fix.yml deleted file mode 100644 index 03e23bc617c..00000000000 --- a/changelogs/unreleased/import-sources-fix.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Read import sources from setting at first initialization -merge_request: 14141 -author: Visay Keo -type: fixed diff --git a/changelogs/unreleased/improve_sorting_list.yml b/changelogs/unreleased/improve_sorting_list.yml deleted file mode 100644 index a3730e23ed1..00000000000 --- a/changelogs/unreleased/improve_sorting_list.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improve list of sorting options -merge_request: 14320 -author: Vitaliy @blackst0ne Klachkov -type: added diff --git a/changelogs/unreleased/issue_32215.yml b/changelogs/unreleased/issue_32215.yml deleted file mode 100644 index c608eb6dd28..00000000000 --- a/changelogs/unreleased/issue_32215.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Allow developer role to admin milestones -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/issue_35873.yml b/changelogs/unreleased/issue_35873.yml deleted file mode 100644 index 65064b97e56..00000000000 --- a/changelogs/unreleased/issue_35873.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Commenting on image diffs -merge_request: 14061 -author: -type: added diff --git a/changelogs/unreleased/italicized_emoji.yml b/changelogs/unreleased/italicized_emoji.yml deleted file mode 100644 index d3f15f94363..00000000000 --- a/changelogs/unreleased/italicized_emoji.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update native unicode emojis to always render as normal text (previously could render italicized) -merge_request: -author: Branka Martinovic -type: fixed diff --git a/changelogs/unreleased/jobs-sort-by-id.yml b/changelogs/unreleased/jobs-sort-by-id.yml deleted file mode 100644 index ec2c3a17b74..00000000000 --- a/changelogs/unreleased/jobs-sort-by-id.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Sort JobsController by id, not created_at -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/kt-bug-fix-revision-and-size-for-container-registry.yml b/changelogs/unreleased/kt-bug-fix-revision-and-size-for-container-registry.yml deleted file mode 100644 index acbb24d16fc..00000000000 --- a/changelogs/unreleased/kt-bug-fix-revision-and-size-for-container-registry.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix revision and total size missing for Container Registry -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/lint-changelog-yaml.yml b/changelogs/unreleased/lint-changelog-yaml.yml deleted file mode 100644 index dcc8bf54827..00000000000 --- a/changelogs/unreleased/lint-changelog-yaml.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Detect when changelog entries are invalid -merge_request: -author: -type: other diff --git a/changelogs/unreleased/mentions-in-comments.yml b/changelogs/unreleased/mentions-in-comments.yml deleted file mode 100644 index 907f455007b..00000000000 --- a/changelogs/unreleased/mentions-in-comments.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Makes @mentions links have a different styling for better separation -merge_request: -author: -type: added diff --git a/changelogs/unreleased/merge-request-notes-performance.yml b/changelogs/unreleased/merge-request-notes-performance.yml deleted file mode 100644 index 6cf7a5047df..00000000000 --- a/changelogs/unreleased/merge-request-notes-performance.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use a UNION ALL for getting merge request notes -merge_request: -author: -type: other diff --git a/changelogs/unreleased/milestone-avatar-issuable-link.yml b/changelogs/unreleased/milestone-avatar-issuable-link.yml deleted file mode 100644 index 7915ad60fa8..00000000000 --- a/changelogs/unreleased/milestone-avatar-issuable-link.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed milestone issuable assignee link URL -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/mk-clarify-moving-namespaces.yml b/changelogs/unreleased/mk-clarify-moving-namespaces.yml deleted file mode 100644 index 8d89c296f61..00000000000 --- a/changelogs/unreleased/mk-clarify-moving-namespaces.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Expand docs for changing username or group path -merge_request: 13914 -author: -type: other diff --git a/changelogs/unreleased/mk-normalize-ldap-user-dns.yml b/changelogs/unreleased/mk-normalize-ldap-user-dns.yml deleted file mode 100644 index 5a128d6acc1..00000000000 --- a/changelogs/unreleased/mk-normalize-ldap-user-dns.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Search or compare LDAP DNs case-insensitively and ignore excess whitespace -merge_request: 14697 -author: -type: fixed diff --git a/changelogs/unreleased/mr-side-by-side-breadcrumbs-container.yml b/changelogs/unreleased/mr-side-by-side-breadcrumbs-container.yml deleted file mode 100644 index 39b636bdfda..00000000000 --- a/changelogs/unreleased/mr-side-by-side-breadcrumbs-container.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed breadcrumbs container expanding in side-by-side diff view -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/mr-widget-merged-date-tooltip.yml b/changelogs/unreleased/mr-widget-merged-date-tooltip.yml deleted file mode 100644 index ea22993ff52..00000000000 --- a/changelogs/unreleased/mr-widget-merged-date-tooltip.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed merge request widget merged & closed date tooltip text -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/multi-file-editor-submodules.yml b/changelogs/unreleased/multi-file-editor-submodules.yml new file mode 100644 index 00000000000..b83a50957c5 --- /dev/null +++ b/changelogs/unreleased/multi-file-editor-submodules.yml @@ -0,0 +1,5 @@ +--- +title: Added submodule support in multi-file editor +merge_request: +author: +type: added diff --git a/changelogs/unreleased/not-found-in-commits.yml b/changelogs/unreleased/not-found-in-commits.yml new file mode 100644 index 00000000000..d5f9ff15a36 --- /dev/null +++ b/changelogs/unreleased/not-found-in-commits.yml @@ -0,0 +1,5 @@ +--- +title: Renders 404 in commits controller if no commits are found for a given path +merge_request: 14610 +author: Guilherme Vieira +type: fixed diff --git a/changelogs/unreleased/prevent-creating-multiple-application-settings.yml b/changelogs/unreleased/prevent-creating-multiple-application-settings.yml deleted file mode 100644 index fd49028b9e9..00000000000 --- a/changelogs/unreleased/prevent-creating-multiple-application-settings.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Prevent creating multiple ApplicationSetting instances -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/project-page-clearer.yml b/changelogs/unreleased/project-page-clearer.yml deleted file mode 100644 index 7db01373360..00000000000 --- a/changelogs/unreleased/project-page-clearer.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Added tabs to dashboard/projects to easily switch to personal projects -merge_request: -author: -type: added diff --git a/changelogs/unreleased/rc-fix-gh-import-branches-performance.yml b/changelogs/unreleased/rc-fix-gh-import-branches-performance.yml deleted file mode 100644 index af359ce96b4..00000000000 --- a/changelogs/unreleased/rc-fix-gh-import-branches-performance.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improve GitHub import performance -merge_request: 14445 -author: -type: other diff --git a/changelogs/unreleased/rd-fix-case-sensative-email-conf-signup.yml b/changelogs/unreleased/rd-fix-case-sensative-email-conf-signup.yml deleted file mode 100644 index 69695e403a9..00000000000 --- a/changelogs/unreleased/rd-fix-case-sensative-email-conf-signup.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix case sensitive email confirmation on signup -merge_request: 14606 -author: robdel12 -type: fixed diff --git a/changelogs/unreleased/refactor-animate-js.yml b/changelogs/unreleased/refactor-animate-js.yml deleted file mode 100644 index ec32d68bbdd..00000000000 --- a/changelogs/unreleased/refactor-animate-js.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove animate.js and label animation. -merge_request: -author: -type: removed diff --git a/changelogs/unreleased/refactor-monitoring-service.yml b/changelogs/unreleased/refactor-monitoring-service.yml deleted file mode 100644 index 685397cadb8..00000000000 --- a/changelogs/unreleased/refactor-monitoring-service.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Perform prometheus data endpoint requests in parallel -merge_request: 14003 -author: -type: fixed diff --git a/changelogs/unreleased/remote_user.yml b/changelogs/unreleased/remote_user.yml deleted file mode 100644 index 75a941fa95f..00000000000 --- a/changelogs/unreleased/remote_user.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Add username as GL_USERNAME in hooks -merge_request: -author: diff --git a/changelogs/unreleased/remove-temporary-ci-index.yml b/changelogs/unreleased/remove-temporary-ci-index.yml deleted file mode 100644 index a319f7fff7f..00000000000 --- a/changelogs/unreleased/remove-temporary-ci-index.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove an index on ci_builds meant to be only temporary -merge_request: -author: -type: other diff --git a/changelogs/unreleased/remove-use-key-worker.yml b/changelogs/unreleased/remove-use-key-worker.yml deleted file mode 100644 index a39bcae66bc..00000000000 --- a/changelogs/unreleased/remove-use-key-worker.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Stop using Sidekiq for updating Key#last_used_at -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/remove_repo_prefix_from_api.yml b/changelogs/unreleased/remove_repo_prefix_from_api.yml deleted file mode 100644 index bf2075e529c..00000000000 --- a/changelogs/unreleased/remove_repo_prefix_from_api.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove 'Repo' prefix from API entites -merge_request: 14694 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_emails-feature.yml b/changelogs/unreleased/replace_emails-feature.yml deleted file mode 100644 index d7f1a7a7ba9..00000000000 --- a/changelogs/unreleased/replace_emails-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the profile/emails.feature spinach test with an rspec analog -merge_request: 14172 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_group_links-feature.yml b/changelogs/unreleased/replace_group_links-feature.yml deleted file mode 100644 index 7dd157632c9..00000000000 --- a/changelogs/unreleased/replace_group_links-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace project/group_links.feature spinach test with an rspec analog -merge_request: 14169 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_milestone-feature.yml b/changelogs/unreleased/replace_milestone-feature.yml deleted file mode 100644 index effe6d65645..00000000000 --- a/changelogs/unreleased/replace_milestone-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the project/milestone.feature spinach test with an rspec analog -merge_request: 14171 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_profile_active_tab-feature.yml b/changelogs/unreleased/replace_profile_active_tab-feature.yml deleted file mode 100644 index e911396a2b9..00000000000 --- a/changelogs/unreleased/replace_profile_active_tab-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'profile/active_tab.feature' spinach test with an rspec analog -merge_request: 14239 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_archived-feature.yml b/changelogs/unreleased/replace_project_archived-feature.yml deleted file mode 100644 index d0697347aa0..00000000000 --- a/changelogs/unreleased/replace_project_archived-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/archived.feature' spinach test with an rspec analog -merge_request: 14322 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_builds_summary-feature.yml b/changelogs/unreleased/replace_project_builds_summary-feature.yml deleted file mode 100644 index 48652b39b7e..00000000000 --- a/changelogs/unreleased/replace_project_builds_summary-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/builds/summary.feature' spinach test with an rspec analog -merge_request: 14177 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_commits_revert-feature.yml b/changelogs/unreleased/replace_project_commits_revert-feature.yml deleted file mode 100644 index 7fc9fcf3580..00000000000 --- a/changelogs/unreleased/replace_project_commits_revert-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/commits/revert.feature' spinach test with an rspec analog -merge_request: 14325 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_issues_award_emoji-feature.yml b/changelogs/unreleased/replace_project_issues_award_emoji-feature.yml deleted file mode 100644 index a4a7435d4fa..00000000000 --- a/changelogs/unreleased/replace_project_issues_award_emoji-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/issues/award_emoji.feature' spinach test with an rspec analog -merge_request: 14202 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_merge_requests-feature.yml b/changelogs/unreleased/replace_project_merge_requests-feature.yml deleted file mode 100644 index 082c922a32b..00000000000 --- a/changelogs/unreleased/replace_project_merge_requests-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/merge_requests.feature' spinach test with an rspec analog -merge_request: 14621 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_merge_requests_accept-feature.yml b/changelogs/unreleased/replace_project_merge_requests_accept-feature.yml deleted file mode 100644 index 03562d6025e..00000000000 --- a/changelogs/unreleased/replace_project_merge_requests_accept-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog -merge_request: 14176 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_merge_requests_revert-feature.yml b/changelogs/unreleased/replace_project_merge_requests_revert-feature.yml deleted file mode 100644 index 7d1ab4566b6..00000000000 --- a/changelogs/unreleased/replace_project_merge_requests_revert-feature.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Replace the 'project/merge_requests/revert.feature' spinach test with an rspec - analog -merge_request: 14201 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_service-feature.yml b/changelogs/unreleased/replace_project_service-feature.yml deleted file mode 100644 index 11814732a9b..00000000000 --- a/changelogs/unreleased/replace_project_service-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/service.feature' spinach test with an rspec analog -merge_request: 14432 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_shortcuts-feature.yml b/changelogs/unreleased/replace_project_shortcuts-feature.yml deleted file mode 100644 index 89e47a7a983..00000000000 --- a/changelogs/unreleased/replace_project_shortcuts-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/shortcuts.feature' spinach test with an rspec analog -merge_request: 14431 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_snippets-feature.yml b/changelogs/unreleased/replace_project_snippets-feature.yml deleted file mode 100644 index 4fdee70008a..00000000000 --- a/changelogs/unreleased/replace_project_snippets-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/snippets.feature' spinach test with an rspec analog -merge_request: 14326 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_search-feature.yml b/changelogs/unreleased/replace_search-feature.yml deleted file mode 100644 index 487f602ba30..00000000000 --- a/changelogs/unreleased/replace_search-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'search.feature' spinach test with an rspec analog -merge_request: 14248 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_spinach_wiki-feature.yml b/changelogs/unreleased/replace_spinach_wiki-feature.yml deleted file mode 100644 index a1801f1b58d..00000000000 --- a/changelogs/unreleased/replace_spinach_wiki-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace 'project/wiki.feature' spinach test with an rspec analog -merge_request: 13856 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_team_management-feature.yml b/changelogs/unreleased/replace_team_management-feature.yml deleted file mode 100644 index bc2bb17faf1..00000000000 --- a/changelogs/unreleased/replace_team_management-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the project/team_management.feature spinach test with an rspec analog -merge_request: 14173 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/rotated_profile_image.yml b/changelogs/unreleased/rotated_profile_image.yml deleted file mode 100644 index 1e221e47379..00000000000 --- a/changelogs/unreleased/rotated_profile_image.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix profile image orientation based on EXIF data gvieira37 -merge_request: 14461 -author: gvieira37 -type: fixed diff --git a/changelogs/unreleased/save-a-query-on-todos-with-no-filters.yml b/changelogs/unreleased/save-a-query-on-todos-with-no-filters.yml deleted file mode 100644 index c9fb042aa37..00000000000 --- a/changelogs/unreleased/save-a-query-on-todos-with-no-filters.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove a SQL query from the todos index page -merge_request: -author: -type: other diff --git a/changelogs/unreleased/sh-fix-container-registry-destroy.yml b/changelogs/unreleased/sh-fix-container-registry-destroy.yml new file mode 100644 index 00000000000..21a463da62a --- /dev/null +++ b/changelogs/unreleased/sh-fix-container-registry-destroy.yml @@ -0,0 +1,5 @@ +--- +title: Fix deletion of container registry or images returning an error +merge_request: +author: +type: fixed diff --git a/changelogs/unreleased/sh-fix-username-logging.yml b/changelogs/unreleased/sh-fix-username-logging.yml deleted file mode 100644 index dadf3fb6729..00000000000 --- a/changelogs/unreleased/sh-fix-username-logging.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix username and ID not logging in production_json.log for Git activity -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/sh-show-all-slack-names.yml b/changelogs/unreleased/sh-show-all-slack-names.yml deleted file mode 100644 index f970cd0fb15..00000000000 --- a/changelogs/unreleased/sh-show-all-slack-names.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Include GitLab full name in Slack messages -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/sh-thread-safe-markdown.yml b/changelogs/unreleased/sh-thread-safe-markdown.yml deleted file mode 100644 index af7d9d58a9f..00000000000 --- a/changelogs/unreleased/sh-thread-safe-markdown.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Make Redcarpet Markdown renderer thread-safe -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/tag-link-size.yml b/changelogs/unreleased/tag-link-size.yml deleted file mode 100644 index d94e415ba1f..00000000000 --- a/changelogs/unreleased/tag-link-size.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adjusts tag link to avoid underlining spaces -merge_request: 14544 -author: Guilherme Vieira -type: fixed diff --git a/changelogs/unreleased/tc-geo-read-only-idea.yml b/changelogs/unreleased/tc-geo-read-only-idea.yml deleted file mode 100644 index e1b52eef2ca..00000000000 --- a/changelogs/unreleased/tc-geo-read-only-idea.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Create idea of read-only database -merge_request: 14688 -author: -type: changed diff --git a/changelogs/unreleased/uipolish-fix-2factor-warning.yml b/changelogs/unreleased/uipolish-fix-2factor-warning.yml deleted file mode 100644 index 9f55207d309..00000000000 --- a/changelogs/unreleased/uipolish-fix-2factor-warning.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Two factor auth messages in settings no longer overlap the button -merge_request: -author: Jedidiah Broadbent -type: fixed diff --git a/changelogs/unreleased/uipolish-fix-remember-me-checkbox.yml b/changelogs/unreleased/uipolish-fix-remember-me-checkbox.yml deleted file mode 100644 index 34aa3d0db6f..00000000000 --- a/changelogs/unreleased/uipolish-fix-remember-me-checkbox.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Made the "remember me" check boxes have consistent styles and alignment -merge_request: -author: Jedidiah Broadbent -type: fixed diff --git a/changelogs/unreleased/update-pages-0-6.yml b/changelogs/unreleased/update-pages-0-6.yml deleted file mode 100644 index 507bb4d78e9..00000000000 --- a/changelogs/unreleased/update-pages-0-6.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update GitLab Pages to v0.6.0 -merge_request: 14630 -author: -type: other diff --git a/changelogs/unreleased/use-title.yml b/changelogs/unreleased/use-title.yml new file mode 100644 index 00000000000..647e282eb69 --- /dev/null +++ b/changelogs/unreleased/use-title.yml @@ -0,0 +1,5 @@ +--- +title: Use title as placeholder instead of issue title for reusability +merge_request: +author: +type: other diff --git a/changelogs/unreleased/valid-branch-name-dash-bug.yml b/changelogs/unreleased/valid-branch-name-dash-bug.yml deleted file mode 100644 index 89e4578b3e5..00000000000 --- a/changelogs/unreleased/valid-branch-name-dash-bug.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Prevent branches or tags from starting with invalid characters (e.g. -, .) -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/voogsgerd-gitlab-ce-daniel-legacy-config.yml b/changelogs/unreleased/voogsgerd-gitlab-ce-daniel-legacy-config.yml deleted file mode 100644 index faa5d3303c6..00000000000 --- a/changelogs/unreleased/voogsgerd-gitlab-ce-daniel-legacy-config.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Removed two legacy config options -merge_request: -author: Daniel Voogsgerd -type: deprecated diff --git a/changelogs/unreleased/winh-delete-account-modal.yml b/changelogs/unreleased/winh-delete-account-modal.yml deleted file mode 100644 index f1e2710fdcc..00000000000 --- a/changelogs/unreleased/winh-delete-account-modal.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Show confirmation modal before deleting account -merge_request: 14360 -author: -type: changed diff --git a/changelogs/unreleased/winh-indeterminate-dropdown.yml b/changelogs/unreleased/winh-indeterminate-dropdown.yml deleted file mode 100644 index 61205d1643e..00000000000 --- a/changelogs/unreleased/winh-indeterminate-dropdown.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix alignment for indeterminate marker in dropdowns -merge_request: 14809 -author: -type: fixed diff --git a/changelogs/unreleased/winh-protected-branch-modal-merged.yml b/changelogs/unreleased/winh-protected-branch-modal-merged.yml deleted file mode 100644 index 63f1f424a5d..00000000000 --- a/changelogs/unreleased/winh-protected-branch-modal-merged.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Display whether branch has been merged when deleting protected branch -merge_request: 14220 -author: -type: changed diff --git a/changelogs/unreleased/winh-sprintf.yml b/changelogs/unreleased/winh-sprintf.yml deleted file mode 100644 index f8ae5932ae4..00000000000 --- a/changelogs/unreleased/winh-sprintf.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add basic sprintf implementation to JavaScript -merge_request: 14506 -author: -type: other diff --git a/config/routes/project.rb b/config/routes/project.rb index 7f0e056c884..d05fe11f233 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -281,8 +281,13 @@ constraints(ProjectUrlConstrainer.new) do namespace :registry do resources :repository, only: [] do - resources :tags, only: [:index, :destroy], - constraints: { id: Gitlab::Regex.container_registry_tag_regex } + # We default to JSON format in the controller to avoid ambiguity. + # `latest.json` could either be a request for a tag named `latest` + # in JSON format, or a request for tag named `latest.json`. + scope format: false do + resources :tags, only: [:index, :destroy], + constraints: { id: Gitlab::Regex.container_registry_tag_regex } + end end end diff --git a/doc/administration/logs.md b/doc/administration/logs.md index 76e071dc673..c9ed2d84ccb 100644 --- a/doc/administration/logs.md +++ b/doc/administration/logs.md @@ -18,8 +18,7 @@ other than production, the corresponding logfile is shown here.) It contains a structured log for Rails controller requests received from GitLab, thanks to [Lograge](https://github.com/roidrage/lograge/). Note that -requests from the API [are not yet logged to this -file](https://gitlab.com/gitlab-org/gitlab-ce/issues/36189). +requests from the API are logged to a separate file in `api_json.log`. Each line contains a JSON line that can be ingested by Elasticsearch, Splunk, etc. For example: @@ -73,6 +72,27 @@ In this example we can see that server processed an HTTP request with URL 19:34:53 +0200. Also we can see that request was processed by `Projects::TreeController`. +## `api_json.log` + +Introduced in GitLab 10.0, this file lives in +`/var/log/gitlab/gitlab-rails/api_json.log` for Omnibus GitLab packages or in +`/home/git/gitlab/log/api_json.log` for installations from source. + +It helps you see requests made directly to the API. For example: + +```json +{"time":"2017-10-10T12:30:11.579Z","severity":"INFO","duration":16.84,"db":1.57,"view":15.27,"status":200,"method":"POST","path":"/api/v4/internal/allowed","params":{"action":"git-upload-pack","changes":"_any","gl_repository":null,"project":"root/foobar.git","protocol":"ssh","env":"{}","key_id":"[FILTERED]","secret_token":"[FILTERED]"},"host":"127.0.0.1","ip":"127.0.0.1","ua":"Ruby"} +``` + +This entry above shows an access to an internal endpoint to check whether an +associated SSH key can download the project in question via a `git fetch` or +`git clone`. In this example, we see: + +1. `method`: The HTTP method used to make the request +1. `path`: The relative path of the query +1. `params`: Key-value pairs passed in a query string or HTTP body. Sensitive parameters (e.g. passwords, tokens, etc.) are filtered out. +1. `ua`: The User-Agent of the requester + ## `application.log` This file lives in `/var/log/gitlab/gitlab-rails/application.log` for diff --git a/doc/api/README.md b/doc/api/README.md index 3fd4c97e536..de0fe79b3d6 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -63,7 +63,21 @@ following locations: ## Road to GraphQL -We have changed our plans to move to GraphQL. After reviewing the GraphQL license, anything related to the Facebook BSD plus patent license will not be allowed at GitLab. +Going forward, we will start on moving to +[GraphQL](http://graphql.org/learn/best-practices/) and deprecate the use of +controller-specific endpoints. GraphQL has a number of benefits: + +1. We avoid having to maintain two different APIs. +2. Callers of the API can request only what they need. +3. It is versioned by default. + +It will co-exist with the current v4 REST API. If we have a v5 API, this should +be a compatibility layer on top of GraphQL. + +Although there were some patenting and licensing concerns with GraphQL, these +have been resolved to our satisfaction by the relicensing of the reference +implementations under MIT, and the use of the OWF license for the GraphQL +specification. ## Basic usage @@ -441,6 +455,23 @@ Content-Type: application/json } ``` +## Encoding `+` in ISO 8601 dates + +If you need to include a `+` in a query parameter, you may need to use `%2B` instead due +a [W3 recommendation]((http://www.w3.org/Addressing/URL/4_URI_Recommentations.html) that +causes a `+` to be interpreted as a space. For example, in an ISO 8601 date, you may want to pass +a time in Mountain Standard Time, such as: + +``` +2017-10-17T23:11:13.000+05:30 +``` + +The correct encoding for the query parameter would be: + +``` +2017-10-17T23:11:13.000%2B05:30 +``` + ## Clients There are many unofficial GitLab API Clients for most of the popular diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index 17839cbaef1..73568757aaa 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -43,6 +43,7 @@ future GitLab releases.** | **CI_COMMIT_TAG** | 9.0 | 0.5 | The commit tag name. Present only when building tags. | | **CI_CONFIG_PATH** | 9.4 | 0.5 | The path to CI config file. Defaults to `.gitlab-ci.yml` | | **CI_DEBUG_TRACE** | all | 1.7 | Whether [debug tracing](#debug-tracing) is enabled | +| **CI_DISPOSABLE_ENVIRONMENT** | all | 10.1 | Mark that job is executed in a disposable environment (something that is created only for this job and disposed of/destroyed after the execution - all executors except `shell` and `ssh`). If the environment is disposable, it is set to true, otherwise it is not defined at all. | | **CI_ENVIRONMENT_NAME** | 8.15 | all | The name of the environment for this job | | **CI_ENVIRONMENT_SLUG** | 8.15 | all | A simplified version of the environment name, suitable for inclusion in DNS, URLs, Kubernetes labels, etc. | | **CI_ENVIRONMENT_URL** | 9.3 | all | The URL of the environment for this job | @@ -73,6 +74,7 @@ future GitLab releases.** | **CI_SERVER_NAME** | all | all | The name of CI server that is used to coordinate jobs | | **CI_SERVER_REVISION** | all | all | GitLab revision that is used to schedule jobs | | **CI_SERVER_VERSION** | all | all | GitLab version that is used to schedule jobs | +| **CI_SHARED_ENVIRONMENT** | all | 10.1 | Mark that job is executed in a shared environment (something that is persisted across CI invocations like `shell` or `ssh` executor). If the environment is shared, it is set to true, otherwise it is not defined at all. | | **ARTIFACT_DOWNLOAD_ATTEMPTS** | 8.15 | 1.9 | Number of attempts to download artifacts running a job | | **GET_SOURCES_ATTEMPTS** | 8.15 | 1.9 | Number of attempts to fetch sources running a job | | **GITLAB_CI** | all | all | Mark that job is executed in GitLab CI environment | diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 38bd0450a09..6ad70707594 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -95,6 +95,12 @@ be an array or a multi-line string. `after_script` is used to define the command that will be run after for all jobs. This has to be an array or a multi-line string. +> **Note:** +The `before_script` and the main `script` are concatenated and run in a single context/container. +The `after_script` is run separately, so depending on the executor, changes done +outside of the working tree might not be visible, e.g. software installed in the +`before_script`. + ### stages `stages` is used to define stages that can be used by jobs. diff --git a/doc/development/licensing.md b/doc/development/licensing.md index a75cdf22f40..902b1c74a42 100644 --- a/doc/development/licensing.md +++ b/doc/development/licensing.md @@ -56,6 +56,7 @@ Libraries with the following licenses are acceptable for use: - [ISC License][ISC] (also known as the OpenBSD License): A permissive (non-copyleft) license as defined by the Open Source Initiative. - [Creative Commons Zero (CC0)][CC0]: A public domain dedication, recommended as a way to disclaim copyright on your work to the maximum extent possible. - [Unlicense][UNLICENSE]: Another public domain dedication. +- [OWFa 1.0][OWFa1]: An open-source license and patent grant designed for specifications. ## Unacceptable Licenses @@ -105,6 +106,7 @@ Gems which are included only in the "development" or "test" groups by Bundler ar [OSL-GNU]: https://www.gnu.org/licenses/license-list.en.html#OSL [Org-Repo]: https://gitlab.com/gitlab-com/organization [UNLICENSE]: https://unlicense.org +[OWFa1]: http://www.openwebfoundation.org/legal/the-owf-1-0-agreements/owfa-1-0 [Facebook]: https://code.facebook.com/pages/850928938376556 [x-list]: https://www.apache.org/legal/resolved.html#category-x [Acceptable-Licenses]: #acceptable-licenses diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md index 613423dbd9a..7ddd02e6c73 100644 --- a/doc/development/testing_guide/best_practices.md +++ b/doc/development/testing_guide/best_practices.md @@ -35,6 +35,8 @@ Here are some things to keep in mind regarding test performance: [Gotchas](../gotchas.md#dont-assert-against-the-absolute-value-of-a-sequence-generated-attribute)). - Don't supply the `:each` argument to hooks since it's the default. - On `before` and `after` hooks, prefer it scoped to `:context` over `:all` +- When using `evaluate_script("$('.js-foo').testSomething()")` (or `execute_script`) which acts on a given element, + use a Capyabara matcher beforehand (e.g. `find('.js-foo')`) to ensure the element actually exists. [four-phase-test]: https://robots.thoughtbot.com/four-phase-test diff --git a/doc/integration/google.md b/doc/integration/google.md index 0611cbb59dc..727ca13ebcf 100644 --- a/doc/integration/google.md +++ b/doc/integration/google.md @@ -105,24 +105,5 @@ form. Click the icon to begin the authentication process. Google will ask the user to sign in and authorize the GitLab application. If everything goes well the user will be returned to GitLab and will be signed in. -## Further Configuration - -This further configuration is not required for Google authentication to function -but it is strongly recommended. Taking these steps will increase usability for -users by providing a little more recognition and branding. - -At this point, when users first try to authenticate to your GitLab installation -with Google they will see a generic application name on the prompt screen. The -prompt informs the user that "Project Default Service Account" would like to -access their account. "Project Default Service Account" isn't very recognizable -and may confuse or cause users to be concerned. This is easily changeable: - -1. Select 'Consent screen' in the left menu. (See steps 1, 4 and 5 above for - instructions on how to get here if you closed your window). -1. Scroll down until you find "Product Name". Change the product name to - something more descriptive. -1. Add any additional information as you wish - homepage, logo, privacy policy, - etc. None of this is required, but it may help your users. - [reconfigure]: ../administration/restart_gitlab.md#omnibus-gitlab-reconfigure [restart GitLab]: ../administration/restart_gitlab.md#installations-from-source diff --git a/doc/policy/maintenance.md b/doc/policy/maintenance.md new file mode 100644 index 00000000000..7ab56c89014 --- /dev/null +++ b/doc/policy/maintenance.md @@ -0,0 +1,81 @@ +# GitLab Maintenance Policy + +## Versioning + +GitLab follows the [Semantic Versioning](http://semver.org/) for its releases: +`(Major).(Minor).(Patch)` in a [pragmatic way]. + +- **Major version**: Whenever there is something significant or any backwards + incompatible changes are introduced to the public API. +- **Minor version**: When new, backwards compatible functionality is introduced + to the public API or a minor feature is introduced, or when a set of smaller + features is rolled out. +- **Patch number**: When backwards compatible bug fixes are introduced that fix + incorrect behavior. + +For example, for GitLab version 10.5.7: + +* `10` represents major version +* `5` represents minor version +* `7` represents patch number + +## Security releases + +The current stable release will receive security patches and bug fixes +(eg. `8.9.0` -> `8.9.1`). + +Feature releases will mark the next supported stable +release where the minor version is increased numerically by increments of one +(eg. `8.9 -> 8.10`). + +Our current policy is to support one stable release at any given time. +For medium-level security issues, we may consider backporting to the previous two +monthly releases. + +For very serious security issues, there is [precedent](https://about.gitlab.com/2016/05/02/cve-2016-4340-patches/) +to backport security fixes to even more monthly releases of GitLab. This decision +is made on a case-by-case basis. + +## Version support + +We encourage everyone to run the latest stable release to ensure that you can +easily upgrade to the most secure and feature-rich GitLab experience. In order +to make sure you can easily run the most recent stable release, we are working +hard to keep the update process simple and reliable. + +If you are unable to follow our monthly release cycle, there are a couple of +cases you need to consider. + +It is considered safe to jump between patch versions and minor versions within +one major version. For example, it is safe to: + +* Upgrade the patch version: + * `8.9.0` -> `8.9.7` + * `8.9.0` -> `8.9.1` + * `8.9.2` -> `8.9.6` +* Upgrade the minor version: + * `8.9.4` -> `8.12.3` + * `9.2.3` -> `9.5.5` + +Upgrading the major version requires more attention. +We cannot guarantee that upgrading between major versions will be seamless. As previously mentioned, major versions are reserved for backwards incompatible changes. + +We recommend that you first upgrade to the latest available minor version within +your major version. By doing this, you can address any deprecation messages +that could possibly change behaviour in the next major release. + +Please see the table below for some examples: + +| Latest stable version | Your version | Recommended upgrade path | Note | +| -------------- | ------------ | ------------------------ | ---------------- | +| 9.4.5 | 8.13.4 | `8.13.4` -> `8.17.7` -> `9.4.5` | `8.17.7` is the last version in version `8` | +| 10.1.4 | 8.13.4 | `8.13.4` -> `8.17.7` -> `9.5.8` -> `10.1.4` | `8.17.7` is the last version in version `8`, `9.5.8` is the last version in version `9` | +| + +More information about the release procedures can be found in our +[release-tools documentation][rel]. You may also want to read our +[Responsible Disclosure Policy][disclosure]. + +[rel]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/ +[disclosure]: https://about.gitlab.com/disclosure/ +[pragmatic way]: https://gist.github.com/jashkenas/cbd2b088e20279ae2c8e diff --git a/doc/system_hooks/system_hooks.md b/doc/system_hooks/system_hooks.md index 0399ebec86a..a45a4eb9e49 100644 --- a/doc/system_hooks/system_hooks.md +++ b/doc/system_hooks/system_hooks.md @@ -2,6 +2,8 @@ Your GitLab instance can perform HTTP POST requests on the following events: `project_create`, `project_destroy`, `project_rename`, `project_transfer`, `project_update`, `user_add_to_team`, `user_remove_from_team`, `user_create`, `user_destroy`, `key_create`, `key_destroy`, `group_create`, `group_destroy`, `user_add_to_group` and `user_remove_from_group`. +The triggers for most of these are self-explanatory, but `project_update` and `project_rename` deserve some clarification: `project_update` is fired any time an attribute of a project is changed (name, description, tags, etc.) *unless* the `path` attribute is also changed. In that case, a `project_rename` is triggered instead (so that, for instance, if all you care about is the repo URL, you can just listen for `project_rename`). + System hooks can be used, e.g. for logging or changing information in a LDAP server. > **Note:** diff --git a/features/steps/project/issues/filter_labels.rb b/features/steps/project/issues/filter_labels.rb index d34fa694789..b467af53c98 100644 --- a/features/steps/project/issues/filter_labels.rb +++ b/features/steps/project/issues/filter_labels.rb @@ -28,12 +28,6 @@ class Spinach::Features::ProjectIssuesFilterLabels < Spinach::FeatureSteps end end - step 'I click link "bug"' do - page.find('.js-label-select', visible: true).click - sleep 0.5 - execute_script("$('.dropdown-menu-labels li:contains(\"bug\") a').click()") - end - step 'I click "dropdown close button"' do page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click sleep 2 diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb index 621cae5d80d..6e04f09f322 100644 --- a/features/steps/project/source/browse_files.rb +++ b/features/steps/project/source/browse_files.rb @@ -46,10 +46,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps expect(page).to have_content new_gitignore_content end - step 'I should see its content with new lines preserved at end of file' do - expect(evaluate_script('ace.edit("editor").getValue()')).to eq "Sample\n\n\n" - end - step 'I click link "Raw"' do click_link 'Open raw' end @@ -70,20 +66,11 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps click_link 'Fork' end - step 'I can edit code' do - set_new_content - expect(evaluate_script('ace.edit("editor").getValue()')).to eq new_gitignore_content - end - step 'I edit code' do expect(page).to have_selector('.file-editor') set_new_content end - step 'I edit code with new lines at end of file' do - execute_script('ace.edit("editor").setValue("Sample\n\n\n")') - end - step 'I fill the new file name' do fill_in :file_name, with: new_file_name end @@ -395,6 +382,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps private def set_new_content + find('#editor') execute_script("ace.edit('editor').setValue('#{new_gitignore_content}')") end diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb index dc0e3ac59a5..bff0d58aaf4 100644 --- a/features/steps/shared/paths.rb +++ b/features/steps/shared/paths.rb @@ -222,7 +222,7 @@ module SharedPaths end step "I visit my project's commits page for a specific path" do - visit project_commits_path(@project, root_ref + "/app/models/project.rb", { limit: 5 }) + visit project_commits_path(@project, root_ref + "/files/ruby/regex.rb", { limit: 5 }) end step 'I visit my project\'s commits stats page' do diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb index 3cf3939994a..05aa79dc160 100644 --- a/lib/backup/manager.rb +++ b/lib/backup/manager.rb @@ -101,50 +101,52 @@ module Backup end def unpack - Dir.chdir(backup_path) - - # check for existing backups in the backup dir - if backup_file_list.empty? - $progress.puts "No backups found in #{backup_path}" - $progress.puts "Please make sure that file name ends with #{FILE_NAME_SUFFIX}" - exit 1 - elsif backup_file_list.many? && ENV["BACKUP"].nil? - $progress.puts 'Found more than one backup, please specify which one you want to restore:' - $progress.puts 'rake gitlab:backup:restore BACKUP=timestamp_of_backup' - exit 1 - end + Dir.chdir(backup_path) do + # check for existing backups in the backup dir + if backup_file_list.empty? + $progress.puts "No backups found in #{backup_path}" + $progress.puts "Please make sure that file name ends with #{FILE_NAME_SUFFIX}" + exit 1 + elsif backup_file_list.many? && ENV["BACKUP"].nil? + $progress.puts 'Found more than one backup, please specify which one you want to restore:' + $progress.puts 'rake gitlab:backup:restore BACKUP=timestamp_of_backup' + exit 1 + end - tar_file = if ENV['BACKUP'].present? - "#{ENV['BACKUP']}#{FILE_NAME_SUFFIX}" - else - backup_file_list.first - end + tar_file = if ENV['BACKUP'].present? + "#{ENV['BACKUP']}#{FILE_NAME_SUFFIX}" + else + backup_file_list.first + end - unless File.exist?(tar_file) - $progress.puts "The backup file #{tar_file} does not exist!" - exit 1 - end + unless File.exist?(tar_file) + $progress.puts "The backup file #{tar_file} does not exist!" + exit 1 + end - $progress.print 'Unpacking backup ... ' + $progress.print 'Unpacking backup ... ' - unless Kernel.system(*%W(tar -xf #{tar_file})) - $progress.puts 'unpacking backup failed'.color(:red) - exit 1 - else - $progress.puts 'done'.color(:green) - end + unless Kernel.system(*%W(tar -xf #{tar_file})) + $progress.puts 'unpacking backup failed'.color(:red) + exit 1 + else + $progress.puts 'done'.color(:green) + end - ENV["VERSION"] = "#{settings[:db_version]}" if settings[:db_version].to_i > 0 - - # restoring mismatching backups can lead to unexpected problems - if settings[:gitlab_version] != Gitlab::VERSION - $progress.puts 'GitLab version mismatch:'.color(:red) - $progress.puts " Your current GitLab version (#{Gitlab::VERSION}) differs from the GitLab version in the backup!".color(:red) - $progress.puts ' Please switch to the following version and try again:'.color(:red) - $progress.puts " version: #{settings[:gitlab_version]}".color(:red) - $progress.puts - $progress.puts "Hint: git checkout v#{settings[:gitlab_version]}" - exit 1 + ENV["VERSION"] = "#{settings[:db_version]}" if settings[:db_version].to_i > 0 + + # restoring mismatching backups can lead to unexpected problems + if settings[:gitlab_version] != Gitlab::VERSION + $progress.puts(<<~HEREDOC.color(:red)) + GitLab version mismatch: + Your current GitLab version (#{Gitlab::VERSION}) differs from the GitLab version in the backup! + Please switch to the following version and try again: + version: #{settings[:gitlab_version]} + HEREDOC + $progress.puts + $progress.puts "Hint: git checkout v#{settings[:gitlab_version]}" + exit 1 + end end end diff --git a/lib/github/import.rb b/lib/github/import.rb index 55f8387f27a..76612799412 100644 --- a/lib/github/import.rb +++ b/lib/github/import.rb @@ -74,7 +74,7 @@ module Github def fetch_wiki_repository return if project.wiki.repository_exists? - wiki_path = "#{project.disk_path}.wiki" + wiki_path = project.wiki.disk_path gitlab_shell.import_repository(project.repository_storage_path, wiki_path, wiki_url) rescue Gitlab::Shell::Error => e # GitHub error message when the wiki repo has not been created, diff --git a/lib/gitlab/encoding_helper.rb b/lib/gitlab/encoding_helper.rb index 7b3483a7f96..99dfee3dd9b 100644 --- a/lib/gitlab/encoding_helper.rb +++ b/lib/gitlab/encoding_helper.rb @@ -14,9 +14,9 @@ module Gitlab ENCODING_CONFIDENCE_THRESHOLD = 50 def encode!(message) - return nil unless message.respond_to? :force_encoding + return nil unless message.respond_to?(:force_encoding) + return message if message.encoding == Encoding::UTF_8 && message.valid_encoding? - # if message is utf-8 encoding, just return it message.force_encoding("UTF-8") return message if message.valid_encoding? @@ -50,6 +50,9 @@ module Gitlab end def encode_utf8(message) + return nil unless message.is_a?(String) + return message if message.encoding == Encoding::UTF_8 && message.valid_encoding? + detect = CharlockHolmes::EncodingDetector.detect(message) if detect && detect[:encoding] begin diff --git a/lib/gitlab/github_import/wiki_formatter.rb b/lib/gitlab/github_import/wiki_formatter.rb index 0396122eeb9..ca8d96f5650 100644 --- a/lib/gitlab/github_import/wiki_formatter.rb +++ b/lib/gitlab/github_import/wiki_formatter.rb @@ -8,7 +8,7 @@ module Gitlab end def disk_path - "#{project.disk_path}.wiki" + project.wiki.disk_path end def import_url diff --git a/lib/tasks/gitlab/dev.rake b/lib/tasks/gitlab/dev.rake index b4d05f5995a..930b4bc13e2 100644 --- a/lib/tasks/gitlab/dev.rake +++ b/lib/tasks/gitlab/dev.rake @@ -5,7 +5,9 @@ namespace :gitlab do opts = if ENV['CI'] { - ce_repo: ENV['CI_REPOSITORY_URL'], + # We don't use CI_REPOSITORY_URL since it includes `gitlab-ci-token:xxxxxxxxxxxxxxxxxxxx@` + # which is confusing in the steps suggested in the job's output. + ce_repo: "#{ENV['CI_PROJECT_URL']}.git", branch: ENV['CI_COMMIT_REF_NAME'] } else diff --git a/locale/bg/gitlab.po b/locale/bg/gitlab.po index 38d63315fdc..77b843f84ae 100644 --- a/locale/bg/gitlab.po +++ b/locale/bg/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:45-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:34-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: Bulgarian\n" "Language: bg_BG\n" @@ -21,6 +21,11 @@ msgid_plural "%d commits" msgstr[0] "%d подаване" msgstr[1] "%d подавания" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" +msgstr[1] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "%s подаване беше пропуснато, за да не се натоварва системата." @@ -57,6 +62,9 @@ msgstr[1] "%d схеми" msgid "1st contribution!" msgstr "" +msgid "2FA enabled" +msgstr "" + msgid "A collection of graphs regarding Continuous Integration" msgstr "Набор от графики относно непрекъснатата интеграция" @@ -81,12 +89,18 @@ msgstr "Активно" msgid "Activity" msgstr "Дейност" +msgid "Add" +msgstr "" + msgid "Add Changelog" msgstr "Добавяне на списък с промени" msgid "Add Contribution guide" msgstr "Добавяне на ръководство за сътрудничество" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "" + msgid "Add License" msgstr "Добавяне на лиценз" @@ -132,25 +146,31 @@ msgstr "Прикачете файл чрез влачене и пускане и msgid "Authentication Log" msgstr "" -msgid "Auto DevOps (Beta)" +msgid "Author" +msgstr "" + +msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." msgstr "" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." msgstr "" -msgid "Auto DevOps documentation" +msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps (Beta)" msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." msgstr "" -msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps documentation" msgstr "" -msgid "AutoDevOps|Learn more in the" +msgid "AutoDevOps|Enable in settings" +msgstr "" + +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgstr "" msgid "Billing" @@ -168,6 +188,9 @@ msgstr "" msgid "BillingPlans|Customer Support" msgstr "" +msgid "BillingPlans|Downgrade" +msgstr "" + msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." msgstr "" @@ -204,12 +227,6 @@ msgstr "" msgid "BillingPlans|per user" msgstr "" -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" - msgid "Branch" msgid_plural "Branches" msgstr[0] "Клон" @@ -332,12 +349,18 @@ msgstr "" msgid "CI configuration" msgstr "Конфигурация на непрекъсната интеграция" +msgid "CICD|Jobs" +msgstr "" + msgid "Cancel" msgstr "Отказ" msgid "Cancel edit" msgstr "" +msgid "Change Weight" +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "Избиране в клона" @@ -365,6 +388,9 @@ msgstr "Подбиране на това подаване" msgid "Cherry-pick this merge request" msgstr "Подбиране на тази заявка за сливане" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "отказано" @@ -419,6 +445,135 @@ msgstr "пропуснато" msgid "CiStatus|running" msgstr "протича в момента" +msgid "Clone repository" +msgstr "" + +msgid "Close" +msgstr "" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "" @@ -427,6 +582,9 @@ msgid_plural "Commits" msgstr[0] "Подаване" msgstr[1] "Подавания" +msgid "Commit Message" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" msgstr "Времетраене на подаванията в минути за последните 30 подавания" @@ -454,6 +612,51 @@ msgstr "Подадено от" msgid "Compare" msgstr "Сравнение" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "Ръководство за сътрудничество" @@ -472,9 +675,6 @@ msgstr "Копиране на идентификатора на подаване msgid "Create New Directory" msgstr "Създаване на нова папка" -msgid "Create a new branch" -msgstr "" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "Създайте си личен жетон за достъп в профила си, за да можете да изтегляте и изпращате промени чрез %{protocol}." @@ -538,6 +738,12 @@ msgstr "Подготовка за издаване" msgid "CycleAnalyticsStage|Test" msgstr "Тестване" +msgid "DashboardProjects|All" +msgstr "" + +msgid "DashboardProjects|Personal" +msgstr "" + msgid "Define a custom pattern with cron syntax" msgstr "Задайте потребителски шаблон, използвайки синтаксиса на „Cron“" @@ -555,6 +761,9 @@ msgstr "" msgid "Description" msgstr "Описание" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "" + msgid "Details" msgstr "" @@ -564,6 +773,9 @@ msgstr "Име на папката" msgid "Discard changes" msgstr "" +msgid "Dismiss Merge Request promotion" +msgstr "" + msgid "Don't show again" msgstr "Да не се показва повече" @@ -603,9 +815,6 @@ msgstr "Редактиране на плана %{id} за схема" msgid "Emails" msgstr "" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "" @@ -668,6 +877,12 @@ msgstr[1] "Разклонения" msgid "ForkedFromProjectPath|Forked from" msgstr "Разклонение на" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "" + +msgid "Format" +msgstr "" + msgid "From issue creation until deploy to production" msgstr "От създаването на проблема до внедряването в крайната версия" @@ -680,6 +895,12 @@ msgstr "" msgid "Geo Nodes" msgstr "" +msgid "Geo|Groups to replicate" +msgstr "" + +msgid "Geo|Select groups to replicate." +msgstr "" + msgid "Git storage health information has been reset" msgstr "" @@ -692,6 +913,9 @@ msgstr "Към Вашето разклонение" msgid "GoToYourFork|Fork" msgstr "Разклонение" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." +msgstr "" + msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgstr "" @@ -734,28 +958,54 @@ msgstr "" msgid "HealthCheck|Unhealthy" msgstr "" +msgid "History" +msgstr "" + msgid "Housekeeping successfully started" msgstr "Освежаването започна успешно" msgid "Import repository" msgstr "Внасяне на хранилище" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "" + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "" + msgid "Install a Runner compatible with GitLab CI" msgstr "" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "" +msgstr[1] "" + msgid "Interval Pattern" msgstr "Шаблон за интервала" msgid "Introducing Cycle Analytics" msgstr "Представяме Ви анализа на циклите" +msgid "Issue board focus mode" +msgstr "" + +msgid "Issue boards with milestones" +msgstr "" + msgid "Issue events" msgstr "" -msgid "Issues" +msgid "IssueBoards|Board" msgstr "" -msgid "Jobs" +msgid "IssueBoards|Boards" +msgstr "" + +msgid "Issues" msgstr "" msgid "LFSStatus|Disabled" @@ -775,12 +1025,21 @@ msgstr[1] "Последните %d дни" msgid "Last Pipeline" msgstr "Последна схема" -msgid "Last Update" -msgstr "Последна промяна" - msgid "Last commit" msgstr "Последно подаване" +msgid "Last edited %{date}" +msgstr "" + +msgid "Last edited by %{name}" +msgstr "" + +msgid "Last update" +msgstr "" + +msgid "Last updated" +msgstr "" + msgid "LastPushEvent|You pushed to" msgstr "" @@ -807,6 +1066,12 @@ msgid_plural "Limited to showing %d events at most" msgstr[0] "Ограничено до показване на най-много %d събитие" msgstr[1] "Ограничено до показване на най-много %d събития" +msgid "Lock" +msgstr "" + +msgid "Locked" +msgstr "" + msgid "Locked Files" msgstr "" @@ -837,6 +1102,9 @@ msgstr "" msgid "More information is available|here" msgstr "" +msgid "Multiple issue boards" +msgstr "" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "Нов проблем" @@ -869,12 +1137,18 @@ msgstr "Нов отрязък" msgid "New tag" msgstr "Нов етикет" +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "Няма хранилище" msgid "No schedules" msgstr "Няма планове" +msgid "None" +msgstr "" + msgid "Not available" msgstr "Не е налично" @@ -941,9 +1215,15 @@ msgstr "" msgid "OfSearchInADropdown|Filter" msgstr "Филтър" +msgid "Only project members can comment." +msgstr "" + msgid "OpenedNDaysAgo|Opened" msgstr "Отворен" +msgid "Opens in a new window" +msgstr "" + msgid "Options" msgstr "Опции" @@ -968,6 +1248,9 @@ msgstr "" msgid "Password" msgstr "" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "" + msgid "Pipeline" msgstr "Схема" @@ -1127,6 +1410,21 @@ msgstr "Етап" msgid "ProjectNetworkGraph|Graph" msgstr "Графика" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "" @@ -1217,6 +1515,9 @@ msgstr "Отмяна на тази заявка за сливане" msgid "SSH Keys" msgstr "" +msgid "Save changes" +msgstr "" + msgid "Save pipeline schedule" msgstr "Запазване на плана за схема" @@ -1238,9 +1539,6 @@ msgstr "Изберете формата на архива" msgid "Select a timezone" msgstr "Изберете часова зона" -msgid "Select existing branch" -msgstr "" - msgid "Select target branch" msgstr "Изберете целеви клон" @@ -1279,6 +1577,18 @@ msgstr[1] "Показване на %d събития" msgid "Snippets" msgstr "" +msgid "Something went wrong on our end." +msgstr "" + +msgid "Something went wrong while fetching the projects." +msgstr "" + +msgid "Something went wrong while fetching the registry list." +msgstr "" + +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" +msgstr "" + msgid "SortOptions|Access level, ascending" msgstr "" @@ -1416,6 +1726,12 @@ msgstr "Целеви клон" msgid "Team" msgstr "" +msgid "Thanks! Don't show me this again" +msgstr "" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "Етапът на програмиране показва времето от първото подаване до създаването на заявката за сливане. Данните ще бъдат добавени тук автоматично след като бъде създадена първата заявка за сливане." @@ -1467,12 +1783,24 @@ msgstr "Стойността, която се намира в средата н msgid "There are problems accessing Git storage: " msgstr "" -msgid "This is the author's first Merge Request to this project. Handle with care." +msgid "This is a confidential issue." +msgstr "" + +msgid "This is the author's first Merge Request to this project." +msgstr "" + +msgid "This issue is confidential and locked." +msgstr "" + +msgid "This issue is locked." msgstr "" msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "Това означава, че няма да можете да изпращате код, докато не създадете празно хранилище или не внесете съществуващо такова." +msgid "This merge request is locked." +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "Време преди един проблем да бъде планиран за работа" @@ -1551,9 +1879,6 @@ msgstr "преди един месец" msgid "Timeago|a week ago" msgstr "преди една седмица" -msgid "Timeago|a while" -msgstr "преди известно време" - msgid "Timeago|a year ago" msgstr "преди една година" @@ -1605,6 +1930,9 @@ msgstr "след 1 седмица" msgid "Timeago|in 1 year" msgstr "след 1 година" +msgid "Timeago|in a while" +msgstr "" + msgid "Timeago|less than a minute ago" msgstr "преди по-малко от минута" @@ -1627,9 +1955,33 @@ msgstr "Общо време" msgid "Total test time for all commits/merges" msgstr "Общо време за тестване на всички подавания/сливания" +msgid "Track activity with Contribution Analytics." +msgstr "" + +msgid "Unlock" +msgstr "" + +msgid "Unlocked" +msgstr "" + msgid "Unstar" msgstr "Без звезда" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "" + msgid "Upload New File" msgstr "Качване на нов файл" @@ -1672,9 +2024,117 @@ msgstr "Искате ли да видите данните? Помолете а msgid "We don't have enough data to show this stage." msgstr "Няма достатъчно данни за този етап." +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "" + +msgid "Weight" +msgstr "" + msgid "Wiki" msgstr "" +msgid "WikiClone|Clone your wiki" +msgstr "" + +msgid "WikiClone|Git Access" +msgstr "" + +msgid "WikiClone|Install Gollum" +msgstr "" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "" + +msgid "WikiHistoricalPage|history" +msgstr "" + +msgid "WikiHistoricalPage|most recent version" +msgstr "" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "" + +msgid "WikiMarkdownDocs|documentation" +msgstr "" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "" + +msgid "WikiPageConflictMessage|the page" +msgstr "" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "" + +msgid "WikiPage|Page slug" +msgstr "" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "" + +msgid "Wiki|Create Page" +msgstr "" + +msgid "Wiki|Create page" +msgstr "" + +msgid "Wiki|Edit Page" +msgstr "" + +msgid "Wiki|Empty page" +msgstr "" + +msgid "Wiki|More Pages" +msgstr "" + +msgid "Wiki|New page" +msgstr "" + +msgid "Wiki|Page history" +msgstr "" + +msgid "Wiki|Page version" +msgstr "" + +msgid "Wiki|Pages" +msgstr "" + +msgid "Wiki|Wiki Pages" +msgstr "" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "" + msgid "Withdraw Access Request" msgstr "Оттегляне на заявката за достъп" @@ -1723,6 +2183,9 @@ msgstr "Няма да можете да изтегляте или изпраща msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "Няма да можете да изтегляте или изпращате код в проекта чрез SSH, докато не %{add_ssh_key_link} в профила си" +msgid "Your comment will not be visible to the public." +msgstr "" + msgid "Your name" msgstr "Вашето име" @@ -1748,3 +2211,9 @@ msgid_plural "parents" msgstr[0] "родител" msgstr[1] "родители" +msgid "to help your contributors communicate effectively!" +msgstr "" + +msgid "personal access token" +msgstr "" + diff --git a/locale/de/gitlab.po b/locale/de/gitlab.po index fc3c60166b7..f65012d1e1f 100644 --- a/locale/de/gitlab.po +++ b/locale/de/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:45-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:36-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: German\n" "Language: de_DE\n" @@ -21,6 +21,11 @@ msgid_plural "%d commits" msgstr[0] "%d Commit" msgstr[1] "%d Commits" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" +msgstr[1] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "%s zusätzlicher Commit wurde ausgelassen um Leistungsprobleme zu verhindern." @@ -57,6 +62,9 @@ msgstr[1] "" msgid "1st contribution!" msgstr "" +msgid "2FA enabled" +msgstr "" + msgid "A collection of graphs regarding Continuous Integration" msgstr "Eine Sammlung von Graphen bezüglich kontinuierlicher Integration" @@ -81,12 +89,18 @@ msgstr "Aktiv" msgid "Activity" msgstr "Aktivität" +msgid "Add" +msgstr "" + msgid "Add Changelog" msgstr "Änderungsliste hinzufügen " msgid "Add Contribution guide" msgstr "Mitarbeitsanleitung hinzufügen" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "" + msgid "Add License" msgstr "Lizenz hinzufügen" @@ -132,30 +146,36 @@ msgstr "Datei mittels Drag & Drop oder %{upload_link} hinzufügen" msgid "Authentication Log" msgstr "" -msgid "Auto DevOps (Beta)" +msgid "Author" +msgstr "" + +msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." msgstr "" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." msgstr "" -msgid "Auto DevOps documentation" +msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps (Beta)" msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." msgstr "" -msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps documentation" msgstr "" -msgid "AutoDevOps|Learn more in the" +msgid "AutoDevOps|Enable in settings" msgstr "" -msgid "Billing" +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgstr "" +msgid "Billing" +msgstr "Abrechnung" + msgid "BillingPlans|%{group_name} is currently on the %{plan_link} plan." msgstr "" @@ -168,6 +188,9 @@ msgstr "" msgid "BillingPlans|Customer Support" msgstr "" +msgid "BillingPlans|Downgrade" +msgstr "" + msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." msgstr "" @@ -204,12 +227,6 @@ msgstr "" msgid "BillingPlans|per user" msgstr "" -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" - msgid "Branch" msgid_plural "Branches" msgstr[0] "Zweig" @@ -332,12 +349,18 @@ msgstr "CI / CD" msgid "CI configuration" msgstr "CI-Konfiguration" +msgid "CICD|Jobs" +msgstr "" + msgid "Cancel" msgstr "Abbrechen" msgid "Cancel edit" msgstr "Bearbeitung abbrechen" +msgid "Change Weight" +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "In dem Branch wählen" @@ -365,6 +388,9 @@ msgstr "Diesen Commit herauspicken " msgid "Cherry-pick this merge request" msgstr "Diesen Merge Request herauspicken" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "abgebrochen" @@ -419,6 +445,135 @@ msgstr "übersprungen" msgid "CiStatus|running" msgstr "laufend" +msgid "Clone repository" +msgstr "" + +msgid "Close" +msgstr "Schließen" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "Kommentare" @@ -427,6 +582,9 @@ msgid_plural "Commits" msgstr[0] "Commit" msgstr[1] "Commits" +msgid "Commit Message" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" msgstr "Dauer der Commits in Minuten für die letzten 30 Commits" @@ -454,6 +612,51 @@ msgstr "Committed von" msgid "Compare" msgstr "Vergleichen" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "Mitarbeitsanleitung" @@ -461,7 +664,7 @@ msgid "Contributors" msgstr "Mitarbeiter" msgid "Copy SSH public key to clipboard" -msgstr "" +msgstr "Öffentlichen SSH-Schlüssel in die Zwischenablage kopieren" msgid "Copy URL to clipboard" msgstr "Kopiere URL in die Zwischenablage" @@ -472,9 +675,6 @@ msgstr "Kopiere Commit SHA in die Zwischenablage" msgid "Create New Directory" msgstr "Erstelle neues Verzeichnis" -msgid "Create a new branch" -msgstr "Erstelle einen neuen Branch" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "Erstelle einen persönlichen Zugriffstoken in Deinem Konto um mittels %{protocol} zu übertragen (push) oder abzurufen (pull)." @@ -538,6 +738,12 @@ msgstr "Staging" msgid "CycleAnalyticsStage|Test" msgstr "Test" +msgid "DashboardProjects|All" +msgstr "" + +msgid "DashboardProjects|Personal" +msgstr "" + msgid "Define a custom pattern with cron syntax" msgstr "Erstelle ein individuelles Muster mittels Cron Syntax" @@ -555,6 +761,9 @@ msgstr "" msgid "Description" msgstr "Beschreibung" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "" + msgid "Details" msgstr "Details" @@ -564,6 +773,9 @@ msgstr "Verzeichnisname" msgid "Discard changes" msgstr "Änderungen verwerfen" +msgid "Dismiss Merge Request promotion" +msgstr "" + msgid "Don't show again" msgstr "Nicht erneut anzeigen" @@ -603,9 +815,6 @@ msgstr "Pipeline Zeitplan bearbeiten %{id}" msgid "Emails" msgstr "E-Mails" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "Filtere alle" @@ -668,6 +877,12 @@ msgstr[1] "Ableger" msgid "ForkedFromProjectPath|Forked from" msgstr "Ableger von" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "" + +msgid "Format" +msgstr "" + msgid "From issue creation until deploy to production" msgstr "Von der Ticketbeschreibung bis zur Bereitstellung" @@ -680,6 +895,12 @@ msgstr "" msgid "Geo Nodes" msgstr "" +msgid "Geo|Groups to replicate" +msgstr "" + +msgid "Geo|Select groups to replicate." +msgstr "" + msgid "Git storage health information has been reset" msgstr "Informationen über den Speicherzustand von Gitlab wurden zurückgesetzt." @@ -692,6 +913,9 @@ msgstr "Gehe zu Deinem Ableger" msgid "GoToYourFork|Fork" msgstr "Ableger" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." +msgstr "" + msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgstr "" @@ -734,28 +958,54 @@ msgstr "Keine Probleme erkannt" msgid "HealthCheck|Unhealthy" msgstr "Problematisch" +msgid "History" +msgstr "" + msgid "Housekeeping successfully started" msgstr "Aufräumen erfolgreich gestartet" msgid "Import repository" msgstr "Repository importieren" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "" + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "" + msgid "Install a Runner compatible with GitLab CI" msgstr "Installiere einen Runner der mit GitLab CI kompatibel ist" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "" +msgstr[1] "" + msgid "Interval Pattern" msgstr "Intervallmuster" msgid "Introducing Cycle Analytics" msgstr "Arbeitsablaufsanalysen vorgestellt" +msgid "Issue board focus mode" +msgstr "" + +msgid "Issue boards with milestones" +msgstr "" + msgid "Issue events" msgstr "Ticketereignisse" -msgid "Issues" +msgid "IssueBoards|Board" +msgstr "" + +msgid "IssueBoards|Boards" msgstr "" -msgid "Jobs" +msgid "Issues" msgstr "" msgid "LFSStatus|Disabled" @@ -775,12 +1025,21 @@ msgstr[1] "Letzten %d Tage" msgid "Last Pipeline" msgstr "Letzte Pipeline" -msgid "Last Update" -msgstr "Letzte Aktualisierung" - msgid "Last commit" msgstr "Letzter Commit" +msgid "Last edited %{date}" +msgstr "" + +msgid "Last edited by %{name}" +msgstr "" + +msgid "Last update" +msgstr "" + +msgid "Last updated" +msgstr "" + msgid "LastPushEvent|You pushed to" msgstr "Du übertrugst an" @@ -800,16 +1059,22 @@ msgid "Leave project" msgstr "Verlasse das Projekt" msgid "License" -msgstr "" +msgstr "Lizenz" msgid "Limited to showing %d event at most" msgid_plural "Limited to showing %d events at most" msgstr[0] "Limitiere die Anzeige auf höchstens %d Ereignis" msgstr[1] "Limitiere die Anzeige auf höchstens %d Ereignisse" -msgid "Locked Files" +msgid "Lock" +msgstr "" + +msgid "Locked" msgstr "" +msgid "Locked Files" +msgstr "Gesperrte Dateien" + msgid "Median" msgstr "Median" @@ -837,6 +1102,9 @@ msgstr "Überwachung" msgid "More information is available|here" msgstr "hier" +msgid "Multiple issue boards" +msgstr "" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "Neues Ticket" @@ -869,12 +1137,18 @@ msgstr "Neuer Schnipsel" msgid "New tag" msgstr "Neuer Tag" +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "Kein Repository" msgid "No schedules" msgstr "Keine Zeitpläne" +msgid "None" +msgstr "" + msgid "Not available" msgstr "Nicht verfügbar" @@ -941,9 +1215,15 @@ msgstr "Benachrichtigungen" msgid "OfSearchInADropdown|Filter" msgstr "Filter" +msgid "Only project members can comment." +msgstr "" + msgid "OpenedNDaysAgo|Opened" msgstr "Ungelöst" +msgid "Opens in a new window" +msgstr "" + msgid "Options" msgstr "Optionen" @@ -968,6 +1248,9 @@ msgstr "" msgid "Password" msgstr "Passwort" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "" + msgid "Pipeline" msgstr "" @@ -1071,7 +1354,7 @@ msgid "Preferences" msgstr "" msgid "Profile" -msgstr "" +msgstr "Profil" msgid "Project '%{project_name}' queued for deletion." msgstr "Das Projekt '%{project_name}' wurde zur Löschung eingeplant." @@ -1127,6 +1410,21 @@ msgstr "Stage" msgid "ProjectNetworkGraph|Graph" msgstr "Diagramm" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "" @@ -1217,6 +1515,9 @@ msgstr "Merge Request zurücksetzen" msgid "SSH Keys" msgstr "SSH-Schlüssel" +msgid "Save changes" +msgstr "" + msgid "Save pipeline schedule" msgstr "Zeitplan der Pipeline speichern" @@ -1238,9 +1539,6 @@ msgstr "Archivierungsformat auswählen" msgid "Select a timezone" msgstr "Zeitzone auswählen" -msgid "Select existing branch" -msgstr "Existierenden Branch auswählen" - msgid "Select target branch" msgstr "Zielbranch auswählen" @@ -1279,6 +1577,18 @@ msgstr[1] "Zeige %d Ereignisse" msgid "Snippets" msgstr "" +msgid "Something went wrong on our end." +msgstr "" + +msgid "Something went wrong while fetching the projects." +msgstr "" + +msgid "Something went wrong while fetching the registry list." +msgstr "" + +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" +msgstr "" + msgid "SortOptions|Access level, ascending" msgstr "" @@ -1416,6 +1726,12 @@ msgstr "Zielbranch" msgid "Team" msgstr "" +msgid "Thanks! Don't show me this again" +msgstr "" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "Die Entwicklungsphase stellt die Zeit vom ersten Commit bis zum Erstellen eines Merge Requests dar. Sobald Du Deinen ersten Merge Request anlegst, werden dessen Daten automatisch ergänzt." @@ -1467,12 +1783,24 @@ msgstr "Der mittlere aller erfassten Werte. Zum Beispiel ist für 3, 5, 9 der Me msgid "There are problems accessing Git storage: " msgstr "Es gibt ein Problem beim Zugriff auf den Gitspeicher:" -msgid "This is the author's first Merge Request to this project. Handle with care." +msgid "This is a confidential issue." +msgstr "" + +msgid "This is the author's first Merge Request to this project." +msgstr "" + +msgid "This issue is confidential and locked." +msgstr "" + +msgid "This issue is locked." msgstr "" msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "Dies bedeutet, dass Du keinen Code übertragen kannst, bevor Du kein leeres Repositorium erstellt oder ein Existierendes importiert hast." +msgid "This merge request is locked." +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "Zeit bis ein Ticket geplant wird" @@ -1551,9 +1879,6 @@ msgstr "vor einem Monat" msgid "Timeago|a week ago" msgstr "vor einer Woche" -msgid "Timeago|a while" -msgstr "eine Weile" - msgid "Timeago|a year ago" msgstr "vor einem Jahr" @@ -1605,6 +1930,9 @@ msgstr "in 1 Woche" msgid "Timeago|in 1 year" msgstr "in 1 Jahr" +msgid "Timeago|in a while" +msgstr "" + msgid "Timeago|less than a minute ago" msgstr "vor weniger als einer Minute" @@ -1627,9 +1955,33 @@ msgstr "Gesamtzeit" msgid "Total test time for all commits/merges" msgstr "Gesamte Testzeit für alle Commits/Merges" +msgid "Track activity with Contribution Analytics." +msgstr "" + +msgid "Unlock" +msgstr "" + +msgid "Unlocked" +msgstr "" + msgid "Unstar" msgstr "Entfavorisieren" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "" + msgid "Upload New File" msgstr "Eine Neue Datei hochladen" @@ -1672,7 +2024,115 @@ msgstr "Du möchtest diese Daten sehen? Bitte frage einen Administrator nach dem msgid "We don't have enough data to show this stage." msgstr "Es liegen nicht genügend Daten vor, um diese Phase anzuzeigen." +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "" + +msgid "Weight" +msgstr "" + msgid "Wiki" +msgstr "Wiki" + +msgid "WikiClone|Clone your wiki" +msgstr "" + +msgid "WikiClone|Git Access" +msgstr "" + +msgid "WikiClone|Install Gollum" +msgstr "" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "" + +msgid "WikiHistoricalPage|history" +msgstr "" + +msgid "WikiHistoricalPage|most recent version" +msgstr "" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "" + +msgid "WikiMarkdownDocs|documentation" +msgstr "" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "" + +msgid "WikiPageConflictMessage|the page" +msgstr "" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "" + +msgid "WikiPage|Page slug" +msgstr "" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "" + +msgid "Wiki|Create Page" +msgstr "" + +msgid "Wiki|Create page" +msgstr "" + +msgid "Wiki|Edit Page" +msgstr "" + +msgid "Wiki|Empty page" +msgstr "" + +msgid "Wiki|More Pages" +msgstr "" + +msgid "Wiki|New page" +msgstr "" + +msgid "Wiki|Page history" +msgstr "" + +msgid "Wiki|Page version" +msgstr "" + +msgid "Wiki|Pages" +msgstr "" + +msgid "Wiki|Wiki Pages" +msgstr "" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." msgstr "" msgid "Withdraw Access Request" @@ -1723,14 +2183,17 @@ msgstr "Du kannst erst mittels '%{protocol}' übertragen (push) oder abrufen (pu msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "Du kannst erst mittels SSH übertragen (push) oder abrufen (pull), nachdem Du Deinem Konto '%{add_ssh_key_link}'." +msgid "Your comment will not be visible to the public." +msgstr "" + msgid "Your name" msgstr "Dein Name" msgid "Your projects" -msgstr "" +msgstr "Deine Projekte" msgid "commit" -msgstr "" +msgstr "Commit" msgid "day" msgid_plural "days" @@ -1748,3 +2211,9 @@ msgid_plural "parents" msgstr[0] "Vorgänger" msgstr[1] "Vorgänger" +msgid "to help your contributors communicate effectively!" +msgstr "" + +msgid "personal access token" +msgstr "" + diff --git a/locale/eo/gitlab.po b/locale/eo/gitlab.po index e8c2195e4e3..838c7b62810 100644 --- a/locale/eo/gitlab.po +++ b/locale/eo/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:45-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:36-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: Esperanto\n" "Language: eo_UY\n" @@ -21,6 +21,11 @@ msgid_plural "%d commits" msgstr[0] "%d enmetado" msgstr[1] "%d enmetadoj" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" +msgstr[1] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "%s enmetado estis transsaltita, por ne troŝarĝi la sistemon." @@ -57,6 +62,9 @@ msgstr[1] "%d ĉenstabloj" msgid "1st contribution!" msgstr "" +msgid "2FA enabled" +msgstr "" + msgid "A collection of graphs regarding Continuous Integration" msgstr "Aro da diagramoj pri la seninterrompa integrado" @@ -81,12 +89,18 @@ msgstr "Aktiva" msgid "Activity" msgstr "Aktiveco" +msgid "Add" +msgstr "" + msgid "Add Changelog" msgstr "Aldoni liston de ŝanĝoj" msgid "Add Contribution guide" msgstr "Aldoni gvidliniojn por kontribuado" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "" + msgid "Add License" msgstr "Aldoni rajtigilon" @@ -132,25 +146,31 @@ msgstr "Alkroĉu dosieron per ŝovmetado aŭ %{upload_link}" msgid "Authentication Log" msgstr "" -msgid "Auto DevOps (Beta)" +msgid "Author" +msgstr "" + +msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." msgstr "" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." msgstr "" -msgid "Auto DevOps documentation" +msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps (Beta)" msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." msgstr "" -msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps documentation" msgstr "" -msgid "AutoDevOps|Learn more in the" +msgid "AutoDevOps|Enable in settings" +msgstr "" + +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgstr "" msgid "Billing" @@ -168,6 +188,9 @@ msgstr "" msgid "BillingPlans|Customer Support" msgstr "" +msgid "BillingPlans|Downgrade" +msgstr "" + msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." msgstr "" @@ -204,12 +227,6 @@ msgstr "" msgid "BillingPlans|per user" msgstr "" -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" - msgid "Branch" msgid_plural "Branches" msgstr[0] "Branĉo" @@ -332,12 +349,18 @@ msgstr "" msgid "CI configuration" msgstr "Agordoj de seninterrompa integrado" +msgid "CICD|Jobs" +msgstr "" + msgid "Cancel" msgstr "Nuligi" msgid "Cancel edit" msgstr "" +msgid "Change Weight" +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "Elekti en branĉon" @@ -365,6 +388,9 @@ msgstr "Precize elekti ĉi tiun kunmetadon" msgid "Cherry-pick this merge request" msgstr "Precize elekti ĉi tiun peton pri kunfando" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "nuligita" @@ -419,6 +445,135 @@ msgstr "transsaltita" msgid "CiStatus|running" msgstr "plenumiĝanta" +msgid "Clone repository" +msgstr "" + +msgid "Close" +msgstr "" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "" @@ -427,6 +582,9 @@ msgid_plural "Commits" msgstr[0] "Enmetado" msgstr[1] "Enmetadoj" +msgid "Commit Message" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" msgstr "Daŭro de la enmetadoj por la lastaj 30 enmetadoj" @@ -454,6 +612,51 @@ msgstr "Enmetita de" msgid "Compare" msgstr "Kompari" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "Gvidlinioj por kontribuado" @@ -472,9 +675,6 @@ msgstr "Kopii la identigilon de la enmetado" msgid "Create New Directory" msgstr "Krei novan dosierujon" -msgid "Create a new branch" -msgstr "" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "Kreu propran atingoĵetonon en via konto por ebligi al vi eltiri kaj alpuŝi per %{protocol}." @@ -538,6 +738,12 @@ msgstr "Preparo por eldono" msgid "CycleAnalyticsStage|Test" msgstr "Testado" +msgid "DashboardProjects|All" +msgstr "" + +msgid "DashboardProjects|Personal" +msgstr "" + msgid "Define a custom pattern with cron syntax" msgstr "Difini propran ŝablonon, uzante la sintakson de Cron" @@ -555,6 +761,9 @@ msgstr "" msgid "Description" msgstr "Priskribo" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "" + msgid "Details" msgstr "" @@ -564,6 +773,9 @@ msgstr "Nomo de dosierujo" msgid "Discard changes" msgstr "" +msgid "Dismiss Merge Request promotion" +msgstr "" + msgid "Don't show again" msgstr "Ne montru denove" @@ -603,9 +815,6 @@ msgstr "Redakti ĉenstablan planon %{id}" msgid "Emails" msgstr "" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "" @@ -668,6 +877,12 @@ msgstr[1] "Disbranĉigoj" msgid "ForkedFromProjectPath|Forked from" msgstr "Disbranĉigita el" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "" + +msgid "Format" +msgstr "" + msgid "From issue creation until deploy to production" msgstr "De la kreado de la problemo ĝis la disponigado en la publika versio" @@ -680,6 +895,12 @@ msgstr "" msgid "Geo Nodes" msgstr "" +msgid "Geo|Groups to replicate" +msgstr "" + +msgid "Geo|Select groups to replicate." +msgstr "" + msgid "Git storage health information has been reset" msgstr "" @@ -692,6 +913,9 @@ msgstr "Al via disbranĉigo" msgid "GoToYourFork|Fork" msgstr "Disbranĉigo" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." +msgstr "" + msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgstr "" @@ -734,28 +958,54 @@ msgstr "" msgid "HealthCheck|Unhealthy" msgstr "" +msgid "History" +msgstr "" + msgid "Housekeeping successfully started" msgstr "La refreŝigo komenciĝis sukcese" msgid "Import repository" msgstr "Enporti deponejon" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "" + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "" + msgid "Install a Runner compatible with GitLab CI" msgstr "" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "" +msgstr[1] "" + msgid "Interval Pattern" msgstr "Intervala ŝablono" msgid "Introducing Cycle Analytics" msgstr "Ni prezentas al vi la ciklan analizon" +msgid "Issue board focus mode" +msgstr "" + +msgid "Issue boards with milestones" +msgstr "" + msgid "Issue events" msgstr "" -msgid "Issues" +msgid "IssueBoards|Board" msgstr "" -msgid "Jobs" +msgid "IssueBoards|Boards" +msgstr "" + +msgid "Issues" msgstr "" msgid "LFSStatus|Disabled" @@ -775,12 +1025,21 @@ msgstr[1] "La lastaj %d tagoj" msgid "Last Pipeline" msgstr "Lasta ĉenstablo" -msgid "Last Update" -msgstr "Lasta ĝisdatigo" - msgid "Last commit" msgstr "Lasta enmetado" +msgid "Last edited %{date}" +msgstr "" + +msgid "Last edited by %{name}" +msgstr "" + +msgid "Last update" +msgstr "" + +msgid "Last updated" +msgstr "" + msgid "LastPushEvent|You pushed to" msgstr "" @@ -807,6 +1066,12 @@ msgid_plural "Limited to showing %d events at most" msgstr[0] "Limigita al montrado de ne pli ol %d evento" msgstr[1] "Limigita al montrado de ne pli ol %d eventoj" +msgid "Lock" +msgstr "" + +msgid "Locked" +msgstr "" + msgid "Locked Files" msgstr "" @@ -837,6 +1102,9 @@ msgstr "" msgid "More information is available|here" msgstr "" +msgid "Multiple issue boards" +msgstr "" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "Nova problemo" @@ -869,12 +1137,18 @@ msgstr "Nova kodaĵo" msgid "New tag" msgstr "Nova etikedo" +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "Ne estas deponejo" msgid "No schedules" msgstr "Ne estas planoj" +msgid "None" +msgstr "" + msgid "Not available" msgstr "Ne disponebla" @@ -941,9 +1215,15 @@ msgstr "" msgid "OfSearchInADropdown|Filter" msgstr "Filtrilo" +msgid "Only project members can comment." +msgstr "" + msgid "OpenedNDaysAgo|Opened" msgstr "Malfermita" +msgid "Opens in a new window" +msgstr "" + msgid "Options" msgstr "Opcioj" @@ -968,6 +1248,9 @@ msgstr "" msgid "Password" msgstr "" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "" + msgid "Pipeline" msgstr "Ĉenstablo" @@ -1127,6 +1410,21 @@ msgstr "Etapo" msgid "ProjectNetworkGraph|Graph" msgstr "Grafeo" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "" @@ -1217,6 +1515,9 @@ msgstr "Malfari ĉi tiun peton pri kunfando" msgid "SSH Keys" msgstr "" +msgid "Save changes" +msgstr "" + msgid "Save pipeline schedule" msgstr "Konservi ĉenstablan planon" @@ -1238,9 +1539,6 @@ msgstr "Elektu formaton de arkivo" msgid "Select a timezone" msgstr "Elektu horzonon" -msgid "Select existing branch" -msgstr "" - msgid "Select target branch" msgstr "Elektu celan branĉon" @@ -1279,6 +1577,18 @@ msgstr[1] "Estas montrataj %d eventoj" msgid "Snippets" msgstr "" +msgid "Something went wrong on our end." +msgstr "" + +msgid "Something went wrong while fetching the projects." +msgstr "" + +msgid "Something went wrong while fetching the registry list." +msgstr "" + +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" +msgstr "" + msgid "SortOptions|Access level, ascending" msgstr "" @@ -1416,6 +1726,12 @@ msgstr "Cela branĉo" msgid "Team" msgstr "" +msgid "Thanks! Don't show me this again" +msgstr "" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "La etapo de programado montras la tempon de la unua enmetado ĝis la kreado de la peto pri kunfando. La datenoj aldoniĝos aŭtomate ĉi tie post kiam vi kreas la unuan peton pri kunfando." @@ -1467,12 +1783,24 @@ msgstr "La valoro, kiu troviĝas en la mezo de aro da rigardataj valoroj. Ekzemp msgid "There are problems accessing Git storage: " msgstr "" -msgid "This is the author's first Merge Request to this project. Handle with care." +msgid "This is a confidential issue." +msgstr "" + +msgid "This is the author's first Merge Request to this project." +msgstr "" + +msgid "This issue is confidential and locked." +msgstr "" + +msgid "This issue is locked." msgstr "" msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "Ĉi tiu signifas, ke vi ne povos alpuŝi kodon, antaŭ ol vi kreos malplenan deponejon aŭ enportos jam ekzistantan." +msgid "This merge request is locked." +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "Tempo antaŭ problemo estas planita por ellabori" @@ -1551,9 +1879,6 @@ msgstr "antaŭ unu monato" msgid "Timeago|a week ago" msgstr "antaŭ unu semajno" -msgid "Timeago|a while" -msgstr "antaŭ iom da tempo" - msgid "Timeago|a year ago" msgstr "antaŭ unu jaro" @@ -1605,6 +1930,9 @@ msgstr "post 1 semajno" msgid "Timeago|in 1 year" msgstr "post 1 jaro" +msgid "Timeago|in a while" +msgstr "" + msgid "Timeago|less than a minute ago" msgstr "antaŭ malpli ol minuto" @@ -1627,9 +1955,33 @@ msgstr "Totala tempo" msgid "Total test time for all commits/merges" msgstr "Totala tempo por la testado de ĉiuj enmetadoj/kunfandoj" +msgid "Track activity with Contribution Analytics." +msgstr "" + +msgid "Unlock" +msgstr "" + +msgid "Unlocked" +msgstr "" + msgid "Unstar" msgstr "Malsteligi" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "" + msgid "Upload New File" msgstr "Alŝuti novan dosieron" @@ -1672,9 +2024,117 @@ msgstr "Ĉu vi volas vidi la datenojn? Bonvolu peti atingeblon de administranto. msgid "We don't have enough data to show this stage." msgstr "Ne estas sufiĉe da datenoj por montri ĉi tiun etapon." +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "" + +msgid "Weight" +msgstr "" + msgid "Wiki" msgstr "" +msgid "WikiClone|Clone your wiki" +msgstr "" + +msgid "WikiClone|Git Access" +msgstr "" + +msgid "WikiClone|Install Gollum" +msgstr "" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "" + +msgid "WikiHistoricalPage|history" +msgstr "" + +msgid "WikiHistoricalPage|most recent version" +msgstr "" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "" + +msgid "WikiMarkdownDocs|documentation" +msgstr "" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "" + +msgid "WikiPageConflictMessage|the page" +msgstr "" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "" + +msgid "WikiPage|Page slug" +msgstr "" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "" + +msgid "Wiki|Create Page" +msgstr "" + +msgid "Wiki|Create page" +msgstr "" + +msgid "Wiki|Edit Page" +msgstr "" + +msgid "Wiki|Empty page" +msgstr "" + +msgid "Wiki|More Pages" +msgstr "" + +msgid "Wiki|New page" +msgstr "" + +msgid "Wiki|Page history" +msgstr "" + +msgid "Wiki|Page version" +msgstr "" + +msgid "Wiki|Pages" +msgstr "" + +msgid "Wiki|Wiki Pages" +msgstr "" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "" + msgid "Withdraw Access Request" msgstr "Nuligi la peton pri atingeblo" @@ -1723,6 +2183,9 @@ msgstr "Vi ne povos eltiri aŭ alpuŝi kodon per %{protocol} antaŭ ol vi %{set_ msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "Vi ne povos eltiri aŭ alpuŝi kodon per SSH antaŭ ol vi %{add_ssh_key_link} al via profilo" +msgid "Your comment will not be visible to the public." +msgstr "" + msgid "Your name" msgstr "Via nomo" @@ -1748,3 +2211,9 @@ msgid_plural "parents" msgstr[0] "patro" msgstr[1] "patroj" +msgid "to help your contributors communicate effectively!" +msgstr "" + +msgid "personal access token" +msgstr "" + diff --git a/locale/es/gitlab.po b/locale/es/gitlab.po index 29a010f9428..c930e22a083 100644 --- a/locale/es/gitlab.po +++ b/locale/es/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:43-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:37-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: Spanish\n" "Language: es_ES\n" @@ -21,6 +21,11 @@ msgid_plural "%d commits" msgstr[0] "%d cambio" msgstr[1] "%d cambios" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" +msgstr[1] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "%s cambio adicional ha sido omitido para evitar problemas de rendimiento." @@ -57,6 +62,9 @@ msgstr[1] "" msgid "1st contribution!" msgstr "" +msgid "2FA enabled" +msgstr "" + msgid "A collection of graphs regarding Continuous Integration" msgstr "Una colección de gráficos sobre Integración Continua" @@ -81,12 +89,18 @@ msgstr "Activo" msgid "Activity" msgstr "Actividad" +msgid "Add" +msgstr "" + msgid "Add Changelog" msgstr "Agregar Changelog" msgid "Add Contribution guide" msgstr "Agregar guía de contribución" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "" + msgid "Add License" msgstr "Agregar Licencia" @@ -132,25 +146,31 @@ msgstr "Adjunte un archivo arrastrando & soltando o %{upload_link}" msgid "Authentication Log" msgstr "" -msgid "Auto DevOps (Beta)" +msgid "Author" +msgstr "" + +msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." msgstr "" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." msgstr "" -msgid "Auto DevOps documentation" +msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps (Beta)" msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." msgstr "" -msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps documentation" msgstr "" -msgid "AutoDevOps|Learn more in the" +msgid "AutoDevOps|Enable in settings" +msgstr "" + +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgstr "" msgid "Billing" @@ -168,6 +188,9 @@ msgstr "" msgid "BillingPlans|Customer Support" msgstr "" +msgid "BillingPlans|Downgrade" +msgstr "" + msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." msgstr "" @@ -204,12 +227,6 @@ msgstr "" msgid "BillingPlans|per user" msgstr "" -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" - msgid "Branch" msgid_plural "Branches" msgstr[0] "Rama" @@ -332,12 +349,18 @@ msgstr "" msgid "CI configuration" msgstr "Configuración de CI" +msgid "CICD|Jobs" +msgstr "" + msgid "Cancel" msgstr "Cancelar" msgid "Cancel edit" msgstr "" +msgid "Change Weight" +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "Escoger en la rama" @@ -365,6 +388,9 @@ msgstr "Escoger este cambio" msgid "Cherry-pick this merge request" msgstr "Escoger esta solicitud de fusión" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "cancelado" @@ -419,6 +445,135 @@ msgstr "omitido" msgid "CiStatus|running" msgstr "en ejecución" +msgid "Clone repository" +msgstr "" + +msgid "Close" +msgstr "" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "" @@ -427,6 +582,9 @@ msgid_plural "Commits" msgstr[0] "Cambio" msgstr[1] "Cambios" +msgid "Commit Message" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" msgstr "Duración de los cambios en minutos para los últimos 30" @@ -454,6 +612,51 @@ msgstr "Enviado por" msgid "Compare" msgstr "Comparar" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "Guía de contribución" @@ -472,9 +675,6 @@ msgstr "Copiar SHA del cambio al portapapeles" msgid "Create New Directory" msgstr "Crear Nuevo Directorio" -msgid "Create a new branch" -msgstr "" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "Crear un token de acceso personal en tu cuenta para actualizar o enviar a través de %{protocol}." @@ -538,6 +738,12 @@ msgstr "Puesta en escena" msgid "CycleAnalyticsStage|Test" msgstr "Pruebas" +msgid "DashboardProjects|All" +msgstr "" + +msgid "DashboardProjects|Personal" +msgstr "" + msgid "Define a custom pattern with cron syntax" msgstr "Definir un patrón personalizado con la sintaxis de cron" @@ -555,6 +761,9 @@ msgstr "" msgid "Description" msgstr "Descripción" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "" + msgid "Details" msgstr "" @@ -564,6 +773,9 @@ msgstr "Nombre del directorio" msgid "Discard changes" msgstr "" +msgid "Dismiss Merge Request promotion" +msgstr "" + msgid "Don't show again" msgstr "No mostrar de nuevo" @@ -603,9 +815,6 @@ msgstr "Editar Programación del Pipeline %{id}" msgid "Emails" msgstr "" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "" @@ -668,6 +877,12 @@ msgstr[1] "Bifurcaciones" msgid "ForkedFromProjectPath|Forked from" msgstr "Bifurcado de" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "" + +msgid "Format" +msgstr "" + msgid "From issue creation until deploy to production" msgstr "Desde la creación de la incidencia hasta el despliegue a producción" @@ -680,6 +895,12 @@ msgstr "" msgid "Geo Nodes" msgstr "" +msgid "Geo|Groups to replicate" +msgstr "" + +msgid "Geo|Select groups to replicate." +msgstr "" + msgid "Git storage health information has been reset" msgstr "" @@ -692,6 +913,9 @@ msgstr "Ir a tu bifurcación" msgid "GoToYourFork|Fork" msgstr "Bifurcación" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." +msgstr "" + msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgstr "" @@ -734,28 +958,54 @@ msgstr "" msgid "HealthCheck|Unhealthy" msgstr "" +msgid "History" +msgstr "" + msgid "Housekeeping successfully started" msgstr "Servicio de limpieza iniciado con éxito" msgid "Import repository" msgstr "Importar repositorio" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "" + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "" + msgid "Install a Runner compatible with GitLab CI" msgstr "" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "" +msgstr[1] "" + msgid "Interval Pattern" msgstr "Patrón de intervalo" msgid "Introducing Cycle Analytics" msgstr "Introducción a Cycle Analytics" +msgid "Issue board focus mode" +msgstr "" + +msgid "Issue boards with milestones" +msgstr "" + msgid "Issue events" msgstr "" -msgid "Issues" +msgid "IssueBoards|Board" msgstr "" -msgid "Jobs" +msgid "IssueBoards|Boards" +msgstr "" + +msgid "Issues" msgstr "" msgid "LFSStatus|Disabled" @@ -775,12 +1025,21 @@ msgstr[1] "Últimos %d días" msgid "Last Pipeline" msgstr "Último Pipeline" -msgid "Last Update" -msgstr "Última actualización" - msgid "Last commit" msgstr "Último cambio" +msgid "Last edited %{date}" +msgstr "" + +msgid "Last edited by %{name}" +msgstr "" + +msgid "Last update" +msgstr "" + +msgid "Last updated" +msgstr "" + msgid "LastPushEvent|You pushed to" msgstr "" @@ -807,6 +1066,12 @@ msgid_plural "Limited to showing %d events at most" msgstr[0] "Limitado a mostrar máximo %d evento" msgstr[1] "Limitado a mostrar máximo %d eventos" +msgid "Lock" +msgstr "" + +msgid "Locked" +msgstr "" + msgid "Locked Files" msgstr "" @@ -837,6 +1102,9 @@ msgstr "" msgid "More information is available|here" msgstr "" +msgid "Multiple issue boards" +msgstr "" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "Nueva incidencia" @@ -869,12 +1137,18 @@ msgstr "Nuevo fragmento de código" msgid "New tag" msgstr "Nueva etiqueta" +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "No hay repositorio" msgid "No schedules" msgstr "No hay programaciones" +msgid "None" +msgstr "" + msgid "Not available" msgstr "No disponible" @@ -941,9 +1215,15 @@ msgstr "" msgid "OfSearchInADropdown|Filter" msgstr "Filtrar" +msgid "Only project members can comment." +msgstr "" + msgid "OpenedNDaysAgo|Opened" msgstr "Abierto" +msgid "Opens in a new window" +msgstr "" + msgid "Options" msgstr "Opciones" @@ -968,6 +1248,9 @@ msgstr "" msgid "Password" msgstr "" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "" + msgid "Pipeline" msgstr "" @@ -1127,6 +1410,21 @@ msgstr "Etapa" msgid "ProjectNetworkGraph|Graph" msgstr "Historial gráfico" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "" @@ -1217,6 +1515,9 @@ msgstr "Revertir esta solicitud de fusión" msgid "SSH Keys" msgstr "" +msgid "Save changes" +msgstr "" + msgid "Save pipeline schedule" msgstr "Guardar programación del pipeline" @@ -1238,9 +1539,6 @@ msgstr "Seleccionar formato de archivo" msgid "Select a timezone" msgstr "Selecciona una zona horaria" -msgid "Select existing branch" -msgstr "" - msgid "Select target branch" msgstr "Selecciona una rama de destino" @@ -1279,6 +1577,18 @@ msgstr[1] "Mostrando %d eventos" msgid "Snippets" msgstr "" +msgid "Something went wrong on our end." +msgstr "" + +msgid "Something went wrong while fetching the projects." +msgstr "" + +msgid "Something went wrong while fetching the registry list." +msgstr "" + +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" +msgstr "" + msgid "SortOptions|Access level, ascending" msgstr "" @@ -1416,6 +1726,12 @@ msgstr "Rama de destino" msgid "Team" msgstr "" +msgid "Thanks! Don't show me this again" +msgstr "" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "La etapa de desarrollo muestra el tiempo desde el primer cambio hasta la creación de la solicitud de fusión. Los datos serán automáticamente incorporados aquí una vez creada tu primera solicitud de fusión." @@ -1467,12 +1783,24 @@ msgstr "El valor en el punto medio de una serie de valores observados. Por ejemp msgid "There are problems accessing Git storage: " msgstr "" -msgid "This is the author's first Merge Request to this project. Handle with care." +msgid "This is a confidential issue." +msgstr "" + +msgid "This is the author's first Merge Request to this project." +msgstr "" + +msgid "This issue is confidential and locked." +msgstr "" + +msgid "This issue is locked." msgstr "" msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "Esto significa que no puede enviar código hasta que cree un repositorio vacío o importe uno existente." +msgid "This merge request is locked." +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "Tiempo antes de que una incidencia sea programada" @@ -1551,9 +1879,6 @@ msgstr "hace un mes" msgid "Timeago|a week ago" msgstr "hace una semana" -msgid "Timeago|a while" -msgstr "hace un momento" - msgid "Timeago|a year ago" msgstr "hace un año" @@ -1605,6 +1930,9 @@ msgstr "en 1 semana" msgid "Timeago|in 1 year" msgstr "en 1 año" +msgid "Timeago|in a while" +msgstr "" + msgid "Timeago|less than a minute ago" msgstr "hace menos de 1 minuto" @@ -1627,9 +1955,33 @@ msgstr "Tiempo Total" msgid "Total test time for all commits/merges" msgstr "Tiempo total de pruebas para todos los cambios o integraciones" +msgid "Track activity with Contribution Analytics." +msgstr "" + +msgid "Unlock" +msgstr "" + +msgid "Unlocked" +msgstr "" + msgid "Unstar" msgstr "No Destacar" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "" + msgid "Upload New File" msgstr "Subir nuevo archivo" @@ -1672,9 +2024,117 @@ msgstr "¿Quieres ver los datos? Por favor pide acceso al administrador." msgid "We don't have enough data to show this stage." msgstr "No hay suficientes datos para mostrar en esta etapa." +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "" + +msgid "Weight" +msgstr "" + msgid "Wiki" msgstr "" +msgid "WikiClone|Clone your wiki" +msgstr "" + +msgid "WikiClone|Git Access" +msgstr "" + +msgid "WikiClone|Install Gollum" +msgstr "" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "" + +msgid "WikiHistoricalPage|history" +msgstr "" + +msgid "WikiHistoricalPage|most recent version" +msgstr "" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "" + +msgid "WikiMarkdownDocs|documentation" +msgstr "" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "" + +msgid "WikiPageConflictMessage|the page" +msgstr "" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "" + +msgid "WikiPage|Page slug" +msgstr "" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "" + +msgid "Wiki|Create Page" +msgstr "" + +msgid "Wiki|Create page" +msgstr "" + +msgid "Wiki|Edit Page" +msgstr "" + +msgid "Wiki|Empty page" +msgstr "" + +msgid "Wiki|More Pages" +msgstr "" + +msgid "Wiki|New page" +msgstr "" + +msgid "Wiki|Page history" +msgstr "" + +msgid "Wiki|Page version" +msgstr "" + +msgid "Wiki|Pages" +msgstr "" + +msgid "Wiki|Wiki Pages" +msgstr "" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "" + msgid "Withdraw Access Request" msgstr "Retirar Solicitud de Acceso" @@ -1723,6 +2183,9 @@ msgstr "No podrás actualizar o enviar código al proyecto a través de %{protoc msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "No podrás actualizar o enviar código al proyecto a través de SSH hasta que %{add_ssh_key_link} en su perfil" +msgid "Your comment will not be visible to the public." +msgstr "" + msgid "Your name" msgstr "Tu nombre" @@ -1748,3 +2211,9 @@ msgid_plural "parents" msgstr[0] "padre" msgstr[1] "padres" +msgid "to help your contributors communicate effectively!" +msgstr "" + +msgid "personal access token" +msgstr "" + diff --git a/locale/fr/gitlab.po b/locale/fr/gitlab.po index 28d9c6a3e56..56cc02c55d5 100644 --- a/locale/fr/gitlab.po +++ b/locale/fr/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:45-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:36-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: French\n" "Language: fr_FR\n" @@ -21,6 +21,11 @@ msgid_plural "%d commits" msgstr[0] "%d validation" msgstr[1] "%d validations" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" +msgstr[1] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "%s validation supplémentaire a été masquée afin d'éviter de créer de problèmes de performances." @@ -30,7 +35,7 @@ msgid "%{commit_author_link} committed %{commit_timeago}" msgstr "%{commit_author_link} a validé %{commit_timeago}" msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead" -msgstr "" +msgstr "%{number_commits_behind} validations de retard sur %{default_branch}, %{number_commits_ahead} validations d'avance" msgid "%{number_of_failures} of %{maximum_failures} failures. GitLab will allow access on the next attempt." msgstr "%{number_of_failures} sur %{maximum_failures} tentative(s). GitLab va vous permettre d'accéder à la prochaine tentative." @@ -55,6 +60,9 @@ msgstr[0] "1 pipeline" msgstr[1] "%d pipelines" msgid "1st contribution!" +msgstr "1ère contribution !" + +msgid "2FA enabled" msgstr "" msgid "A collection of graphs regarding Continuous Integration" @@ -81,12 +89,18 @@ msgstr "Actif" msgid "Activity" msgstr "Activité" +msgid "Add" +msgstr "Ajouter" + msgid "Add Changelog" msgstr "Ajouter un journal des modifications" msgid "Add Contribution guide" msgstr "Ajouter un guide de contribution" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "" + msgid "Add License" msgstr "Ajouter une licence" @@ -100,7 +114,7 @@ msgid "All" msgstr "Tous" msgid "Appearance" -msgstr "" +msgstr "Apparence" msgid "Applications" msgstr "Applications" @@ -124,38 +138,44 @@ msgid "Are you sure?" msgstr "Êtes-vous certain ?" msgid "Artifacts" -msgstr "" +msgstr "Artéfacts" msgid "Attach a file by drag & drop or %{upload_link}" msgstr "Attachez un fichier par glisser & déposer ou %{upload_link}" msgid "Authentication Log" +msgstr "Journal d'authentification" + +msgid "Author" msgstr "" -msgid "Auto DevOps (Beta)" +msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." msgstr "" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." msgstr "" -msgid "Auto DevOps documentation" +msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps (Beta)" msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." msgstr "" -msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps documentation" msgstr "" -msgid "AutoDevOps|Learn more in the" +msgid "AutoDevOps|Enable in settings" msgstr "" -msgid "Billing" +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgstr "" +msgid "Billing" +msgstr "Facturation" + msgid "BillingPlans|%{group_name} is currently on the %{plan_link} plan." msgstr "" @@ -168,6 +188,9 @@ msgstr "" msgid "BillingPlans|Customer Support" msgstr "" +msgid "BillingPlans|Downgrade" +msgstr "" + msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." msgstr "" @@ -181,13 +204,13 @@ msgid "BillingPlans|See all %{plan_name} features" msgstr "" msgid "BillingPlans|This group uses the plan associated with its parent group." -msgstr "" +msgstr "Ce groupe utilise le plan associé à son groupe parent." msgid "BillingPlans|To manage the plan for this group, visit the billing section of %{parent_billing_page_link}." -msgstr "" +msgstr "Pour gérer le plan de ce groupe, visitez la section facturation de %{parent_billing_page_link}." msgid "BillingPlans|Upgrade" -msgstr "" +msgstr "Mise à niveau" msgid "BillingPlans|You are currently on the %{plan_link} plan." msgstr "" @@ -204,12 +227,6 @@ msgstr "" msgid "BillingPlans|per user" msgstr "" -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" - msgid "Branch" msgid_plural "Branches" msgstr[0] "Branche" @@ -228,88 +245,88 @@ msgid "Branches" msgstr "Branches" msgid "Branches|Cant find HEAD commit for this branch" -msgstr "" +msgstr "Impossible de trouver la validation HEAD pour cette branche" msgid "Branches|Compare" -msgstr "" +msgstr "Comparer" msgid "Branches|Delete all branches that are merged into '%{default_branch}'" -msgstr "" +msgstr "Supprimer toutes les branches qui ont été fusionnées dans '%{default_branch}'" msgid "Branches|Delete branch" -msgstr "" +msgstr "Supprimer cette branche" msgid "Branches|Delete merged branches" -msgstr "" +msgstr "Supprimer les branches fusionnées" msgid "Branches|Delete protected branch" -msgstr "" +msgstr "Supprimer cette branche protégée" msgid "Branches|Delete protected branch '%{branch_name}'?" -msgstr "" +msgstr "Supprimer la branche protégée '%{branch_name}' ?" msgid "Branches|Deleting the '%{branch_name}' branch cannot be undone. Are you sure?" -msgstr "" +msgstr "La suppression de la branche '%{branch_name}' ne peut être annulée. Êtes-vous sûr ?" msgid "Branches|Deleting the merged branches cannot be undone. Are you sure?" -msgstr "" +msgstr "La suppression des branches fusionnées ne peut être annulée. Êtes-vous sûr ?" msgid "Branches|Filter by branch name" -msgstr "" +msgstr "Filtrer par nom de branche" msgid "Branches|Merged into %{default_branch}" -msgstr "" +msgstr "Fusionnée dans %{default_branch}" msgid "Branches|New branch" -msgstr "" +msgstr "Nouvelle branche" msgid "Branches|No branches to show" -msgstr "" +msgstr "Aucune branche à afficher" msgid "Branches|Once you confirm and press %{delete_protected_branch}, it cannot be undone or recovered." -msgstr "" +msgstr "Une fois que vous aurez confirmé et cliqué sur %{delete_protected_branch}, cette action ne pourra pas être annulée ou restaurée." msgid "Branches|Only a project master or owner can delete a protected branch" -msgstr "" +msgstr "Seulement un maître ou un propriétaire du projet peut supprimer une branche protégée" msgid "Branches|Protected branches can be managed in %{project_settings_link}" -msgstr "" +msgstr "Les branches protégées peuvent être gérées dans %{project_settings_link}" msgid "Branches|Sort by" -msgstr "" +msgstr "Trier par" msgid "Branches|The branch could not be updated automatically because it has diverged from its upstream counterpart." -msgstr "" +msgstr "Cette branche ne peut pas être mise à jour automatiquement car elle a dévié par rapport à son dépôt en amont." msgid "Branches|The default branch cannot be deleted" -msgstr "" +msgstr "La branche par défaut ne peut pas être supprimée" msgid "Branches|This branch hasn’t been merged into %{default_branch}." -msgstr "" +msgstr "Cette branche n'a pas été fusionnée dans %{default_branch}." msgid "Branches|To avoid data loss, consider merging this branch before deleting it." -msgstr "" +msgstr "Afin d'éviter de perdre des données, il est conseillé de fusionner cette branche avant de la supprimer." msgid "Branches|To confirm, type %{branch_name_confirmation}:" -msgstr "" +msgstr "Pour confirmer, veuillez saisir %{branch_name_confirmation} :" msgid "Branches|To discard the local changes and overwrite the branch with the upstream version, delete it here and choose 'Update Now' above." -msgstr "" +msgstr "Pour rejeter les changements locaux et écraser la branche avec la version du dépôt en amont, veuillez la supprimer ici puis cliquez ci-dessus sur 'Mettre à jour maintenant'." msgid "Branches|You’re about to permanently delete the protected branch %{branch_name}." -msgstr "" +msgstr "Vous êtes sur le point de supprimer définitivement la branche protégées %{branch_name}." msgid "Branches|diverged from upstream" -msgstr "" +msgstr "a dévié du dépôt en amont" msgid "Branches|merged" -msgstr "" +msgstr "fusionnée" msgid "Branches|project settings" -msgstr "" +msgstr "paramètres du projet" msgid "Branches|protected" -msgstr "" +msgstr "protégée" msgid "Browse Directory" msgstr "Parcourir le dossier" @@ -332,12 +349,18 @@ msgstr "Intégration continu / Déploiement continu" msgid "CI configuration" msgstr "Configuration de l'intégration continue (CI)" +msgid "CICD|Jobs" +msgstr "Tâches" + msgid "Cancel" msgstr "Annuler" msgid "Cancel edit" msgstr "Annuler modification" +msgid "Change Weight" +msgstr "Changer le poids" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "Sélectionner dans la branche" @@ -365,6 +388,9 @@ msgstr "Sélectionner cette validation" msgid "Cherry-pick this merge request" msgstr "Sélectionner cette demande de fusion" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "annulé" @@ -419,6 +445,135 @@ msgstr "ignoré" msgid "CiStatus|running" msgstr "en cours" +msgid "Clone repository" +msgstr "" + +msgid "Close" +msgstr "Fermer" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "Commentaires" @@ -427,6 +582,9 @@ msgid_plural "Commits" msgstr[0] "Validation" msgstr[1] "Validations" +msgid "Commit Message" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" msgstr "Durée des 30 derniers pipelines en minutes" @@ -454,6 +612,51 @@ msgstr "Validé par" msgid "Compare" msgstr "Comparer" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "Guilde de contribution" @@ -461,7 +664,7 @@ msgid "Contributors" msgstr "Contributeurs" msgid "Copy SSH public key to clipboard" -msgstr "" +msgstr "Copier la clé publique SSH dans le presse-papier" msgid "Copy URL to clipboard" msgstr "Copier l'URL dans le presse-papier" @@ -472,9 +675,6 @@ msgstr "Copier le SHA de la validation" msgid "Create New Directory" msgstr "Créer un nouveau dossier" -msgid "Create a new branch" -msgstr "Créer une nouvelle branche" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "Créer un jeton d’accès personnel pour votre compte afin de récupérer ou pousser par %{protocol}." @@ -494,7 +694,7 @@ msgid "CreateNewFork|Fork" msgstr "Fourcher" msgid "CreateTag|Tag" -msgstr "Étiquette" +msgstr "Tag" msgid "CreateTokenToCloneLink|create a personal access token" msgstr "Créer un jeton d'accès personnel" @@ -538,6 +738,12 @@ msgstr "Pré-production" msgid "CycleAnalyticsStage|Test" msgstr "Test" +msgid "DashboardProjects|All" +msgstr "Tous" + +msgid "DashboardProjects|Personal" +msgstr "Personnels" + msgid "Define a custom pattern with cron syntax" msgstr "Définir un schéma personnalisé avec une syntaxe Cron" @@ -555,6 +761,9 @@ msgstr "Clés de déploiement" msgid "Description" msgstr "Description" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "" + msgid "Details" msgstr "Détails" @@ -564,6 +773,9 @@ msgstr "Nom du dossier" msgid "Discard changes" msgstr "Supprimer les modifications" +msgid "Dismiss Merge Request promotion" +msgstr "" + msgid "Don't show again" msgstr "Ne plus montrer" @@ -603,9 +815,6 @@ msgstr "Éditer le pipeline programmé %{id}" msgid "Emails" msgstr "Courriels" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "Aucun filtre" @@ -634,7 +843,7 @@ msgid "Every week (Sundays at 4:00am)" msgstr "Chaque semaine (dimanche à 4:00 du matin)" msgid "Explore projects" -msgstr "" +msgstr "Explorer les projets" msgid "Failed to change the owner" msgstr "Échec du changement de propriétaire" @@ -668,6 +877,12 @@ msgstr[1] "Fourches" msgid "ForkedFromProjectPath|Forked from" msgstr "Fourché depuis" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "" + +msgid "Format" +msgstr "Format" + msgid "From issue creation until deploy to production" msgstr "Depuis la création de l'incident jusqu'au déploiement en production" @@ -680,6 +895,12 @@ msgstr "Clés GPG" msgid "Geo Nodes" msgstr "" +msgid "Geo|Groups to replicate" +msgstr "" + +msgid "Geo|Select groups to replicate." +msgstr "" + msgid "Git storage health information has been reset" msgstr "Les informations de santé du stockage Git ont été réinitialisées" @@ -692,6 +913,9 @@ msgstr "Aller à votre fourche" msgid "GoToYourFork|Fork" msgstr "Fourche" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." +msgstr "" + msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgstr "" @@ -734,30 +958,56 @@ msgstr "Aucun problème détecté" msgid "HealthCheck|Unhealthy" msgstr "En mauvaise santé" +msgid "History" +msgstr "Historique" + msgid "Housekeeping successfully started" msgstr "Maintenance démarrée avec succès" msgid "Import repository" msgstr "Importer un dépôt" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "" + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "" + msgid "Install a Runner compatible with GitLab CI" msgstr "Installez un Runner compatible avec l'intégration continue de GitLab" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "" +msgstr[1] "" + msgid "Interval Pattern" msgstr "Schéma d’intervalle" msgid "Introducing Cycle Analytics" msgstr "Introduction à l'analyseur de cycle" +msgid "Issue board focus mode" +msgstr "" + +msgid "Issue boards with milestones" +msgstr "Tableaux d'incidents avec leurs jalons" + msgid "Issue events" msgstr "Événements de l'incident" +msgid "IssueBoards|Board" +msgstr "Tableau" + +msgid "IssueBoards|Boards" +msgstr "Tableaux" + msgid "Issues" msgstr "Incidents" -msgid "Jobs" -msgstr "" - msgid "LFSStatus|Disabled" msgstr "Désactivé" @@ -765,7 +1015,7 @@ msgid "LFSStatus|Enabled" msgstr "Activé" msgid "Labels" -msgstr "" +msgstr "Étiquettes" msgid "Last %d day" msgid_plural "Last %d days" @@ -775,12 +1025,21 @@ msgstr[1] "Les derniers %d jours" msgid "Last Pipeline" msgstr "Dernier pipeline" -msgid "Last Update" -msgstr "Dernière mise à jour" - msgid "Last commit" msgstr "Dernière validation" +msgid "Last edited %{date}" +msgstr "" + +msgid "Last edited by %{name}" +msgstr "" + +msgid "Last update" +msgstr "" + +msgid "Last updated" +msgstr "" + msgid "LastPushEvent|You pushed to" msgstr "Vous avez poussé sur" @@ -800,15 +1059,21 @@ msgid "Leave project" msgstr "Quitter le projet" msgid "License" -msgstr "" +msgstr "Licence" msgid "Limited to showing %d event at most" msgid_plural "Limited to showing %d events at most" msgstr[0] "Limiter l'affichage au plus à %d évènement" msgstr[1] "Limiter l'affichage au plus à %d évènements" +msgid "Lock" +msgstr "Verrouiller" + +msgid "Locked" +msgstr "Verrouillé" + msgid "Locked Files" -msgstr "" +msgstr "Fichiers verrouillés" msgid "Median" msgstr "Médian" @@ -823,7 +1088,7 @@ msgid "Merge events" msgstr "Événements de fusion" msgid "Merge request" -msgstr "" +msgstr "Demande de fusion" msgid "Messages" msgstr "Messages" @@ -837,6 +1102,9 @@ msgstr "Surveillance" msgid "More information is available|here" msgstr "ici" +msgid "Multiple issue boards" +msgstr "" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "Nouvel incident" @@ -867,7 +1135,10 @@ msgid "New snippet" msgstr "Nouvel extrait de code" msgid "New tag" -msgstr "Nouvelle étiquette" +msgstr "Nouveau tag" + +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" msgid "No repository" msgstr "Pas de dépôt" @@ -875,6 +1146,9 @@ msgstr "Pas de dépôt" msgid "No schedules" msgstr "Aucun programme" +msgid "None" +msgstr "Aucun(e)" + msgid "Not available" msgstr "Indisponible" @@ -941,9 +1215,15 @@ msgstr "Notifications" msgid "OfSearchInADropdown|Filter" msgstr "Filtre" +msgid "Only project members can comment." +msgstr "" + msgid "OpenedNDaysAgo|Opened" msgstr "Ouvert" +msgid "Opens in a new window" +msgstr "" + msgid "Options" msgstr "Paramètres" @@ -954,20 +1234,23 @@ msgid "Owner" msgstr "Propriétaire" msgid "Pagination|Last »" -msgstr "" +msgstr "Dernière »" msgid "Pagination|Next" -msgstr "" +msgstr "Suivante" msgid "Pagination|Prev" -msgstr "" +msgstr "Précédente" msgid "Pagination|« First" -msgstr "" +msgstr "« Première" msgid "Password" msgstr "Mot de Passe" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "" + msgid "Pipeline" msgstr "Pipeline" @@ -981,7 +1264,7 @@ msgid "Pipeline Schedules" msgstr "Programmations de pipeline" msgid "Pipeline quota" -msgstr "" +msgstr "Quota de pipeline" msgid "PipelineCharts|Failed:" msgstr "Échecs : " @@ -1071,7 +1354,7 @@ msgid "Preferences" msgstr "Préférences" msgid "Profile" -msgstr "" +msgstr "Profil" msgid "Project '%{project_name}' queued for deletion." msgstr "Projet '%{project_name}' en attente de suppression." @@ -1127,9 +1410,24 @@ msgstr "Étape" msgid "ProjectNetworkGraph|Graph" msgstr "Graphique " -msgid "ProjectsDropdown|Frequently visited" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." msgstr "" +msgid "ProjectsDropdown|Frequently visited" +msgstr "Fréquemment visité" + msgid "ProjectsDropdown|Loading projects" msgstr "Chargement des projets" @@ -1140,7 +1438,7 @@ msgid "ProjectsDropdown|Search your projects" msgstr "Chercher dans vos projets" msgid "ProjectsDropdown|Something went wrong on our end." -msgstr "" +msgstr "Un problème est survenu de notre côté." msgid "ProjectsDropdown|Sorry, no projects matched your search" msgstr "Désolé, aucun projet ne correspond à votre recherche" @@ -1149,7 +1447,7 @@ msgid "ProjectsDropdown|This feature requires browser localStorage support" msgstr "Cette fonctionnalité requiert le support du localStorage par votre navigateur" msgid "Push Rules" -msgstr "" +msgstr "Règles de poussée" msgid "Push events" msgstr "Évènements de poussée" @@ -1164,10 +1462,10 @@ msgid "RefSwitcher|Branches" msgstr "Branches" msgid "RefSwitcher|Tags" -msgstr "Étiquettes" +msgstr "Tags" msgid "Registry" -msgstr "" +msgstr "Registre" msgid "Related Commits" msgstr "Validations liés" @@ -1209,14 +1507,17 @@ msgid "Reset runners registration token" msgstr "Réinitialiser le jeton d’inscription des Runners" msgid "Revert this commit" -msgstr "Annuler cette validation" +msgstr "Défaire cette validation" msgid "Revert this merge request" -msgstr "Annuler cette demande de fusion" +msgstr "Défaire cette demande de fusion" msgid "SSH Keys" msgstr "Clés SSH" +msgid "Save changes" +msgstr "Enregistrer les modifications" + msgid "Save pipeline schedule" msgstr "Sauvegarder le pipeline programmé" @@ -1224,7 +1525,7 @@ msgid "Schedule a new pipeline" msgstr "Programmer un nouveau pipeline" msgid "Schedules" -msgstr "" +msgstr "Programmes" msgid "Scheduling Pipelines" msgstr "Programmer des pipelines" @@ -1238,9 +1539,6 @@ msgstr "Sélectionnez le format de l'archive" msgid "Select a timezone" msgstr "Sélectionnez un fuseau horaire" -msgid "Select existing branch" -msgstr "Sélectionnez une branche existante" - msgid "Select target branch" msgstr "Sélectionnez une branche cible" @@ -1266,10 +1564,10 @@ msgid "Settings" msgstr "Paramètres" msgid "Show parent pages" -msgstr "" +msgstr "Afficher les pages parentes" msgid "Show parent subgroups" -msgstr "" +msgstr "Afficher les sous-groupes parents" msgid "Showing %d event" msgid_plural "Showing %d events" @@ -1279,101 +1577,113 @@ msgstr[1] "Affichage de %d évènements" msgid "Snippets" msgstr "Extraits de code" -msgid "SortOptions|Access level, ascending" +msgid "Something went wrong on our end." msgstr "" -msgid "SortOptions|Access level, descending" +msgid "Something went wrong while fetching the projects." msgstr "" -msgid "SortOptions|Created date" +msgid "Something went wrong while fetching the registry list." msgstr "" -msgid "SortOptions|Due date" +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" msgstr "" +msgid "SortOptions|Access level, ascending" +msgstr "Niveau d’accès, croissant" + +msgid "SortOptions|Access level, descending" +msgstr "Niveau d’accès, decroissant" + +msgid "SortOptions|Created date" +msgstr "Date de création" + +msgid "SortOptions|Due date" +msgstr "Date d'échéance" + msgid "SortOptions|Due later" -msgstr "" +msgstr "Échéance lointaine" msgid "SortOptions|Due soon" -msgstr "" +msgstr "Échéance proche" msgid "SortOptions|Label priority" -msgstr "" +msgstr "Priorité des étiquettes" msgid "SortOptions|Largest group" -msgstr "" +msgstr "Taille de groupe" msgid "SortOptions|Largest repository" -msgstr "" +msgstr "Taille de dépôt" msgid "SortOptions|Last created" -msgstr "" +msgstr "Créé récemment" msgid "SortOptions|Last joined" -msgstr "" +msgstr "Rejoint récemment" msgid "SortOptions|Last updated" -msgstr "" +msgstr "Mise à jour récemment" msgid "SortOptions|Least popular" -msgstr "" +msgstr "Moins populaire" msgid "SortOptions|Less weight" -msgstr "" +msgstr "Poids croissant" msgid "SortOptions|Milestone" -msgstr "" +msgstr "Jalon" msgid "SortOptions|Milestone due later" -msgstr "" +msgstr "Jalon avec une échéance lointaine" msgid "SortOptions|Milestone due soon" -msgstr "" +msgstr "Jalon avec une échéance proche" msgid "SortOptions|More weight" -msgstr "" +msgstr "Poids décroissant" msgid "SortOptions|Most popular" -msgstr "" +msgstr "Populaire" msgid "SortOptions|Name" -msgstr "" +msgstr "Nom" msgid "SortOptions|Name, ascending" -msgstr "" +msgstr "Nom, par ordre croissant" msgid "SortOptions|Name, descending" -msgstr "" +msgstr "Nom, par ordre décroissant" msgid "SortOptions|Oldest created" -msgstr "" +msgstr "Créé depuis longtemps" msgid "SortOptions|Oldest joined" -msgstr "" +msgstr "Rejoint depuis longtemps" msgid "SortOptions|Oldest sign in" -msgstr "" +msgstr "Authentifié depuis longtemps" msgid "SortOptions|Oldest updated" -msgstr "" +msgstr "Mise à jour depuis longtemps" msgid "SortOptions|Popularity" -msgstr "" +msgstr "Popularité" msgid "SortOptions|Priority" -msgstr "" +msgstr "Priorité" msgid "SortOptions|Recent sign in" -msgstr "" +msgstr "Authentifié récemment" msgid "SortOptions|Start later" -msgstr "" +msgstr "Commence plus tard" msgid "SortOptions|Start soon" -msgstr "" +msgstr "Commence bientôt" msgid "SortOptions|Weight" -msgstr "" +msgstr "Poids" msgid "Source code" msgstr "Code source" @@ -1388,7 +1698,7 @@ msgid "StarProject|Star" msgstr "S'abonner" msgid "Starred projects" -msgstr "" +msgstr "Projets favoris" msgid "Start a %{new_merge_request} with these changes" msgstr "Créer une %{new_merge_request} avec ces changements" @@ -1400,15 +1710,15 @@ msgid "Switch branch/tag" msgstr "Changer de branche / d'étiquette" msgid "System Hooks" -msgstr "" +msgstr "Crochets système" msgid "Tag" msgid_plural "Tags" msgstr[0] "Étiquette" -msgstr[1] "Étiquettes" +msgstr[1] "Tags" msgid "Tags" -msgstr "Étiquettes" +msgstr "Tags" msgid "Target Branch" msgstr "Branche cible" @@ -1416,6 +1726,12 @@ msgstr "Branche cible" msgid "Team" msgstr "Équipe" +msgid "Thanks! Don't show me this again" +msgstr "Merci de ne plus afficher ce message" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "L’étape de développement montre le temps entre la première validation et la création de la demande de fusion. Les données seront automatiquement ajoutées ici une fois que vous aurez créé votre première demande de fusion." @@ -1432,7 +1748,7 @@ msgid "The phase of the development lifecycle." msgstr "Les étapes du cycle de développement." msgid "The pipelines schedule runs pipelines in the future, repeatedly, for specific branches or tags. Those scheduled pipelines will inherit limited project access based on their associated user." -msgstr "Les pipelines programmés exécutent des pipelines dans le futur, de façon répétée, pour les branches et étiquettes spécifiées. Ces pipelines programmés héritent d’un accès partiel au projet basé sur l’utilisateur qui leurs est associé." +msgstr "Les pipelines programmés exécutent des pipelines dans le futur, de façon répétée, pour les branches et tags spécifiées. Ces pipelines programmés héritent d’un accès partiel au projet basé sur l’utilisateur qui leurs est associé." msgid "The planning stage shows the time from the previous step to pushing your first commit. This time will be added automatically once you push your first commit." msgstr "L’étape de planification montre le temps entre l’étape précédente et l’envoi de votre première validation. Ce temps sera automatiquement ajouté quand vous pousserez votre première validation." @@ -1467,12 +1783,24 @@ msgstr "La valeur située au point médian d’une série de valeur observée. C msgid "There are problems accessing Git storage: " msgstr "Il y a des difficultés à accéder aux données Git : " -msgid "This is the author's first Merge Request to this project. Handle with care." +msgid "This is a confidential issue." +msgstr "" + +msgid "This is the author's first Merge Request to this project." +msgstr "" + +msgid "This issue is confidential and locked." +msgstr "" + +msgid "This issue is locked." msgstr "" msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "Cela signifie que vous ne pouvez pas pousser du code tant que vous ne créez pas un dépôt vide, ou importez une dépôt existant." +msgid "This merge request is locked." +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "Temps avant qu’un incident ne soit planifié" @@ -1551,9 +1879,6 @@ msgstr "Il y a un mois" msgid "Timeago|a week ago" msgstr "Il y a une semaine" -msgid "Timeago|a while" -msgstr "Il y a un moment" - msgid "Timeago|a year ago" msgstr "Il y a un an" @@ -1605,6 +1930,9 @@ msgstr "Dans 1 semaine" msgid "Timeago|in 1 year" msgstr "Dans 1 an" +msgid "Timeago|in a while" +msgstr "" + msgid "Timeago|less than a minute ago" msgstr "il y a moins d'une minute" @@ -1627,9 +1955,33 @@ msgstr "Temps total" msgid "Total test time for all commits/merges" msgstr "Temps total de test pour toutes les validations/fusions" +msgid "Track activity with Contribution Analytics." +msgstr "" + +msgid "Unlock" +msgstr "Déverrouiller" + +msgid "Unlocked" +msgstr "Déverrouillé" + msgid "Unstar" msgstr "Se désabonner" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "" + msgid "Upload New File" msgstr "Téléverser un nouveau fichier" @@ -1646,13 +1998,13 @@ msgid "Use your global notification setting" msgstr "Utiliser vos paramètres de notification globaux" msgid "View file @ " -msgstr "" +msgstr "Voir le fichier @ " msgid "View open merge request" msgstr "Afficher la demande de fusion" msgid "View replaced file @ " -msgstr "" +msgstr "Voir le fichier remplacé @ " msgid "VisibilityLevel|Internal" msgstr "Interne" @@ -1672,9 +2024,117 @@ msgstr "Vous voulez voir les données ? Merci de contacter un administrateur pou msgid "We don't have enough data to show this stage." msgstr "Nous n'avons pas suffisamment de données pour afficher cette étape." +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "" + +msgid "Weight" +msgstr "Poids" + msgid "Wiki" msgstr "Wiki" +msgid "WikiClone|Clone your wiki" +msgstr "" + +msgid "WikiClone|Git Access" +msgstr "" + +msgid "WikiClone|Install Gollum" +msgstr "" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "" + +msgid "WikiHistoricalPage|history" +msgstr "" + +msgid "WikiHistoricalPage|most recent version" +msgstr "" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "" + +msgid "WikiMarkdownDocs|documentation" +msgstr "" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "" + +msgid "WikiPageConflictMessage|the page" +msgstr "" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "" + +msgid "WikiPage|Page slug" +msgstr "" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "" + +msgid "Wiki|Create Page" +msgstr "" + +msgid "Wiki|Create page" +msgstr "" + +msgid "Wiki|Edit Page" +msgstr "" + +msgid "Wiki|Empty page" +msgstr "" + +msgid "Wiki|More Pages" +msgstr "" + +msgid "Wiki|New page" +msgstr "" + +msgid "Wiki|Page history" +msgstr "" + +msgid "Wiki|Page version" +msgstr "" + +msgid "Wiki|Pages" +msgstr "" + +msgid "Wiki|Wiki Pages" +msgstr "" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "" + msgid "Withdraw Access Request" msgstr "Retirer la demande d'accès" @@ -1723,14 +2183,17 @@ msgstr "Vous ne pourrez pas récupérer ou pousser de code par %{protocol} tant msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "Vous ne pourrez pas récupérer ou pousser de code par SSH tant que vous n’aurez pas %{add_ssh_key_link} dans votre profil" +msgid "Your comment will not be visible to the public." +msgstr "" + msgid "Your name" msgstr "Votre nom" msgid "Your projects" -msgstr "" +msgstr "Vos projets" msgid "commit" -msgstr "" +msgstr "validation" msgid "day" msgid_plural "days" @@ -1748,3 +2211,9 @@ msgid_plural "parents" msgstr[0] "parent" msgstr[1] "parents" +msgid "to help your contributors communicate effectively!" +msgstr "pour aider vos contributeurs à communiquer efficacement !" + +msgid "personal access token" +msgstr "" + diff --git a/locale/it/gitlab.po b/locale/it/gitlab.po index 804817e96e9..5697c4e415c 100644 --- a/locale/it/gitlab.po +++ b/locale/it/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:44-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:36-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: Italian\n" "Language: it_IT\n" @@ -21,6 +21,11 @@ msgid_plural "%d commits" msgstr[0] "" msgstr[1] "" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" +msgstr[1] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "%s commit aggiuntivo è stato omesso per evitare degradi di prestazioni negli issues." @@ -57,6 +62,9 @@ msgstr[1] "" msgid "1st contribution!" msgstr "" +msgid "2FA enabled" +msgstr "" + msgid "A collection of graphs regarding Continuous Integration" msgstr "Un insieme di grafici riguardo la Continuous Integration" @@ -81,12 +89,18 @@ msgstr "Attivo" msgid "Activity" msgstr "Attività" +msgid "Add" +msgstr "" + msgid "Add Changelog" msgstr "Aggiungi Changelog" msgid "Add Contribution guide" msgstr "Aggiungi Guida per contribuire" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "" + msgid "Add License" msgstr "Aggiungi Licenza" @@ -132,25 +146,31 @@ msgstr "Aggiungi un file tramite trascina & rilascia ( drag & drop) o %{ msgid "Authentication Log" msgstr "" -msgid "Auto DevOps (Beta)" +msgid "Author" +msgstr "" + +msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." msgstr "" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." msgstr "" -msgid "Auto DevOps documentation" +msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps (Beta)" msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." msgstr "" -msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps documentation" msgstr "" -msgid "AutoDevOps|Learn more in the" +msgid "AutoDevOps|Enable in settings" +msgstr "" + +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgstr "" msgid "Billing" @@ -168,6 +188,9 @@ msgstr "" msgid "BillingPlans|Customer Support" msgstr "" +msgid "BillingPlans|Downgrade" +msgstr "" + msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." msgstr "" @@ -204,12 +227,6 @@ msgstr "" msgid "BillingPlans|per user" msgstr "" -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" - msgid "Branch" msgid_plural "Branches" msgstr[0] "" @@ -332,12 +349,18 @@ msgstr "" msgid "CI configuration" msgstr "Configurazione CI (Integrazione Continua)" +msgid "CICD|Jobs" +msgstr "" + msgid "Cancel" msgstr "Cancella" msgid "Cancel edit" msgstr "" +msgid "Change Weight" +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "Preleva nella branch" @@ -365,6 +388,9 @@ msgstr "" msgid "Cherry-pick this merge request" msgstr "Cherry-pick questa richiesta di merge" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "cancellato" @@ -419,6 +445,135 @@ msgstr "saltata" msgid "CiStatus|running" msgstr "in corso" +msgid "Clone repository" +msgstr "" + +msgid "Close" +msgstr "" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "" @@ -427,6 +582,9 @@ msgid_plural "Commits" msgstr[0] "" msgstr[1] "" +msgid "Commit Message" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" msgstr "Durata del commit (in minuti) per gli ultimi 30 commit" @@ -454,6 +612,51 @@ msgstr "Committato da " msgid "Compare" msgstr "Confronta" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "Guida per contribuire" @@ -472,9 +675,6 @@ msgstr "Copia l'SHA del commit negli appunti" msgid "Create New Directory" msgstr "Crea una nuova cartella" -msgid "Create a new branch" -msgstr "" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "Creare un token di accesso sul tuo account per eseguire pull o push tramite %{protocol}" @@ -538,6 +738,12 @@ msgstr "Pre-rilascio" msgid "CycleAnalyticsStage|Test" msgstr "Test" +msgid "DashboardProjects|All" +msgstr "" + +msgid "DashboardProjects|Personal" +msgstr "" + msgid "Define a custom pattern with cron syntax" msgstr "Definisci un patter personalizzato mediante la sintassi cron" @@ -555,6 +761,9 @@ msgstr "" msgid "Description" msgstr "Descrizione" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "" + msgid "Details" msgstr "" @@ -564,6 +773,9 @@ msgstr "Nome cartella" msgid "Discard changes" msgstr "" +msgid "Dismiss Merge Request promotion" +msgstr "" + msgid "Don't show again" msgstr "Non mostrare più" @@ -603,9 +815,6 @@ msgstr "Cambia programmazione della pipeline %{id}" msgid "Emails" msgstr "" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "" @@ -668,6 +877,12 @@ msgstr[1] "" msgid "ForkedFromProjectPath|Forked from" msgstr "Fork da" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "" + +msgid "Format" +msgstr "" + msgid "From issue creation until deploy to production" msgstr "Dalla creazione di un issue fino al rilascio in produzione" @@ -680,6 +895,12 @@ msgstr "" msgid "Geo Nodes" msgstr "" +msgid "Geo|Groups to replicate" +msgstr "" + +msgid "Geo|Select groups to replicate." +msgstr "" + msgid "Git storage health information has been reset" msgstr "" @@ -692,6 +913,9 @@ msgstr "Vai il tuo fork" msgid "GoToYourFork|Fork" msgstr "Fork" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." +msgstr "" + msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgstr "" @@ -734,28 +958,54 @@ msgstr "" msgid "HealthCheck|Unhealthy" msgstr "" +msgid "History" +msgstr "" + msgid "Housekeeping successfully started" msgstr "Housekeeping iniziato con successo" msgid "Import repository" msgstr "Importa repository" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "" + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "" + msgid "Install a Runner compatible with GitLab CI" msgstr "" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "" +msgstr[1] "" + msgid "Interval Pattern" msgstr "Intervallo di Pattern" msgid "Introducing Cycle Analytics" msgstr "Introduzione delle Analisi Cicliche" +msgid "Issue board focus mode" +msgstr "" + +msgid "Issue boards with milestones" +msgstr "" + msgid "Issue events" msgstr "" -msgid "Issues" +msgid "IssueBoards|Board" msgstr "" -msgid "Jobs" +msgid "IssueBoards|Boards" +msgstr "" + +msgid "Issues" msgstr "" msgid "LFSStatus|Disabled" @@ -775,12 +1025,21 @@ msgstr[1] "Gli ultimi %d giorni" msgid "Last Pipeline" msgstr "Ultima Pipeline" -msgid "Last Update" -msgstr "Ultimo Aggiornamento" - msgid "Last commit" msgstr "Ultimo Commit" +msgid "Last edited %{date}" +msgstr "" + +msgid "Last edited by %{name}" +msgstr "" + +msgid "Last update" +msgstr "" + +msgid "Last updated" +msgstr "" + msgid "LastPushEvent|You pushed to" msgstr "" @@ -807,6 +1066,12 @@ msgid_plural "Limited to showing %d events at most" msgstr[0] "Limita visualizzazione %d d'evento" msgstr[1] "Limita visualizzazione %d di eventi" +msgid "Lock" +msgstr "" + +msgid "Locked" +msgstr "" + msgid "Locked Files" msgstr "" @@ -837,6 +1102,9 @@ msgstr "" msgid "More information is available|here" msgstr "" +msgid "Multiple issue boards" +msgstr "" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "Nuovo Issue" @@ -869,12 +1137,18 @@ msgstr "Nuovo snippet" msgid "New tag" msgstr "Nuovo tag" +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "Nessuna Repository" msgid "No schedules" msgstr "Nessuna pianificazione" +msgid "None" +msgstr "" + msgid "Not available" msgstr "Non disponibile" @@ -941,9 +1215,15 @@ msgstr "" msgid "OfSearchInADropdown|Filter" msgstr "Filtra" +msgid "Only project members can comment." +msgstr "" + msgid "OpenedNDaysAgo|Opened" msgstr "Aperto" +msgid "Opens in a new window" +msgstr "" + msgid "Options" msgstr "Opzioni" @@ -968,6 +1248,9 @@ msgstr "" msgid "Password" msgstr "" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "" + msgid "Pipeline" msgstr "" @@ -1127,6 +1410,21 @@ msgstr "Stadio" msgid "ProjectNetworkGraph|Graph" msgstr "Grafico" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "" @@ -1217,6 +1515,9 @@ msgstr "Ripristina questa richiesta di merge" msgid "SSH Keys" msgstr "" +msgid "Save changes" +msgstr "" + msgid "Save pipeline schedule" msgstr "Salva pianificazione pipeline" @@ -1238,9 +1539,6 @@ msgstr "Seleziona formato d'archivio" msgid "Select a timezone" msgstr "Seleziona una timezone" -msgid "Select existing branch" -msgstr "" - msgid "Select target branch" msgstr "Seleziona una branch di destinazione" @@ -1279,6 +1577,18 @@ msgstr[1] "Visualizza %d eventi" msgid "Snippets" msgstr "" +msgid "Something went wrong on our end." +msgstr "" + +msgid "Something went wrong while fetching the projects." +msgstr "" + +msgid "Something went wrong while fetching the registry list." +msgstr "" + +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" +msgstr "" + msgid "SortOptions|Access level, ascending" msgstr "" @@ -1416,6 +1726,12 @@ msgstr "Branch di destinazione" msgid "Team" msgstr "" +msgid "Thanks! Don't show me this again" +msgstr "" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "Lo stadio di programmazione mostra il tempo trascorso dal primo commit alla creazione di una richiesta di merge (MR). I dati saranno aggiunti una volta che avrai creato la prima richiesta di merge." @@ -1467,12 +1783,24 @@ msgstr "Il valore falsato nel mezzo di una serie di dati osservati. ES: tra 3,5, msgid "There are problems accessing Git storage: " msgstr "" -msgid "This is the author's first Merge Request to this project. Handle with care." +msgid "This is a confidential issue." +msgstr "" + +msgid "This is the author's first Merge Request to this project." +msgstr "" + +msgid "This issue is confidential and locked." +msgstr "" + +msgid "This issue is locked." msgstr "" msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "Questo significa che non è possibile effettuare push di codice fino a che non crei una repository vuota o ne importi una esistente" +msgid "This merge request is locked." +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "Il tempo che impiega un issue per esser pianificato" @@ -1551,9 +1879,6 @@ msgstr "un mese fa" msgid "Timeago|a week ago" msgstr "una settimana fa" -msgid "Timeago|a while" -msgstr "poco fa" - msgid "Timeago|a year ago" msgstr "un anno fa" @@ -1605,6 +1930,9 @@ msgstr "in 1 settimana" msgid "Timeago|in 1 year" msgstr "in 1 anno" +msgid "Timeago|in a while" +msgstr "" + msgid "Timeago|less than a minute ago" msgstr "meno di un minuto fa" @@ -1627,9 +1955,33 @@ msgstr "Tempo Totale" msgid "Total test time for all commits/merges" msgstr "Tempo totale di test per tutti i commits/merges" +msgid "Track activity with Contribution Analytics." +msgstr "" + +msgid "Unlock" +msgstr "" + +msgid "Unlocked" +msgstr "" + msgid "Unstar" msgstr "" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "" + msgid "Upload New File" msgstr "Carica un nuovo file" @@ -1672,9 +2024,117 @@ msgstr "Vuoi visualizzare i dati? Richiedi l'accesso ad un amministratore, grazi msgid "We don't have enough data to show this stage." msgstr "Non ci sono sufficienti dati da mostrare su questo stadio" +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "" + +msgid "Weight" +msgstr "" + msgid "Wiki" msgstr "" +msgid "WikiClone|Clone your wiki" +msgstr "" + +msgid "WikiClone|Git Access" +msgstr "" + +msgid "WikiClone|Install Gollum" +msgstr "" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "" + +msgid "WikiHistoricalPage|history" +msgstr "" + +msgid "WikiHistoricalPage|most recent version" +msgstr "" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "" + +msgid "WikiMarkdownDocs|documentation" +msgstr "" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "" + +msgid "WikiPageConflictMessage|the page" +msgstr "" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "" + +msgid "WikiPage|Page slug" +msgstr "" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "" + +msgid "Wiki|Create Page" +msgstr "" + +msgid "Wiki|Create page" +msgstr "" + +msgid "Wiki|Edit Page" +msgstr "" + +msgid "Wiki|Empty page" +msgstr "" + +msgid "Wiki|More Pages" +msgstr "" + +msgid "Wiki|New page" +msgstr "" + +msgid "Wiki|Page history" +msgstr "" + +msgid "Wiki|Page version" +msgstr "" + +msgid "Wiki|Pages" +msgstr "" + +msgid "Wiki|Wiki Pages" +msgstr "" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "" + msgid "Withdraw Access Request" msgstr "Ritira richiesta d'accesso" @@ -1723,6 +2183,9 @@ msgstr "Non sarai in grado di eseguire pull o push di codice tramite %{protocol} msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "Non sarai in grado di effettuare push o pull tramite SSH fino a che %{add_ssh_key_link} al tuo profilo" +msgid "Your comment will not be visible to the public." +msgstr "" + msgid "Your name" msgstr "Il tuo nome" @@ -1748,3 +2211,9 @@ msgid_plural "parents" msgstr[0] "" msgstr[1] "" +msgid "to help your contributors communicate effectively!" +msgstr "" + +msgid "personal access token" +msgstr "" + diff --git a/locale/ja/gitlab.po b/locale/ja/gitlab.po index 2a08abda7ce..4b70f8dd9df 100644 --- a/locale/ja/gitlab.po +++ b/locale/ja/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:44-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:37-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: Japanese\n" "Language: ja_JP\n" @@ -20,6 +20,10 @@ msgid "%d commit" msgid_plural "%d commits" msgstr[0] "%d個のコミット" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "パフォーマンス低下を避けるため %s 個のコミットを省略しました。" @@ -53,6 +57,9 @@ msgstr[0] "%d 個のパイプライン" msgid "1st contribution!" msgstr "" +msgid "2FA enabled" +msgstr "" + msgid "A collection of graphs regarding Continuous Integration" msgstr "CIについてのグラフ" @@ -77,12 +84,18 @@ msgstr "有効" msgid "Activity" msgstr "アクティビティー" +msgid "Add" +msgstr "" + msgid "Add Changelog" msgstr "変更履歴を追加" msgid "Add Contribution guide" msgstr "貢献者向けガイドを追加" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "" + msgid "Add License" msgstr "ライセンスを追加" @@ -128,25 +141,31 @@ msgstr "ドラッグ＆ドロップまたは %{upload_link} でファイルを msgid "Authentication Log" msgstr "" -msgid "Auto DevOps (Beta)" +msgid "Author" msgstr "" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." msgstr "" -msgid "Auto DevOps documentation" +msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." +msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." +msgid "AutoDevOps|Auto DevOps (Beta)" msgstr "" -msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." msgstr "" -msgid "AutoDevOps|Learn more in the" +msgid "AutoDevOps|Auto DevOps documentation" +msgstr "" + +msgid "AutoDevOps|Enable in settings" +msgstr "" + +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgstr "" msgid "Billing" @@ -164,6 +183,9 @@ msgstr "" msgid "BillingPlans|Customer Support" msgstr "" +msgid "BillingPlans|Downgrade" +msgstr "" + msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." msgstr "" @@ -200,12 +222,6 @@ msgstr "" msgid "BillingPlans|per user" msgstr "" -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" - msgid "Branch" msgid_plural "Branches" msgstr[0] "ブランチ" @@ -327,12 +343,18 @@ msgstr "" msgid "CI configuration" msgstr "CI 設定" +msgid "CICD|Jobs" +msgstr "" + msgid "Cancel" msgstr "キャンセル" msgid "Cancel edit" msgstr "" +msgid "Change Weight" +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "ピック先ブランチ:" @@ -360,6 +382,9 @@ msgstr "このコミットをチェリーピック" msgid "Cherry-pick this merge request" msgstr "このマージリクエストをチェリーピック" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "キャンセル" @@ -414,6 +439,135 @@ msgstr "スキップ済み" msgid "CiStatus|running" msgstr "実行中" +msgid "Clone repository" +msgstr "" + +msgid "Close" +msgstr "" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "" @@ -421,6 +575,9 @@ msgid "Commit" msgid_plural "Commits" msgstr[0] "コミット" +msgid "Commit Message" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" msgstr "直近30コミットの所要時間(分)" @@ -448,6 +605,51 @@ msgstr "コミット担当者: " msgid "Compare" msgstr "比較" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "貢献者向けガイド" @@ -466,9 +668,6 @@ msgstr "コミットのSHAをクリップボードにコピー" msgid "Create New Directory" msgstr "新規ディレクトリを作成" -msgid "Create a new branch" -msgstr "" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "%{protocol} でプッシュやプルするためのあなた個人用アクセストークンを作成" @@ -532,6 +731,12 @@ msgstr "ステージング" msgid "CycleAnalyticsStage|Test" msgstr "テスト" +msgid "DashboardProjects|All" +msgstr "" + +msgid "DashboardProjects|Personal" +msgstr "" + msgid "Define a custom pattern with cron syntax" msgstr "Cron 構文でカスタムなパターンを指定する" @@ -548,6 +753,9 @@ msgstr "" msgid "Description" msgstr "説明" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "" + msgid "Details" msgstr "" @@ -557,6 +765,9 @@ msgstr "ディレクトリ名" msgid "Discard changes" msgstr "" +msgid "Dismiss Merge Request promotion" +msgstr "" + msgid "Don't show again" msgstr "次回から表示しない" @@ -596,9 +807,6 @@ msgstr "パイプラインスケジュール %{id} を編集" msgid "Emails" msgstr "" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "" @@ -660,6 +868,12 @@ msgstr[0] "フォーク" msgid "ForkedFromProjectPath|Forked from" msgstr "フォーク元" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "" + +msgid "Format" +msgstr "" + msgid "From issue creation until deploy to production" msgstr "課題が登録されてからプロダクションにデプロイされるまで" @@ -672,6 +886,12 @@ msgstr "" msgid "Geo Nodes" msgstr "" +msgid "Geo|Groups to replicate" +msgstr "" + +msgid "Geo|Select groups to replicate." +msgstr "" + msgid "Git storage health information has been reset" msgstr "" @@ -684,6 +904,9 @@ msgstr "自分のフォークへ移動" msgid "GoToYourFork|Fork" msgstr "フォーク" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." +msgstr "" + msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgstr "" @@ -726,28 +949,53 @@ msgstr "" msgid "HealthCheck|Unhealthy" msgstr "" +msgid "History" +msgstr "" + msgid "Housekeeping successfully started" msgstr "ハウスキーピングは正常に起動しました。" msgid "Import repository" msgstr "レポジトリーをインポート" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "" + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "" + msgid "Install a Runner compatible with GitLab CI" msgstr "" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "" + msgid "Interval Pattern" msgstr "間隔のパターン" msgid "Introducing Cycle Analytics" msgstr "サイクル分析のご紹介" +msgid "Issue board focus mode" +msgstr "" + +msgid "Issue boards with milestones" +msgstr "" + msgid "Issue events" msgstr "" -msgid "Issues" +msgid "IssueBoards|Board" +msgstr "" + +msgid "IssueBoards|Boards" msgstr "" -msgid "Jobs" +msgid "Issues" msgstr "" msgid "LFSStatus|Disabled" @@ -766,12 +1014,21 @@ msgstr[0] "過去%d日間" msgid "Last Pipeline" msgstr "最新パイプライン" -msgid "Last Update" -msgstr "最新アップデート" - msgid "Last commit" msgstr "最新コミット" +msgid "Last edited %{date}" +msgstr "" + +msgid "Last edited by %{name}" +msgstr "" + +msgid "Last update" +msgstr "" + +msgid "Last updated" +msgstr "" + msgid "LastPushEvent|You pushed to" msgstr "" @@ -797,6 +1054,12 @@ msgid "Limited to showing %d event at most" msgid_plural "Limited to showing %d events at most" msgstr[0] "イベント表示数を最大 %d 個に制限" +msgid "Lock" +msgstr "" + +msgid "Locked" +msgstr "" + msgid "Locked Files" msgstr "" @@ -827,6 +1090,9 @@ msgstr "" msgid "More information is available|here" msgstr "" +msgid "Multiple issue boards" +msgstr "" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "新規課題" @@ -858,12 +1124,18 @@ msgstr "新規スニペット" msgid "New tag" msgstr "新規タグ" +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "レポジトリーはありません" msgid "No schedules" msgstr "スケジュールなし" +msgid "None" +msgstr "" + msgid "Not available" msgstr "利用できません" @@ -930,9 +1202,15 @@ msgstr "" msgid "OfSearchInADropdown|Filter" msgstr "フィルター" +msgid "Only project members can comment." +msgstr "" + msgid "OpenedNDaysAgo|Opened" msgstr "オープンされたのは" +msgid "Opens in a new window" +msgstr "" + msgid "Options" msgstr "オプション" @@ -957,6 +1235,9 @@ msgstr "" msgid "Password" msgstr "" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "" + msgid "Pipeline" msgstr "パイプライン" @@ -1116,6 +1397,21 @@ msgstr "ステージ" msgid "ProjectNetworkGraph|Graph" msgstr "ネットワークグラフ" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "" @@ -1206,6 +1502,9 @@ msgstr "このマージリクエストをリバート" msgid "SSH Keys" msgstr "" +msgid "Save changes" +msgstr "" + msgid "Save pipeline schedule" msgstr "パイプラインスケジュールを保存" @@ -1227,9 +1526,6 @@ msgstr "アーカイブのフォーマットを選択" msgid "Select a timezone" msgstr "タイムゾーンを選択" -msgid "Select existing branch" -msgstr "" - msgid "Select target branch" msgstr "ターゲットブランチを選択" @@ -1267,6 +1563,18 @@ msgstr[0] "%d のイベントを表示中" msgid "Snippets" msgstr "" +msgid "Something went wrong on our end." +msgstr "" + +msgid "Something went wrong while fetching the projects." +msgstr "" + +msgid "Something went wrong while fetching the registry list." +msgstr "" + +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" +msgstr "" + msgid "SortOptions|Access level, ascending" msgstr "" @@ -1403,6 +1711,12 @@ msgstr "ターゲットブランチ" msgid "Team" msgstr "" +msgid "Thanks! Don't show me this again" +msgstr "" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "コーディングステージでは、最初のコミットからマージリクエストが作成されるまでの時間が表示されます。このデータは最初のマージリクエストが作成されたときに自動的に追加されます。" @@ -1454,12 +1768,24 @@ msgstr "得られた一連のデータを小さい順に並べたときに中央 msgid "There are problems accessing Git storage: " msgstr "" -msgid "This is the author's first Merge Request to this project. Handle with care." +msgid "This is a confidential issue." +msgstr "" + +msgid "This is the author's first Merge Request to this project." +msgstr "" + +msgid "This issue is confidential and locked." +msgstr "" + +msgid "This issue is locked." msgstr "" msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "空レポジトリーを作成または既存レポジトリーをインポートをしなければ、コードのプッシュはできません。" +msgid "This merge request is locked." +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "課題が計画されるまでの時間" @@ -1538,9 +1864,6 @@ msgstr "1ヶ月前" msgid "Timeago|a week ago" msgstr "1週間前" -msgid "Timeago|a while" -msgstr "しばらく前" - msgid "Timeago|a year ago" msgstr "1年前" @@ -1592,6 +1915,9 @@ msgstr "1週間以内" msgid "Timeago|in 1 year" msgstr "1年以内" +msgid "Timeago|in a while" +msgstr "" + msgid "Timeago|less than a minute ago" msgstr "1分未満" @@ -1612,9 +1938,33 @@ msgstr "合計時間" msgid "Total test time for all commits/merges" msgstr "すべてのコミット/マージの合計テスト時間" +msgid "Track activity with Contribution Analytics." +msgstr "" + +msgid "Unlock" +msgstr "" + +msgid "Unlocked" +msgstr "" + msgid "Unstar" msgstr "スターを外す" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "" + msgid "Upload New File" msgstr "新規ファイルをアップロード" @@ -1657,9 +2007,117 @@ msgstr "このデータを参照したいですか？アクセスするには管 msgid "We don't have enough data to show this stage." msgstr "データ不足のため、このステージの表示はできません。" +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "" + +msgid "Weight" +msgstr "" + msgid "Wiki" msgstr "" +msgid "WikiClone|Clone your wiki" +msgstr "" + +msgid "WikiClone|Git Access" +msgstr "" + +msgid "WikiClone|Install Gollum" +msgstr "" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "" + +msgid "WikiHistoricalPage|history" +msgstr "" + +msgid "WikiHistoricalPage|most recent version" +msgstr "" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "" + +msgid "WikiMarkdownDocs|documentation" +msgstr "" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "" + +msgid "WikiPageConflictMessage|the page" +msgstr "" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "" + +msgid "WikiPage|Page slug" +msgstr "" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "" + +msgid "Wiki|Create Page" +msgstr "" + +msgid "Wiki|Create page" +msgstr "" + +msgid "Wiki|Edit Page" +msgstr "" + +msgid "Wiki|Empty page" +msgstr "" + +msgid "Wiki|More Pages" +msgstr "" + +msgid "Wiki|New page" +msgstr "" + +msgid "Wiki|Page history" +msgstr "" + +msgid "Wiki|Page version" +msgstr "" + +msgid "Wiki|Pages" +msgstr "" + +msgid "Wiki|Wiki Pages" +msgstr "" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "" + msgid "Withdraw Access Request" msgstr "アクセスリクエストを取り消す" @@ -1708,6 +2166,9 @@ msgstr "%{set_password_link} でアカウントのパスワードがセットさ msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "%{add_ssh_key_link} をプロファイルに追加していないので、プロジェクトにソースコードをプッシュ、プルできません" +msgid "Your comment will not be visible to the public." +msgstr "" + msgid "Your name" msgstr "名前" @@ -1731,3 +2192,9 @@ msgid "parent" msgid_plural "parents" msgstr[0] "親" +msgid "to help your contributors communicate effectively!" +msgstr "" + +msgid "personal access token" +msgstr "" + diff --git a/locale/ko/gitlab.po b/locale/ko/gitlab.po index de4a13d3765..5a6c8ef9c7a 100644 --- a/locale/ko/gitlab.po +++ b/locale/ko/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:43-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:37-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: Korean\n" "Language: ko_KR\n" @@ -20,6 +20,10 @@ msgid "%d commit" msgid_plural "%d commits" msgstr[0] "%d 커밋" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "%s 추가 커밋은 성능 이슈를 방지하기 위해 생략되었습니다." @@ -53,6 +57,9 @@ msgstr[0] "%d 파이프라인" msgid "1st contribution!" msgstr "" +msgid "2FA enabled" +msgstr "" + msgid "A collection of graphs regarding Continuous Integration" msgstr "지속적인 통합에 관한 그래프 모음" @@ -77,12 +84,18 @@ msgstr "활성" msgid "Activity" msgstr "활동" +msgid "Add" +msgstr "" + msgid "Add Changelog" msgstr "변경 로그 추가" msgid "Add Contribution guide" msgstr "기여 가이드 추가" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "" + msgid "Add License" msgstr "라이선스 추가" @@ -128,25 +141,31 @@ msgstr "드래그 & 드롭 또는 %{upload_link}" msgid "Authentication Log" msgstr "" -msgid "Auto DevOps (Beta)" +msgid "Author" msgstr "" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." msgstr "" -msgid "Auto DevOps documentation" +msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." +msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." +msgid "AutoDevOps|Auto DevOps (Beta)" msgstr "" -msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." msgstr "" -msgid "AutoDevOps|Learn more in the" +msgid "AutoDevOps|Auto DevOps documentation" +msgstr "" + +msgid "AutoDevOps|Enable in settings" +msgstr "" + +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgstr "" msgid "Billing" @@ -164,6 +183,9 @@ msgstr "" msgid "BillingPlans|Customer Support" msgstr "" +msgid "BillingPlans|Downgrade" +msgstr "" + msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." msgstr "" @@ -200,12 +222,6 @@ msgstr "" msgid "BillingPlans|per user" msgstr "" -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" - msgid "Branch" msgid_plural "Branches" msgstr[0] "브랜치" @@ -327,12 +343,18 @@ msgstr "" msgid "CI configuration" msgstr "CI 설정" +msgid "CICD|Jobs" +msgstr "" + msgid "Cancel" msgstr "취소" msgid "Cancel edit" msgstr "" +msgid "Change Weight" +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "브랜치에서 Pick" @@ -360,6 +382,9 @@ msgstr "이 커밋을 Cherry-pick" msgid "Cherry-pick this merge request" msgstr "이 머지 리퀘스트를 Cherry-pick" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "취소됨" @@ -414,6 +439,135 @@ msgstr "건너 뜀" msgid "CiStatus|running" msgstr "실행 중" +msgid "Clone repository" +msgstr "" + +msgid "Close" +msgstr "" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "" @@ -421,6 +575,9 @@ msgid "Commit" msgid_plural "Commits" msgstr[0] "커밋" +msgid "Commit Message" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" msgstr "최근 30 건의 커밋 소요시간 (분)" @@ -448,6 +605,51 @@ msgstr "커밋한 사용자" msgid "Compare" msgstr "비교" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "기여에 대한 안내" @@ -466,9 +668,6 @@ msgstr "커밋의 SHA를 클립보드로 복사합니다" msgid "Create New Directory" msgstr "새 디렉토리 만들기" -msgid "Create a new branch" -msgstr "새 브랜치 생성" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "%{protocol}을 (를) 통해 Pull 하거나 Push 할 개인 액세스 토큰을 만드십시오." @@ -532,6 +731,12 @@ msgstr "스테이징" msgid "CycleAnalyticsStage|Test" msgstr "테스트" +msgid "DashboardProjects|All" +msgstr "" + +msgid "DashboardProjects|Personal" +msgstr "" + msgid "Define a custom pattern with cron syntax" msgstr "cron 구문을 사용하여 사용자 정의 패턴 정의" @@ -548,6 +753,9 @@ msgstr "" msgid "Description" msgstr "설명" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "" + msgid "Details" msgstr "상세" @@ -557,6 +765,9 @@ msgstr "디렉토리 이름" msgid "Discard changes" msgstr "변경 내용 취소" +msgid "Dismiss Merge Request promotion" +msgstr "" + msgid "Don't show again" msgstr "다시 표시하지 않음" @@ -596,9 +807,6 @@ msgstr "파이프라인 스케줄 편집 %{id}" msgid "Emails" msgstr "" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "모든 값을 기준으로 필터" @@ -660,6 +868,12 @@ msgstr[0] "포크" msgid "ForkedFromProjectPath|Forked from" msgstr "포크한 사용자" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "" + +msgid "Format" +msgstr "" + msgid "From issue creation until deploy to production" msgstr "이슈 생성에서 프로덕션 배포까지" @@ -672,6 +886,12 @@ msgstr "" msgid "Geo Nodes" msgstr "" +msgid "Geo|Groups to replicate" +msgstr "" + +msgid "Geo|Select groups to replicate." +msgstr "" + msgid "Git storage health information has been reset" msgstr "git storage 상태 정보가 초기화되었습니다." @@ -684,6 +904,9 @@ msgstr "당신의 포크로 이동하세요" msgid "GoToYourFork|Fork" msgstr "포크" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." +msgstr "" + msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgstr "" @@ -726,28 +949,53 @@ msgstr " 헬스 문제가 발견되지 않았습니다." msgid "HealthCheck|Unhealthy" msgstr "비정상" +msgid "History" +msgstr "" + msgid "Housekeeping successfully started" msgstr "Housekeeping이 성공적으로 시작되었습니다" msgid "Import repository" msgstr "저장소 가져 오기" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "" + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "" + msgid "Install a Runner compatible with GitLab CI" msgstr "GitLab CI 와 호환되는 Runner 설치" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "" + msgid "Interval Pattern" msgstr "주기 패턴" msgid "Introducing Cycle Analytics" msgstr "Cycle Analytics 소개" +msgid "Issue board focus mode" +msgstr "" + +msgid "Issue boards with milestones" +msgstr "" + msgid "Issue events" msgstr "이슈 이벤트" -msgid "Issues" +msgid "IssueBoards|Board" +msgstr "" + +msgid "IssueBoards|Boards" msgstr "" -msgid "Jobs" +msgid "Issues" msgstr "" msgid "LFSStatus|Disabled" @@ -766,12 +1014,21 @@ msgstr[0] "최근 %d 일" msgid "Last Pipeline" msgstr "최근 파이프라인" -msgid "Last Update" -msgstr "최근 업데이트" - msgid "Last commit" msgstr "최근 커밋" +msgid "Last edited %{date}" +msgstr "" + +msgid "Last edited by %{name}" +msgstr "" + +msgid "Last update" +msgstr "" + +msgid "Last updated" +msgstr "" + msgid "LastPushEvent|You pushed to" msgstr "푸쉬: " @@ -797,6 +1054,12 @@ msgid "Limited to showing %d event at most" msgid_plural "Limited to showing %d events at most" msgstr[0] "최대 %d 이벤트 만 표시하는 것으로 제한됩니다." +msgid "Lock" +msgstr "" + +msgid "Locked" +msgstr "" + msgid "Locked Files" msgstr "" @@ -827,6 +1090,9 @@ msgstr "" msgid "More information is available|here" msgstr "여기" +msgid "Multiple issue boards" +msgstr "" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "새 이슈" @@ -858,12 +1124,18 @@ msgstr "새 스니펫" msgid "New tag" msgstr "새 태그 " +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "저장소 없음" msgid "No schedules" msgstr "일정 없음" +msgid "None" +msgstr "" + msgid "Not available" msgstr "사용할 수 없음" @@ -930,9 +1202,15 @@ msgstr "" msgid "OfSearchInADropdown|Filter" msgstr "필터" +msgid "Only project members can comment." +msgstr "" + msgid "OpenedNDaysAgo|Opened" msgstr "열린" +msgid "Opens in a new window" +msgstr "" + msgid "Options" msgstr "옵션 " @@ -957,6 +1235,9 @@ msgstr "" msgid "Password" msgstr "" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "" + msgid "Pipeline" msgstr "파이프라인" @@ -1116,6 +1397,21 @@ msgstr "스테이징" msgid "ProjectNetworkGraph|Graph" msgstr "그래프" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "" @@ -1206,6 +1502,9 @@ msgstr "이 머지 리퀘스트 되돌리기" msgid "SSH Keys" msgstr "" +msgid "Save changes" +msgstr "" + msgid "Save pipeline schedule" msgstr "파이프라인 스케줄 저장" @@ -1227,9 +1526,6 @@ msgstr "아카이브 포맷 선택" msgid "Select a timezone" msgstr "시간대 선택" -msgid "Select existing branch" -msgstr "" - msgid "Select target branch" msgstr "대상 브랜치 선택" @@ -1267,6 +1563,18 @@ msgstr[0] "%d 개의 이벤트 표시 중" msgid "Snippets" msgstr "" +msgid "Something went wrong on our end." +msgstr "" + +msgid "Something went wrong while fetching the projects." +msgstr "" + +msgid "Something went wrong while fetching the registry list." +msgstr "" + +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" +msgstr "" + msgid "SortOptions|Access level, ascending" msgstr "" @@ -1403,6 +1711,12 @@ msgstr "대상 브랜치" msgid "Team" msgstr "" +msgid "Thanks! Don't show me this again" +msgstr "" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "Coding Stage는 첫 번째 커밋에서부터 머지 리퀘스트 생성까지의 시간을 보여줍니다. 첫 번째 머지 리퀘스트을 생성하면 데이터가 자동으로 여기에 추가됩니다." @@ -1454,12 +1768,24 @@ msgstr "값은 일련의 관측 값 중점에 있습니다. 예를 들어, 3, 5, msgid "There are problems accessing Git storage: " msgstr "git storage에 접근하는데 문제가 발생했습니다. " -msgid "This is the author's first Merge Request to this project. Handle with care." +msgid "This is a confidential issue." +msgstr "" + +msgid "This is the author's first Merge Request to this project." +msgstr "" + +msgid "This issue is confidential and locked." +msgstr "" + +msgid "This issue is locked." msgstr "" msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "즉, 빈 저장소를 만들거나 기존 저장소를 가져올 때까지 코드를 Push 할 수 없습니다." +msgid "This merge request is locked." +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "이슈가 스케줄되기 전의 시간" @@ -1538,9 +1864,6 @@ msgstr "1 달 전" msgid "Timeago|a week ago" msgstr "1 주일 전" -msgid "Timeago|a while" -msgstr "잠시 전" - msgid "Timeago|a year ago" msgstr "1 년 전" @@ -1592,6 +1915,9 @@ msgstr "1 주일 이내" msgid "Timeago|in 1 year" msgstr "1 년 이내" +msgid "Timeago|in a while" +msgstr "" + msgid "Timeago|less than a minute ago" msgstr "1 분미만" @@ -1612,9 +1938,33 @@ msgstr "시간 합계:" msgid "Total test time for all commits/merges" msgstr "모든 커밋 / 머지의 총 테스트 시간" +msgid "Track activity with Contribution Analytics." +msgstr "" + +msgid "Unlock" +msgstr "" + +msgid "Unlocked" +msgstr "" + msgid "Unstar" msgstr "별표 제거" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "" + msgid "Upload New File" msgstr "새 파일 업로드" @@ -1657,9 +2007,117 @@ msgstr "이 데이터를 보고 싶은가요? 관리자에게 액세스 권한 msgid "We don't have enough data to show this stage." msgstr "이 단계를 보여주기에 충분한 데이터가 없습니다." +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "" + +msgid "Weight" +msgstr "" + msgid "Wiki" msgstr "" +msgid "WikiClone|Clone your wiki" +msgstr "" + +msgid "WikiClone|Git Access" +msgstr "" + +msgid "WikiClone|Install Gollum" +msgstr "" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "" + +msgid "WikiHistoricalPage|history" +msgstr "" + +msgid "WikiHistoricalPage|most recent version" +msgstr "" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "" + +msgid "WikiMarkdownDocs|documentation" +msgstr "" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "" + +msgid "WikiPageConflictMessage|the page" +msgstr "" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "" + +msgid "WikiPage|Page slug" +msgstr "" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "" + +msgid "Wiki|Create Page" +msgstr "" + +msgid "Wiki|Create page" +msgstr "" + +msgid "Wiki|Edit Page" +msgstr "" + +msgid "Wiki|Empty page" +msgstr "" + +msgid "Wiki|More Pages" +msgstr "" + +msgid "Wiki|New page" +msgstr "" + +msgid "Wiki|Page history" +msgstr "" + +msgid "Wiki|Page version" +msgstr "" + +msgid "Wiki|Pages" +msgstr "" + +msgid "Wiki|Wiki Pages" +msgstr "" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "" + msgid "Withdraw Access Request" msgstr "액세스 요청 철회" @@ -1708,6 +2166,9 @@ msgstr "당신의 계정에 %{set_password_link} 을 하기 전에는 %{protocol msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "당신의 프로필에 %{add_ssh_key_link} 를 하기 전에는 SSH를 통해 프로젝트 코드를 Pull 하거나 Push 할 수 없습니다" +msgid "Your comment will not be visible to the public." +msgstr "" + msgid "Your name" msgstr "귀하의 이름" @@ -1731,3 +2192,9 @@ msgid "parent" msgid_plural "parents" msgstr[0] "부모" +msgid "to help your contributors communicate effectively!" +msgstr "" + +msgid "personal access token" +msgstr "" + diff --git a/locale/nl_NL/gitlab.po b/locale/nl_NL/gitlab.po index 45a444fac43..fc7bbc79899 100644 --- a/locale/nl_NL/gitlab.po +++ b/locale/nl_NL/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:43-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:37-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: Dutch\n" "Language: nl_NL\n" @@ -21,6 +21,11 @@ msgid_plural "%d commits" msgstr[0] "%d commit" msgstr[1] "%d commits" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" +msgstr[1] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "%s andere commit is weggelaten om prestatieproblemen te voorkomen." @@ -57,6 +62,9 @@ msgstr[1] "" msgid "1st contribution!" msgstr "" +msgid "2FA enabled" +msgstr "" + msgid "A collection of graphs regarding Continuous Integration" msgstr "" @@ -81,12 +89,18 @@ msgstr "Actief" msgid "Activity" msgstr "Activiteit" +msgid "Add" +msgstr "Voeg toe" + msgid "Add Changelog" msgstr "Changelog toevoegen" msgid "Add Contribution guide" msgstr "" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "" + msgid "Add License" msgstr "Licentie toevoegen" @@ -100,7 +114,7 @@ msgid "All" msgstr "Alles" msgid "Appearance" -msgstr "" +msgstr "Uiterlijk" msgid "Applications" msgstr "Applicaties" @@ -132,30 +146,36 @@ msgstr "" msgid "Authentication Log" msgstr "" -msgid "Auto DevOps (Beta)" +msgid "Author" +msgstr "Auteur" + +msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." msgstr "" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." msgstr "" -msgid "Auto DevOps documentation" +msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps (Beta)" msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." msgstr "" -msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps documentation" msgstr "" -msgid "AutoDevOps|Learn more in the" +msgid "AutoDevOps|Enable in settings" msgstr "" -msgid "Billing" +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgstr "" +msgid "Billing" +msgstr "Facturatie" + msgid "BillingPlans|%{group_name} is currently on the %{plan_link} plan." msgstr "" @@ -168,6 +188,9 @@ msgstr "" msgid "BillingPlans|Customer Support" msgstr "" +msgid "BillingPlans|Downgrade" +msgstr "" + msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." msgstr "" @@ -204,12 +227,6 @@ msgstr "" msgid "BillingPlans|per user" msgstr "" -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" - msgid "Branch" msgid_plural "Branches" msgstr[0] "" @@ -219,19 +236,19 @@ msgid "Branch <strong>%{branch_name}</strong> was created. To set up auto deploy msgstr "" msgid "BranchSwitcherPlaceholder|Search branches" -msgstr "" +msgstr "BranchSwitcherPlaceholder|Zoek branches" msgid "BranchSwitcherTitle|Switch branch" -msgstr "" +msgstr "BranchSwitcherTitle|Ga naar branch" msgid "Branches" msgstr "Branches" msgid "Branches|Cant find HEAD commit for this branch" -msgstr "" +msgstr "Branches|Kan geen HEAD-commit vinden voor deze branch" msgid "Branches|Compare" -msgstr "" +msgstr "Branches|Vergelijk" msgid "Branches|Delete all branches that are merged into '%{default_branch}'" msgstr "" @@ -332,12 +349,18 @@ msgstr "CI / CD" msgid "CI configuration" msgstr "CI Configuratie" +msgid "CICD|Jobs" +msgstr "" + msgid "Cancel" msgstr "Annuleren" msgid "Cancel edit" msgstr "Bewerken annuleren" +msgid "Change Weight" +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "" @@ -365,6 +388,9 @@ msgstr "Cherry-pick deze commit" msgid "Cherry-pick this merge request" msgstr "" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "geannuleerd" @@ -419,6 +445,135 @@ msgstr "overgeslagen" msgid "CiStatus|running" msgstr "" +msgid "Clone repository" +msgstr "" + +msgid "Close" +msgstr "" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "Opmerkingen" @@ -427,6 +582,9 @@ msgid_plural "Commits" msgstr[0] "" msgstr[1] "" +msgid "Commit Message" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" msgstr "" @@ -454,6 +612,51 @@ msgstr "Gecommit door" msgid "Compare" msgstr "Vergelijk" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "" @@ -472,9 +675,6 @@ msgstr "" msgid "Create New Directory" msgstr "" -msgid "Create a new branch" -msgstr "" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "" @@ -518,7 +718,7 @@ msgid "Cycle Analytics gives an overview of how much time it takes to go from id msgstr "" msgid "CycleAnalyticsStage|Code" -msgstr "" +msgstr "Code" msgid "CycleAnalyticsStage|Issue" msgstr "" @@ -527,7 +727,7 @@ msgid "CycleAnalyticsStage|Plan" msgstr "" msgid "CycleAnalyticsStage|Production" -msgstr "" +msgstr "Productie" msgid "CycleAnalyticsStage|Review" msgstr "" @@ -538,6 +738,12 @@ msgstr "" msgid "CycleAnalyticsStage|Test" msgstr "" +msgid "DashboardProjects|All" +msgstr "" + +msgid "DashboardProjects|Personal" +msgstr "" + msgid "Define a custom pattern with cron syntax" msgstr "" @@ -555,6 +761,9 @@ msgstr "" msgid "Description" msgstr "" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "" + msgid "Details" msgstr "" @@ -564,6 +773,9 @@ msgstr "" msgid "Discard changes" msgstr "" +msgid "Dismiss Merge Request promotion" +msgstr "" + msgid "Don't show again" msgstr "" @@ -603,9 +815,6 @@ msgstr "" msgid "Emails" msgstr "" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "" @@ -668,6 +877,12 @@ msgstr[1] "" msgid "ForkedFromProjectPath|Forked from" msgstr "" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "" + +msgid "Format" +msgstr "" + msgid "From issue creation until deploy to production" msgstr "" @@ -680,6 +895,12 @@ msgstr "" msgid "Geo Nodes" msgstr "" +msgid "Geo|Groups to replicate" +msgstr "" + +msgid "Geo|Select groups to replicate." +msgstr "" + msgid "Git storage health information has been reset" msgstr "" @@ -692,6 +913,9 @@ msgstr "" msgid "GoToYourFork|Fork" msgstr "" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." +msgstr "" + msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgstr "" @@ -734,28 +958,54 @@ msgstr "" msgid "HealthCheck|Unhealthy" msgstr "" +msgid "History" +msgstr "" + msgid "Housekeeping successfully started" msgstr "" msgid "Import repository" msgstr "" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "" + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "" + msgid "Install a Runner compatible with GitLab CI" msgstr "" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "" +msgstr[1] "" + msgid "Interval Pattern" msgstr "" msgid "Introducing Cycle Analytics" msgstr "" +msgid "Issue board focus mode" +msgstr "" + +msgid "Issue boards with milestones" +msgstr "" + msgid "Issue events" msgstr "" -msgid "Issues" +msgid "IssueBoards|Board" msgstr "" -msgid "Jobs" +msgid "IssueBoards|Boards" +msgstr "" + +msgid "Issues" msgstr "" msgid "LFSStatus|Disabled" @@ -775,10 +1025,19 @@ msgstr[1] "" msgid "Last Pipeline" msgstr "" -msgid "Last Update" +msgid "Last commit" msgstr "" -msgid "Last commit" +msgid "Last edited %{date}" +msgstr "" + +msgid "Last edited by %{name}" +msgstr "" + +msgid "Last update" +msgstr "" + +msgid "Last updated" msgstr "" msgid "LastPushEvent|You pushed to" @@ -807,6 +1066,12 @@ msgid_plural "Limited to showing %d events at most" msgstr[0] "" msgstr[1] "" +msgid "Lock" +msgstr "" + +msgid "Locked" +msgstr "" + msgid "Locked Files" msgstr "" @@ -837,6 +1102,9 @@ msgstr "" msgid "More information is available|here" msgstr "" +msgid "Multiple issue boards" +msgstr "" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "Nieuwe issue" @@ -869,12 +1137,18 @@ msgstr "" msgid "New tag" msgstr "" +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "" msgid "No schedules" msgstr "" +msgid "None" +msgstr "" + msgid "Not available" msgstr "" @@ -941,7 +1215,13 @@ msgstr "" msgid "OfSearchInADropdown|Filter" msgstr "" +msgid "Only project members can comment." +msgstr "" + msgid "OpenedNDaysAgo|Opened" +msgstr "Geopend" + +msgid "Opens in a new window" msgstr "" msgid "Options" @@ -968,6 +1248,9 @@ msgstr "" msgid "Password" msgstr "" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "" + msgid "Pipeline" msgstr "" @@ -1127,6 +1410,21 @@ msgstr "" msgid "ProjectNetworkGraph|Graph" msgstr "" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "" @@ -1217,6 +1515,9 @@ msgstr "" msgid "SSH Keys" msgstr "" +msgid "Save changes" +msgstr "" + msgid "Save pipeline schedule" msgstr "" @@ -1238,9 +1539,6 @@ msgstr "" msgid "Select a timezone" msgstr "" -msgid "Select existing branch" -msgstr "" - msgid "Select target branch" msgstr "" @@ -1279,6 +1577,18 @@ msgstr[1] "" msgid "Snippets" msgstr "" +msgid "Something went wrong on our end." +msgstr "" + +msgid "Something went wrong while fetching the projects." +msgstr "" + +msgid "Something went wrong while fetching the registry list." +msgstr "" + +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" +msgstr "" + msgid "SortOptions|Access level, ascending" msgstr "" @@ -1416,6 +1726,12 @@ msgstr "" msgid "Team" msgstr "" +msgid "Thanks! Don't show me this again" +msgstr "" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "" @@ -1467,12 +1783,24 @@ msgstr "" msgid "There are problems accessing Git storage: " msgstr "" -msgid "This is the author's first Merge Request to this project. Handle with care." +msgid "This is a confidential issue." +msgstr "" + +msgid "This is the author's first Merge Request to this project." +msgstr "" + +msgid "This issue is confidential and locked." +msgstr "" + +msgid "This issue is locked." msgstr "" msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "" +msgid "This merge request is locked." +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "" @@ -1551,9 +1879,6 @@ msgstr "" msgid "Timeago|a week ago" msgstr "" -msgid "Timeago|a while" -msgstr "" - msgid "Timeago|a year ago" msgstr "" @@ -1605,6 +1930,9 @@ msgstr "" msgid "Timeago|in 1 year" msgstr "" +msgid "Timeago|in a while" +msgstr "" + msgid "Timeago|less than a minute ago" msgstr "" @@ -1619,7 +1947,7 @@ msgstr[0] "" msgstr[1] "" msgid "Time|s" -msgstr "" +msgstr "s" msgid "Total Time" msgstr "" @@ -1627,9 +1955,33 @@ msgstr "" msgid "Total test time for all commits/merges" msgstr "" +msgid "Track activity with Contribution Analytics." +msgstr "" + +msgid "Unlock" +msgstr "" + +msgid "Unlocked" +msgstr "" + msgid "Unstar" msgstr "" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "" + msgid "Upload New File" msgstr "" @@ -1658,7 +2010,7 @@ msgid "VisibilityLevel|Internal" msgstr "" msgid "VisibilityLevel|Private" -msgstr "" +msgstr "Privé" msgid "VisibilityLevel|Public" msgstr "" @@ -1672,9 +2024,117 @@ msgstr "" msgid "We don't have enough data to show this stage." msgstr "" +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "" + +msgid "Weight" +msgstr "" + msgid "Wiki" msgstr "" +msgid "WikiClone|Clone your wiki" +msgstr "" + +msgid "WikiClone|Git Access" +msgstr "" + +msgid "WikiClone|Install Gollum" +msgstr "" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "" + +msgid "WikiHistoricalPage|history" +msgstr "" + +msgid "WikiHistoricalPage|most recent version" +msgstr "" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "" + +msgid "WikiMarkdownDocs|documentation" +msgstr "" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "" + +msgid "WikiPageConflictMessage|the page" +msgstr "" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "" + +msgid "WikiPage|Page slug" +msgstr "" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "" + +msgid "Wiki|Create Page" +msgstr "" + +msgid "Wiki|Create page" +msgstr "" + +msgid "Wiki|Edit Page" +msgstr "" + +msgid "Wiki|Empty page" +msgstr "" + +msgid "Wiki|More Pages" +msgstr "" + +msgid "Wiki|New page" +msgstr "" + +msgid "Wiki|Page history" +msgstr "" + +msgid "Wiki|Page version" +msgstr "" + +msgid "Wiki|Pages" +msgstr "" + +msgid "Wiki|Wiki Pages" +msgstr "" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "" + msgid "Withdraw Access Request" msgstr "" @@ -1723,6 +2183,9 @@ msgstr "" msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "" +msgid "Your comment will not be visible to the public." +msgstr "" + msgid "Your name" msgstr "" @@ -1748,3 +2211,9 @@ msgid_plural "parents" msgstr[0] "" msgstr[1] "" +msgid "to help your contributors communicate effectively!" +msgstr "" + +msgid "personal access token" +msgstr "" + diff --git a/locale/pt_BR/gitlab.po b/locale/pt_BR/gitlab.po index 318c719c2ed..e6ba0c8cf9a 100644 --- a/locale/pt_BR/gitlab.po +++ b/locale/pt_BR/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:42-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:37-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" @@ -21,6 +21,11 @@ msgid_plural "%d commits" msgstr[0] "" msgstr[1] "" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" +msgstr[1] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "%s commit adicional foi omitido para prevenir problemas de performance." @@ -57,6 +62,9 @@ msgstr[1] "" msgid "1st contribution!" msgstr "" +msgid "2FA enabled" +msgstr "" + msgid "A collection of graphs regarding Continuous Integration" msgstr "Uma coleção de gráficos sobre Integração Contínua" @@ -81,12 +89,18 @@ msgstr "Ativo" msgid "Activity" msgstr "Atividade" +msgid "Add" +msgstr "" + msgid "Add Changelog" msgstr "Adicionar registro de mudanças" msgid "Add Contribution guide" msgstr "Adicionar Guia de contribuição" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "" + msgid "Add License" msgstr "Adicionar Licença" @@ -132,25 +146,31 @@ msgstr "Para anexar arquivo, arraste e solte ou %{upload_link}" msgid "Authentication Log" msgstr "" -msgid "Auto DevOps (Beta)" +msgid "Author" +msgstr "" + +msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." msgstr "" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." msgstr "" -msgid "Auto DevOps documentation" +msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps (Beta)" msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." msgstr "" -msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps documentation" msgstr "" -msgid "AutoDevOps|Learn more in the" +msgid "AutoDevOps|Enable in settings" +msgstr "" + +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgstr "" msgid "Billing" @@ -168,6 +188,9 @@ msgstr "" msgid "BillingPlans|Customer Support" msgstr "" +msgid "BillingPlans|Downgrade" +msgstr "" + msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." msgstr "" @@ -204,12 +227,6 @@ msgstr "" msgid "BillingPlans|per user" msgstr "" -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" - msgid "Branch" msgid_plural "Branches" msgstr[0] "" @@ -332,12 +349,18 @@ msgstr "" msgid "CI configuration" msgstr "Configuração da IC" +msgid "CICD|Jobs" +msgstr "" + msgid "Cancel" msgstr "Cancelar" msgid "Cancel edit" msgstr "" +msgid "Change Weight" +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "Pick para um branch" @@ -365,6 +388,9 @@ msgstr "Cherry-pick esse commit" msgid "Cherry-pick this merge request" msgstr "Cherry-pick esse merge request" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "cancelado" @@ -419,6 +445,135 @@ msgstr "ignorado" msgid "CiStatus|running" msgstr "executando" +msgid "Clone repository" +msgstr "" + +msgid "Close" +msgstr "" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "" @@ -427,6 +582,9 @@ msgid_plural "Commits" msgstr[0] "" msgstr[1] "" +msgid "Commit Message" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" msgstr "Duração do commit em minutos para os últimos 30 commits" @@ -454,6 +612,51 @@ msgstr "Commit feito por" msgid "Compare" msgstr "Comparar" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "Guia de contribuição" @@ -472,9 +675,6 @@ msgstr "Copiar SHA do commit para a área de transferência" msgid "Create New Directory" msgstr "Criar Novo Diretório" -msgid "Create a new branch" -msgstr "" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "Crie um token de acesso pessoal na sua conta para dar pull ou push via %{protocol}." @@ -538,6 +738,12 @@ msgstr "Homologação" msgid "CycleAnalyticsStage|Test" msgstr "Teste" +msgid "DashboardProjects|All" +msgstr "" + +msgid "DashboardProjects|Personal" +msgstr "" + msgid "Define a custom pattern with cron syntax" msgstr "Defina um padrão personalizado utilizando a sintaxe do cron" @@ -555,6 +761,9 @@ msgstr "" msgid "Description" msgstr "Descrição" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "" + msgid "Details" msgstr "" @@ -564,6 +773,9 @@ msgstr "Nome do diretório" msgid "Discard changes" msgstr "" +msgid "Dismiss Merge Request promotion" +msgstr "" + msgid "Don't show again" msgstr "Não exibir novamente" @@ -603,9 +815,6 @@ msgstr "Alterar Agendamento do Pipeline %{id}" msgid "Emails" msgstr "" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "" @@ -668,6 +877,12 @@ msgstr[1] "" msgid "ForkedFromProjectPath|Forked from" msgstr "Fork criado a partir de" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "" + +msgid "Format" +msgstr "" + msgid "From issue creation until deploy to production" msgstr "Da abertura de tarefas até a implantação para a produção" @@ -680,6 +895,12 @@ msgstr "" msgid "Geo Nodes" msgstr "" +msgid "Geo|Groups to replicate" +msgstr "" + +msgid "Geo|Select groups to replicate." +msgstr "" + msgid "Git storage health information has been reset" msgstr "" @@ -692,6 +913,9 @@ msgstr "Ir para seu fork" msgid "GoToYourFork|Fork" msgstr "Fork" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." +msgstr "" + msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgstr "" @@ -734,28 +958,54 @@ msgstr "" msgid "HealthCheck|Unhealthy" msgstr "" +msgid "History" +msgstr "" + msgid "Housekeeping successfully started" msgstr "Manutenção iniciada com sucesso" msgid "Import repository" msgstr "Importar repositório" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "" + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "" + msgid "Install a Runner compatible with GitLab CI" msgstr "" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "" +msgstr[1] "" + msgid "Interval Pattern" msgstr "Padrão de intervalo" msgid "Introducing Cycle Analytics" msgstr "Apresentando a Análise de Ciclo" +msgid "Issue board focus mode" +msgstr "" + +msgid "Issue boards with milestones" +msgstr "" + msgid "Issue events" msgstr "" -msgid "Issues" +msgid "IssueBoards|Board" msgstr "" -msgid "Jobs" +msgid "IssueBoards|Boards" +msgstr "" + +msgid "Issues" msgstr "" msgid "LFSStatus|Disabled" @@ -775,12 +1025,21 @@ msgstr[1] "Últimos %d dias" msgid "Last Pipeline" msgstr "Último Pipeline" -msgid "Last Update" -msgstr "Última Atualização" - msgid "Last commit" msgstr "Último commit" +msgid "Last edited %{date}" +msgstr "" + +msgid "Last edited by %{name}" +msgstr "" + +msgid "Last update" +msgstr "" + +msgid "Last updated" +msgstr "" + msgid "LastPushEvent|You pushed to" msgstr "" @@ -807,6 +1066,12 @@ msgid_plural "Limited to showing %d events at most" msgstr[0] "Limitado a mostrar %d evento, no máximo" msgstr[1] "Limitado a mostrar %d eventos, no máximo" +msgid "Lock" +msgstr "" + +msgid "Locked" +msgstr "" + msgid "Locked Files" msgstr "" @@ -837,6 +1102,9 @@ msgstr "" msgid "More information is available|here" msgstr "" +msgid "Multiple issue boards" +msgstr "" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "Nova Issue" @@ -869,12 +1137,18 @@ msgstr "Novo snippet" msgid "New tag" msgstr "Nova tag" +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "Nenhum repositório" msgid "No schedules" msgstr "Nenhum agendamento" +msgid "None" +msgstr "" + msgid "Not available" msgstr "Não disponível" @@ -941,9 +1215,15 @@ msgstr "" msgid "OfSearchInADropdown|Filter" msgstr "Filtrar" +msgid "Only project members can comment." +msgstr "" + msgid "OpenedNDaysAgo|Opened" msgstr "Aberto" +msgid "Opens in a new window" +msgstr "" + msgid "Options" msgstr "Opções" @@ -968,6 +1248,9 @@ msgstr "" msgid "Password" msgstr "" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "" + msgid "Pipeline" msgstr "" @@ -1127,6 +1410,21 @@ msgstr "Etapa" msgid "ProjectNetworkGraph|Graph" msgstr "Árvore" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "" @@ -1217,6 +1515,9 @@ msgstr "Reverter esse merge request" msgid "SSH Keys" msgstr "" +msgid "Save changes" +msgstr "" + msgid "Save pipeline schedule" msgstr "Salvar agendamento da pipeline" @@ -1238,9 +1539,6 @@ msgstr "Selecionar Formato do Arquivo" msgid "Select a timezone" msgstr "Selecionar fuso horário" -msgid "Select existing branch" -msgstr "" - msgid "Select target branch" msgstr "Selecionar branch de destino" @@ -1279,6 +1577,18 @@ msgstr[1] "Mostrando %d eventos" msgid "Snippets" msgstr "" +msgid "Something went wrong on our end." +msgstr "" + +msgid "Something went wrong while fetching the projects." +msgstr "" + +msgid "Something went wrong while fetching the registry list." +msgstr "" + +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" +msgstr "" + msgid "SortOptions|Access level, ascending" msgstr "" @@ -1416,6 +1726,12 @@ msgstr "Branch de destino" msgid "Team" msgstr "" +msgid "Thanks! Don't show me this again" +msgstr "" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "A etapa de codificação mostra o tempo desde a entrega do primeiro commit até a criação do merge request. Os dados serão automaticamente adicionados aqui desde o momento de criação do merge request." @@ -1467,12 +1783,24 @@ msgstr "O valor situado no ponto médio de uma série de valores observados. Ex. msgid "There are problems accessing Git storage: " msgstr "" -msgid "This is the author's first Merge Request to this project. Handle with care." +msgid "This is a confidential issue." +msgstr "" + +msgid "This is the author's first Merge Request to this project." +msgstr "" + +msgid "This issue is confidential and locked." +msgstr "" + +msgid "This issue is locked." msgstr "" msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "Isto significa que você não pode entregar código até que crie um repositório vazio ou importe um existente." +msgid "This merge request is locked." +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "Tempo até que uma issue seja agendada" @@ -1551,9 +1879,6 @@ msgstr "há um mês" msgid "Timeago|a week ago" msgstr "há uma semana" -msgid "Timeago|a while" -msgstr "há algum tempo" - msgid "Timeago|a year ago" msgstr "há um ano" @@ -1605,6 +1930,9 @@ msgstr "em 1 semana" msgid "Timeago|in 1 year" msgstr "em 1 ano" +msgid "Timeago|in a while" +msgstr "" + msgid "Timeago|less than a minute ago" msgstr "há menos de um minuto" @@ -1627,9 +1955,33 @@ msgstr "Tempo Total" msgid "Total test time for all commits/merges" msgstr "Tempo de teste total para todos os commits/merges" +msgid "Track activity with Contribution Analytics." +msgstr "" + +msgid "Unlock" +msgstr "" + +msgid "Unlocked" +msgstr "" + msgid "Unstar" msgstr "Desmarcar" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "" + msgid "Upload New File" msgstr "Enviar Novo Arquivo" @@ -1672,9 +2024,117 @@ msgstr "Precisa visualizar os dados? Solicite acesso ao administrador." msgid "We don't have enough data to show this stage." msgstr "Esta etapa não possui dados suficientes para exibição." +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "" + +msgid "Weight" +msgstr "" + msgid "Wiki" msgstr "" +msgid "WikiClone|Clone your wiki" +msgstr "" + +msgid "WikiClone|Git Access" +msgstr "" + +msgid "WikiClone|Install Gollum" +msgstr "" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "" + +msgid "WikiHistoricalPage|history" +msgstr "" + +msgid "WikiHistoricalPage|most recent version" +msgstr "" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "" + +msgid "WikiMarkdownDocs|documentation" +msgstr "" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "" + +msgid "WikiPageConflictMessage|the page" +msgstr "" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "" + +msgid "WikiPage|Page slug" +msgstr "" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "" + +msgid "Wiki|Create Page" +msgstr "" + +msgid "Wiki|Create page" +msgstr "" + +msgid "Wiki|Edit Page" +msgstr "" + +msgid "Wiki|Empty page" +msgstr "" + +msgid "Wiki|More Pages" +msgstr "" + +msgid "Wiki|New page" +msgstr "" + +msgid "Wiki|Page history" +msgstr "" + +msgid "Wiki|Page version" +msgstr "" + +msgid "Wiki|Pages" +msgstr "" + +msgid "Wiki|Wiki Pages" +msgstr "" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "" + msgid "Withdraw Access Request" msgstr "Remover Requisição de Acesso" @@ -1723,6 +2183,9 @@ msgstr "Você não poderá fazer pull ou push via %{protocol} até que %{set_pas msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "Você não conseguirá fazer pull ou push no projeto via SSH até que adicione %{add_ssh_key_link} ao seu perfil" +msgid "Your comment will not be visible to the public." +msgstr "" + msgid "Your name" msgstr "Seu nome" @@ -1748,3 +2211,9 @@ msgid_plural "parents" msgstr[0] "pai" msgstr[1] "pais" +msgid "to help your contributors communicate effectively!" +msgstr "" + +msgid "personal access token" +msgstr "" + diff --git a/locale/ru/gitlab.po b/locale/ru/gitlab.po index 507dc187cdb..7e1f23178b9 100644 --- a/locale/ru/gitlab.po +++ b/locale/ru/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:43-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:37-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: Russian\n" "Language: ru_RU\n" @@ -22,6 +22,12 @@ msgstr[0] "%d коммит" msgstr[1] "%d коммитов" msgstr[2] "%d коммитов" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "%s добавленный коммит был исключен для предотвращения проблем с производительностью." @@ -29,13 +35,13 @@ msgstr[1] "%s добавленные коммиты были исключены msgstr[2] "%s добавленные коммиты были исключены для предотвращения проблем с производительностью." msgid "%{commit_author_link} committed %{commit_timeago}" -msgstr "%{commit_author_link} коммичено %{commit_timeago}" +msgstr "%{commit_author_link} добавил коммит %{commit_timeago}" msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead" -msgstr "" +msgstr "на %{number_commits_behind} коммитов позади %{default_branch}, на %{number_commits_ahead} коммитов впереди" msgid "%{number_of_failures} of %{maximum_failures} failures. GitLab will allow access on the next attempt." -msgstr "%{number_of_failures} из %{maximum_failures} возможных попыток. Вы можете попытаться еще раз." +msgstr "%{number_of_failures} из %{maximum_failures} возможных неудачных попыток. GitLab будет доступен после следующей попытки." msgid "%{number_of_failures} of %{maximum_failures} failures. GitLab will block access for %{number_of_seconds} seconds." msgstr "%{number_of_failures} из %{maximum_failures} возможных неудачных попыток. GitLab заблокирует доступ на %{number_of_seconds} секунд." @@ -54,15 +60,18 @@ msgstr "(перейдите по ссылке %{link} для получения msgid "1 pipeline" msgid_plural "%d pipelines" -msgstr[0] "1 конвейер" -msgstr[1] "%d конвейеры" -msgstr[2] "%d конвейеры" +msgstr[0] "1 сборочная линия" +msgstr[1] "%d сборочных линий" +msgstr[2] "%d сборочных линий" msgid "1st contribution!" +msgstr "Первый вклад!" + +msgid "2FA enabled" msgstr "" msgid "A collection of graphs regarding Continuous Integration" -msgstr "Графики относительно непрерывной интеграции" +msgstr "Графики относительно непрерывной интеграции (Ci)" msgid "About auto deploy" msgstr "Об автоматическом развёртывании" @@ -85,26 +94,32 @@ msgstr "Активный" msgid "Activity" msgstr "Активность" +msgid "Add" +msgstr "Добавить" + msgid "Add Changelog" -msgstr "Добавить журнал изменений" +msgstr "Добавить Журнал Изменений" msgid "Add Contribution guide" -msgstr "Добавить руководство" +msgstr "Добавить Руководство участника" + +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "Добавить групповые веб-обработчики и GitLab Enterprise Edition." msgid "Add License" -msgstr "Добавить лицензию" +msgstr "Добавить Лицензию" msgid "Add an SSH key to your profile to pull or push via SSH." msgstr "Добавьте ключ SSH в свой профиль, чтобы отправлять или получать код через SSH." msgid "Add new directory" -msgstr "Добавить каталог" +msgstr "Добавить новый каталог" msgid "All" msgstr "Все" msgid "Appearance" -msgstr "" +msgstr "Оформление" msgid "Applications" msgstr "Приложения" @@ -113,48 +128,54 @@ msgid "Archived project! Repository is read-only" msgstr "Архивный проект! Репозиторий доступен только для чтения" msgid "Are you sure you want to delete this pipeline schedule?" -msgstr "Вы действительно хотите удалить это расписание конвейера?" +msgstr "Вы действительно хотите удалить это расписание сборочной линии?" msgid "Are you sure you want to discard your changes?" msgstr "Вы уверены, что Вы хотите отменить Ваши изменения?" msgid "Are you sure you want to reset registration token?" -msgstr "Вы уверены, что Вы хотите сбросить этот ключ регистрации?" +msgstr "" msgid "Are you sure you want to reset the health check token?" -msgstr "Вы уверены, что Вы хотите сбросить этот ключ проверки работоспособности?" +msgstr "" msgid "Are you sure?" msgstr "Вы уверены?" msgid "Artifacts" -msgstr "" +msgstr "Артефакты" msgid "Attach a file by drag & drop or %{upload_link}" msgstr "Приложить файл через drag & drop или %{upload_link}" msgid "Authentication Log" -msgstr "" +msgstr "Журнал аутентификации" -msgid "Auto DevOps (Beta)" -msgstr "" +msgid "Author" +msgstr "Автор" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." -msgstr "" +msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." +msgstr "Приложения для автоматического ревью и автоматического развёртывания требуют указания имени домена и %{kubernetes} для корректной работы." -msgid "Auto DevOps documentation" -msgstr "" +msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." +msgstr "Приложения для автоматического ревью и автоматического развёртывания требуют указания имени домена для корректной работы." -msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." +msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." +msgstr "Приложения для автоматического ревью и автоматического развёртывания требуют указания %{kubernetes} для корректной работы." + +msgid "AutoDevOps|Auto DevOps (Beta)" msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." msgstr "" -msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps documentation" msgstr "" -msgid "AutoDevOps|Learn more in the" +msgid "AutoDevOps|Enable in settings" +msgstr "Включить в настройках" + +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgstr "" msgid "Billing" @@ -172,6 +193,9 @@ msgstr "" msgid "BillingPlans|Customer Support" msgstr "" +msgid "BillingPlans|Downgrade" +msgstr "" + msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." msgstr "" @@ -197,22 +221,16 @@ msgid "BillingPlans|You are currently on the %{plan_link} plan." msgstr "" msgid "BillingPlans|frequently asked questions" -msgstr "" +msgstr "Часто задаваемые вопросы" msgid "BillingPlans|monthly" -msgstr "" +msgstr "ежемесячно" msgid "BillingPlans|paid annually at %{price_per_year}" msgstr "" msgid "BillingPlans|per user" -msgstr "" - -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" +msgstr "за пользователя" msgid "Branch" msgid_plural "Branches" @@ -221,7 +239,7 @@ msgstr[1] "Ветки" msgstr[2] "Ветки" msgid "Branch <strong>%{branch_name}</strong> was created. To set up auto deploy, choose a GitLab CI Yaml template and commit your changes. %{link_to_autodeploy_doc}" -msgstr "Ветка <strong>%{branch_name}</strong> создана. Для настройки автоматического развертывания выберете GitLab CI Yaml-шаблон и зафиксируйте изменения. %{link_to_autodeploy_doc}" +msgstr "Ветка <strong>%{branch_name}</strong> создана. Для настройки автоматического развертывания выберите Yaml-шаблон для GitLab CI и зафиксируйте свои изменения. %{link_to_autodeploy_doc}" msgid "BranchSwitcherPlaceholder|Search branches" msgstr "Поиск веток" @@ -233,91 +251,91 @@ msgid "Branches" msgstr "Ветки" msgid "Branches|Cant find HEAD commit for this branch" -msgstr "" +msgstr "Невозможно найти HEAD-коммит этой ветки" msgid "Branches|Compare" -msgstr "" +msgstr "Сравнить" msgid "Branches|Delete all branches that are merged into '%{default_branch}'" -msgstr "" +msgstr "Удалить все ветки, влитые в '%{default_branch}'" msgid "Branches|Delete branch" -msgstr "" +msgstr "Удалить ветку" msgid "Branches|Delete merged branches" -msgstr "" +msgstr "Удалить влитые ветки" msgid "Branches|Delete protected branch" -msgstr "" +msgstr "Удалить защищённую ветку" msgid "Branches|Delete protected branch '%{branch_name}'?" -msgstr "" +msgstr "Удалить защищённую ветку '%{branch_name}'?" msgid "Branches|Deleting the '%{branch_name}' branch cannot be undone. Are you sure?" -msgstr "" +msgstr "Уделение ветки '%{branch_name}' невозможно отменить. Вы уверены?" msgid "Branches|Deleting the merged branches cannot be undone. Are you sure?" -msgstr "" +msgstr "Удаление влитых веток невозможно отменить. Вы уверены?" msgid "Branches|Filter by branch name" -msgstr "" +msgstr "Отфильтровать по имени ветки" msgid "Branches|Merged into %{default_branch}" -msgstr "" +msgstr "Влить в %{default_branch}" msgid "Branches|New branch" -msgstr "" +msgstr "Новая ветка" msgid "Branches|No branches to show" -msgstr "" +msgstr "Нет веток для отображения" msgid "Branches|Once you confirm and press %{delete_protected_branch}, it cannot be undone or recovered." -msgstr "" +msgstr "Как только вы подтвердите и нажмёте %{delete_protected_branch}, данные будут удалены без возможности восстановления." msgid "Branches|Only a project master or owner can delete a protected branch" -msgstr "" +msgstr "Только мастер или владелец проекта может удалить защищённую ветку" msgid "Branches|Protected branches can be managed in %{project_settings_link}" -msgstr "" +msgstr "Управление защищёнными ветками возможно в %{project_settings_link}" msgid "Branches|Sort by" -msgstr "" +msgstr "Сортировать по" msgid "Branches|The branch could not be updated automatically because it has diverged from its upstream counterpart." -msgstr "" +msgstr "Ветка не может быть обновлена автоматически, потому что она имеет расхождения с её двойником в родительском репозитории." msgid "Branches|The default branch cannot be deleted" -msgstr "" +msgstr "Ветка \"по умолчанию\" не может быть удалена" msgid "Branches|This branch hasn’t been merged into %{default_branch}." -msgstr "" +msgstr "Эта ветка не может быть влита в %{default_branch}." msgid "Branches|To avoid data loss, consider merging this branch before deleting it." -msgstr "" +msgstr "Чтобы избежать потери данных, рассмотрите возможность слияния этой ветки перед её удалением." msgid "Branches|To confirm, type %{branch_name_confirmation}:" -msgstr "" +msgstr "Для подтверждения, введите %{branch_name_confirmation}:" msgid "Branches|To discard the local changes and overwrite the branch with the upstream version, delete it here and choose 'Update Now' above." -msgstr "" +msgstr "Чтобы отменить локальные изменения и перезаписать ветку версией из родительского репозитория, удалите её здесь и выберите \"Обновить сейчас\" выше." msgid "Branches|You’re about to permanently delete the protected branch %{branch_name}." -msgstr "" +msgstr "Вы собираетесь безвозвратно удалить защищённую ветку %{branch_name}." msgid "Branches|diverged from upstream" -msgstr "" +msgstr "расходятся с родительским репозиторием" msgid "Branches|merged" -msgstr "" +msgstr "влита" msgid "Branches|project settings" -msgstr "" +msgstr "настройках проекта" msgid "Branches|protected" -msgstr "" +msgstr "защищена" msgid "Browse Directory" -msgstr "Обзор" +msgstr "Обзор каталога" msgid "Browse File" msgstr "Просмотр файла" @@ -337,12 +355,18 @@ msgstr "CI / CD" msgid "CI configuration" msgstr "Настройка CI" +msgid "CICD|Jobs" +msgstr "Задания" + msgid "Cancel" msgstr "Отмена" msgid "Cancel edit" msgstr "Отменить редактирование" +msgid "Change Weight" +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "Выбрать в ветке" @@ -370,6 +394,9 @@ msgstr "Подобрать в этом коммите" msgid "Cherry-pick this merge request" msgstr "Побрать в этом запросе на слияние" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "отменено" @@ -398,7 +425,7 @@ msgid "CiStatusLabel|waiting for manual action" msgstr "ожидание ручных действий" msgid "CiStatusText|blocked" -msgstr "блокировано" +msgstr "заблокировано" msgid "CiStatusText|canceled" msgstr "отменено" @@ -424,6 +451,135 @@ msgstr "пропущено" msgid "CiStatus|running" msgstr "выполняется" +msgid "Clone repository" +msgstr "" + +msgid "Close" +msgstr "Закрыть" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "Комментарии" @@ -433,8 +589,11 @@ msgstr[0] "Коммит" msgstr[1] "Коммиты" msgstr[2] "Коммиты" +msgid "Commit Message" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" -msgstr "Продолжительность последних 30 фиксаций(коммитов) в минутах" +msgstr "Продолжительность последних 30 коммитов в минутах" msgid "Commit message" msgstr "Описание коммита" @@ -449,17 +608,62 @@ msgid "Commits" msgstr "Коммиты" msgid "Commits feed" -msgstr "Фиксировать подачу" +msgstr "Лента коммитов" msgid "Commits|History" msgstr "История" msgid "Committed by" -msgstr "Фиксировано" +msgstr "Зафиксировано автором" msgid "Compare" msgstr "Сравнить" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "Руководство участника" @@ -467,7 +671,7 @@ msgid "Contributors" msgstr "Участники" msgid "Copy SSH public key to clipboard" -msgstr "" +msgstr "Скопировать публичный ключ SSH в буфер обмена" msgid "Copy URL to clipboard" msgstr "Копировать URL в буфер обмена" @@ -476,28 +680,25 @@ msgid "Copy commit SHA to clipboard" msgstr "Копировать SHA коммита в буфер обмена" msgid "Create New Directory" -msgstr "Создать директорию" - -msgid "Create a new branch" -msgstr "Создать новую ветку" +msgstr "Создать Новый каталог" msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "Создать личный токен на аккаунте для получения или отправки через %{protocol}." msgid "Create directory" -msgstr "Создать директорию" +msgstr "Создать каталог" msgid "Create empty bare repository" msgstr "Создать пустой репозиторий" msgid "Create merge request" -msgstr "Создать запрос на объединение" +msgstr "Создать запрос на слияние" msgid "Create new..." msgstr "Новый" msgid "CreateNewFork|Fork" -msgstr "Форк" +msgstr "Ответвить" msgid "CreateTag|Tag" msgstr "Тег" @@ -518,32 +719,38 @@ msgid "Custom notification levels are the same as participating levels. With cus msgstr "Настраиваемые уровни уведомлений аналогичны уровню уведомлений в соответствии с участием. С настраиваемыми уровнями уведомлений вы также будете получать уведомления о выбранных событиях. Чтобы узнать больше, посмотрите %{notification_link}." msgid "Cycle Analytics" -msgstr "Цикл Аналитик" +msgstr "Аналитика Цикла" msgid "Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project." -msgstr "Цикл Аналитик дает представление о том, сколько времени требуется, чтобы перейти от идеи к производству в проекте." +msgstr "Аналитика Цикла дает представление о том, сколько времени требуется, чтобы перейти от идеи к производству в вашем проекте." msgid "CycleAnalyticsStage|Code" msgstr "Написание кода" msgid "CycleAnalyticsStage|Issue" -msgstr "Обращение" +msgstr "Обсуждение" msgid "CycleAnalyticsStage|Plan" msgstr "Планирование" msgid "CycleAnalyticsStage|Production" -msgstr "Производство" +msgstr "Продуктив" msgid "CycleAnalyticsStage|Review" msgstr "Контроль" msgid "CycleAnalyticsStage|Staging" -msgstr "Постановка" +msgstr "Приёмка" msgid "CycleAnalyticsStage|Test" msgstr "Тестирование" +msgid "DashboardProjects|All" +msgstr "" + +msgid "DashboardProjects|Personal" +msgstr "" + msgid "Define a custom pattern with cron syntax" msgstr "Определить настраиваемый шаблон с синтаксисом cron" @@ -552,9 +759,9 @@ msgstr "Удалить" msgid "Deploy" msgid_plural "Deploys" -msgstr[0] "Разместить" -msgstr[1] "Размещение" -msgstr[2] "Размещение" +msgstr[0] "Развернуть" +msgstr[1] "Развертывание" +msgstr[2] "Развертывание" msgid "Deploy Keys" msgstr "Ключи Развертывания" @@ -562,15 +769,21 @@ msgstr "Ключи Развертывания" msgid "Description" msgstr "Описание" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "Шаблоны описаний позволяют вам определить специфичные шаблоны заполнения обсуждений и запросов на слияние в вашем проекте." + msgid "Details" msgstr "Подробная информация" msgid "Directory name" -msgstr "Каталог" +msgstr "Имя каталога" msgid "Discard changes" msgstr "Отменить изменения" +msgid "Dismiss Merge Request promotion" +msgstr "" + msgid "Don't show again" msgstr "Не показывать снова" @@ -605,14 +818,11 @@ msgid "Edit" msgstr "Редактировать" msgid "Edit Pipeline Schedule %{id}" -msgstr "Изменить расписание конвейера %{id}" +msgstr "Изменить расписание сборочной линии %{id}" msgid "Emails" msgstr "Email-адреса" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "Фильтр по всему" @@ -641,13 +851,13 @@ msgid "Every week (Sundays at 4:00am)" msgstr "Еженедельно (по воскресениями в 4:00)" msgid "Explore projects" -msgstr "" +msgstr "Обзор проектов" msgid "Failed to change the owner" msgstr "Не удалось изменить владельца" msgid "Failed to remove the pipeline schedule" -msgstr "Не удалось удалить расписание конвейера" +msgstr "Не удалось удалить расписание сборочной линии" msgid "Files" msgstr "Файлы" @@ -665,19 +875,25 @@ msgid "FirstPushedBy|First" msgstr "Первый" msgid "FirstPushedBy|pushed by" -msgstr "протолкнул" +msgstr "" msgid "Fork" msgid_plural "Forks" -msgstr[0] "Форк" -msgstr[1] "Форки" -msgstr[2] "Форки" +msgstr[0] "Ответвление" +msgstr[1] "Ответвления" +msgstr[2] "Ответвления" msgid "ForkedFromProjectPath|Forked from" -msgstr "Форк от " +msgstr "Ответвлено от" + +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "Ответвление от %{project_name} (удалено)" + +msgid "Format" +msgstr "" msgid "From issue creation until deploy to production" -msgstr "От создания проблемы до развертывания в рабочей среде" +msgstr "От создания обсуждения до развертывания реализации в рабочей среде" msgid "From merge request merge until deploy to production" msgstr "От запроса на слияние до развертывания в рабочей среде" @@ -688,6 +904,12 @@ msgstr "GPG Ключи" msgid "Geo Nodes" msgstr "" +msgid "Geo|Groups to replicate" +msgstr "" + +msgid "Geo|Select groups to replicate." +msgstr "" + msgid "Git storage health information has been reset" msgstr "Информация о стабильности Git хранилища была сброшена" @@ -695,10 +917,13 @@ msgid "GitLab Runner section" msgstr "Секция Gitlab Runner" msgid "Go to your fork" -msgstr "Перейти к вашему форку" +msgstr "Перейти к вашему ответвлению" msgid "GoToYourFork|Fork" -msgstr "Форк" +msgstr "Ответвление" + +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." +msgstr "" msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgstr "" @@ -742,29 +967,56 @@ msgstr "Проблем работоспособности не обнаруже msgid "HealthCheck|Unhealthy" msgstr "Нестабильный" +msgid "History" +msgstr "" + msgid "Housekeeping successfully started" msgstr "Очистка успешно запущена" msgid "Import repository" msgstr "Импорт репозитория" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "Улучшить доски обсуждений с помощью версии GitLab Enterprise Edition." + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "Улучшить поиск при помощи Расширенного Глобального Поиска в версии GitLab Enterprise Edition." + msgid "Install a Runner compatible with GitLab CI" msgstr "Установите Gitlab Runner совместимый с Gitlab CI" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "Экземпляр" +msgstr[1] "Экземпляры" +msgstr[2] "Экземпляры" + msgid "Interval Pattern" msgstr "Шаблон интервала" msgid "Introducing Cycle Analytics" msgstr "Внедрение Цикла Аналитик" +msgid "Issue board focus mode" +msgstr "Режим фокусировки над доской обсуждений" + +msgid "Issue boards with milestones" +msgstr "Доски обсуждений с вехами" + msgid "Issue events" -msgstr "События задачи" +msgstr "События обсуждений" -msgid "Issues" -msgstr "Задачи" +msgid "IssueBoards|Board" +msgstr "Доска" -msgid "Jobs" -msgstr "" +msgid "IssueBoards|Boards" +msgstr "Доски" + +msgid "Issues" +msgstr "Обсуждения" msgid "LFSStatus|Disabled" msgstr "Отключено" @@ -782,14 +1034,23 @@ msgstr[1] "Последние %d дни" msgstr[2] "Последние %d дни" msgid "Last Pipeline" -msgstr "Последний конвейер" - -msgid "Last Update" -msgstr "Последнее обновление" +msgstr "Последняя Сборочная Линия" msgid "Last commit" msgstr "Последний коммит" +msgid "Last edited %{date}" +msgstr "" + +msgid "Last edited by %{name}" +msgstr "" + +msgid "Last update" +msgstr "" + +msgid "Last updated" +msgstr "" + msgid "LastPushEvent|You pushed to" msgstr "Вы отправили в" @@ -800,7 +1061,7 @@ msgid "Learn more in the" msgstr "Узнайте больше в" msgid "Learn more in the|pipeline schedules documentation" -msgstr "Подробнее в|документации по расписаниям конвейеров" +msgstr "Подробнее в|документации по расписаниям сборочных линий" msgid "Leave group" msgstr "Покинуть группу" @@ -809,19 +1070,25 @@ msgid "Leave project" msgstr "Покинуть проект" msgid "License" -msgstr "" +msgstr "Лицензия" msgid "Limited to showing %d event at most" msgid_plural "Limited to showing %d events at most" -msgstr[0] "Ограничение %d события" -msgstr[1] "Ограничение %d событий" -msgstr[2] "Ограничение %d событий" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -msgid "Locked Files" +msgid "Lock" +msgstr "" + +msgid "Locked" msgstr "" +msgid "Locked Files" +msgstr "Заблокированные Файлы" + msgid "Median" -msgstr "Среднее" +msgstr "" msgid "Members" msgstr "Участники" @@ -833,7 +1100,7 @@ msgid "Merge events" msgstr "События слияний" msgid "Merge request" -msgstr "" +msgstr "Запрос на слияние" msgid "Messages" msgstr "Сообщения" @@ -847,68 +1114,77 @@ msgstr "Мониторинг" msgid "More information is available|here" msgstr "Больше информации доступно|тут" +msgid "Multiple issue boards" +msgstr "Сводные доски задач" + msgid "New Issue" msgid_plural "New Issues" -msgstr[0] "Обращение" -msgstr[1] "Обращения" -msgstr[2] "Обращения" +msgstr[0] "Новое Обсуждение" +msgstr[1] "Новые Обращения" +msgstr[2] "Новые Обращения" msgid "New Pipeline Schedule" -msgstr "Новое расписание конвейера" +msgstr "Новое Расписание Сборочной Линии" msgid "New branch" msgstr "Новая ветка" msgid "New directory" -msgstr "Новая директория" +msgstr "Новый каталог" msgid "New file" msgstr "Новый файл" msgid "New issue" -msgstr "Новое обращение" +msgstr "Новое обсуждение" msgid "New merge request" -msgstr "Новый запрос на объединение" +msgstr "Новый запрос на слияние" msgid "New schedule" msgstr "Новое расписание" msgid "New snippet" -msgstr "Новый сниппет" +msgstr "" msgid "New tag" msgstr "Новый тег" +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "Нет репозитория" msgid "No schedules" -msgstr "Нет расписания" +msgstr "Нет расписаний" + +msgid "None" +msgstr "" msgid "Not available" msgstr "Недоступно" msgid "Not enough data" -msgstr "Нет данных" +msgstr "Недостаточно данных" msgid "Notification events" msgstr "Уведомления о событиях" msgid "NotificationEvent|Close issue" -msgstr "Обращение закрыто" +msgstr "Обсуждение закрыто" msgid "NotificationEvent|Close merge request" -msgstr "Запрос на объединение закрыт" +msgstr "Закрыт запрос на слияние" msgid "NotificationEvent|Failed pipeline" -msgstr "Неудача в конвейере" +msgstr "Неудача в сборочной линии" msgid "NotificationEvent|Merge merge request" -msgstr "Объединить запрос на слияние" +msgstr "" msgid "NotificationEvent|New issue" -msgstr "Новое обращение" +msgstr "Новое обсуждение" msgid "NotificationEvent|New merge request" msgstr "Новый запрос на слияние" @@ -917,16 +1193,16 @@ msgid "NotificationEvent|New note" msgstr "Новая заметка" msgid "NotificationEvent|Reassign issue" -msgstr "Переназначить обращение" +msgstr "Переназначить обсуждение" msgid "NotificationEvent|Reassign merge request" msgstr "Переназначить запрос на слияние" msgid "NotificationEvent|Reopen issue" -msgstr "Переоткрыть обращение" +msgstr "Переоткрыть обсуждение" msgid "NotificationEvent|Successful pipeline" -msgstr "Успешно в конвейере" +msgstr "Успешная сборочная линия" msgid "NotificationLevel|Custom" msgstr "Настраиваемый" @@ -952,9 +1228,15 @@ msgstr "Уведомления" msgid "OfSearchInADropdown|Filter" msgstr "Фильтр" +msgid "Only project members can comment." +msgstr "" + msgid "OpenedNDaysAgo|Opened" msgstr "Открыто" +msgid "Opens in a new window" +msgstr "" + msgid "Options" msgstr "Настройки" @@ -979,20 +1261,23 @@ msgstr "" msgid "Password" msgstr "Пароль" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "" + msgid "Pipeline" -msgstr "Конвейер" +msgstr "Сборочная линия" msgid "Pipeline Health" msgstr "Жизненный цикл конвейера" msgid "Pipeline Schedule" -msgstr "Расписание конвейера" +msgstr "Расписание Сборочной Линии" msgid "Pipeline Schedules" -msgstr "Расписания конвейеров" +msgstr "Расписания Сборочных Линий" msgid "Pipeline quota" -msgstr "" +msgstr "Квота сборочной линии" msgid "PipelineCharts|Failed:" msgstr "Неудача:" @@ -1034,7 +1319,7 @@ msgid "PipelineSchedules|None" msgstr "Отсутствует" msgid "PipelineSchedules|Provide a short description for this pipeline" -msgstr "Предоставьте краткое описание этого конвейера" +msgstr "Предоставьте краткое описание этой сборочной линии" msgid "PipelineSchedules|Remove variable row" msgstr "Удалить значение" @@ -1052,19 +1337,19 @@ msgid "PipelineSheduleIntervalPattern|Custom" msgstr "Настраиваемый" msgid "Pipelines" -msgstr "Конвейер" +msgstr "Сборочные линии" msgid "Pipelines charts" -msgstr "Диаграмма конвейера" +msgstr "Диаграммы сборочных линий" msgid "Pipelines for last month" -msgstr "Конвеер за последний месяц" +msgstr "Сборочные линии за последний месяц" msgid "Pipelines for last week" -msgstr "Конвеер за последнюю неделю" +msgstr "Сборочные линии за последнюю неделю" msgid "Pipelines for last year" -msgstr "Конвееры за последний год" +msgstr "Сборочные линии за последний год" msgid "Pipeline|all" msgstr "все" @@ -1082,7 +1367,7 @@ msgid "Preferences" msgstr "Предпочтения" msgid "Profile" -msgstr "" +msgstr "Профиль" msgid "Project '%{project_name}' queued for deletion." msgstr "Проект '%{project_name}' добавлен в очередь на удаление." @@ -1138,6 +1423,21 @@ msgstr "Этап" msgid "ProjectNetworkGraph|Graph" msgstr "Граф" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "" @@ -1187,7 +1487,7 @@ msgid "Related Deployed Jobs" msgstr "Связанные задачи выгрузки" msgid "Related Issues" -msgstr "Связанные вопросы" +msgstr "Связанные Обсуждения" msgid "Related Jobs" msgstr "Связанные задачи" @@ -1228,17 +1528,20 @@ msgstr "Отменить этот запрос на слияние" msgid "SSH Keys" msgstr "SSH Ключи" +msgid "Save changes" +msgstr "" + msgid "Save pipeline schedule" -msgstr "Сохранить расписание конвейра" +msgstr "Сохранить расписание сборочной лини" msgid "Schedule a new pipeline" -msgstr "Расписание нового конвейера" +msgstr "Расписание новой сборочной линии" msgid "Schedules" msgstr "" msgid "Scheduling Pipelines" -msgstr "Планирование конвейеров" +msgstr "Планирование Сборочных Линий" msgid "Search branches and tags" msgstr "Найти ветки и теги" @@ -1249,9 +1552,6 @@ msgstr "Выбрать формат архива" msgid "Select a timezone" msgstr "Выбор временной зоны" -msgid "Select existing branch" -msgstr "Выбрать существующую ветвь" - msgid "Select target branch" msgstr "Выбор целевой ветки" @@ -1291,101 +1591,113 @@ msgstr[2] "Показано %d событий" msgid "Snippets" msgstr "Сниппеты" -msgid "SortOptions|Access level, ascending" +msgid "Something went wrong on our end." msgstr "" -msgid "SortOptions|Access level, descending" +msgid "Something went wrong while fetching the projects." msgstr "" -msgid "SortOptions|Created date" +msgid "Something went wrong while fetching the registry list." msgstr "" -msgid "SortOptions|Due date" +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" msgstr "" +msgid "SortOptions|Access level, ascending" +msgstr "Уровень доступа, по возрастанию" + +msgid "SortOptions|Access level, descending" +msgstr "Уровень доступа, по убыванию" + +msgid "SortOptions|Created date" +msgstr "Дата создания" + +msgid "SortOptions|Due date" +msgstr "Срок" + msgid "SortOptions|Due later" -msgstr "" +msgstr "Срок позже" msgid "SortOptions|Due soon" -msgstr "" +msgstr "Срок раньше" msgid "SortOptions|Label priority" -msgstr "" +msgstr "Приоритет метки" msgid "SortOptions|Largest group" -msgstr "" +msgstr "Крупнейшая группа" msgid "SortOptions|Largest repository" -msgstr "" +msgstr "Крупнейший репозиторий" msgid "SortOptions|Last created" -msgstr "" +msgstr "Последние созданные" msgid "SortOptions|Last joined" -msgstr "" +msgstr "Последние просоединившиеся" msgid "SortOptions|Last updated" -msgstr "" +msgstr "Последние обновлённые" msgid "SortOptions|Least popular" -msgstr "" +msgstr "Наименее популярный" msgid "SortOptions|Less weight" -msgstr "" +msgstr "Меньший вес" msgid "SortOptions|Milestone" -msgstr "" +msgstr "Веха" msgid "SortOptions|Milestone due later" -msgstr "" +msgstr "Веха, наступающая позднее" msgid "SortOptions|Milestone due soon" -msgstr "" +msgstr "Веха, наступающая раньше" msgid "SortOptions|More weight" -msgstr "" +msgstr "Больший вес" msgid "SortOptions|Most popular" -msgstr "" +msgstr "Наиболее популярный" msgid "SortOptions|Name" -msgstr "" +msgstr "Имя" msgid "SortOptions|Name, ascending" -msgstr "" +msgstr "Имя, по возрастанию" msgid "SortOptions|Name, descending" -msgstr "" +msgstr "Имя, по убыванию" msgid "SortOptions|Oldest created" -msgstr "" +msgstr "Старейшие из созданных" msgid "SortOptions|Oldest joined" -msgstr "" +msgstr "Старейшие из присоединившихся" msgid "SortOptions|Oldest sign in" -msgstr "" +msgstr "Старейшие из заходивших" msgid "SortOptions|Oldest updated" msgstr "" msgid "SortOptions|Popularity" -msgstr "" +msgstr "Популяронсть" msgid "SortOptions|Priority" -msgstr "" +msgstr "Приоритет" msgid "SortOptions|Recent sign in" -msgstr "" +msgstr "Недавно заходившие" msgid "SortOptions|Start later" -msgstr "" +msgstr "Начатые позже" msgid "SortOptions|Start soon" -msgstr "" +msgstr "Начатые недавно" msgid "SortOptions|Weight" -msgstr "" +msgstr "Вес" msgid "Source code" msgstr "Исходный код" @@ -1417,7 +1729,7 @@ msgstr "" msgid "Tag" msgid_plural "Tags" msgstr[0] "Тег" -msgstr[1] "теги" +msgstr[1] "Теги" msgstr[2] "Теги" msgid "Tags" @@ -1429,6 +1741,12 @@ msgstr "Ветка" msgid "Team" msgstr "Команда" +msgid "Thanks! Don't show me this again" +msgstr "" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "На этапе написания кода показывает время первого коммита до создания запроса на слияние. Данные автоматически добавятся после того, как вы создать свой первый запрос на слияние." @@ -1436,22 +1754,22 @@ msgid "The collection of events added to the data gathered for that stage." msgstr "Коллекция событий добавленных в данные собранные для этого этапа." msgid "The fork relationship has been removed." -msgstr "Связь форка удалена." +msgstr "Связь с ответвлением удалена." msgid "The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage." -msgstr "Стадия обращения время, которое потребуется с момента создания обращения до назначения обращению вехи, или добавления обращения в вашу доску обращений. Начните создавать обращения, чтобы увидеть сведения для этой стадии. " +msgstr "Стадия обсуждения показывает время, которое потребуется с момента создания обсуждения до назначения обсуждению вехи, или добавления обсуждения на вашу доску задач. Начните создавать обсуждения, чтобы увидеть сведения для этой стадии." msgid "The phase of the development lifecycle." msgstr "Фаза жизненного цикла разработки." msgid "The pipelines schedule runs pipelines in the future, repeatedly, for specific branches or tags. Those scheduled pipelines will inherit limited project access based on their associated user." -msgstr "Расписание конвейеров запускает в будущем неоднократно конвейеры, для определенных ветвей или тегов. Запланированные конвейеры наследуют ограничения на доступ к проекту на основе связанного с ними пользователя." +msgstr "Расписание сборочных линий регулярно запускает сборочные линии для определенных ветвей или тегов. Запланированные сборочные линии наследуют ограничения на доступ к проекту на основе связанного с ними пользователя." msgid "The planning stage shows the time from the previous step to pushing your first commit. This time will be added automatically once you push your first commit." msgstr "На этапе планирования показывает время от предыдущего шага до проталкивания первого коммита. Добавляется автоматически, как только проталкиваете свой первый коммит." msgid "The production stage shows the total time it takes between creating an issue and deploying the code to production. The data will be automatically added once you have completed the full idea to production cycle." -msgstr "Производственный этап показывает общее время между созданием задачи и развертывание кода в производственной среде. Данные будут автоматически добавлены после полного завершения идеи производственного цикла." +msgstr "Производственный этап показывает общее время между созданием обсуждения и развертыванием кода в продуктивной среде. Данные будут автоматически добавлены после полного завершения идеи." msgid "The project can be accessed by any logged in user." msgstr "Доступ к проекту возможен любым зарегистрированным пользователем." @@ -1469,7 +1787,7 @@ msgid "The staging stage shows the time between merging the MR and deploying cod msgstr "Этап постановки показывает время между слиянием \"MR\" и развертыванием кода в производственной среде. Данные будут автоматически добавлены после развертывания в производстве первый раз." msgid "The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running." -msgstr "Этап тестирования показывает время, которое GitLab CI занимает для запуска каждого конвейера для соответствующего запроса на слияние. Данные будут автоматически добавлены после завершения работы вашего первого конвейера." +msgstr "Этап тестирования показывает время, которое GitLab CI занимает для запуска каждой сборочной линии для соответствующего запроса на слияние. Данные будут автоматически добавлены после завершения работы вашей первой сборочной линии." msgid "The time taken by each data entry gathered by that stage." msgstr "Время, затраченное каждым элементом, собранным на этом этапе." @@ -1480,17 +1798,29 @@ msgstr "Среднее значение в ряду. Пример: между 3, msgid "There are problems accessing Git storage: " msgstr "Проблемы с доступом к Git хранилищу: " -msgid "This is the author's first Merge Request to this project. Handle with care." +msgid "This is a confidential issue." +msgstr "Это конфиденциальное обсуждение." + +msgid "This is the author's first Merge Request to this project." msgstr "" +msgid "This issue is confidential and locked." +msgstr "Это обсуждение конфиденциально и заблокировано." + +msgid "This issue is locked." +msgstr "Обсуждение заблокировано." + msgid "This means you can not push code until you create an empty repository or import existing one." -msgstr "Это означает, что вы не можете пушить код, пока не создадите пустой репозиторий или не импортируете существующий." +msgstr "Это означает, что вы не можете отправить код, пока не создадите пустой репозиторий или не импортируете существующий." + +msgid "This merge request is locked." +msgstr "" msgid "Time before an issue gets scheduled" -msgstr " Время до начала попадания проблемы в планировщик" +msgstr "Время до начала попадания обсуждения в планировщик" msgid "Time before an issue starts implementation" -msgstr "Время до начала работы над проблемой" +msgstr "Время до начала работы над обсуждением" msgid "Time between merge request creation and merge/close" msgstr "Время между созданием запроса слияния и слиянием / закрытием" @@ -1499,10 +1829,10 @@ msgid "Time until first merge request" msgstr "Время до первого запроса на слияние" msgid "Timeago|%s days ago" -msgstr "%s день назад" +msgstr "%s дней назад" msgid "Timeago|%s days remaining" -msgstr "Осталось %s день" +msgstr "Осталось %s дней" msgid "Timeago|%s hours remaining" msgstr "Осталось %s часов" @@ -1514,10 +1844,10 @@ msgid "Timeago|%s minutes remaining" msgstr "Осталось %s минут" msgid "Timeago|%s months ago" -msgstr "%s минут назад" +msgstr "%s месяцев назад" msgid "Timeago|%s months remaining" -msgstr "Осталось %s месяц" +msgstr "Осталось %s месяцев" msgid "Timeago|%s seconds remaining" msgstr "Осталось %s секунд(ы)" @@ -1526,13 +1856,13 @@ msgid "Timeago|%s weeks ago" msgstr "%s недели назад" msgid "Timeago|%s weeks remaining" -msgstr "Осталось %s недели" +msgstr "Осталось %s недель" msgid "Timeago|%s years ago" -msgstr "%s год назад" +msgstr "%s лет назад" msgid "Timeago|%s years remaining" -msgstr "Осталось %s год" +msgstr "Осталось %s лет" msgid "Timeago|1 day remaining" msgstr "Остался день" @@ -1564,9 +1894,6 @@ msgstr "месяц назад" msgid "Timeago|a week ago" msgstr "неделю назад" -msgid "Timeago|a while" -msgstr "какое-то время" - msgid "Timeago|a year ago" msgstr "год назад" @@ -1580,16 +1907,16 @@ msgid "Timeago|about an hour ago" msgstr "около часа назад" msgid "Timeago|in %s days" -msgstr "через %s день" +msgstr "Через %s дней" msgid "Timeago|in %s hours" -msgstr "через %s час" +msgstr "Через %s часов" msgid "Timeago|in %s minutes" msgstr "через %s минут" msgid "Timeago|in %s months" -msgstr "через %s месяц" +msgstr "Через %s месяцев" msgid "Timeago|in %s seconds" msgstr "через %s секунд(ы)" @@ -1598,7 +1925,7 @@ msgid "Timeago|in %s weeks" msgstr "через %s недели" msgid "Timeago|in %s years" -msgstr "через %s год" +msgstr "через %s лет" msgid "Timeago|in 1 day" msgstr "через день" @@ -1618,6 +1945,9 @@ msgstr "через неделю" msgid "Timeago|in 1 year" msgstr "через год" +msgid "Timeago|in a while" +msgstr "" + msgid "Timeago|less than a minute ago" msgstr "менее чем минуту назад" @@ -1642,9 +1972,33 @@ msgstr "Общее время" msgid "Total test time for all commits/merges" msgstr "Общее время тестирования фиксаций/слияний" +msgid "Track activity with Contribution Analytics." +msgstr "" + +msgid "Unlock" +msgstr "" + +msgid "Unlocked" +msgstr "" + msgid "Unstar" msgstr "Снять отметку" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "Обновите ваш тарифный план для появления веса у обсуждений." + +msgid "Upgrade your plan to improve Issue boards." +msgstr "Обновите ваш тарифный план, чтобы улучшить доски обсуждений." + msgid "Upload New File" msgstr "Загрузить новый файл" @@ -1687,9 +2041,117 @@ msgstr "Хотите увидеть данные? Обратитесь к адм msgid "We don't have enough data to show this stage." msgstr "Информация по этапу отсутствует." +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "Веб-обработчики позволяют вам вызывать адрес URL если, например, отправлен новый код или создано новое обсуждение. Вы можете настроить веб-обработчики так, чтобы они реагировали на определённые события, такие как отправки кода, обсуждения или запросы на слияние. Групповые веб-обработчики применяются ко всем проектам в группе и позволяют вам стандартизовать функциональность веб-обработчиков для всей вашей группы." + +msgid "Weight" +msgstr "" + msgid "Wiki" msgstr "Wiki" +msgid "WikiClone|Clone your wiki" +msgstr "" + +msgid "WikiClone|Git Access" +msgstr "" + +msgid "WikiClone|Install Gollum" +msgstr "" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "" + +msgid "WikiHistoricalPage|history" +msgstr "история" + +msgid "WikiHistoricalPage|most recent version" +msgstr "последняя версия" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "Дополнительные примеры находятся в %{docs_link}" + +msgid "WikiMarkdownDocs|documentation" +msgstr "документация" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "Для создания ссылки на страницу (в том числе на новую), просто введите %{link_example}" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "как настроить" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "Совет: Вы можете указать полный путь для нового файла. Будут автоматически созданы любые отсутствующие каталоги." + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "Новая Вики Страница" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "Вы уверены что хотите удалить эту страницу?" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "Кто-то редактирует страницу одновременно с вами. Пожалуйста проверьте %{page_link} и убедитесь, что внесенные Вами изменения не затрут чужие." + +msgid "WikiPageConflictMessage|the page" +msgstr "страница" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "Создать %{page_title}" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "Обновить %{page_title}" + +msgid "WikiPage|Page slug" +msgstr "" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "Напишите ваше содержимое или перетащите сюда файлы..." + +msgid "Wiki|Create Page" +msgstr "Создать Страницу" + +msgid "Wiki|Create page" +msgstr "Создать страницу" + +msgid "Wiki|Edit Page" +msgstr "Редактировать страницу" + +msgid "Wiki|Empty page" +msgstr "Пустая страница" + +msgid "Wiki|More Pages" +msgstr "Ещё страницы" + +msgid "Wiki|New page" +msgstr "Новая страница" + +msgid "Wiki|Page history" +msgstr "История страницы" + +msgid "Wiki|Page version" +msgstr "Версия страницы" + +msgid "Wiki|Pages" +msgstr "Страницы" + +msgid "Wiki|Wiki Pages" +msgstr "Вики Страницы" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "" + msgid "Withdraw Access Request" msgstr "Отменить запрос доступа" @@ -1700,7 +2162,7 @@ msgid "You are going to remove %{project_name_with_namespace}. Removed project C msgstr "Вы хотите удалить %{project_name_with_namespace}. Удаленный проект НЕ МОЖЕТ быть восстановлен! Вы АБСОЛЮТНО уверены?" msgid "You are going to remove the fork relationship to source project %{forked_from_project}. Are you ABSOLUTELY sure?" -msgstr "Вы собираетесь удалить связь форка с исходным проектом %{forked_from_project}. Вы АБСОЛЮТНО уверены?" +msgstr "Вы собираетесь удалить связь ответвления с исходным проектом %{forked_from_project}. Вы АБСОЛЮТНО уверены?" msgid "You are going to transfer %{project_name_with_namespace} to another owner. Are you ABSOLUTELY sure?" msgstr "Вы собираетесь передать проект %{project_name_with_namespace} другому владельцу. Вы АБСОЛЮТНО уверены?" @@ -1738,11 +2200,14 @@ msgstr "Вы не сможете получать и отправлять код msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "Вы не сможете получать и отправлять код проекта через SSH пока %{add_ssh_key_link} в ваш профиль." +msgid "Your comment will not be visible to the public." +msgstr "" + msgid "Your name" msgstr "Ваше имя" msgid "Your projects" -msgstr "" +msgstr "Ваши проекты" msgid "commit" msgstr "" @@ -1750,8 +2215,8 @@ msgstr "" msgid "day" msgid_plural "days" msgstr[0] "день" -msgstr[1] "дни" -msgstr[2] "дни" +msgstr[1] "дней" +msgstr[2] "дней" msgid "new merge request" msgstr "новый запрос на слияние" @@ -1765,3 +2230,9 @@ msgstr[0] "источник" msgstr[1] "источники" msgstr[2] "источники" +msgid "to help your contributors communicate effectively!" +msgstr "" + +msgid "personal access token" +msgstr "" + diff --git a/locale/uk/gitlab.po b/locale/uk/gitlab.po index ffbbe88cc51..62f4d4cbf2e 100644 --- a/locale/uk/gitlab.po +++ b/locale/uk/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:43-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:37-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: Ukrainian\n" "Language: uk_UA\n" @@ -22,6 +22,12 @@ msgstr[0] "%d комміт" msgstr[1] "%d комміта" msgstr[2] "%d коммітів" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "%s доданий Комміт був виключений для запобігання проблем з продуктивністю." @@ -32,7 +38,7 @@ msgid "%{commit_author_link} committed %{commit_timeago}" msgstr "%{commit_author_link} комміт %{commit_timeago}" msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead" -msgstr "" +msgstr "на %{number_commits_behind} коммітів позаду %{default_branch}, на %{number_commits_ahead} коммітів попереду" msgid "%{number_of_failures} of %{maximum_failures} failures. GitLab will allow access on the next attempt." msgstr "%{number_of_failures} від %{maximum_failures} невдач. GitLab надасть доступ на наступну спробу." @@ -59,6 +65,9 @@ msgstr[1] "%d конвеєра" msgstr[2] "%d конвеєрів" msgid "1st contribution!" +msgstr "Перший внесок!" + +msgid "2FA enabled" msgstr "" msgid "A collection of graphs regarding Continuous Integration" @@ -85,12 +94,18 @@ msgstr "Активний" msgid "Activity" msgstr "Активність" +msgid "Add" +msgstr "Додати" + msgid "Add Changelog" msgstr "Додати список змін (Changelog)" msgid "Add Contribution guide" msgstr "Додати керівництво для контриб’юторів" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "Додайте групу Webhooks та GitLab Enterprise Edition." + msgid "Add License" msgstr "Додати ліцензію" @@ -98,13 +113,13 @@ msgid "Add an SSH key to your profile to pull or push via SSH." msgstr "Додати SSH ключа в свій профіль, щоб мати можливість завантажити чи надіслати зміни через SSH." msgid "Add new directory" -msgstr "Додати новий каталог" +msgstr "" msgid "All" msgstr "Всі" msgid "Appearance" -msgstr "" +msgstr "Зовнішній вигляд" msgid "Applications" msgstr "Додатки" @@ -128,22 +143,16 @@ msgid "Are you sure?" msgstr "Ви впевнені?" msgid "Artifacts" -msgstr "" +msgstr "Артефакти" msgid "Attach a file by drag & drop or %{upload_link}" msgstr "Прикріпити файл за допомогою перетягування або %{upload_link}" msgid "Authentication Log" -msgstr "" - -msgid "Auto DevOps (Beta)" -msgstr "" +msgstr "Журнал автентифікації" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." -msgstr "" - -msgid "Auto DevOps documentation" -msgstr "" +msgid "Author" +msgstr "Автор" msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." msgstr "" @@ -154,65 +163,74 @@ msgstr "" msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." msgstr "" -msgid "AutoDevOps|Learn more in the" +msgid "AutoDevOps|Auto DevOps (Beta)" msgstr "" -msgid "Billing" +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgstr "Auto DevOps може бути активований для цього проекту. Він буде автоматично створювати, тестувати і розгортати ваш додаток на основі налаштованої конфігурації CI / CD." + +msgid "AutoDevOps|Auto DevOps documentation" msgstr "" +msgid "AutoDevOps|Enable in settings" +msgstr "Включити в налаштуваннях" + +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" +msgstr "Дізнайтеся більше в %{link_to_documentation}" + +msgid "Billing" +msgstr "Білінг" + msgid "BillingPlans|%{group_name} is currently on the %{plan_link} plan." -msgstr "" +msgstr "%{group_name} зараз має план %{plan_link}." msgid "BillingPlans|Automatic downgrade and upgrade to some plans is currently not available." msgstr "" msgid "BillingPlans|Current plan" -msgstr "" +msgstr "Поточний план" msgid "BillingPlans|Customer Support" -msgstr "" +msgstr "Служба підтримки" + +msgid "BillingPlans|Downgrade" +msgstr "Понизити" msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." -msgstr "" +msgstr "Дізнайтеся більше про кожен план, читаючи наш %{faq_link}." msgid "BillingPlans|Manage plan" -msgstr "" +msgstr "Управління планом" msgid "BillingPlans|Please contact %{customer_support_link} in that case." -msgstr "" +msgstr "Будь ласка, в цьому випадку зв'яжіться з %{customer_support_link}." msgid "BillingPlans|See all %{plan_name} features" -msgstr "" +msgstr "Подивіться всі можливості %{plan_name}" msgid "BillingPlans|This group uses the plan associated with its parent group." -msgstr "" +msgstr "Ця група використовує план, пов'язаний з батьківською групою." msgid "BillingPlans|To manage the plan for this group, visit the billing section of %{parent_billing_page_link}." -msgstr "" +msgstr "Для управління планом цієї групи відвідайте секцію оплати %{parent_billing_page_link}." msgid "BillingPlans|Upgrade" -msgstr "" +msgstr "Підвищити" msgid "BillingPlans|You are currently on the %{plan_link} plan." -msgstr "" +msgstr "Зараз ви використовуєте план %{plan_link}." msgid "BillingPlans|frequently asked questions" msgstr "" msgid "BillingPlans|monthly" -msgstr "" +msgstr "щомісяця" msgid "BillingPlans|paid annually at %{price_per_year}" -msgstr "" +msgstr "Оплачується щорічно %{price_per_year}" msgid "BillingPlans|per user" -msgstr "" - -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" +msgstr "За користувача" msgid "Branch" msgid_plural "Branches" @@ -233,25 +251,25 @@ msgid "Branches" msgstr "Гілки" msgid "Branches|Cant find HEAD commit for this branch" -msgstr "" +msgstr "Не можу знайти HEAD-комміт для цієї гілки" msgid "Branches|Compare" -msgstr "" +msgstr "Порівняти" msgid "Branches|Delete all branches that are merged into '%{default_branch}'" -msgstr "" +msgstr "Видалити всі гілки які злиті в '%{default_branch}'" msgid "Branches|Delete branch" -msgstr "" +msgstr "Видалити гілку" msgid "Branches|Delete merged branches" -msgstr "" +msgstr "Видалити злиті гілки" msgid "Branches|Delete protected branch" -msgstr "" +msgstr "Видалити захищену гілку" msgid "Branches|Delete protected branch '%{branch_name}'?" -msgstr "" +msgstr "Видалити захищену гілку \"%{branch_name}\"?" msgid "Branches|Deleting the '%{branch_name}' branch cannot be undone. Are you sure?" msgstr "" @@ -272,31 +290,31 @@ msgid "Branches|No branches to show" msgstr "" msgid "Branches|Once you confirm and press %{delete_protected_branch}, it cannot be undone or recovered." -msgstr "" +msgstr "Як тільки ви підтвердите і натиснете %{delete_protected_branch}, дані будуть втрачені, і їх не можливо буде відновити." msgid "Branches|Only a project master or owner can delete a protected branch" msgstr "" msgid "Branches|Protected branches can be managed in %{project_settings_link}" -msgstr "" +msgstr "Управляти захищеними гілками можливо в %{project_settings_link}" msgid "Branches|Sort by" -msgstr "" +msgstr "Сортувати за" msgid "Branches|The branch could not be updated automatically because it has diverged from its upstream counterpart." msgstr "" msgid "Branches|The default branch cannot be deleted" -msgstr "" +msgstr "Гілка \"за замовчуванням\" не може бути видалена" msgid "Branches|This branch hasn’t been merged into %{default_branch}." msgstr "" msgid "Branches|To avoid data loss, consider merging this branch before deleting it." -msgstr "" +msgstr "Щоб уникнути втрати даних, розгляньте можливість злиття цієї гілки перед її видаленням." msgid "Branches|To confirm, type %{branch_name_confirmation}:" -msgstr "" +msgstr "Для підтвердження, введіть %{branch_name_confirmation}:" msgid "Branches|To discard the local changes and overwrite the branch with the upstream version, delete it here and choose 'Update Now' above." msgstr "" @@ -311,10 +329,10 @@ msgid "Branches|merged" msgstr "" msgid "Branches|project settings" -msgstr "" +msgstr "Настройки проекту" msgid "Branches|protected" -msgstr "" +msgstr "захищені" msgid "Browse Directory" msgstr "Переглянути каталог" @@ -337,12 +355,18 @@ msgstr "CI / CD" msgid "CI configuration" msgstr "Налаштування CI" +msgid "CICD|Jobs" +msgstr "" + msgid "Cancel" msgstr "Скасувати" msgid "Cancel edit" msgstr "Відмінити правку" +msgid "Change Weight" +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "Вибрати в гілці" @@ -370,6 +394,9 @@ msgstr "Cherry-pick в цьому комміті" msgid "Cherry-pick this merge request" msgstr "Cherry-pick в цьому запиті на злиття" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "скасовано" @@ -424,6 +451,135 @@ msgstr "пропущено" msgid "CiStatus|running" msgstr "виконується" +msgid "Clone repository" +msgstr "" + +msgid "Close" +msgstr "Закрити" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "Коментарі" @@ -433,6 +589,9 @@ msgstr[0] "Комміт" msgstr[1] "Комміта" msgstr[2] "Коммітів" +msgid "Commit Message" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" msgstr "Тривалість останніх 30 коммітів у хвилинах" @@ -460,6 +619,51 @@ msgstr "Комміт від" msgid "Compare" msgstr "Порівняти" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "Керівництво контриб’юторів" @@ -467,7 +671,7 @@ msgid "Contributors" msgstr "Контриб’ютори" msgid "Copy SSH public key to clipboard" -msgstr "" +msgstr "Скопіюйте відкритий SSH-ключ в буфер обміну" msgid "Copy URL to clipboard" msgstr "Скопіювати URL в буфер обміну" @@ -478,9 +682,6 @@ msgstr "Скопіювати ідентифікатор в буфер обмін msgid "Create New Directory" msgstr "Створити новий каталог" -msgid "Create a new branch" -msgstr "Створити нову гілку" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "Створити токен доступу для вашого аккауета, щоб відправляти або отримувати через %{protocol}." @@ -544,6 +745,12 @@ msgstr "ДЕВ" msgid "CycleAnalyticsStage|Test" msgstr "Тестування" +msgid "DashboardProjects|All" +msgstr "Всі" + +msgid "DashboardProjects|Personal" +msgstr "Особисті" + msgid "Define a custom pattern with cron syntax" msgstr "Визначте власний шаблон за допомогою синтаксису cron" @@ -562,6 +769,9 @@ msgstr "Ключи для розгортування" msgid "Description" msgstr "Опис" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "Шаблони опису дозволяють визначити конкретні шаблони обговорень та запитів на зливання для вашого проекту." + msgid "Details" msgstr "Деталі" @@ -571,6 +781,9 @@ msgstr "Ім'я каталогу" msgid "Discard changes" msgstr "Скасувати зміни" +msgid "Dismiss Merge Request promotion" +msgstr "Не показувати промоушн запитів на злиття" + msgid "Don't show again" msgstr "Не показувати знову" @@ -610,9 +823,6 @@ msgstr "Редагувати Розклад Конвеєра %{id}" msgid "Emails" msgstr "Адреси електронної пошти" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "Всі" @@ -641,7 +851,7 @@ msgid "Every week (Sundays at 4:00am)" msgstr "Щотижня (в неділю о 4:00 ранку)" msgid "Explore projects" -msgstr "" +msgstr "Огляд проектів" msgid "Failed to change the owner" msgstr "Не вдалося змінити власника" @@ -676,6 +886,12 @@ msgstr[2] "Форків" msgid "ForkedFromProjectPath|Forked from" msgstr "Форк від" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "Форк із %{project_name} (видалено)" + +msgid "Format" +msgstr "Формат" + msgid "From issue creation until deploy to production" msgstr "З моменту створення проблеми до розгортання на ПРОД" @@ -686,7 +902,13 @@ msgid "GPG Keys" msgstr "GPG ключі" msgid "Geo Nodes" -msgstr "" +msgstr "Гео-Вузли" + +msgid "Geo|Groups to replicate" +msgstr "Групи для реплікації" + +msgid "Geo|Select groups to replicate." +msgstr "Виберіть групи для реплікації." msgid "Git storage health information has been reset" msgstr "Інформація про статус зберігання Git була скинута" @@ -700,11 +922,14 @@ msgstr "Перейти до вашого форку" msgid "GoToYourFork|Fork" msgstr "Форк" -msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." msgstr "" +msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" +msgstr "Заборонити спільний доступ до проекту в рамках %{group} з іншими групами" + msgid "GroupSettings|Share with group lock" -msgstr "" +msgstr "Блокування спільного доступу з іншими групами" msgid "GroupSettings|This setting is applied on %{ancestor_group} and has been overridden on this subgroup." msgstr "" @@ -716,13 +941,13 @@ msgid "GroupSettings|This setting is applied on %{ancestor_group}. You can overr msgstr "" msgid "GroupSettings|This setting will be applied to all subgroups unless overridden by a group owner. Groups that already have access to the project will continue to have access unless removed manually." -msgstr "" +msgstr "Цей параметр буде застосовано до всіх підгруп, якщо тільки не буде перевизначено власником групи. Групи, які вже мають доступ до проекту, будуть мати доступ, якщо вони не будуть вилучені вручну." msgid "GroupSettings|cannot be disabled when the parent group \"Share with group lock\" is enabled, except by the owner of the parent group" -msgstr "" +msgstr "не може бути скасовано поки \"Блокування спільного доступу з іншими групами\" активне на батьківській групі, за винятком власника батьківської групи" msgid "GroupSettings|remove the share with group lock from %{ancestor_group_name}" -msgstr "" +msgstr "Видалити блокування спільного доступу з іншими групами з %{ancestor_group_name}" msgid "Health Check" msgstr "Перевірки працездатності" @@ -742,30 +967,57 @@ msgstr "Жодних проблем із здоров'ям не виявлено msgid "HealthCheck|Unhealthy" msgstr "Нездорові" +msgid "History" +msgstr "Історія" + msgid "Housekeeping successfully started" msgstr "Очищення успішно розпочато" msgid "Import repository" msgstr "Імпорт репозеторія" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "Покращити дошки обговорень за допомогою версії GitLab Enterprise Edition." + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "Покращити управління проблемами з можливістю визначення ваги проблеми за допомогою GitLab Enterprise Edition." + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "Покращити пошук за допомогою розширеного глобального пошук в версії GitLab Enterprise Edition." + msgid "Install a Runner compatible with GitLab CI" msgstr "Встановіть Runner, сумісний з GitLab CI" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "Інстанс" +msgstr[1] "Інстанса" +msgstr[2] "Інстансів" + msgid "Interval Pattern" msgstr "Шаблон інтервалу" msgid "Introducing Cycle Analytics" msgstr "Представляємо аналітику циклу" +msgid "Issue board focus mode" +msgstr "Режим фокусування над дошкою обговорень" + +msgid "Issue boards with milestones" +msgstr "Дошка обговорень із етапами" + msgid "Issue events" msgstr "Події проблем" +msgid "IssueBoards|Board" +msgstr "Дошка" + +msgid "IssueBoards|Boards" +msgstr "Дошки" + msgid "Issues" msgstr "Проблеми" -msgid "Jobs" -msgstr "" - msgid "LFSStatus|Disabled" msgstr "Вимкнено" @@ -784,12 +1036,21 @@ msgstr[2] "Останніх %d днів" msgid "Last Pipeline" msgstr "Останній Конвеєр" -msgid "Last Update" -msgstr "Останнє оновлення" - msgid "Last commit" msgstr "Останній комміт" +msgid "Last edited %{date}" +msgstr "Останні зміни %{date}" + +msgid "Last edited by %{name}" +msgstr "Останні зміни від %{name}" + +msgid "Last update" +msgstr "Останнє оновлення" + +msgid "Last updated" +msgstr "" + msgid "LastPushEvent|You pushed to" msgstr "Ви надіслали зміни до" @@ -809,7 +1070,7 @@ msgid "Leave project" msgstr "Залишити проект" msgid "License" -msgstr "" +msgstr "Ліцензія" msgid "Limited to showing %d event at most" msgid_plural "Limited to showing %d events at most" @@ -817,8 +1078,14 @@ msgstr[0] "Обмеження %d події" msgstr[1] "Обмеження %d подій" msgstr[2] "Обмеження %d подій" +msgid "Lock" +msgstr "Блокування" + +msgid "Locked" +msgstr "Заблоковано" + msgid "Locked Files" -msgstr "" +msgstr "Заблоковані файли" msgid "Median" msgstr "Медіана" @@ -833,7 +1100,7 @@ msgid "Merge events" msgstr "Події запит на злиття" msgid "Merge request" -msgstr "" +msgstr "Запит на злиття" msgid "Messages" msgstr "Повідомлення" @@ -847,6 +1114,9 @@ msgstr "Моніторинг" msgid "More information is available|here" msgstr "тут" +msgid "Multiple issue boards" +msgstr "Зведені дошки обговорення" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "Нова проблема" @@ -880,12 +1150,18 @@ msgstr "Новий сніппет" msgid "New tag" msgstr "Новий тег" +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "Немає репозеторія" msgid "No schedules" msgstr "немає Розкладів" +msgid "None" +msgstr "Жоден" + msgid "Not available" msgstr "Недоступний" @@ -952,9 +1228,15 @@ msgstr "Сповіщення" msgid "OfSearchInADropdown|Filter" msgstr "Фільтр" +msgid "Only project members can comment." +msgstr "Тільки учасники проекту можуть залишати коментарі." + msgid "OpenedNDaysAgo|Opened" msgstr "Відкрито" +msgid "Opens in a new window" +msgstr "Відкривається у новому вікні" + msgid "Options" msgstr "Параметри" @@ -965,20 +1247,23 @@ msgid "Owner" msgstr "Власник" msgid "Pagination|Last »" -msgstr "" +msgstr "Остання »" msgid "Pagination|Next" -msgstr "" +msgstr "Наступна" msgid "Pagination|Prev" -msgstr "" +msgstr "Попередня" msgid "Pagination|« First" -msgstr "" +msgstr "« Перша" msgid "Password" msgstr "Пароль" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "Люди без дозволу ніколи не отримуватимуть сповіщень і не зможуть коментувати." + msgid "Pipeline" msgstr "Конвеєр" @@ -1082,7 +1367,7 @@ msgid "Preferences" msgstr "Налаштування" msgid "Profile" -msgstr "" +msgstr "Профіль" msgid "Project '%{project_name}' queued for deletion." msgstr "Проект '%{project_name}' доданий в чергу на видалення." @@ -1138,6 +1423,21 @@ msgstr "Етап" msgid "ProjectNetworkGraph|Graph" msgstr "Історія" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "Тільки підписані комміти можуть бути надіслані в цей репозиторій." + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "Цей параметр застосовується на рівні сервера та може бути перевизначений адміністратором." + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "Цей параметр застосовується на рівні сервера, але його було перевизначено для цього проекту." + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "" @@ -1151,7 +1451,7 @@ msgid "ProjectsDropdown|Search your projects" msgstr "Пошук по ваших проектах" msgid "ProjectsDropdown|Something went wrong on our end." -msgstr "" +msgstr "Щось пішло не так з нашого боку." msgid "ProjectsDropdown|Sorry, no projects matched your search" msgstr "На жаль, по вашоу запиту проектів не знайдено" @@ -1160,7 +1460,7 @@ msgid "ProjectsDropdown|This feature requires browser localStorage support" msgstr "Ця функція потребує підтримки localStorage вашим браузером" msgid "Push Rules" -msgstr "" +msgstr "Push-правила" msgid "Push events" msgstr "Push події" @@ -1178,7 +1478,7 @@ msgid "RefSwitcher|Tags" msgstr "Теги" msgid "Registry" -msgstr "" +msgstr "Реєстр" msgid "Related Commits" msgstr "Пов'язані Комміти" @@ -1228,6 +1528,9 @@ msgstr "Скасувати цей запит на злиття" msgid "SSH Keys" msgstr "Ключі SSH" +msgid "Save changes" +msgstr "Зберегти зміни" + msgid "Save pipeline schedule" msgstr "Зберегти Розклад Конвеєра" @@ -1235,7 +1538,7 @@ msgid "Schedule a new pipeline" msgstr "Розклад нового конвеєра" msgid "Schedules" -msgstr "" +msgstr "Розклади" msgid "Scheduling Pipelines" msgstr "Планування конвеєрів" @@ -1249,9 +1552,6 @@ msgstr "Виберіть формат архіву" msgid "Select a timezone" msgstr "Вибрати часовий пояс" -msgid "Select existing branch" -msgstr "Виберіть гілку" - msgid "Select target branch" msgstr "Вибір цільової гілки" @@ -1277,10 +1577,10 @@ msgid "Settings" msgstr "Налаштування" msgid "Show parent pages" -msgstr "" +msgstr "Показати батьківські сторінки" msgid "Show parent subgroups" -msgstr "" +msgstr "Показати батьківські підгрупи" msgid "Showing %d event" msgid_plural "Showing %d events" @@ -1291,101 +1591,113 @@ msgstr[2] "Показано %d подій" msgid "Snippets" msgstr "Фрагменти" -msgid "SortOptions|Access level, ascending" +msgid "Something went wrong on our end." msgstr "" -msgid "SortOptions|Access level, descending" +msgid "Something went wrong while fetching the projects." msgstr "" -msgid "SortOptions|Created date" +msgid "Something went wrong while fetching the registry list." msgstr "" +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" +msgstr "Щось пішло не так, намагаючись змінити статус блокування цього ${this.issuableDisplayName(this.issuableType)}" + +msgid "SortOptions|Access level, ascending" +msgstr "Рівень доступу, в порядку зростання" + +msgid "SortOptions|Access level, descending" +msgstr "Рівень доступу, в порядку спадання" + +msgid "SortOptions|Created date" +msgstr "Дата створення" + msgid "SortOptions|Due date" -msgstr "" +msgstr "Запланована дата завершення" msgid "SortOptions|Due later" -msgstr "" +msgstr "Заплановано пізніше" msgid "SortOptions|Due soon" -msgstr "" +msgstr "Заплановано незабаром" msgid "SortOptions|Label priority" -msgstr "" +msgstr "Пріоритет мітки" msgid "SortOptions|Largest group" -msgstr "" +msgstr "Найбільша група" msgid "SortOptions|Largest repository" -msgstr "" +msgstr "Найбільший репозиторій" msgid "SortOptions|Last created" -msgstr "" +msgstr "Останній створений" msgid "SortOptions|Last joined" -msgstr "" +msgstr "Останній приєднавшийся" msgid "SortOptions|Last updated" -msgstr "" +msgstr "Останній оновлений" msgid "SortOptions|Least popular" -msgstr "" +msgstr "Найменш популярний" msgid "SortOptions|Less weight" -msgstr "" +msgstr "Найменша вага" msgid "SortOptions|Milestone" -msgstr "" +msgstr "Етап" msgid "SortOptions|Milestone due later" -msgstr "" +msgstr "Етап запланований на пізніше" msgid "SortOptions|Milestone due soon" -msgstr "" +msgstr "Етап запланований незабаром" msgid "SortOptions|More weight" -msgstr "" +msgstr "Найбільша вага" msgid "SortOptions|Most popular" -msgstr "" +msgstr "Найбільш популярний" msgid "SortOptions|Name" -msgstr "" +msgstr "Ім'я" msgid "SortOptions|Name, ascending" -msgstr "" +msgstr "Ім'я, за зростанням" msgid "SortOptions|Name, descending" -msgstr "" +msgstr "Ім'я, за спаданням" msgid "SortOptions|Oldest created" -msgstr "" +msgstr "Найстаріший з створених" msgid "SortOptions|Oldest joined" -msgstr "" +msgstr "Приєднаний найраніше" msgid "SortOptions|Oldest sign in" -msgstr "" +msgstr "Залогінений найраніше" msgid "SortOptions|Oldest updated" -msgstr "" +msgstr "Оновлений найраніше" msgid "SortOptions|Popularity" -msgstr "" +msgstr "Популярність" msgid "SortOptions|Priority" -msgstr "" +msgstr "Пріоритет" msgid "SortOptions|Recent sign in" -msgstr "" +msgstr "Нещодавно зареєстровані" msgid "SortOptions|Start later" -msgstr "" +msgstr "Розпочатий пізніше" msgid "SortOptions|Start soon" -msgstr "" +msgstr "Розпочатий нещодавно" msgid "SortOptions|Weight" -msgstr "" +msgstr "Вага" msgid "Source code" msgstr "Код" @@ -1400,7 +1712,7 @@ msgid "StarProject|Star" msgstr "Підписатися" msgid "Starred projects" -msgstr "" +msgstr "Відмічені проекти" msgid "Start a %{new_merge_request} with these changes" msgstr "Почати %{new_merge_request} з цих змін" @@ -1412,7 +1724,7 @@ msgid "Switch branch/tag" msgstr "тег" msgid "System Hooks" -msgstr "" +msgstr "Системні Hook'и" msgid "Tag" msgid_plural "Tags" @@ -1429,6 +1741,12 @@ msgstr "Цільова гілка" msgid "Team" msgstr "Команда" +msgid "Thanks! Don't show me this again" +msgstr "Дякую! Більше не показувати це повідомлення" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "Розширений глобальний пошук в GitLab - це потужний інструмент який заощаджує ваш час. Замість дублювання коду і витрати часу, ви можете шукати код всередині інших команд, який може допомогти у вашому проекті." + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "На стадії написання коду, показує час першого комміту до створення запиту на об'єднання. Дані будуть автоматично додані після створення вашого першого запиту на об'єднання." @@ -1480,12 +1798,24 @@ msgstr "Середнє значення в рядку. Приклад: між 3, msgid "There are problems accessing Git storage: " msgstr "Є проблеми з доступом до сховища: " -msgid "This is the author's first Merge Request to this project. Handle with care." -msgstr "" +msgid "This is a confidential issue." +msgstr "Це конфіденційна проблема." + +msgid "This is the author's first Merge Request to this project." +msgstr "Це перший запит на злиття від цього автора для цього проекту." + +msgid "This issue is confidential and locked." +msgstr "Ця проблема конфіденційна і заблокована." + +msgid "This issue is locked." +msgstr "Ця проблема заблокована." msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "Це означає, що ви не можете відправляти код, поки не створите порожній репозиторій або НЕ імпортуєте існуючий." +msgid "This merge request is locked." +msgstr "Цей запит на злиття заблоковано." + msgid "Time before an issue gets scheduled" msgstr "Час до початку потрапляння проблеми в планувальник" @@ -1564,9 +1894,6 @@ msgstr "місяць тому" msgid "Timeago|a week ago" msgstr "тиждень тому" -msgid "Timeago|a while" -msgstr "деякий час назад" - msgid "Timeago|a year ago" msgstr "рік тому" @@ -1618,6 +1945,9 @@ msgstr "через тиждень" msgid "Timeago|in 1 year" msgstr "через рік" +msgid "Timeago|in a while" +msgstr "невдовзі" + msgid "Timeago|less than a minute ago" msgstr "менше хвилини тому" @@ -1642,9 +1972,33 @@ msgstr "Загальний час" msgid "Total test time for all commits/merges" msgstr "Загальний час, щоб перевірити всі фіксації/злиття" +msgid "Track activity with Contribution Analytics." +msgstr "Відстежувати активність за допомогою Аналітики контриб’юторів." + +msgid "Unlock" +msgstr "Розблокувати" + +msgid "Unlocked" +msgstr "Розблоковано" + msgid "Unstar" msgstr "Відписатись" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "Перейдіть на вищий тарифний план щоб активувати Покращений Глобальний Пошук." + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "Перейдіть на вищий тарифний план для активації Аналітики контриб’юторів." + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "" + msgid "Upload New File" msgstr "Завантажити новий файл" @@ -1661,13 +2015,13 @@ msgid "Use your global notification setting" msgstr "Використовуються глобальні налаштування повідомлень" msgid "View file @ " -msgstr "" +msgstr "Перегляд файла @ " msgid "View open merge request" msgstr "Перегляд відкритих запитів на злиття" msgid "View replaced file @ " -msgstr "" +msgstr "Перегляд заміненого файлу @ " msgid "VisibilityLevel|Internal" msgstr "Внутрішній" @@ -1687,9 +2041,117 @@ msgstr "Хочете побачити дані? Будь ласка, попро msgid "We don't have enough data to show this stage." msgstr "Ми не маємо достатньо даних для показу цього етапу." +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "Webhook дозволяють вам викликати адресу URL якщо, наприклад, відправлений новий код або створено нову тему повідомлення. Ви можете налаштувати Webhook так, щоб він реагував на певні події, такі як відправки коду, обговорення або запити на злиття. Групові Webhook’и застосовуються до всіх проектів в групі і дозволяють вам стандартизувати функціональність Webhook’ів для всієї вашої групи." + +msgid "Weight" +msgstr "Вага" + msgid "Wiki" msgstr "Wiki" +msgid "WikiClone|Clone your wiki" +msgstr "Клонувати ваш wiki" + +msgid "WikiClone|Git Access" +msgstr "" + +msgid "WikiClone|Install Gollum" +msgstr "" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "" + +msgid "WikiHistoricalPage|history" +msgstr "" + +msgid "WikiHistoricalPage|most recent version" +msgstr "" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "" + +msgid "WikiMarkdownDocs|documentation" +msgstr "" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "" + +msgid "WikiPageConflictMessage|the page" +msgstr "" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "" + +msgid "WikiPage|Page slug" +msgstr "" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "" + +msgid "Wiki|Create Page" +msgstr "" + +msgid "Wiki|Create page" +msgstr "" + +msgid "Wiki|Edit Page" +msgstr "Редагувати сторінку" + +msgid "Wiki|Empty page" +msgstr "" + +msgid "Wiki|More Pages" +msgstr "" + +msgid "Wiki|New page" +msgstr "" + +msgid "Wiki|Page history" +msgstr "" + +msgid "Wiki|Page version" +msgstr "" + +msgid "Wiki|Pages" +msgstr "" + +msgid "Wiki|Wiki Pages" +msgstr "" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "" + msgid "Withdraw Access Request" msgstr "Скасувати запит доступу" @@ -1738,6 +2200,9 @@ msgstr "Ви не зможете отримувати і відправляти msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "Ви не зможете отримувати і відправляти код проекту через SSH поки %{add_ssh_key_link} в ваш профіль." +msgid "Your comment will not be visible to the public." +msgstr "" + msgid "Your name" msgstr "Ваше ім'я" @@ -1745,7 +2210,7 @@ msgid "Your projects" msgstr "" msgid "commit" -msgstr "" +msgstr "комміт" msgid "day" msgid_plural "days" @@ -1765,3 +2230,9 @@ msgstr[0] "джерело" msgstr[1] "джерела" msgstr[2] "джерел" +msgid "to help your contributors communicate effectively!" +msgstr "" + +msgid "personal access token" +msgstr "" + diff --git a/locale/zh_CN/gitlab.po b/locale/zh_CN/gitlab.po index 4a05b159008..caccb246e0b 100644 --- a/locale/zh_CN/gitlab.po +++ b/locale/zh_CN/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:44-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:35-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -20,6 +20,10 @@ msgid "%d commit" msgid_plural "%d commits" msgstr[0] "%d 次提交" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "为提高页面加载速度及性能，已省略了 %s 次提交。" @@ -28,7 +32,7 @@ msgid "%{commit_author_link} committed %{commit_timeago}" msgstr "由 %{commit_author_link} 提交于 %{commit_timeago}" msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead" -msgstr "" +msgstr "%{number_commits_behind} 个落后 %{default_branch} 分支的提交, %{number_commits_ahead} 早超前的提交" msgid "%{number_of_failures} of %{maximum_failures} failures. GitLab will allow access on the next attempt." msgstr "已失败 %{number_of_failures} 次/最多允许失败失败 %{maximum_failures} 次，GitLab 将继续重试。" @@ -51,6 +55,9 @@ msgid_plural "%d pipelines" msgstr[0] "%d 条流水线" msgid "1st contribution!" +msgstr "最高贡献" + +msgid "2FA enabled" msgstr "" msgid "A collection of graphs regarding Continuous Integration" @@ -77,12 +84,18 @@ msgstr "启用" msgid "Activity" msgstr "活动" +msgid "Add" +msgstr "添加" + msgid "Add Changelog" msgstr "添加更新日志" msgid "Add Contribution guide" msgstr "添加贡献指南" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "添加来自 Webhooks 或者 GitLab 企业版的团队。" + msgid "Add License" msgstr "添加许可证" @@ -96,7 +109,7 @@ msgid "All" msgstr "全部" msgid "Appearance" -msgstr "" +msgstr "外观" msgid "Applications" msgstr "应用程序" @@ -120,91 +133,94 @@ msgid "Are you sure?" msgstr "确定吗？" msgid "Artifacts" -msgstr "" +msgstr "产物" msgid "Attach a file by drag & drop or %{upload_link}" msgstr "拖放文件到此处或者 %{upload_link}" msgid "Authentication Log" -msgstr "" - -msgid "Auto DevOps (Beta)" -msgstr "" - -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." -msgstr "" +msgstr "认证日志" -msgid "Auto DevOps documentation" -msgstr "" +msgid "Author" +msgstr "作者" msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." -msgstr "" +msgstr "自动审查程序和自动部署程序需要一个域名和 %{kubernetes} 才能正常工作。" msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." -msgstr "" +msgstr "自动审查程序和自动部署程序需要一个域名才能正常工作。" msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." -msgstr "" +msgstr "自动审查程序和自动部署程序需要 %{kubernetes} 才能正常工作。" -msgid "AutoDevOps|Learn more in the" -msgstr "" +msgid "AutoDevOps|Auto DevOps (Beta)" +msgstr "DevOps 自动化(测试版)" + +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgstr "可以为此项目启用 DevOps 自动化。它将根据预定义的 CI/CD配置自动构建、测试和部署应用程序。" + +msgid "AutoDevOps|Auto DevOps documentation" +msgstr "DevOps 自动化文档" + +msgid "AutoDevOps|Enable in settings" +msgstr "在设置中启用" + +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" +msgstr "想了解更多请访问 %{link_to_documentation}" msgid "Billing" -msgstr "" +msgstr "账单" msgid "BillingPlans|%{group_name} is currently on the %{plan_link} plan." -msgstr "" +msgstr "%{group_name} 正在使用 %{plan_link} 方案。" msgid "BillingPlans|Automatic downgrade and upgrade to some plans is currently not available." -msgstr "" +msgstr "在当前方案中不可使用自动降级或自动升级。" msgid "BillingPlans|Current plan" -msgstr "" +msgstr "当前方案" msgid "BillingPlans|Customer Support" -msgstr "" +msgstr "用户支持" + +msgid "BillingPlans|Downgrade" +msgstr "降级" msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." -msgstr "" +msgstr "阅读 %{faq_link} 以了解更多信息。" msgid "BillingPlans|Manage plan" -msgstr "" +msgstr "管理方案" msgid "BillingPlans|Please contact %{customer_support_link} in that case." -msgstr "" +msgstr "请联系 %{customer_support_link}" msgid "BillingPlans|See all %{plan_name} features" -msgstr "" +msgstr "查看所有 %{plan_name} 功能" msgid "BillingPlans|This group uses the plan associated with its parent group." -msgstr "" +msgstr "使用与其父项目一致的方案" msgid "BillingPlans|To manage the plan for this group, visit the billing section of %{parent_billing_page_link}." -msgstr "" +msgstr "访问 %{parent_billing_page_link} 以管理该项目的计费方案。" msgid "BillingPlans|Upgrade" -msgstr "" +msgstr "升级" msgid "BillingPlans|You are currently on the %{plan_link} plan." -msgstr "" +msgstr "您目前正在使用 %{plan_link} 方案。" msgid "BillingPlans|frequently asked questions" -msgstr "" +msgstr "常见问题" msgid "BillingPlans|monthly" -msgstr "" +msgstr "每月" msgid "BillingPlans|paid annually at %{price_per_year}" -msgstr "" +msgstr "每年支付 %{price_per_year}" msgid "BillingPlans|per user" -msgstr "" - -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" +msgstr "每个用户" msgid "Branch" msgid_plural "Branches" @@ -223,88 +239,88 @@ msgid "Branches" msgstr "分支" msgid "Branches|Cant find HEAD commit for this branch" -msgstr "" +msgstr "不能找到这个分支的 HEAD 提交" msgid "Branches|Compare" -msgstr "" +msgstr "比较" msgid "Branches|Delete all branches that are merged into '%{default_branch}'" -msgstr "" +msgstr "删除所有已合并到 %{default_branch} 的分支。" msgid "Branches|Delete branch" -msgstr "" +msgstr "删除分支" msgid "Branches|Delete merged branches" -msgstr "" +msgstr "删除已合并的分支" msgid "Branches|Delete protected branch" -msgstr "" +msgstr "删除受保护的分支" msgid "Branches|Delete protected branch '%{branch_name}'?" -msgstr "" +msgstr "确认删除受保护的分支 '%{branch_name}'？" msgid "Branches|Deleting the '%{branch_name}' branch cannot be undone. Are you sure?" -msgstr "" +msgstr "删除 ”%{branch_name}” 后将无法恢复，您确定？" msgid "Branches|Deleting the merged branches cannot be undone. Are you sure?" -msgstr "" +msgstr "删除已合并的分支后将无法恢复，您确定？" msgid "Branches|Filter by branch name" -msgstr "" +msgstr "按分支名称筛选" msgid "Branches|Merged into %{default_branch}" -msgstr "" +msgstr "合并到 %{default_branch}" msgid "Branches|New branch" -msgstr "" +msgstr "新建分支" msgid "Branches|No branches to show" -msgstr "" +msgstr "找不到分支" msgid "Branches|Once you confirm and press %{delete_protected_branch}, it cannot be undone or recovered." -msgstr "" +msgstr "确认执行 %{delete_protected_branch} 后将无法撤销或恢复。" msgid "Branches|Only a project master or owner can delete a protected branch" -msgstr "" +msgstr "只有项目管理者或所有者才能删除受保护的分支！" msgid "Branches|Protected branches can be managed in %{project_settings_link}" -msgstr "" +msgstr "在 %{project_settings_link} 管理受保护的分支" msgid "Branches|Sort by" -msgstr "" +msgstr "排序" msgid "Branches|The branch could not be updated automatically because it has diverged from its upstream counterpart." -msgstr "" +msgstr "分支无法自动提交，因为与上游分支冲突。" msgid "Branches|The default branch cannot be deleted" -msgstr "" +msgstr "无法删除默认分支" msgid "Branches|This branch hasn’t been merged into %{default_branch}." -msgstr "" +msgstr "此分支尚未合并到 %{default_branch}。" msgid "Branches|To avoid data loss, consider merging this branch before deleting it." -msgstr "" +msgstr "为避免数据丢失，请在删除之前合并此分支。" msgid "Branches|To confirm, type %{branch_name_confirmation}:" -msgstr "" +msgstr "要确认？请输入 %{branch_name_confirmation} ：" msgid "Branches|To discard the local changes and overwrite the branch with the upstream version, delete it here and choose 'Update Now' above." -msgstr "" +msgstr "若要放弃本地更改并使用上游版本覆盖本分支，请先删除并“立即更新”。" msgid "Branches|You’re about to permanently delete the protected branch %{branch_name}." -msgstr "" +msgstr "将要永久删除受保护 %{branch_name} 分支。" msgid "Branches|diverged from upstream" -msgstr "" +msgstr "与上游存在差异" msgid "Branches|merged" -msgstr "" +msgstr "已合并的" msgid "Branches|project settings" -msgstr "" +msgstr "项目设置" msgid "Branches|protected" -msgstr "" +msgstr "受保护的" msgid "Browse Directory" msgstr "浏览目录" @@ -327,12 +343,18 @@ msgstr "CI / CD" msgid "CI configuration" msgstr "CI 配置" +msgid "CICD|Jobs" +msgstr "作业" + msgid "Cancel" msgstr "取消" msgid "Cancel edit" msgstr "取消编辑" +msgid "Change Weight" +msgstr "变更权重" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "选择分支" @@ -352,7 +374,7 @@ msgid "Charts" msgstr "统计图" msgid "Chat" -msgstr "交流" +msgstr "即时通讯" msgid "Cherry-pick this commit" msgstr "优选此提交" @@ -360,6 +382,9 @@ msgstr "优选此提交" msgid "Cherry-pick this merge request" msgstr "优选此合并请求" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "选择要复制到此节点的群组。留空则复制所有。" + msgid "CiStatusLabel|canceled" msgstr "已取消" @@ -414,6 +439,135 @@ msgstr "已跳过" msgid "CiStatus|running" msgstr "运行中" +msgid "Clone repository" +msgstr "克隆存储库" + +msgid "Close" +msgstr "关闭" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "评论" @@ -421,6 +575,9 @@ msgid "Commit" msgid_plural "Commits" msgstr[0] "提交" +msgid "Commit Message" +msgstr "提交消息" + msgid "Commit duration in minutes for last 30 commits" msgstr "最近30次提交相应持续集成花费的时间（分钟）" @@ -448,6 +605,51 @@ msgstr "提交者：" msgid "Compare" msgstr "比较" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "贡献指南" @@ -455,7 +657,7 @@ msgid "Contributors" msgstr "贡献者" msgid "Copy SSH public key to clipboard" -msgstr "" +msgstr "复制 SSH 公钥到剪贴板" msgid "Copy URL to clipboard" msgstr "复制 URL 到剪贴板" @@ -466,9 +668,6 @@ msgstr "复制提交 SHA 的值到剪贴板" msgid "Create New Directory" msgstr "创建新目录" -msgid "Create a new branch" -msgstr "创建一个新分支" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "在帐户上创建个人访问令牌，以通过 %{protocol} 来拉取或推送。" @@ -532,6 +731,12 @@ msgstr "预发布" msgid "CycleAnalyticsStage|Test" msgstr "测试" +msgid "DashboardProjects|All" +msgstr "所有" + +msgid "DashboardProjects|Personal" +msgstr "个人" + msgid "Define a custom pattern with cron syntax" msgstr "使用 Cron 语法定义自定义模式" @@ -548,6 +753,9 @@ msgstr "部署密钥" msgid "Description" msgstr "描述" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "描述模板允许您为项目的议题和合并请求在创建时选择特定的模版。" + msgid "Details" msgstr "详情" @@ -557,6 +765,9 @@ msgstr "目录名称" msgid "Discard changes" msgstr "放弃更改" +msgid "Dismiss Merge Request promotion" +msgstr "关闭合并请求中的促销广告" + msgid "Don't show again" msgstr "不再显示" @@ -596,9 +807,6 @@ msgstr "编辑 %{id} 流水线计划" msgid "Emails" msgstr "电子邮件" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "全部" @@ -627,7 +835,7 @@ msgid "Every week (Sundays at 4:00am)" msgstr "每周执行（周日凌晨 4 点）" msgid "Explore projects" -msgstr "" +msgstr "查看项目" msgid "Failed to change the owner" msgstr "无法变更所有者" @@ -660,6 +868,12 @@ msgstr[0] "派生" msgid "ForkedFromProjectPath|Forked from" msgstr "派生自" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "派生自 %{project_name} (删除)" + +msgid "Format" +msgstr "格式" + msgid "From issue creation until deploy to production" msgstr "从创建议题到部署至生产环境" @@ -670,7 +884,13 @@ msgid "GPG Keys" msgstr "GPG 密钥" msgid "Geo Nodes" -msgstr "" +msgstr "Geo 节点" + +msgid "Geo|Groups to replicate" +msgstr "要复制的群组" + +msgid "Geo|Select groups to replicate." +msgstr "选择要复制的群组。" msgid "Git storage health information has been reset" msgstr "Git 存储健康信息已重置" @@ -684,29 +904,32 @@ msgstr "跳转到派生项目" msgid "GoToYourFork|Fork" msgstr "跳转到派生项目" -msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." msgstr "" +msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" +msgstr "禁止与其他群组共享 %{group} 中的项目" + msgid "GroupSettings|Share with group lock" -msgstr "" +msgstr "共享群组锁" msgid "GroupSettings|This setting is applied on %{ancestor_group} and has been overridden on this subgroup." -msgstr "" +msgstr "此设置已经应用于 %{ancestor_group}，并已覆盖此子组的设置。" msgid "GroupSettings|This setting is applied on %{ancestor_group}. To share projects in this group with another group, ask the owner to override the setting or %{remove_ancestor_share_with_group_lock}." -msgstr "" +msgstr "此设置已应用于 %{ancestor_group}。若要与其它群组共享此群组中的的项目，请联系所有者覆盖此设置或者 %{remove_ancestor_share_with_group_lock}。" msgid "GroupSettings|This setting is applied on %{ancestor_group}. You can override the setting or %{remove_ancestor_share_with_group_lock}." -msgstr "" +msgstr "此设置已应用于 %{ancestor_group}。 您可以覆盖此设置或 %{remove_ancestor_share_with_group_lock}。" msgid "GroupSettings|This setting will be applied to all subgroups unless overridden by a group owner. Groups that already have access to the project will continue to have access unless removed manually." -msgstr "" +msgstr "此设置将应用于所有子组，除非由组所有者覆盖。已经有权访问该项目的群组将继续访问，除非手动移除。" msgid "GroupSettings|cannot be disabled when the parent group \"Share with group lock\" is enabled, except by the owner of the parent group" -msgstr "" +msgstr "无法禁用父组的“共享群组锁”，只有父群组的所有者才可以操作！" msgid "GroupSettings|remove the share with group lock from %{ancestor_group_name}" -msgstr "" +msgstr "从 %{ancestor_group_name} 中删除共享群组锁" msgid "Health Check" msgstr "健康检查" @@ -726,30 +949,55 @@ msgstr "没有检测到健康问题" msgid "HealthCheck|Unhealthy" msgstr "非健康" +msgid "History" +msgstr "历史" + msgid "Housekeeping successfully started" msgstr "已开始维护" msgid "Import repository" msgstr "导入存储库" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "协助改进 GitLab 企业版的议题看板。" + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "协助改善GitLab 企业版的议题管理与权重。" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "协助改进GitLab 企业版的搜索和高级全局搜索 。" + msgid "Install a Runner compatible with GitLab CI" msgstr "安装一个与 GitLab CI 兼容的 Runner" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "例子" + msgid "Interval Pattern" msgstr "循环周期" msgid "Introducing Cycle Analytics" msgstr "周期分析简介" +msgid "Issue board focus mode" +msgstr "议题看板模式" + +msgid "Issue boards with milestones" +msgstr "议题看板与里程碑" + msgid "Issue events" msgstr "议题事件" +msgid "IssueBoards|Board" +msgstr "看板" + +msgid "IssueBoards|Boards" +msgstr "看板" + msgid "Issues" msgstr "议题" -msgid "Jobs" -msgstr "" - msgid "LFSStatus|Disabled" msgstr "停用" @@ -766,12 +1014,21 @@ msgstr[0] "最近 %d 天" msgid "Last Pipeline" msgstr "最新流水线" -msgid "Last Update" -msgstr "最后更新" - msgid "Last commit" msgstr "最后提交" +msgid "Last edited %{date}" +msgstr "最后修改 %{date}" + +msgid "Last edited by %{name}" +msgstr "最后修改人 %{name}" + +msgid "Last update" +msgstr "最后更新" + +msgid "Last updated" +msgstr "最后更新" + msgid "LastPushEvent|You pushed to" msgstr "您推送了" @@ -791,14 +1048,20 @@ msgid "Leave project" msgstr "退出项目" msgid "License" -msgstr "" +msgstr "许可协议" msgid "Limited to showing %d event at most" msgid_plural "Limited to showing %d events at most" msgstr[0] "最多显示 %d 个事件" +msgid "Lock" +msgstr "锁定" + +msgid "Locked" +msgstr "已锁定" + msgid "Locked Files" -msgstr "" +msgstr "已锁定文件" msgid "Median" msgstr "中位数" @@ -813,7 +1076,7 @@ msgid "Merge events" msgstr "合并事件" msgid "Merge request" -msgstr "" +msgstr "合并请求" msgid "Messages" msgstr "消息" @@ -827,6 +1090,9 @@ msgstr "监控" msgid "More information is available|here" msgstr "帮助文档" +msgid "Multiple issue boards" +msgstr "多个议题看板" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "新建议题" @@ -858,12 +1124,18 @@ msgstr "新建代码片段" msgid "New tag" msgstr "新建标签" +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "没有存储库" msgid "No schedules" msgstr "没有计划" +msgid "None" +msgstr "无" + msgid "Not available" msgstr "数据不足" @@ -930,9 +1202,15 @@ msgstr "通知" msgid "OfSearchInADropdown|Filter" msgstr "筛选" +msgid "Only project members can comment." +msgstr "只有项目成员可以发表评论。" + msgid "OpenedNDaysAgo|Opened" msgstr "开始于" +msgid "Opens in a new window" +msgstr "打开一个新窗口" + msgid "Options" msgstr "操作" @@ -943,20 +1221,23 @@ msgid "Owner" msgstr "所有者" msgid "Pagination|Last »" -msgstr "" +msgstr "尾页 »" msgid "Pagination|Next" -msgstr "" +msgstr "下一页" msgid "Pagination|Prev" -msgstr "" +msgstr "上一页" msgid "Pagination|« First" -msgstr "" +msgstr "« 首页" msgid "Password" msgstr "密码" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "未经许可的人将永远不会收到通知并且无法评论。" + msgid "Pipeline" msgstr "流水线" @@ -970,7 +1251,7 @@ msgid "Pipeline Schedules" msgstr "流水线计划" msgid "Pipeline quota" -msgstr "" +msgstr "流水线配额" msgid "PipelineCharts|Failed:" msgstr "失败：" @@ -1060,7 +1341,7 @@ msgid "Preferences" msgstr "偏好设置" msgid "Profile" -msgstr "" +msgstr "用户信息" msgid "Project '%{project_name}' queued for deletion." msgstr "项目 '%{project_name}' 已进入删除队列。" @@ -1116,8 +1397,23 @@ msgstr "阶段" msgid "ProjectNetworkGraph|Graph" msgstr "分支图" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "联系管理员更改此设置。" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "只有已签署提交才可以推送到此存储库。" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "此设置已应用于服务器级别，可由管理员覆盖。" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "此设置应用于服务器级别，但已被该项目覆盖。" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "此设置将应用于所有项目，除非被管理员覆盖。" + msgid "ProjectsDropdown|Frequently visited" -msgstr "" +msgstr "经常访问" msgid "ProjectsDropdown|Loading projects" msgstr "加载项目中" @@ -1129,7 +1425,7 @@ msgid "ProjectsDropdown|Search your projects" msgstr "搜索您的项目" msgid "ProjectsDropdown|Something went wrong on our end." -msgstr "" +msgstr "发生了内部错误" msgid "ProjectsDropdown|Sorry, no projects matched your search" msgstr "对不起，没有搜索到符合条件的项目" @@ -1138,7 +1434,7 @@ msgid "ProjectsDropdown|This feature requires browser localStorage support" msgstr "此功能需要浏览器支持 localStorage" msgid "Push Rules" -msgstr "" +msgstr "推送规则" msgid "Push events" msgstr "推送事件" @@ -1156,7 +1452,7 @@ msgid "RefSwitcher|Tags" msgstr "标签" msgid "Registry" -msgstr "" +msgstr "注册表" msgid "Related Commits" msgstr "相关的提交" @@ -1206,6 +1502,9 @@ msgstr "还原此合并请求" msgid "SSH Keys" msgstr "SSH 密钥" +msgid "Save changes" +msgstr "保存修改" + msgid "Save pipeline schedule" msgstr "保存流水线计划" @@ -1213,7 +1512,7 @@ msgid "Schedule a new pipeline" msgstr "新建流水线计划" msgid "Schedules" -msgstr "" +msgstr "日程" msgid "Scheduling Pipelines" msgstr "流水线计划" @@ -1227,9 +1526,6 @@ msgstr "选择下载格式" msgid "Select a timezone" msgstr "选择时区" -msgid "Select existing branch" -msgstr "选择现有分支" - msgid "Select target branch" msgstr "选择目标分支" @@ -1255,10 +1551,10 @@ msgid "Settings" msgstr "设置" msgid "Show parent pages" -msgstr "" +msgstr "查看父页面" msgid "Show parent subgroups" -msgstr "" +msgstr "查看群组中的子群组" msgid "Showing %d event" msgid_plural "Showing %d events" @@ -1267,101 +1563,113 @@ msgstr[0] "显示 %d 个事件" msgid "Snippets" msgstr "代码片段" -msgid "SortOptions|Access level, ascending" +msgid "Something went wrong on our end." msgstr "" -msgid "SortOptions|Access level, descending" +msgid "Something went wrong while fetching the projects." msgstr "" -msgid "SortOptions|Created date" +msgid "Something went wrong while fetching the registry list." msgstr "" +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" +msgstr "尝试更改 ${this.issuableDisplayName(this.issuableType)} 的锁定状态时发生错误" + +msgid "SortOptions|Access level, ascending" +msgstr "访问级别，升序排列" + +msgid "SortOptions|Access level, descending" +msgstr "访问级别，降序排列" + +msgid "SortOptions|Created date" +msgstr "创建日期" + msgid "SortOptions|Due date" -msgstr "" +msgstr "截止日期" msgid "SortOptions|Due later" -msgstr "" +msgstr "已截止" msgid "SortOptions|Due soon" -msgstr "" +msgstr "即将截止" msgid "SortOptions|Label priority" -msgstr "" +msgstr "标签优先" msgid "SortOptions|Largest group" -msgstr "" +msgstr "最大群组" msgid "SortOptions|Largest repository" -msgstr "" +msgstr "最大存储库" msgid "SortOptions|Last created" -msgstr "" +msgstr "最新创建" msgid "SortOptions|Last joined" -msgstr "" +msgstr "最新加入" msgid "SortOptions|Last updated" -msgstr "" +msgstr "最新更新" msgid "SortOptions|Least popular" -msgstr "" +msgstr "最不受欢迎" msgid "SortOptions|Less weight" -msgstr "" +msgstr "最低权重" msgid "SortOptions|Milestone" -msgstr "" +msgstr "里程碑" msgid "SortOptions|Milestone due later" -msgstr "" +msgstr "里程碑截止日期" msgid "SortOptions|Milestone due soon" -msgstr "" +msgstr "即将截止的里程碑" msgid "SortOptions|More weight" -msgstr "" +msgstr "更大的权重" msgid "SortOptions|Most popular" -msgstr "" +msgstr "最受欢迎" msgid "SortOptions|Name" -msgstr "" +msgstr "名称" msgid "SortOptions|Name, ascending" -msgstr "" +msgstr "名称，升序排列" msgid "SortOptions|Name, descending" -msgstr "" +msgstr "名称，降序排列" msgid "SortOptions|Oldest created" -msgstr "" +msgstr "最早的创建" msgid "SortOptions|Oldest joined" -msgstr "" +msgstr "最早的加入" msgid "SortOptions|Oldest sign in" -msgstr "" +msgstr "最早的登录" msgid "SortOptions|Oldest updated" -msgstr "" +msgstr "最早的提交" msgid "SortOptions|Popularity" -msgstr "" +msgstr "人气" msgid "SortOptions|Priority" -msgstr "" +msgstr "优先" msgid "SortOptions|Recent sign in" -msgstr "" +msgstr "最近登录" msgid "SortOptions|Start later" -msgstr "" +msgstr "稍后开始" msgid "SortOptions|Start soon" -msgstr "" +msgstr "现在开始" msgid "SortOptions|Weight" -msgstr "" +msgstr "权重" msgid "Source code" msgstr "源代码" @@ -1376,7 +1684,7 @@ msgid "StarProject|Star" msgstr "星标" msgid "Starred projects" -msgstr "" +msgstr "已星标项目" msgid "Start a %{new_merge_request} with these changes" msgstr "由此更改 %{new_merge_request}" @@ -1388,7 +1696,7 @@ msgid "Switch branch/tag" msgstr "切换分支/标签" msgid "System Hooks" -msgstr "" +msgstr "系统钩子" msgid "Tag" msgid_plural "Tags" @@ -1403,6 +1711,12 @@ msgstr "目标分支" msgid "Team" msgstr "团队" +msgid "Thanks! Don't show me this again" +msgstr "谢谢 ! 请不要再显示" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "GitLab 中的高级全局搜索功能是非常强大的搜索服务。您可以搜索其他团队的代码以帮助您完善自己的项目中的代码。从而避免创建重复的代码或浪费时间。" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "编码阶段概述了从第一次提交到创建合并请求的时间。创建第一个合并请求后，数据将自动添加到此处。" @@ -1454,12 +1768,24 @@ msgstr "中位数是一个数列中最中间的值。例如在 3、5、9 之间 msgid "There are problems accessing Git storage: " msgstr "访问 Git 存储时出现问题：" -msgid "This is the author's first Merge Request to this project. Handle with care." -msgstr "" +msgid "This is a confidential issue." +msgstr "这是一个机密议题。" + +msgid "This is the author's first Merge Request to this project." +msgstr "这是作者为项目贡献的第一个合并请求。" + +msgid "This issue is confidential and locked." +msgstr "这个是机密且已锁定的议题。" + +msgid "This issue is locked." +msgstr "此议题已锁定。" msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "在创建一个空的存储库或导入现有存储库之前，将无法推送代码。" +msgid "This merge request is locked." +msgstr "此合并请求已锁定。" + msgid "Time before an issue gets scheduled" msgstr "议题被列入日程表的时间" @@ -1538,9 +1864,6 @@ msgstr " 1 个月前" msgid "Timeago|a week ago" msgstr " 1 星期前" -msgid "Timeago|a while" -msgstr "刚刚" - msgid "Timeago|a year ago" msgstr " 1 年前" @@ -1592,6 +1915,9 @@ msgstr " 1 星期后" msgid "Timeago|in 1 year" msgstr " 1 年后" +msgid "Timeago|in a while" +msgstr "刚刚" + msgid "Timeago|less than a minute ago" msgstr "不到 1 分钟前" @@ -1612,9 +1938,33 @@ msgstr "总时间" msgid "Total test time for all commits/merges" msgstr "所有提交和合并的总测试时间" +msgid "Track activity with Contribution Analytics." +msgstr "跟踪分析贡献与活动。" + +msgid "Unlock" +msgstr "解锁" + +msgid "Unlocked" +msgstr "已解锁" + msgid "Unstar" msgstr "取消星标" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "升级您的方案以启用高级全局搜索。" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "升级您的方案以启用贡献分析。" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "升级您的方案以激活 Webhooks 。" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "升级您的方案以激活议题权重。" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "升级您的方案以使用议题看板。" + msgid "Upload New File" msgstr "上传新文件" @@ -1631,13 +1981,13 @@ msgid "Use your global notification setting" msgstr "使用全局通知设置" msgid "View file @ " -msgstr "" +msgstr "浏览文件 @ " msgid "View open merge request" msgstr "查看待处理的合并请求" msgid "View replaced file @ " -msgstr "" +msgstr "查看替换文件 @ " msgid "VisibilityLevel|Internal" msgstr "内部" @@ -1657,9 +2007,117 @@ msgstr "权限不足。如需查看相关数据，请向管理员申请权限。 msgid "We don't have enough data to show this stage." msgstr "该阶段的数据不足，无法显示。" +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "如果有新的推送或新的议题，Webhook将自动触发您设置URL。 您可以配置 Webhook 来监听特定事件，如推送、议题或合并请求。 群组 Webhook 将适用于团队中的所有项目，并允许您设置整个团队中的 Webhook 。" + +msgid "Weight" +msgstr "权重" + msgid "Wiki" msgstr "Wiki" +msgid "WikiClone|Clone your wiki" +msgstr "克隆您的 wiki" + +msgid "WikiClone|Git Access" +msgstr "Git 访问" + +msgid "WikiClone|Install Gollum" +msgstr "安装 Gollum" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "建议安装 %{markdown}，以便 GFM 功能在本地渲染：" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "启动 Gollum 并在本地编辑" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "您不能创建 wiki 页面" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "这是此页面的过期版本。" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "您可以查看 %{most_recent_link} 或浏览 %{history_link}。" + +msgid "WikiHistoricalPage|history" +msgstr "历史" + +msgid "WikiHistoricalPage|most recent version" +msgstr "最新版本" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "更多示例在 %{docs_link}" + +msgid "WikiMarkdownDocs|documentation" +msgstr "文档" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "要链接到(新)页面，只需键入 %{link_example}" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "如何设置" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "提示：您可以指定新文件的完整路径。我们将自动创建完整的目录。" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "新 Wiki 页面" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "确定要删除此页面吗？" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "有人在同一时间编辑了页面。请检查 %{page_link} 并确保您的更改不会无意中删除。" + +msgid "WikiPageConflictMessage|the page" +msgstr "这一页" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "创建 %{page_title}" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "更新 %{page_title}" + +msgid "WikiPage|Page slug" +msgstr "页面块" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "在这里撰写您的内容或拖曳文件到此..." + +msgid "Wiki|Create Page" +msgstr "创建页面" + +msgid "Wiki|Create page" +msgstr "创建页面" + +msgid "Wiki|Edit Page" +msgstr "修改页面" + +msgid "Wiki|Empty page" +msgstr "空页面" + +msgid "Wiki|More Pages" +msgstr "更多页面" + +msgid "Wiki|New page" +msgstr "新页面" + +msgid "Wiki|Page history" +msgstr "页面历史" + +msgid "Wiki|Page version" +msgstr "页面版本" + +msgid "Wiki|Pages" +msgstr "页面" + +msgid "Wiki|Wiki Pages" +msgstr "Wiki 页面" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "通过贡献分析，您可以分析您的组织及其成员的议题、 合并请求和推送活动。" + msgid "Withdraw Access Request" msgstr "取消权限申请" @@ -1708,14 +2166,17 @@ msgstr "在账号中 %{set_password_link} 之前将无法通过 %{protocol} 拉 msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "在账号中 %{add_ssh_key_link} 之前将无法通过 SSH 拉取或推送代码。" +msgid "Your comment will not be visible to the public." +msgstr "您的评论将不会公开显示。" + msgid "Your name" msgstr "您的名字" msgid "Your projects" -msgstr "" +msgstr "您的项目" msgid "commit" -msgstr "" +msgstr "提交" msgid "day" msgid_plural "days" @@ -1731,3 +2192,9 @@ msgid "parent" msgid_plural "parents" msgstr[0] "父级" +msgid "to help your contributors communicate effectively!" +msgstr "帮助您的贡献者进行有效沟通！" + +msgid "personal access token" +msgstr "" + diff --git a/locale/zh_HK/gitlab.po b/locale/zh_HK/gitlab.po index c3b6cc72aed..1ae511b4d6d 100644 --- a/locale/zh_HK/gitlab.po +++ b/locale/zh_HK/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:44-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 05:36-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: Chinese Traditional, Hong Kong\n" "Language: zh_HK\n" @@ -20,6 +20,10 @@ msgid "%d commit" msgid_plural "%d commits" msgstr[0] " %d 次提交" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "為提高頁面加載速度及性能，已省略了 %s 次提交。" @@ -53,6 +57,9 @@ msgstr[0] "%d 條流水線" msgid "1st contribution!" msgstr "" +msgid "2FA enabled" +msgstr "" + msgid "A collection of graphs regarding Continuous Integration" msgstr "相關持續集成的圖像集合" @@ -77,12 +84,18 @@ msgstr "啟用" msgid "Activity" msgstr "活動" +msgid "Add" +msgstr "" + msgid "Add Changelog" msgstr "添加更新日誌" msgid "Add Contribution guide" msgstr "添加貢獻指南" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "" + msgid "Add License" msgstr "添加許可證" @@ -128,25 +141,31 @@ msgstr "拖放文件到此處或者 %{upload_link}" msgid "Authentication Log" msgstr "" -msgid "Auto DevOps (Beta)" +msgid "Author" msgstr "" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." msgstr "" -msgid "Auto DevOps documentation" +msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." +msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." msgstr "" -msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." +msgid "AutoDevOps|Auto DevOps (Beta)" msgstr "" -msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgstr "" + +msgid "AutoDevOps|Auto DevOps documentation" +msgstr "" + +msgid "AutoDevOps|Enable in settings" msgstr "" -msgid "AutoDevOps|Learn more in the" +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgstr "" msgid "Billing" @@ -164,6 +183,9 @@ msgstr "" msgid "BillingPlans|Customer Support" msgstr "" +msgid "BillingPlans|Downgrade" +msgstr "" + msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." msgstr "" @@ -200,12 +222,6 @@ msgstr "" msgid "BillingPlans|per user" msgstr "" -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" - msgid "Branch" msgid_plural "Branches" msgstr[0] "分支" @@ -327,12 +343,18 @@ msgstr "" msgid "CI configuration" msgstr "CI 配置" +msgid "CICD|Jobs" +msgstr "" + msgid "Cancel" msgstr "取消" msgid "Cancel edit" msgstr "取消编辑" +msgid "Change Weight" +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "挑選到分支" @@ -360,6 +382,9 @@ msgstr "優選此提交" msgid "Cherry-pick this merge request" msgstr "優選此合併請求" +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "" + msgid "CiStatusLabel|canceled" msgstr "已取消" @@ -414,6 +439,135 @@ msgstr "已跳過" msgid "CiStatus|running" msgstr "運行中" +msgid "Clone repository" +msgstr "" + +msgid "Close" +msgstr "" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "評論 (Comment)" @@ -421,6 +575,9 @@ msgid "Commit" msgid_plural "Commits" msgstr[0] "提交" +msgid "Commit Message" +msgstr "" + msgid "Commit duration in minutes for last 30 commits" msgstr "最近30次提交花費的時間（分鐘）" @@ -448,6 +605,51 @@ msgstr "提交者：" msgid "Compare" msgstr "比較" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "貢獻指南" @@ -466,9 +668,6 @@ msgstr "複製提交 SHA 到剪貼板" msgid "Create New Directory" msgstr "創建新目錄" -msgid "Create a new branch" -msgstr "創建壹個新分支 (branch)" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "在帳戶上創建個人訪問令牌，以通過 %{protocol} 來拉取或推送。" @@ -532,6 +731,12 @@ msgstr "預發布" msgid "CycleAnalyticsStage|Test" msgstr "測試" +msgid "DashboardProjects|All" +msgstr "" + +msgid "DashboardProjects|Personal" +msgstr "" + msgid "Define a custom pattern with cron syntax" msgstr "使用 Cron 語法定義自定義模式" @@ -548,6 +753,9 @@ msgstr "" msgid "Description" msgstr "描述" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "" + msgid "Details" msgstr "詳情" @@ -557,6 +765,9 @@ msgstr "目錄名稱" msgid "Discard changes" msgstr "放棄更改" +msgid "Dismiss Merge Request promotion" +msgstr "" + msgid "Don't show again" msgstr "不再顯示" @@ -596,9 +807,6 @@ msgstr "編輯 %{id} 流水線計劃" msgid "Emails" msgstr "" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "全部" @@ -660,6 +868,12 @@ msgstr[0] "派生" msgid "ForkedFromProjectPath|Forked from" msgstr "派生自" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "" + +msgid "Format" +msgstr "" + msgid "From issue creation until deploy to production" msgstr "從創建議題到部署到生產環境" @@ -672,6 +886,12 @@ msgstr "" msgid "Geo Nodes" msgstr "" +msgid "Geo|Groups to replicate" +msgstr "" + +msgid "Geo|Select groups to replicate." +msgstr "" + msgid "Git storage health information has been reset" msgstr "Git 存儲健康信息已重置" @@ -684,6 +904,9 @@ msgstr "跳轉到派生項目" msgid "GoToYourFork|Fork" msgstr "跳轉到派生項目" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." +msgstr "" + msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgstr "" @@ -726,28 +949,53 @@ msgstr "沒有檢測到健康問題" msgid "HealthCheck|Unhealthy" msgstr "不良" +msgid "History" +msgstr "" + msgid "Housekeeping successfully started" msgstr "已開始維護" msgid "Import repository" msgstr "導入存儲庫" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "" + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "" + msgid "Install a Runner compatible with GitLab CI" msgstr "安裝壹個與 GitLab CI 兼容的 Runner" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "" + msgid "Interval Pattern" msgstr "循環週期" msgid "Introducing Cycle Analytics" msgstr "週期分析簡介" +msgid "Issue board focus mode" +msgstr "" + +msgid "Issue boards with milestones" +msgstr "" + msgid "Issue events" msgstr "議題事件 (issue event)" -msgid "Issues" +msgid "IssueBoards|Board" +msgstr "" + +msgid "IssueBoards|Boards" msgstr "" -msgid "Jobs" +msgid "Issues" msgstr "" msgid "LFSStatus|Disabled" @@ -766,12 +1014,21 @@ msgstr[0] "最近 %d 天" msgid "Last Pipeline" msgstr "最新流水線" -msgid "Last Update" -msgstr "最後更新" - msgid "Last commit" msgstr "最後提交" +msgid "Last edited %{date}" +msgstr "" + +msgid "Last edited by %{name}" +msgstr "" + +msgid "Last update" +msgstr "" + +msgid "Last updated" +msgstr "" + msgid "LastPushEvent|You pushed to" msgstr "您推送了" @@ -797,6 +1054,12 @@ msgid "Limited to showing %d event at most" msgid_plural "Limited to showing %d events at most" msgstr[0] "最多顯示 %d 個事件" +msgid "Lock" +msgstr "" + +msgid "Locked" +msgstr "" + msgid "Locked Files" msgstr "" @@ -827,6 +1090,9 @@ msgstr "" msgid "More information is available|here" msgstr "幫助文檔" +msgid "Multiple issue boards" +msgstr "" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "新建議題" @@ -858,12 +1124,18 @@ msgstr "新代碼片段" msgid "New tag" msgstr "新增標籤" +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "沒有存儲庫" msgid "No schedules" msgstr "沒有計劃" +msgid "None" +msgstr "" + msgid "Not available" msgstr "不可用" @@ -930,9 +1202,15 @@ msgstr "" msgid "OfSearchInADropdown|Filter" msgstr "篩選" +msgid "Only project members can comment." +msgstr "" + msgid "OpenedNDaysAgo|Opened" msgstr "開始於" +msgid "Opens in a new window" +msgstr "" + msgid "Options" msgstr "操作" @@ -957,6 +1235,9 @@ msgstr "" msgid "Password" msgstr "" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "" + msgid "Pipeline" msgstr "流水線" @@ -1116,6 +1397,21 @@ msgstr "階段" msgid "ProjectNetworkGraph|Graph" msgstr "分支圖" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "" @@ -1206,6 +1502,9 @@ msgstr "還原此合併請求" msgid "SSH Keys" msgstr "" +msgid "Save changes" +msgstr "" + msgid "Save pipeline schedule" msgstr "保存流水線計劃" @@ -1227,9 +1526,6 @@ msgstr "選擇下載格式" msgid "Select a timezone" msgstr "選擇時區" -msgid "Select existing branch" -msgstr "選擇現有分支 (branch)" - msgid "Select target branch" msgstr "選擇目標分支" @@ -1267,6 +1563,18 @@ msgstr[0] "顯示 %d 個事件" msgid "Snippets" msgstr "" +msgid "Something went wrong on our end." +msgstr "" + +msgid "Something went wrong while fetching the projects." +msgstr "" + +msgid "Something went wrong while fetching the registry list." +msgstr "" + +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" +msgstr "" + msgid "SortOptions|Access level, ascending" msgstr "" @@ -1403,6 +1711,12 @@ msgstr "目標分支" msgid "Team" msgstr "團隊" +msgid "Thanks! Don't show me this again" +msgstr "" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "編碼階段概述了從第壹次提交到創建合併請求的時間。創建第壹個合併請求後，數據將自動添加到此處。" @@ -1454,12 +1768,24 @@ msgstr "中位數是壹個數列中最中間的值。例如在 3、5、9 之間 msgid "There are problems accessing Git storage: " msgstr "訪問 Git 存儲時出現問題：" -msgid "This is the author's first Merge Request to this project. Handle with care." +msgid "This is a confidential issue." +msgstr "" + +msgid "This is the author's first Merge Request to this project." +msgstr "" + +msgid "This issue is confidential and locked." +msgstr "" + +msgid "This issue is locked." msgstr "" msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "在創建壹個空的存儲庫或導入現有存儲庫之前，您將無法推送代碼。" +msgid "This merge request is locked." +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "議題被列入日程表的時間" @@ -1538,9 +1864,6 @@ msgstr " 1 個月前" msgid "Timeago|a week ago" msgstr " 1 星期前" -msgid "Timeago|a while" -msgstr " 剛剛" - msgid "Timeago|a year ago" msgstr " 1 年前" @@ -1592,6 +1915,9 @@ msgstr " 1 星期後" msgid "Timeago|in 1 year" msgstr " 1 年後" +msgid "Timeago|in a while" +msgstr "" + msgid "Timeago|less than a minute ago" msgstr "不到 1 分鐘前" @@ -1612,9 +1938,33 @@ msgstr "總時間" msgid "Total test time for all commits/merges" msgstr "所有提交和合併的總測試時間" +msgid "Track activity with Contribution Analytics." +msgstr "" + +msgid "Unlock" +msgstr "" + +msgid "Unlocked" +msgstr "" + msgid "Unstar" msgstr "取消星標" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "" + msgid "Upload New File" msgstr "上傳新文件" @@ -1657,9 +2007,117 @@ msgstr "權限不足。如需查看相關數據，請向管理員申請權限。 msgid "We don't have enough data to show this stage." msgstr "該階段的數據不足，無法顯示。" +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "" + +msgid "Weight" +msgstr "" + msgid "Wiki" msgstr "" +msgid "WikiClone|Clone your wiki" +msgstr "" + +msgid "WikiClone|Git Access" +msgstr "" + +msgid "WikiClone|Install Gollum" +msgstr "" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "" + +msgid "WikiHistoricalPage|history" +msgstr "" + +msgid "WikiHistoricalPage|most recent version" +msgstr "" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "" + +msgid "WikiMarkdownDocs|documentation" +msgstr "" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "" + +msgid "WikiPageConflictMessage|the page" +msgstr "" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "" + +msgid "WikiPage|Page slug" +msgstr "" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "" + +msgid "Wiki|Create Page" +msgstr "" + +msgid "Wiki|Create page" +msgstr "" + +msgid "Wiki|Edit Page" +msgstr "" + +msgid "Wiki|Empty page" +msgstr "" + +msgid "Wiki|More Pages" +msgstr "" + +msgid "Wiki|New page" +msgstr "" + +msgid "Wiki|Page history" +msgstr "" + +msgid "Wiki|Page version" +msgstr "" + +msgid "Wiki|Pages" +msgstr "" + +msgid "Wiki|Wiki Pages" +msgstr "" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "" + msgid "Withdraw Access Request" msgstr "取消權限申请" @@ -1708,6 +2166,9 @@ msgstr "在賬號上 %{set_password_link} 之前將無法通過 %{protocol} 拉 msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "在賬號中 %{add_ssh_key_link} 之前將無法通過 SSH 拉取或推送代碼。" +msgid "Your comment will not be visible to the public." +msgstr "" + msgid "Your name" msgstr "您的名字" @@ -1731,3 +2192,9 @@ msgid "parent" msgid_plural "parents" msgstr[0] "父級" +msgid "to help your contributors communicate effectively!" +msgstr "" + +msgid "personal access token" +msgstr "" + diff --git a/locale/zh_TW/gitlab.po b/locale/zh_TW/gitlab.po index 8a14cd01566..d0c852f35ff 100644 --- a/locale/zh_TW/gitlab.po +++ b/locale/zh_TW/gitlab.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab-ee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 16:26+0200\n" -"PO-Revision-Date: 2017-09-27 13:44-0400\n" +"POT-Creation-Date: 2017-10-06 22:39+0200\n" +"PO-Revision-Date: 2017-10-17 13:01-0400\n" "Last-Translator: gitlab <mbartlett+crowdin@gitlab.com>\n" "Language-Team: Chinese Traditional\n" "Language: zh_TW\n" @@ -20,6 +20,10 @@ msgid "%d commit" msgid_plural "%d commits" msgstr[0] "%d 個更動 (commit)" +msgid "%d layer" +msgid_plural "%d layers" +msgstr[0] "" + msgid "%s additional commit has been omitted to prevent performance issues." msgid_plural "%s additional commits have been omitted to prevent performance issues." msgstr[0] "因效能考量，不顯示 %s 個更動 (commit)。" @@ -28,7 +32,7 @@ msgid "%{commit_author_link} committed %{commit_timeago}" msgstr "%{commit_author_link} 在 %{commit_timeago} 送交" msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead" -msgstr "" +msgstr "%{number_commits_behind} 個落後 %{default_branch} 分支的修訂版提交，%{number_commits_ahead} 個超前的修訂版提交" msgid "%{number_of_failures} of %{maximum_failures} failures. GitLab will allow access on the next attempt." msgstr "已失敗 %{number_of_failures} 次，在失敗 %{maximum_failures} 次前 GitLab 會重試。" @@ -51,6 +55,9 @@ msgid_plural "%d pipelines" msgstr[0] "%d 條流水線" msgid "1st contribution!" +msgstr "第一次協作" + +msgid "2FA enabled" msgstr "" msgid "A collection of graphs regarding Continuous Integration" @@ -60,10 +67,10 @@ msgid "About auto deploy" msgstr "關於自動部署" msgid "Abuse Reports" -msgstr "" +msgstr "濫用報告" msgid "Access Tokens" -msgstr "" +msgstr "存取憑證 (access token)" msgid "Access to failing storages has been temporarily disabled to allow the mount to recover. Reset storage information after the issue has been resolved to allow access again." msgstr "已暫時停用失敗的 Git 儲存空間。當儲存空間恢復正常後，請重置儲存空間健康指數。" @@ -77,12 +84,18 @@ msgstr "啟用" msgid "Activity" msgstr "活動" +msgid "Add" +msgstr "增加" + msgid "Add Changelog" msgstr "新增更新日誌" msgid "Add Contribution guide" msgstr "新增協作指南" +msgid "Add Group Webhooks and GitLab Enterprise Edition." +msgstr "加入來自 Webhooks 或者是 GitHub 企業版的團隊" + msgid "Add License" msgstr "新增授權條款" @@ -96,7 +109,7 @@ msgid "All" msgstr "全部" msgid "Appearance" -msgstr "" +msgstr "外觀" msgid "Applications" msgstr "應用程式" @@ -120,91 +133,94 @@ msgid "Are you sure?" msgstr "確定嗎？" msgid "Artifacts" -msgstr "" +msgstr "產物" msgid "Attach a file by drag & drop or %{upload_link}" msgstr "拖放檔案到此處或者 %{upload_link}" msgid "Authentication Log" -msgstr "" - -msgid "Auto DevOps (Beta)" -msgstr "" +msgstr "驗證 Log" -msgid "Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." -msgstr "" - -msgid "Auto DevOps documentation" -msgstr "" +msgid "Author" +msgstr "作者" msgid "Auto Review Apps and Auto Deploy need a domain name and the %{kubernetes} to work correctly." -msgstr "" +msgstr "自動審查程序 & 自動部屬程序需要一個網域和 %{kubernetes} 才能運作。" msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." -msgstr "" +msgstr "自動審查程序 & 自動部屬程序需要一個網域才能正常運作。" msgid "Auto Review Apps and Auto Deploy need the %{kubernetes} to work correctly." -msgstr "" +msgstr "自動審查程序 & 自動部屬程序需要 %{kubernetes} 才能正常運作。" -msgid "AutoDevOps|Learn more in the" -msgstr "" +msgid "AutoDevOps|Auto DevOps (Beta)" +msgstr "DevOps 自動化 (測試版)" + +msgid "AutoDevOps|Auto DevOps can be activated for this project. It will automatically build, test, and deploy your application based on a predefined CI/CD configuration." +msgstr "為此專案啟用 「DevOps 自動化」。 它將依據預設的 CI/CD 配置自動構建、測試、部屬應用程式。" + +msgid "AutoDevOps|Auto DevOps documentation" +msgstr "「DevOps 自動化」 文件" + +msgid "AutoDevOps|Enable in settings" +msgstr "在設定中啟用" + +msgid "AutoDevOps|Learn more in the %{link_to_documentation}" +msgstr "了解更多於 %{link_to_documentation}" msgid "Billing" -msgstr "" +msgstr "方案" msgid "BillingPlans|%{group_name} is currently on the %{plan_link} plan." -msgstr "" +msgstr "%{group_name} 目前使用 %{plan_link} 方案。" msgid "BillingPlans|Automatic downgrade and upgrade to some plans is currently not available." -msgstr "" +msgstr "目前無法自動升級或降級至其他方案。" msgid "BillingPlans|Current plan" -msgstr "" +msgstr "目前方案" msgid "BillingPlans|Customer Support" -msgstr "" +msgstr "客戶服務" + +msgid "BillingPlans|Downgrade" +msgstr "降級" msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}." -msgstr "" +msgstr "了解更多我們的方案，或是閱讀 %{faq_link}" msgid "BillingPlans|Manage plan" -msgstr "" +msgstr "管理方案" msgid "BillingPlans|Please contact %{customer_support_link} in that case." -msgstr "" +msgstr "請聯繫 %{customer_support_link}" msgid "BillingPlans|See all %{plan_name} features" -msgstr "" +msgstr "查看更多 %{plan_name} 功能" msgid "BillingPlans|This group uses the plan associated with its parent group." -msgstr "" +msgstr "此群組使用和上層群組相同的方案。" msgid "BillingPlans|To manage the plan for this group, visit the billing section of %{parent_billing_page_link}." -msgstr "" +msgstr "要管理這個群組的方案，請瀏覽 %{parent_billing_page_link} 的計費部分。" msgid "BillingPlans|Upgrade" -msgstr "" +msgstr "升級" msgid "BillingPlans|You are currently on the %{plan_link} plan." -msgstr "" +msgstr "你目前正在使用方案 %{plan_link}" msgid "BillingPlans|frequently asked questions" -msgstr "" +msgstr "常見問題" msgid "BillingPlans|monthly" -msgstr "" +msgstr "每個月" msgid "BillingPlans|paid annually at %{price_per_year}" -msgstr "" +msgstr "每年支付 %{price_per_year}" msgid "BillingPlans|per user" -msgstr "" - -msgid "Billinglans|Downgrade" -msgstr "" - -msgid "Board" -msgstr "" +msgstr "每個使用者" msgid "Branch" msgid_plural "Branches" @@ -223,88 +239,88 @@ msgid "Branches" msgstr "分支 (branch) " msgid "Branches|Cant find HEAD commit for this branch" -msgstr "" +msgstr "不能找到這個分支的 HEAD 更動。" msgid "Branches|Compare" -msgstr "" +msgstr "比較" msgid "Branches|Delete all branches that are merged into '%{default_branch}'" -msgstr "" +msgstr "移除所有已經合併到 %{default_branch} 的分支。" msgid "Branches|Delete branch" -msgstr "" +msgstr "移除分支" msgid "Branches|Delete merged branches" -msgstr "" +msgstr "移除已經合併的分支" msgid "Branches|Delete protected branch" -msgstr "" +msgstr "移除受保護的分支" msgid "Branches|Delete protected branch '%{branch_name}'?" -msgstr "" +msgstr "確定要移除「%{branch_name}」這個受保護的分支嗎 ？" msgid "Branches|Deleting the '%{branch_name}' branch cannot be undone. Are you sure?" -msgstr "" +msgstr "移除 %{branch_name} 分支將無法還原，你確定？" msgid "Branches|Deleting the merged branches cannot be undone. Are you sure?" -msgstr "" +msgstr "移除已經合併的分支後將無法還原，你確定？" msgid "Branches|Filter by branch name" -msgstr "" +msgstr "按分支名稱篩選" msgid "Branches|Merged into %{default_branch}" -msgstr "" +msgstr "合併到 %{default_branch}" msgid "Branches|New branch" -msgstr "" +msgstr "新增分支" msgid "Branches|No branches to show" -msgstr "" +msgstr "找不到分支" msgid "Branches|Once you confirm and press %{delete_protected_branch}, it cannot be undone or recovered." -msgstr "" +msgstr "當你確認並按下 %{delete_protected_branch}，他將無法撤銷或還原。" msgid "Branches|Only a project master or owner can delete a protected branch" -msgstr "" +msgstr "只有專案管理者或擁有者才能刪除被保護的分支。" msgid "Branches|Protected branches can be managed in %{project_settings_link}" -msgstr "" +msgstr "在 %{project_settings_link} 管理受保護的分支" msgid "Branches|Sort by" -msgstr "" +msgstr "排序自" msgid "Branches|The branch could not be updated automatically because it has diverged from its upstream counterpart." -msgstr "" +msgstr "分支無法自動送交，因為與上游分支衝突。" msgid "Branches|The default branch cannot be deleted" -msgstr "" +msgstr "無法刪除預設分支" msgid "Branches|This branch hasn’t been merged into %{default_branch}." -msgstr "" +msgstr "這個分支尚未合併到 %{default_branch}" msgid "Branches|To avoid data loss, consider merging this branch before deleting it." -msgstr "" +msgstr "為避免資料丟失，請在刪除之前合併該分支。" msgid "Branches|To confirm, type %{branch_name_confirmation}:" -msgstr "" +msgstr "為了確認，請輸入 %{branch_name_confirmation} ：" msgid "Branches|To discard the local changes and overwrite the branch with the upstream version, delete it here and choose 'Update Now' above." -msgstr "" +msgstr "為了捨棄目前變更並使用上游版本覆蓋本分支，請先刪除並按下 \"立刻更新\"。" msgid "Branches|You’re about to permanently delete the protected branch %{branch_name}." -msgstr "" +msgstr "你將要永久刪除受保護的 %{branch_name} 分支。" msgid "Branches|diverged from upstream" -msgstr "" +msgstr "與上游存在差異" msgid "Branches|merged" -msgstr "" +msgstr "已合併" msgid "Branches|project settings" -msgstr "" +msgstr "專案設定" msgid "Branches|protected" -msgstr "" +msgstr "受保護的" msgid "Browse Directory" msgstr "瀏覽目錄" @@ -322,17 +338,23 @@ msgid "ByAuthor|by" msgstr "作者：" msgid "CI / CD" -msgstr "" +msgstr "CI / CD" msgid "CI configuration" msgstr "CI 組態" +msgid "CICD|Jobs" +msgstr "作業" + msgid "Cancel" msgstr "取消" msgid "Cancel edit" msgstr "取消編輯" +msgid "Change Weight" +msgstr "變更權重" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "挑選到分支 (branch) " @@ -352,7 +374,7 @@ msgid "Charts" msgstr "統計圖" msgid "Chat" -msgstr "" +msgstr "即時通訊" msgid "Cherry-pick this commit" msgstr "挑選此更動記錄 (commit) " @@ -360,6 +382,9 @@ msgstr "挑選此更動記錄 (commit) " msgid "Cherry-pick this merge request" msgstr "挑選此合併請求 (merge request) " +msgid "Choose which groups you wish to replicate to this secondary node. Leave blank to replicate all." +msgstr "選擇哪個群組是你要複製到第二節點的。留白則複製全部。" + msgid "CiStatusLabel|canceled" msgstr "已取消" @@ -414,6 +439,135 @@ msgstr "已跳過" msgid "CiStatus|running" msgstr "執行中" +msgid "Clone repository" +msgstr "克隆倉庫" + +msgid "Close" +msgstr "關閉" + +msgid "ClusterIntegration|A %{link_to_container_project} must have been created under this account" +msgstr "" + +msgid "ClusterIntegration|Cluster integration" +msgstr "" + +msgid "ClusterIntegration|Cluster integration is disabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project." +msgstr "" + +msgid "ClusterIntegration|Cluster integration is enabled for this project. Disabling this integration will not affect your cluster, it will only temporarily turn off GitLab's connection to it." +msgstr "" + +msgid "ClusterIntegration|Cluster is being created on Google Container Engine..." +msgstr "" + +msgid "ClusterIntegration|Cluster name" +msgstr "" + +msgid "ClusterIntegration|Cluster was successfully created on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Copy cluster name" +msgstr "" + +msgid "ClusterIntegration|Create cluster" +msgstr "" + +msgid "ClusterIntegration|Create new cluster on Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Enable cluster integration" +msgstr "" + +msgid "ClusterIntegration|Google Cloud Platform project ID" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine project" +msgstr "" + +msgid "ClusterIntegration|Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|Learn more about %{link_to_documentation}" +msgstr "" + +msgid "ClusterIntegration|See machine types" +msgstr "" + +msgid "ClusterIntegration|Make sure your account %{link_to_requirements} to create clusters" +msgstr "" + +msgid "ClusterIntegration|Manage your cluster by visiting %{link_gke}" +msgstr "" + +msgid "ClusterIntegration|Number of nodes" +msgstr "" + +msgid "ClusterIntegration|Project namespace (optional, unique)" +msgstr "" + +msgid "ClusterIntegration|Remove cluster integration" +msgstr "" + +msgid "ClusterIntegration|Remove integration" +msgstr "" + +msgid "ClusterIntegration|Removing cluster integration will remove the cluster configuration you have added to this project. It will not delete your project." +msgstr "" + +msgid "ClusterIntegration|Save changes" +msgstr "" + +msgid "ClusterIntegration|See your projects" +msgstr "" + +msgid "ClusterIntegration|See zones" +msgstr "" + +msgid "ClusterIntegration|Something went wrong on our end." +msgstr "" + +msgid "ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine." +msgstr "" + +msgid "ClusterIntegration|Please make sure that your Google account meets the following requirements:" +msgstr "" + +msgid "ClusterIntegration|Toggle Cluster" +msgstr "" + +msgid "ClusterIntegration|Read our %{link_to_help_page} on cluster integration." +msgstr "" + +msgid "ClusterIntegration|With a cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way." +msgstr "" + +msgid "ClusterIntegration|Your account must have %{link_to_container_engine}" +msgstr "" + +msgid "ClusterIntegration|Zone" +msgstr "" + +msgid "ClusterIntegration|access to Google Container Engine" +msgstr "" + +msgid "ClusterIntegration|cluster" +msgstr "" + +msgid "ClusterIntegration|help page" +msgstr "" + +msgid "ClusterIntegration|meets the requirements" +msgstr "" + +msgid "ClusterIntegration|properly configured" +msgstr "" + msgid "Comments" msgstr "留言" @@ -421,6 +575,9 @@ msgid "Commit" msgid_plural "Commits" msgstr[0] "更動記錄 (commit) " +msgid "Commit Message" +msgstr "更動訊息" + msgid "Commit duration in minutes for last 30 commits" msgstr "最近 30 次更動花費的時間（分鐘）" @@ -448,6 +605,51 @@ msgstr "送交者為 " msgid "Compare" msgstr "比較" +msgid "Container Registry" +msgstr "" + +msgid "ContainerRegistry|Created" +msgstr "" + +msgid "ContainerRegistry|First log in to GitLab’s Container Registry using your GitLab username and password. If you have %{link_2fa} you need to use a %{link_token}:" +msgstr "" + +msgid "ContainerRegistry|GitLab supports up to 3 levels of image names. The following examples of images are valid for your project:" +msgstr "" + +msgid "ContainerRegistry|How to use the Container Registry" +msgstr "" + +msgid "ContainerRegistry|Learn more about" +msgstr "" + +msgid "ContainerRegistry|No tags in Container Registry for this container image." +msgstr "" + +msgid "ContainerRegistry|Once you log in, you’re free to create and upload a container image using the common %{build} and %{push} commands" +msgstr "" + +msgid "ContainerRegistry|Remove repository" +msgstr "" + +msgid "ContainerRegistry|Remove tag" +msgstr "" + +msgid "ContainerRegistry|Size" +msgstr "" + +msgid "ContainerRegistry|Tag" +msgstr "" + +msgid "ContainerRegistry|Tag ID" +msgstr "" + +msgid "ContainerRegistry|Use different image names" +msgstr "" + +msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images." +msgstr "" + msgid "Contribution guide" msgstr "協作指南" @@ -455,7 +657,7 @@ msgid "Contributors" msgstr "協作者" msgid "Copy SSH public key to clipboard" -msgstr "" +msgstr "複製 SSH 公鑰到剪貼簿" msgid "Copy URL to clipboard" msgstr "複製網址到剪貼簿" @@ -466,9 +668,6 @@ msgstr "複製更動記錄 (commit) 的 SHA 值到剪貼簿" msgid "Create New Directory" msgstr "建立新目錄" -msgid "Create a new branch" -msgstr "建立新分支 (branch)" - msgid "Create a personal access token on your account to pull or push via %{protocol}." msgstr "建立個人存取憑證 (access token) 以使用 %{protocol} 來上傳 (push) 或下載 (pull) 。" @@ -532,6 +731,12 @@ msgstr "試營運" msgid "CycleAnalyticsStage|Test" msgstr "測試" +msgid "DashboardProjects|All" +msgstr "全部" + +msgid "DashboardProjects|Personal" +msgstr "個人" + msgid "Define a custom pattern with cron syntax" msgstr "使用 Cron 語法自訂排程" @@ -548,6 +753,9 @@ msgstr "部署金鑰" msgid "Description" msgstr "描述" +msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project." +msgstr "描述範本允許你為項目的議題和合併請求在建立時選擇特定的範本。" + msgid "Details" msgstr "細節" @@ -557,6 +765,9 @@ msgstr "目錄名稱" msgid "Discard changes" msgstr "放棄修改" +msgid "Dismiss Merge Request promotion" +msgstr "關閉合併請求中的促銷廣告" + msgid "Don't show again" msgstr "不再顯示" @@ -596,9 +807,6 @@ msgstr "編輯 %{id} 流水線 (pipeline) 排程" msgid "Emails" msgstr "電子郵件" -msgid "Enable in settings" -msgstr "" - msgid "EventFilterBy|Filter by all" msgstr "顯示全部" @@ -627,7 +835,7 @@ msgid "Every week (Sundays at 4:00am)" msgstr "每週執行（週日淩晨 四點）" msgid "Explore projects" -msgstr "" +msgstr "瀏覽項目" msgid "Failed to change the owner" msgstr "無法變更所有權" @@ -660,6 +868,12 @@ msgstr[0] "分支 (fork) " msgid "ForkedFromProjectPath|Forked from" msgstr "分支 (fork) 自" +msgid "ForkedFromProjectPath|Forked from %{project_name} (deleted)" +msgstr "從 %{project_name} Fork. (deleted)" + +msgid "Format" +msgstr "格式" + msgid "From issue creation until deploy to production" msgstr "從議題 (issue) 建立直到部署至營運環境" @@ -670,7 +884,13 @@ msgid "GPG Keys" msgstr "GPG 金鑰" msgid "Geo Nodes" -msgstr "" +msgstr "Geo 節點" + +msgid "Geo|Groups to replicate" +msgstr "要複製的群組" + +msgid "Geo|Select groups to replicate." +msgstr "選擇欲複製之群組。" msgid "Git storage health information has been reset" msgstr "Git 儲存空間健康指數已重置" @@ -684,29 +904,32 @@ msgstr "前往您的分支 (fork) " msgid "GoToYourFork|Fork" msgstr "前往您的分支 (fork) " -msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" +msgid "Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service." msgstr "" +msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" +msgstr "禁止與其他群組共享 %{group} 中的項目" + msgid "GroupSettings|Share with group lock" -msgstr "" +msgstr "分享群組鎖" msgid "GroupSettings|This setting is applied on %{ancestor_group} and has been overridden on this subgroup." -msgstr "" +msgstr "這個設定已經套用至 %{ancestor_group}，並已經覆蓋此子組的設定。" msgid "GroupSettings|This setting is applied on %{ancestor_group}. To share projects in this group with another group, ask the owner to override the setting or %{remove_ancestor_share_with_group_lock}." -msgstr "" +msgstr "此設定已經套用在 %{ancestor_group}。若要與其他群組共享此群組中的項目，請聯繫擁有者覆蓋這個設定或者 %{remove_ancestor_share_with_group_lock}" msgid "GroupSettings|This setting is applied on %{ancestor_group}. You can override the setting or %{remove_ancestor_share_with_group_lock}." -msgstr "" +msgstr "此設定已經套用至 %{ancestor_group}。你可以覆蓋此設定或是 %{remove_ancestor_share_with_group_lock}" msgid "GroupSettings|This setting will be applied to all subgroups unless overridden by a group owner. Groups that already have access to the project will continue to have access unless removed manually." -msgstr "" +msgstr "此設定將套用在所有子組，除非群組擁有者覆蓋。已經有權限瀏覽本項目的群組將仍可瀏覽，除非手動移除。" msgid "GroupSettings|cannot be disabled when the parent group \"Share with group lock\" is enabled, except by the owner of the parent group" -msgstr "" +msgstr "無法調用父組的 \"共享群組鎖\"，僅父群組的所有者才可操作。" msgid "GroupSettings|remove the share with group lock from %{ancestor_group_name}" -msgstr "" +msgstr "從 %{ancestor_group_name} 中移除共享群組鎖" msgid "Health Check" msgstr "健康檢查" @@ -726,30 +949,55 @@ msgstr "沒有檢測到健康問題" msgid "HealthCheck|Unhealthy" msgstr "不良" +msgid "History" +msgstr "歷史" + msgid "Housekeeping successfully started" msgstr "已開始維護" msgid "Import repository" msgstr "匯入檔案庫 (repository)" +msgid "Improve Issue boards with GitLab Enterprise Edition." +msgstr "協助改進 GitLab 企業版的問題看板。" + +msgid "Improve issues management with Issue weight and GitLab Enterprise Edition." +msgstr "協助改善 GitLab 企業版的問題管理與權重。" + +msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition." +msgstr "協助改進 GitLab 企業版的搜尋 & 進階全局搜尋。" + msgid "Install a Runner compatible with GitLab CI" msgstr "安裝與 GitLab CI 相容的 Runner" +msgid "Instance" +msgid_plural "Instances" +msgstr[0] "實例" + msgid "Interval Pattern" msgstr "循環週期" msgid "Introducing Cycle Analytics" msgstr "週期分析簡介" +msgid "Issue board focus mode" +msgstr "問題看板模式" + +msgid "Issue boards with milestones" +msgstr "問題看板 & 里程碑" + msgid "Issue events" msgstr "議題 (issue) 事件" +msgid "IssueBoards|Board" +msgstr "看板" + +msgid "IssueBoards|Boards" +msgstr "看板" + msgid "Issues" msgstr "議題" -msgid "Jobs" -msgstr "" - msgid "LFSStatus|Disabled" msgstr "停用" @@ -766,12 +1014,21 @@ msgstr[0] "最近 %d 天" msgid "Last Pipeline" msgstr "最新流水線 (pipeline) " -msgid "Last Update" -msgstr "最後更新" - msgid "Last commit" msgstr "最後更動記錄 (commit) " +msgid "Last edited %{date}" +msgstr "上次編輯於 %{date}" + +msgid "Last edited by %{name}" +msgstr "上次編輯由 %{name}" + +msgid "Last update" +msgstr "上次更新" + +msgid "Last updated" +msgstr "上次更新" + msgid "LastPushEvent|You pushed to" msgstr "您上傳 (push) 了" @@ -791,14 +1048,20 @@ msgid "Leave project" msgstr "退出專案" msgid "License" -msgstr "" +msgstr "授權" msgid "Limited to showing %d event at most" msgid_plural "Limited to showing %d events at most" msgstr[0] "限制最多顯示 %d 個事件" +msgid "Lock" +msgstr "鎖定" + +msgid "Locked" +msgstr "鎖定" + msgid "Locked Files" -msgstr "" +msgstr "被鎖定檔案" msgid "Median" msgstr "中位數" @@ -813,7 +1076,7 @@ msgid "Merge events" msgstr "合併 (merge) 事件" msgid "Merge request" -msgstr "" +msgstr "合併請求" msgid "Messages" msgstr "公告" @@ -827,6 +1090,9 @@ msgstr "監控" msgid "More information is available|here" msgstr "健康檢查" +msgid "Multiple issue boards" +msgstr "多個問題看板" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "建立議題 (issue) " @@ -858,12 +1124,18 @@ msgstr "新文字片段" msgid "New tag" msgstr "新增標籤" +msgid "No container images stored for this project. Add one by following the instructions above." +msgstr "" + msgid "No repository" msgstr "找不到檔案庫 (repository)" msgid "No schedules" msgstr "沒有排程" +msgid "None" +msgstr "無" + msgid "Not available" msgstr "無法使用" @@ -930,9 +1202,15 @@ msgstr "通知" msgid "OfSearchInADropdown|Filter" msgstr "篩選" +msgid "Only project members can comment." +msgstr "只有群組成員才能留言。" + msgid "OpenedNDaysAgo|Opened" msgstr "開始於" +msgid "Opens in a new window" +msgstr "於新視窗開啟" + msgid "Options" msgstr "選項" @@ -943,20 +1221,23 @@ msgid "Owner" msgstr "所有權" msgid "Pagination|Last »" -msgstr "" +msgstr "尾頁 »" msgid "Pagination|Next" -msgstr "" +msgstr "下一頁" msgid "Pagination|Prev" -msgstr "" +msgstr "上一頁" msgid "Pagination|« First" -msgstr "" +msgstr "« 首頁" msgid "Password" msgstr "密碼" +msgid "People without permission will never get a notification and won\\'t be able to comment." +msgstr "當使用者沒有權限，將不會收到任何通知以及無法留言" + msgid "Pipeline" msgstr "流水線 (pipeline) " @@ -970,7 +1251,7 @@ msgid "Pipeline Schedules" msgstr "流水線 (pipeline) 排程" msgid "Pipeline quota" -msgstr "" +msgstr "流水線配額" msgid "PipelineCharts|Failed:" msgstr "失敗：" @@ -1036,13 +1317,13 @@ msgid "Pipelines charts" msgstr "流水線 (pipeline) 圖表" msgid "Pipelines for last month" -msgstr "" +msgstr "上個月的流水線" msgid "Pipelines for last week" -msgstr "" +msgstr "上週的流水線" msgid "Pipelines for last year" -msgstr "" +msgstr "去年的流水線" msgid "Pipeline|all" msgstr "所有" @@ -1060,7 +1341,7 @@ msgid "Preferences" msgstr "偏好設定" msgid "Profile" -msgstr "" +msgstr "個人資料" msgid "Project '%{project_name}' queued for deletion." msgstr "專案 '%{project_name}' 已加入刪除佇列。" @@ -1116,20 +1397,35 @@ msgstr "階段" msgid "ProjectNetworkGraph|Graph" msgstr "分支圖" +msgid "ProjectSettings|Contact an admin to change this setting." +msgstr "聯絡管理員以變更設定。" + +msgid "ProjectSettings|Only signed commits can be pushed to this repository." +msgstr "只有已簽署的變更才能被推送到倉庫。" + +msgid "ProjectSettings|This setting is applied on the server level and can be overridden by an admin." +msgstr "此設定已經套用於伺服器層級，並且可被管理員覆寫。" + +msgid "ProjectSettings|This setting is applied on the server level but has been overridden for this project." +msgstr "此設定已經套用於伺服器級別，但已經在這個專案被覆寫。" + +msgid "ProjectSettings|This setting will be applied to all projects unless overridden by an admin." +msgstr "此設定將套用於所有專案，除非被管理員覆寫。" + msgid "ProjectsDropdown|Frequently visited" -msgstr "" +msgstr "經常使用" msgid "ProjectsDropdown|Loading projects" -msgstr "" +msgstr "讀取專案中" msgid "ProjectsDropdown|Projects you visit often will appear here" -msgstr "" +msgstr "您經常拜訪的專案會顯示在這裡" msgid "ProjectsDropdown|Search your projects" msgstr "搜尋您的專案" msgid "ProjectsDropdown|Something went wrong on our end." -msgstr "" +msgstr "發生了內部錯誤" msgid "ProjectsDropdown|Sorry, no projects matched your search" msgstr "抱歉，沒有符合搜尋條件的專案" @@ -1138,7 +1434,7 @@ msgid "ProjectsDropdown|This feature requires browser localStorage support" msgstr "此功能需要瀏覽器支援 localStorage" msgid "Push Rules" -msgstr "" +msgstr "推送 [Push] 規則" msgid "Push events" msgstr "推送 (push) 事件" @@ -1156,7 +1452,7 @@ msgid "RefSwitcher|Tags" msgstr "標籤" msgid "Registry" -msgstr "" +msgstr "登錄表" msgid "Related Commits" msgstr "相關的更動記錄 (commit) " @@ -1206,6 +1502,9 @@ msgstr "還原此合併請求 (merge request) " msgid "SSH Keys" msgstr "SSH 金鑰" +msgid "Save changes" +msgstr "儲存變更" + msgid "Save pipeline schedule" msgstr "儲存流水線 (pipeline) 排程" @@ -1213,7 +1512,7 @@ msgid "Schedule a new pipeline" msgstr "建立流水線 (pipeline) 排程" msgid "Schedules" -msgstr "" +msgstr "排程" msgid "Scheduling Pipelines" msgstr "流水線 (pipeline) 排程" @@ -1227,9 +1526,6 @@ msgstr "選擇下載格式" msgid "Select a timezone" msgstr "選擇時區" -msgid "Select existing branch" -msgstr "選擇現有分支 (branch)" - msgid "Select target branch" msgstr "選擇目標分支 (branch) " @@ -1255,119 +1551,131 @@ msgid "Settings" msgstr "設定" msgid "Show parent pages" -msgstr "" +msgstr "顯示父頁面" msgid "Show parent subgroups" -msgstr "" +msgstr "顯示群組中的子群組" msgid "Showing %d event" msgid_plural "Showing %d events" msgstr[0] "顯示 %d 個事件" msgid "Snippets" +msgstr "文字片段" + +msgid "Something went wrong on our end." msgstr "" -msgid "SortOptions|Access level, ascending" +msgid "Something went wrong while fetching the projects." msgstr "" -msgid "SortOptions|Access level, descending" +msgid "Something went wrong while fetching the registry list." msgstr "" +msgid "Something went wrong trying to change the locked state of this ${this.issuableDisplayName(this.issuableType)}" +msgstr "有個地方出錯了，因為他嘗試去變更 ${this.issuableDisplayName(this.issuableType)} 的鎖定狀態。" + +msgid "SortOptions|Access level, ascending" +msgstr "訪問級別、升冪排列" + +msgid "SortOptions|Access level, descending" +msgstr "訪問級別、降冪排列" + msgid "SortOptions|Created date" -msgstr "" +msgstr "建立日期" msgid "SortOptions|Due date" -msgstr "" +msgstr "截止日期" msgid "SortOptions|Due later" -msgstr "" +msgstr "已截止" msgid "SortOptions|Due soon" -msgstr "" +msgstr "即將截止" msgid "SortOptions|Label priority" -msgstr "" +msgstr "標籤優先" msgid "SortOptions|Largest group" -msgstr "" +msgstr "最大群組" msgid "SortOptions|Largest repository" -msgstr "" +msgstr "最大儲存庫" msgid "SortOptions|Last created" -msgstr "" +msgstr "最近建立" msgid "SortOptions|Last joined" -msgstr "" +msgstr "最近加入" msgid "SortOptions|Last updated" -msgstr "" +msgstr "最近更新" msgid "SortOptions|Least popular" -msgstr "" +msgstr "最不受歡迎" msgid "SortOptions|Less weight" -msgstr "" +msgstr "最低權重" msgid "SortOptions|Milestone" -msgstr "" +msgstr "里程碑" msgid "SortOptions|Milestone due later" -msgstr "" +msgstr "里程碑截止日期" msgid "SortOptions|Milestone due soon" -msgstr "" +msgstr "即將截止的里程碑" msgid "SortOptions|More weight" -msgstr "" +msgstr "更大的權重" msgid "SortOptions|Most popular" -msgstr "" +msgstr "最受歡迎" msgid "SortOptions|Name" -msgstr "" +msgstr "名稱" msgid "SortOptions|Name, ascending" -msgstr "" +msgstr "名稱、升冪排列" msgid "SortOptions|Name, descending" -msgstr "" +msgstr "名稱、降冪排列" msgid "SortOptions|Oldest created" -msgstr "" +msgstr "最早建立" msgid "SortOptions|Oldest joined" -msgstr "" +msgstr "最早加入" msgid "SortOptions|Oldest sign in" -msgstr "" +msgstr "最早登入" msgid "SortOptions|Oldest updated" -msgstr "" +msgstr "最早提交" msgid "SortOptions|Popularity" -msgstr "" +msgstr "最有人氣" msgid "SortOptions|Priority" -msgstr "" +msgstr "優先" msgid "SortOptions|Recent sign in" -msgstr "" +msgstr "最近登入" msgid "SortOptions|Start later" -msgstr "" +msgstr "稍後開始" msgid "SortOptions|Start soon" -msgstr "" +msgstr "現在開始" msgid "SortOptions|Weight" -msgstr "" +msgstr "權重" msgid "Source code" msgstr "原始碼" msgid "Spam Logs" -msgstr "" +msgstr "垃圾訊息記錄" msgid "Specify the following URL during the Runner setup:" msgstr "在安裝 Runner 時指定以下 URL：" @@ -1376,7 +1684,7 @@ msgid "StarProject|Star" msgstr "收藏" msgid "Starred projects" -msgstr "" +msgstr "星標項目" msgid "Start a %{new_merge_request} with these changes" msgstr "以這些改動建立一個新的 %{new_merge_request} " @@ -1388,7 +1696,7 @@ msgid "Switch branch/tag" msgstr "切換分支 (branch) 或標籤" msgid "System Hooks" -msgstr "" +msgstr "系統鉤子" msgid "Tag" msgid_plural "Tags" @@ -1403,6 +1711,12 @@ msgstr "目標分支 (branch) " msgid "Team" msgstr "團隊" +msgid "Thanks! Don't show me this again" +msgstr "感謝！請不要再次顯示" + +msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project." +msgstr "GitLab 的進階全局搜尋功能是非常強大的搜尋服務。您可以搜尋其他團隊的代碼以幫助您完善自己項目中的代碼。從而避免建立重複的代碼浪費時間。" + msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request." msgstr "程式開發階段顯示從第一次更動記錄 (commit) 到建立合併請求 (merge request) 的時間。建立第一個合併請求後，資料將自動填入。" @@ -1454,12 +1768,24 @@ msgstr "中位數是一個數列中最中間的值。例如在 3、5、9 之間 msgid "There are problems accessing Git storage: " msgstr "存取 Git 儲存空間時出現問題：" -msgid "This is the author's first Merge Request to this project. Handle with care." -msgstr "" +msgid "This is a confidential issue." +msgstr "這是個隱密問題。" + +msgid "This is the author's first Merge Request to this project." +msgstr "這是作者第一次合併請求至本專案。" + +msgid "This issue is confidential and locked." +msgstr "這個問題是保密且鎖定的。" + +msgid "This issue is locked." +msgstr "這個問題已被鎖定。" msgid "This means you can not push code until you create an empty repository or import existing one." msgstr "這代表在您建立一個空的檔案庫 (repository) 或是匯入一個現存的檔案庫之前，您將無法上傳更新 (push) 。" +msgid "This merge request is locked." +msgstr "這個合併請求已被鎖定。" + msgid "Time before an issue gets scheduled" msgstr "議題 (issue) 被列入日程表的時間" @@ -1538,9 +1864,6 @@ msgstr " 1 個月前" msgid "Timeago|a week ago" msgstr " 1 週前" -msgid "Timeago|a while" -msgstr "剛剛" - msgid "Timeago|a year ago" msgstr " 1 年前" @@ -1592,6 +1915,9 @@ msgstr " 1 週後" msgid "Timeago|in 1 year" msgstr " 1 年後" +msgid "Timeago|in a while" +msgstr "剛剛" + msgid "Timeago|less than a minute ago" msgstr "不到 1 分鐘前" @@ -1612,9 +1938,33 @@ msgstr "總時間" msgid "Total test time for all commits/merges" msgstr "合併 (merge) 與更動記錄 (commit) 的總測試時間" +msgid "Track activity with Contribution Analytics." +msgstr "追蹤分析貢獻與活動。" + +msgid "Unlock" +msgstr "解鎖" + +msgid "Unlocked" +msgstr "已解鎖" + msgid "Unstar" msgstr "取消收藏" +msgid "Upgrade your plan to activate Advanced Global Search." +msgstr "升級您的方案以啟用進階全局搜尋。" + +msgid "Upgrade your plan to activate Contribution Analytics." +msgstr "升級您的方案以啟用貢獻分析。" + +msgid "Upgrade your plan to activate Group Webhooks." +msgstr "升級您的方案以啟用群組 Webhooks。" + +msgid "Upgrade your plan to activate Issue weight." +msgstr "升級您的方案以啟用問題權重。" + +msgid "Upgrade your plan to improve Issue boards." +msgstr "升級您的方案以使用問題看版" + msgid "Upload New File" msgstr "上傳新檔案" @@ -1631,13 +1981,13 @@ msgid "Use your global notification setting" msgstr "使用全域通知設定" msgid "View file @ " -msgstr "" +msgstr "瀏覽檔案 @ " msgid "View open merge request" msgstr "查看此分支的合併請求 (merge request)" msgid "View replaced file @ " -msgstr "" +msgstr "瀏覽已替換檔案 @ " msgid "VisibilityLevel|Internal" msgstr "內部" @@ -1657,9 +2007,117 @@ msgstr "權限不足。如需查看相關資料，請向管理員申請權限。 msgid "We don't have enough data to show this stage." msgstr "因該階段的資料不足而無法顯示相關資訊" +msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group." +msgstr "如果有新的推送或新的议题，Webhook 将自动触发您设置 URL。 您可以配置 Webhook 来监听特定事件，如推送、议题或合并请求。 群组 Webhook 将适用于团队中的所有项目，并允许您设置整个团队中的 Webhook 。" + +msgid "Weight" +msgstr "權重" + msgid "Wiki" msgstr "Wiki" +msgid "WikiClone|Clone your wiki" +msgstr "克隆你的維基" + +msgid "WikiClone|Git Access" +msgstr "Git 讀取" + +msgid "WikiClone|Install Gollum" +msgstr "安裝 Gollum" + +msgid "WikiClone|It is recommended to install %{markdown} so that GFM features render locally:" +msgstr "它被推薦安裝 %{markdown} 所以那 GFM 功能在本機呈現：" + +msgid "WikiClone|Start Gollum and edit locally" +msgstr "開始你的 Gollum 並在本機編輯。" + +msgid "WikiEmptyPageError|You are not allowed to create wiki pages" +msgstr "你沒有權限去建立維基頁面" + +msgid "WikiHistoricalPage|This is an old version of this page." +msgstr "這是這個頁面較舊的版本。" + +msgid "WikiHistoricalPage|You can view the %{most_recent_link} or browse the %{history_link}." +msgstr "你可以查看 %{most_recent_link} 或是瀏覽 %{history_link} 。" + +msgid "WikiHistoricalPage|history" +msgstr "歷史" + +msgid "WikiHistoricalPage|most recent version" +msgstr "最新版本" + +msgid "WikiMarkdownDocs|More examples are in the %{docs_link}" +msgstr "更多範例在 %{docs_link}" + +msgid "WikiMarkdownDocs|documentation" +msgstr "文件" + +msgid "WikiMarkdownTip|To link to a (new) page, simply type %{link_example}" +msgstr "若要連結到一個新的頁面，只要簡單的輸入 %{link_example}。" + +msgid "WikiNewPagePlaceholder|how-to-setup" +msgstr "如何安裝" + +msgid "WikiNewPageTip|Tip: You can specify the full path for the new file. We will automatically create any missing directories." +msgstr "小提示： 你可以指定新檔案的絕對路徑。我們會自動建立所有不存在的目錄。" + +msgid "WikiNewPageTitle|New Wiki Page" +msgstr "新的維基頁面" + +msgid "WikiPageConfirmDelete|Are you sure you want to delete this page?" +msgstr "你確定要刪除這個頁面？" + +msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{page_link} and make sure your changes will not unintentionally remove theirs." +msgstr "某個人在同一時間跟你一起編輯了這個頁面。請檢查 %{page_link} 並確定你的變更並沒有被他們無意中移除。" + +msgid "WikiPageConflictMessage|the page" +msgstr "此頁面" + +msgid "WikiPageCreate|Create %{page_title}" +msgstr "建立 %{page_title}" + +msgid "WikiPageEdit|Update %{page_title}" +msgstr "更新 %{page_title}" + +msgid "WikiPage|Page slug" +msgstr "頁面 slug" + +msgid "WikiPage|Write your content or drag files here..." +msgstr "寫上你的內容或拖曳檔案到這..." + +msgid "Wiki|Create Page" +msgstr "建立頁面" + +msgid "Wiki|Create page" +msgstr "建立頁面" + +msgid "Wiki|Edit Page" +msgstr "編輯頁面" + +msgid "Wiki|Empty page" +msgstr "空白頁面" + +msgid "Wiki|More Pages" +msgstr "更多頁面" + +msgid "Wiki|New page" +msgstr "新頁面" + +msgid "Wiki|Page history" +msgstr "歷史頁面" + +msgid "Wiki|Page version" +msgstr "頁面版本" + +msgid "Wiki|Pages" +msgstr "頁面" + +msgid "Wiki|Wiki Pages" +msgstr "維基頁面" + +msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members." +msgstr "透過貢獻分析，您可以分析您的組織及其成員的問題、合併請求和推送活動。" + msgid "Withdraw Access Request" msgstr "取消權限申請" @@ -1708,14 +2166,17 @@ msgstr "在帳號上 %{set_password_link} 之前， 將無法使用 %{protocol} msgid "You won't be able to pull or push project code via SSH until you %{add_ssh_key_link} to your profile" msgstr "在個人帳號中 %{add_ssh_key_link} 之前， 將無法使用 SSH 上傳 (push) 或下載 (pull) 程式碼。" +msgid "Your comment will not be visible to the public." +msgstr "你的留言將不會被公開。" + msgid "Your name" msgstr "您的名字" msgid "Your projects" -msgstr "" +msgstr "你的計劃" msgid "commit" -msgstr "" +msgstr "更動" msgid "day" msgid_plural "days" @@ -1731,3 +2192,9 @@ msgid "parent" msgid_plural "parents" msgstr[0] "上層" +msgid "to help your contributors communicate effectively!" +msgstr "幫助你的貢獻者進行有效的溝通！" + +msgid "personal access token" +msgstr "" + diff --git a/rubocop/cop/rspec/env_assignment.rb b/rubocop/cop/rspec/env_assignment.rb new file mode 100644 index 00000000000..257454af0e1 --- /dev/null +++ b/rubocop/cop/rspec/env_assignment.rb @@ -0,0 +1,58 @@ +require 'rubocop-rspec' +require_relative '../../spec_helpers' + +module RuboCop + module Cop + module RSpec + # This cop checks for ENV assignment in specs + # + # @example + # + # # bad + # before do + # ENV['FOO'] = 'bar' + # end + # + # # good + # before do + # stub_env('FOO', 'bar') + # end + class EnvAssignment < Cop + include SpecHelpers + + MESSAGE = "Don't assign to ENV, use `stub_env` instead.".freeze + + def_node_search :env_assignment?, <<~PATTERN + (send (const nil? :ENV) :[]= ...) + PATTERN + + # Following is what node.children looks like on a match + # [s(:const, nil, :ENV), :[]=, s(:str, "key"), s(:str, "value")] + def on_send(node) + return unless in_spec?(node) + return unless env_assignment?(node) + + add_offense(node, :expression, MESSAGE) + end + + def autocorrect(node) + lambda do |corrector| + corrector.replace(node.loc.expression, stub_env(env_key(node), env_value(node))) + end + end + + def env_key(node) + node.children[2].source + end + + def env_value(node) + node.children[3].source + end + + def stub_env(key, value) + "stub_env(#{key}, #{value})" + end + end + end + end +end diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb index 1df23899efb..4ebbe010e90 100644 --- a/rubocop/rubocop.rb +++ b/rubocop/rubocop.rb @@ -1,11 +1,11 @@ +require_relative 'cop/active_record_dependent' +require_relative 'cop/active_record_serialize' require_relative 'cop/custom_error_class' require_relative 'cop/gem_fetcher' -require_relative 'cop/active_record_serialize' -require_relative 'cop/redirect_with_status' +require_relative 'cop/in_batches' require_relative 'cop/polymorphic_associations' require_relative 'cop/project_path_helper' -require_relative 'cop/active_record_dependent' -require_relative 'cop/in_batches' +require_relative 'cop/redirect_with_status' require_relative 'cop/migration/add_column' require_relative 'cop/migration/add_column_with_default_to_large_table' require_relative 'cop/migration/add_concurrent_foreign_key' @@ -13,12 +13,13 @@ require_relative 'cop/migration/add_concurrent_index' require_relative 'cop/migration/add_index' require_relative 'cop/migration/add_timestamps' require_relative 'cop/migration/datetime' -require_relative 'cop/migration/safer_boolean_column' require_relative 'cop/migration/hash_index' require_relative 'cop/migration/remove_concurrent_index' require_relative 'cop/migration/remove_index' require_relative 'cop/migration/reversible_add_column_with_default' +require_relative 'cop/migration/safer_boolean_column' require_relative 'cop/migration/timestamps' require_relative 'cop/migration/update_column_in_batches' +require_relative 'cop/rspec/env_assignment' require_relative 'cop/rspec/single_line_hook' require_relative 'cop/rspec/verbose_include_metadata' diff --git a/rubocop/spec_helpers.rb b/rubocop/spec_helpers.rb new file mode 100644 index 00000000000..a702a083958 --- /dev/null +++ b/rubocop/spec_helpers.rb @@ -0,0 +1,12 @@ +module RuboCop + module SpecHelpers + SPEC_HELPERS = %w[spec_helper.rb rails_helper.rb].freeze + + # Returns true if the given node originated from the spec directory. + def in_spec?(node) + path = node.location.expression.source_buffer.name + + !SPEC_HELPERS.include?(File.basename(path)) && path.start_with?(File.join(Dir.pwd, 'spec')) + end + end +end diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index 59a6cfbf4f5..0a3a0f7da18 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -221,6 +221,20 @@ describe ApplicationController do end end + describe '#set_page_title_header' do + let(:controller) { described_class.new } + + it 'URI encodes UTF-8 characters in the title' do + response = double(headers: {}) + allow_any_instance_of(PageLayoutHelper).to receive(:page_title).and_return('€100 · GitLab') + allow(controller).to receive(:response).and_return(response) + + controller.send(:set_page_title_header) + + expect(response.headers['Page-Title']).to eq('%E2%82%AC100%20%C2%B7%20GitLab') + end + end + context 'two-factor authentication' do let(:controller) { described_class.new } diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index e7631d4d709..5036c1d2226 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -32,6 +32,31 @@ describe GroupsController do end end + describe 'GET #show' do + before do + sign_in(user) + project + end + + context 'as html' do + it 'assigns whether or not a group has children' do + get :show, id: group.to_param + + expect(assigns(:has_children)).to be_truthy + end + end + + context 'as atom' do + it 'assigns events for all the projects in the group' do + create(:event, project: project) + + get :show, id: group.to_param, format: :atom + + expect(assigns(:events)).not_to be_empty + end + end + end + describe 'GET #new' do context 'when creating subgroups', :nested_groups do [true, false].each do |can_create_group_status| diff --git a/spec/controllers/projects/commits_controller_spec.rb b/spec/controllers/projects/commits_controller_spec.rb index e26731fb691..c459d732507 100644 --- a/spec/controllers/projects/commits_controller_spec.rb +++ b/spec/controllers/projects/commits_controller_spec.rb @@ -10,9 +10,36 @@ describe Projects::CommitsController do end describe "GET show" do - context "when the ref name ends in .atom" do - render_views + render_views + + context 'with file path' do + before do + get(:show, + namespace_id: project.namespace, + project_id: project, + id: id) + end + + context "valid branch, valid file" do + let(:id) { 'master/README.md' } + + it { is_expected.to respond_with(:success) } + end + + context "valid branch, invalid file" do + let(:id) { 'master/invalid-path.rb' } + it { is_expected.to respond_with(:not_found) } + end + + context "invalid branch, valid file" do + let(:id) { 'invalid-branch/README.md' } + + it { is_expected.to respond_with(:not_found) } + end + end + + context "when the ref name ends in .atom" do context "when the ref does not exist with the suffix" do it "renders as atom" do get(:show, diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb index 91c4e5037de..60ed17c0c81 100644 --- a/spec/features/boards/boards_spec.rb +++ b/spec/features/boards/boards_spec.rb @@ -171,12 +171,14 @@ describe 'Issue Boards', :js do expect(page).to have_selector('.card', count: 20) expect(page).to have_content('Showing 20 of 58 issues') + find('.board .board-list') evaluate_script("document.querySelectorAll('.board .board-list')[1].scrollTop = document.querySelectorAll('.board .board-list')[1].scrollHeight") wait_for_requests expect(page).to have_selector('.card', count: 40) expect(page).to have_content('Showing 40 of 58 issues') + find('.board .board-list') evaluate_script("document.querySelectorAll('.board .board-list')[1].scrollTop = document.querySelectorAll('.board .board-list')[1].scrollHeight") wait_for_requests @@ -449,11 +451,13 @@ describe 'Issue Boards', :js do expect(page).to have_selector('.card', count: 20) expect(page).to have_content('Showing 20 of 51 issues') + find('.board .board-list') evaluate_script("document.querySelectorAll('.board .board-list')[1].scrollTop = document.querySelectorAll('.board .board-list')[1].scrollHeight") expect(page).to have_selector('.card', count: 40) expect(page).to have_content('Showing 40 of 51 issues') + find('.board .board-list') evaluate_script("document.querySelectorAll('.board .board-list')[1].scrollTop = document.querySelectorAll('.board .board-list')[1].scrollHeight") expect(page).to have_selector('.card', count: 51) diff --git a/spec/features/ci_lint_spec.rb b/spec/features/ci_lint_spec.rb index 9accd7bb07c..9bc23baf6cf 100644 --- a/spec/features/ci_lint_spec.rb +++ b/spec/features/ci_lint_spec.rb @@ -10,6 +10,7 @@ describe 'CI Lint', :js do visit ci_lint_path # Ace editor updates a hidden textarea and it happens asynchronously # `sleep 0.1` is actually needed here because of this + find('#ci-editor') execute_script("ace.edit('ci-editor').setValue(" + yaml_content.to_json + ");") sleep 0.1 click_on 'Validate' diff --git a/spec/features/dashboard/issues_spec.rb b/spec/features/dashboard/issues_spec.rb index 5610894fd9a..a8919976c31 100644 --- a/spec/features/dashboard/issues_spec.rb +++ b/spec/features/dashboard/issues_spec.rb @@ -87,8 +87,10 @@ RSpec.describe 'Dashboard Issues' do project_path = "/#{project.path_with_namespace}" project_json = { name: project.name_with_namespace, url: project_path }.to_json - # similate selection, and prevent overlap by dropdown menu + # simulate selection, and prevent overlap by dropdown menu + first('.project-item-select', visible: false) execute_script("$('.project-item-select').val('#{project_json}').trigger('change');") + find('#select2-drop-mask', visible: false) execute_script("$('#select2-drop-mask').remove();") find('.new-project-item-link').trigger('click') diff --git a/spec/features/issues/issue_detail_spec.rb b/spec/features/issues/issue_detail_spec.rb index c0c396af93f..6fbee0ebcb5 100644 --- a/spec/features/issues/issue_detail_spec.rb +++ b/spec/features/issues/issue_detail_spec.rb @@ -25,7 +25,7 @@ feature 'Issue Detail', :js do wait_for_requests click_link 'Edit' - fill_in 'issue-title', with: 'issue title' + fill_in 'issuable-title', with: 'issue title' click_button 'Save' Users::DestroyService.new(user).execute(user) diff --git a/spec/features/issues/markdown_toolbar_spec.rb b/spec/features/issues/markdown_toolbar_spec.rb index 6869c2c869d..fee8fd9b365 100644 --- a/spec/features/issues/markdown_toolbar_spec.rb +++ b/spec/features/issues/markdown_toolbar_spec.rb @@ -16,6 +16,7 @@ feature 'Issue markdown toolbar', :js do find('#note-body').native.send_key(:enter) find('#note-body').native.send_keys('bold') + find('.js-main-target-form #note-body') page.evaluate_script('document.querySelectorAll(".js-main-target-form #note-body")[0].setSelectionRange(4, 9)') first('.toolbar-btn').click @@ -28,6 +29,7 @@ feature 'Issue markdown toolbar', :js do find('#note-body').native.send_key(:enter) find('#note-body').native.send_keys('underline') + find('.js-main-target-form #note-body') page.evaluate_script('document.querySelectorAll(".js-main-target-form #note-body")[0].setSelectionRange(4, 50)') find('.toolbar-btn:nth-child(2)').click diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb index b0432ed8fc6..ba976bc7216 100644 --- a/spec/features/merge_requests/conflicts_spec.rb +++ b/spec/features/merge_requests/conflicts_spec.rb @@ -60,12 +60,14 @@ feature 'Merge request conflict resolution', :js do within find('.files-wrapper .diff-file', text: 'files/ruby/popen.rb') do click_button 'Edit inline' wait_for_requests + find('.files-wrapper .diff-file pre') execute_script('ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("One morning");') end within find('.files-wrapper .diff-file', text: 'files/ruby/regex.rb') do click_button 'Edit inline' wait_for_requests + find('.files-wrapper .diff-file pre') execute_script('ace.edit($(".files-wrapper .diff-file pre")[1]).setValue("Gregor Samsa woke from troubled dreams");') end @@ -139,6 +141,7 @@ feature 'Merge request conflict resolution', :js do it 'conflicts are resolved in Edit inline mode' do within find('.files-wrapper .diff-file', text: 'files/markdown/ruby-style-guide.md') do wait_for_requests + find('.files-wrapper .diff-file pre') execute_script('ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("Gregor Samsa woke from troubled dreams");') end diff --git a/spec/features/merge_requests/edit_mr_spec.rb b/spec/features/merge_requests/edit_mr_spec.rb index 4538555c168..4362f8b3fcc 100644 --- a/spec/features/merge_requests/edit_mr_spec.rb +++ b/spec/features/merge_requests/edit_mr_spec.rb @@ -66,6 +66,7 @@ feature 'Edit Merge Request' do end def get_textarea_height + find('#merge_request_description') page.evaluate_script('document.getElementById("merge_request_description").offsetHeight') end end diff --git a/spec/features/merge_requests/mini_pipeline_graph_spec.rb b/spec/features/merge_requests/mini_pipeline_graph_spec.rb index dcc70338d7f..bf21a719901 100644 --- a/spec/features/merge_requests/mini_pipeline_graph_spec.rb +++ b/spec/features/merge_requests/mini_pipeline_graph_spec.rb @@ -52,10 +52,12 @@ feature 'Mini Pipeline Graph', :js do end it 'should expand when hovered' do + find('.mini-pipeline-graph-dropdown-toggle') before_width = evaluate_script("$('.mini-pipeline-graph-dropdown-toggle:visible').outerWidth();") toggle.hover + find('.mini-pipeline-graph-dropdown-toggle') after_width = evaluate_script("$('.mini-pipeline-graph-dropdown-toggle:visible').outerWidth();") expect(before_width).to be < after_width diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb index 6c625ed17aa..965028a6f90 100644 --- a/spec/features/projects/blobs/edit_spec.rb +++ b/spec/features/projects/blobs/edit_spec.rb @@ -20,6 +20,7 @@ feature 'Editing file blob', :js do def edit_and_commit wait_for_requests find('.js-edit-blob').click + find('#editor') execute_script('ace.edit("editor").setValue("class NextFeature\nend\n")') click_button 'Commit changes' end diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb index 9f67216705d..a012db8fd27 100644 --- a/spec/features/projects/issuable_templates_spec.rb +++ b/spec/features/projects/issuable_templates_spec.rb @@ -35,7 +35,7 @@ feature 'issuable templates', :js do page.within('.content .issuable-actions') do click_on 'Edit' end - fill_in :'issue-title', with: 'test issue title' + fill_in :'issuable-title', with: 'test issue title' end scenario 'user selects "bug" template' do @@ -80,7 +80,7 @@ feature 'issuable templates', :js do page.within('.content .issuable-actions') do click_on 'Edit' end - fill_in :'issue-title', with: 'test issue title' + fill_in :'issuable-title', with: 'test issue title' fill_in :'issue-description', with: prior_description end diff --git a/spec/features/projects/user_creates_files_spec.rb b/spec/features/projects/user_creates_files_spec.rb index cbe70a93942..d84b91ddc32 100644 --- a/spec/features/projects/user_creates_files_spec.rb +++ b/spec/features/projects/user_creates_files_spec.rb @@ -60,6 +60,7 @@ describe 'User creates files' do end it 'creates and commit a new file', :js do + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:file_name, with: 'not_a_file.md') fill_in(:commit_message, with: 'New commit message', visible: true) @@ -75,6 +76,7 @@ describe 'User creates files' do end it 'creates and commit a new file with new lines at the end of file', :js do + find('#editor') execute_script('ace.edit("editor").setValue("Sample\n\n\n")') fill_in(:file_name, with: 'not_a_file.md') fill_in(:commit_message, with: 'New commit message', visible: true) @@ -86,6 +88,7 @@ describe 'User creates files' do find('.js-edit-blob').click + find('#editor') expect(evaluate_script('ace.edit("editor").getValue()')).to eq("Sample\n\n\n") end @@ -94,6 +97,7 @@ describe 'User creates files' do expect(page).to have_selector('.file-editor') + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:commit_message, with: 'New commit message', visible: true) click_button('Commit changes') @@ -108,6 +112,7 @@ describe 'User creates files' do it 'creates and commit a new file specifying a new branch', :js do expect(page).to have_selector('.file-editor') + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:file_name, with: 'not_a_file.md') fill_in(:commit_message, with: 'New commit message', visible: true) @@ -136,6 +141,7 @@ describe 'User creates files' do expect(page).to have_selector('.file-editor') + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:file_name, with: 'not_a_file.md') diff --git a/spec/features/projects/user_edits_files_spec.rb b/spec/features/projects/user_edits_files_spec.rb index e8d83a661d4..d26ee653415 100644 --- a/spec/features/projects/user_edits_files_spec.rb +++ b/spec/features/projects/user_edits_files_spec.rb @@ -23,6 +23,7 @@ describe 'User edits files' do find('.js-edit-blob').click find('.file-editor', match: :first) + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") expect(evaluate_script('ace.edit("editor").getValue()')).to eq('*.rbca') @@ -40,6 +41,7 @@ describe 'User edits files' do find('.js-edit-blob').click find('.file-editor', match: :first) + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:commit_message, with: 'New commit message', visible: true) click_button('Commit changes') @@ -57,6 +59,7 @@ describe 'User edits files' do find('.file-editor', match: :first) + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:commit_message, with: 'New commit message', visible: true) fill_in(:branch_name, with: 'new_branch_name', visible: true) @@ -74,6 +77,7 @@ describe 'User edits files' do find('.js-edit-blob').click find('.file-editor', match: :first) + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") click_link('Preview changes') @@ -103,6 +107,7 @@ describe 'User edits files' do find('.file-editor', match: :first) + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") expect(evaluate_script('ace.edit("editor").getValue()')).to eq('*.rbca') @@ -119,6 +124,7 @@ describe 'User edits files' do find('.file-editor', match: :first) + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:commit_message, with: 'New commit message', visible: true) click_button('Commit changes') @@ -145,6 +151,7 @@ describe 'User edits files' do expect(page).not_to have_link('Fork') expect(page).not_to have_button('Cancel') + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:commit_message, with: 'Another commit', visible: true) click_button('Commit changes') diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 66785cf32da..7a241b02d28 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -312,9 +312,9 @@ describe ApplicationHelper do describe '#locale_path' do it 'returns the locale path with an `_`' do - Gitlab::I18n.locale = 'pt-BR' - - expect(helper.locale_path).to include('assets/locale/pt_BR/app') + Gitlab::I18n.with_locale('pt-BR') do + expect(helper.locale_path).to include('assets/locale/pt_BR/app') + end end end end diff --git a/spec/javascripts/blob/blob_file_dropzone_spec.js b/spec/javascripts/blob/blob_file_dropzone_spec.js index 2c8183ff77b..47de63e6690 100644 --- a/spec/javascripts/blob/blob_file_dropzone_spec.js +++ b/spec/javascripts/blob/blob_file_dropzone_spec.js @@ -1,4 +1,3 @@ -import 'dropzone'; import BlobFileDropzone from '~/blob/blob_file_dropzone'; describe('BlobFileDropzone', () => { diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js index 18916c5aa97..e441d1153ed 100644 --- a/spec/javascripts/merge_request_tabs_spec.js +++ b/spec/javascripts/merge_request_tabs_spec.js @@ -5,8 +5,7 @@ import '~/merge_request_tabs'; import '~/commit/pipelines/pipelines_bundle'; import '~/breakpoints'; import '~/lib/utils/common_utils'; -import '~/diff'; -import '~/files_comment_button'; +import Diff from '~/diff'; import '~/notes'; import 'vendor/jquery.scrollTo'; @@ -225,7 +224,7 @@ import 'vendor/jquery.scrollTo'; describe('with "Side-by-side"/parallel diff view', () => { beforeEach(function () { this.class.diffViewType = () => 'parallel'; - gl.Diff.prototype.diffViewType = () => 'parallel'; + Diff.prototype.diffViewType = () => 'parallel'; }); it('maintains `container-limited` for pipelines tab', function (done) { diff --git a/spec/javascripts/repo/components/repo_file_spec.js b/spec/javascripts/repo/components/repo_file_spec.js index 334bf0997ca..107f6797f8a 100644 --- a/spec/javascripts/repo/components/repo_file_spec.js +++ b/spec/javascripts/repo/components/repo_file_spec.js @@ -93,6 +93,32 @@ describe('RepoFile', () => { expect(vm.linkClicked).toHaveBeenCalledWith(vm.file); }); + describe('submodule', () => { + let f; + let vm; + + beforeEach(() => { + f = file('submodule name', '123456789'); + f.type = 'submodule'; + + vm = createComponent({ + file: f, + }); + }); + + afterEach(() => { + vm.$destroy(); + }); + + it('renders submodule short ID', () => { + expect(vm.$el.querySelector('.commit-sha').textContent.trim()).toBe('12345678'); + }); + + it('renders ID next to submodule name', () => { + expect(vm.$el.querySelector('td').textContent.replace(/\s+/g, ' ')).toContain('submodule name @ 12345678'); + }); + }); + describe('methods', () => { describe('linkClicked', () => { it('$emits fileNameClicked with file obj', () => { diff --git a/spec/javascripts/repo/components/repo_sidebar_spec.js b/spec/javascripts/repo/components/repo_sidebar_spec.js index 61283da8257..148f275e03d 100644 --- a/spec/javascripts/repo/components/repo_sidebar_spec.js +++ b/spec/javascripts/repo/components/repo_sidebar_spec.js @@ -117,6 +117,21 @@ describe('RepoSidebar', () => { expect(Helper.setDirectoryToClosed).toHaveBeenCalledWith(RepoStore.files[0]); }); + + describe('submodule', () => { + it('opens submodule project URL', () => { + spyOn(gl.utils, 'visitUrl'); + + const f = file(); + f.type = 'submodule'; + + vm = createComponent(); + + vm.fileClicked(f); + + expect(gl.utils.visitUrl).toHaveBeenCalledWith('url'); + }); + }); }); describe('goToPreviousDirectoryClicked', () => { diff --git a/spec/javascripts/repo/mock_data.js b/spec/javascripts/repo/mock_data.js index 836b867205e..71e275caf09 100644 --- a/spec/javascripts/repo/mock_data.js +++ b/spec/javascripts/repo/mock_data.js @@ -1,13 +1,14 @@ import RepoHelper from '~/repo/helpers/repo_helper'; // eslint-disable-next-line import/prefer-default-export -export const file = (name = 'name') => RepoHelper.serializeRepoEntity('blob', { +export const file = (name = 'name', id = name) => RepoHelper.serializeRepoEntity('blob', { + id, icon: 'icon', url: 'url', name, last_commit: { id: '123', message: 'test', - committed_date: '', + committed_date: new Date().toISOString(), }, }); diff --git a/spec/javascripts/zen_mode_spec.js b/spec/javascripts/zen_mode_spec.js index bd18f79cea7..7047053d131 100644 --- a/spec/javascripts/zen_mode_spec.js +++ b/spec/javascripts/zen_mode_spec.js @@ -1,7 +1,6 @@ /* eslint-disable space-before-function-paren, no-var, one-var, one-var-declaration-per-line, object-shorthand, comma-dangle, no-return-assign, new-cap, max-len */ -/* global Dropzone */ /* global Mousetrap */ - +import Dropzone from 'dropzone'; import ZenMode from '~/zen_mode'; (function() { diff --git a/spec/lib/gitlab/backup/manager_spec.rb b/spec/lib/gitlab/backup/manager_spec.rb index 422f2af7266..b68301a066a 100644 --- a/spec/lib/gitlab/backup/manager_spec.rb +++ b/spec/lib/gitlab/backup/manager_spec.rb @@ -172,10 +172,6 @@ describe Backup::Manager do end describe '#unpack' do - before do - allow(Dir).to receive(:chdir) - end - context 'when there are no backup files in the directory' do before do allow(Dir).to receive(:glob).and_return([]) diff --git a/spec/lib/gitlab/current_settings_spec.rb b/spec/lib/gitlab/current_settings_spec.rb index d57ffcae8e1..492659a82b0 100644 --- a/spec/lib/gitlab/current_settings_spec.rb +++ b/spec/lib/gitlab/current_settings_spec.rb @@ -21,7 +21,7 @@ describe Gitlab::CurrentSettings do it 'falls back to DB if Redis returns an empty value' do expect(ApplicationSetting).to receive(:cached).and_return(nil) - expect(ApplicationSetting).to receive(:last).and_call_original + expect(ApplicationSetting).to receive(:last).and_call_original.twice expect(current_application_settings).to be_a(ApplicationSetting) end diff --git a/spec/lib/gitlab/encoding_helper_spec.rb b/spec/lib/gitlab/encoding_helper_spec.rb index 8b14b227e65..9151c66afb3 100644 --- a/spec/lib/gitlab/encoding_helper_spec.rb +++ b/spec/lib/gitlab/encoding_helper_spec.rb @@ -6,6 +6,9 @@ describe Gitlab::EncodingHelper do describe '#encode!' do [ + ["nil", nil, nil], + ["empty string", "".encode("ASCII-8BIT"), "".encode("UTF-8")], + ["invalid utf-8 encoded string", "my bad string\xE5".force_encoding("UTF-8"), "my bad string"], [ 'leaves ascii only string as is', 'ascii only string', @@ -81,6 +84,9 @@ describe Gitlab::EncodingHelper do describe '#encode_utf8' do [ + ["nil", nil, nil], + ["empty string", "".encode("ASCII-8BIT"), "".encode("UTF-8")], + ["invalid utf-8 encoded string", "my bad string\xE5".force_encoding("UTF-8"), "my bad stringå"], [ "encodes valid utf8 encoded string to utf8", "λ, λ, λ".encode("UTF-8"), @@ -95,12 +101,18 @@ describe Gitlab::EncodingHelper do "encodes valid ISO-8859-1 encoded string to utf8", "Rüby ist eine Programmiersprache. Wir verlängern den text damit ICU die Sprache erkennen kann.".encode("ISO-8859-1", "UTF-8"), "Rüby ist eine Programmiersprache. Wir verlängern den text damit ICU die Sprache erkennen kann.".encode("UTF-8") + ], + [ + # Test case from https://gitlab.com/gitlab-org/gitlab-ce/issues/39227 + "Equifax branch name", + "refs/heads/Equifax".encode("UTF-8"), + "refs/heads/Equifax".encode("UTF-8") ] ].each do |description, test_string, xpect| it description do - r = ext_class.encode_utf8(test_string.force_encoding('UTF-8')) + r = ext_class.encode_utf8(test_string) expect(r).to eq(xpect) - expect(r.encoding.name).to eq('UTF-8') + expect(r.encoding.name).to eq('UTF-8') if xpect end end diff --git a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb b/spec/lib/gitlab/github_import/wiki_formatter_spec.rb index fcd90fab547..2662cc20b32 100644 --- a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb +++ b/spec/lib/gitlab/github_import/wiki_formatter_spec.rb @@ -11,7 +11,7 @@ describe Gitlab::GithubImport::WikiFormatter do describe '#disk_path' do it 'appends .wiki to project path' do - expect(wiki.disk_path).to eq project.disk_path + '.wiki' + expect(wiki.disk_path).to eq project.wiki.disk_path end end diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb index 6945c90cb9b..30495fd4f5e 100644 --- a/spec/models/application_setting_spec.rb +++ b/spec/models/application_setting_spec.rb @@ -220,6 +220,21 @@ describe ApplicationSetting do expect(described_class.current).to eq(:last) end end + + context 'when an ApplicationSetting is not yet present' do + it 'does not cache nil object' do + # when missing settings a nil object is returned, but not cached + allow(described_class).to receive(:last).and_return(nil).twice + expect(described_class.current).to be_nil + + # when the settings are set the method returns a valid object + allow(described_class).to receive(:last).and_return(:last) + expect(described_class.current).to eq(:last) + + # subsequent calls get everything from cache + expect(described_class.current).to eq(:last) + end + end end context 'restrict creating duplicates' do diff --git a/spec/models/ci/artifact_blob_spec.rb b/spec/models/ci/artifact_blob_spec.rb index d5ba088af53..4e72d9d748e 100644 --- a/spec/models/ci/artifact_blob_spec.rb +++ b/spec/models/ci/artifact_blob_spec.rb @@ -56,15 +56,14 @@ describe Ci::ArtifactBlob do end context 'txt extensions' do - let(:entry) { build.artifacts_metadata_entry('other_artifacts_0.1.2/doc_sample.txt') } + let(:path) { 'other_artifacts_0.1.2/doc_sample.txt' } + let(:entry) { build.artifacts_metadata_entry(path) } it 'returns a URL' do url = subject.external_url(build.project, build) expect(url).not_to be_nil - expect(url).to start_with("http") - expect(url).to match Gitlab.config.pages.host - expect(url).to end_with(entry.path) + expect(url).to eq("http://#{project.namespace.path}.#{Gitlab.config.pages.host}/-/#{project.path}/-/jobs/#{build.id}/artifacts/#{path}") end end end diff --git a/spec/rubocop/cop/rspec/env_assignment_spec.rb b/spec/rubocop/cop/rspec/env_assignment_spec.rb new file mode 100644 index 00000000000..4e859b6f6fa --- /dev/null +++ b/spec/rubocop/cop/rspec/env_assignment_spec.rb @@ -0,0 +1,59 @@ +require 'spec_helper' + +require 'rubocop' +require 'rubocop/rspec/support' + +require_relative '../../../../rubocop/cop/rspec/env_assignment' + +describe RuboCop::Cop::RSpec::EnvAssignment do + include CopHelper + + OFFENSE_CALL_SINGLE_QUOTES_KEY = %(ENV['FOO'] = 'bar').freeze + OFFENSE_CALL_DOUBLE_QUOTES_KEY = %(ENV["FOO"] = 'bar').freeze + + let(:source_file) { 'spec/foo_spec.rb' } + + subject(:cop) { described_class.new } + + shared_examples 'an offensive ENV#[]= call' do |content| + it "registers an offense for `#{content}`" do + inspect_source(cop, content, source_file) + + expect(cop.offenses.size).to eq(1) + expect(cop.offenses.map(&:line)).to eq([1]) + expect(cop.highlights).to eq([content]) + end + end + + shared_examples 'an autocorrected ENV#[]= call' do |content, autocorrected_content| + it "registers an offense for `#{content}` and autocorrects it to `#{autocorrected_content}`" do + autocorrected = autocorrect_source(cop, content, source_file) + + expect(autocorrected).to eql(autocorrected_content) + end + end + + context 'in a spec file' do + before do + allow(cop).to receive(:in_spec?).and_return(true) + end + + context 'with a key using single quotes' do + it_behaves_like 'an offensive ENV#[]= call', OFFENSE_CALL_SINGLE_QUOTES_KEY + it_behaves_like 'an autocorrected ENV#[]= call', OFFENSE_CALL_SINGLE_QUOTES_KEY, %(stub_env('FOO', 'bar')) + end + + context 'with a key using double quotes' do + it_behaves_like 'an offensive ENV#[]= call', OFFENSE_CALL_DOUBLE_QUOTES_KEY + it_behaves_like 'an autocorrected ENV#[]= call', OFFENSE_CALL_DOUBLE_QUOTES_KEY, %(stub_env("FOO", 'bar')) + end + end + + context 'outside of a spec file' do + it "does not register an offense for `#{OFFENSE_CALL_SINGLE_QUOTES_KEY}` in a non-spec file" do + inspect_source(cop, OFFENSE_CALL_SINGLE_QUOTES_KEY) + + expect(cop.offenses.size).to eq(0) + end + end +end diff --git a/spec/support/features/discussion_comments_shared_example.rb b/spec/support/features/discussion_comments_shared_example.rb index 9f05cabf7ae..7132b9cd221 100644 --- a/spec/support/features/discussion_comments_shared_example.rb +++ b/spec/support/features/discussion_comments_shared_example.rb @@ -121,14 +121,31 @@ shared_examples 'discussion comments' do |resource_name| end end - it 'clicking "Start discussion" will post a discussion' do - find(submit_selector).click + describe 'creating a discussion' do + before do + find(submit_selector).click + find(comments_selector, match: :first) + end + + it 'clicking "Start discussion" will post a discussion' do + new_comment = all(comments_selector).last + + expect(new_comment).to have_content 'a' + expect(new_comment).to have_selector '.discussion' + end + + if resource_name == 'merge request' + it 'shows resolved discussion when toggled' do + click_button "Resolve discussion" + + expect(page).to have_selector('.note-row-1', visible: true) - find(comments_selector, match: :first) - new_comment = all(comments_selector).last + refresh + click_button "Toggle discussion" - expect(new_comment).to have_content 'a' - expect(new_comment).to have_selector '.discussion' + expect(page).to have_selector('.note-row-1', visible: true) + end + end end if resource_name == 'issue' diff --git a/spec/support/select2_helper.rb b/spec/support/select2_helper.rb index 6b1853c2364..55da961e173 100644 --- a/spec/support/select2_helper.rb +++ b/spec/support/select2_helper.rb @@ -16,6 +16,7 @@ module Select2Helper selector = options.fetch(:from) + first(selector, visible: false) if options[:multiple] execute_script("$('#{selector}').select2('val', ['#{value}']).trigger('change');") else diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb index 886052d7848..bf2e11bc360 100644 --- a/spec/tasks/gitlab/backup_rake_spec.rb +++ b/spec/tasks/gitlab/backup_rake_spec.rb @@ -4,7 +4,15 @@ require 'rake' describe 'gitlab:app namespace rake task' do let(:enable_registry) { true } - before :all do + def tars_glob + Dir.glob(File.join(Gitlab.config.backup.path, '*_gitlab_backup.tar')) + end + + def backup_tar + tars_glob.first + end + + before(:all) do Rake.application.rake_require 'tasks/gitlab/helpers' Rake.application.rake_require 'tasks/gitlab/backup' Rake.application.rake_require 'tasks/gitlab/shell' @@ -19,9 +27,16 @@ describe 'gitlab:app namespace rake task' do end before do + stub_env('force', 'yes') + FileUtils.rm(tars_glob, force: true) + reenable_backup_sub_tasks stub_container_registry_config(enabled: enable_registry) end + after do + FileUtils.rm(tars_glob, force: true) + end + def run_rake_task(task_name) Rake::Task[task_name].reenable Rake.application.invoke_task task_name @@ -34,22 +49,15 @@ describe 'gitlab:app namespace rake task' do end describe 'backup_restore' do - before do - # avoid writing task output to spec progress - allow($stdout).to receive :write - end - context 'gitlab version' do before do allow(Dir).to receive(:glob).and_return(['1_gitlab_backup.tar']) - allow(Dir).to receive(:chdir) allow(File).to receive(:exist?).and_return(true) allow(Kernel).to receive(:system).and_return(true) allow(FileUtils).to receive(:cp_r).and_return(true) allow(FileUtils).to receive(:mv).and_return(true) allow(Rake::Task["gitlab:shell:setup"]) .to receive(:invoke).and_return(true) - ENV['force'] = 'yes' end let(:gitlab_version) { Gitlab::VERSION } @@ -58,8 +66,9 @@ describe 'gitlab:app namespace rake task' do allow(YAML).to receive(:load_file) .and_return({ gitlab_version: "not #{gitlab_version}" }) - expect { run_rake_task('gitlab:backup:restore') } - .to raise_error(SystemExit) + expect do + expect { run_rake_task('gitlab:backup:restore') }.to output.to_stdout + end.to raise_error(SystemExit) end it 'invokes restoration on match' do @@ -75,44 +84,15 @@ describe 'gitlab:app namespace rake task' do expect(Rake::Task['gitlab:backup:lfs:restore']).to receive(:invoke) expect(Rake::Task['gitlab:backup:registry:restore']).to receive(:invoke) expect(Rake::Task['gitlab:shell:setup']).to receive(:invoke) - expect { run_rake_task('gitlab:backup:restore') }.not_to raise_error + expect { run_rake_task('gitlab:backup:restore') }.to output.to_stdout end end end # backup_restore task describe 'backup' do - before(:all) do - ENV['force'] = 'yes' - end - - def tars_glob - Dir.glob(File.join(Gitlab.config.backup.path, '*_gitlab_backup.tar')) - end - - def create_backup - FileUtils.rm tars_glob - + before do # This reconnect makes our project fixture disappear, breaking the restore. Stub it out. allow(ActiveRecord::Base.connection).to receive(:reconnect!) - - # Redirect STDOUT and run the rake task - orig_stdout = $stdout - $stdout = StringIO.new - reenable_backup_sub_tasks - run_rake_task('gitlab:backup:create') - reenable_backup_sub_tasks - $stdout = orig_stdout - - @backup_tar = tars_glob.first - end - - def restore_backup - orig_stdout = $stdout - $stdout = StringIO.new - reenable_backup_sub_tasks - run_rake_task('gitlab:backup:restore') - reenable_backup_sub_tasks - $stdout = orig_stdout end describe 'backup creation and deletion using custom_hooks' do @@ -120,27 +100,17 @@ describe 'gitlab:app namespace rake task' do let(:user_backup_path) { "repositories/#{project.disk_path}" } before do - @origin_cd = Dir.pwd - - path = File.join(project.repository.path_to_repo, filename) + stub_env('SKIP', 'db') + path = File.join(project.repository.path_to_repo, 'custom_hooks') FileUtils.mkdir_p(path) FileUtils.touch(File.join(path, "dummy.txt")) - - ENV["SKIP"] = "db" - create_backup - end - - after do - ENV["SKIP"] = "" - FileUtils.rm(@backup_tar) - Dir.chdir(@origin_cd) end context 'project uses custom_hooks and successfully creates backup' do - let(:filename) { "custom_hooks" } - it 'creates custom_hooks.tar and project bundle' do - tar_contents, exit_status = Gitlab::Popen.popen(%W{tar -tvf #{@backup_tar}}) + expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout + + tar_contents, exit_status = Gitlab::Popen.popen(%W{tar -tvf #{backup_tar}}) expect(exit_status).to eq(0) expect(tar_contents).to match(user_backup_path) @@ -149,47 +119,43 @@ describe 'gitlab:app namespace rake task' do end it 'restores files correctly' do - restore_backup + expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout + expect { run_rake_task('gitlab:backup:restore') }.to output.to_stdout - expect(Dir.entries(File.join(project.repository.path, "custom_hooks"))).to include("dummy.txt") + expect(Dir.entries(File.join(project.repository.path, 'custom_hooks'))).to include("dummy.txt") end end end context 'tar creation' do - before do - create_backup - end - - after do - FileUtils.rm(@backup_tar) - end - context 'archive file permissions' do it 'sets correct permissions on the tar file' do - expect(File.exist?(@backup_tar)).to be_truthy - expect(File::Stat.new(@backup_tar).mode.to_s(8)).to eq('100600') + expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout + + expect(File.exist?(backup_tar)).to be_truthy + expect(File::Stat.new(backup_tar).mode.to_s(8)).to eq('100600') end context 'with custom archive_permissions' do before do allow(Gitlab.config.backup).to receive(:archive_permissions).and_return(0651) - # We created a backup in a before(:all) so it got the default permissions. - # We now need to do some work to create a _new_ backup file using our stub. - FileUtils.rm(@backup_tar) - create_backup end it 'uses the custom permissions' do - expect(File::Stat.new(@backup_tar).mode.to_s(8)).to eq('100651') + expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout + + expect(File::Stat.new(backup_tar).mode.to_s(8)).to eq('100651') end end end it 'sets correct permissions on the tar contents' do + expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout + tar_contents, exit_status = Gitlab::Popen.popen( - %W{tar -tvf #{@backup_tar} db uploads.tar.gz repositories builds.tar.gz artifacts.tar.gz pages.tar.gz lfs.tar.gz registry.tar.gz} + %W{tar -tvf #{backup_tar} db uploads.tar.gz repositories builds.tar.gz artifacts.tar.gz pages.tar.gz lfs.tar.gz registry.tar.gz} ) + expect(exit_status).to eq(0) expect(tar_contents).to match('db/') expect(tar_contents).to match('uploads.tar.gz') @@ -203,6 +169,8 @@ describe 'gitlab:app namespace rake task' do end it 'deletes temp directories' do + expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout + temp_dirs = Dir.glob( File.join(Gitlab.config.backup.path, '{db,repositories,uploads,builds,artifacts,pages,lfs,registry}') ) @@ -214,9 +182,12 @@ describe 'gitlab:app namespace rake task' do let(:enable_registry) { false } it 'does not create registry.tar.gz' do + expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout + tar_contents, exit_status = Gitlab::Popen.popen( - %W{tar -tvf #{@backup_tar}} + %W{tar -tvf #{backup_tar}} ) + expect(exit_status).to eq(0) expect(tar_contents).not_to match('registry.tar.gz') end @@ -232,37 +203,33 @@ describe 'gitlab:app namespace rake task' do } end - let(:project_a) { create(:project, :repository, repository_storage: 'default') } - let(:project_b) { create(:project, :repository, repository_storage: 'test_second_storage') } - before do - FileUtils.mkdir('tmp/tests/default_storage') - FileUtils.mkdir('tmp/tests/custom_storage') + # We only need a backup of the repositories for this test + stub_env('SKIP', 'db,uploads,builds,artifacts,lfs,registry') + FileUtils.mkdir(Settings.absolute('tmp/tests/default_storage')) + FileUtils.mkdir(Settings.absolute('tmp/tests/custom_storage')) allow(Gitlab.config.repositories).to receive(:storages).and_return(storages) - # Create the projects now, after mocking the settings but before doing the backup - project_a - project_b - # Avoid asking gitaly about the root ref (which will fail beacuse of the # mocked storages) allow_any_instance_of(Repository).to receive(:empty_repo?).and_return(false) - - # We only need a backup of the repositories for this test - ENV["SKIP"] = "db,uploads,builds,artifacts,lfs,registry" - create_backup end after do - FileUtils.rm_rf('tmp/tests/default_storage') - FileUtils.rm_rf('tmp/tests/custom_storage') - FileUtils.rm(@backup_tar) if @backup_tar + FileUtils.rm_rf(Settings.absolute('tmp/tests/default_storage')) + FileUtils.rm_rf(Settings.absolute('tmp/tests/custom_storage')) end it 'includes repositories in all repository storages' do + project_a = create(:project, :repository, repository_storage: 'default') + project_b = create(:project, :repository, repository_storage: 'test_second_storage') + + expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout + tar_contents, exit_status = Gitlab::Popen.popen( - %W{tar -tvf #{@backup_tar} repositories} + %W{tar -tvf #{backup_tar} repositories} ) + expect(exit_status).to eq(0) expect(tar_contents).to match("repositories/#{project_a.disk_path}.bundle") expect(tar_contents).to match("repositories/#{project_b.disk_path}.bundle") @@ -271,35 +238,15 @@ describe 'gitlab:app namespace rake task' do end # backup_create task describe "Skipping items" do - def tars_glob - Dir.glob(File.join(Gitlab.config.backup.path, '*_gitlab_backup.tar')) - end - - before :all do - @origin_cd = Dir.pwd - - reenable_backup_sub_tasks - - FileUtils.rm tars_glob - - # Redirect STDOUT and run the rake task - orig_stdout = $stdout - $stdout = StringIO.new - ENV["SKIP"] = "repositories,uploads" - run_rake_task('gitlab:backup:create') - $stdout = orig_stdout - - @backup_tar = tars_glob.first - end - - after :all do - FileUtils.rm(@backup_tar) - Dir.chdir @origin_cd + before do + stub_env('SKIP', 'repositories,uploads') end it "does not contain skipped item" do + expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout + tar_contents, _exit_status = Gitlab::Popen.popen( - %W{tar -tvf #{@backup_tar} db uploads.tar.gz repositories builds.tar.gz artifacts.tar.gz pages.tar.gz lfs.tar.gz registry.tar.gz} + %W{tar -tvf #{backup_tar} db uploads.tar.gz repositories builds.tar.gz artifacts.tar.gz pages.tar.gz lfs.tar.gz registry.tar.gz} ) expect(tar_contents).to match('db/') @@ -313,9 +260,10 @@ describe 'gitlab:app namespace rake task' do end it 'does not invoke repositories restore' do + expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout + allow(Rake::Task['gitlab:shell:setup']) .to receive(:invoke).and_return(true) - allow($stdout).to receive :write expect(Rake::Task['gitlab:db:drop_tables']).to receive :invoke expect(Rake::Task['gitlab:backup:db:restore']).to receive :invoke @@ -327,38 +275,15 @@ describe 'gitlab:app namespace rake task' do expect(Rake::Task['gitlab:backup:lfs:restore']).to receive :invoke expect(Rake::Task['gitlab:backup:registry:restore']).to receive :invoke expect(Rake::Task['gitlab:shell:setup']).to receive :invoke - expect { run_rake_task('gitlab:backup:restore') }.not_to raise_error + expect { run_rake_task('gitlab:backup:restore') }.to output.to_stdout end end describe "Human Readable Backup Name" do - def tars_glob - Dir.glob(File.join(Gitlab.config.backup.path, '*_gitlab_backup.tar')) - end - - before :all do - @origin_cd = Dir.pwd - - reenable_backup_sub_tasks - - FileUtils.rm tars_glob - - # Redirect STDOUT and run the rake task - orig_stdout = $stdout - $stdout = StringIO.new - run_rake_task('gitlab:backup:create') - $stdout = orig_stdout - - @backup_tar = tars_glob.first - end - - after :all do - FileUtils.rm(@backup_tar) - Dir.chdir @origin_cd - end - it 'name has human readable time' do - expect(@backup_tar).to match(/\d+_\d{4}_\d{2}_\d{2}_\d+\.\d+\.\d+.*_gitlab_backup.tar$/) + expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout + + expect(backup_tar).to match(/\d+_\d{4}_\d{2}_\d{2}_\d+\.\d+\.\d+.*_gitlab_backup.tar$/) end end end # gitlab:app namespace diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb index 1e9b20435ec..5dd8fe8eaa5 100644 --- a/spec/tasks/gitlab/gitaly_rake_spec.rb +++ b/spec/tasks/gitlab/gitaly_rake_spec.rb @@ -43,15 +43,8 @@ describe 'gitlab:gitaly namespace rake task' do describe 'gmake/make' do let(:command_preamble) { %w[/usr/bin/env -u RUBYOPT -u BUNDLE_GEMFILE] } - before(:all) do - @old_env_ci = ENV.delete('CI') - end - - after(:all) do - ENV['CI'] = @old_env_ci if @old_env_ci - end - before do + stub_env('CI', false) FileUtils.mkdir_p(clone_path) expect(Dir).to receive(:chdir).with(clone_path).and_call_original allow(Bundler).to receive(:bundle_path).and_return('/fake/bundle_path') diff --git a/spec/tasks/gitlab/ldap_rake_spec.rb b/spec/tasks/gitlab/ldap_rake_spec.rb index 12d442b9820..279234f2887 100644 --- a/spec/tasks/gitlab/ldap_rake_spec.rb +++ b/spec/tasks/gitlab/ldap_rake_spec.rb @@ -4,7 +4,7 @@ describe 'gitlab:ldap:rename_provider rake task' do it 'completes without error' do Rake.application.rake_require 'tasks/gitlab/ldap' stub_warn_user_is_not_gitlab - ENV['force'] = 'yes' + stub_env('force', 'yes') create(:identity) # Necessary to prevent `exit 1` from the task. |
