diff --git a/ChangeLog b/ChangeLog index 8579e7b6d8..feb11bd052 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/doc/require.rst b/doc/require.rst index e7c5350d9a..935dc117d9 100644 --- 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 `_ extension. +* Performance suggestion: install the ``ctype`` extension. + .. seealso:: :ref:`faq1_31`, :ref:`authentication_modes` Database diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js index 753ba39dcb..d24bfb9127 100644 --- 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++) { diff --git a/js/tbl_change.js b/js/tbl_change.js index a249063b2c..28f3b29575 100644 --- 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); diff --git a/js/tbl_gis_visualization.js b/js/tbl_gis_visualization.js index 79fac6565e..bd364cec23 100644 --- 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 diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index e31ac6f1b3..4f0d617642 100644 --- 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']) . '...'; diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index af5cb90be7..3e57bce0de 100644 --- 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 = '' . '' diff --git a/po/cy.po b/po/cy.po index 977fcb886a..258d539bef 100644 --- 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ř \n" "Language-Team: Welsh \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 diff --git a/po/en_GB.po b/po/en_GB.po index 93f5cd6a63..9a995734ee 100644 --- 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 \n" -"Language-Team: English (United Kingdom) \n" +"PO-Revision-Date: 2013-08-24 15:18+0200\n" +"Last-Translator: Patrick V \n" +"Language-Team: English (United Kingdom) " +"\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
by double-clicking directly on them." diff --git a/po/eu.po b/po/eu.po index 2dbe21824d..d6a721277c 100644 --- 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ř \n" "Language-Team: Basque \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 diff --git a/po/id.po b/po/id.po index 84a73d750d..bc5c894ca3 100644 --- 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 \n" "Language-Team: Indonesian " "\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 diff --git a/po/mn.po b/po/mn.po index 7c78a2c07c..a80c35e788 100644 --- 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ř \n" -"Language-Team: Mongolian \n" +"Language-Team: Mongolian \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 diff --git a/po/uz@latin.po b/po/uz@latin.po index 49f5103fbb..5b2e1aa7f9 100644 --- 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ř \n" -"Language-Team: Uzbek (latin) \n" +"Language-Team: Uzbek (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 diff --git a/po/zh_CN.po b/po/zh_CN.po index 7184c487c4..c11a95d96c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.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-05-14 06:43+0200\n" -"Last-Translator: Randall Fan \n" -"Language-Team: Simplified Chinese \n" +"PO-Revision-Date: 2013-08-25 12:52+0200\n" +"Last-Translator: shanyan baishui \n" +"Language-Team: Simplified Chinese " +"\n" "Language: zh_CN\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 @@ -35,9 +35,7 @@ msgid "" "The target browser window could not be updated. Maybe you have closed the " "parent window, or your browser's security settings are configured to block " "cross-window updates." -msgstr "" -"无法更新目标浏览窗口。可能你已经关闭了父窗口或您浏览器的安全设置阻止了跨窗口" -"更新。" +msgstr "无法更新目标浏览窗口。您可能关闭了父窗口或您的浏览器安全设置阻止了跨窗口更新。" #: browse_foreigners.php:182 libraries/Menu.class.php:280 #: libraries/Menu.class.php:365 libraries/Util.class.php:3245 @@ -97,23 +95,23 @@ msgstr "说明" #: browse_foreigners.php:284 browse_foreigners.php:296 #: browse_foreigners.php:312 browse_foreigners.php:324 msgid "Use this value" -msgstr "使用此值" +msgstr "使用该值" #: changelog.php:36 license.php:28 #, php-format msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." -msgstr "该系统不支持 %s 文件，请访问 www.phpmyadmin.net 查询更多信息。" +msgstr "该系统上没有文件 %s，请访问 www.phpmyadmin.net 获取更多信息。" #: db_create.php:74 #, php-format msgid "Database %1$s has been created." -msgstr "创建数据库 %1$s 成功。" +msgstr "已创建数据库 %1$s。" #: db_datadict.php:51 libraries/operations.lib.php:36 msgid "Database comment: " -msgstr "数据库注释: " +msgstr "数据库注释： " #: db_datadict.php:157 libraries/operations.lib.php:808 #: libraries/schema/Pdf_Relation_Schema.class.php:1339 @@ -268,7 +266,7 @@ msgstr "是" #: db_export.php:29 msgid "View dump (schema) of database" -msgstr "查看数据库的转储(大纲)" +msgstr "查看数据库的转储（大纲）" #: db_export.php:33 db_printview.php:92 db_tracking.php:49 export.php:558 #: libraries/DBQbe.class.php:268 @@ -302,7 +300,7 @@ msgstr "已将数据库 %1$s 复制为 %2$s" msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." -msgstr "phpMyAdmin 高级功能尚未激活。要查出原因，请点击%s此处%s。" +msgstr "phpMyAdmin 高级功能尚未激活。请点击%s这里%s查看原因。" #: db_printview.php:99 db_tracking.php:79 db_tracking.php:204 #: libraries/Menu.class.php:207 libraries/config/messages.inc.php:512 @@ -370,7 +368,7 @@ msgstr "您最少要选择显示一列" #: db_qbe.php:60 #, php-format msgid "Switch to %svisual builder%s" -msgstr "切换到 %s可视化查询生成器%s" +msgstr "切换到%s可视化查询生成器%s" #: db_search.php:30 libraries/plugins/auth/AuthenticationConfig.class.php:81 #: libraries/plugins/auth/AuthenticationConfig.class.php:96 @@ -378,7 +376,7 @@ msgstr "切换到 %s可视化查询生成器%s" #: libraries/plugins/auth/AuthenticationHttp.class.php:65 #: libraries/plugins/auth/AuthenticationSignon.class.php:253 msgid "Access denied" -msgstr "拒绝访问" +msgstr "访问被拒绝" #: db_structure.php:86 msgid "No tables found in database" @@ -439,7 +437,7 @@ msgstr "显示" #: db_tracking.php:101 js/messages.php:34 msgid "Delete tracking data for this table" -msgstr "删除追踪数据" +msgstr "删除该表的追踪数据" #: db_tracking.php:109 libraries/Index.class.php:625 #: libraries/Util.class.php:3467 libraries/Util.class.php:3468 @@ -483,15 +481,15 @@ msgstr "数据库日志" #: export.php:152 msgid "Bad type!" -msgstr "非法类型！" +msgstr "类型无效！" #: export.php:203 msgid "Selected export type has to be saved in file!" -msgstr "选择导出文件的类型！" +msgstr "选择的导出类型必须保存为文件！" #: export.php:232 msgid "Bad parameters!" -msgstr "非法参数！" +msgstr "参数无效！" #: export.php:336 export.php:367 export.php:929 #, php-format @@ -512,7 +510,7 @@ msgstr "网站服务器没有保存文件 %s 的权限。" #: export.php:935 #, php-format msgid "Dump has been saved to file %s." -msgstr "转存已经保存到文件 %s 中。" +msgstr "已保存转储到文件 %s 中。" #: file_echo.php:22 msgid "Invalid export type" @@ -521,13 +519,12 @@ msgstr "导出类型无效" #: gis_data_editor.php:112 #, php-format msgid "Value for the column \"%s\"" -msgstr "字段 %s 的值" +msgstr "字段“%s”的值" #: gis_data_editor.php:140 tbl_gis_visualization.php:163 msgid "Use OpenStreetMaps as Base Layer" msgstr "以 OpenStreetMaps 为背景" -# what's the f**k word of "SRID"? #: gis_data_editor.php:161 msgid "SRID" msgstr "SRID" @@ -602,14 +599,14 @@ msgstr "输出" msgid "" "Choose \"GeomFromText\" from the \"Function\" column and paste the string " "below into the \"Value\" field" -msgstr "从 \"函数\" 列中选择 \"GeomFromText\" 并粘贴内容到下列 \"值\" 列中" +msgstr "从“函数”列中选择“GeomFromText”并粘贴下列内容到“值”中" #: import.php:107 #, php-format msgid "" "You probably tried to upload a file that is too large. Please refer to " "%sdocumentation%s for a workaround for this limit." -msgstr "您可能正在上传很大的文件，请参考%s文档%s来寻找解决方法。" +msgstr "您想要上传的文件可能太大了，请参考%s文档%s来寻找解决方法。" #: import.php:268 import.php:534 msgid "Showing bookmark" @@ -617,7 +614,7 @@ msgstr "显示书签" #: import.php:283 import.php:530 msgid "The bookmark has been deleted." -msgstr "书签已删除。" +msgstr "已删除书签。" #: import.php:378 import.php:439 libraries/File.class.php:432 #: libraries/File.class.php:525 @@ -630,8 +627,7 @@ msgstr "无法读取文件" msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." -msgstr "" -"您正在载入不支持的压缩格式 (%s)。配置文件中没有对应这种格式的配置说明。" +msgstr "您尝试导入的文件是不支持的压缩格式（%s）。可能服务器不支持或您在设置中禁止了这种格式。" #: import.php:445 msgid "" @@ -639,8 +635,7 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[doc@faq1-16]FAQ 1.16[/doc]." msgstr "" -"没有接收到要导入的数据。可能是文件名没有提交，也可能是文件大小超出 PHP 限制。" -"参见 [doc@faq1-16]FAQ 1.16[/doc]。" +"没有接收到要导入的数据。可能是文件名没有提交，也可能是文件大小超出 PHP 限制。参见[doc@faq1-16]常见问题 1.16[/doc]。" #: import.php:465 msgid "" @@ -649,7 +644,7 @@ msgstr "没有字符集转换库，无法转换文件字符集" #: import.php:503 libraries/display_import.lib.php:29 msgid "Could not load import plugins, please check your installation!" -msgstr "无法加载导入插件，请检查你的安装！" +msgstr "无法加载导入插件，请检查您的安装！" #: import.php:537 sql.php:382 sql.php:1259 #, php-format @@ -665,7 +660,7 @@ msgstr "导入成功，执行了 %d 个查询。" msgid "" "Script timeout passed, if you want to finish import, please resubmit same " "file and import will resume." -msgstr "脚本超时，如果你要完成导入，请重新提交相同的文件，导入将会继续进行。" +msgstr "脚本超时，如果您要完成导入，请重新提交相同的文件，导入将会继续进行。" #: import.php:577 msgid "" @@ -698,7 +693,7 @@ msgstr "修改密码" #: index.php:159 msgid "Server connection collation" -msgstr "服务器连接校对" +msgstr "服务器连接排序规则" #: index.php:185 msgid "Appearance Settings" @@ -773,11 +768,11 @@ msgstr "文档" #: index.php:342 libraries/config/FormDisplay.tpl.php:146 msgid "Wiki" -msgstr "维基 (Wiki) (外链，英文)" +msgstr "维基" #: index.php:351 msgid "Official Homepage" -msgstr "官方主页 (外链，英文)" +msgstr "官方主页" #: index.php:358 msgid "Contribute" @@ -798,18 +793,15 @@ msgid "" "running with this default, is open to intrusion, and you really should fix " "this security hole by setting a password for user 'root'." msgstr "" -"您配置文件中的设置 (空密码的 root) 与 MySQL 默认管理员账户对应。您的 MySQL 服" -"务器使用默认值运行当然没有问题，不过这样的话，被入侵的可能性会很大，我们强烈" -"建议您应该立即给 'root' 用户设置一个密码来补上这个安全漏洞。" +"您配置文件中的设置（空密码的 root）是 MySQL 的默认管理员帐号。您的 MySQL " +"服务器正在使用这个默认设置运行，这样容易被入侵，我们强烈建议您立即给‘root’用户设置一个密码来修复这个安全漏洞。" #: index.php:406 msgid "" "You have enabled mbstring.func_overload in your PHP configuration. This " "option is incompatible with phpMyAdmin and might cause some data to be " "corrupted!" -msgstr "" -"PHP 配置中已启用了 mbstring.func_overload 。这个选项和 phpMyAdmin 不兼容，可" -"能会导致一些数据损坏！" +msgstr "您在 PHP 设置中启用了 mbstring.func_overload。该选项和 phpMyAdmin 不兼容并可能会导致一些数据损坏！" #: index.php:417 msgid "" @@ -817,8 +809,8 @@ msgid "" "multibyte charset. Without the mbstring extension phpMyAdmin is unable to " "split strings correctly and it may result in unexpected results." msgstr "" -"没有找到 PHP 扩展 mbstring，而您现在好像在使用多字节字符集。没有 mbstring 扩" -"展的 phpMyAdmin 不能正确分割字符串，可能产生意想不到的结果。" +"没有找到 PHP 扩展 mbstring，而您现在好像在使用多字节字符集。没有 mbstring 扩展的 phpMyAdmin " +"不能正确分割字符串并可能产生意料之外的结果。" #: index.php:428 msgid "" @@ -827,10 +819,9 @@ msgid "" "cookie validity configured in phpMyAdmin, because of this, your login will " "expire sooner than configured in phpMyAdmin." msgstr "" -"您的 PHP 配置参数 [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@_blank]session.gc_maxlifetime (外链，英文)[/a] 短于您" -"在 phpMyAdmin 中设置的 Cookies 有效期，因此您的登录会话有效期将会比您在 " -"phpMyAdmin 中设置的时间要更短。" +"您的 PHP 参数 [a@http://php.net/manual/zh/session.configuration.php#ini.session" +".gc-maxlifetime@_blank]session.gc_maxlifetime[/a] 短于您在 phpMyAdmin 中设置的 " +"Cookies 有效期，因此您的登录会话有效期将会比您在 phpMyAdmin 中设置的时间要更短。" #: index.php:440 msgid "" @@ -858,45 +849,42 @@ msgstr "" msgid "" "The phpMyAdmin configuration storage is not completely configured, some " "extended features have been deactivated. To find out why click %shere%s." -msgstr "" -"phpMyAdmin 高级功能未全部设置，部分功能不可用。要查出原因请%s点这里%s。" +msgstr "phpMyAdmin 高级功能尚未完全设置，部分功能未激活。请点击%s这里%s查看原因。" #: index.php:505 #, php-format msgid "" "Your PHP MySQL library version %s differs from your MySQL server version %s. " "This may cause unpredictable behavior." -msgstr "" -"你的 PHP MySQL 库版本 %s 和你的 MySQL 服务器版本 %s 不同。这可能造成一些未知" -"的问题。" +msgstr "您的 PHP MySQL 库版本 %s 与您的 MySQL 服务器版本 %s 不同。这可能导致无法预料的问题。" #: index.php:530 #, php-format msgid "" "Server running with Suhosin. Please refer to %sdocumentation%s for possible " "issues." -msgstr "服务器上运行了 Suhosin。请先查看%s文档%s中是否有类似的情况。" +msgstr "服务器上运行了 Suhosin。请查看%s文档%s了解可能发生的问题。" #: js/messages.php:27 libraries/import.lib.php:118 sql.php:342 msgid "\"DROP DATABASE\" statements are disabled." -msgstr "已经禁用删除数据库 (“DROP DATABASE”) 语句。" +msgstr "已禁用“删除数据库”语句。" #: js/messages.php:30 #, php-format msgid "Do you really want to execute \"%s\"?" -msgstr "您真的要执行\"%s\"吗?" +msgstr "您真的要执行“%s”吗？" #: 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 msgid "You are about to DESTROY a complete table!" -msgstr "您将要删除一个完整的数据表！" +msgstr "您将要完全删除一个表！" #: js/messages.php:33 msgid "You are about to TRUNCATE a complete table!" -msgstr "您将要清空一个完整的数据表！" +msgstr "您将要完全清空一个表！" #: js/messages.php:35 msgid "Deleting tracking data" @@ -908,7 +896,7 @@ msgstr "正在删除主键" #: js/messages.php:37 msgid "This operation could take a long time. Proceed anyway?" -msgstr "该操作可能需要执行较长时间，确定执行？" +msgstr "该操作可能需要较长时间执行。是否继续？" #: js/messages.php:40 msgid "Missing value in the form!" @@ -963,7 +951,7 @@ msgstr "添加用户" #: js/messages.php:56 msgid "Reloading Privileges" -msgstr "重新载入权限" +msgstr "正在重新载入权限" #: js/messages.php:57 msgid "Removing Selected Users" @@ -1030,7 +1018,7 @@ msgstr "连接 / 进程" #: js/messages.php:79 msgid "Local monitor configuration incompatible" -msgstr "本地监控配置不兼容" +msgstr "本地监控设置不兼容" #: js/messages.php:80 msgid "" @@ -1072,7 +1060,7 @@ msgstr "平均负载" #: js/messages.php:91 msgid "Total memory" -msgstr "内存总数" +msgstr "内存总量" #: js/messages.php:92 msgid "Cached memory" @@ -1092,7 +1080,7 @@ msgstr "已用内存" #: js/messages.php:97 msgid "Total Swap" -msgstr "交换空间总数" +msgstr "交换空间总量" #: js/messages.php:98 msgid "Cached Swap" @@ -1214,27 +1202,27 @@ msgstr "暂停监控" #: js/messages.php:130 msgid "general_log and slow_query_log are enabled." -msgstr "general_log 和 slow_query_log 已启用。" +msgstr "已启用 general_log 和 slow_query_log。" #: js/messages.php:131 msgid "general_log is enabled." -msgstr "general_log 已启用。" +msgstr "已启用 general_log。" #: js/messages.php:132 msgid "slow_query_log is enabled." -msgstr "slow_query_log 已启用。" +msgstr "已启用 slow_query_log。" #: js/messages.php:133 msgid "slow_query_log and general_log are disabled." -msgstr "slow_query_log 和 general_log 已禁用。" +msgstr "未启用 slow_query_log 和 general_log。" #: js/messages.php:134 msgid "log_output is not set to TABLE." -msgstr "log_output 未设置到 TABLE 。" +msgstr "未设置 log_output 为 TABLE。" #: js/messages.php:135 msgid "log_output is set to TABLE." -msgstr "log_output 已设置到 TABLE 。" +msgstr "已设置 log_output 为 TABLE。" #: js/messages.php:136 #, php-format @@ -1243,19 +1231,19 @@ msgid "" "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, " "depending on your system." msgstr "" -"slow_query_log 已启用，但服务器仅记录查询时间超过 %d 秒的查询。请根据您的系统" -"适当设置 long_query_time 为 0-2 秒。" +"已启用 slow_query_log，但服务器仅记录查询时间超过 %d 秒的查询。请根据您的系统适当设置 long_query_time 为 0-2 " +"秒。" #: js/messages.php:137 #, php-format msgid "long_query_time is set to %d second(s)." -msgstr "long_query_time 已设为 %d 秒。" +msgstr "已设置 long_query_time 为 %d 秒。" #: js/messages.php:138 msgid "" "Following settings will be applied globally and reset to default on server " "restart:" -msgstr "下列设置将被应用到整个服务器直到服务器重新启动:" +msgstr "下列设置将被应用到整个服务器直到服务器重新启动：" #. l10n: %s is FILE or TABLE #: js/messages.php:140 @@ -1319,7 +1307,7 @@ msgstr "从慢查询日志" #: js/messages.php:158 msgid "From general log" -msgstr "从通用日志" +msgstr "从常规日志" #: js/messages.php:159 msgid "Analysing logs" @@ -1327,7 +1315,7 @@ msgstr "正在分析日志" #: js/messages.php:160 msgid "Analysing & loading logs. This may take a while." -msgstr "正在加载并分析日志。请稍候。" +msgstr "正在分析并加载日志。请稍候。" #: js/messages.php:161 msgid "Cancel request" @@ -1338,20 +1326,18 @@ msgid "" "This column shows the amount of identical queries that are grouped together. " "However only the SQL query itself has been used as a grouping criteria, so " "the other attributes of queries, such as start time, may differ." -msgstr "" -"这一列显示了相同的查询被组合在一起了。然而，有且只有SQL文本被修改过了,因此查" -"询其他属性例如启动时间可能不同。" +msgstr "该列显示了已分组的相同查询数量。然而只有 SQL 查询本身被作为分组依据，所以查询的其它属性，如开始时间可能不同。" #: js/messages.php:163 msgid "" "Since grouping of INSERTs queries has been selected, INSERT queries into the " "same table are also being grouped together, disregarding of the inserted " "data." -msgstr "因选择了分组 INSERT 查询，相同表的 INSERT 查询将被分为一组，忽略数据。" +msgstr "因选择了分组 INSERT 查询，对相同表的 INSERT 查询将忽略插入的数据而被分为一组。" #: js/messages.php:164 msgid "Log data loaded. Queries executed in this time span:" -msgstr "日志数据已加载。查询执行时间为：" +msgstr "已加载日志数据。该时间段执行的查询：" #: js/messages.php:166 msgid "Jump to Log table" @@ -1363,7 +1349,7 @@ msgstr "未找到数据" #: js/messages.php:168 msgid "Log analysed, but no data found in this time span." -msgstr "日志已分析，时间段内没有数据。" +msgstr "已分析日志，但在该时间段内没有找到数据。" #: js/messages.php:170 msgid "Analyzing…" @@ -1371,7 +1357,7 @@ msgstr "正在分析…" #: js/messages.php:171 msgid "Explain output" -msgstr "分析输出" +msgstr "解析输出" #: js/messages.php:173 js/messages.php:524 #: libraries/plugins/export/ExportHtmlword.class.php:484 @@ -1383,7 +1369,7 @@ msgstr "时间" #: js/messages.php:174 msgid "Total time:" -msgstr "总时间:" +msgstr "总时间：" #: js/messages.php:175 msgid "Profiling results" @@ -1409,28 +1395,28 @@ msgstr "数据" #. l10n: A collection of available filters #: js/messages.php:182 msgid "Log table filter options" -msgstr "日志表过滤选项" +msgstr "日志表筛选选项" #. l10n: Filter as in "Start Filtering" #: js/messages.php:184 msgid "Filter" -msgstr "快速搜索" +msgstr "筛选" #: js/messages.php:185 msgid "Filter queries by word/regexp:" -msgstr "根据内容/正则表达式搜索:" +msgstr "根据内容/正则表达式筛选：" #: js/messages.php:186 msgid "Group queries, ignoring variable data in WHERE clauses" -msgstr "忽略 WHERE 语句中的变量值对查询分组" +msgstr "忽略 WHERE 从句中的变量值对查询分组" #: js/messages.php:187 msgid "Sum of grouped rows:" -msgstr "分组后的行数:" +msgstr "分组后的行数：" #: js/messages.php:188 msgid "Total:" -msgstr "总数:" +msgstr "总数：" #: js/messages.php:190 msgid "Loading logs" @@ -1438,16 +1424,14 @@ msgstr "正在加载日志" #: js/messages.php:191 msgid "Monitor refresh failed" -msgstr "监控刷新失败" +msgstr "刷新监控失败" #: js/messages.php:192 msgid "" "While requesting new chart data the server returned an invalid response. " "This is most likely because your session expired. Reloading the page and " "reentering your credentials should help." -msgstr "" -"请求新图表数据时服务器返回了无效数据。这可能是因为会话过期。请尝试重新加载页" -"面。" +msgstr "请求新图表数据时服务器返回了无效数据。这很可能是因为您的会话已过期所造成的。请尝试重新载入页面并重新登录。" #: js/messages.php:193 msgid "Reload page" @@ -1455,16 +1439,16 @@ msgstr "重新载入页面" #: js/messages.php:195 msgid "Affected rows:" -msgstr "影响的行数:" +msgstr "影响的行数：" #: js/messages.php:197 msgid "Failed parsing config file. It doesn't seem to be valid JSON code." -msgstr "解析配置文件失败。它看上去不像有效的 JSON 代码。" +msgstr "解析配置文件失败。它似乎不是有效的 JSON 代码。" #: js/messages.php:198 msgid "" "Failed building chart grid with imported config. Resetting to default config…" -msgstr "导入配置失败。正在重设为默认设置…" +msgstr "使用导入的设置建立图表失败。正在重设为默认设置…" #: js/messages.php:199 libraries/Menu.class.php:305 #: libraries/Menu.class.php:388 libraries/Menu.class.php:499 @@ -1480,9 +1464,10 @@ msgstr "导入监控设置" #: js/messages.php:201 msgid "Please select the file you want to import" -msgstr "请选择要导入的文件" +msgstr "请选择您要导入的文件" #: js/messages.php:203 +#, fuzzy msgid "Analyse Query" msgstr "查询分析" @@ -1504,19 +1489,19 @@ msgstr "建议" #: js/messages.php:211 msgid "Rule details" -msgstr "规则详细" +msgstr "规则细节" #: js/messages.php:212 msgid "Justification" -msgstr "校正" +msgstr "现状" #: js/messages.php:213 msgid "Used variable / formula" -msgstr "已使用的 变量/公式" +msgstr "使用的变量/公式" #: js/messages.php:214 msgid "Test" -msgstr "测试" +msgstr "检验" #: js/messages.php:219 pmd_general.php:437 pmd_general.php:474 #: pmd_general.php:594 pmd_general.php:642 pmd_general.php:718 @@ -1551,7 +1536,7 @@ msgstr "错误信息：%s" #: js/messages.php:227 libraries/db_common.inc.php:58 #: libraries/db_table_exists.lib.php:28 server_databases.php:89 msgid "No databases selected." -msgstr "未选中数据库。" +msgstr "没有已选择的数据库。" #: js/messages.php:228 msgid "Dropping Column" @@ -1569,7 +1554,7 @@ msgstr "确定" #: js/messages.php:231 msgid "Click to dismiss this notification" -msgstr "点击解除这条通知" +msgstr "点击隐藏该提示" #: js/messages.php:234 msgid "Renaming Databases" @@ -1589,9 +1574,10 @@ msgstr "正在修改字符集" #: js/messages.php:238 msgid "Table must have at least one column" -msgstr "数据表至少要有一个字段" +msgstr "表至少要有一个字段" #: js/messages.php:243 +#, fuzzy msgid "Insert Table" msgstr "插入表格" @@ -1605,7 +1591,7 @@ msgstr "显示索引" #: js/messages.php:246 libraries/mult_submits.inc.php:329 msgid "Foreign key check:" -msgstr "检查外键：" +msgstr "外键约束：" #: js/messages.php:247 libraries/mult_submits.inc.php:333 msgid "(Enabled)" @@ -1654,7 +1640,7 @@ msgstr "新字段的值" #: js/messages.php:264 msgid "Enter each value in a separate field" -msgstr "请将每个值分别输入" +msgstr "每个输入框一个值" #: js/messages.php:265 #, php-format @@ -1769,6 +1755,7 @@ msgid "Add columns" msgstr "添加字段" #: js/messages.php:326 +#, fuzzy msgid "Select referenced key" msgstr "选择外键" @@ -1797,7 +1784,7 @@ msgstr "给字段添加选项 " #: js/messages.php:334 #, php-format msgid "%d object(s) created" -msgstr "创建了 %d 个对象" +msgstr "已创建 %d 个对象" #: js/messages.php:337 msgid "Press escape to cancel editing" @@ -1807,7 +1794,7 @@ msgstr "按 Esc 键取消编辑" msgid "" "You have edited some data and they have not been saved. Are you sure you " "want to leave this page before saving the data?" -msgstr "已有数据被修改但尚未保存。你真的要不保存修改就离开本页吗？" +msgstr "您已修改了一些数据但尚未保存。您真的要放弃保存并离开吗？" #: js/messages.php:339 msgid "Drag to reorder" @@ -1823,9 +1810,10 @@ msgstr "点击以标记/取消标记" #: js/messages.php:342 msgid "Double-click to copy column name" -msgstr "双击以复制字段名字" +msgstr "双击以复制字段名" #: js/messages.php:343 +#, fuzzy msgid "Click the drop-down arrow
to toggle column's visibility" msgstr "点击下箭头以设置显示的字段" @@ -1833,21 +1821,19 @@ msgstr "点击下箭头以设置显示的字段" msgid "" "This table does not contain a unique column. Features related to the grid " "edit, checkbox, Edit, Copy and Delete links may not work after saving." -msgstr "" -"该表没有唯一字段。单元格编辑、复选框、编辑、复制和删除链接相关功能可能无法正" -"常使用。" +msgstr "该表没有唯一字段。在保存后单元格编辑、多选、编辑、复制和删除等功能可能无法正常使用。" #: js/messages.php:350 msgid "You can also edit most values
by double-clicking directly on them." -msgstr "您可以直接通过双击来编辑绝大部分字段。" +msgstr "您可以直接双击大部分
单元格以修改其值。" #: js/messages.php:353 msgid "You can also edit most values
by clicking directly on them." -msgstr "您可以直接编辑绝大部分字段
仅仅通过点击就可以实现。" +msgstr "您可以直接点击大部分
单元格以修改其值。" #: js/messages.php:358 msgid "Go to link" -msgstr "转到此链接" +msgstr "打开链接" #: js/messages.php:359 msgid "Copy column name" @@ -1855,9 +1841,10 @@ msgstr "复制字段名" #: js/messages.php:360 msgid "Right-click the column name to copy it to your clipboard." -msgstr "在字段名处右键复制名字到粘贴板。" +msgstr "在字段名上右键以复制到剪贴板。" #: js/messages.php:361 +#, fuzzy msgid "Show data row(s)" msgstr "显示数据行" @@ -1879,27 +1866,27 @@ msgstr "更多" #: js/messages.php:372 msgid "Show Panel" -msgstr "显示面板" +msgstr "显示导航面板" #: js/messages.php:373 msgid "Hide Panel" -msgstr "隐藏面板" +msgstr "隐藏导航面板" #: js/messages.php:376 msgid "The requested page was not found in the history, it may have expired." -msgstr "无法在历史记录中找到请求页面,页面可能已经过期。" +msgstr "没有在历史记录中找到所请求的页面，页面可能已过期。" #: js/messages.php:379 setup/lib/index.lib.php:188 #, php-format msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." -msgstr "有新的 phpMyAdmin 可用，请考虑升级。最新的版本是 %s，于 %s 发布。" +msgstr "phpMyAdmin 有新版本了，请您考虑升级。最新的版本是 %s，于 %s 发布。" #. l10n: Latest available phpMyAdmin version #: js/messages.php:381 msgid ", latest stable version:" -msgstr "，最新稳定版本:" +msgstr "，最新稳定版本：" #: js/messages.php:382 msgid "up to date" @@ -2140,7 +2127,7 @@ msgstr "周" #. l10n: Month-year order for calendar, use either "calendar-month-year" or "calendar-year-month". #: js/messages.php:514 msgid "calendar-month-year" -msgstr "日历-月-年" +msgstr "calendar-year-month" #. l10n: Year suffix for calendar, "none" is empty. #: js/messages.php:516 @@ -2163,7 +2150,7 @@ msgstr "秒" #: libraries/Advisor.class.php:77 #, php-format msgid "PHP threw following error: %s" -msgstr "php给出下述错误：%s" +msgstr "PHP 抛出下列错误：%s" #: libraries/Advisor.class.php:104 #, php-format @@ -2183,7 +2170,7 @@ msgstr "规则‘%s’运行测试失败" #: libraries/Advisor.class.php:222 #, php-format msgid "Failed formatting string for rule '%s'." -msgstr "格式化字符串 '%s' 失败。" +msgstr "格式化规则‘%s’的字符串时出错。" #: libraries/Advisor.class.php:393 #, php-format @@ -2226,11 +2213,11 @@ msgstr "每天" #: libraries/Config.class.php:1111 #, php-format msgid "Existing configuration file (%s) is not readable." -msgstr "已存在的配置文件(%s)是不可读的。" +msgstr "现有的配置文件（%s）是不可读的。" #: libraries/Config.class.php:1141 msgid "Wrong permissions on configuration file, should not be world writable!" -msgstr "配置文件权限错误，无法写入！" +msgstr "配置文件权限错误，不应任何用户都能修改！" #: libraries/Config.class.php:1715 msgid "Font size" @@ -2263,6 +2250,7 @@ msgid "Criteria" msgstr "条件" #: libraries/DBQbe.class.php:576 +#, fuzzy msgid "Add/Delete criteria rows" msgstr "添加/删除标准行" @@ -2334,13 +2322,13 @@ msgstr "“%s”的搜索结果 %s：" #, php-format msgid "Total: %s match" msgid_plural "Total: %s matches" -msgstr[0] "总计： %s 个匹配" +msgstr[0] "总计：找到 %s 个" #: libraries/DbSearch.class.php:331 #, php-format msgid "%1$s match in %2$s" msgid_plural "%1$s matches in %2$s" -msgstr[0] "在 %2$s 中找到 %1$s 个匹配" +msgstr[0] "在 %2$s 中找到 %1$s 个" #: libraries/DbSearch.class.php:346 libraries/Menu.class.php:267 #: libraries/Util.class.php:3247 libraries/Util.class.php:3460 @@ -2351,7 +2339,7 @@ msgstr "浏览" #: libraries/DbSearch.class.php:353 #, php-format msgid "Delete the matches for the %s table?" -msgstr "删除 %s 表中所有匹配的记录？" +msgstr "删除在 %s 表中找到的所有记录吗？" #: libraries/DbSearch.class.php:357 libraries/DisplayResults.class.php:3390 #: libraries/DisplayResults.class.php:5028 @@ -2370,27 +2358,27 @@ msgstr "在数据库中搜索" #: libraries/DbSearch.class.php:386 msgid "Words or values to search for (wildcard: \"%\"):" -msgstr "要查找的内容 (通配符: \"%\"):" +msgstr "要搜索的内容（通配符：“%”）：" #: libraries/DbSearch.class.php:395 msgid "Find:" -msgstr "查找:" +msgstr "查找：" #: libraries/DbSearch.class.php:400 libraries/DbSearch.class.php:404 msgid "Words are separated by a space character (\" \")." -msgstr "每个单词用空格 (\" \") 分隔。" +msgstr "每个单词用空格（“ ”）分开。" #: libraries/DbSearch.class.php:419 msgid "Inside tables:" -msgstr "于下列表:" +msgstr "于下列表：" #: libraries/DbSearch.class.php:445 msgid "Inside column:" -msgstr "包含字段:" +msgstr "包含字段：" #: libraries/DisplayResults.class.php:702 msgid "Save edited data" -msgstr "保存已编辑的数据" +msgstr "保存已修改的数据" #: libraries/DisplayResults.class.php:708 msgid "Restore column order" @@ -2438,11 +2426,11 @@ msgstr "水平" #: libraries/DisplayResults.class.php:924 msgid "horizontal (rotated headers)" -msgstr "水平 (旋转表头)" +msgstr "水平（旋转表头）" #: libraries/DisplayResults.class.php:925 msgid "vertical" -msgstr "垂直" +msgstr "竖直" #: libraries/DisplayResults.class.php:937 #, php-format @@ -2451,7 +2439,7 @@ msgstr "每 %s 行重复表头" #: libraries/DisplayResults.class.php:1234 msgid "Sort by key" -msgstr "主键排序" +msgstr "按索引排序" #: libraries/DisplayResults.class.php:1582 libraries/TableSearch.class.php:754 #: libraries/import.lib.php:1195 libraries/import.lib.php:1221 @@ -2517,11 +2505,11 @@ msgstr "隐藏浏览器转换" #: libraries/DisplayResults.class.php:1646 msgid "Well Known Text" -msgstr "文本表达式 (WKT)" +msgstr "WKT 文本表达" #: libraries/DisplayResults.class.php:1647 msgid "Well Known Binary" -msgstr "二进制表达式 (WKB)" +msgstr "WKB 二进制表达" #: libraries/DisplayResults.class.php:3363 #: libraries/DisplayResults.class.php:3379 @@ -2535,30 +2523,31 @@ msgstr "杀死" #: libraries/DisplayResults.class.php:4481 libraries/structure.lib.php:771 msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]" -msgstr "可能接近。参见 [doc@faq3-11]FAQ 3.11[/doc]" +msgstr "近似值。参见[doc@faq3-11]常见问题 3.11[/doc]" #: libraries/DisplayResults.class.php:4877 +#, fuzzy msgid "in query" msgstr "查询中" #: libraries/DisplayResults.class.php:4914 libraries/structure.lib.php:653 -#, php-format +#, fuzzy, php-format msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." msgstr "该视图最少包含的行数，参见%s文档%s。" #: libraries/DisplayResults.class.php:4927 -#, fuzzy, php-format +#, php-format #| msgid "Showing rows" msgid "Showing rows %1s - %2s" -msgstr "显示行" +msgstr "正在显示第 %1s - %2s 行" #: libraries/DisplayResults.class.php:4939 -#, fuzzy, php-format +#, php-format #| msgid "total" msgid "%d total" -msgstr "总计" +msgstr "共 %d 行" #: libraries/DisplayResults.class.php:4951 sql.php:945 #, php-format @@ -2600,7 +2589,7 @@ msgstr "导出" #: libraries/DisplayResults.class.php:5164 msgid "Query results operations" -msgstr "查询结果选项" +msgstr "查询结果操作" #: libraries/DisplayResults.class.php:5188 libraries/Header.class.php:340 #: libraries/structure.lib.php:299 libraries/structure.lib.php:362 @@ -2610,7 +2599,7 @@ msgstr "打印预览" #: libraries/DisplayResults.class.php:5206 msgid "Print view (with full texts)" -msgstr "打印预览 (全文显示)" +msgstr "打印预览（全文显示）" #: libraries/DisplayResults.class.php:5277 tbl_chart.php:151 msgid "Display chart" @@ -2644,11 +2633,11 @@ msgstr "上传文件的大小超过 php.ini 文件中 upload_max_filesize 的限 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." -msgstr "上传文件的大小超过 HTML 表单中指定的 MAX_FILE_SIZE 值。" +msgstr "上传文件的大小超过 HTML 表单中 MAX_FILE_SIZE 的限制。" #: libraries/File.class.php:285 msgid "The uploaded file was only partially uploaded." -msgstr "仅上传了文件的一部分内容。" +msgstr "文件没有完全上传。" #: libraries/File.class.php:288 msgid "Missing a temporary folder." @@ -2656,11 +2645,11 @@ msgstr "找不到临时文件夹。" #: libraries/File.class.php:291 msgid "Failed to write file to disk." -msgstr "将文件写入磁盘失败。" +msgstr "向磁盘写入文件失败。" #: libraries/File.class.php:294 msgid "File upload stopped by extension." -msgstr "因扩展而停止文件上传。" +msgstr "扩展停止了文件上传。" #: libraries/File.class.php:297 msgid "Unknown error in file upload." @@ -2668,29 +2657,29 @@ msgstr "上传文件时发生未知错误。" #: libraries/File.class.php:475 msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]" -msgstr "移动上传文件时发生错误，参见 [doc@faq1-11]FAQ 1.11[/doc]" +msgstr "移动已上传的文件时发生错误，参见[doc@faq1-11]常见问题 1.11[/doc]" #: libraries/File.class.php:493 msgid "Error while moving uploaded file." -msgstr "移动上传的文件时发生错误。" +msgstr "移动已上传的文件时发生错误。" #: libraries/File.class.php:501 msgid "Cannot read (moved) upload file." -msgstr "无法读取移动后的上传文件。" +msgstr "无法读取（移动后的）上传文件。" #: libraries/Footer.class.php:133 libraries/Footer.class.php:141 #: libraries/Footer.class.php:144 msgid "Open new phpMyAdmin window" -msgstr "打开新 phpMyAdmin 窗口" +msgstr "打开新的 phpMyAdmin 窗口" #: libraries/Header.class.php:398 msgid "Click on the bar to scroll to top of page" -msgstr "点击控制条回滚到页面顶部" +msgstr "点击以滚动到页面顶部" #: libraries/Header.class.php:639 #: libraries/plugins/auth/AuthenticationCookie.class.php:172 msgid "Javascript must be enabled past this point" -msgstr "必须启用 javascript 才能登录" +msgstr "该处必须启用 Javascript" #: libraries/Index.class.php:531 msgid "No index defined!" @@ -2726,7 +2715,7 @@ msgstr "基数" #: libraries/tbl_columns_definition_form.inc.php:842 server_collations.php:38 #: server_collations.php:50 tbl_tracking.php:325 tbl_tracking.php:387 msgid "Collation" -msgstr "整理" +msgstr "排序规则" #: libraries/Index.class.php:570 libraries/rte/rte_events.lib.php:529 #: libraries/rte/rte_routines.lib.php:1068 tbl_tracking.php:329 @@ -2748,7 +2737,7 @@ msgstr "已删除索引 %s" msgid "" "The indexes %1$s and %2$s seem to be equal and one of them could possibly be " "removed." -msgstr "索引 %1$s 和 %2$s 可能是相同的，其中一个将可能被删除。" +msgstr "索引 %1$s 和 %2$s 似乎是相同的，可以删除其中一个。" #: libraries/Menu.class.php:207 libraries/structure.lib.php:677 #: libraries/structure.lib.php:707 libraries/structure.lib.php:1188 @@ -2900,7 +2889,7 @@ msgstr[0] "插入了 %1$d 行。" #: libraries/PDF.class.php:124 msgid "Error while creating PDF:" -msgstr "创建 PDF 时发生错误:" +msgstr "创建 PDF 时发生错误：" #: libraries/RecentTable.class.php:118 msgid "Could not save recent table" @@ -2941,7 +2930,7 @@ msgstr "延迟插入" #: libraries/ServerStatusData.class.php:190 msgid "Key cache" -msgstr "键缓存" +msgstr "索引缓存" #: libraries/ServerStatusData.class.php:191 msgid "Joins" @@ -2957,7 +2946,7 @@ msgstr "排序" #: libraries/navigation/Nodes/Node_Table_Container.class.php:26 #: libraries/plugins/export/ExportXml.class.php:116 msgid "Tables" -msgstr "数据表" +msgstr "表" #: libraries/ServerStatusData.class.php:195 msgid "Transaction coordinator" @@ -2969,7 +2958,7 @@ msgstr "文件" #: libraries/ServerStatusData.class.php:207 msgid "Flush (close) all tables" -msgstr "强制更新 (关闭) 所有表" +msgstr "刷新（关闭）所有表" #: libraries/ServerStatusData.class.php:209 msgid "Show open tables" @@ -2981,7 +2970,7 @@ msgstr "显示从服务器" #: libraries/ServerStatusData.class.php:218 server_replication.php:170 msgid "Show master status" -msgstr "查看主服务器状态" +msgstr "显示主服务器状态" #: libraries/ServerStatusData.class.php:221 msgid "Show slave status" @@ -2989,7 +2978,7 @@ msgstr "显示从服务器状态" #: libraries/ServerStatusData.class.php:226 msgid "Flush query cache" -msgstr "强制更新查询缓存" +msgstr "刷新查询缓存" #: libraries/ServerStatusData.class.php:241 #: libraries/engines/innodb.lib.php:148 @@ -3015,49 +3004,49 @@ msgstr "建议" #: libraries/StorageEngine.class.php:216 msgid "" "There is no detailed status information available for this storage engine." -msgstr "没有该存储引擎的详细信息。" +msgstr "没有该存储引擎的详细状态信息。" #: libraries/StorageEngine.class.php:352 libraries/structure.lib.php:200 #, php-format msgid "%s is the default storage engine on this MySQL server." -msgstr "%s 是此 MySQL 服务器的默认存储引擎。" +msgstr "%s 是该 MySQL 服务器的默认存储引擎。" #: libraries/StorageEngine.class.php:355 #, php-format msgid "%s is available on this MySQL server." -msgstr "%s 在此 MySQL 服务器上可用。" +msgstr "%s 在该 MySQL 服务器上可用。" #: libraries/StorageEngine.class.php:358 #, php-format msgid "%s has been disabled for this MySQL server." -msgstr "%s 在此 MySQL 服务器上被禁止了。" +msgstr "%s 在该 MySQL 服务器上被禁止了。" #: libraries/StorageEngine.class.php:362 #, php-format msgid "This MySQL server does not support the %s storage engine." -msgstr "此 MySQL 服务器不支持 %s 存储引擎。" +msgstr "该 MySQL 服务器不支持 %s 存储引擎。" #: libraries/Table.class.php:395 msgid "unknown table status: " -msgstr "未知表状态: " +msgstr "未知表状态： " #: libraries/Table.class.php:796 #, php-format msgid "Source database `%s` was not found!" -msgstr "源数据库 `%s` 未找到!" +msgstr "未找到源数据库 `%s`！" #: libraries/Table.class.php:804 #, php-format msgid "Target database `%s` was not found!" -msgstr "未找到目标数据库 %s ！" +msgstr "未找到目标数据库 `%s`！" #: libraries/Table.class.php:1232 msgid "Invalid database" -msgstr "无效的数据库" +msgstr "数据库无效" #: libraries/Table.class.php:1246 tbl_get_field.php:44 msgid "Invalid table name" -msgstr "无效的数据表名" +msgstr "表名无效" #: libraries/Table.class.php:1278 #, php-format @@ -3067,7 +3056,7 @@ msgstr "将表 %1$s 改名为 %2$s 时发生错误" #: libraries/Table.class.php:1297 #, php-format msgid "Table %1$s has been renamed to %2$s." -msgstr "已将数据表 %1$s 改名为 %2$s。" +msgstr "已将表 %1$s 改名为 %2$s。" #: libraries/Table.class.php:1441 msgid "Could not save table UI preferences" @@ -3078,8 +3067,7 @@ msgstr "无法保存表界面设置" msgid "" "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" "['MaxTableUiprefs'] %s)" -msgstr "" -"清除表用户界面设置失败（查看$cfg['Servers'][$i]['MaxTableUiprefs'] %s）" +msgstr "清除表界面设置失败（参见 $cfg['Servers'][$i]['MaxTableUiprefs'] %s）" #: libraries/Table.class.php:1603 #, php-format @@ -6080,7 +6068,7 @@ msgstr "可能的深度递归攻击" msgid "" "The server is not responding (or the local server's socket is not correctly " "configured)." -msgstr "服务器无响应(或者本地 MySQL 服务器的套接字没有正确配置)。" +msgstr "服务器没有响应（或本地服务器的套接字没有正确设置）。" #: libraries/database_interface.lib.php:2079 msgid "The server is not responding." @@ -6088,7 +6076,7 @@ msgstr "服务器没有响应。" #: libraries/database_interface.lib.php:2084 msgid "Please check privileges of directory containing database." -msgstr "请检查数据库目录的权限。" +msgstr "请检查数据库文件夹的权限。" #: libraries/database_interface.lib.php:2094 msgid "Details…" @@ -6211,7 +6199,7 @@ msgstr "转储部分记录" #: libraries/display_export.lib.php:165 msgid "Number of rows:" -msgstr "记录数：" +msgstr "行数：" #: libraries/display_export.lib.php:177 msgid "Row to begin at:" diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php index 3906a9c2fd..f2c3df61c6 100644 --- 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-: 0.5em; + min-width: 16em; } /* END table stats */ diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index 4860c060ff..42752b5293 100644 --- 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-: 1.5em; margin-top: .5em; + min-width: 16em; } /* END table stats */ diff --git a/themes/pmahomme/info.inc.php b/themes/pmahomme/info.inc.php index d45f8ee470..0c32532d17 100644 --- 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'; ?>