From a62aafefae0c79e6b7190309f640d258428daf4b Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sun, 8 Mar 2020 23:37:10 +0900 Subject: [PATCH 1/2] =?UTF-8?q?change:=20test:=20travis.yml=E3=81=8B?= =?UTF-8?q?=E3=82=89php5.4,5.5=E3=82=92=E5=89=8A=E9=99=A4=E3=80=82php7.3,7?= =?UTF-8?q?.4=E3=82=92=E8=BF=BD=E5=8A=A0=20https://github.com/NetCommons3/?= =?UTF-8?q?NetCommons3/issues/1560?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 221e461..9c53e49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 From 925567c666119bcad910d4d9e8d331fa31a458c2 Mon Sep 17 00:00:00 2001 From: ryu818 Date: Thu, 30 Apr 2020 16:22:26 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E3=80=8C=E3=83=91=E3=82=B9=E3=83=AF?= =?UTF-8?q?=E3=83=BC=E3=83=89=E5=86=8D=E7=99=BA=E8=A1=8C=E3=80=8D=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E3=81=AE=E3=80=81=E3=80=8C=E7=99=BB=E9=8C=B2=E3=81=AB?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=97=E3=81=9F=E3=83=A1=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E3=82=A2=E3=83=89=E3=83=AC=E3=82=B9=E3=82=92=E5=85=A5=E5=8A=9B?= =?UTF-8?q?=E3=81=97=E3=80=81[=E6=B1=BA=E5=AE=9A]=E3=83=9C=E3=82=BF?= =?UTF-8?q?=E3=83=B3=E3=82=92=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=8F=E3=81=A0=E3=81=95=E3=81=84=E3=80=82=E3=80=8D?= =?UTF-8?q?=E3=81=AE=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AF[=E6=AC=A1?= =?UTF-8?q?=E3=81=B8]=E3=81=8C=E6=AD=A3=E3=81=97=E3=81=84=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E3=80=81=E4=BF=AE=E6=AD=A3=20https://github.com/resea?= =?UTF-8?q?rchmap/RmNetCommons3/issues/1978?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Locale/eng/LC_MESSAGES/auth.po | 2 +- Locale/jpn/LC_MESSAGES/auth.po | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Locale/eng/LC_MESSAGES/auth.po b/Locale/eng/LC_MESSAGES/auth.po index 7614d03..f805632 100644 --- a/Locale/eng/LC_MESSAGES/auth.po +++ b/Locale/eng/LC_MESSAGES/auth.po @@ -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.
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.
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." diff --git a/Locale/jpn/LC_MESSAGES/auth.po b/Locale/jpn/LC_MESSAGES/auth.po index 65924b6..122792c 100644 --- a/Locale/jpn/LC_MESSAGES/auth.po +++ b/Locale/jpn/LC_MESSAGES/auth.po @@ -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.
We will send the activation key to obtain a new password to your registered e-mail address." -msgstr "登録に使用したメールアドレスを入力し、[決定]ボタンをクリックしてください。
" +msgstr "登録に使用したメールアドレスを入力し、[次へ]ボタンをクリックしてください。
" "パスワード取得用のリンクが記載されたメールが登録メールアドレス宛に送られます。" #: Auth/View/ForgotPass/update.ctp:19