diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-29 17:39:42 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-29 17:39:42 +0300 |
commit | 70cf3bff18e358beaff9efc52906748636718d99 (patch) | |
tree | 72a6ccf4150ccce844e812bff8be3081c3c597bf | |
parent | af848e4c421ed317782069b85a204e87d8494a60 (diff) | |
parent | ff10f02db99d4c468188d924a1ff057c44ba00d1 (diff) |
Merge branch 'i18n-extract-app/views/admin-identities' into 'master'
i18n: externalize strings from 'app/views/admin/identities'
See merge request gitlab-org/gitlab-ce!19927
-rw-r--r-- | app/views/admin/identities/_form.html.haml | 4 | ||||
-rw-r--r-- | app/views/admin/identities/_identity.html.haml | 6 | ||||
-rw-r--r-- | app/views/admin/identities/edit.html.haml | 4 | ||||
-rw-r--r-- | app/views/admin/identities/index.html.haml | 10 | ||||
-rw-r--r-- | app/views/admin/identities/new.html.haml | 4 | ||||
-rw-r--r-- | locale/gitlab.pot | 125 |
6 files changed, 133 insertions, 20 deletions
diff --git a/app/views/admin/identities/_form.html.haml b/app/views/admin/identities/_form.html.haml index 231c0f70882..946d868da01 100644 --- a/app/views/admin/identities/_form.html.haml +++ b/app/views/admin/identities/_form.html.haml @@ -7,10 +7,10 @@ - values = Gitlab::Auth::OAuth::Provider.providers.map { |name| ["#{Gitlab::Auth::OAuth::Provider.label_for(name)} (#{name})", name] } = f.select :provider, values, { allow_blank: false }, class: 'form-control' .form-group.row - = f.label :extern_uid, "Identifier", class: 'col-form-label col-sm-2' + = f.label :extern_uid, _("Identifier"), class: 'col-form-label col-sm-2' .col-sm-10 = f.text_field :extern_uid, class: 'form-control', required: true .form-actions - = f.submit 'Save changes', class: "btn btn-save" + = f.submit _('Save changes'), class: "btn btn-save" diff --git a/app/views/admin/identities/_identity.html.haml b/app/views/admin/identities/_identity.html.haml index 50fe9478a78..5ed59809db5 100644 --- a/app/views/admin/identities/_identity.html.haml +++ b/app/views/admin/identities/_identity.html.haml @@ -5,8 +5,8 @@ = identity.extern_uid %td = link_to edit_admin_user_identity_path(@user, identity), class: 'btn btn-sm btn-grouped' do - Edit + = _("Edit") = link_to [:admin, @user, identity], method: :delete, class: 'btn btn-sm btn-danger', - data: { confirm: "Are you sure you want to remove this identity?" } do - Delete + data: { confirm: _("Are you sure you want to remove this identity?") } do + = _('Delete') diff --git a/app/views/admin/identities/edit.html.haml b/app/views/admin/identities/edit.html.haml index 515d46b0f29..1ad6ce969cb 100644 --- a/app/views/admin/identities/edit.html.haml +++ b/app/views/admin/identities/edit.html.haml @@ -1,6 +1,6 @@ -- page_title "Edit", @identity.provider, "Identities", @user.name, "Users" +- page_title _("Edit"), @identity.provider, _("Identities"), @user.name, _("Users") %h3.page-title - Edit identity for #{@user.name} + = _('Edit identity for %{user_name}') % { user_name: @user.name } %hr = render 'form' diff --git a/app/views/admin/identities/index.html.haml b/app/views/admin/identities/index.html.haml index ee51fb3fda1..59373ee6752 100644 --- a/app/views/admin/identities/index.html.haml +++ b/app/views/admin/identities/index.html.haml @@ -1,15 +1,15 @@ -- page_title "Identities", @user.name, "Users" +- page_title _("Identities"), @user.name, _("Users") = render 'admin/users/head' -= link_to 'New identity', new_admin_user_identity_path, class: 'float-right btn btn-new' += link_to _('New identity'), new_admin_user_identity_path, class: 'float-right btn btn-new' - if @identities.present? .table-holder %table.table %thead %tr - %th Provider - %th Identifier + %th= _('Provider') + %th= _('Identifier') %th = render @identities - else - %h4 This user has no identities + %h4= _('This user has no identities') diff --git a/app/views/admin/identities/new.html.haml b/app/views/admin/identities/new.html.haml index e30bf0ef0ee..ee743b0fd3c 100644 --- a/app/views/admin/identities/new.html.haml +++ b/app/views/admin/identities/new.html.haml @@ -1,4 +1,4 @@ -- page_title "New Identity" -%h3.page-title New identity +- page_title _("New Identity") +%h3.page-title= _('New identity') %hr = render 'form' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 926bd708532..80c1cb09964 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-20 16:52+0300\n" -"PO-Revision-Date: 2018-06-20 16:52+0300\n" +"POT-Creation-Date: 2018-06-29 16:17+1000\n" +"PO-Revision-Date: 2018-06-29 16:17+1000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" @@ -87,6 +87,9 @@ msgstr[1] "" msgid "%{filePath} deleted" 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 "%{loadingIcon} Started" msgstr "" @@ -357,6 +360,9 @@ msgstr "" msgid "Alternatively, you can use a %{personal_access_token_link}. When you create your Personal Access Token, you will need to select the <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import." msgstr "" +msgid "An error occured creating the new branch." +msgstr "" + msgid "An error occurred previewing the blob" msgstr "" @@ -438,6 +444,9 @@ msgstr "" msgid "Are you sure you want to delete this pipeline schedule?" msgstr "" +msgid "Are you sure you want to remove this identity?" +msgstr "" + msgid "Are you sure you want to reset registration token?" msgstr "" @@ -555,6 +564,9 @@ msgstr "" msgid "Average per day: %{average}" msgstr "" +msgid "Background color" +msgstr "" + msgid "Background jobs" msgstr "" @@ -630,6 +642,12 @@ msgstr "" msgid "Begin with the selected commit" msgstr "" +msgid "Boards" +msgstr "" + +msgid "Branch %{branchName} was not found in this project's repository." +msgstr "" + msgid "Branch (%{branch_count})" msgid_plural "Branches (%{branch_count})" msgstr[0] "" @@ -836,6 +854,9 @@ msgstr "" msgid "CICD|You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages." msgstr "" +msgid "Can't find HEAD commit for this branch" +msgstr "" + msgid "Cancel" msgstr "" @@ -899,6 +920,9 @@ msgstr "" msgid "Choose a branch/tag (e.g. %{master}) or enter a commit (e.g. %{sha}) to see what's changed or to create a merge request." msgstr "" +msgid "Choose any color." +msgstr "" + msgid "Choose file..." msgstr "" @@ -1094,7 +1118,7 @@ msgstr "" msgid "ClusterIntegration|Environment scope" msgstr "" -msgid "ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for new GCP accounts to get started with GitLab's Google Kubernetes Engine Integration." +msgid "ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for both new and existing GCP accounts to get started with GitLab's Google Kubernetes Engine Integration." msgstr "" msgid "ClusterIntegration|Fetching machine types" @@ -1443,6 +1467,9 @@ msgstr "" msgid "Committed by" msgstr "" +msgid "Commit…" +msgstr "" + msgid "Compare" msgstr "" @@ -1560,6 +1587,9 @@ msgstr "" msgid "Continuous Integration and Deployment" msgstr "" +msgid "Contribute to GitLab" +msgstr "" + msgid "Contribution" msgstr "" @@ -1743,6 +1773,9 @@ msgstr "" msgid "Delete" msgstr "" +msgid "Delete list" +msgstr "" + msgid "Deploy" msgid_plural "Deploys" msgstr[0] "" @@ -1955,12 +1988,18 @@ msgstr "" msgid "Edit" msgstr "" +msgid "Edit Label" +msgstr "" + msgid "Edit Pipeline Schedule %{id}" msgstr "" msgid "Edit files in the editor and commit changes here" msgstr "" +msgid "Edit identity for %{user_name}" +msgstr "" + msgid "Email" msgstr "" @@ -2096,6 +2135,9 @@ msgstr "" msgid "Error loading project data. Please try again." msgstr "" +msgid "Error loading tree data. Please try again." +msgstr "" + msgid "Error occurred when toggling the notification subscription" msgstr "" @@ -2183,6 +2225,9 @@ msgstr "" msgid "February" msgstr "" +msgid "Fetching diff files failed. Please reload the page to try again!" +msgstr "" + msgid "Fields on this page are now uneditable, you can configure" msgstr "" @@ -2341,6 +2386,9 @@ msgstr "" msgid "GroupSettings|remove the share with group lock from %{ancestor_group_name}" msgstr "" +msgid "Groups can also be nested by creating %{subgroup_docs_link_start}subgroups%{subgroup_docs_link_end}." +msgstr "" + msgid "GroupsEmptyState|A group is a collection of several projects." msgstr "" @@ -2427,6 +2475,9 @@ msgstr "" msgid "I accept the|Terms of Service and Privacy Policy" msgstr "" +msgid "ID" +msgstr "" + msgid "IDE|Commit" msgstr "" @@ -2442,6 +2493,12 @@ msgstr "" msgid "IDE|Review" msgstr "" +msgid "Identifier" +msgstr "" + +msgid "Identities" +msgstr "" + msgid "If you already have files you can push them using the %{link_to_cli} below." msgstr "" @@ -2505,6 +2562,9 @@ msgstr "" msgid "Introducing Cycle Analytics" msgstr "" +msgid "Issue Board" +msgstr "" + msgid "Issue events" msgstr "" @@ -2523,6 +2583,9 @@ msgstr "" msgid "January" msgstr "" +msgid "Job" +msgstr "" + msgid "Job has been erased" msgstr "" @@ -2837,6 +2900,9 @@ msgstr "" msgid "Name new label" msgstr "" +msgid "Name your individual key via a title" +msgstr "" + msgid "Nav|Help" msgstr "" @@ -2849,6 +2915,9 @@ msgstr "" msgid "Nav|Sign out and sign in with a different account" msgstr "" +msgid "New Identity" +msgstr "" + msgid "New Issue" msgid_plural "New Issues" msgstr[0] "" @@ -2860,6 +2929,9 @@ msgstr "" msgid "New Kubernetes cluster" msgstr "" +msgid "New Label" +msgstr "" + msgid "New Pipeline Schedule" msgstr "" @@ -2878,6 +2950,9 @@ msgstr "" msgid "New group" msgstr "" +msgid "New identity" +msgstr "" + msgid "New issue" msgstr "" @@ -3076,6 +3151,9 @@ msgstr "" msgid "Options" msgstr "" +msgid "Or you can choose one of the suggested colors below" +msgstr "" + msgid "Other Labels" msgstr "" @@ -3112,6 +3190,9 @@ msgstr "" msgid "Password" 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 "" + msgid "Pause" msgstr "" @@ -3298,6 +3379,9 @@ msgstr "" msgid "Please solve the reCAPTCHA" msgstr "" +msgid "Please try again" +msgstr "" + msgid "Please wait while we import the repository for you. Refresh at will." msgstr "" @@ -3553,6 +3637,9 @@ msgstr "" msgid "Protip:" msgstr "" +msgid "Provider" +msgstr "" + msgid "Public - The group and any public projects can be viewed without any authentication." msgstr "" @@ -3571,6 +3658,9 @@ msgstr "" msgid "Quick actions can be used in the issues description and comment boxes." msgstr "" +msgid "Re-deploy" +msgstr "" + msgid "Read more" msgstr "" @@ -3699,6 +3789,9 @@ msgstr "" msgid "Reviewing (merge request !%{mergeRequestId})" msgstr "" +msgid "Rollback" +msgstr "" + msgid "Runners" msgstr "" @@ -3714,6 +3807,9 @@ msgstr "" msgid "SSH Keys" msgstr "" +msgid "Save" +msgstr "" + msgid "Save changes" msgstr "" @@ -4058,6 +4154,9 @@ msgstr "" msgid "Stage" msgstr "" +msgid "Stage & Commit" +msgstr "" + msgid "Stage all changes" msgstr "" @@ -4303,6 +4402,9 @@ msgstr "" msgid "There are no issues to show" msgstr "" +msgid "There are no labels yet" +msgstr "" + msgid "There are no merge requests to show" msgstr "" @@ -4417,6 +4519,9 @@ msgstr "" msgid "This source diff could not be displayed because it is too large." msgstr "" +msgid "This user has no identities" +msgstr "" + msgid "Time before an issue gets scheduled" msgstr "" @@ -4592,6 +4697,9 @@ msgstr "" msgid "To GitLab" msgstr "" +msgid "To add an SSH key you need to %{generate_link_start}generate one%{link_end} or use an %{existing_link_start}existing key%{link_end}." +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 <code>repo</code> scope, so we can display a list of your public and private repositories which are available to import." msgstr "" @@ -4691,6 +4799,11 @@ msgstr "" msgid "Up to date" msgstr "" +msgid "Update %{files}" +msgid_plural "Update %{files} files" +msgstr[0] "" +msgstr[1] "" + msgid "Update your group name, description, avatar, and other general settings." msgstr "" @@ -4724,6 +4837,9 @@ msgstr "" msgid "User and IP Rate Limits" msgstr "" +msgid "Users" +msgstr "" + msgid "Variables" msgstr "" @@ -4940,9 +5056,6 @@ msgstr "" msgid "Withdraw Access Request" msgstr "" -msgid "Write a commit message..." -msgstr "" - msgid "Yes" msgstr "" |