Merge pull request #818 from fzerorubigd/master

add a function to rewrite all public keys on admin request

diff --cc conf/locale/locale_en-US.ini
index 534e8d3879bc7febdd2814279a60e5a183926700,deedbefab018b14b09832ff5840a232e880766eb..c0979d1bdbc8f15ad8b9264b2e18517896b55932
--- 1/conf/locale/locale_en-US.ini
--- 2/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@@ -59,14 -59,12 +59,14 @@@ run_user = Run Use
  run_user_helper = The user must have access to Repository Root Path and run Gogs.
  domain = Domain
  domain_helper = This affects SSH clone URLs.
 +http_port = HTTP Port
 +http_port_helper = Port number which application will listen on.
  app_url = Application URL
  app_url_helper = This affects HTTP/HTTPS clone URL and somewhere in e-mail.
 -email_title = E-mail Service Settings(Optional)
 +email_title = E-mail Service Settings (Optional)
  smtp_host = SMTP Host
  mailer_user = Sender E-mail
- mailer_password = Sender Password 
+ mailer_password = Sender Password
  notify_title = Notification Settings(Optional)
  register_confirm = Enable Register Confirmation
  mail_notify = Enable Mail Notification

diff --cc models/publickey.go
Simple merge