Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0

2013-08-26 08:53:22 +05:30 · 2013-08-26 08:53:22 +05:30 · cadb2cb803
commit cadb2cb803
parent a865344279 1c058596fa
17 changed files with 252 additions and 245 deletions
--- a/4
+++ b/4
@ -7,6 +7,10 @@ phpMyAdmin - ChangeLog
 - bug #4048 Cannot select foreign value in Search
 - bug #4025 gzip export is not actually compressed with mod_deflate
 - bug #4054 query analysis doesn't launch in status monitor
+ Add pmahomme icon credits (FamFamFam silk icon set)
+- bug #4064 Table structure statistics "Space usage" caption too small for l10n
+- bug #4051 Wrong tabindex when inserting rows
+- bug #4066 varchar field not truncated in table browse mode

 4.0.5.0 (2013-08-04)
 - bug #3977 Not detected configuration storage
--- a/doc/require.rst
+++ b/doc/require.rst
@ -13,7 +13,7 @@ PHP
 ---

 * You need PHP 5.2.0 or newer, with ``session`` support, the Standard PHP Library 
-  (SPL) extension, JSON support, and the ``mbstring`` and ``ctype`` extensions.
+  (SPL) extension, JSON support, and the ``mbstring`` extension.

 * To support uploading of ZIP files, you need the PHP ``zip`` extension.

@ -31,6 +31,8 @@ PHP
  5.2.17 or newer and the `libxml <http://www.php.net/libxml>`_
  extension.

+* Performance suggestion: install the ``ctype`` extension.
+
 .. seealso:: :ref:`faq1_31`, :ref:`authentication_modes`

 Database
--- a/js/gis_data_editor.js
+++ b/js/gis_data_editor.js
@ -94,7 +94,7 @@ function loadJSAndGISEditor(value, field, type, input_name, token) {
    // Loads a set of small JS file needed for the GIS editor
    var smallScripts = [ 'js/jquery/jquery.svg.js',
                     'js/jquery/jquery.mousewheel.js',
-                     'js/jquery/jquery.event.drag-2.0.js',
+                     'js/jquery/jquery.event.drag-2.2.js',
                     'js/tbl_gis_visualization.js' ];

    for (var i = 0; i < smallScripts.length; i++) {
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@ -466,14 +466,14 @@ AJAX.registerOnload('tbl_change.js', function() {
        // IMO it's not really important to handle the tabindex for
        // function and Null
        var tabindex = 0;
-        $('.textfield')
+        $('.textfield, .char')
        .each(function() {
                tabindex++;
                $(this).attr('tabindex', tabindex);
                // update the IDs of textfields to ensure that they are unique
                $(this).attr('id', "field_" + tabindex + "_3");
            });
-        $('select.control_at_footer')
+        $('.control_at_footer')
        .each(function() {
                tabindex++;
                $(this).attr('tabindex', tabindex);
--- a/js/tbl_gis_visualization.js
+++ b/js/tbl_gis_visualization.js
@ -5,7 +5,7 @@
 * @requires    jquery
 * @requires    jquery/jquery.svg.js
 * @requires    jquery/jquery.mousewheel.js
- * @requires    jquery/jquery.event.drag-2.0.js
+ * @requires    jquery/jquery.event.drag-2.2.js
 */

 // Constants
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@ -3865,8 +3865,8 @@ class PMA_DisplayResults
            // (unless it's a link-type transformation)
            if (PMA_strlen($column) > $GLOBALS['cfg']['LimitChars']
                && ($_SESSION['tmp_user_values']['display_text'] == self::DISPLAY_PARTIAL_TEXT)
-                && gettype($transformation_plugin) == "object"
-                && ! strpos($transformation_plugin->getName(), 'Link') === true
+                && ! (gettype($transformation_plugin) == "object"
+                && strpos($transformation_plugin->getName(), 'Link') !== false)
            ) {
                $column = PMA_substr($column, 0, $GLOBALS['cfg']['LimitChars'])
                    . '...';
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@ -1483,7 +1483,7 @@ function PMA_getSubmitTypeDropDown($where_clause, $tabindex, $tabindex_for_value
 */
 function PMA_getAfterInsertDropDown($where_clause, $after_insert, $found_unique_key)
 {
-    $html_output = '<select name="after_insert">'
+    $html_output = '<select name="after_insert" class="control_at_footer">'
        . '<option value="back" '
        . ($after_insert == 'back' ? 'selected="selected"' : '') . '>'
        . __('Go back to previous page') . '</option>'
--- a/po/cy.po
+++ b/po/cy.po
@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-07-29 15:07+0200\n"
-"PO-Revision-Date: 2013-05-07 17:20+0200\n"
+"PO-Revision-Date: 2013-08-23 09:14+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Welsh <http://l10n.cihar.com/projects/phpmyadmin/4-0/cy/>\n"
 "Language: cy\n"
@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
-"X-Generator: Weblate 1.6-dev\n"
+"X-Generator: Weblate 1.7-dev\n"

 #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:344
 #: libraries/DisplayResults.class.php:813
@ -378,10 +378,10 @@ msgid "You have to choose at least one column to display"
 msgstr "Mae'n rhaid dewis o leiaf un golofn i'w dangos"

 #: db_qbe.php:60
-#, fuzzy, php-format
+#, php-format
 #| msgid "visual builder"
 msgid "Switch to %svisual builder%s"
-msgstr "adeiladwr gweledol"
+msgstr "Newid i %sadeiladwr gweledol%s"

 #: db_search.php:30 libraries/plugins/auth/AuthenticationConfig.class.php:81
 #: libraries/plugins/auth/AuthenticationConfig.class.php:96
--- a/po/en_GB.po
+++ b/po/en_GB.po
@ -6,16 +6,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-07-29 15:07+0200\n"
-"PO-Revision-Date: 2013-05-31 14:23+0200\n"
-"Last-Translator: Robert Readman <robert_readman@hotmail.com>\n"
-"Language-Team: English (United Kingdom) <http://l10n.cihar.com/projects/"
-"phpmyadmin/4-0/en_GB/>\n"
+"PO-Revision-Date: 2013-08-24 15:18+0200\n"
+"Last-Translator: Patrick V <patrik_13@hotmail.com>\n"
+"Language-Team: English (United Kingdom) "
+"<http://l10n.cihar.com/projects/phpmyadmin/4-0/en_GB/>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 1.6-dev\n"
+"X-Generator: Weblate 1.7-dev\n"

 #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:344
 #: libraries/DisplayResults.class.php:813
@ -1878,7 +1878,7 @@ msgid ""
 "edit, checkbox, Edit, Copy and Delete links may not work after saving."
 msgstr ""
 "This table does not contain a unique column. Features related to the grid "
-"edit, tick-box, Edit, Copy and Delete links may not work after saving."
+"edit, checkbox, Edit, Copy and Delete links may not work after saving."

 #: js/messages.php:350
 msgid "You can also edit most values<br />by double-clicking directly on them."
--- a/po/eu.po
+++ b/po/eu.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-07-29 15:07+0200\n"
-"PO-Revision-Date: 2013-07-12 15:38+0200\n"
+"PO-Revision-Date: 2013-08-23 09:21+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Basque <http://l10n.cihar.com/projects/phpmyadmin/4-0/eu/>\n"
 "Language: eu\n"
@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 1.6-dev\n"
+"X-Generator: Weblate 1.7-dev\n"

 #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:344
 #: libraries/DisplayResults.class.php:813
@ -204,7 +204,7 @@ msgstr "Lehenetsia"
 #: libraries/schema/Pdf_Relation_Schema.class.php:1371
 #: libraries/schema/Pdf_Relation_Schema.class.php:1394 tbl_printview.php:135
 msgid "Links to"
-msgstr "Esteka:"
+msgstr "Esteka"

 #: db_datadict.php:176 db_printview.php:107
 #: libraries/config/messages.inc.php:94 libraries/config/messages.inc.php:109
--- a/po/id.po
+++ b/po/id.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-07-29 15:07+0200\n"
-"PO-Revision-Date: 2013-08-04 15:08+0200\n"
+"PO-Revision-Date: 2013-08-23 19:00+0200\n"
 "Last-Translator: Dadan Setia <da2n_s@yahoo.co.id>\n"
 "Language-Team: Indonesian "
 "<http://l10n.cihar.com/projects/phpmyadmin/4-0/id/>\n"
@ -3507,10 +3507,13 @@ msgstr ""
 "byte, disimpan dengan awalan empat byte menunjukkan panjang nilai"

 #: libraries/Types.class.php:354
+#, fuzzy
 msgid ""
 "An enumeration, chosen from the list of up to 65,535 values or the special "
 "'' error value"
 msgstr ""
+"Sebuah pencacahan, nilai dipilih dari daftar hingga 65,535 atau nilai khusus "
+"'' error"

 #: libraries/Types.class.php:356
 msgid "A single value chosen from a set of up to 64 members"
@ -3587,7 +3590,7 @@ msgstr ""

 #: libraries/Types.class.php:714
 msgid "A system's default double-precision floating-point number"
-msgstr ""
+msgstr "Sebuah nomor standar presisi-ganda sistem"

 #: libraries/Types.class.php:716
 msgid "True or false"
@ -3852,7 +3855,7 @@ msgstr "Error: Token tidak cocok"

 #: libraries/common.inc.php:1123
 msgid "GLOBALS overwrite attempt"
-msgstr ""
+msgstr "upaya penimpaan GLOBALS"

 #: libraries/common.inc.php:1130
 msgid "possible exploit"
@ -4554,7 +4557,7 @@ msgstr "Urutan tarik turun foreign key"

 #: libraries/config/messages.inc.php:152
 msgid "A dropdown will be used if fewer items are present"
-msgstr ""
+msgstr "Sebuah dropdown akan digunakan jika sedikit item yang tampil"

 #: libraries/config/messages.inc.php:153
 msgid "Foreign key limit"
@ -4644,16 +4647,14 @@ msgid "Databases display options"
 msgstr "Opsi tampilan basis data"

 #: libraries/config/messages.inc.php:179 setup/frames/menu.inc.php:19
-#, fuzzy
 #| msgid "Navigation frame"
 msgid "Navigation panel"
-msgstr "Bingkai navigasi"
+msgstr "Panel navigasi"

 #: libraries/config/messages.inc.php:180
-#, fuzzy
 #| msgid "Customize appearance of the navigation frame"
 msgid "Customize appearance of the navigation panel"
-msgstr "Atur tampilan bingkai navigasi"
+msgstr "Atur tampilan panel navigasi"

 #: libraries/config/messages.inc.php:181 libraries/select_server.lib.php:42
 #: setup/frames/index.inc.php:117
@ -4669,10 +4670,9 @@ msgid "Tables display options"
 msgstr "Opsi tampilan tabel"

 #: libraries/config/messages.inc.php:185 setup/frames/menu.inc.php:20
-#, fuzzy
 #| msgid "Main frame"
 msgid "Main panel"
-msgstr "Bingkai utama"
+msgstr "Panel utama"

 #: libraries/config/messages.inc.php:186
 msgid "Microsoft Office"
@ -4715,6 +4715,8 @@ msgid ""
 "Please note that phpMyAdmin is just a user interface and its features do not "
 "limit MySQL"
 msgstr ""
+"Sebagai catatan bahwa phpMyAdmin hanyalah antarmuka pengguna dan fitur-"
+"fiturnya tidak membatasi MySQL"

 #: libraries/config/messages.inc.php:198
 msgid "Basic settings"
@ -4737,6 +4739,8 @@ msgid ""
 "Advanced server configuration, do not change these options unless you know "
 "what they are for"
 msgstr ""
+"Konfigurasi mahir server, tidak mengubah pilihan ini kecuali Anda tahu untuk "
+"apa penggunaannya"

 #: libraries/config/messages.inc.php:203
 msgid "Enter server connection parameters"
@ -4762,6 +4766,8 @@ msgid ""
 "Tracking of changes made in database. Requires the phpMyAdmin configuration "
 "storage."
 msgstr ""
+"Pelacakan perubahan yang dilakukan dalam database. Membutuhkan penyimpanan "
+"konfigurasi phpMyAdmin."

 #: libraries/config/messages.inc.php:208
 msgid "Customize export options"
@ -4772,16 +4778,14 @@ msgid "Customize import defaults"
 msgstr "Atur bawaan impor"

 #: libraries/config/messages.inc.php:211
-#, fuzzy
 #| msgid "Customize navigation frame"
 msgid "Customize navigation panel"
-msgstr "Atur bingkai navigasi"
+msgstr "Atur panel navigasi"

 #: libraries/config/messages.inc.php:212
-#, fuzzy
 #| msgid "Customize main frame"
 msgid "Customize main panel"
-msgstr "Atur bingkai utama"
+msgstr "Atur panel utama"

 #: libraries/config/messages.inc.php:213 libraries/config/messages.inc.php:218
 #: setup/frames/menu.inc.php:18
@ -4821,24 +4825,22 @@ msgid "Customize startup page"
 msgstr "Atur halaman awal"

 #: libraries/config/messages.inc.php:224
-#, fuzzy
 #| msgid "Database server"
 msgid "Database structure"
-msgstr "Server basis data"
+msgstr "Stuktur basis data"

 #: libraries/config/messages.inc.php:225
 msgid "Choose which details to show in the database structure (list of tables)"
-msgstr ""
+msgstr "Pilih detail mana untuk menampilkan struktur database (daftar tabel)"

 #: libraries/config/messages.inc.php:226
-#, fuzzy
 #| msgid "Database server"
 msgid "Table structure"
-msgstr "Server basis data"
+msgstr "Struktur tabel"

 #: libraries/config/messages.inc.php:227
 msgid "Settings for the table structure (list of columns)"
-msgstr ""
+msgstr "Pengaturan untuk struktur tabel (daftar kolom)"

 #: libraries/config/messages.inc.php:228
 msgid "Tabs"
@ -4873,6 +4875,8 @@ msgid ""
 "Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import "
 "and export operations"
 msgstr ""
+"Aktifkan kompresi [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] untuk "
+"operasi impor dan ekspor"

 #: libraries/config/messages.inc.php:237
 msgid "GZip"
@ -4887,6 +4891,8 @@ msgid ""
 "If enabled, phpMyAdmin continues computing multiple-statement queries even "
 "if one of the queries failed"
 msgstr ""
+"Jika diaktifkan, phpMyAdmin terus menjalankan multi-statmen query bahkan "
+"jika salah satu query gagal"

 #: libraries/config/messages.inc.php:240
 msgid "Ignore multiple statement errors"
@ -4919,6 +4925,8 @@ msgid ""
 "Default format; be aware that this list depends on location (database, "
 "table) and only SQL is always available"
 msgstr ""
+"Format standar, sadari bahwa daftar ini tergantung pada lokasi (database, "
+"tabel) dan hanya SQL selalu tersedia"

 #: libraries/config/messages.inc.php:251
 msgid "Format of imported file"
@ -13211,13 +13219,12 @@ msgid "Slow_launch_threads is above 2s"
 msgstr "Slow_launch_threads diatas 2 detik"

 #: libraries/advisory_rules.txt:387
-#, fuzzy
 #| msgid "There are too many joins without indexes."
 msgid ""
 "Set {slow_launch_time} to 1s or 2s to correctly count threads that are slow "
 "to launch"
 msgstr ""
-"Atur {slow_launch_time} ke 1 atau 2 detik untuk memperbaiki perhitungan "
+"Atur {slow_launch_time} menjadi 1 atau 2 detik untuk memperbaiki perhitungan "
 "thread yang lambat diluncurkan"

 #: libraries/advisory_rules.txt:388
--- a/po/mn.po
+++ b/po/mn.po
@ -4,16 +4,15 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-07-29 15:07+0200\n"
-"PO-Revision-Date: 2013-04-25 15:34+0200\n"
+"PO-Revision-Date: 2013-08-23 09:21+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Mongolian <http://l10n.cihar.com/projects/phpmyadmin/4-0/mn/"
-">\n"
+"Language-Team: Mongolian <http://l10n.cihar.com/projects/phpmyadmin/4-0/mn/>\n"
 "Language: mn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 1.6-dev\n"
+"X-Generator: Weblate 1.7-dev\n"

 #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:344
 #: libraries/DisplayResults.class.php:813
@ -928,7 +927,7 @@ msgstr "Та үнэхээр "

 #: js/messages.php:31 libraries/mult_submits.inc.php:316 sql.php:464
 msgid "You are about to DESTROY a complete database!"
-msgstr "Дүүрэн өгөгдлийн сан УСТГАХ тухай?"
+msgstr "Дүүрэн өгөгдлийн сан УСТГАХ тухай!"

 #: js/messages.php:32
 #, fuzzy
--- a/po/uz@latin.po
+++ b/po/uz@latin.po
@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.0.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-07-29 15:07+0200\n"
-"PO-Revision-Date: 2013-07-15 11:32+0200\n"
+"PO-Revision-Date: 2013-08-23 09:29+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Uzbek (latin) <http://l10n.cihar.com/projects/phpmyadmin/4-0/"
-"uz@latin/>\n"
+"Language-Team: Uzbek (latin) "
+"<http://l10n.cihar.com/projects/phpmyadmin/4-0/uz@latin/>\n"
 "Language: uz@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 1.6-dev\n"
+"X-Generator: Weblate 1.7-dev\n"

 #: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:344
 #: libraries/DisplayResults.class.php:813
@ -10089,7 +10089,7 @@ msgstr "Ma`lumotlarni fayldan import va faylga eksport qilishga ruxsat beradi."
 #: libraries/server_privileges.lib.php:650
 #: libraries/server_privileges.lib.php:947 server_privileges.php:83
 msgid "Has no effect in this MySQL version."
-msgstr "MySQL-serverning ushbu versiyada bunday xususiyat mavjud emas!"
+msgstr "MySQL-serverning ushbu versiyada bunday xususiyat mavjud emas."

 #: libraries/server_privileges.lib.php:211
 #: libraries/server_privileges.lib.php:850 server_privileges.php:75
@ -12210,7 +12210,7 @@ msgid ""
 msgstr ""
 "InnoDB tomonidan amalga oshirilgan ketma-ket oldinga o‘tib ketgan o‘qishlar "
 "soni. Ushbu hol InnoDB jadvalni to‘laligicha ketma-ket ko‘rib chiqayotganda "
-"ro‘y beradi"
+"ro‘y beradi."

 #: server_status_variables.php:471
 msgid "The number of logical read requests InnoDB has done."
@ -12289,7 +12289,7 @@ msgid ""
 "wait for it to be flushed before continuing."
 msgstr ""
 "Jurnal buferining hajmi kichik bo‘lganligi sababli, uning tozalanishi "
-"kutayotgan yozuvlar soni"
+"kutayotgan yozuvlar soni."

 #: server_status_variables.php:524
 msgid "The number of log write requests."
@ -12492,7 +12492,7 @@ msgstr ""

 #: server_status_variables.php:654
 msgid "The amount of free memory for query cache."
-msgstr "So‘rovlar keshi uchun bo‘sh xotira hajmi"
+msgstr "So‘rovlar keshi uchun bo‘sh xotira hajmi."

 #: server_status_variables.php:657
 msgid "The number of cache hits."
@ -12514,7 +12514,7 @@ msgstr ""
 "Yangi so‘rovlarni keshlashga xotira bo‘shatish uchun keshdan o‘chirilgan "
 "so‘rovlar soni. Bu ma`lumot so‘rovlar keshi hajmini belgilashga yordam "
 "beradi. So‘rovlar keshi keshdan so‘rovlarni o‘chirishda \"LRU\" (Least "
-"Recently Used - eng oldingi ishlatilgan) strategiyasidan foydalanadi"
+"Recently Used - eng oldingi ishlatilgan) strategiyasidan foydalanadi."

 #: server_status_variables.php:670
 msgid ""
@ -12556,9 +12556,9 @@ msgid ""
 "(If this is not 0, you should carefully check the indexes of your tables.)"
 msgstr ""
 "Ikkilamchi jadvaldan qatorlarga murojaat etish uchun diapazon bo‘yicha "
-"qidiruv ishlatgan holda bajarilgan birlashma so‘rovlar soni. Agar "
+"qidiruv ishlatgan holda bajarilgan birlashma so‘rovlar soni. (Agar "
 "o‘zgaruvchi qiymati 0 bo‘lmasa, jadval indekslarini tekshirish tavsiya "
-"etiladi."
+"etiladi.)"

 #: server_status_variables.php:695
 msgid ""
@ -12566,8 +12566,8 @@ msgid ""
 "critical even if this is big.)"
 msgstr ""
 "Birinchi jadvalda diapazon bo‘yicha qidiruv ishlatgan holda bajarilgan "
-"birlashma so‘rovlar soni. Odatda, ushbu o‘zgaruvchining qiymati, hatto juda "
-"katta bo‘lsa ham, unchalik muhim emas."
+"birlashma so‘rovlar soni. (Odatda, ushbu o‘zgaruvchining qiymati, hatto juda "
+"katta bo‘lsa ham, unchalik muhim emas.)"

 #: server_status_variables.php:699
 msgid "The number of joins that did a full scan of the first table."
@ -12622,7 +12622,7 @@ msgstr "Diapazon yordamida bajarilgan sortirovka operatsiyalari soni."

 #: server_status_variables.php:729
 msgid "The number of sorted rows."
-msgstr "Sortirovka qilingan qatorlar soni"
+msgstr "Sortirovka qilingan qatorlar soni."

 #: server_status_variables.php:732
 msgid "The number of sorts that were done by scanning the table."
@ -13077,7 +13077,7 @@ msgstr "Unumdorlikni oshirish maqsadida \"mysqli\"dan foydalaning"

 #: setup/lib/index.lib.php:400
 msgid "You allow for connecting to the server without a password."
-msgstr "Serverga parolsiz ulanishga ruxsat berasizmi"
+msgstr "Serverga parolsiz ulanishga ruxsat berasizmi."

 #: setup/lib/index.lib.php:424
 #, fuzzy
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@ -816,6 +816,7 @@ div#tablestatistics table {
    margin-top: 0.5em;
    margin-bottom: 0.5em;
    margin-<?php echo $right; ?>: 0.5em;
+    min-width: 16em;
 }
 /* END table stats */

--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@ -1067,6 +1067,7 @@ div#tablestatistics table {
    margin-bottom: .5em;
    margin-<?php echo $right; ?>: 1.5em;
    margin-top: .5em;
+    min-width: 16em;
 }

 /* END table stats */
--- a/themes/pmahomme/info.inc.php
+++ b/themes/pmahomme/info.inc.php
@ -11,6 +11,11 @@
 * If you have problems or questions about this theme email
 * mikehomme@users.sourceforge.net
 */
+
+/**
+ * Icon set used by this theme: http://famfamfam.com/lab/icons/silk/
+ */
+
 $theme_name = 'pmahomme';
 $theme_full_version = '1.1';
 ?>