From: 无闻 <u@gogs.io>
Date: Sun, 1 Feb 2015 21:56:34 +0000 (-0500)
Subject: Merge pull request #818 from fzerorubigd/master
X-Git-Tag: v0.9.99~1513
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cd6376f0930d6d0848936756675ffa4c96f6cea8;p=gitea.git

Merge pull request #818 from fzerorubigd/master

add a function to rewrite all public keys on admin request
---

cd6376f0930d6d0848936756675ffa4c96f6cea8
diff --cc conf/locale/locale_en-US.ini
index 534e8d3879,deedbefab0..c0979d1bdb
--- a/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