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-01-29 15:24:12 +01:00
commit 4416a0f71b
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/File.class.php
View File

@ -473,7 +473,7 @@ class PMA_File
|| ! is_writable($GLOBALS['cfg']['TempDir'])
) {
// cannot create directory or access, point user to FAQ 1.11
$this->_error_message = __('Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]');
$this->_error_message = __('Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc].');
return false;
}

2
libraries/Header.class.php
View File

@ -658,7 +658,7 @@ class PMA_Header
if ($this->_warningsEnabled) {
$retval .= "<noscript>";
$retval .= PMA_message::error(
__("Javascript must be enabled past this point")
__("Javascript must be enabled past this point!")
)->getDisplay();
$retval .= "</noscript>";
}

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

@ -235,7 +235,7 @@ class PMA_Validator
while (1) {
$drizzle = @drizzle_create();
if (! $drizzle) {
$error = __('Could not initialize Drizzle connection library');
$error = __('Could not initialize Drizzle connection library!');
break;
}
$conn = $socket
@ -244,7 +244,7 @@ class PMA_Validator
$drizzle, $host, $port, $user, $pass, null, 0
);
if (! $conn) {
$error = __('Could not connect to Drizzle server');
$error = __('Could not connect to the database server!');
drizzle_free($drizzle);
break;
}
@ -252,7 +252,7 @@ class PMA_Validator
// to actually connect
$res = @drizzle_query($conn, 'SELECT 1');
if (! $res) {
$error = __('Could not connect to Drizzle server');
$error = __('Could not connect to the database server!');
} else {
drizzle_result_free($res);
}
@ -263,14 +263,14 @@ class PMA_Validator
} else if ($extension == 'mysql') {
$conn = @mysql_connect($host . $socket . $port, $user, $pass);
if (! $conn) {
$error = __('Could not connect to MySQL server');
$error = __('Could not connect to the database server!');
} else {
mysql_close($conn);
}
} else {
$conn = @mysqli_connect($host, $user, $pass, null, $port, $socket);
if (! $conn) {
$error = __('Could not connect to MySQL server');
$error = __('Could not connect to the database server!');
} else {
mysqli_close($conn);
}
@ -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 config 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 signon 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 signon authentication method!');
$error = true;
}

2
libraries/plugins/auth/AuthenticationCookie.class.php
View File

@ -175,7 +175,7 @@ class AuthenticationCookie extends AuthenticationPlugin
echo "<noscript>\n";
PMA_message::error(
__("Javascript must be enabled past this point")
__("Javascript must be enabled past this point!")
)->display();
echo "</noscript>\n";