aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-12-02 11:47:15 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-12-02 11:47:15 -0500
commit18236745148472a717dd09664f8fed8c5f631b04 (patch)
treed06c9a4451bd907eefca0ee3a2823f984cc2068e /phpBB/language
parent21caf6db6ffe8f58b663bd2d0441626ecdb02e72 (diff)
parent37f2841af2d1027b92953ee2c08da44481d0a06e (diff)
downloadforums-18236745148472a717dd09664f8fed8c5f631b04.tar
forums-18236745148472a717dd09664f8fed8c5f631b04.tar.gz
forums-18236745148472a717dd09664f8fed8c5f631b04.tar.bz2
forums-18236745148472a717dd09664f8fed8c5f631b04.tar.xz
forums-18236745148472a717dd09664f8fed8c5f631b04.zip
Merge PR #1065 branch 'dhruvgoel92/ticket/10771' into develop
* dhruvgoel92/ticket/10771: [ticket/10771] fix remember me language [ticket/10771] use remember me in ucp [ticket/10771] use remember me in acp [ticket/10771] changed value in help_faq.php [ticket/10771] Using Remember Me instead of autologin or persistent keys
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/board.php8
-rw-r--r--phpBB/language/en/common.php2
-rw-r--r--phpBB/language/en/help_faq.php2
-rw-r--r--phpBB/language/en/ucp.php8
4 files changed, 10 insertions, 10 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index a4380486cc..1b99c87938 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -449,10 +449,10 @@ $lang = array_merge($lang, array(
'ACP_SECURITY_SETTINGS_EXPLAIN' => 'Here you are able to define session and login related settings.',
'ALL' => 'All',
- 'ALLOW_AUTOLOGIN' => 'Allow persistent logins',
- 'ALLOW_AUTOLOGIN_EXPLAIN' => 'Determines whether users can autologin when they visit the board.',
- 'AUTOLOGIN_LENGTH' => 'Persistent login key expiration length (in days)',
- 'AUTOLOGIN_LENGTH_EXPLAIN' => 'Number of days after which persistent login keys are removed or zero to disable.',
+ 'ALLOW_AUTOLOGIN' => 'Allow "Remember Me" logins',
+ 'ALLOW_AUTOLOGIN_EXPLAIN' => 'Determines whether users are given "Remember Me" option when they visit the board.',
+ 'AUTOLOGIN_LENGTH' => '"Remember Me" login key expiration length (in days)',
+ 'AUTOLOGIN_LENGTH_EXPLAIN' => 'Number of days after which "Remember Me" login keys are removed or zero to disable.',
'BROWSER_VALID' => 'Validate browser',
'BROWSER_VALID_EXPLAIN' => 'Enables browser validation for each session improving security.',
'CHECK_DNSBL' => 'Check IP against DNS Blackhole List',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 7ce3b5d2e6..fbb7b40d41 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -343,7 +343,7 @@ $lang = array_merge($lang, array(
'LOGIN_EXPLAIN_VIEWONLINE' => 'In order to view the online list you have to be registered and logged in.',
'LOGOUT' => 'Logout',
'LOGOUT_USER' => 'Logout [ %s ]',
- 'LOG_ME_IN' => 'Log me on automatically each visit',
+ 'LOG_ME_IN' => 'Remember me',
'MARK' => 'Mark',
'MARK_ALL' => 'Mark all',
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index 5c99f81c06..9500943b88 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -43,7 +43,7 @@ $help = array(
),
array(
0 => 'Why do I get logged off automatically?',
- 1 => 'If you do not check the <em>Log me in automatically</em> box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.'
+ 1 => 'If you do not check the <em>Remember me</em> box when you login, the board will only keep you logged in for a preset time. This prevents misuse of your account by anyone else. To stay logged in, check the box during login. This is not recommended if you access the board from a shared computer, e.g. library, internet cafe, university computer lab, etc. If you do not see this checkbox, it means the board administrator has disabled this feature.'
),
array(
0 => 'How do I prevent my username appearing in the online user listings?',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 705b07b170..b919699ea0 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -87,7 +87,7 @@ $lang = array_merge($lang, array(
'ATTACHMENTS_EXPLAIN' => 'This is a list of attachments you have made in posts to this board.',
'ATTACHMENTS_DELETED' => 'Attachments successfully deleted.',
'ATTACHMENT_DELETED' => 'Attachment successfully deleted.',
- 'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected persistent login keys were successfully deleted.',
+ 'AUTOLOGIN_SESSION_KEYS_DELETED'=> 'The selected "Remember Me" login keys were successfully deleted.',
'AVATAR_CATEGORY' => 'Category',
'AVATAR_EXPLAIN' => 'Maximum dimensions; width: %1$s, height: %2$s, file size: %3$.2f KiB.',
'AVATAR_FEATURES_DISABLED' => 'The avatar functionality is currently disabled.',
@@ -380,8 +380,8 @@ $lang = array_merge($lang, array(
'PREFERENCES_UPDATED' => 'Your preferences have been updated.',
'PROFILE_INFO_NOTICE' => 'Please note that this information may be viewable to other members. Be careful when including any personal details. Any fields marked with a * must be completed.',
'PROFILE_UPDATED' => 'Your profile has been updated.',
- 'PROFILE_AUTOLOGIN_KEYS' => 'The persistent login keys automatically log you in when you visit the board. If you logout, the persistent login key is deleted only on the computer you are using to logout. Here you can see persistent login keys created on other computers you used to access this site.',
- 'PROFILE_NO_AUTOLOGIN_KEYS' => 'There are no saved persistent login keys.',
+ 'PROFILE_AUTOLOGIN_KEYS' => 'The "Remember Me" login keys automatically log you in when you visit the board. If you logout, the remember me login key is deleted only on the computer you are using to logout. Here you can see remember login keys created on other computers you used to access this site.',
+ 'PROFILE_NO_AUTOLOGIN_KEYS' => 'There are no saved "Remember Me" login keys.',
'RECIPIENT' => 'Recipient',
'RECIPIENTS' => 'Recipients',
@@ -476,7 +476,7 @@ $lang = array_merge($lang, array(
'UCP_PROFILE_PROFILE_INFO' => 'Edit profile',
'UCP_PROFILE_REG_DETAILS' => 'Edit account settings',
'UCP_PROFILE_SIGNATURE' => 'Edit signature',
- 'UCP_PROFILE_AUTOLOGIN_KEYS'=> 'Edit persistent login keys',
+ 'UCP_PROFILE_AUTOLOGIN_KEYS'=> 'Edit "Remember Me" login keys',
'UCP_USERGROUPS' => 'Usergroups',
'UCP_USERGROUPS_MEMBER' => 'Edit memberships',
generated by cgit v1.2.1 (git 2.21.0) at 2025-02-18 12:54:07 +0000