Skip to content

G
gitlab-ce
Commit c6430785 authored by Bob Van Landuyt's avatar Bob Van Landuyt
Browse files
Options

Avoid newlines in externalized strings

parent f241de2d
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 21 deletions
ee/app/controllers/ee/projects/git_http_client_controller.rb
View file @ c6430785
...@@ -74,9 +74,8 @@ module EE ...@@ -74,9 +74,8 @@ module EE
end end
def incorrect_version_message def incorrect_version_message
_("You need git-lfs version %{min_git_lfs_version} (or greater) to translation = _("You need git-lfs version %{min_git_lfs_version} (or greater) to continue. Please visit https://git-lfs.github.com")
continue. Please visit https://git-lfs.github.com") % translation % { min_git_lfs_version: MINIMUM_GIT_LFS_VERSION }
{ min_git_lfs_version: MINIMUM_GIT_LFS_VERSION }
end end
end end
......
ee/app/controllers/ee/projects/lfs_api_controller.rb
View file @ c6430785
...@@ -20,10 +20,9 @@ module EE ...@@ -20,10 +20,9 @@ module EE
def lfs_read_only_message def lfs_read_only_message
return super unless ::Gitlab::Geo.secondary_with_primary? return super unless ::Gitlab::Geo.secondary_with_primary?
(_('You cannot write to a read-only secondary GitLab Geo instance. translation = _('You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead.')
Please use %{link_to_primary_node} instead.') % message = translation % { link_to_primary_node: geo_primary_default_url_to_repo(project) }
{ link_to_primary_node: geo_primary_default_url_to_repo(project) } message.html_safe
).html_safe
end end
end end
end end
......
locale/gitlab.pot
View file @ c6430785
...@@ -8,8 +8,8 @@ msgid "" ...@@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gitlab 1.0.0\n" "Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-06 14:35+0200\n" "POT-Creation-Date: 2018-07-09 08:42+0200\n"
"PO-Revision-Date: 2018-07-06 14:35+0200\n" "PO-Revision-Date: 2018-07-09 08:42+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
...@@ -235,6 +235,15 @@ msgstr "" ...@@ -235,6 +235,15 @@ msgstr ""
msgid "404|Please contact your GitLab administrator if you think this is a mistake." msgid "404|Please contact your GitLab administrator if you think this is a mistake."
msgstr "" msgstr ""
msgid "<strong>%{created_count}</strong> created, <strong>%{accepted_count}</strong> accepted."
msgstr ""
msgid "<strong>%{created_count}</strong> created, <strong>%{closed_count}</strong> closed."
msgstr ""
msgid "<strong>%{pushes}</strong> pushes, more than <strong>%{commits}</strong> commits by <strong>%{people}</strong> contributors."
msgstr ""
msgid "<strong>Removes</strong> source branch" msgid "<strong>Removes</strong> source branch"
msgstr "" msgstr ""
...@@ -2568,6 +2577,9 @@ msgstr "" ...@@ -2568,6 +2577,9 @@ msgstr ""
msgid "Expand sidebar" msgid "Expand sidebar"
msgstr "" msgstr ""
msgid "Explore groups"
msgstr ""
msgid "Explore projects" msgid "Explore projects"
msgstr "" msgstr ""
...@@ -3050,6 +3062,27 @@ msgstr "" ...@@ -3050,6 +3062,27 @@ msgstr ""
msgid "Groups can also be nested by creating %{subgroup_docs_link_start}subgroups%{subgroup_docs_link_end}." msgid "Groups can also be nested by creating %{subgroup_docs_link_start}subgroups%{subgroup_docs_link_end}."
msgstr "" msgstr ""
msgid "GroupsDropdown|Frequently visited"
msgstr ""
msgid "GroupsDropdown|Groups you visit often will appear here"
msgstr ""
msgid "GroupsDropdown|Loading groups"
msgstr ""
msgid "GroupsDropdown|Search your groups"
msgstr ""
msgid "GroupsDropdown|Something went wrong on our end."
msgstr ""
msgid "GroupsDropdown|Sorry, no groups matched your search"
msgstr ""
msgid "GroupsDropdown|This feature requires browser localStorage support"
msgstr ""
msgid "GroupsEmptyState|A group is a collection of several projects." msgid "GroupsEmptyState|A group is a collection of several projects."
msgstr "" msgstr ""
...@@ -3285,6 +3318,9 @@ msgstr "" ...@@ -3285,6 +3318,9 @@ msgstr ""
msgid "Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable." msgid "Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable."
msgstr "" msgstr ""
msgid "Issues closed"
msgstr ""
msgid "Jan" msgid "Jan"
msgstr "" msgstr ""
...@@ -3527,12 +3563,18 @@ msgstr "" ...@@ -3527,12 +3563,18 @@ msgstr ""
msgid "Members will be forwarded here when signing in to your group. Get this from your identity provider, where it can also be called \"SSO Service Location\", \"SAML Token Issuance Endpoint\", or \"SAML 2.0/W-Federation URL\"." msgid "Members will be forwarded here when signing in to your group. Get this from your identity provider, where it can also be called \"SSO Service Location\", \"SAML Token Issuance Endpoint\", or \"SAML 2.0/W-Federation URL\"."
msgstr "" msgstr ""
msgid "Merge Request"
msgstr ""
msgid "Merge Request:" msgid "Merge Request:"
msgstr "" msgstr ""
msgid "Merge Requests" msgid "Merge Requests"
msgstr "" msgstr ""
msgid "Merge Requests created"
msgstr ""
msgid "Merge events" msgid "Merge events"
msgstr "" msgstr ""
...@@ -3862,12 +3904,21 @@ msgstr "" ...@@ -3862,12 +3904,21 @@ msgstr ""
msgid "No files found." msgid "No files found."
msgstr "" msgstr ""
msgid "No issues for the selected time period."
msgstr ""
msgid "No merge requests for the selected time period."
msgstr ""
msgid "No merge requests found" msgid "No merge requests found"
msgstr "" msgstr ""
msgid "No messages were logged" msgid "No messages were logged"
msgstr "" msgstr ""
msgid "No pushes for the selected time period."
msgstr ""
msgid "No repository" msgid "No repository"
msgstr "" msgstr ""
...@@ -4006,6 +4057,9 @@ msgstr "" ...@@ -4006,6 +4057,9 @@ msgstr ""
msgid "Only project members can comment." msgid "Only project members can comment."
msgstr "" msgstr ""
msgid "Oops, are you sure?"
msgstr ""
msgid "Open" msgid "Open"
msgstr "" msgstr ""
...@@ -4324,6 +4378,9 @@ msgstr "" ...@@ -4324,6 +4378,9 @@ msgstr ""
msgid "Profiles|Account scheduled for removal." msgid "Profiles|Account scheduled for removal."
msgstr "" msgstr ""
msgid "Profiles|Add key"
msgstr ""
msgid "Profiles|Change username" msgid "Profiles|Change username"
msgstr "" msgstr ""
...@@ -4351,9 +4408,15 @@ msgstr "" ...@@ -4351,9 +4408,15 @@ msgstr ""
msgid "Profiles|Path" msgid "Profiles|Path"
msgstr "" msgstr ""
msgid "Profiles|This doesn't look like a public SSH key, are you sure you want to add it?"
msgstr ""
msgid "Profiles|Type your %{confirmationValue} to confirm:" msgid "Profiles|Type your %{confirmationValue} to confirm:"
msgstr "" msgstr ""
msgid "Profiles|Typically starts with \"ssh-rsa …\""
msgstr ""
msgid "Profiles|Update username" msgid "Profiles|Update username"
msgstr "" msgstr ""
...@@ -4372,6 +4435,9 @@ msgstr "" ...@@ -4372,6 +4435,9 @@ msgstr ""
msgid "Profiles|Your account is currently an owner in these groups:" msgid "Profiles|Your account is currently an owner in these groups:"
msgstr "" msgstr ""
msgid "Profiles|e.g. My MacBook key"
msgstr ""
msgid "Profiles|your account" msgid "Profiles|your account"
msgstr "" msgstr ""
...@@ -4498,9 +4564,6 @@ msgstr "" ...@@ -4498,9 +4564,6 @@ msgstr ""
msgid "ProjectsDropdown|Sorry, no projects matched your search" msgid "ProjectsDropdown|Sorry, no projects matched your search"
msgstr "" msgstr ""
msgid "ProjectsDropdown|This feature requires browser localStorage support"
msgstr ""
msgid "PrometheusDashboard|Time" msgid "PrometheusDashboard|Time"
msgstr "" msgstr ""
...@@ -4639,6 +4702,9 @@ msgstr "" ...@@ -4639,6 +4702,9 @@ msgstr ""
msgid "Pushed" msgid "Pushed"
msgstr "" msgstr ""
msgid "Pushes"
msgstr ""
msgid "Quarters" msgid "Quarters"
msgstr "" msgstr ""
...@@ -4914,9 +4980,18 @@ msgstr "" ...@@ -4914,9 +4980,18 @@ msgstr ""
msgid "Seconds to wait for a storage access attempt" msgid "Seconds to wait for a storage access attempt"
msgstr "" msgstr ""
msgid "Security Dashboard"
msgstr ""
msgid "Security report" msgid "Security report"
msgstr "" msgstr ""
msgid "SecurityDashboard|Monitor vulnerabilities in your code"
msgstr ""
msgid "SecurityDashboard|Pipeline %{pipelineLink} triggered"
msgstr ""
msgid "Select" msgid "Select"
msgstr "" msgstr ""
...@@ -6331,6 +6406,9 @@ msgstr "" ...@@ -6331,6 +6406,9 @@ msgstr ""
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
msgid "Yes, add it"
msgstr ""
msgid "You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?" msgid "You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?"
msgstr "" msgstr ""
...@@ -6376,9 +6454,7 @@ msgstr "" ...@@ -6376,9 +6454,7 @@ msgstr ""
msgid "You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}" msgid "You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}"
msgstr "" msgstr ""
msgid "" msgid "You cannot write to a read-only secondary GitLab Geo instance. Please use %{link_to_primary_node} instead."
"You cannot write to a read-only secondary GitLab Geo instance.\n"
" Please use %{link_to_primary_node} instead."
msgstr "" msgstr ""
msgid "You cannot write to this read-only GitLab instance." msgid "You cannot write to this read-only GitLab instance."
...@@ -6411,9 +6487,7 @@ msgstr "" ...@@ -6411,9 +6487,7 @@ msgstr ""
msgid "You need a different license to enable FileLocks feature" msgid "You need a different license to enable FileLocks feature"
msgstr "" msgstr ""
msgid "" msgid "You need git-lfs version %{min_git_lfs_version} (or greater) to continue. Please visit https://git-lfs.github.com"
"You need git-lfs version %{min_git_lfs_version} (or greater) to\n"
" continue. Please visit https://git-lfs.github.com"
msgstr "" msgstr ""
msgid "You need permission." msgid "You need permission."
...@@ -6879,6 +6953,9 @@ msgstr "" ...@@ -6879,6 +6953,9 @@ msgstr ""
msgid "mrWidget|No Approval required; you can still approve" msgid "mrWidget|No Approval required; you can still approve"
msgstr "" msgstr ""
msgid "mrWidget|Open in Web IDE"
msgstr ""
msgid "mrWidget|Plain diff" msgid "mrWidget|Plain diff"
msgstr "" msgstr ""
...@@ -6951,9 +7028,6 @@ msgstr "" ...@@ -6951,9 +7028,6 @@ msgstr ""
msgid "mrWidget|This project is archived, write access has been disabled" msgid "mrWidget|This project is archived, write access has been disabled"
msgstr "" msgstr ""
msgid "mrWidget|Web IDE"
msgstr ""
msgid "mrWidget|You can merge this merge request manually using the" msgid "mrWidget|You can merge this merge request manually using the"
msgstr "" msgstr ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7