diff options
| author | Unknwon <joe2010xtmf@163.com> | 2015-02-11 19:25:59 -0500 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2015-02-11 19:25:59 -0500 |
| commit | c5c467a9cd805c7cd0fb93f467e0205ee082cca3 (patch) | |
| tree | b4e617b52918b38e589ec2221eaf2bededd23f79 /conf | |
| parent | c7a042ef3682fce9f343faf5e8d3e4228feabb96 (diff) | |
| parent | 0af74b36add865445ed1d6cd649910d8bb82fe5e (diff) | |
| download | gitea-c5c467a9cd805c7cd0fb93f467e0205ee082cca3.tar.gz gitea-c5c467a9cd805c7cd0fb93f467e0205ee082cca3.zip | |
Merge branch 'dev' of github.com:gogits/gogs into access
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/app.ini | 2 | ||||
| -rw-r--r-- | conf/locale/locale_en-US.ini | 1 | ||||
| -rwxr-xr-x | conf/locale/locale_ja-JP.ini | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/conf/app.ini b/conf/app.ini index 782dc51c89..2019557bd4 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -89,6 +89,8 @@ ENABLE_REVERSE_PROXY_AUTO_REGISTERATION = false TASK_INTERVAL = 1 ; Deliver timeout in seconds DELIVER_TIMEOUT = 5 +; Allow insecure certification +SKIP_TLS_VERIFY = false [mailer] ENABLED = false diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 8ea383f26b..6b59be7391 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -647,6 +647,7 @@ config.reset_password_code_lives = Reset Password Code Lives config.webhook_config = Webhook Configuration config.task_interval = Task Interval config.deliver_timeout = Deliver Timeout +config.skip_tls_verify = Skip TLS Verify config.mailer_config = Mailer Configuration config.mailer_enabled = Enabled config.mailer_name = Name diff --git a/conf/locale/locale_ja-JP.ini b/conf/locale/locale_ja-JP.ini index c8b70aa1cf..29ea94e4da 100755 --- a/conf/locale/locale_ja-JP.ini +++ b/conf/locale/locale_ja-JP.ini @@ -516,8 +516,8 @@ dashboard.git_gc_repos=リポジトリでのガベージコレクションを実 dashboard.git_gc_repos_success=すべてのリポジトリは正常にガベージ コレクションを行いました。
dashboard.resync_all_sshkeys='.ssh/ autorized_key' ファイルを再生成します。（警告：Gogsキー以外は失われます）
dashboard.resync_all_sshkeys_success=すべての公開鍵が正常に書き換えられました。
-dashboard.resync_all_update_hooks=Rewrite all update hook of repositories (needed when custom config path is changed)
-dashboard.resync_all_update_hooks_success=All repositories' update hook have been rewritten successfully.
+dashboard.resync_all_update_hooks=リポジトリの update フックをすべて再更新する（カスタムの設定パスが変更されたときに必要）
+dashboard.resync_all_update_hooks_success=リポジトリの update フックがすべて正常に再更新されました。
dashboard.server_uptime=サーバーの稼働時間
dashboard.current_goroutine=現在のGoroutine
|