From d283729810b7563158cdfb5d5ab52d480e5de65e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 25 Jul 2020 09:09:33 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../application_settings/_ci_cd.html.haml | 4 +- .../application_settings/ci/_header.html.haml | 6 +- app/views/admin/groups/show.html.haml | 6 +- lib/gitlab/i18n/html_todo.yml | 104 +++++++++--------- locale/gitlab.pot | 31 +++--- 5 files changed, 74 insertions(+), 77 deletions(-) diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index 410820dfb85..7051b790fb7 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -39,13 +39,13 @@ = 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. The default unit is in seconds, but you can define an alternative. For example: 4 mins 2 sec, 2h42min.").html_safe + = html_escape(_("Set the default expiration time for each job's artifacts. 0 for unlimited. The default unit is in seconds, but you can define an alternative. For example: %{code_open}4 mins 2 sec%{code_close}, %{code_open}2h42min%{code_close}.")) % { code_open: ''.html_safe, code_close: ''.html_safe } = link_to icon('question-circle'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'default-artifacts-expiration-core-only') .form-group = f.label :archive_builds_in_human_readable, _('Archive jobs'), class: 'label-bold' = f.text_field :archive_builds_in_human_readable, class: 'form-control', placeholder: 'never' .form-text.text-muted - = _("Set the duration for which the jobs will be considered as old and expired. Once that time passes, the jobs will be archived and no longer able to be retried. Make it empty to never expire jobs. It has to be no less than 1 day, for example: 15 days, 1 month, 2 years.").html_safe + = html_escape(_("Set the duration for which the jobs will be considered as old and expired. Once that time passes, the jobs will be archived and no longer able to be retried. Make it empty to never expire jobs. It has to be no less than 1 day, for example: %{code_open}15 days%{code_close}, %{code_open}1 month%{code_close}, %{code_open}2 years%{code_close}.")) % { code_open: ''.html_safe, code_close: ''.html_safe } .form-group .form-check = f.check_box :protected_ci_variables, class: 'form-check-input' diff --git a/app/views/admin/application_settings/ci/_header.html.haml b/app/views/admin/application_settings/ci/_header.html.haml index fe86284ba2f..104c68a1e66 100644 --- a/app/views/admin/application_settings/ci/_header.html.haml +++ b/app/views/admin/application_settings/ci/_header.html.haml @@ -8,13 +8,13 @@ = expanded ? _('Collapse') : _('Expand') %p - = _('Environment variables are applied to all project environments in this instance via the Runner. You can use environment variables for passwords, secret keys, etc. Make variables available to the running application by prepending the variable key with K8S_SECRET_. You can set variables to be:').html_safe + = html_escape(_('Environment variables are applied to all project environments in this instance via the Runner. You can use environment variables for passwords, secret keys, etc. Make variables available to the running application by prepending the variable key with %{code_open}K8S_SECRET_%{code_close}. You can set variables to be:')) % { code_open: ''.html_safe, code_close: ''.html_safe } %ul %li - = _('Protected to expose them to protected branches or tags only.').html_safe + = html_escape(_('%{code_open}Protected%{code_close} to expose them to protected branches or tags only.')) % { code_open: ''.html_safe, code_close: ''.html_safe } %li - = _('Masked to prevent the values from being displayed in job logs (must match certain regexp requirements).').html_safe + = html_escape(_('%{code_open}Masked%{code_close} to prevent the values from being displayed in job logs (must match certain regexp requirements).')) % { code_open: ''.html_safe, code_close: ''.html_safe } %p = link_to _('More information'), help_page_path('ci/variables/README', anchor: 'instance-level-cicd-environment-variables') diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 32d37a5dae1..f64fe2eff7d 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -106,8 +106,8 @@ = _('Add user(s) to the group:') .card-body.form-holder %p.light - - link_to_help = link_to(_("here"), help_page_path("user/permissions")) - = _('Read more about project permissions %{link_to_help}').html_safe % { link_to_help: link_to_help } + - help_link_open = ''.html_safe % { help_url: help_page_url("user/permissions") } + = html_escape(_('Read more about project permissions %{help_link_open}here%{help_link_close}')) % { help_link_open: help_link_open, help_link_close: ''.html_safe } = form_tag admin_group_members_update_path(@group), id: "new_project_member", class: "bulk_import", method: :put do %div @@ -120,7 +120,7 @@ .card .card-header - = _("%{group_name} group members").html_safe % { group_name: @group.name } + = html_escape(_("%{group_name} group members")) % { group_name: "#{html_escape(@group.name)}".html_safe } %span.badge.badge-pill= @group.members.size .float-right = link_to group_group_members_path(@group), class: 'btn btn-default gl-button btn-sm' do diff --git a/lib/gitlab/i18n/html_todo.yml b/lib/gitlab/i18n/html_todo.yml index aa648dbb41d..f7eb7711003 100644 --- a/lib/gitlab/i18n/html_todo.yml +++ b/lib/gitlab/i18n/html_todo.yml @@ -136,28 +136,6 @@ - "\\\"johnsmith@example.com\\\": \\\"johnsmith@example.com\\\" 은 원래 johnsmith@example.com이 생성한 모든 이슈와 주석에 \\\"By johnsmith@example.com\\\"을 추가합니다. 기본적으로 이메일 주소 또는 사용자 이름은 가려져 있어서 사용자의 개인정보를 보호합니다. 전체 전자 메일 주소를 표시하려면 이 옵션을 사용하십시오." - "\\\"johnsmith@example.com\\\": \\\"johnsmith@example.com\\\" ajoutera « Par johnsmith@example.com » à tous les tickets et commentaires créés à l’origine par johnsmith@example.com. Par défaut, l’adresse de courriel ou le nom d’utilisateur est masqué pour garantir la confidentialité de l’utilisateur. Utilisez cette option si vous souhaitez afficher l’adresse de courriel complète." - "\\\"johnsmith@example.com\\\": \\\"johnsmith@example.com\\\" añadirá \\\"Por johnsmith@example.com\\\" a todas las incidencias y comentarios originalmente creados por johnsmith@example.com. Por defecto, el correo electrónico o el nombre de usuario está oculto para asegurar la privacidad del usuario. Utilice esta opción si desea mostrar la dirección de correo electrónico completa." -"Masked to prevent the values from being displayed in job logs (must match certain regexp requirements).": - plural_id: - translations: -"Protected to expose them to protected branches or tags only.": - plural_id: - translations: -"%{group_name} group members": - plural_id: - translations: - - "%{group_name} 群組成員" - - "Membros do grupo %{group_name}" - - "%{group_name} グループのメンバー" - - "%{group_name} 群組的成員" - - "Membros do grupo %{group_name}" - - "%{group_name} участников группы" - - "%{group_name} 群组成员" - - "%{group_name} користувачі групи" - - "%{group_name} Gruppenmitglieder" - - "%{group_name} 그룹 멤버" - - "Membres du groupe %{group_name}" - - "miembros del grupo %{group_name}" - - "%{group_name} grup üyeleri" "%{label_name} will be permanently deleted from %{subject_name}. This cannot be undone.": plural_id: translations: @@ -393,9 +371,6 @@ - "不用担心，您可以通过单击右上角的帮助图标来访问此导览，然后选择 Learn GitLab。" - "Не хвилюйтеся, ви завжди зможете отримати доступ до цієї екскурсії, натиснувши кнопку довідки у верхньому правому куті і вибравши Дізнатися про GitLab." - "No se preocupe, puede acceder a este visita haciendo clic sobre el ícono de ayuda situado en la esquina superior derecha y seleccionando aprender GitLab." -"Environment variables are applied to all project environments in this instance via the Runner. You can use environment variables for passwords, secret keys, etc. Make variables available to the running application by prepending the variable key with K8S_SECRET_. You can set variables to be:": - plural_id: - translations: "Example: acme.com,acme.co.in,acme.uk.": plural_id: translations: @@ -574,16 +549,6 @@ - "

공통 메트릭스가 발견되지 않았습니다.

" - "

Aucune métrique commune trouvée

" - "

No se han encontradométricas comunes

" -"Read more about project permissions %{link_to_help}": - plural_id: - translations: - - "Saiba mais sobre as permissões do projeto %{link_to_help}" - - "プロジェクトの権限については %{link_to_help} を参照" - - "了解有关项目权限的更多信息 %{link_to_help}" - - "Дізнайтеся більше про права доступу в проекті %{link_to_help}" - - "Lies mehr über Projektberechtigungen %{link_to_help}" - - "Pour en savoir plus sur les autorisations de projet : %{link_to_help}" - - "Lea más sobre los permisos de este proyecto %{link_to_help}" "SSH host keys are not available on this system. Please use ssh-keyscan command or contact your GitLab administrator for more information.": plural_id: translations: @@ -612,20 +577,6 @@ - "Wenn du eine(n) GitLab-Benutzer(in) azswählst, wird in der Beschreibung des Tickets und den Kommentaren ein Link zum/zur Benutzer(in) hinzugefügt (z. B. \\\"Von @johnsmith\\\"). Außerdem wird der/die ausgewählte Benutzer(in) dem Ticket oder Kommentar zugeordnet und/oder es ihm/ihr zugewiesen." - "La sélection d’un utilisateur de GitLab va ajouter un lien vers cet utilisateur dans les descriptions des tickets et des commentaires (p. ex., « Par @johnsmith »). Les tickets et commentaires seront également associés ou assignés à cet utilisateur." - "Al seleccionar un usuario de GitLab añadirá un link al usuario en la descripción de las incidencias, así como también, en los comentarios (por ejemplo, \\\"Por @johnsmith\\\"). Al hacer esto, también asociará y asignará dichas incidencias y comentarios con el usuario seleccionado." -"Set the default expiration time for each job's artifacts. 0 for unlimited. The default unit is in seconds, but you can define an alternative. For example: 4 mins 2 sec, 2h42min.": - plural_id: - translations: - - "各ジョブのアーティファクトのデフォルトの有効期限を設定します。 無制限の場合は0。 デフォルトの単位は秒ですが、代わりのものを定義できます。 例：4分2秒、2時間42分" - - "设置每个作业的产物的默认到期时间。 0 表示无限制。默认以秒为单位，但您可以定义替代方案。例如：4 mins 2 sec, 2h42min.。" - - "Задайте стандартний час зберігання для артефактів кожного із завдань. 0 означає необмежений. Стандартною одиницею вимірювання є секунда (sec), але ви можете вибрати й іншу. Наприклад: 4 mins 2 sec, 2h42min." - - "Establezca el tiempo de caducidad predeterminado para los artefactos generados en cada trabajo. 0 para una caducidad ilimitada. La unidad predeterminada son segundos, pero puede definir una alternativa. Por ejemplo: 4 minutos 2 segundos, 2h42min." -"Set the duration for which the jobs will be considered as old and expired. Once that time passes, the jobs will be archived and no longer able to be retried. Make it empty to never expire jobs. It has to be no less than 1 day, for example: 15 days, 1 month, 2 years.": - plural_id: - translations: - - "ジョブが期限切れとなる期間を設定します。設定された時間を経過するとジョブはアーカイブされ、再試行できなくなります。ジョブの期限を無期限にする場合、空のままにしてください。これらは1日以上で指定しなければなりません。例えば、15 days、 1 month、 2 years など。" - - "设置作业的过期时间。一旦逾期，作业将被归档并且不能重试。留空则永不过期。必须设置为 1 天以上，例如： 15 days, 1 month, 2 years。" - - "Встановіть тривалість, протягом якої завдання будуть вважатися застарілими. Як тільки пройде цей час, вони будуть заархівовані і більше не зможуть бути повтореними. Залиште порожнім, щоб завдання ніколи не застарівали. Має бути не менше 1 дня, наприклад: 15 днів, 1 місяць, 2 роки." - - "Establezca la duración durante la cual los trabajos se considerarán antiguos y vencidos. Una vez pasado ese tiempo, los trabajos se archivarán y ya no se podrá volver a reintentar su ejecución. Establezca este campo como nulo para que los trabajos no caduquen. Este valor, no debe ser inferior a 1 día, por ejemplo: 15 días, 1 mes, 2 años." "Share the %{sso_label} with members so they can sign in to your group through your identity provider": plural_id: translations: @@ -919,9 +870,6 @@ - "您还可以通过在变量键前面加上K8S_SECRET_来添加可用于正在运行的应用程序的变量。" - "Ви також можете додати змінні, що будуть доступними для запущеного застосунку шляхом додавання префіксу K8S_SECRET_ до їх імен." - "También puede añadir variables que están disponibles para la aplicación en ejecución, anteponiendo la clave de variable con K8S_SECRET_." -"Your license will be included in your GitLab backup and will survive upgrades, so in normal usage you should never need to re-upload your .gitlab-license file.": - plural_id: - translations: "confidentiality|You are going to turn off the confidentiality. This means everyone will be able to see and leave a comment on this issue.": plural_id: translations: @@ -1053,3 +1001,55 @@ - "Elasticsearch, PlantUML, застосунок Slack, пропозиції від третіх осіб, Snowplow, Amazon EKS були переміщені до Налаштувань > Загальне." "cannot contain HTML/XML tags, including any word between angle brackets (<,>).": translations: +"Environment variables are applied to all project environments in this instance via the Runner. You can use environment variables for passwords, secret keys, etc. Make variables available to the running application by prepending the variable key with K8S_SECRET_. You can set variables to be:": + plural_id: + translations: +"Protected to expose them to protected branches or tags only.": + plural_id: + translations: +"Masked to prevent the values from being displayed in job logs (must match certain regexp requirements).": + plural_id: + translations: +"Set the default expiration time for each job's artifacts. 0 for unlimited. The default unit is in seconds, but you can define an alternative. For example: 4 mins 2 sec, 2h42min.": + plural_id: + translations: + - "各ジョブのアーティファクトのデフォルトの有効期限を設定します。 無制限の場合は0。 デフォルトの単位は秒ですが、代わりのものを定義できます。 例：4分2秒、2時間42分" + - "设置每个作业的产物的默认到期时间。 0 表示无限制。默认以秒为单位，但您可以定义替代方案。例如：4 mins 2 sec, 2h42min.。" + - "Задайте стандартний час зберігання для артефактів кожного із завдань. 0 означає необмежений. Стандартною одиницею вимірювання є секунда (sec), але ви можете вибрати й іншу. Наприклад: 4 mins 2 sec, 2h42min." + - "Establezca el tiempo de caducidad predeterminado para los artefactos generados en cada trabajo. 0 para una caducidad ilimitada. La unidad predeterminada son segundos, pero puede definir una alternativa. Por ejemplo: 4 minutos 2 segundos, 2h42min." +"Set the duration for which the jobs will be considered as old and expired. Once that time passes, the jobs will be archived and no longer able to be retried. Make it empty to never expire jobs. It has to be no less than 1 day, for example: 15 days, 1 month, 2 years.": + plural_id: + translations: + - "ジョブが期限切れとなる期間を設定します。設定された時間を経過するとジョブはアーカイブされ、再試行できなくなります。ジョブの期限を無期限にする場合、空のままにしてください。これらは1日以上で指定しなければなりません。例えば、15 days、 1 month、 2 years など。" + - "设置作业的过期时间。一旦逾期，作业将被归档并且不能重试。留空则永不过期。必须设置为 1 天以上，例如： 15 days, 1 month, 2 years。" + - "Встановіть тривалість, протягом якої завдання будуть вважатися застарілими. Як тільки пройде цей час, вони будуть заархівовані і більше не зможуть бути повтореними. Залиште порожнім, щоб завдання ніколи не застарівали. Має бути не менше 1 дня, наприклад: 15 днів, 1 місяць, 2 роки." + - "Establezca la duración durante la cual los trabajos se considerarán antiguos y vencidos. Una vez pasado ese tiempo, los trabajos se archivarán y ya no se podrá volver a reintentar su ejecución. Establezca este campo como nulo para que los trabajos no caduquen. Este valor, no debe ser inferior a 1 día, por ejemplo: 15 días, 1 mes, 2 años." +"%{group_name} group members": + plural_id: + translations: + - "%{group_name} 群組成員" + - "Membros do grupo %{group_name}" + - "%{group_name} グループのメンバー" + - "%{group_name} 群組的成員" + - "Membros do grupo %{group_name}" + - "%{group_name} участников группы" + - "%{group_name} 群组成员" + - "%{group_name} користувачі групи" + - "%{group_name} Gruppenmitglieder" + - "%{group_name} 그룹 멤버" + - "Membres du groupe %{group_name}" + - "miembros del grupo %{group_name}" + - "%{group_name} grup üyeleri" +"Read more about project permissions %{link_to_help}": + plural_id: + translations: + - "Saiba mais sobre as permissões do projeto %{link_to_help}" + - "プロジェクトの権限については %{link_to_help} を参照" + - "了解有关项目权限的更多信息 %{link_to_help}" + - "Дізнайтеся більше про права доступу в проекті %{link_to_help}" + - "Lies mehr über Projektberechtigungen %{link_to_help}" + - "Pour en savoir plus sur les autorisations de projet : %{link_to_help}" + - "Lea más sobre los permisos de este proyecto %{link_to_help}" +"Your license will be included in your GitLab backup and will survive upgrades, so in normal usage you should never need to re-upload your .gitlab-license file.": + plural_id: + translations: diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 87c9108d6a9..026a18c86a7 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -298,6 +298,12 @@ msgstr "" msgid "%{authorsName}'s thread" msgstr "" +msgid "%{code_open}Masked%{code_close} to prevent the values from being displayed in job logs (must match certain regexp requirements)." +msgstr "" + +msgid "%{code_open}Protected%{code_close} to expose them to protected branches or tags only." +msgstr "" + msgid "%{commit_author_link} authored %{commit_timeago}" msgstr "" @@ -399,6 +405,9 @@ 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 "%{group_name} group members" +msgstr "" + msgid "%{group_name} uses group managed accounts. You need to create a new GitLab account which will be managed by %{group_name}." msgstr "" @@ -1025,18 +1034,9 @@ msgstr "" msgid "\"johnsmith@example.com\": \"johnsmith@example.com\" will add \"By johnsmith@example.com\" to all issues and comments originally created by johnsmith@example.com. By default, the email address or username is masked to ensure the user's privacy. Use this option if you want to show the full email address." msgstr "" -msgid "Masked to prevent the values from being displayed in job logs (must match certain regexp requirements)." -msgstr "" - -msgid "Protected to expose them to protected branches or tags only." -msgstr "" - msgid "" msgstr "" -msgid "%{group_name} group members" -msgstr "" - msgid "%{label_name} will be permanently deleted from %{subject_name}. This cannot be undone." msgstr "" @@ -9085,7 +9085,7 @@ msgstr "" msgid "Environment scope" msgstr "" -msgid "Environment variables are applied to all project environments in this instance via the Runner. You can use environment variables for passwords, secret keys, etc. Make variables available to the running application by prepending the variable key with K8S_SECRET_. You can set variables to be:" +msgid "Environment variables are applied to all project environments in this instance via the Runner. You can use environment variables for passwords, secret keys, etc. Make variables available to the running application by prepending the variable key with %{code_open}K8S_SECRET_%{code_close}. You can set variables to be:" msgstr "" msgid "Environment variables are applied to environments via the runner. They can be protected by only exposing them to protected branches or tags. Additionally, they can be masked so they are hidden in job logs, though they must match certain regexp requirements to do so. You can use environment variables for passwords, secret keys, or whatever you want." @@ -19459,7 +19459,7 @@ msgstr "" msgid "Read more" msgstr "" -msgid "Read more about project permissions %{link_to_help}" +msgid "Read more about project permissions %{help_link_open}here%{help_link_close}" msgstr "" msgid "Read more about related issues" @@ -21615,7 +21615,7 @@ msgstr "" msgid "Set target branch to %{branch_name}." msgstr "" -msgid "Set the default expiration time for each job's artifacts. 0 for unlimited. The default unit is in seconds, but you can define an alternative. For example: 4 mins 2 sec, 2h42min." +msgid "Set the default expiration time for each job's artifacts. 0 for unlimited. The default unit is in seconds, but you can define an alternative. For example: %{code_open}4 mins 2 sec%{code_close}, %{code_open}2h42min%{code_close}." msgstr "" msgid "Set the default name of the initial branch when creating new repositories through the user interface." @@ -21624,7 +21624,7 @@ msgstr "" msgid "Set the due date to %{due_date}." msgstr "" -msgid "Set the duration for which the jobs will be considered as old and expired. Once that time passes, the jobs will be archived and no longer able to be retried. Make it empty to never expire jobs. It has to be no less than 1 day, for example: 15 days, 1 month, 2 years." +msgid "Set the duration for which the jobs will be considered as old and expired. Once that time passes, the jobs will be archived and no longer able to be retried. Make it empty to never expire jobs. It has to be no less than 1 day, for example: %{code_open}15 days%{code_close}, %{code_open}1 month%{code_close}, %{code_open}2 years%{code_close}." msgstr "" msgid "Set the iteration to %{iteration_reference}." @@ -27723,7 +27723,7 @@ msgstr "" msgid "Your license is valid from" msgstr "" -msgid "Your license will be included in your GitLab backup and will survive upgrades, so in normal usage you should never need to re-upload your .gitlab-license file." +msgid "Your license will be included in your GitLab backup and will survive upgrades, so in normal usage you should never need to re-upload your %{code_open}.gitlab-license%{code_close} file." msgstr "" msgid "Your message here" @@ -28312,9 +28312,6 @@ msgstr "" msgid "help" msgstr "" -msgid "here" -msgstr "" - msgid "http:" msgstr ""