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 2013-07-29 15:38:13 +02:00
commit e9ca68e6fa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -44,7 +44,7 @@
<arg line="${source_comma_sep}
xml
codesize,design,naming,unusedcode
--exclude test,build,tcpdf,php-gettext,bfShapeFiles,PMAStandard,phpseclib,recaptchalib.php,swekey.php
--exclude lib/Cake/,vendors/
--reportfile '${basedir}/build/logs/pmd.xml'" />
</exec>
</target>

6
libraries/server_privileges.lib.php
View File

@ -3195,7 +3195,7 @@ function PMA_getHtmlForListingUsersofAGroup($userGroup)
if ($result) {
if ($GLOBALS['dbi']->numRows($result) == 0) {
$html_output .= '<p>'
. __('No users were found belonging to this user group')
. __('No users were found belonging to this user group.')
. '</p>';
} else {
$html_output .= '<table>'
@ -3367,7 +3367,7 @@ function PMA_getHtmlToEditUserGroup($userGroup = null)
. '</legend>';
if ($userGroup == null) {
$html_output .= '<label for="userGroup">' . __('Group name: ') . '</label>';
$html_output .= '<label for="userGroup">' . __('Group name:') . '</label>';
$html_output .= '<input type="text" name="userGroup" autocomplete="off" />';
$html_output .= '<div class="clearfloat"></div>';
}
@ -3399,7 +3399,7 @@ function PMA_getHtmlToEditUserGroup($userGroup = null)
}
$html_output .= _getTabList(
__('Sever level tabs'), 'server', $allowedTabs['server']
__('Server level tabs'), 'server', $allowedTabs['server']
);
$html_output .= _getTabList(
__('Database level tabs'), 'db', $allowedTabs['db']