@@ -39,19 +39,19 @@ class Admin::UsersController < Admin::ApplicationController
...
@@ -39,19 +39,19 @@ class Admin::UsersController < Admin::ApplicationController
warden.set_user(user,scope: :user)
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_toroot_path
redirect_toroot_path
else
else
flash[:alert]=
flash[:alert]=
ifuser.blocked?
ifuser.blocked?
"You cannot impersonate a blocked user"
_("You cannot impersonate a blocked user")
elsifuser.internal?
elsifuser.internal?
"You cannot impersonate an internal user"
_("You cannot impersonate an internal user")
else
else
"You cannot impersonate a user who cannot log in"
_("You cannot impersonate a user who cannot log in")
end
end
redirect_toadmin_user_path(user)
redirect_toadmin_user_path(user)
...
@@ -60,35 +60,35 @@ class Admin::UsersController < Admin::ApplicationController
...
@@ -60,35 +60,35 @@ class Admin::UsersController < Admin::ApplicationController
msgid "Started asynchronous removal of all repository check states."
msgstr ""
msgid "Starts %{startsIn}"
msgid "Starts %{startsIn}"
msgstr ""
msgstr ""
...
@@ -7453,6 +7558,21 @@ msgstr ""
...
@@ -7453,6 +7558,21 @@ msgstr ""
msgid "Subscribed"
msgid "Subscribed"
msgstr ""
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"
msgid "Suggested change"
msgstr ""
msgstr ""
...
@@ -7480,6 +7600,9 @@ msgstr ""
...
@@ -7480,6 +7600,9 @@ msgstr ""
msgid "System header and footer"
msgid "System header and footer"
msgstr ""
msgstr ""
msgid "System hook was successfully updated."
msgstr ""
msgid "System metrics (Custom)"
msgid "System metrics (Custom)"
msgstr ""
msgstr ""
...
@@ -7696,6 +7819,9 @@ msgstr ""
...
@@ -7696,6 +7819,9 @@ msgstr ""
msgid "The usage ping is disabled, and cannot be configured through this form."
msgid "The usage ping is disabled, and cannot be configured through this form."
msgstr ""
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."
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 ""
msgstr ""
...
@@ -7738,6 +7864,9 @@ msgstr ""
...
@@ -7738,6 +7864,9 @@ msgstr ""
msgid "There was an error loading users activity calendar."
msgid "There was an error loading users activity calendar."
msgstr ""
msgstr ""
msgid "There was an error removing the e-mail."
msgstr ""
msgid "There was an error saving your changes."
msgid "There was an error saving your changes."
msgstr ""
msgstr ""
...
@@ -7951,6 +8080,9 @@ msgstr ""
...
@@ -7951,6 +8080,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."
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 ""
msgstr ""
msgid "This user cannot be unlocked manually from GitLab"
msgstr ""
msgid "This user has no identities"
msgid "This user has no identities"
msgstr ""
msgstr ""
...
@@ -8300,6 +8432,9 @@ msgstr ""
...
@@ -8300,6 +8432,9 @@ msgstr ""
msgid "Twitter"
msgid "Twitter"
msgstr ""
msgstr ""
msgid "Two-factor Authentication has been disabled for this user"
msgstr ""
msgid "Two-factor authentication"
msgid "Two-factor authentication"
msgstr ""
msgstr ""
...
@@ -8444,6 +8579,12 @@ msgstr ""
...
@@ -8444,6 +8579,12 @@ msgstr ""
msgid "Use your global notification setting"
msgid "Use your global notification setting"
msgstr ""
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."
msgid "User Cohorts are only shown when the %{usage_ping_link_start}usage ping%{usage_ping_link_end} is enabled."
msgstr ""
msgstr ""
...
@@ -8456,9 +8597,27 @@ msgstr ""
...
@@ -8456,9 +8597,27 @@ msgstr ""
msgid "User and IP Rate Limits"
msgid "User and IP Rate Limits"
msgstr ""
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"
msgid "User map"
msgstr ""
msgstr ""
msgid "User was successfully created."
msgstr ""
msgid "User was successfully updated."
msgstr ""
msgid "UserProfile|Activity"
msgid "UserProfile|Activity"
msgstr ""
msgstr ""
...
@@ -8540,6 +8699,9 @@ msgstr ""
...
@@ -8540,6 +8699,9 @@ msgstr ""
msgid "Users requesting access to"
msgid "Users requesting access to"
msgstr ""
msgstr ""
msgid "Users were successfully added."
msgstr ""
msgid "Validate"
msgid "Validate"
msgstr ""
msgstr ""
...
@@ -8864,6 +9026,9 @@ msgstr ""
...
@@ -8864,6 +9026,9 @@ msgstr ""
msgid "You are going to transfer %{project_full_name} to another owner. Are you ABSOLUTELY sure?"
msgid "You are going to transfer %{project_full_name} to another owner. Are you ABSOLUTELY sure?"
msgstr ""
msgstr ""
msgid "You are now impersonating %{username}"
msgstr ""
msgid "You are on a read-only GitLab instance."
msgid "You are on a read-only GitLab instance."
msgstr ""
msgstr ""
...
@@ -8918,6 +9083,15 @@ msgstr ""
...
@@ -8918,6 +9083,15 @@ msgstr ""
msgid "You can test your .gitlab-ci.yml in %{linkStart}CI Lint%{linkEnd}."
msgid "You can test your .gitlab-ci.yml in %{linkStart}CI Lint%{linkEnd}."
msgstr ""
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."
msgid "You cannot write to this read-only GitLab instance."