gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-03-04 13:41:14 +01:00
commit cda3aeef47
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/config/ServerConfigChecks.class.php
View File

@ -375,7 +375,7 @@ class ServerConfigChecks
'[/a]', '[a@?page=form&formset=Features#tab_Security]',
'[/a]'
);
$sBlowfishSecretMsg = __('You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.');
$sBlowfishSecretMsg = __('You didn\'t have blowfish secret set and have enabled [kbd]cookie[/kbd] authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.');
$sBZipDumpWarning = __('%sBzip2 compression and decompression%s requires functions (%s) which are unavailable on this system.');
$sBZipDumpWarning = sprintf(
$sBZipDumpWarning,
@ -413,14 +413,14 @@ class ServerConfigChecks
'[a@?page=form&formset=Features#tab_Security]',
'[/a]'
);
$sLoginCookieValidityWarn3 = __('If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin cookie validity%s must be set to a value less or equal to it.');
$sLoginCookieValidityWarn3 = __('If using [kbd]cookie[/kbd] authentication and %sLogin cookie store%s is not 0, %sLogin cookie validity%s must be set to a value less or equal to it.');
$sLoginCookieValidityWarn3 = sprintf(
$sLoginCookieValidityWarn3,
'[a@?page=form&formset=Features#tab_Security]',
'[/a]', '[a@?page=form&formset=Features#tab_Security]',
'[/a]'
);
$sSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - %shost authentication%s settings and %strusted proxies list%s. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
$sSecurityInfoMsg = __('If you feel this is necessary, use additional protection settings - %s[kbd]host[/kbd] authentication%s settings and %strusted proxies list%s. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.');
$sSecurityInfoMsg = sprintf(
$sSecurityInfoMsg,
'[a@?page=servers&mode=edit&id=%1$d#tab_Server_config]',

6
libraries/config/Validator.class.php
View File

@ -303,7 +303,7 @@ class PMA_Validator
&& empty($values['Servers/1/user'])
) {
$result['Servers/1/user']
= __('Empty username while using config authentication method!');
= __('Empty username while using [kbd]config[/kbd] authentication method!');
$error = true;
}
if ($values['Servers/1/auth_type'] == 'signon'
@ -311,7 +311,7 @@ class PMA_Validator
) {
$result['Servers/1/SignonSession'] = __(
'Empty signon session name '
. 'while using signon authentication method!'
. 'while using [kbd]signon[/kbd] authentication method!'
);
$error = true;
}
@ -319,7 +319,7 @@ class PMA_Validator
&& empty($values['Servers/1/SignonURL'])
) {
$result['Servers/1/SignonURL']
= __('Empty signon URL while using signon authentication method!');
= __('Empty signon URL while using [kbd]signon[/kbd] authentication method!');
$error = true;
}

8
libraries/config/messages.inc.php
View File

@ -382,8 +382,8 @@ $strConfigLoginCookieDeleteAll_desc = __(
);
$strConfigLoginCookieDeleteAll_name = __('Delete all cookies on logout');
$strConfigLoginCookieRecall_desc = __(
'Define whether the previous login should be recalled or not in cookie '
. 'authentication mode.'
'Define whether the previous login should be recalled or not in '
. '[kbd]cookie[/kbd] authentication mode.'
);
$strConfigLoginCookieRecall_name = __('Recall user name');
$strConfigLoginCookieStore_desc = __(
@ -420,8 +420,8 @@ $strConfigMaxTableList_cmt = __('Users cannot set a higher value');
$strConfigMaxTableList_desc = __('Maximum number of tables displayed in table list.');
$strConfigMaxTableList_name = __('Maximum tables');
$strConfigMcryptDisableWarning_desc = __(
'Disable the default warning that is displayed if mcrypt is missing for cookie '
. 'authentication.'
'Disable the default warning that is displayed if mcrypt is missing for '
. '[kbd]cookie[/kbd] authentication.'
);
$strConfigMcryptDisableWarning_name = __('mcrypt warning');
$strConfigMemoryLimit_desc = __(