Merge branch 'mw-i18n-admin-controllers' into 'master'

Externalize strings in admin controllers

See merge request gitlab-org/gitlab-ce!26357

app/controllers/admin/appearances_controller.rb

@@ -14,7 +14,7 @@ class Admin::AppearancesController < Admin::ApplicationController
     @appearance = Appearance.new(appearance_params)
 
     if @appearance.save
-      redirect_to admin_appearances_path, notice: 'Appearance was successfully created.'
+      redirect_to admin_appearances_path, notice: _('Appearance was successfully created.')
     else
       render action: 'show'
     end
@@ -22,7 +22,7 @@ class Admin::AppearancesController < Admin::ApplicationController
 
   def update
     if @appearance.update(appearance_params)
-      redirect_to admin_appearances_path, notice: 'Appearance was successfully updated.'
+      redirect_to admin_appearances_path, notice: _('Appearance was successfully updated.')
     else
       render action: 'show'
     end
@@ -33,21 +33,21 @@ class Admin::AppearancesController < Admin::ApplicationController
 
     @appearance.save
 
-    redirect_to admin_appearances_path, notice: 'Logo was successfully removed.'
+    redirect_to admin_appearances_path, notice: _('Logo was successfully removed.')
   end
 
   def header_logos
     @appearance.remove_header_logo!
     @appearance.save
 
-    redirect_to admin_appearances_path, notice: 'Header logo was successfully removed.'
+    redirect_to admin_appearances_path, notice: _('Header logo was successfully removed.')
   end
 
   def favicon
     @appearance.remove_favicon!
     @appearance.save
 
-    redirect_to admin_appearances_path, notice: 'Favicon was successfully removed.'
+    redirect_to admin_appearances_path, notice: _('Favicon was successfully removed.')
   end
 
   private

app/controllers/admin/application_settings_controller.rb

@@ -48,7 +48,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
     respond_to do |format|
       if successful
         format.json { head :ok }
-        format.html { redirect_to redirect_path, notice: 'Application settings saved successfully' }
+        format.html { redirect_to redirect_path, notice: _('Application settings saved successfully') }
       else
         format.json { head :bad_request }
         format.html { render :show }
@@ -70,13 +70,13 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
   def reset_registration_token
     @application_setting.reset_runners_registration_token!
 
-    flash[:notice] = 'New runners registration token has been generated!'
+    flash[:notice] = _('New runners registration token has been generated!')
     redirect_to admin_runners_path
   end
 
   def reset_health_check_token
     @application_setting.reset_health_check_access_token!
-    flash[:notice] = 'New health check access token has been generated!'
+    flash[:notice] = _('New health check access token has been generated!')
     redirect_back_or_default
   end
 
@@ -85,7 +85,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
 
     redirect_to(
       admin_application_settings_path,
-      notice: 'Started asynchronous removal of all repository check states.'
+      notice: _('Started asynchronous removal of all repository check states.')
     )
   end
 

app/controllers/admin/applications_controller.rb

@@ -34,7 +34,7 @@ class Admin::ApplicationsController < Admin::ApplicationController
 
   def update
     if @application.update(application_params)
-      redirect_to admin_application_path(@application), notice: 'Application was successfully updated.'
+      redirect_to admin_application_path(@application), notice: _('Application was successfully updated.')
     else
       render :edit
     end
@@ -42,7 +42,7 @@ class Admin::ApplicationsController < Admin::ApplicationController
 
   def destroy
     @application.destroy
-    redirect_to admin_applications_url, status: 302, notice: 'Application was successfully destroyed.'
+    redirect_to admin_applications_url, status: 302, notice: _('Application was successfully destroyed.')
   end
 
   private

app/controllers/admin/broadcast_messages_controller.rb

@@ -19,7 +19,7 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController
     @broadcast_message = BroadcastMessage.new(broadcast_message_params)
 
     if @broadcast_message.save
-      redirect_to admin_broadcast_messages_path, notice: 'Broadcast Message was successfully created.'
+      redirect_to admin_broadcast_messages_path, notice: _('Broadcast Message was successfully created.')
     else
       render :index
     end
@@ -27,7 +27,7 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController
 
   def update
     if @broadcast_message.update(broadcast_message_params)
-      redirect_to admin_broadcast_messages_path, notice: 'Broadcast Message was successfully updated.'
+      redirect_to admin_broadcast_messages_path, notice: _('Broadcast Message was successfully updated.')
     else
       render :edit
     end

app/controllers/admin/deploy_keys_controller.rb

@@ -25,7 +25,7 @@ class Admin::DeployKeysController < Admin::ApplicationController
 
   def update
     if deploy_key.update(update_params)
-      flash[:notice] = 'Deploy key was successfully updated.'
+      flash[:notice] = _('Deploy key was successfully updated.')
       redirect_to admin_deploy_keys_path
     else
       render 'edit'

app/controllers/admin/groups_controller.rb

@@ -36,7 +36,7 @@ class Admin::GroupsController < Admin::ApplicationController
 
     if @group.save
       @group.add_owner(current_user)
-      redirect_to [:admin, @group], notice: "Group '#{@group.name}' was successfully created."
+      redirect_to [:admin, @group], notice: _('Group %{group_name} was successfully created.') % { group_name: @group.name }
     else
       render "new"
     end
@@ -44,7 +44,7 @@ class Admin::GroupsController < Admin::ApplicationController
 
   def update
     if @group.update(group_params)
-      redirect_to [:admin, @group], notice: 'Group was successfully updated.'
+      redirect_to [:admin, @group], notice: _('Group was successfully updated.')
     else
       render "edit"
     end
@@ -55,7 +55,7 @@ class Admin::GroupsController < Admin::ApplicationController
     result = Members::CreateService.new(current_user, member_params.merge(limit: -1)).execute(@group)
 
     if result[:status] == :success
-      redirect_to [:admin, @group], notice: 'Users were successfully added.'
+      redirect_to [:admin, @group], notice: _('Users were successfully added.')
     else
       redirect_to [:admin, @group], alert: result[:message]
     end
@@ -66,7 +66,7 @@ class Admin::GroupsController < Admin::ApplicationController
 
     redirect_to admin_groups_path,
                 status: 302,
-                alert: "Group '#{@group.name}' was scheduled for deletion."
+                alert: _('Group %{group_name} was scheduled for deletion.') % { group_name: @group.name }
   end
 
   private

app/controllers/admin/hooks_controller.rb

@@ -14,7 +14,7 @@ class Admin::HooksController < Admin::ApplicationController
     @hook = SystemHook.new(hook_params.to_h)
 
     if @hook.save
-      redirect_to admin_hooks_path, notice: 'Hook was successfully created.'
+      redirect_to admin_hooks_path, notice: _('Hook was successfully created.')
     else
       @hooks = SystemHook.all
       render :index
@@ -26,7 +26,7 @@ class Admin::HooksController < Admin::ApplicationController
 
   def update
     if hook.update(hook_params)
-      flash[:notice] = 'System hook was successfully updated.'
+      flash[:notice] = _('System hook was successfully updated.')
       redirect_to admin_hooks_path
     else
       render 'edit'

app/controllers/admin/identities_controller.rb

@@ -13,7 +13,7 @@ class Admin::IdentitiesController < Admin::ApplicationController
     @identity.user_id = user.id
 
     if @identity.save
-      redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully created.'
+      redirect_to admin_user_identities_path(@user), notice: _('User identity was successfully created.')
     else
       render :new
     end
@@ -29,7 +29,7 @@ class Admin::IdentitiesController < Admin::ApplicationController
   def update
     if @identity.update(identity_params)
       RepairLdapBlockedUserService.new(@user).execute
-      redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully updated.'
+      redirect_to admin_user_identities_path(@user), notice: _('User identity was successfully updated.')
     else
       render :edit
     end
@@ -38,9 +38,9 @@ class Admin::IdentitiesController < Admin::ApplicationController
   def destroy
     if @identity.destroy
       RepairLdapBlockedUserService.new(@user).execute
-      redirect_to admin_user_identities_path(@user), status: 302, notice: 'User identity was successfully removed.'
+      redirect_to admin_user_identities_path(@user), status: 302, notice: _('User identity was successfully removed.')
     else
-      redirect_to admin_user_identities_path(@user), status: 302, alert: 'Failed to remove user identity.'
+      redirect_to admin_user_identities_path(@user), status: 302, alert: _('Failed to remove user identity.')
     end
   end
 

app/controllers/admin/impersonation_tokens_controller.rb

@@ -12,7 +12,7 @@ class Admin::ImpersonationTokensController < Admin::ApplicationController
 
     if @impersonation_token.save
       PersonalAccessToken.redis_store!(current_user.id, @impersonation_token.token)
-      redirect_to admin_user_impersonation_tokens_path, notice: "A new impersonation token has been created."
+      redirect_to admin_user_impersonation_tokens_path, notice: _("A new impersonation token has been created.")
     else
       set_index_vars
       render :index
@@ -23,9 +23,9 @@ class Admin::ImpersonationTokensController < Admin::ApplicationController
     @impersonation_token = finder.find(params[:id])
 
     if @impersonation_token.revoke!
-      flash[:notice] = "Revoked impersonation token #{@impersonation_token.name}!"
+      flash[:notice] = _("Revoked impersonation token %{token_name}!") % { token_name: @impersonation_token.name }
     else
-      flash[:alert] = "Could not revoke impersonation token #{@impersonation_token.name}."
+      flash[:alert] = _("Could not revoke impersonation token %{token_name}.") % { token_name: @impersonation_token.name }
     end
 
     redirect_to admin_user_impersonation_tokens_path

app/controllers/admin/keys_controller.rb

@@ -17,9 +17,9 @@ class Admin::KeysController < Admin::ApplicationController
 
     respond_to do |format|
       if key.destroy
-        format.html { redirect_to keys_admin_user_path(user), status: 302, notice: 'User key was successfully removed.' }
+        format.html { redirect_to keys_admin_user_path(user), status: 302, notice: _('User key was successfully removed.') }
       else
-        format.html { redirect_to keys_admin_user_path(user), status: 302, alert: 'Failed to remove user key.' }
+        format.html { redirect_to keys_admin_user_path(user), status: 302, alert: _('Failed to remove user key.') }
       end
     end
   end

app/controllers/admin/labels_controller.rb

@@ -21,7 +21,7 @@ class Admin::LabelsController < Admin::ApplicationController
     @label = Labels::CreateService.new(label_params).execute(template: true)
 
     if @label.persisted?
-      redirect_to admin_labels_url, notice: "Label was created"
+      redirect_to admin_labels_url, notice: _("Label was created")
     else
       render :new
     end
@@ -31,7 +31,7 @@ class Admin::LabelsController < Admin::ApplicationController
     @label = Labels::UpdateService.new(label_params).execute(@label)
 
     if @label.valid?
-      redirect_to admin_labels_path, notice: 'Label was successfully updated.'
+      redirect_to admin_labels_path, notice: _('Label was successfully updated.')
     else
       render :edit
     end
@@ -43,7 +43,7 @@ class Admin::LabelsController < Admin::ApplicationController
 
     respond_to do |format|
       format.html do
-        redirect_to admin_labels_path, status: 302, notice: 'Label was removed'
+        redirect_to admin_labels_path, status: 302, notice: _('Label was removed')
       end
       format.js
     end

app/controllers/admin/projects_controller.rb

@@ -50,7 +50,7 @@ class Admin::ProjectsController < Admin::ApplicationController
 
     redirect_to(
       admin_project_path(@project),
-      notice: 'Repository check was triggered.'
+      notice: _('Repository check was triggered.')
     )
   end
 

app/controllers/admin/runners_controller.rb

@@ -34,17 +34,17 @@ class Admin::RunnersController < Admin::ApplicationController
 
   def resume
     if Ci::UpdateRunnerService.new(@runner).update(active: true)
-      redirect_to admin_runners_path, notice: 'Runner was successfully updated.'
+      redirect_to admin_runners_path, notice: _('Runner was successfully updated.')
     else
-      redirect_to admin_runners_path, alert: 'Runner was not updated.'
+      redirect_to admin_runners_path, alert: _('Runner was not updated.')
     end
   end
 
   def pause
     if Ci::UpdateRunnerService.new(@runner).update(active: false)
-      redirect_to admin_runners_path, notice: 'Runner was successfully updated.'
+      redirect_to admin_runners_path, notice: _('Runner was successfully updated.')
     else
-      redirect_to admin_runners_path, alert: 'Runner was not updated.'
+      redirect_to admin_runners_path, alert: _('Runner was not updated.')
     end
   end
 

app/controllers/admin/spam_logs_controller.rb

@@ -14,7 +14,7 @@ class Admin::SpamLogsController < Admin::ApplicationController
       spam_log.remove_user(deleted_by: current_user)
       redirect_to admin_spam_logs_path,
                   status: 302,
-                  notice: "User #{spam_log.user.username} was successfully removed."
+                  notice: _('User %{username} was successfully removed.') % { username: spam_log.user.username }
     else
       spam_log.destroy
       head :ok
@@ -25,9 +25,9 @@ class Admin::SpamLogsController < Admin::ApplicationController
     spam_log = SpamLog.find(params[:id])
 
     if HamService.new(spam_log).mark_as_ham!
-      redirect_to admin_spam_logs_path, notice: 'Spam log successfully submitted as ham.'
+      redirect_to admin_spam_logs_path, notice: _('Spam log successfully submitted as ham.')
     else
-      redirect_to admin_spam_logs_path, alert: 'Error with Akismet. Please check the logs for more info.'
+      redirect_to admin_spam_logs_path, alert: _('Error with Akismet. Please check the logs for more info.')
     end
   end
 end

app/controllers/admin/users_controller.rb

@@ -39,19 +39,19 @@ class Admin::UsersController < Admin::ApplicationController
 
       warden.set_user(user, scope: :user)
 
-      Gitlab::AppLogger.info("User #{current_user.username} has started impersonating #{user.username}")
+      Gitlab::AppLogger.info(_("User %{current_user_username} has started impersonating %{username}") % { current_user_username: current_user.username, username: user.username })
 
-      flash[:alert] = "You are now impersonating #{user.username}"
+      flash[:alert] = _("You are now impersonating %{username}") % { username: user.username }
 
       redirect_to root_path
     else
       flash[:alert] =
         if user.blocked?
-          "You cannot impersonate a blocked user"
+          _("You cannot impersonate a blocked user")
         elsif user.internal?
-          "You cannot impersonate an internal user"
+          _("You cannot impersonate an internal user")
         else
-          "You cannot impersonate a user who cannot log in"
+          _("You cannot impersonate a user who cannot log in")
         end
 
       redirect_to admin_user_path(user)
@@ -60,35 +60,35 @@ class Admin::UsersController < Admin::ApplicationController
 
   def block
     if update_user { |user| user.block }
-      redirect_back_or_admin_user(notice: "Successfully blocked")
+      redirect_back_or_admin_user(notice: _("Successfully blocked"))
     else
-      redirect_back_or_admin_user(alert: "Error occurred. User was not blocked")
+      redirect_back_or_admin_user(alert: _("Error occurred. User was not blocked"))
     end
   end
 
   def unblock
     if user.ldap_blocked?
-      redirect_back_or_admin_user(alert: "This user cannot be unlocked manually from GitLab")
+      redirect_back_or_admin_user(alert: _("This user cannot be unlocked manually from GitLab"))
     elsif update_user { |user| user.activate }
-      redirect_back_or_admin_user(notice: "Successfully unblocked")
+      redirect_back_or_admin_user(notice: _("Successfully unblocked"))
     else
-      redirect_back_or_admin_user(alert: "Error occurred. User was not unblocked")
+      redirect_back_or_admin_user(alert: _("Error occurred. User was not unblocked"))
     end
   end
 
   def unlock
     if update_user { |user| user.unlock_access! }
-      redirect_back_or_admin_user(alert: "Successfully unlocked")
+      redirect_back_or_admin_user(alert: _("Successfully unlocked"))
     else
-      redirect_back_or_admin_user(alert: "Error occurred. User was not unlocked")
+      redirect_back_or_admin_user(alert: _("Error occurred. User was not unlocked"))
     end
   end
 
   def confirm
     if update_user { |user| user.confirm }
-      redirect_back_or_admin_user(notice: "Successfully confirmed")
+      redirect_back_or_admin_user(notice: _("Successfully confirmed"))
     else
-      redirect_back_or_admin_user(alert: "Error occurred. User was not confirmed")
+      redirect_back_or_admin_user(alert: _("Error occurred. User was not confirmed"))
     end
   end
 
@@ -96,7 +96,7 @@ class Admin::UsersController < Admin::ApplicationController
     update_user { |user| user.disable_two_factor! }
 
     redirect_to admin_user_path(user),
-      notice: 'Two-factor Authentication has been disabled for this user'
+      notice: _('Two-factor Authentication has been disabled for this user')
   end
 
   def create
@@ -109,7 +109,7 @@ class Admin::UsersController < Admin::ApplicationController
 
     respond_to do |format|
       if @user.persisted?
-        format.html { redirect_to [:admin, @user], notice: 'User was successfully created.' }
+        format.html { redirect_to [:admin, @user], notice: _('User was successfully created.') }
         format.json { render json: @user, status: :created, location: @user }
       else
         format.html { render "new" }
@@ -138,7 +138,7 @@ class Admin::UsersController < Admin::ApplicationController
       end
 
       if result[:status] == :success
-        format.html { redirect_to [:admin, user], notice: 'User was successfully updated.' }
+        format.html { redirect_to [:admin, user], notice: _('User was successfully updated.') }
         format.json { head :ok }
       else
         # restore username to keep form action url.
@@ -153,7 +153,7 @@ class Admin::UsersController < Admin::ApplicationController
     user.delete_async(deleted_by: current_user, params: params.permit(:hard_delete))
 
     respond_to do |format|
-      format.html { redirect_to admin_users_path, status: 302, notice: "The user is being deleted." }
+      format.html { redirect_to admin_users_path, status: 302, notice: _("The user is being deleted.") }
       format.json { head :ok }
     end
   end
@@ -164,11 +164,11 @@ class Admin::UsersController < Admin::ApplicationController
 
     respond_to do |format|
       if success
-        format.html { redirect_back_or_admin_user(notice: 'Successfully removed email.') }
+        format.html { redirect_back_or_admin_user(notice: _('Successfully removed email.')) }
         format.json { head :ok }
       else
-        format.html { redirect_back_or_admin_user(alert: 'There was an error removing the e-mail.') }
-        format.json { render json: 'There was an error removing the e-mail.', status: :bad_request }
+        format.html { redirect_back_or_admin_user(alert: _('There was an error removing the e-mail.')) }
+        format.json { render json: _('There was an error removing the e-mail.'), status: :bad_request }
       end
     end
   end

locale/gitlab.pot

@@ -321,6 +321,9 @@ msgstr ""
 msgid "A new branch will be created in your fork and a new merge request will be started."
 msgstr ""
 
+msgid "A new impersonation token has been created."
+msgstr ""
+
 msgid "A plain HTML site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features."
 msgstr ""
 
@@ -798,12 +801,27 @@ msgstr ""
 msgid "Appearance"
 msgstr ""
 
+msgid "Appearance was successfully created."
+msgstr ""
+
+msgid "Appearance was successfully updated."
+msgstr ""
+
 msgid "Application"
 msgstr ""
 
 msgid "Application ID"
 msgstr ""
 
+msgid "Application settings saved successfully"
+msgstr ""
+
+msgid "Application was successfully destroyed."
+msgstr ""
+
+msgid "Application was successfully updated."
+msgstr ""
+
 msgid "Application: %{name}"
 msgstr ""
 
@@ -1269,6 +1287,12 @@ msgstr ""
 msgid "Branches|protected"
 msgstr ""
 
+msgid "Broadcast Message was successfully created."
+msgstr ""
+
+msgid "Broadcast Message was successfully updated."
+msgstr ""
+
 msgid "Browse Directory"
 msgstr ""
 
@@ -2426,6 +2450,9 @@ msgstr ""
 msgid "Could not retrieve the pipeline status. For troubleshooting steps, read the %{linkStart}documentation.%{linkEnd}"
 msgstr ""
 
+msgid "Could not revoke impersonation token %{token_name}."
+msgstr ""
+
 msgid "Coverage"
 msgstr ""
 
@@ -2704,6 +2731,9 @@ msgstr[1] ""
 msgid "Deploy Keys"
 msgstr ""
 
+msgid "Deploy key was successfully updated."
+msgstr ""
+
 msgid "DeployKeys|+%{count} others"
 msgstr ""
 
@@ -3313,6 +3343,18 @@ msgstr ""
 msgid "Error occurred when toggling the notification subscription"
 msgstr ""
 
+msgid "Error occurred. User was not blocked"
+msgstr ""
+
+msgid "Error occurred. User was not confirmed"
+msgstr ""
+
+msgid "Error occurred. User was not unblocked"
+msgstr ""
+
+msgid "Error occurred. User was not unlocked"
+msgstr ""
+
 msgid "Error rendering markdown preview"
 msgstr ""
 
@@ -3331,6 +3373,9 @@ msgstr ""
 msgid "Error while loading the merge request. Please try again."
 msgstr ""
 
+msgid "Error with Akismet. Please check the logs for more info."
+msgstr ""
+
 msgid "Error:"
 msgstr ""
 
@@ -3505,6 +3550,12 @@ msgstr ""
 msgid "Failed to remove the pipeline schedule"
 msgstr ""
 
+msgid "Failed to remove user identity."
+msgstr ""
+
+msgid "Failed to remove user key."
+msgstr ""
+
 msgid "Failed to update issues, please try again."
 msgstr ""
 
@@ -3520,6 +3571,9 @@ msgstr ""
 msgid "Faster as it re-uses the project workspace (falling back to clone if it doesn't exist)"
 msgstr ""
 
+msgid "Favicon was successfully removed."
+msgstr ""
+
 msgid "Feb"
 msgstr ""
 
@@ -3840,6 +3894,12 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+msgid "Group %{group_name} was scheduled for deletion."
+msgstr ""
+
+msgid "Group %{group_name} was successfully created."
+msgstr ""
+
 msgid "Group CI/CD settings"
 msgstr ""
 
@@ -3879,6 +3939,9 @@ msgstr ""
 msgid "Group name"
 msgstr ""
 
+msgid "Group was successfully updated."
+msgstr ""
+
 msgid "Group:"
 msgstr ""
 
@@ -4002,6 +4065,9 @@ msgstr ""
 msgid "GroupsTree|Search by name"
 msgstr ""
 
+msgid "Header logo was successfully removed."
+msgstr ""
+
 msgid "Header message"
 msgstr ""
 
@@ -4058,6 +4124,9 @@ msgstr ""
 msgid "History"
 msgstr ""
 
+msgid "Hook was successfully created."
+msgstr ""
+
 msgid "Housekeeping successfully started"
 msgstr ""
 
@@ -4526,6 +4595,15 @@ msgstr ""
 msgid "Label actions dropdown"
 msgstr ""
 
+msgid "Label was created"
+msgstr ""
+
+msgid "Label was removed"
+msgstr ""
+
+msgid "Label was successfully updated."
+msgstr ""
+
 msgid "LabelSelect|%{firstLabelName} +%{remainingLabelCount} more"
 msgstr ""
 
@@ -4704,6 +4782,9 @@ msgstr ""
 msgid "Locked to current projects"
 msgstr ""
 
+msgid "Logo was successfully removed."
+msgstr ""
+
 msgid "Logs"
 msgstr ""
 
@@ -5138,6 +5219,9 @@ msgstr ""
 msgid "New group"
 msgstr ""
 
+msgid "New health check access token has been generated!"
+msgstr ""
+
 msgid "New identity"
 msgstr ""
 
@@ -5159,6 +5243,9 @@ msgstr ""
 msgid "New project"
 msgstr ""
 
+msgid "New runners registration token has been generated!"
+msgstr ""
+
 msgid "New schedule"
 msgstr ""
 
@@ -6537,6 +6624,9 @@ msgstr ""
 msgid "Repository URL"
 msgstr ""
 
+msgid "Repository check was triggered."
+msgstr ""
+
 msgid "Repository cleanup"
 msgstr ""
 
@@ -6644,6 +6734,9 @@ msgstr ""
 msgid "Revoke"
 msgstr ""
 
+msgid "Revoked impersonation token %{token_name}!"
+msgstr ""
+
 msgid "Run untagged jobs"
 msgstr ""
 
@@ -6662,6 +6755,12 @@ msgstr ""
 msgid "Runner token"
 msgstr ""
 
+msgid "Runner was not updated."
+msgstr ""
+
+msgid "Runner was successfully updated."
+msgstr ""
+
 msgid "Runner will not receive any new jobs"
 msgstr ""
 
@@ -7315,6 +7414,9 @@ msgstr ""
 msgid "Spam and Anti-bot Protection"
 msgstr ""
 
+msgid "Spam log successfully submitted as ham."
+msgstr ""
+
 msgid "Specific Runners"
 msgstr ""
 
@@ -7402,6 +7504,9 @@ msgstr ""
 msgid "Started %{startsIn}"
 msgstr ""
 
+msgid "Started asynchronous removal of all repository check states."
+msgstr ""
+
 msgid "Starts %{startsIn}"
 msgstr ""
 
@@ -7471,6 +7576,21 @@ msgstr ""
 msgid "Subscribed"
 msgstr ""
 
+msgid "Successfully blocked"
+msgstr ""
+
+msgid "Successfully confirmed"
+msgstr ""
+
+msgid "Successfully removed email."
+msgstr ""
+
+msgid "Successfully unblocked"
+msgstr ""
+
+msgid "Successfully unlocked"
+msgstr ""
+
 msgid "Suggested change"
 msgstr ""
 
@@ -7498,6 +7618,9 @@ msgstr ""
 msgid "System header and footer"
 msgstr ""
 
+msgid "System hook was successfully updated."
+msgstr ""
+
 msgid "System metrics (Custom)"
 msgstr ""
 
@@ -7714,6 +7837,9 @@ msgstr ""
 msgid "The usage ping is disabled, and cannot be configured through this form."
 msgstr ""
 
+msgid "The user is being deleted."
+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>:</code>. Be sure to preserve the surrounding double quotes, other punctuation and the email address or username on the left hand side."
 msgstr ""
 
@@ -7756,6 +7882,9 @@ msgstr ""
 msgid "There was an error loading users activity calendar."
 msgstr ""
 
+msgid "There was an error removing the e-mail."
+msgstr ""
+
 msgid "There was an error saving your changes."
 msgstr ""
 
@@ -7975,6 +8104,9 @@ msgstr ""
 msgid "This timeout will take precedence when lower than project-defined timeout and accepts a human readable time input language like \"1 hour\". Values without specification represent seconds."
 msgstr ""
 
+msgid "This user cannot be unlocked manually from GitLab"
+msgstr ""
+
 msgid "This user has no identities"
 msgstr ""
 
@@ -8324,6 +8456,9 @@ msgstr ""
 msgid "Twitter"
 msgstr ""
 
+msgid "Two-factor Authentication has been disabled for this user"
+msgstr ""
+
 msgid "Two-factor authentication"
 msgstr ""
 
@@ -8468,6 +8603,12 @@ msgstr ""
 msgid "Use your global notification setting"
 msgstr ""
 
+msgid "User %{current_user_username} has started impersonating %{username}"
+msgstr ""
+
+msgid "User %{username} was successfully removed."
+msgstr ""
+
 msgid "User Cohorts are only shown when the %{usage_ping_link_start}usage ping%{usage_ping_link_end} is enabled."
 msgstr ""
 
@@ -8480,9 +8621,27 @@ msgstr ""
 msgid "User and IP Rate Limits"
 msgstr ""
 
+msgid "User identity was successfully created."
+msgstr ""
+
+msgid "User identity was successfully removed."
+msgstr ""
+
+msgid "User identity was successfully updated."
+msgstr ""
+
+msgid "User key was successfully removed."
+msgstr ""
+
 msgid "User map"
 msgstr ""
 
+msgid "User was successfully created."
+msgstr ""
+
+msgid "User was successfully updated."
+msgstr ""
+
 msgid "UserProfile|Activity"
 msgstr ""
 
@@ -8564,6 +8723,9 @@ msgstr ""
 msgid "Users requesting access to"
 msgstr ""
 
+msgid "Users were successfully added."
+msgstr ""
+
 msgid "Validate"
 msgstr ""
 
@@ -8888,6 +9050,9 @@ msgstr ""
 msgid "You are going to transfer %{project_full_name} to another owner. Are you ABSOLUTELY sure?"
 msgstr ""
 
+msgid "You are now impersonating %{username}"
+msgstr ""
+
 msgid "You are on a read-only GitLab instance."
 msgstr ""
 
@@ -8942,6 +9107,15 @@ msgstr ""
 msgid "You can test your .gitlab-ci.yml in %{linkStart}CI Lint%{linkEnd}."
 msgstr ""
 
+msgid "You cannot impersonate a blocked user"
+msgstr ""
+
+msgid "You cannot impersonate a user who cannot log in"
+msgstr ""
+
+msgid "You cannot impersonate an internal user"
+msgstr ""
+
 msgid "You cannot write to this read-only GitLab instance."
 msgstr ""