Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 141 deletions

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index fd14af60b9a..d966678cb52 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -370,18 +370,6 @@ msgstr ""
 msgid "%{authorsName}'s thread"
 msgstr ""
 
-msgid "%{code_open}\"johnsmith@example.com\": \"@johnsmith\"%{code_close} will add \"By %{link_open}@johnsmith%{link_close}\" to all issues and comments originally created by johnsmith@example.com, and will set %{link_open}@johnsmith%{link_close} as the assignee on all issues originally assigned to johnsmith@example.com."
-msgstr ""
-
-msgid "%{code_open}\"johnsmith@example.com\": \"John Smith\"%{code_close} will add \"By John Smith\" to all issues and comments originally created by johnsmith@example.com."
-msgstr ""
-
-msgid "%{code_open}\"johnsmith@example.com\": \"johnsm...@example.com\"%{code_close} will add \"By johnsm...@example.com\" to all issues and comments originally created by johnsmith@example.com. The email address or username is masked to ensure the user's privacy."
-msgstr ""
-
-msgid "%{code_open}\"johnsmith@example.com\": \"johnsmith@example.com\"%{code_close} will add \"By %{link_open}johnsmith@example.com%{link_close}\" 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 "%{code_open}Masked%{code_close} variables are hidden in job logs (though they must match certain regexp requirements to do so)."
 msgstr ""
 
@@ -623,9 +611,6 @@ msgstr ""
 msgid "%{listToShow}, and %{awardsListLength} more."
 msgstr ""
 
-msgid "%{loadingIcon} Started"
-msgstr ""
-
 msgid "%{location} is missing required keys: %{keys}"
 msgstr ""
 
@@ -3128,9 +3113,6 @@ msgstr ""
 msgid "An error occurred while getting projects"
 msgstr ""
 
-msgid "An error occurred while importing project: %{details}"
-msgstr ""
-
 msgid "An error occurred while initializing path locks"
 msgstr ""
 
@@ -5361,12 +5343,6 @@ msgstr ""
 msgid "Chinese language support using"
 msgstr ""
 
-msgid "Choose %{strong_open}Create archive%{strong_close} and wait for archiving to complete."
-msgstr ""
-
-msgid "Choose %{strong_open}Next%{strong_close} at the bottom of the page."
-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 ""
 
@@ -5619,12 +5595,6 @@ msgstr ""
 msgid "Click %{link_to} to view the request."
 msgstr ""
 
-msgid "Click the %{strong_open}Download%{strong_close} button and wait for downloading to complete."
-msgstr ""
-
-msgid "Click the %{strong_open}Select none%{strong_close} button on the right, since we only need \"Google Code Project Hosting\"."
-msgstr ""
-
 msgid "Click the button below to begin the install process by navigating to the Kubernetes page"
 msgstr ""
 
@@ -8260,9 +8230,6 @@ msgstr ""
 msgid "Customize how FogBugz email addresses and usernames are imported into GitLab. In the next step, you'll be able to select the projects you want to import."
 msgstr ""
 
-msgid "Customize how Google Code email addresses and usernames are imported into GitLab. In the next step, you'll be able to select the projects you want to import."
-msgstr ""
-
 msgid "Customize icon"
 msgstr ""
 
@@ -8823,9 +8790,6 @@ msgstr ""
 msgid "Default stages"
 msgstr ""
 
-msgid "Default: Directly import the Google Code email address or username"
-msgstr ""
-
 msgid "Default: Map a FogBugz account ID to a full name"
 msgstr ""
 
@@ -9803,9 +9767,6 @@ msgstr ""
 msgid "Do not display offers from third parties within GitLab"
 msgstr ""
 
-msgid "Do you want to customize how Google Code email addresses and usernames are imported into GitLab?"
-msgstr ""
-
 msgid "Dockerfile"
 msgstr ""
 
@@ -12073,12 +12034,6 @@ msgstr ""
 msgid "Find file"
 msgstr ""
 
-msgid "Find the downloaded ZIP file and decompress it."
-msgstr ""
-
-msgid "Find the newly extracted %{code_open}Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json%{code_close} file."
-msgstr ""
-
 msgid "Fingerprint"
 msgstr ""
 
@@ -12148,9 +12103,6 @@ msgstr ""
 msgid "Folder/%{name}"
 msgstr ""
 
-msgid "Follow the steps below to export your Google Code project data."
-msgstr ""
-
 msgid "Font Color"
 msgstr ""
 
@@ -12262,9 +12214,6 @@ msgstr ""
 msgid "From %{providerTitle}"
 msgstr ""
 
-msgid "From Google Code"
-msgstr ""
-
 msgid "From issue creation until deploy to production"
 msgstr ""
 
@@ -13003,9 +12952,6 @@ msgstr ""
 msgid "Go full screen"
 msgstr ""
 
-msgid "Go to %{link_to_google_takeout}."
-msgstr ""
-
 msgid "Go to %{strongStart}Issues%{strongEnd} > %{strongStart}Boards%{strongEnd} to access your personalized learning issue board."
 msgstr ""
 
@@ -13120,12 +13066,6 @@ msgstr ""
 msgid "Google Cloud Platform"
 msgstr ""
 
-msgid "Google Code import"
-msgstr ""
-
-msgid "Google Takeout"
-msgstr ""
-
 msgid "Google authentication is not %{link_start}properly configured%{link_end}. Ask your GitLab administrator if you want to use this service."
 msgstr ""
 
@@ -14205,12 +14145,6 @@ msgstr ""
 msgid "Import Projects from Gitea"
 msgstr ""
 
-msgid "Import all compatible projects"
-msgstr ""
-
-msgid "Import all projects"
-msgstr ""
-
 msgid "Import an exported GitLab project"
 msgstr ""
 
@@ -14262,9 +14196,6 @@ msgstr ""
 msgid "Import projects from GitLab.com"
 msgstr ""
 
-msgid "Import projects from Google Code"
-msgstr ""
-
 msgid "Import repositories from Bitbucket Server"
 msgstr ""
 
@@ -14364,9 +14295,6 @@ msgstr ""
 msgid "In progress"
 msgstr ""
 
-msgid "In the next step, you'll be able to select the projects you want to import."
-msgstr ""
-
 msgid "Incident"
 msgstr ""
 
@@ -14544,9 +14472,6 @@ msgstr ""
 msgid "Incoming!"
 msgstr ""
 
-msgid "Incompatible Project"
-msgstr ""
-
 msgid "Incompatible options set!"
 msgstr ""
 
@@ -16030,9 +15955,6 @@ msgstr ""
 msgid "Leave project"
 msgstr ""
 
-msgid "Leave the \"File type\" and \"Delivery method\" options on their default values."
-msgstr ""
-
 msgid "Leave zen mode"
 msgstr ""
 
@@ -16488,9 +16410,6 @@ msgstr ""
 msgid "Make sure you save it - you won't be able to access it again."
 msgstr ""
 
-msgid "Make sure you're logged into the account that owns the projects you'd like to import."
-msgstr ""
-
 msgid "Make this epic confidential"
 msgstr ""
 
@@ -16554,15 +16473,6 @@ msgstr ""
 msgid "Map a FogBugz account ID to a GitLab user"
 msgstr ""
 
-msgid "Map a Google Code user to a GitLab user"
-msgstr ""
-
-msgid "Map a Google Code user to a full email address"
-msgstr ""
-
-msgid "Map a Google Code user to a full name"
-msgstr ""
-
 msgid "Mar"
 msgstr ""
 
@@ -18736,9 +18646,6 @@ msgstr ""
 msgid "No worries, you can still use all the %{strong}%{plan_name}%{strong_close} features for now. You have %{remaining_days} to renew your subscription."
 msgstr ""
 
-msgid "No, directly import the existing email addresses and usernames."
-msgstr ""
-
 msgid "No. of commits"
 msgstr ""
 
@@ -19125,9 +19032,6 @@ msgstr ""
 msgid "One or more of your %{provider} projects cannot be imported into GitLab directly because they use Subversion or Mercurial for version control, rather than Git."
 msgstr ""
 
-msgid "One or more of your Google Code projects cannot be imported into GitLab directly because they use Subversion or Mercurial for version control, rather than Git."
-msgstr ""
-
 msgid "One or more of your dependency files are not supported, and the dependency list may be incomplete. Below is a list of supported file types."
 msgstr ""
 
@@ -19278,9 +19182,6 @@ msgstr ""
 msgid "Optionally, you can %{link_to_customize} how FogBugz email addresses and usernames are imported into GitLab."
 msgstr ""
 
-msgid "Optionally, you can %{link_to_customize} how Google Code email addresses and usernames are imported into GitLab."
-msgstr ""
-
 msgid "Options"
 msgstr ""
 
@@ -20313,9 +20214,6 @@ msgstr ""
 msgid "Please convert %{linkStart}them to Git%{linkEnd}, and go through the %{linkToImportFlow} again."
 msgstr ""
 
-msgid "Please convert them to Git on Google Code, and go through the %{link_to_import_flow} again."
-msgstr ""
-
 msgid "Please create a password for your new account."
 msgstr ""
 
@@ -23799,9 +23697,6 @@ msgstr ""
 msgid "Scroll down"
 msgstr ""
 
-msgid "Scroll down to %{strong_open}Google Code Project Hosting%{strong_close} and enable the switch on the right."
-msgstr ""
-
 msgid "Scroll left"
 msgstr ""
 
@@ -24504,9 +24399,6 @@ msgstr ""
 msgid "Select projects"
 msgstr ""
 
-msgid "Select projects you want to import."
-msgstr ""
-
 msgid "Select required regulatory standard"
 msgstr ""
 
@@ -27057,9 +26949,6 @@ msgstr ""
 msgid "The download link will expire in 24 hours."
 msgstr ""
 
-msgid "The entered user map is not a valid JSON user map."
-msgstr ""
-
 msgid "The errors we encountered were:"
 msgstr ""
 
@@ -27329,9 +27218,6 @@ msgstr ""
 msgid "The update action will time out after %{number_of_minutes} minutes. For big repositories, use a clone/push combination."
 msgstr ""
 
-msgid "The uploaded file is not a valid Google Takeout archive."
-msgstr ""
-
 msgid "The usage ping is disabled, and cannot be configured through this form."
 msgstr ""
 
@@ -27341,9 +27227,6 @@ msgstr ""
 msgid "The user map has been saved. Continue by selecting the projects you want to import."
 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 %{code_open}:%{code_close}. Be sure to preserve the surrounding double quotes, other punctuation and the email address or username on the left hand side."
-msgstr ""
-
 msgid "The user map is a mapping of the FogBugz users that participated on your projects to the way their email address and usernames will be imported into GitLab. You can change this by populating the table below."
 msgstr ""
 
@@ -29388,9 +29271,6 @@ msgstr ""
 msgid "Upgrade your plan to improve Merge Requests."
 msgstr ""
 
-msgid "Upload %{code_open}GoogleCodeProjectHosting.json%{code_close} here:"
-msgstr ""
-
 msgid "Upload CSV file"
 msgstr ""
 
@@ -29835,6 +29715,9 @@ msgstr ""
 msgid "UserProfile|This user is blocked"
 msgstr ""
 
+msgid "UserProfile|Unconfirmed user"
+msgstr ""
+
 msgid "UserProfile|View all"
 msgstr ""
 
@@ -30972,9 +30855,6 @@ msgstr ""
 msgid "Yes, delete project"
 msgstr ""
 
-msgid "Yes, let me map Google Code users to full names or GitLab users."
-msgstr ""
-
 msgid "Yesterday"
 msgstr ""
 
@@ -31404,9 +31284,6 @@ msgstr ""
 msgid "You need to upload a GitLab project export archive (ending in .gz)."
 msgstr ""
 
-msgid "You need to upload a Google Takeout archive."
-msgstr ""
-
 msgid "You successfully declined the invitation"
 msgstr ""
 
@@ -32122,9 +31999,6 @@ msgstr ""
 msgid "committed"
 msgstr ""
 
-msgid "connecting"
-msgstr ""
-
 msgid "container_name can contain only lowercase letters, digits, '-', and '.' and must start and end with an alphanumeric character"
 msgstr ""
 
@@ -32140,9 +32014,6 @@ msgstr ""
 msgid "created %{timeAgo}"
 msgstr ""
 
-msgid "customize"
-msgstr ""
-
 msgid "data"
 msgstr ""
 
@@ -32181,9 +32052,6 @@ msgstr ""
 msgid "does not have a supported extension. Only %{extension_list} are supported"
 msgstr ""
 
-msgid "done"
-msgstr ""
-
 msgid "download it"
 msgstr ""
 
@@ -32322,9 +32190,6 @@ msgstr ""
 msgid "import flow"
 msgstr ""
 
-msgid "importing"
-msgstr ""
-
 msgid "in group %{link_to_group}"
 msgstr ""
 
@@ -33098,9 +32963,6 @@ msgstr ""
 msgid "ssh:"
 msgstr ""
 
-msgid "started"
-msgstr ""
-
 msgid "started a discussion on %{design_link}"
 msgstr ""