diff --git a/app/views/admin/application_settings/_abuse.html.haml b/app/views/admin/application_settings/_abuse.html.haml index 5f8bd799d23fbdafb9be19cf96f7b013739a0240..d16d2a4b43a4b94771d10ca808ee272885895432 100644 --- a/app/views/admin/application_settings/_abuse.html.haml +++ b/app/views/admin/application_settings/_abuse.html.haml @@ -3,9 +3,9 @@ %fieldset .form-group - = f.label :admin_notification_email, 'Abuse reports notification email', class: 'label-bold' + = f.label :admin_notification_email, _('Abuse reports notification email'), class: 'label-bold' = f.text_field :admin_notification_email, class: 'form-control' .form-text.text-muted - Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area. + = _("Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area.") - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml index 39637c9981c13df8237de2a089270509aacbf443..c067e4b1de7092ec117be73b94070092876492a0 100644 --- a/app/views/admin/application_settings/_account_and_limit.html.haml +++ b/app/views/admin/application_settings/_account_and_limit.html.haml @@ -6,40 +6,39 @@ .form-check = f.check_box :gravatar_enabled, class: 'form-check-input' = f.label :gravatar_enabled, class: 'form-check-label' do - Gravatar enabled + = _("Gravatar enabled") .form-group = f.label :default_projects_limit, class: 'label-bold' = f.number_field :default_projects_limit, class: 'form-control' .form-group - = f.label :max_attachment_size, 'Maximum attachment size (MB)', class: 'label-bold' + = f.label :max_attachment_size, _('Maximum attachment size (MB)'), class: 'label-bold' = f.number_field :max_attachment_size, class: 'form-control' = render 'repository_size_limit_setting', form: f .form-group - = f.label :session_expire_delay, 'Session duration (minutes)', class: 'label-bold' + = f.label :session_expire_delay, _('Session duration (minutes)'), class: 'label-bold' = f.number_field :session_expire_delay, class: 'form-control' - %span.form-text.text-muted#session_expire_delay_help_block GitLab restart is required to apply changes + %span.form-text.text-muted#session_expire_delay_help_block= _("GitLab restart is required to apply changes") .form-group - = f.label :user_oauth_applications, 'User OAuth applications', class: 'label-bold' + = f.label :user_oauth_applications, _('User OAuth applications'), class: 'label-bold' .form-check = f.check_box :user_oauth_applications, class: 'form-check-input' = f.label :user_oauth_applications, class: 'form-check-label' do - Allow users to register any application to use GitLab as an OAuth provider + = _("Allow users to register any application to use GitLab as an OAuth provider") .form-group - = f.label :user_default_external, 'New users set to external', class: 'label-bold' + = f.label :user_default_external, _('New users set to external'), class: 'label-bold' .form-check = f.check_box :user_default_external, class: 'form-check-input' = f.label :user_default_external, class: 'form-check-label' do - Newly registered users will by default be external + = _("Newly registered users will by default be external") - if ::Gitlab.dev_env_or_com? .form-group - = f.label :check_namespace_plan, 'Check feature availability on namespace plan', class: 'label-bold' + = f.label :check_namespace_plan, _('Check feature availability on namespace plan'), class: 'label-bold' .form-check = f.check_box :check_namespace_plan, class: 'form-check-input' = f.label :check_namespace_plan, class: 'form-check-label' do - Enabling this will only make licensed EE features available to projects if the project namespace's plan - includes the feature or if the project is public. + = _("Enabling this will only make licensed EE features available to projects if the project namespace's plan includes the feature or if the project is public.") - = f.submit 'Save changes', class: 'btn btn-success' + = f.submit _('Save changes'), class: 'btn btn-success' diff --git a/app/views/admin/application_settings/_background_jobs.html.haml b/app/views/admin/application_settings/_background_jobs.html.haml index 7d1a64b645a7fadb9bfcb905dc57ae8e00f68b01..20c9f43252954afb73fa45ae8b4bf053be39def3 100644 --- a/app/views/admin/application_settings/_background_jobs.html.haml +++ b/app/views/admin/application_settings/_background_jobs.html.haml @@ -3,25 +3,24 @@ %fieldset %p - These settings require a - = link_to 'restart', help_page_path('administration/restart_gitlab') - to take effect. + - link_to_restart = link_to(_('restart'), help_page_path('administration/restart_gitlab')) + = _("These settings require a %{link_to_restart} to take effect.").html_safe % { link_to_restart: link_to_restart } .form-group .form-check = f.check_box :sidekiq_throttling_enabled, class: 'form-check-input' = f.label :sidekiq_throttling_enabled, class: 'form-check-label' do - Enable Sidekiq Job Throttling + = _("Enable Sidekiq Job Throttling") .form-text.text-muted - Limit the amount of resources slow running jobs are assigned. + = _("Limit the amount of resources slow running jobs are assigned.") .form-group - = f.label :sidekiq_throttling_queues, 'Sidekiq queues to throttle', class: 'label-bold' + = f.label :sidekiq_throttling_queues, _('Sidekiq queues to throttle'), class: 'label-bold' = f.select :sidekiq_throttling_queues, sidekiq_queue_options_for_select, { include_hidden: false }, multiple: true, class: 'select2 select-wide', data: { field: 'sidekiq_throttling_queues' } .form-text.text-muted - Choose which queues you wish to throttle. + = _("Choose which queues you wish to throttle.") .form-group - = f.label :sidekiq_throttling_factor, 'Throttling Factor', class: 'label-bold' + = f.label :sidekiq_throttling_factor, _('Throttling Factor'), class: 'label-bold' = f.number_field :sidekiq_throttling_factor, class: 'form-control', min: '0.01', max: '0.99', step: '0.01' .form-text.text-muted - The factor by which the queues should be throttled. A value between 0.0 and 1.0, exclusive. + = _("The factor by which the queues should be throttled. A value between 0.0 and 1.0, exclusive.") - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index 4507218d023eee2942ea9bed58c7992986546dd0..acc3d8a8d5d1621eea022cecdbf87191b7fe65b6 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -8,7 +8,7 @@ .form-check = f.check_box :auto_devops_enabled, class: 'form-check-input' = f.label :auto_devops_enabled, class: 'form-check-label' do - Default to Auto DevOps pipeline for all projects + = _("Default to Auto DevOps pipeline for all projects") .form-text.text-muted = s_('CICD|The Auto DevOps pipeline will run if no alternative CI configuration file is found.') = link_to _('More information'), help_page_path('topics/autodevops/index.md'), target: '_blank' @@ -21,26 +21,25 @@ .form-check = f.check_box :shared_runners_enabled, class: 'form-check-input' = f.label :shared_runners_enabled, class: 'form-check-label' do - Enable shared runners for new projects + = _("Enable shared runners for new projects") = render 'shared_runners_minutes_setting', form: f .form-group = f.label :shared_runners_text, class: 'label-bold' = f.text_area :shared_runners_text, class: 'form-control', rows: 4 - .form-text.text-muted Markdown enabled + .form-text.text-muted= _("Markdown enabled") .form-group - = f.label :max_artifacts_size, 'Maximum artifacts size (MB)', class: 'label-bold' + = f.label :max_artifacts_size, _('Maximum artifacts size (MB)'), class: 'label-bold' = f.number_field :max_artifacts_size, class: 'form-control' .form-text.text-muted - Set the maximum file size for each job's artifacts + = _("Set the maximum file size for each job's artifacts") = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'maximum-artifacts-size') .form-group - = f.label :default_artifacts_expire_in, 'Default artifacts expiration', class: 'label-bold' + = f.label :default_artifacts_expire_in, _('Default artifacts expiration'), class: 'label-bold' = f.text_field :default_artifacts_expire_in, class: 'form-control' .form-text.text-muted - Set the default expiration time for each job's artifacts. - 0 for unlimited. + = _("Set the default expiration time for each job's artifacts. 0 for unlimited.") = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'default-artifacts-expiration') - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_email.html.haml b/app/views/admin/application_settings/_email.html.haml index 6d821e083e2b0153ddac5aed1db498614f165ee0..41df670c9690e93c246938f46920b6ce9570b576 100644 --- a/app/views/admin/application_settings/_email.html.haml +++ b/app/views/admin/application_settings/_email.html.haml @@ -6,20 +6,16 @@ .form-check = f.check_box :email_author_in_body, class: 'form-check-input' = f.label :email_author_in_body, class: 'form-check-label' do - Include author name in notification email body + = _("Include author name in notification email body") .form-text.text-muted - Some email servers do not support overriding the email sender name. - Enable this option to include the name of the author of the issue, - merge request or comment in the email body instead. + = _("Some email servers do not support overriding the email sender name. Enable this option to include the name of the author of the issue, merge request or comment in the email body instead.") .form-group .form-check = f.check_box :html_emails_enabled, class: 'form-check-input' = f.label :html_emails_enabled, class: 'form-check-label' do - Enable HTML emails + = _("Enable HTML emails") .form-text.text-muted - By default GitLab sends emails in HTML and plain text formats so mail - clients can choose what format to use. Disable this option if you only - want to send emails in plain text format. + = _("By default GitLab sends emails in HTML and plain text formats so mail clients can choose what format to use. Disable this option if you only want to send emails in plain text format.") -# EE-specific start - if License.feature_available?(:email_additional_text) .form-group @@ -29,4 +25,4 @@ = _('Add additional text to appear in all email communications. %{character_limit} character limit') % { character_limit: number_with_delimiter(Gitlab::CurrentSettings.email_additional_text_character_limit) } -# EE-specific end - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_gitaly.html.haml b/app/views/admin/application_settings/_gitaly.html.haml index f39d570981152af9c86802b42a541c3d7d42bf5c..ca6e4974085ac89e8c0247fb6dee33ddd1f54082 100644 --- a/app/views/admin/application_settings/_gitaly.html.haml +++ b/app/views/admin/application_settings/_gitaly.html.haml @@ -3,22 +3,19 @@ %fieldset .form-group - = f.label :gitaly_timeout_default, 'Default Timeout Period', class: 'label-bold' + = f.label :gitaly_timeout_default, _('Default Timeout Period'), class: 'label-bold' = f.number_field :gitaly_timeout_default, class: 'form-control' .form-text.text-muted - Timeout for Gitaly calls from the GitLab application (in seconds). This timeout is not enforced - for git fetch/push operations or Sidekiq jobs. + = _("Timeout for Gitaly calls from the GitLab application (in seconds). This timeout is not enforced for git fetch/push operations or Sidekiq jobs.") .form-group - = f.label :gitaly_timeout_fast, 'Fast Timeout Period', class: 'label-bold' + = f.label :gitaly_timeout_fast, _('Fast Timeout Period'), class: 'label-bold' = f.number_field :gitaly_timeout_fast, class: 'form-control' .form-text.text-muted - Fast operation timeout (in seconds). Some Gitaly operations are expected to be fast. - If they exceed this threshold, there may be a problem with a storage shard and 'failing fast' - can help maintain the stability of the GitLab instance. + = _("Fast operation timeout (in seconds). Some Gitaly operations are expected to be fast. If they exceed this threshold, there may be a problem with a storage shard and 'failing fast' can help maintain the stability of the GitLab instance.") .form-group - = f.label :gitaly_timeout_medium, 'Medium Timeout Period', class: 'label-bold' + = f.label :gitaly_timeout_medium, _('Medium Timeout Period'), class: 'label-bold' = f.number_field :gitaly_timeout_medium, class: 'form-control' .form-text.text-muted - Medium operation timeout (in seconds). This should be a value between the Fast and the Default timeout. + = _("Medium operation timeout (in seconds). This should be a value between the Fast and the Default timeout.") - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_help_page.html.haml b/app/views/admin/application_settings/_help_page.html.haml index ec91cb5c0936eb6a5ddf817e2ae9d86dcb947c21..4d5938a5d1f2f6106221ccc617224c5b166c1e54 100644 --- a/app/views/admin/application_settings/_help_page.html.haml +++ b/app/views/admin/application_settings/_help_page.html.haml @@ -9,15 +9,15 @@ .form-group = f.label :help_page_text, class: 'label-bold' = f.text_area :help_page_text, class: 'form-control', rows: 4 - .form-text.text-muted Markdown enabled + .form-text.text-muted= _("Markdown enabled") .form-group .form-check = f.check_box :help_page_hide_commercial_content, class: 'form-check-input' = f.label :help_page_hide_commercial_content, class: 'form-check-label' do - Hide marketing-related entries from help + = _("Hide marketing-related entries from help") .form-group - = f.label :help_page_support_url, 'Support page URL', class: 'label-bold' + = f.label :help_page_support_url, _('Support page URL'), class: 'label-bold' = f.text_field :help_page_support_url, class: 'form-control', placeholder: 'http://company.example.com/getting-help', :'aria-describedby' => 'support_help_block' - %span.form-text.text-muted#support_help_block Alternate support URL for help page + %span.form-text.text-muted#support_help_block= _("Alternate support URL for help page") - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_influx.html.haml b/app/views/admin/application_settings/_influx.html.haml index a1eeacd82900428bb620a86c30e7bb45eedaf541..6d43cb91eec51134511e2f22d7b3aca40fd269fe 100644 --- a/app/views/admin/application_settings/_influx.html.haml +++ b/app/views/admin/application_settings/_influx.html.haml @@ -3,58 +3,46 @@ %fieldset %p - Setup InfluxDB to measure a wide variety of statistics like the time spent - in running SQL queries. These settings require a - = link_to 'restart', help_page_path('administration/restart_gitlab') - to take effect. + - link_to_restart = link_to(_('restart'), help_page_path('administration/restart_gitlab')) + = _("Setup InfluxDB to measure a wide variety of statistics like the time spent in running SQL queries. These settings require a %{link_to_restart} to take effect.").html_safe % { link_to_restart: link_to_restart } = link_to icon('question-circle'), help_page_path('administration/monitoring/performance/introduction') .form-group .form-check = f.check_box :metrics_enabled, class: 'form-check-input' = f.label :metrics_enabled, class: 'form-check-label' do - Enable InfluxDB Metrics + = _("Enable InfluxDB Metrics") .form-group - = f.label :metrics_host, 'InfluxDB host', class: 'label-bold' + = f.label :metrics_host, _('InfluxDB host'), class: 'label-bold' = f.text_field :metrics_host, class: 'form-control', placeholder: 'influxdb.example.com' .form-group - = f.label :metrics_port, 'InfluxDB port', class: 'label-bold' + = f.label :metrics_port, _('InfluxDB port'), class: 'label-bold' = f.text_field :metrics_port, class: 'form-control', placeholder: '8089' .form-text.text-muted - The UDP port to use for connecting to InfluxDB. InfluxDB requires that - your server configuration specifies a database to store data in when - sending messages to this port, without it metrics data will not be - saved. + = _("The UDP port to use for connecting to InfluxDB. InfluxDB requires that your server configuration specifies a database to store data in when sending messages to this port, without it metrics data will not be saved.") .form-group - = f.label :metrics_pool_size, 'Connection pool size', class: 'label-bold' + = f.label :metrics_pool_size, _('Connection pool size'), class: 'label-bold' = f.number_field :metrics_pool_size, class: 'form-control' .form-text.text-muted - The amount of InfluxDB connections to open. Connections are opened - lazily. Users using multi-threaded application servers should ensure - enough connections are available (at minimum the amount of application - server threads). + = _("The amount of InfluxDB connections to open. Connections are opened lazily. Users using multi-threaded application servers should ensure enough connections are available (at minimum the amount of application server threads).") .form-group - = f.label :metrics_timeout, 'Connection timeout', class: 'label-bold' + = f.label :metrics_timeout, _('Connection timeout'), class: 'label-bold' = f.number_field :metrics_timeout, class: 'form-control' .form-text.text-muted - The amount of seconds after which an InfluxDB connection will time - out. + = _("The amount of seconds after which an InfluxDB connection will time out.") .form-group - = f.label :metrics_method_call_threshold, 'Method Call Threshold (ms)', class: 'label-bold' + = f.label :metrics_method_call_threshold, _('Method Call Threshold (ms)'), class: 'label-bold' = f.number_field :metrics_method_call_threshold, class: 'form-control' .form-text.text-muted - A method call is only tracked when it takes longer to complete than - the given amount of milliseconds. + = _("A method call is only tracked when it takes longer to complete than the given amount of milliseconds.") .form-group - = f.label :metrics_sample_interval, 'Sampler Interval (sec)', class: 'label-bold' + = f.label :metrics_sample_interval, _('Sampler Interval (sec)'), class: 'label-bold' = f.number_field :metrics_sample_interval, class: 'form-control' .form-text.text-muted - The sampling interval in seconds. Sampled data includes memory usage, - retained Ruby objects, file descriptors and so on. + = _("The sampling interval in seconds. Sampled data includes memory usage, retained Ruby objects, file descriptors and so on.") .form-group - = f.label :metrics_packet_size, 'Metrics per packet', class: 'label-bold' + = f.label :metrics_packet_size, _('Metrics per packet'), class: 'label-bold' = f.number_field :metrics_packet_size, class: 'form-control' .form-text.text-muted - The amount of points to store in a single UDP packet. More points - results in fewer but larger UDP packets being sent. + = _("The amount of points to store in a single UDP packet. More points results in fewer but larger UDP packets being sent.") - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_ip_limits.html.haml b/app/views/admin/application_settings/_ip_limits.html.haml index 5a5681830b8f4a70cff9a2af3dfe5523f246f679..f1d87f0fdfc44d1f7168003c5524e6a88a2c4708 100644 --- a/app/views/admin/application_settings/_ip_limits.html.haml +++ b/app/views/admin/application_settings/_ip_limits.html.haml @@ -6,40 +6,40 @@ .form-check = f.check_box :throttle_unauthenticated_enabled, class: 'form-check-input' = f.label :throttle_unauthenticated_enabled, class: 'form-check-label' do - Enable unauthenticated request rate limit + = _("Enable unauthenticated request rate limit") %span.form-text.text-muted - Helps reduce request volume (e.g. from crawlers or abusive bots) + = _("Helps reduce request volume (e.g. from crawlers or abusive bots)") .form-group - = f.label :throttle_unauthenticated_requests_per_period, 'Max requests per period per IP', class: 'label-bold' + = f.label :throttle_unauthenticated_requests_per_period, _('Max requests per period per IP'), class: 'label-bold' = f.number_field :throttle_unauthenticated_requests_per_period, class: 'form-control' .form-group - = f.label :throttle_unauthenticated_period_in_seconds, 'Rate limit period in seconds', class: 'label-bold' + = f.label :throttle_unauthenticated_period_in_seconds, _('Rate limit period in seconds'), class: 'label-bold' = f.number_field :throttle_unauthenticated_period_in_seconds, class: 'form-control' .form-group .form-check = f.check_box :throttle_authenticated_api_enabled, class: 'form-check-input' = f.label :throttle_authenticated_api_enabled, class: 'form-check-label' do - Enable authenticated API request rate limit + = _("Enable authenticated API request rate limit") %span.form-text.text-muted - Helps reduce request volume (e.g. from crawlers or abusive bots) + = _("Helps reduce request volume (e.g. from crawlers or abusive bots)") .form-group - = f.label :throttle_authenticated_api_requests_per_period, 'Max requests per period per user', class: 'label-bold' + = f.label :throttle_authenticated_api_requests_per_period, _('Max requests per period per user'), class: 'label-bold' = f.number_field :throttle_authenticated_api_requests_per_period, class: 'form-control' .form-group - = f.label :throttle_authenticated_api_period_in_seconds, 'Rate limit period in seconds', class: 'label-bold' + = f.label :throttle_authenticated_api_period_in_seconds, _('Rate limit period in seconds'), class: 'label-bold' = f.number_field :throttle_authenticated_api_period_in_seconds, class: 'form-control' .form-group .form-check = f.check_box :throttle_authenticated_web_enabled, class: 'form-check-input' = f.label :throttle_authenticated_web_enabled, class: 'form-check-label' do - Enable authenticated web request rate limit + = _("Enable authenticated web request rate limit") %span.form-text.text-muted - Helps reduce request volume (e.g. from crawlers or abusive bots) + = _("Helps reduce request volume (e.g. from crawlers or abusive bots)") .form-group - = f.label :throttle_authenticated_web_requests_per_period, 'Max requests per period per user', class: 'label-bold' + = f.label :throttle_authenticated_web_requests_per_period, _('Max requests per period per user'), class: 'label-bold' = f.number_field :throttle_authenticated_web_requests_per_period, class: 'form-control' .form-group - = f.label :throttle_authenticated_web_period_in_seconds, 'Rate limit period in seconds', class: 'label-bold' + = f.label :throttle_authenticated_web_period_in_seconds, _('Rate limit period in seconds'), class: 'label-bold' = f.number_field :throttle_authenticated_web_period_in_seconds, class: 'form-control' - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_koding.html.haml b/app/views/admin/application_settings/_koding.html.haml index 8b635b08abdbe5820996ea7dfaaf9a1cf0d32ce2..0d601b37b4ff49f546e1bd0d13efe402fb6ada11 100644 --- a/app/views/admin/application_settings/_koding.html.haml +++ b/app/views/admin/application_settings/_koding.html.haml @@ -6,17 +6,14 @@ .form-check = f.check_box :koding_enabled, class: 'form-check-input' = f.label :koding_enabled, class: 'form-check-label' do - Enable Koding + = _("Enable Koding") .form-text.text-muted - Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again. + = _("Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again.") .form-group - = f.label :koding_url, 'Koding URL', class: 'label-bold' + = f.label :koding_url, _('Koding URL'), class: 'label-bold' = f.text_field :koding_url, class: 'form-control', placeholder: 'http://gitlab.your-koding-instance.com:8090' .form-text.text-muted - Koding has integration enabled out of the box for the - %strong gitlab - team, and you need to provide that team's URL here. Learn more in the - = succeed "." do - = link_to "Koding administration documentation", help_page_path("administration/integration/koding") + - link_to_koding_doc = link_to(_("Koding administration documentation"), help_page_path("administration/integration/koding")) + = _("Koding has integration enabled out of the box for the %{strong_start}gitlab%{strong_end} team, and you need to provide that team's URL here. Learn more in the %{link_to_koding_doc}.").html_safe % { link_to_koding_doc: link_to_koding_doc, strong_start: ''.html_safe, strong_end: ''.html_safe } - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_logging.html.haml b/app/views/admin/application_settings/_logging.html.haml index 41b787515b5a8ad43bc861b074060c69582d3f07..f9ef737593659bf85093532b7f181af64003a69c 100644 --- a/app/views/admin/application_settings/_logging.html.haml +++ b/app/views/admin/application_settings/_logging.html.haml @@ -6,27 +6,27 @@ .form-check = f.check_box :sentry_enabled, class: 'form-check-input' = f.label :sentry_enabled, class: 'form-check-label' do - Enable Sentry + = _("Enable Sentry") .form-text.text-muted - %p This setting requires a restart to take effect. - Sentry is an error reporting and logging tool which is currently not shipped with GitLab, get it here: + %p= _("This setting requires a restart to take effect.") + = _("Sentry is an error reporting and logging tool which is currently not shipped with GitLab, get it here:") %a{ href: 'https://getsentry.com', target: '_blank', rel: 'noopener noreferrer' } https://getsentry.com .form-group - = f.label :sentry_dsn, 'Sentry DSN', class: 'label-bold' + = f.label :sentry_dsn, _('Sentry DSN'), class: 'label-bold' = f.text_field :sentry_dsn, class: 'form-control' .form-group .form-check = f.check_box :clientside_sentry_enabled, class: 'form-check-input' = f.label :clientside_sentry_enabled, class: 'form-check-label' do - Enable Clientside Sentry + = _("Enable Clientside Sentry") .form-text.text-muted - Sentry can also be used for reporting and logging clientside exceptions. + = _("Sentry can also be used for reporting and logging clientside exceptions.") %a{ href: 'https://sentry.io/for/javascript/', target: '_blank', rel: 'noopener noreferrer' } https://sentry.io/for/javascript/ .form-group - = f.label :clientside_sentry_dsn, 'Clientside Sentry DSN', class: 'label-bold' + = f.label :clientside_sentry_dsn, _('Clientside Sentry DSN'), class: 'label-bold' = f.text_field :clientside_sentry_dsn, class: 'form-control' - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_outbound.html.haml b/app/views/admin/application_settings/_outbound.html.haml index f4bfb5af385701f5fa9f22b7028c0d4efc4c1d37..d51192eb280263401b3f2ef41254c9c5a7f09c84 100644 --- a/app/views/admin/application_settings/_outbound.html.haml +++ b/app/views/admin/application_settings/_outbound.html.haml @@ -6,6 +6,6 @@ .form-check = f.check_box :allow_local_requests_from_hooks_and_services, class: 'form-check-input' = f.label :allow_local_requests_from_hooks_and_services, class: 'form-check-label' do - Allow requests to the local network from hooks and services + = _("Allow requests to the local network from hooks and services") - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_pages.html.haml b/app/views/admin/application_settings/_pages.html.haml index ad5c8d4da22640e43cb44ad73f7643d78ca8c2cd..d0758c64704b78ecabe1710968186fbc33c9a520 100644 --- a/app/views/admin/application_settings/_pages.html.haml +++ b/app/views/admin/application_settings/_pages.html.haml @@ -3,18 +3,16 @@ %fieldset .form-group - = f.label :max_pages_size, 'Maximum size of pages (MB)', class: 'label-bold' + = f.label :max_pages_size, _('Maximum size of pages (MB)'), class: 'label-bold' = f.number_field :max_pages_size, class: 'form-control' - .form-text.text-muted 0 for unlimited + .form-text.text-muted= _("0 for unlimited") .form-group .form-check = f.check_box :pages_domain_verification_enabled, class: 'form-check-input' = f.label :pages_domain_verification_enabled, class: 'form-check-label' do - Require users to prove ownership of custom domains + = _("Require users to prove ownership of custom domains") .form-text.text-muted - Domain verification is an essential security measure for public GitLab - sites. Users are required to demonstrate they control a domain before - it is enabled + = _("Domain verification is an essential security measure for public GitLab sites. Users are required to demonstrate they control a domain before it is enabled") = link_to icon('question-circle'), help_page_path('user/project/pages/getting_started_part_three.md', anchor: 'dns-txt-record') - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_performance.html.haml b/app/views/admin/application_settings/_performance.html.haml index e7076e7ed2f623781e41d517e655388af2dad27b..fecbf25e93445ed32919e2122ccf2d4504deacdb 100644 --- a/app/views/admin/application_settings/_performance.html.haml +++ b/app/views/admin/application_settings/_performance.html.haml @@ -6,13 +6,9 @@ .form-check = f.check_box :authorized_keys_enabled, class: 'form-check-input' = f.label :authorized_keys_enabled, class: 'form-check-label' do - Write to "authorized_keys" file + = _('Write to "authorized_keys" file') .form-text.text-muted - By default, we write to the "authorized_keys" file to support Git - over SSH without additional configuration. GitLab can be optimized - to authenticate SSH keys via the database file. Only uncheck this - if you have configured your OpenSSH server to use the - AuthorizedKeysCommand. Click on the help icon for more details. + = _('By default, we write to the "authorized_keys" file to support Git over SSH without additional configuration. GitLab can be optimized to authenticate SSH keys via the database file. Only uncheck this if you have configured your OpenSSH server to use the AuthorizedKeysCommand. Click on the help icon for more details.') = link_to icon('question-circle'), help_page_path('administration/operations/fast_ssh_key_lookup') - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_performance_bar.html.haml b/app/views/admin/application_settings/_performance_bar.html.haml index 44ac8d94764c8bc2fe14fbca1e19f23a453415f9..7ff0c22f95accd322baeecf1fd9d781d501dde02 100644 --- a/app/views/admin/application_settings/_performance_bar.html.haml +++ b/app/views/admin/application_settings/_performance_bar.html.haml @@ -6,9 +6,9 @@ .form-check = f.check_box :performance_bar_enabled, class: 'form-check-input' = f.label :performance_bar_enabled, class: 'form-check-label' do - Enable the Performance Bar + = _("Enable the Performance Bar") .form-group - = f.label :performance_bar_allowed_group_path, 'Allowed group', class: 'label-bold' + = f.label :performance_bar_allowed_group_path, _('Allowed group'), class: 'label-bold' = f.text_field :performance_bar_allowed_group_path, class: 'form-control', placeholder: 'my-org/my-group', value: @application_setting.performance_bar_allowed_group&.full_path - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_plantuml.html.haml b/app/views/admin/application_settings/_plantuml.html.haml index 5c2b71144265085f0c1944ce474313dc4ba626b2..ab8e1ea97d189f0beb48755615ceb2d43651b43d 100644 --- a/app/views/admin/application_settings/_plantuml.html.haml +++ b/app/views/admin/application_settings/_plantuml.html.haml @@ -6,13 +6,12 @@ .form-check = f.check_box :plantuml_enabled, class: 'form-check-input' = f.label :plantuml_enabled, class: 'form-check-label' do - Enable PlantUML + = _("Enable PlantUML") .form-group - = f.label :plantuml_url, 'PlantUML URL', class: 'label-bold' + = f.label :plantuml_url, _('PlantUML URL'), class: 'label-bold' = f.text_field :plantuml_url, class: 'form-control', placeholder: 'http://gitlab.your-plantuml-instance.com:8080' .form-text.text-muted - Allow rendering of - = link_to "PlantUML", "http://plantuml.com" - diagrams in Asciidoc documents using an external PlantUML service. + = link_to_plantuml = link_to("PlantUML", "http://plantuml.com") + = _("Allow rendering of %{link_to_plantuml} diagrams in Asciidoc documents using an external PlantUML service.").html_safe % { link_to_plantuml: link_to_plantuml } - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_prometheus.html.haml b/app/views/admin/application_settings/_prometheus.html.haml index a923568e52dee2792d1e2dd877e07d3a9ad877b4..5435fe377c61a07f4b35bd12ab12ce5d463f43d4 100644 --- a/app/views/admin/application_settings/_prometheus.html.haml +++ b/app/views/admin/application_settings/_prometheus.html.haml @@ -3,25 +3,19 @@ %fieldset %p - Enable a Prometheus metrics endpoint at - %code= metrics_path - to expose a variety of statistics on the health and performance of GitLab. Additional information on authenticating and connecting to the metrics endpoint is available - = link_to 'here', admin_health_check_path - \. This setting requires a - = link_to 'restart', help_page_path('administration/restart_gitlab') - to take effect. + - link_to_restart = link_to(_('restart'), help_page_path('administration/restart_gitlab')) + = _('Enable a Prometheus metrics endpoint at %{metrics_path} to expose a variety of statistics on the health and performance of GitLab. Additional information on authenticating and connecting to the metrics endpoint is available %{link}.') % { metrics_path: metrics_path, link: link_to(_('here'), admin_health_check_path) } + = _('This setting requires a %{link_to_restart} to take effect.').html_safe % { link_to_restart: link_to_restart } = link_to icon('question-circle'), help_page_path('administration/monitoring/prometheus/index') .form-group .form-check = f.check_box :prometheus_metrics_enabled, class: 'form-check-input' = f.label :prometheus_metrics_enabled, class: 'form-check-label' do - Enable Prometheus Metrics + = _("Enable Prometheus Metrics") - unless Gitlab::Metrics.metrics_folder_present? .form-text.text-muted - %strong.cred WARNING: - Environment variable - %code prometheus_multiproc_dir - does not exist or is not pointing to a valid directory. + %strong.cred= _("WARNING:") + = _("Environment variable %{code_start}prometheus_multiproc_dir%{code_end} does not exist or is not pointing to a valid directory.").html_safe % { code_start: ''.html_safe, code_end: ''.html_safe } = link_to icon('question-circle'), help_page_path('administration/monitoring/prometheus/gitlab_metrics', anchor: 'metrics-shared-directory') - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_realtime.html.haml b/app/views/admin/application_settings/_realtime.html.haml index 92f0c02eb6ad087d71888b646001c557bce14363..23c911b5aa468aae983750c56232cd747d28e714 100644 --- a/app/views/admin/application_settings/_realtime.html.haml +++ b/app/views/admin/application_settings/_realtime.html.haml @@ -3,16 +3,11 @@ %fieldset .form-group - = f.label :polling_interval_multiplier, 'Polling interval multiplier', class: 'label-bold' + = f.label :polling_interval_multiplier, _('Polling interval multiplier'), class: 'label-bold' = f.text_field :polling_interval_multiplier, class: 'form-control' .form-text.text-muted - Change this value to influence how frequently the GitLab UI polls for updates. - If you set the value to 2 all polling intervals are multiplied - by 2, which means that polling happens half as frequently. - The multiplier can also have a decimal value. - The default value (1) is a reasonable choice for the majority of GitLab - installations. Set to 0 to completely disable polling. + = _("Change this value to influence how frequently the GitLab UI polls for updates. If you set the value to 2 all polling intervals are multiplied by 2, which means that polling happens half as frequently. The multiplier can also have a decimal value. The default value (1) is a reasonable choice for the majority of GitLab installations. Set to 0 to completely disable polling.") = link_to icon('question-circle'), help_page_path('administration/polling') - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_registry.html.haml b/app/views/admin/application_settings/_registry.html.haml index 08c981db13f725f5035785b3cd0c132ce7bdf1fe..7350163f2e6e78ca62ca0da1c022be7900089c89 100644 --- a/app/views/admin/application_settings/_registry.html.haml +++ b/app/views/admin/application_settings/_registry.html.haml @@ -3,7 +3,7 @@ %fieldset .form-group - = f.label :container_registry_token_expire_delay, 'Authorization token duration (minutes)', class: 'label-bold' + = f.label :container_registry_token_expire_delay, _('Authorization token duration (minutes)'), class: 'label-bold' = f.number_field :container_registry_token_expire_delay, class: 'form-control' - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_repository_check.html.haml b/app/views/admin/application_settings/_repository_check.html.haml index 925e39bc0a36b7d26a02c053feb2a87b21af4fc2..8e5ae7d9bf9f3ab4be9e7dbe12e3b02c0ae0ad67 100644 --- a/app/views/admin/application_settings/_repository_check.html.haml +++ b/app/views/admin/application_settings/_repository_check.html.haml @@ -3,54 +3,49 @@ %fieldset .sub-section - %h4 Repository checks + %h4= _("Repository checks") .form-group .form-check = f.check_box :repository_checks_enabled, class: 'form-check-input' = f.label :repository_checks_enabled, class: 'form-check-label' do - Enable Repository Checks + = _("Enable Repository Checks") .form-text.text-muted - GitLab will periodically run - %a{ href: 'https://git-scm.com/docs/git-fsck', target: 'blank' } 'git fsck' - in all project and wiki repositories to look for silent disk corruption issues. + - link_to_git_fsck = link_to('git fsck', 'https://git-scm.com/docs/git-fsck', target: '_blank') + = _("GitLab will periodically run %{link_to_git_fsck} in all project and wiki repositories to look for silent disk corruption issues.").html_safe % { link_to_git_fsck: link_to_git_fsck } .form-group - = link_to 'Clear all repository checks', clear_repository_check_states_admin_application_settings_path, data: { confirm: 'This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?' }, method: :put, class: "btn btn-sm btn-remove" + = link_to _('Clear all repository checks'), clear_repository_check_states_admin_application_settings_path, data: { confirm: _('This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?') }, method: :put, class: "btn btn-sm btn-remove" .form-text.text-muted - If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database. + = _("If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database.") .sub-section - %h4 Housekeeping + %h4= _("Housekeeping") .form-group .form-check = f.check_box :housekeeping_enabled, class: 'form-check-input' = f.label :housekeeping_enabled, class: 'form-check-label' do - Enable automatic repository housekeeping (git repack, git gc) + = _("Enable automatic repository housekeeping (git repack, git gc)") .form-text.text-muted - If you keep automatic housekeeping disabled for a long time Git - repository access on your GitLab server will become slower and your - repositories will use more disk space. We recommend to always leave - this enabled. + = _("If you keep automatic housekeeping disabled for a long time Git repository access on your GitLab server will become slower and your repositories will use more disk space. We recommend to always leave this enabled.") .form-check = f.check_box :housekeeping_bitmaps_enabled, class: 'form-check-input' = f.label :housekeeping_bitmaps_enabled, class: 'form-check-label' do - Enable Git pack file bitmap creation + = _("Enable Git pack file bitmap creation") .form-text.text-muted - Creating pack file bitmaps makes housekeeping take a little longer but - bitmaps should accelerate 'git clone' performance. + = _("Creating pack file bitmaps makes housekeeping take a little longer but bitmaps should accelerate 'git clone' performance.") .form-group - = f.label :housekeeping_incremental_repack_period, 'Incremental repack period', class: 'label-bold' + = f.label :housekeeping_incremental_repack_period, _('Incremental repack period'), class: 'label-bold' = f.number_field :housekeeping_incremental_repack_period, class: 'form-control' .form-text.text-muted - Number of Git pushes after which an incremental 'git repack' is run. + = _("Number of Git pushes after which an incremental 'git repack' is run.") .form-group - = f.label :housekeeping_full_repack_period, 'Full repack period', class: 'label-bold' + = f.label :housekeeping_full_repack_period, _('Full repack period'), class: 'label-bold' = f.number_field :housekeeping_full_repack_period, class: 'form-control' .form-text.text-muted - Number of Git pushes after which a full 'git repack' is run. + = _("Number of Git pushes after which a full 'git repack' is run.") .form-group - = f.label :housekeeping_gc_period, 'Git GC period', class: 'label-bold' + = f.label :housekeeping_gc_period, _('Git GC period'), class: 'label-bold' = f.number_field :housekeeping_gc_period, class: 'form-control' .form-text.text-muted - Number of Git pushes after which 'git gc' is run. + = _("Number of Git pushes after which 'git gc' is run.") - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_repository_mirrors_form.html.haml b/app/views/admin/application_settings/_repository_mirrors_form.html.haml index 182742619206af62ab8969abb7dcbbc6e7c5cc97..050fa887ae9db8f3ca9de56d1ee8b910f3186cfb 100644 --- a/app/views/admin/application_settings/_repository_mirrors_form.html.haml +++ b/app/views/admin/application_settings/_repository_mirrors_form.html.haml @@ -3,16 +3,16 @@ %fieldset .form-group - = f.label :mirror_available, 'Enable mirror configuration', class: 'label-bold' + = f.label :mirror_available, _('Enable mirror configuration'), class: 'label-bold' .form-check = f.check_box :mirror_available, class: 'form-check-input' = f.label :mirror_available, class: 'form-check-label' do - Allow mirrors to be setup for projects + = _("Allow mirrors to be setup for projects") %span.form-text.text-muted - If disabled, only admins will be able to setup mirrors in projects. + = _("If disabled, only admins will be able to setup mirrors in projects.") = link_to icon('question-circle'), help_page_path('workflow/repository_mirroring') - if Gitlab.com? && License.feature_available?(:repository_mirrors) = render 'mirror_settings', f: f - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_repository_storage.html.haml b/app/views/admin/application_settings/_repository_storage.html.haml index 4523332493b74862253790aa0c70adf3cac14914..929e5f53ad6e1e6cd3074860763893f0c085ebea 100644 --- a/app/views/admin/application_settings/_repository_storage.html.haml +++ b/app/views/admin/application_settings/_repository_storage.html.haml @@ -7,21 +7,18 @@ .form-check = f.check_box :hashed_storage_enabled, class: 'form-check-input' = f.label :hashed_storage_enabled, class: 'form-check-label' do - Use hashed storage paths for newly created and renamed projects + = _("Use hashed storage paths for newly created and renamed projects") .form-text.text-muted - Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents - repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance. - %em (EXPERIMENTAL) + = _("Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance. %{emphasis_start}(EXPERIMENTAL)%{emphasis_end}").html_safe % { emphasis_start: ''.html_safe, emphasis_end: ''.html_safe } .form-group - = f.label :repository_storages, 'Storage paths for new projects', class: 'label-bold' + = f.label :repository_storages, _('Storage paths for new projects'), class: 'label-bold' = f.select :repository_storages, repository_storages_options_for_select(@application_setting.repository_storages), {include_hidden: false}, multiple: true, class: 'form-control' .form-text.text-muted - Manage repository storage paths. Learn more in the - = succeed "." do - = link_to "repository storages documentation", help_page_path("administration/repository_storage_paths") + - link_to_repository_doc = link_to(_("repository storages documentation"), help_page_path("administration/repository_storage_paths")) + = _("Manage repository storage paths. Learn more in the %{link_to_repository_doc}.").html_safe % { link_to_repository_doc: link_to_repository_doc } .sub-section - %h4 Circuit breaker + %h4= _("Circuit breaker") .form-group = f.label :circuitbreaker_check_interval, _('Check interval'), class: 'label-bold' = f.number_field :circuitbreaker_check_interval, class: 'form-control' @@ -48,4 +45,4 @@ .form-text.text-muted = circuitbreaker_failure_reset_time_help_text - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_signin.html.haml b/app/views/admin/application_settings/_signin.html.haml index 635a6751e5bb212d0ed647adffd0c9b5966f803e..16c3b12b9b93622f9c92fa384a66d4dbdebe8990 100644 --- a/app/views/admin/application_settings/_signin.html.haml +++ b/app/views/admin/application_settings/_signin.html.haml @@ -6,14 +6,14 @@ .form-check = f.check_box :password_authentication_enabled_for_web, class: 'form-check-input' = f.label :password_authentication_enabled_for_web, class: 'form-check-label' do - Password authentication enabled for web interface + = _("Password authentication enabled for web interface") .form-text.text-muted - When disabled, an external authentication provider must be used. + = _("When disabled, an external authentication provider must be used.") .form-group .form-check = f.check_box :password_authentication_enabled_for_git, class: 'form-check-input' = f.label :password_authentication_enabled_for_git, class: 'form-check-label' do - Password authentication enabled for Git over HTTP(S) + = _("Password authentication enabled for Git over HTTP(S)") .form-text.text-muted When disabled, a Personal Access Token - if Gitlab::Auth::LDAP::Config.enabled? @@ -21,32 +21,32 @@ must be used to authenticate. - if omniauth_enabled? && button_based_providers.any? .form-group - = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'label-bold' + = f.label :enabled_oauth_sign_in_sources, _('Enabled OAuth sign-in sources'), class: 'label-bold' = hidden_field_tag 'application_setting[enabled_oauth_sign_in_sources][]' .btn-group{ data: { toggle: 'buttons' } } - oauth_providers_checkboxes.each do |source| = source .form-group - = f.label :two_factor_authentication, 'Two-factor authentication', class: 'label-bold' + = f.label :two_factor_authentication, _('Two-factor authentication'), class: 'label-bold' .form-check = f.check_box :require_two_factor_authentication, class: 'form-check-input' = f.label :require_two_factor_authentication, class: 'form-check-label' do - Require all users to setup Two-factor authentication + = _("Require all users to setup Two-factor authentication") .form-group - = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'label-bold' + = f.label :two_factor_authentication, _('Two-factor grace period (hours)'), class: 'label-bold' = f.number_field :two_factor_grace_period, min: 0, class: 'form-control', placeholder: '0' - .form-text.text-muted Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication + .form-text.text-muted= _("Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication") .form-group - = f.label :home_page_url, 'Home page URL', class: 'label-bold' + = f.label :home_page_url, _('Home page URL'), class: 'label-bold' = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block' - %span.form-text.text-muted#home_help_block We will redirect non-logged in users to this page + %span.form-text.text-muted#home_help_block= _("We will redirect non-logged in users to this page") .form-group = f.label :after_sign_out_path, class: 'label-bold' = f.text_field :after_sign_out_path, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'after_sign_out_path_help_block' - %span.form-text.text-muted#after_sign_out_path_help_block We will redirect users to this page after they sign out + %span.form-text.text-muted#after_sign_out_path_help_block= _("We will redirect users to this page after they sign out") .form-group = f.label :sign_in_text, class: 'label-bold' = f.text_area :sign_in_text, class: 'form-control', rows: 4 - .form-text.text-muted Markdown enabled + .form-text.text-muted= _("Markdown enabled") - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_signup.html.haml b/app/views/admin/application_settings/_signup.html.haml index a0a58b811ee3edc6fb4a35dede16fe7800001578..69529644fd55555ae75ae3333ecefd1dcc1ef37f 100644 --- a/app/views/admin/application_settings/_signup.html.haml +++ b/app/views/admin/application_settings/_signup.html.haml @@ -6,45 +6,45 @@ .form-check = f.check_box :signup_enabled, class: 'form-check-input' = f.label :signup_enabled, class: 'form-check-label' do - Sign-up enabled + = _("Sign-up enabled") .form-group .form-check = f.check_box :send_user_confirmation_email, class: 'form-check-input' = f.label :send_user_confirmation_email, class: 'form-check-label' do - Send confirmation email on sign-up + = _("Send confirmation email on sign-up") .form-group - = f.label :domain_whitelist, 'Whitelisted domains for sign-ups', class: 'label-bold' + = f.label :domain_whitelist, _('Whitelisted domains for sign-ups'), class: 'label-bold' = f.text_area :domain_whitelist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8 - .form-text.text-muted ONLY users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com + .form-text.text-muted= _("ONLY users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com") .form-group - = f.label :domain_blacklist_enabled, 'Domain Blacklist', class: 'label-bold' + = f.label :domain_blacklist_enabled, _('Domain Blacklist'), class: 'label-bold' .form-check = f.check_box :domain_blacklist_enabled, class: 'form-check-input' = f.label :domain_blacklist_enabled, class: 'form-check-label' do - Enable domain blacklist for sign ups + = _("Enable domain blacklist for sign ups") .form-group .form-check = radio_button_tag :blacklist_type, :file, false, class: 'form-check-input' = label_tag :blacklist_type_file, class: 'form-check-label' do .option-title - Upload blacklist file + = _("Upload blacklist file") .form-check = radio_button_tag :blacklist_type, :raw, @application_setting.domain_blacklist.present? || @application_setting.domain_blacklist.blank?, class: 'form-check-input' = label_tag :blacklist_type_raw, class: 'form-check-label' do .option-title - Enter blacklist manually + = _("Enter blacklist manually") .form-group.blacklist-file - = f.label :domain_blacklist_file, 'Blacklist file', class: 'label-bold' + = f.label :domain_blacklist_file, _('Blacklist file'), class: 'label-bold' = f.file_field :domain_blacklist_file, class: 'form-control', accept: '.txt,.conf' - .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines or commas for multiple entries. + .form-text.text-muted= _("Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines or commas for multiple entries.") .form-group.blacklist-raw - = f.label :domain_blacklist, 'Blacklisted domains for sign-ups', class: 'label-bold' + = f.label :domain_blacklist, _('Blacklisted domains for sign-ups'), class: 'label-bold' = f.text_area :domain_blacklist_raw, placeholder: 'domain.com', class: 'form-control', rows: 8 - .form-text.text-muted Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com + .form-text.text-muted= _("Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com") .form-group = f.label :after_sign_up_text, class: 'label-bold' = f.text_area :after_sign_up_text, class: 'form-control', rows: 4 - .form-text.text-muted Markdown enabled + .form-text.text-muted= _("Markdown enabled") - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_spam.html.haml b/app/views/admin/application_settings/_spam.html.haml index 54cda531580c975a76e90b510879c8911f7edc03..dc05d687642f6ac9a7abb197c9527804b29e3806 100644 --- a/app/views/admin/application_settings/_spam.html.haml +++ b/app/views/admin/application_settings/_spam.html.haml @@ -6,52 +6,52 @@ .form-check = f.check_box :recaptcha_enabled, class: 'form-check-input' = f.label :recaptcha_enabled, class: 'form-check-label' do - Enable reCAPTCHA - %span.form-text.text-muted#recaptcha_help_block Helps prevent bots from creating accounts + = _("Enable reCAPTCHA") + %span.form-text.text-muted#recaptcha_help_block= _("Helps prevent bots from creating accounts") .form-group - = f.label :recaptcha_site_key, 'reCAPTCHA Site Key', class: 'label-bold' + = f.label :recaptcha_site_key, _('reCAPTCHA Site Key'), class: 'label-bold' = f.text_field :recaptcha_site_key, class: 'form-control' .form-text.text-muted - Generate site and private keys at + = _("Generate site and private keys at") %a{ href: 'http://www.google.com/recaptcha', target: 'blank' } http://www.google.com/recaptcha .form-group - = f.label :recaptcha_private_key, 'reCAPTCHA Private Key', class: 'label-bold' + = f.label :recaptcha_private_key, _('reCAPTCHA Private Key'), class: 'label-bold' = f.text_field :recaptcha_private_key, class: 'form-control' .form-group .form-check = f.check_box :akismet_enabled, class: 'form-check-input' = f.label :akismet_enabled, class: 'form-check-label' do - Enable Akismet - %span.form-text.text-muted#akismet_help_block Helps prevent bots from creating issues + = _("Enable Akismet") + %span.form-text.text-muted#akismet_help_block= _("Helps prevent bots from creating issues") .form-group - = f.label :akismet_api_key, 'Akismet API Key', class: 'label-bold' + = f.label :akismet_api_key, _('Akismet API Key'), class: 'label-bold' = f.text_field :akismet_api_key, class: 'form-control' .form-text.text-muted - Generate API key at + = _("Generate API key at") %a{ href: 'http://www.akismet.com', target: 'blank' } http://www.akismet.com .form-group .form-check = f.check_box :unique_ips_limit_enabled, class: 'form-check-input' = f.label :unique_ips_limit_enabled, class: 'form-check-label' do - Limit sign in from multiple ips + = _("Limit sign in from multiple ips") %span.form-text.text-muted#unique_ip_help_block - Helps prevent malicious users hide their activity + = _("Helps prevent malicious users hide their activity") .form-group - = f.label :unique_ips_limit_per_user, 'IPs per user', class: 'label-bold' + = f.label :unique_ips_limit_per_user, _('IPs per user'), class: 'label-bold' = f.number_field :unique_ips_limit_per_user, class: 'form-control' .form-text.text-muted - Maximum number of unique IPs per user + = _("Maximum number of unique IPs per user") .form-group - = f.label :unique_ips_limit_time_window, 'IP expiration time', class: 'label-bold' + = f.label :unique_ips_limit_time_window, _('IP expiration time'), class: 'label-bold' = f.number_field :unique_ips_limit_time_window, class: 'form-control' .form-text.text-muted - How many seconds an IP will be counted towards the limit + = _("How many seconds an IP will be counted towards the limit") - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_terminal.html.haml b/app/views/admin/application_settings/_terminal.html.haml index 49980e1e1a759d7dabca4cb1a614605553e2bb14..b7e952d429f12b13c51be4bc1d03941b9c8ab4f7 100644 --- a/app/views/admin/application_settings/_terminal.html.haml +++ b/app/views/admin/application_settings/_terminal.html.haml @@ -3,10 +3,9 @@ %fieldset .form-group - = f.label :terminal_max_session_time, 'Max session time', class: 'label-bold' + = f.label :terminal_max_session_time, _('Max session time'), class: 'label-bold' = f.number_field :terminal_max_session_time, class: 'form-control' .form-text.text-muted - Maximum time for web terminal websocket connection (in seconds). - 0 for unlimited. + = _("Maximum time for web terminal websocket connection (in seconds). 0 for unlimited.") - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_usage.html.haml b/app/views/admin/application_settings/_usage.html.haml index 2495defb6a79242e68bd91d7fb964e1a5ac9d9ee..ae6fbb7aed1baffc58520a6b41878460cb4aacd4 100644 --- a/app/views/admin/application_settings/_usage.html.haml +++ b/app/views/admin/application_settings/_usage.html.haml @@ -6,33 +6,29 @@ .form-check = f.check_box :version_check_enabled, class: 'form-check-input' = f.label :version_check_enabled, class: 'form-check-label' do - Enable version check + = _("Enable version check") .form-text.text-muted - GitLab will inform you if a new version is available. - = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "version-check") - about what information is shared with GitLab Inc. + = _("GitLab will inform you if a new version is available.") + - link_to_learn_more = link_to('Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "version-check")) + = _("%{link_to_learn_more} about what information is shared with GitLab Inc.").html_safe % { link_to_learn_more: link_to_learn_more } .form-group - can_be_configured = @application_setting.usage_ping_can_be_configured? .form-check = f.check_box :usage_ping_enabled, disabled: !can_be_configured, class: 'form-check-input' = f.label :usage_ping_enabled, class: 'form-check-label' do - Enable usage ping + = _("Enable usage ping") .form-text.text-muted - if can_be_configured - To help improve GitLab and its user experience, GitLab will - periodically collect usage information. - = link_to 'Learn more', help_page_path("user/admin_area/settings/usage_statistics", anchor: "usage-ping") - about what information is shared with GitLab Inc. Visit - = link_to _('Cohorts'), instance_statistics_cohorts_path(anchor: 'usage-ping') - to see the JSON payload sent. + = _("To help improve GitLab and its user experience, GitLab will periodically collect usage information.") + - link_to_learn_more = link_to(_('Learn more'), help_page_path("user/admin_area/settings/usage_statistics", anchor: "usage-ping")) + - link_to_cohorts = link_to(_('Cohorts'), instance_statistics_cohorts_path(anchor: 'usage-ping')) + = _("%{link_to_learn_more} about what information is shared with GitLab Inc. Visit %{link_to_cohorts} to see the JSON payload sent.").html_safe % { link_to_learn_more: link_to_learn_more, link_to_cohorts: link_to_cohorts } - else - The usage ping is disabled, and cannot be configured through this - form. For more information, see the documentation on - = succeed '.' do - = link_to 'deactivating the usage ping', help_page_path('user/admin_area/settings/usage_statistics', anchor: 'deactivate-the-usage-ping') + - link_to_deactivating = link_to(_('deactivating the usage ping'), help_page_path('user/admin_area/settings/usage_statistics', anchor: 'deactivate-the-usage-ping')) + = _("The usage ping is disabled, and cannot be configured through this form. For more information, see the documentation on %{link_to_deactivating}.").html_safe % { link_to_deactivating: link_to_deactivating } .form-group = f.label :instance_statistics_visibility_private, _('Instance Statistics visibility') = f.select :instance_statistics_visibility_private, options_for_select({_('All users') => false, _('Only admins') => true}, Gitlab::CurrentSettings.instance_statistics_visibility_private?), {}, class: 'form-control' - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/_visibility_and_access.html.haml b/app/views/admin/application_settings/_visibility_and_access.html.haml index 2f70351939c7fd1bb056ba6ca80e234c69055d95..058463b454ab58467697de6671973720c550cf65 100644 --- a/app/views/admin/application_settings/_visibility_and_access.html.haml +++ b/app/views/admin/application_settings/_visibility_and_access.html.haml @@ -23,20 +23,17 @@ .form-check = level %span.form-text.text-muted#restricted-visibility-help - Selected levels cannot be used by non-admin users for groups, projects or snippets. - If the public level is restricted, user profiles are only visible to logged in users. + = _("Selected levels cannot be used by non-admin users for groups, projects or snippets. If the public level is restricted, user profiles are only visible to logged in users.") .form-group = f.label :import_sources, class: 'label-bold' = hidden_field_tag 'application_setting[import_sources][]' - import_sources_checkboxes('import-sources-help', class: 'form-check-input').each do |source| .form-check= source %span.form-text.text-muted#import-sources-help - Enabled sources for code import during project creation. OmniAuth must be configured for GitHub - = link_to "(?)", help_page_path("integration/github") - , Bitbucket - = link_to "(?)", help_page_path("integration/bitbucket") - and GitLab.com - = link_to "(?)", help_page_path("integration/gitlab") + - link_to_github = link_to("(?)", help_page_path("integration/github")) + - link_to_bitbucket = link_to("(?)", help_page_path("integration/bitbucket")) + - link_to_gitlab = link_to("(?)", help_page_path("integration/gitlab")) + = _("Enabled sources for code import during project creation. OmniAuth must be configured for GitHub %{link_to_github}, Bitbucket %{link_to_bitbucket} and GitLab.com %{link_to_gitlab}").html_safe % { link_to_github: link_to_github, link_to_bitbucket: link_to_bitbucket, link_to_gitlab: link_to_gitlab } -# EE-only - if ldap_enabled? @@ -54,18 +51,18 @@ .form-check = f.check_box :project_export_enabled, class: 'form-check-input' = f.label :project_export_enabled, class: 'form-check-label' do - Project export enabled + = _("Project export enabled") .form-group - %label.label-bold Enabled Git access protocols - = select(:application_setting, :enabled_git_access_protocol, [['Both SSH and HTTP(S)', nil], ['Only SSH', 'ssh'], ['Only HTTP(S)', 'http']], {}, class: 'form-control') + %label.label-bold= _("Enabled Git access protocols") + = select(:application_setting, :enabled_git_access_protocol, [[_('Both SSH and HTTP(S)'), nil], [_('Only SSH'), 'ssh'], [_('Only HTTP(S)'), 'http']], {}, class: 'form-control') %span.form-text.text-muted#clone-protocol-help - Allow only the selected protocols to be used for Git access. + = _("Allow only the selected protocols to be used for Git access.") - ApplicationSetting::SUPPORTED_KEY_TYPES.each do |type| - field_name = :"#{type}_key_restriction" .form-group - = f.label field_name, "#{type.upcase} SSH keys", class: 'label-bold' + = f.label field_name, _("%{key_type} SSH keys") % { key_type: type.upcase }, class: 'label-bold' = f.select field_name, key_restriction_options_for_select(type), {}, class: 'form-control' - = f.submit 'Save changes', class: "btn btn-success" + = f.submit _('Save changes'), class: "btn btn-success" diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml index ba82670be9f5367066e10429fc68599f4f99baec..aacf1fa5b0b7efa525220f980fb9ad8ff78c190d 100644 --- a/app/views/admin/application_settings/show.html.haml +++ b/app/views/admin/application_settings/show.html.haml @@ -1,5 +1,5 @@ -- breadcrumb_title "Settings" -- page_title "Settings" +- breadcrumb_title _("Settings") +- page_title _("Settings") - @content_class = "limit-container-width" unless fluid_layout - expanded = Rails.env.test? diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0ea8789d6cbfc5b9435051434d264fa0aa5b3903..e0c854a72de5429b4fc0ccb23647eac429206329 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -122,6 +122,15 @@ msgstr "" msgid "%{group_docs_link_start}Groups%{group_docs_link_end} allow you to manage and collaborate across multiple projects. Members of a group have access to all of its projects." msgstr "" +msgid "%{key_type} SSH keys" +msgstr "" + +msgid "%{link_to_learn_more} about what information is shared with GitLab Inc." +msgstr "" + +msgid "%{link_to_learn_more} about what information is shared with GitLab Inc. Visit %{link_to_cohorts} to see the JSON payload sent." +msgstr "" + msgid "%{loadingIcon} Started" msgstr "" @@ -200,6 +209,9 @@ msgstr "" msgid "- show less" msgstr "" +msgid "0 for unlimited" +msgstr "" + msgid "1 %{type} addition" msgid_plural "%{count} %{type} additions" msgstr[0] "" @@ -312,6 +324,9 @@ msgstr "" msgid "A collection of graphs regarding Continuous Integration" msgstr "" +msgid "A method call is only tracked when it takes longer to complete than the given amount of milliseconds." +msgstr "" + msgid "A new branch will be created in your fork and a new merge request will be started." msgstr "" @@ -342,6 +357,12 @@ msgstr "" msgid "Abuse reports" msgstr "" +msgid "Abuse reports notification email" +msgstr "" + +msgid "Abuse reports will be sent to this address if it is set. Abuse reports are always available in the admin area." +msgstr "" + msgid "Accept terms" msgstr "" @@ -498,6 +519,9 @@ msgstr "" msgid "Advanced settings" msgstr "" +msgid "Akismet API Key" +msgstr "" + msgid "All" msgstr "" @@ -513,15 +537,33 @@ msgstr "" msgid "Allow commits from members who can merge to the target branch." msgstr "" +msgid "Allow mirrors to be setup for projects" +msgstr "" + +msgid "Allow only the selected protocols to be used for Git access." +msgstr "" + msgid "Allow public access to pipelines and job details, including output logs and artifacts" msgstr "" +msgid "Allow rendering of %{link_to_plantuml} diagrams in Asciidoc documents using an external PlantUML service." +msgstr "" + msgid "Allow rendering of PlantUML diagrams in Asciidoc documents." msgstr "" +msgid "Allow requests to the local network from hooks and services" +msgstr "" + msgid "Allow requests to the local network from hooks and services." msgstr "" +msgid "Allow users to register any application to use GitLab as an OAuth provider" +msgstr "" + +msgid "Allowed group" +msgstr "" + msgid "Allows you to add and manage Kubernetes clusters." msgstr "" @@ -531,12 +573,18 @@ msgstr "" msgid "Also called \"Relying party service URL\" or \"Reply URL\"" msgstr "" +msgid "Alternate support URL for help page" +msgstr "" + msgid "Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the repo scope, so we can display a list of your public and private repositories which are available to connect." msgstr "" msgid "Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the repo scope, so we can display a list of your public and private repositories which are available to import." msgstr "" +msgid "Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication" +msgstr "" + msgid "An SSH key will be automatically generated when the form is submitted. For more information, please refer to the documentation." msgstr "" @@ -807,6 +855,9 @@ msgstr "" msgid "Authorization code:" msgstr "" +msgid "Authorization token duration (minutes)" +msgstr "" + msgid "Authorization was granted by entering your username and password in the application." msgstr "" @@ -1050,12 +1101,21 @@ msgstr "" msgid "Bitbucket import" msgstr "" +msgid "Blacklist file" +msgstr "" + +msgid "Blacklisted domains for sign-ups" +msgstr "" + msgid "Blog" msgstr "" msgid "Boards" msgstr "" +msgid "Both SSH and HTTP(S)" +msgstr "" + msgid "Branch %{branchName} was not found in this project's repository." msgstr "" @@ -1223,6 +1283,12 @@ msgstr "" msgid "Business metrics (Custom)" msgstr "" +msgid "By default GitLab sends emails in HTML and plain text formats so mail clients can choose what format to use. Disable this option if you only want to send emails in plain text format." +msgstr "" + +msgid "By default, we write to the \"authorized_keys\" file to support Git over SSH without additional configuration. GitLab can be optimized to authenticate SSH keys via the database file. Only uncheck this if you have configured your OpenSSH server to use the AuthorizedKeysCommand. Click on the help icon for more details." +msgstr "" + msgid "ByAuthor|by" msgstr "" @@ -1319,6 +1385,9 @@ msgstr "" msgid "Change this value to influence how frequently the GitLab UI polls for updates." msgstr "" +msgid "Change this value to influence how frequently the GitLab UI polls for updates. If you set the value to 2 all polling intervals are multiplied by 2, which means that polling happens half as frequently. The multiplier can also have a decimal value. The default value (1) is a reasonable choice for the majority of GitLab installations. Set to 0 to completely disable polling." +msgstr "" + msgid "ChangeTypeActionLabel|Pick into branch" msgstr "" @@ -1346,6 +1415,9 @@ msgstr "" msgid "Chat" msgstr "" +msgid "Check feature availability on namespace plan" +msgstr "" + msgid "Check interval" msgstr "" @@ -1388,6 +1460,9 @@ msgstr "" msgid "Choose which groups you wish to synchronize to this secondary node." msgstr "" +msgid "Choose which queues you wish to throttle." +msgstr "" + msgid "Choose which repositories you want to connect and run CI/CD pipelines." msgstr "" @@ -1487,12 +1562,18 @@ msgstr "" msgid "CiVariable|Validation failed" msgstr "" +msgid "Circuit breaker" +msgstr "" + msgid "CircuitBreakerApiLink|circuitbreaker api" msgstr "" msgid "ClassificationLabelUnavailable|is unavailable: %{reason}" msgstr "" +msgid "Clear all repository checks" +msgstr "" + msgid "Clear search input" msgstr "" @@ -1529,6 +1610,9 @@ msgstr "" msgid "Clients" msgstr "" +msgid "Clientside Sentry DSN" +msgstr "" + msgid "Clone repository" msgstr "" @@ -2094,6 +2178,12 @@ msgstr "" msgid "Connecting..." msgstr "" +msgid "Connection pool size" +msgstr "" + +msgid "Connection timeout" +msgstr "" + msgid "Container Registry" msgstr "" @@ -2322,6 +2412,9 @@ msgstr "" msgid "Creating epic" msgstr "" +msgid "Creating pack file bitmaps makes housekeeping take a little longer but bitmaps should accelerate 'git clone' performance." +msgstr "" + msgid "Cron Timezone" msgstr "" @@ -2409,9 +2502,18 @@ msgstr "" msgid "Decline and sign out" msgstr "" +msgid "Default Timeout Period" +msgstr "" + +msgid "Default artifacts expiration" +msgstr "" + msgid "Default classification label" msgstr "" +msgid "Default to Auto DevOps pipeline for all projects" +msgstr "" + msgid "Default: Directly import the Google Code email address or username" msgstr "" @@ -2639,6 +2741,12 @@ msgstr "" msgid "Domain" msgstr "" +msgid "Domain Blacklist" +msgstr "" + +msgid "Domain verification is an essential security measure for public GitLab sites. Users are required to demonstrate they control a domain before it is enabled" +msgstr "" + msgid "Don't show again" msgstr "" @@ -2729,33 +2837,87 @@ msgstr "" msgid "Enable" msgstr "" +msgid "Enable Akismet" +msgstr "" + msgid "Enable Auto DevOps" msgstr "" +msgid "Enable Clientside Sentry" +msgstr "" + +msgid "Enable Git pack file bitmap creation" +msgstr "" + +msgid "Enable HTML emails" +msgstr "" + +msgid "Enable InfluxDB Metrics" +msgstr "" + +msgid "Enable Koding" +msgstr "" + +msgid "Enable PlantUML" +msgstr "" + +msgid "Enable Prometheus Metrics" +msgstr "" + msgid "Enable Pseudonymizer data collection" msgstr "" +msgid "Enable Repository Checks" +msgstr "" + msgid "Enable SAML authentication for this group" msgstr "" +msgid "Enable Sentry" +msgstr "" + msgid "Enable Sentry for error reporting and logging." msgstr "" +msgid "Enable Sidekiq Job Throttling" +msgstr "" + +msgid "Enable a Prometheus metrics endpoint at %{metrics_path} to expose a variety of statistics on the health and performance of GitLab. Additional information on authenticating and connecting to the metrics endpoint is available %{link}." +msgstr "" + msgid "Enable and configure InfluxDB metrics." msgstr "" msgid "Enable and configure Prometheus metrics." msgstr "" +msgid "Enable authenticated API request rate limit" +msgstr "" + +msgid "Enable authenticated web request rate limit" +msgstr "" + +msgid "Enable automatic repository housekeeping (git repack, git gc)" +msgstr "" + msgid "Enable classification control using an external service" msgstr "" +msgid "Enable domain blacklist for sign ups" +msgstr "" + msgid "Enable for this project" msgstr "" msgid "Enable group Runners" msgstr "" +msgid "Enable immutable, hash-based paths and repository names to store repositories on disk. This prevents repositories from having to be moved or renamed when the Project URL changes and may improve disk I/O performance. %{emphasis_start}(EXPERIMENTAL)%{emphasis_end}" +msgstr "" + +msgid "Enable mirror configuration" +msgstr "" + msgid "Enable or disable certain group features and choose access levels." msgstr "" @@ -2765,21 +2927,57 @@ msgstr "" msgid "Enable or disable version check and usage ping." msgstr "" +msgid "Enable reCAPTCHA" +msgstr "" + msgid "Enable reCAPTCHA or Akismet and set IP limits." msgstr "" +msgid "Enable shared runners for new projects" +msgstr "" + +msgid "Enable the Performance Bar" +msgstr "" + msgid "Enable the Performance Bar for a given group." msgstr "" +msgid "Enable unauthenticated request rate limit" +msgstr "" + +msgid "Enable usage ping" +msgstr "" + +msgid "Enable version check" +msgstr "" + msgid "Enabled" msgstr "" +msgid "Enabled Git access protocols" +msgstr "" + +msgid "Enabled OAuth sign-in sources" +msgstr "" + +msgid "Enabled sources for code import during project creation. OmniAuth must be configured for GitHub %{link_to_github}, Bitbucket %{link_to_bitbucket} and GitLab.com %{link_to_gitlab}" +msgstr "" + +msgid "Enabling this will only make licensed EE features available to projects if the project namespace's plan includes the feature or if the project is public." +msgstr "" + msgid "Ends at (UTC)" msgstr "" +msgid "Enter blacklist manually" +msgstr "" + msgid "Enter in your Bitbucket Server URL and personal access token below" msgstr "" +msgid "Environment variable %{code_start}prometheus_multiproc_dir%{code_end} does not exist or is not pointing to a valid directory." +msgstr "" + msgid "Environments" msgstr "" @@ -3044,6 +3242,12 @@ msgstr "" msgid "Failure" msgstr "" +msgid "Fast Timeout Period" +msgstr "" + +msgid "Fast operation timeout (in seconds). Some Gitaly operations are expected to be fast. If they exceed this threshold, there may be a problem with a storage shard and 'failing fast' can help maintain the stability of the GitLab instance." +msgstr "" + msgid "Faster as it re-uses the project workspace (falling back to clone if it doesn't exist)" msgstr "" @@ -3175,6 +3379,9 @@ msgstr "" msgid "From the Kubernetes cluster details view, install Runner from the applications list" msgstr "" +msgid "Full repack period" +msgstr "" + msgid "GPG Keys" msgstr "" @@ -3184,9 +3391,15 @@ msgstr "" msgid "General pipelines" msgstr "" +msgid "Generate API key at" +msgstr "" + msgid "Generate a default set of labels" msgstr "" +msgid "Generate site and private keys at" +msgstr "" + msgid "Geo Nodes" msgstr "" @@ -3463,6 +3676,9 @@ msgstr "" msgid "Git" msgstr "" +msgid "Git GC period" +msgstr "" + msgid "Git repository URL" msgstr "" @@ -3499,9 +3715,18 @@ msgstr "" msgid "GitLab project export" msgstr "" +msgid "GitLab restart is required to apply changes" +msgstr "" + msgid "GitLab single sign on URL" msgstr "" +msgid "GitLab will inform you if a new version is available." +msgstr "" + +msgid "GitLab will periodically run %{link_to_git_fsck} in all project and wiki repositories to look for silent disk corruption issues." +msgstr "" + msgid "GitLab will run a background job that will produce pseudonymized CSVs of the GitLab database that will be uploaded to your configured object storage directory." msgstr "" @@ -3553,6 +3778,9 @@ msgstr "" msgid "Graph" msgstr "" +msgid "Gravatar enabled" +msgstr "" + msgid "Group" msgstr "" @@ -3742,12 +3970,27 @@ msgstr "" msgid "Help page text and support page url." msgstr "" +msgid "Helps prevent bots from creating accounts" +msgstr "" + +msgid "Helps prevent bots from creating issues" +msgstr "" + +msgid "Helps prevent malicious users hide their activity" +msgstr "" + +msgid "Helps reduce request volume (e.g. from crawlers or abusive bots)" +msgstr "" + msgid "Here is the public SSH key that needs to be added to the remote server. For more information, please refer to the documentation." msgstr "" msgid "Hide host keys manual input" msgstr "" +msgid "Hide marketing-related entries from help" +msgstr "" + msgid "Hide value" msgid_plural "Hide values" msgstr[0] "" @@ -3759,9 +4002,18 @@ msgstr "" msgid "History" msgstr "" +msgid "Home page URL" +msgstr "" + +msgid "Housekeeping" +msgstr "" + msgid "Housekeeping successfully started" msgstr "" +msgid "How many seconds an IP will be counted towards the limit" +msgstr "" + msgid "I accept the %{terms_link}" msgstr "" @@ -3807,6 +4059,12 @@ msgstr "" msgid "IDE|Review" msgstr "" +msgid "IP expiration time" +msgstr "" + +msgid "IPs per user" +msgstr "" + msgid "Identifier" msgstr "" @@ -3819,6 +4077,9 @@ msgstr "" msgid "If disabled, a diverged local branch will not be automatically updated with commits from its remote counterpart, to prevent local data loss. If the default branch (%{default_branch}) has diverged and cannot be updated, mirroring will fail. Other diverged branches are silently ignored." msgstr "" +msgid "If disabled, only admins will be able to setup mirrors in projects." +msgstr "" + msgid "If disabled, the access level will depend on the user's permissions in the project." msgstr "" @@ -3834,6 +4095,12 @@ msgstr "" msgid "If you already have files you can push them using the %{link_to_cli} below." msgstr "" +msgid "If you got a lot of false alarms from repository checks you can choose to clear all repository check information from the database." +msgstr "" + +msgid "If you keep automatic housekeeping disabled for a long time Git repository access on your GitLab server will become slower and your repositories will use more disk space. We recommend to always leave this enabled." +msgstr "" + msgid "If your HTTP repository is not publicly accessible, add authentication information to the URL: https://username:password@gitlab.company.com/group/project.git." msgstr "" @@ -3915,12 +4182,24 @@ msgstr "" msgid "Include a Terms of Service agreement and Privacy Policy that all users must accept." msgstr "" +msgid "Include author name in notification email body" +msgstr "" + msgid "Include the username in the URL if required: https://username@gitlab.company.com/group/project.git." msgstr "" msgid "Incompatible Project" msgstr "" +msgid "Incremental repack period" +msgstr "" + +msgid "InfluxDB host" +msgstr "" + +msgid "InfluxDB port" +msgstr "" + msgid "Inline" msgstr "" @@ -4028,6 +4307,18 @@ msgstr "" msgid "Koding Dashboard" msgstr "" +msgid "Koding URL" +msgstr "" + +msgid "Koding administration documentation" +msgstr "" + +msgid "Koding has integration enabled out of the box for the %{strong_start}gitlab%{strong_end} team, and you need to provide that team's URL here. Learn more in the %{link_to_koding_doc}." +msgstr "" + +msgid "Koding integration has been deprecated since GitLab 10.0. If you disable your Koding integration, you will not be able to enable it again." +msgstr "" + msgid "Kubernetes" msgstr "" @@ -4213,6 +4504,12 @@ msgstr "" msgid "Licenses" msgstr "" +msgid "Limit sign in from multiple ips" +msgstr "" + +msgid "Limit the amount of resources slow running jobs are assigned." +msgstr "" + msgid "Limited to showing %d event at most" msgid_plural "Limited to showing %d events at most" msgstr[0] "" @@ -4311,6 +4608,9 @@ msgstr "" msgid "Manage project labels" msgstr "" +msgid "Manage repository storage paths. Learn more in the %{link_to_repository_doc}." +msgstr "" + msgid "Manage your group’s membership while adding another level of security with SAML." msgstr "" @@ -4344,15 +4644,45 @@ msgstr "" msgid "Markdown enabled" msgstr "" +msgid "Max requests per period per IP" +msgstr "" + +msgid "Max requests per period per user" +msgstr "" + +msgid "Max session time" +msgstr "" + +msgid "Maximum artifacts size (MB)" +msgstr "" + +msgid "Maximum attachment size (MB)" +msgstr "" + msgid "Maximum git storage failures" msgstr "" +msgid "Maximum number of unique IPs per user" +msgstr "" + +msgid "Maximum size of pages (MB)" +msgstr "" + +msgid "Maximum time for web terminal websocket connection (in seconds). 0 for unlimited." +msgstr "" + msgid "May" msgstr "" msgid "Median" msgstr "" +msgid "Medium Timeout Period" +msgstr "" + +msgid "Medium operation timeout (in seconds). This should be a value between the Fast and the Default timeout." +msgstr "" + msgid "Members" msgstr "" @@ -4413,6 +4743,9 @@ msgstr "" msgid "Messages" msgstr "" +msgid "Method Call Threshold (ms)" +msgstr "" + msgid "Metrics" msgstr "" @@ -4422,6 +4755,9 @@ msgstr "" msgid "Metrics - Prometheus" msgstr "" +msgid "Metrics per packet" +msgstr "" + msgid "Metrics|Business" msgstr "" @@ -4733,9 +5069,15 @@ msgstr "" msgid "New tag" msgstr "" +msgid "New users set to external" +msgstr "" + msgid "New..." msgstr "" +msgid "Newly registered users will by default be external" +msgstr "" + msgid "No" msgstr "" @@ -4925,12 +5267,24 @@ msgstr "" msgid "November" msgstr "" +msgid "Number of Git pushes after which 'git gc' is run." +msgstr "" + +msgid "Number of Git pushes after which a full 'git repack' is run." +msgstr "" + +msgid "Number of Git pushes after which an incremental 'git repack' is run." +msgstr "" + msgid "Number of access attempts" msgstr "" msgid "OK" msgstr "" +msgid "ONLY users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com" +msgstr "" + msgid "Oct" msgstr "" @@ -4957,6 +5311,12 @@ msgstr "" msgid "Online IDE integration settings." msgstr "" +msgid "Only HTTP(S)" +msgstr "" + +msgid "Only SSH" +msgstr "" + msgid "Only admins" msgstr "" @@ -5056,6 +5416,12 @@ msgstr "" msgid "Password" msgstr "" +msgid "Password authentication enabled for Git over HTTP(S)" +msgstr "" + +msgid "Password authentication enabled for web interface" +msgstr "" + msgid "Paste your public SSH key, which is usually contained in the file '~/.ssh/id_rsa.pub' and begins with 'ssh-rsa'. Don't use your private SSH key." msgstr "" @@ -5260,6 +5626,9 @@ msgstr "" msgid "PlantUML" msgstr "" +msgid "PlantUML URL" +msgstr "" + msgid "Play" msgstr "" @@ -5290,6 +5659,9 @@ msgstr "" msgid "Please wait while we import the repository for you. Refresh at will." msgstr "" +msgid "Polling interval multiplier" +msgstr "" + msgid "Preferences" msgstr "" @@ -5458,6 +5830,9 @@ msgstr "" msgid "Project export could not be deleted." msgstr "" +msgid "Project export enabled" +msgstr "" + msgid "Project export has been deleted." msgstr "" @@ -5734,6 +6109,9 @@ msgstr "" msgid "Quick actions can be used in the issues description and comment boxes." msgstr "" +msgid "Rate limit period in seconds" +msgstr "" + msgid "Read more" msgstr "" @@ -5865,6 +6243,9 @@ msgstr "" msgid "Repository URL" msgstr "" +msgid "Repository checks" +msgstr "" + msgid "Repository has no locks." msgstr "" @@ -5889,6 +6270,12 @@ msgstr "" msgid "Require all users to accept Terms of Service and Privacy Policy when they access GitLab." msgstr "" +msgid "Require all users to setup Two-factor authentication" +msgstr "" + +msgid "Require users to prove ownership of custom domains" +msgstr "" + msgid "Reset git storage health information" msgstr "" @@ -5996,6 +6383,9 @@ msgstr "" msgid "SSL Verification" msgstr "" +msgid "Sampler Interval (sec)" +msgstr "" + msgid "Save" msgstr "" @@ -6166,15 +6556,30 @@ msgstr "" msgid "Select the custom project template source group." msgstr "" +msgid "Selected levels cannot be used by non-admin users for groups, projects or snippets. If the public level is restricted, user profiles are only visible to logged in users." +msgstr "" + msgid "Selecting a GitLab user will add a link to the GitLab user in the descriptions of issues and comments (e.g. \"By @johnsmith\"). It will also associate and/or assign these issues and comments with the selected user." msgstr "" msgid "Selective synchronization" msgstr "" +msgid "Send confirmation email on sign-up" +msgstr "" + msgid "Send email" msgstr "" +msgid "Sentry DSN" +msgstr "" + +msgid "Sentry can also be used for reporting and logging clientside exceptions." +msgstr "" + +msgid "Sentry is an error reporting and logging tool which is currently not shipped with GitLab, get it here:" +msgstr "" + msgid "Sep" msgstr "" @@ -6193,6 +6598,9 @@ msgstr "" msgid "Service URL" msgstr "" +msgid "Session duration (minutes)" +msgstr "" + msgid "Session expiration, projects limit and attachment size." msgstr "" @@ -6211,6 +6619,12 @@ msgstr "" msgid "Set requirements for a user to sign-in. Enable mandatory two-factor authentication." msgstr "" +msgid "Set the default expiration time for each job's artifacts. 0 for unlimited." +msgstr "" + +msgid "Set the maximum file size for each job's artifacts" +msgstr "" + msgid "Set up CI/CD" msgstr "" @@ -6229,6 +6643,9 @@ msgstr "" msgid "Settings" msgstr "" +msgid "Setup InfluxDB to measure a wide variety of statistics like the time spent in running SQL queries. These settings require a %{link_to_restart} to take effect." +msgstr "" + msgid "Setup a specific Runner automatically" msgstr "" @@ -6294,6 +6711,9 @@ msgstr "" msgid "Sidebar|Weight" msgstr "" +msgid "Sidekiq queues to throttle" +msgstr "" + msgid "Sign in" msgstr "" @@ -6312,6 +6732,9 @@ msgstr "" msgid "Sign-in restrictions" msgstr "" +msgid "Sign-up enabled" +msgstr "" + msgid "Sign-up restrictions" msgstr "" @@ -6330,6 +6753,9 @@ msgstr "" msgid "Snippets" msgstr "" +msgid "Some email servers do not support overriding the email sender name. Enable this option to include the name of the author of the issue, merge request or comment in the email body instead." +msgstr "" + msgid "Something went wrong on our end" msgstr "" @@ -6564,6 +6990,9 @@ msgstr "" msgid "Storage" msgstr "" +msgid "Storage paths for new projects" +msgstr "" + msgid "Storage:" msgstr "" @@ -6585,6 +7014,9 @@ msgstr "" msgid "Subscribe at project level" msgstr "" +msgid "Support page URL" +msgstr "" + msgid "Switch branch/tag" msgstr "" @@ -6719,9 +7151,21 @@ msgstr "" msgid "The Issue Tracker is the place to add things that need to be improved or solved in a project. You can register or sign in to create issues for this project." msgstr "" +msgid "The UDP port to use for connecting to InfluxDB. InfluxDB requires that your server configuration specifies a database to store data in when sending messages to this port, without it metrics data will not be saved." +msgstr "" + msgid "The X509 Certificate to use when mutual TLS is required to communicate with the external authorization service. If left blank, the server certificate is still validated when accessing over HTTPS." msgstr "" +msgid "The amount of InfluxDB connections to open. Connections are opened lazily. Users using multi-threaded application servers should ensure enough connections are available (at minimum the amount of application server threads)." +msgstr "" + +msgid "The amount of points to store in a single UDP packet. More points results in fewer but larger UDP packets being sent." +msgstr "" + +msgid "The amount of seconds after which an InfluxDB connection will time out." +msgstr "" + msgid "The character highlighter helps you keep the subject line to %{titleLength} characters and wrap the body at %{bodyLength} so they are readable in git." msgstr "" @@ -6734,6 +7178,9 @@ msgstr "" msgid "The connection will time out after %{timeout}. For repositories that take longer, use a clone/push combination." msgstr "" +msgid "The factor by which the queues should be throttled. A value between 0.0 and 1.0, exclusive." +msgstr "" + msgid "The fork relationship has been removed." msgstr "" @@ -6800,6 +7247,9 @@ msgstr "" msgid "The roadmap shows the progress of your epics along a timeline" msgstr "" +msgid "The sampling interval in seconds. Sampled data includes memory usage, retained Ruby objects, file descriptors and so on." +msgstr "" + msgid "The secure token used by the Runner to checkout the project" msgstr "" @@ -6821,6 +7271,9 @@ msgstr "" msgid "The time taken by each data entry gathered by that stage." msgstr "" +msgid "The usage ping is disabled, and cannot be configured through this form. For more information, see the documentation on %{link_to_deactivating}." +msgstr "" + msgid "The user map is a JSON document mapping the Google Code users that participated on your projects to the way their email addresses and usernames will be imported into GitLab. You can change this by changing the value on the right hand side of :. Be sure to preserve the surrounding double quotes, other punctuation and the email address or username on the left hand side." msgstr "" @@ -6866,6 +7319,9 @@ msgstr "" msgid "There was an error when unsubscribing from this label." msgstr "" +msgid "These settings require a %{link_to_restart} to take effect." +msgstr "" + msgid "They can be managed using the %{link}." msgstr "" @@ -6974,6 +7430,12 @@ msgstr "" msgid "This repository" msgstr "" +msgid "This setting requires a %{link_to_restart} to take effect." +msgstr "" + +msgid "This setting requires a restart to take effect." +msgstr "" + msgid "This source diff could not be displayed because it is too large." msgstr "" @@ -6986,12 +7448,18 @@ msgstr "" msgid "This user will be the author of all events in the activity feed that are the result of an update, like new branches being created or new commits being pushed to existing branches. Upon creation or when reassigning you can only assign yourself to be the mirror user." msgstr "" +msgid "This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?" +msgstr "" + msgid "This will delete the custom metric, Are you sure?" msgstr "" msgid "Those emails automatically become issues (with the comments becoming the email conversation) listed here." msgstr "" +msgid "Throttling Factor" +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "" @@ -7154,6 +7622,9 @@ msgstr "" msgid "Timeout" msgstr "" +msgid "Timeout for Gitaly calls from the GitLab application (in seconds). This timeout is not enforced for git fetch/push operations or Sidekiq jobs." +msgstr "" + msgid "Time|hr" msgid_plural "Time|hrs" msgstr[0] "" @@ -7194,6 +7665,9 @@ msgstr "" msgid "To get started, please enter your Gitea Host URL and a %{link_to_personal_token}." msgstr "" +msgid "To help improve GitLab and its user experience, GitLab will periodically collect usage information." +msgstr "" + msgid "To import GitHub repositories, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the repo scope, so we can display a list of your public and private repositories which are available to import." msgstr "" @@ -7299,6 +7773,12 @@ msgstr "" msgid "Twitter" msgstr "" +msgid "Two-factor authentication" +msgstr "" + +msgid "Two-factor grace period (hours)" +msgstr "" + msgid "Unable to load the diff. %{button_try_again}" msgstr "" @@ -7386,6 +7866,9 @@ msgstr "" msgid "Upload New File" msgstr "" +msgid "Upload blacklist file" +msgstr "" + msgid "Upload file" msgstr "" @@ -7410,6 +7893,9 @@ msgstr "" msgid "Use group milestones to manage issues from multiple projects in the same milestone." msgstr "" +msgid "Use hashed storage paths for newly created and renamed projects" +msgstr "" + msgid "Use one line per URI" msgstr "" @@ -7425,6 +7911,9 @@ msgstr "" msgid "Used by members to sign in to your group in GitLab" msgstr "" +msgid "User OAuth applications" +msgstr "" + msgid "User Settings" msgstr "" @@ -7437,6 +7926,12 @@ msgstr "" msgid "Users" msgstr "" +msgid "Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com" +msgstr "" + +msgid "Users with e-mail addresses that match these domain(s) will NOT be able to sign-up. Wildcards allowed. Use separate lines or commas for multiple entries." +msgstr "" + msgid "User|Current status" msgstr "" @@ -7515,6 +8010,9 @@ msgstr "" msgid "VisibilityLevel|Unknown" msgstr "" +msgid "WARNING:" +msgstr "" + msgid "Want to see the data? Please ask an administrator for access." msgstr "" @@ -7527,6 +8025,12 @@ msgstr "" msgid "We want to be sure it is you, please confirm you are not a robot." msgstr "" +msgid "We will redirect non-logged in users to this page" +msgstr "" + +msgid "We will redirect users to this page after they sign out" +msgstr "" + msgid "Web IDE" msgstr "" @@ -7548,12 +8052,18 @@ msgstr "" msgid "When a runner is locked, it cannot be assigned to other projects" msgstr "" +msgid "When disabled, an external authentication provider must be used." +msgstr "" + msgid "When enabled, users cannot use GitLab until the terms have been accepted." msgstr "" msgid "When leaving the URL blank, classification labels can still be specified without disabling cross project features or performing external authorization checks." msgstr "" +msgid "Whitelisted domains for sign-ups" +msgstr "" + msgid "Wiki" msgstr "" @@ -7695,6 +8205,9 @@ msgstr "" msgid "Withdraw Access Request" msgstr "" +msgid "Write to \"authorized_keys\" file" +msgstr "" + msgid "Yes" msgstr "" @@ -8139,6 +8652,9 @@ msgid_plural "days" msgstr[0] "" msgstr[1] "" +msgid "deactivating the usage ping" +msgstr "" + msgid "deploy token" msgstr "" @@ -8462,6 +8978,12 @@ msgstr "" msgid "private key does not match certificate." msgstr "" +msgid "reCAPTCHA Private Key" +msgstr "" + +msgid "reCAPTCHA Site Key" +msgstr "" + msgid "remaining" msgstr "" @@ -8471,6 +8993,12 @@ msgstr "" msgid "remove weight" msgstr "" +msgid "repository storages documentation" +msgstr "" + +msgid "restart" +msgstr "" + msgid "source" msgstr "" diff --git a/qa/qa/page/admin/settings/repository_storage.rb b/qa/qa/page/admin/settings/repository_storage.rb index 68dd23a41e1fa7c65434f2f0d3be42ca8d79af41..5e51d982a5555d8d48e380d57b91cad2962e12e0 100644 --- a/qa/qa/page/admin/settings/repository_storage.rb +++ b/qa/qa/page/admin/settings/repository_storage.rb @@ -4,7 +4,7 @@ module Admin module Settings class RepositoryStorage < Page::Base view 'app/views/admin/application_settings/_repository_storage.html.haml' do - element :submit, "submit 'Save changes'" + element :submit, "submit _('Save changes')" element :hashed_storage, 'Use hashed storage paths for newly created and renamed projects' end