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

Merge branch 'master' into bug_3787

Browse Source
This commit is contained in:
Marc Delisle 2013-02-03 07:10:14 -05:00
commit 7db8605cbb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/schema/User_Schema.class.php
View File

@ -568,7 +568,9 @@ class PMA_User_Schema
. 'data-y="' . $drag_y . '" '
. 'class="pdflayout_table"'
. '>'
. '<u>' . $temp_sh_page['table_name'] . '</u>';
. '<u>'
. htmlspecialchars($temp_sh_page['table_name'])
. '</u>';
if (isset($with_field_names)) {
$fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']);

4
po/ru.po
View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-01-21 00:59+0100\n"
"PO-Revision-Date: 2013-01-26 08:30+0200\n"
"PO-Revision-Date: 2013-02-03 09:02+0200\n"
"Last-Translator: Victor Volkov <hanut@php-myadmin.ru>\n"
"Language-Team: Russian "
"<http://l10n.cihar.com/projects/phpmyadmin/master/ru/>\n"
@ -14,7 +14,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Weblate 1.4\n"
"X-Generator: Weblate 1.5-dev\n"
#: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:344
#: libraries/DisplayResults.class.php:809