Skip to content

Master merge #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
s-nakajima merged 2 commits into from
Jun 5, 2020
Merged

Master merge #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a62aafe
change: test: travis.ymlからphp5.4,5.5を削除。php7.3,7.4を追加
s-nakajima Mar 8, 2020
925567c
fix: 「パスワード再発行」画面の、「登録に使用したメールアドレスを入力し、[決定]ボタンをクリックしてください。」のボタンは[次へ]が…
ryu818 Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
language: php

php:
- 5.4
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2
- 7.3
- 7.4

sudo: false
dist: trusty
Expand Down
2 changes: 1 addition & 1 deletion Locale/eng/LC_MESSAGES/auth.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ msgstr ""

#: Auth/View/ForgotPass/request.ctp:19
msgid "Please enter your registered e-mail address, and click on the [OK] button. <br>We will send the activation key to obtain a new password to your registered e-mail address."
msgstr ""
msgstr "Please enter your registered e-mail address, and click on the [NEXT] button. <br>We will send the activation key to obtain a new password to your registered e-mail address."

#: Auth/View/ForgotPass/update.ctp:19
msgid "Enter the new password, please click the [OK] button."
Expand Down
2 changes: 1 addition & 1 deletion Locale/jpn/LC_MESSAGES/auth.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ msgstr "入力したメールアドレスに通知された認証キーを入力

#: Auth/View/ForgotPass/request.ctp:19
msgid "Please enter your registered e-mail address, and click on the [OK] button. <br>We will send the activation key to obtain a new password to your registered e-mail address."
msgstr "登録に使用したメールアドレスを入力し、[決定]ボタンをクリックしてください。<br>"
msgstr "登録に使用したメールアドレスを入力し、[次へ]ボタンをクリックしてください。<br>"
"パスワード取得用のリンクが記載されたメールが登録メールアドレス宛に送られます。"

#: Auth/View/ForgotPass/update.ctp:19
Expand Down