The branch, master has been updated
via aa98d772e6f380f9d3b1ee9d9a6104c58192d1bc (commit)
via 761aaf8bf20779c1ac5942a7b62b2315d8f5218d (commit)
via f41c6f887ad88f42456392712ec83e5b0a0b7343 (commit)
via 3e41e6976271beb2284de308c63125eda311847e (commit)
from 89550974db0ff14656b6c52da4c23c63f0763e29 (commit)
- Log -----------------------------------------------------------------
commit aa98d772e6f380f9d3b1ee9d9a6104c58192d1bc
Author: Isaac Bennetch <ibennetch(a)users.sourceforge.net>
Date: Wed Jun 9 16:40:29 2010 +0200
Documentation: FAQ 7.2 cleanup
Some cleanups for FAQ 7.2
commit 761aaf8bf20779c1ac5942a7b62b2315d8f5218d
Author: Isaac Bennetch <ibennetch(a)users.sourceforge.net>
Date: Wed Jun 9 16:38:09 2010 +0200
FAQ 7.2 translation additions
This adds a section about documentation translation.
The text was taken from the PMA website.
commit f41c6f887ad88f42456392712ec83e5b0a0b7343
Author: Isaac Bennetch <ibennetch(a)users.sourceforge.net>
Date: Wed Jun 9 16:37:01 2010 +0200
FAQ 7.1 forum link
Tiny improvement; link directly to the forum instead of the main
sourceforge page.
commit 3e41e6976271beb2284de308c63125eda311847e
Author: Isaac Bennetch <ibennetch(a)users.sourceforge.net>
Date: Wed Jun 9 16:35:54 2010 +0200
Documentation cleanup
I found a few places that needed cleanup plus the Synchronization FAQ
was using literal utf charachters for ' ` " and so on -- those are
replaces with the appropriate escaped character entity or <code> blocks.
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 55 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index d1d589d..374366c 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4344,21 +4344,22 @@ chmod o+rwx tmp
under the Bugs section.<br /><br />
But please first discuss your bug with other users:<br />
- <a href="http://sf.net/projects/phpmyadmin/">
- http://sf.net/projects/phpmyadmin/</a> (and choose Forums)</p>
+ <a href="https://sourceforge.net/projects/phpmyadmin/forums">
+ https://sourceforge.net/projects/phpmyadmin/forums</a>.
+</p>
<h4 id="faq7_2">
<a href="#faq7_2">7.2 I want to translate the messages to a new language or upgrade an
existing language, where do I start?</a></h4>
-<p> Always use latest Git version of po file to translate. You can optionally
+<p> Always use latest Git version of the po file to translate. You can optionally
translate online at our <a href="http://l10n.cihar.com/">translation
- server</a> where you can also get latest po files and merge them
- with your translations. For creating new translation simply use
+ server</a> where you can also get the latest po files and merge them
+ with your translations. For creating a new translation simply use
<code>po/phpmyadmin.pot</code> and generate
<code>po/LANG_CODE.po</code> for your language (you can use
<code>msginit -i po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code>
- to do this) or ask on mailing list to add the translation to the web
+ to do this) or ask on the mailing list to add the translation to the web
interface. More details are available on <a href="http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_translators">our wiki</a>.
</p>
<p>
@@ -4366,18 +4367,30 @@ chmod o+rwx tmp
the translations, since we define the right character set in the file.
With HTML entities, the text on JavaScript messages would not
display correctly.
- However there are some entities that need to be there, for quotes
- ,non-breakable spaces, ampersands, less than, greater than.
+ However there are some entities that need to be there: quotes,
+ non-breakable spaces, ampersands, less than, greater than.
</p>
<p>
You can then put your translations, as a zip file to avoid losing special
- characters, on the sourceforge.net translation tracker.
+ characters, on the sourceforge.net <a href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">translation tracker.</a>
</p>
<p>
- It would be a good idea to subscribe to the phpmyadmin-translators mailing
+ It would be a good idea to subscribe to the <a href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-translators">phpmyadmin-translators</a> mailing
list, because this is where we ask for translations of new messages.
</p>
+<p>
+ Documentation is being translated using po4a and gettext (see
+ <a href="http://www.phpmyadmin.net/home_page/docs.php">documentation</a>
+ for existing translations). To start, checkout
+ <a href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/localized…"<code>localized_docs/po</code></a>
+ from Git, or just go to the <a href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>
+ and translate it online. If your language is missing, just contact
+ <a href="mailto:michal@cihar.com">Michal Čihař</a>; he will add it. If
+ you prefer to directly translate the po files, please put updated ones into our
+ <a href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">translation tracker</a>.
+</p>
+
<h4 id="faq7_3">
<a href="#faq7_3">7.3 I would like to help out with the development of
phpMyAdmin. How should I proceed?</a></h4>
@@ -4417,7 +4430,7 @@ chmod o+rwx tmp
<a href="#faq8_2">8.2 How can I protect phpMyAdmin against brute force attacks?</a></h4>
<p> If you use Apache web server, phpMyAdmin exports information about
- authentication to Apache environment and it can be used in Apache logs.
+ authentication to the Apache environment and it can be used in Apache logs.
Currently there are two variables available:
</p>
<dl>
@@ -4448,14 +4461,14 @@ LogFormat "%h %l %u %t \"%r\" %>s %b \
<a href="#faq9_1">9.1 How can I synchronize two databases/tables in phpMyAdmin?</a></h4>
<p> You can now synchronize databases/tables in phpMyAdmin using the Synchronize feature.
-It allows you to connect to local as well as remote servers.This requires you to enter
+It allows you to connect to local as well as remote servers. This requires you to enter
server host name, username, password, port and the name of the database. Therefore you can
now synchronize your databases placed on the same server or some remote server.
</p>
<p>
This feature is helpful for developers who need to replicate their
-databases’ structure as well as data. Moreover, this feature not only
+database’s structure as well as data. Moreover, this feature not only
helps replication but also facilitates the user to keep his/her database
in sync with another database. Other than the full database, certain
tables of the databases can also be synchronized.
@@ -4476,29 +4489,29 @@ representation.
</p>
<p>
-On the left, are listed the source database table names. Some of the
-names have a ‘+’ plus sign preceding them. This shows that these tables
+On the left, are listed the source database table names. Some of the
+names have a <code>+</code> plus sign preceding them. This shows that these tables
are only present in source database and they need to be added to the
target database in order to synchronize the target database. The tables
-whose names are not preceded by a ‘+’ sign are already present in the
+whose names are not preceded by a <code>+</code> sign are already present in the
target database.
</p>
<p>
On the right, are listed the target database table names. There are few
-table names that have “(not present)” appended after their names. This
+table names that have <code>(not present)</code> appended after their names. This
means that these tables are to be created in target database in order to
-synchronize target database with source database. Some tables’ names
-have a ‘-’ minus sign preceding them. This shows that these tables are
+synchronize target database with source database. Some table names
+have a <code>-</code> minus sign preceding them. This shows that these tables are
only present in target database and they will remain unchanged in the
target database. The column in the middle shows the difference between
the source and target corresponding tables.
</p>
<p>
-The difference is depicted by the red and green buttons with S and D
+The difference is depicted by the red and green buttons with <tt>S</tt> and <tt>D</tt>
letters, indicating that either Structure or Data are not up to date. By
-clicking on them, they will turn grey, what means that they will be synchronised.
+clicking on them, they will turn grey, what means that they will be synchronized.
</p>
<!-- DEVELOPERS -->
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 20bd57a98194f43cdf0f25791cec57923b9a7a04 (commit)
via 1ee61a046be55a930d7ed99b35c327cf257df1c9 (commit)
via 71776c3c7e18ef8363d830b852b67d2765c54bff (commit)
via a1ff22fcd59230ef77c907690a184de0aae5a754 (commit)
via 83e3fb131bf2ef569478f903a6026c51f05cbb55 (commit)
via 67064e3962bdf19b061f65623a3c0be1f1a20e01 (commit)
via 895811f5f297d0e73b893b537937947472befd91 (commit)
via 93ba1d91f0c5a5c3cc485b79389428c5b8fb0298 (commit)
via 01b3d2d4a9057534e52f4ad6cb2e37736641c264 (commit)
via 4b22b6233cd38618eda2581db8d70e62c39c2dc8 (commit)
via 60f5d7cfbdd1fc5b950bf917c9139fc46766f97a (commit)
via 1fd19e56f2601e7f445ec94431e4a69d029daecc (commit)
via 4526a8d904937e3ef1eb1b5b5b7033dc4c6ea77d (commit)
via 400389f9e02229c42d5b8a799ba13d1a913ea9f0 (commit)
via 8e83fe03110471680dd05ee06ff935d9875c2ae1 (commit)
via 6fd1a02af46de6dc4e2dd0d2d0916c90d93dc82f (commit)
via 40c76dbf7691a0c7ba818962cf78cfd9702d6db6 (commit)
via 65ca97f095d872ceedb2a51884f1b9fbd35dab9f (commit)
via e05c50b7961c4dce7669a944aa0c5e994ad0c004 (commit)
via 7340658b3dbc3373600040073332cf88b11d10d0 (commit)
from e747c404a3ce5507f4b2f6b1b5605a300faa936c (commit)
- Log -----------------------------------------------------------------
commit 20bd57a98194f43cdf0f25791cec57923b9a7a04
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:38:00 2010 +0200
Translation update done using Pootle.
commit 1ee61a046be55a930d7ed99b35c327cf257df1c9
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:37:11 2010 +0200
Translation update done using Pootle.
commit 71776c3c7e18ef8363d830b852b67d2765c54bff
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:35:50 2010 +0200
Translation update done using Pootle.
commit a1ff22fcd59230ef77c907690a184de0aae5a754
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:34:37 2010 +0200
Translation update done using Pootle.
commit 83e3fb131bf2ef569478f903a6026c51f05cbb55
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:32:58 2010 +0200
Translation update done using Pootle.
commit 67064e3962bdf19b061f65623a3c0be1f1a20e01
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:32:48 2010 +0200
Translation update done using Pootle.
commit 895811f5f297d0e73b893b537937947472befd91
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:32:16 2010 +0200
Translation update done using Pootle.
commit 93ba1d91f0c5a5c3cc485b79389428c5b8fb0298
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:32:05 2010 +0200
Translation update done using Pootle.
commit 01b3d2d4a9057534e52f4ad6cb2e37736641c264
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:27:44 2010 +0200
Translation update done using Pootle.
commit 4b22b6233cd38618eda2581db8d70e62c39c2dc8
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:27:18 2010 +0200
Translation update done using Pootle.
commit 60f5d7cfbdd1fc5b950bf917c9139fc46766f97a
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:26:44 2010 +0200
Translation update done using Pootle.
commit 1fd19e56f2601e7f445ec94431e4a69d029daecc
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:26:35 2010 +0200
Translation update done using Pootle.
commit 4526a8d904937e3ef1eb1b5b5b7033dc4c6ea77d
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:22:10 2010 +0200
Translation update done using Pootle.
commit 400389f9e02229c42d5b8a799ba13d1a913ea9f0
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:21:05 2010 +0200
Translation update done using Pootle.
commit 8e83fe03110471680dd05ee06ff935d9875c2ae1
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:20:04 2010 +0200
Translation update done using Pootle.
commit 6fd1a02af46de6dc4e2dd0d2d0916c90d93dc82f
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:19:27 2010 +0200
Translation update done using Pootle.
commit 40c76dbf7691a0c7ba818962cf78cfd9702d6db6
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:19:03 2010 +0200
Translation update done using Pootle.
commit 65ca97f095d872ceedb2a51884f1b9fbd35dab9f
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:17:47 2010 +0200
Translation update done using Pootle.
commit e05c50b7961c4dce7669a944aa0c5e994ad0c004
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:16:38 2010 +0200
Translation update done using Pootle.
commit 7340658b3dbc3373600040073332cf88b11d10d0
Author: stanprog <stanprog(a)stanprog.com>
Date: Wed Jun 9 10:15:38 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/bg.po | 333 +++++---------------------------------------------------------
1 files changed, 26 insertions(+), 307 deletions(-)
diff --git a/po/bg.po b/po/bg.po
index e9332fd..2795a3b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -4,14 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-06-08 12:32-0400\n"
-"PO-Revision-Date: 2010-03-12 09:12+0100\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2010-06-09 10:38+0200\n"
+"Last-Translator: <stanprog(a)stanprog.com>\n"
"Language-Team: bulgarian <bg(a)li.org>\n"
+"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
#: browse_foreigners.php:38 browse_foreigners.php:59
#: libraries/display_tbl.lib.php:417 server_privileges.php:1514
@@ -1980,7 +1981,7 @@ msgstr "Смяна на паролата"
#: libraries/display_change_password.lib.php:35
#: libraries/replication_gui.lib.php:345 server_privileges.php:807
msgid "No Password"
-msgstr "Няма парола"
+msgstr "Без парола"
#: libraries/display_change_password.lib.php:41
#: libraries/replication_gui.lib.php:59 libraries/replication_gui.lib.php:60
@@ -1999,7 +2000,7 @@ msgstr "Отново"
#: libraries/display_change_password.lib.php:52
msgid "Password Hashing"
-msgstr ""
+msgstr "Хеширане на паролата"
#: libraries/display_change_password.lib.php:66
#, fuzzy
@@ -2032,10 +2033,9 @@ msgid "No Privileges"
msgstr "Няма привилегии"
#: libraries/display_create_table.lib.php:41
-#, fuzzy
#| msgid "Table must have at least one field."
msgid "Table must have at least one column."
-msgstr "Таблицата трябва да има поне едно поле."
+msgstr "Таблицата трябва да има поне една колона."
#: libraries/display_create_table.lib.php:48
#, php-format
@@ -2043,10 +2043,9 @@ msgid "Create table on database %s"
msgstr "Създаване на нова таблица в БД %s"
#: libraries/display_create_table.lib.php:57
-#, fuzzy
#| msgid "Number of fields"
msgid "Number of columns"
-msgstr "Брой полета"
+msgstr "Брой колони"
#: libraries/display_export.lib.php:42
msgid "Could not load export plugins, please check your installation!"
@@ -2055,14 +2054,14 @@ msgstr ""
"инсталацията!"
#: libraries/display_export.lib.php:107
-#, fuzzy, php-format
+#, php-format
#| msgid "Dump %s row(s) starting at record # %s"
msgid "Dump %s row(s) starting at row # %s"
-msgstr "Дъмп-ни %s реда като започнеш от %s."
+msgstr "Дъмп-ни %s ред(а) като започнеш от ред # %s."
#: libraries/display_export.lib.php:115
msgid "Dump all rows"
-msgstr ""
+msgstr "Дъмп-ни всички редове"
#: libraries/display_export.lib.php:125 setup/lib/messages.inc.php:82
msgid "Save as file"
@@ -2329,15 +2328,15 @@ msgstr "Релационна схема"
#: libraries/display_tbl.lib.php:595
msgid "Show binary contents"
-msgstr ""
+msgstr "Показване на двоичните данни"
#: libraries/display_tbl.lib.php:597
msgid "Show BLOB contents"
-msgstr ""
+msgstr "Показване на BLOB-данните"
#: libraries/display_tbl.lib.php:599
msgid "Show binary contents as HEX"
-msgstr ""
+msgstr "Показване на двоичните данни в шестнадесетичен вид"
#: libraries/display_tbl.lib.php:607 pmd_general.php:141 tbl_change.php:314
#: tbl_change.php:320
@@ -2921,7 +2920,7 @@ msgstr "Използване на INSERT IGNORE"
#: libraries/export/sql.php:118
msgid "Use hexadecimal for BLOB"
-msgstr ""
+msgstr "Използване на шестнадесетична стойност за BLOB"
#: libraries/export/sql.php:120
msgid "Export time in UTC"
@@ -3152,7 +3151,7 @@ msgstr ""
#: libraries/import/sql.php:42
msgid "Do not use AUTO_INCREMENT for zero values"
-msgstr ""
+msgstr "Да не се използва AUTO_INCREMENT за нулеви стойности"
#: libraries/import/xml.php:74 libraries/import/xml.php:130
msgid ""
@@ -4068,7 +4067,7 @@ msgstr ""
#: main.php:159
msgid "Custom color"
-msgstr ""
+msgstr "Потребителски зададен цвят"
#: main.php:163 pdf_pages.php:363 setup/lib/FormDisplay.tpl.php:216
#: tbl_change.php:1175
@@ -7598,7 +7597,7 @@ msgstr ""
#: sql.php:513
msgid "Showing as PHP code"
-msgstr ""
+msgstr "Показване като PHP-код"
#: sql.php:516 tbl_replace.php:360
msgid "Showing SQL query"
@@ -8109,12 +8108,11 @@ msgstr ""
#: tbl_tracking.php:561
msgid "Show versions"
-msgstr ""
+msgstr "Показване на версиите"
#: tbl_tracking.php:593
-#, fuzzy
msgid "Version"
-msgstr "Персийски"
+msgstr "Версия"
#: tbl_tracking.php:640
#, php-format
@@ -8158,10 +8156,12 @@ msgid ""
"No themes support; please check your configuration and/or your themes in "
"directory %s."
msgstr ""
+"Няма поддръжка на теми. Моля, проверете конфигурацията и/или темите, в папка "
+"%s."
#: themes.php:42
msgid "Get more themes!"
-msgstr ""
+msgstr "Вземете си нови теми!"
#: transformation_overview.php:25
msgid "Available MIME types"
@@ -8195,289 +8195,8 @@ msgstr "Профила беше обновен."
#: view_create.php:142
msgid "VIEW name"
-msgstr ""
+msgstr "Име на ИЗГЛЕД-а"
#: view_operations.php:93
-#, fuzzy
msgid "Rename view to"
-msgstr "Преименуване на таблицата на"
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Добавяне на ново поле"
-
-#~ msgid "Field"
-#~ msgstr "Поле"
-
-#~ msgid "Records"
-#~ msgstr "Записи"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Полетата завършват с"
-
-#~ msgid "Fields"
-#~ msgstr "Полета"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "Полето %s беше изтрито"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Виж image/jpeg: inline"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "\"zip-нато\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "\"gzip-нато\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "\"bzip-нато\""
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "Добавяне на коментар в хедъра (\\n нов ред)"
-
-#, fuzzy
-#~ msgid "and"
-#~ msgstr "и"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Забранено"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Позволено"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Поправяне на таблицата"
-
-#~ msgid "Calendar"
-#~ msgstr "Календар"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "MySQL 4.0 съвместимо"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr ""
-#~ "Конфигурацията по подразбиране не може да бъде заредена от: \"%1$s\""
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Създаване на индекс върху %s колони"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Създай нова Страница"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Няма"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Изчистване на кеша на таблицата (\"FLUSH\")"
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Описание"
-
-#, fuzzy
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Няма"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "Схемата на база от данни \"%s\" - Страница %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "Таблица \"%s\" не съществува!"
-
-#~ msgid "running on %s"
-#~ msgstr "работи на %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr "Мащаба е твърде малък за да се събере схемата на една страница"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Няма"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Няма"
-
-#, fuzzy
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr "Провери привилегиите за база от данни "%s"."
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "Таблица \"%s\" не съществува!"
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr ""
-#~ "Конфигурацията по подразбиране не може да бъде заредена от: \"%1$s\""
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "Грешка при преименуване на таблица %1$s в %2$s"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "не мога да заредя разширението %s,<br />моля проверете конфигурацията на "
-#~ "PHP"
-
-#, fuzzy
-#~ msgid "(or the local MySQL server"
-#~ msgstr "Не мога да се логна към MySQL сървъра"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "Има известна вероятност да сте намерили бъг в SQL парсера. Моля проучете "
-#~ "по-добре, и проверете коректността на кавичките. Друга вероятна причина "
-#~ "за грешката може да бъде, че ъплоудвате файл с изпълним код извън "
-#~ "областта заградена с кавички. Можете също така да се опитате да изпълните "
-#~ "заявката чрез интерфейса за команден ред на MySQL. Грешката генерирана от "
-#~ "MySQL сървъра по-долу, ако има такава, може също да ви помогне при "
-#~ "откриването на проблема. Ако все още имате проблеми или парсера дава "
-#~ "грешка там където интерфейса на командния ред не връща такава, моля "
-#~ "ограничете вашите SQL заявки само до проблемната заявка, и изпратете "
-#~ "съобщение за бъг с парчето от данните в CUT секцията по-долу:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV данни"
-
-#~ msgid "Copy"
-#~ msgstr "Копиране"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr ""
-#~ "Изтриване на потребителите и след това презареждане на привилегиите."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Това е най-чистия начин, но презареждането на привилегиите може да отнеме "
-#~ "известно време."
-
-#~ msgid "has been altered."
-#~ msgstr "беше променена."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ ""Изтритите" потребители ще имат достъп до сървъра както "
-#~ "обикновено, докато не се презаредят привилегиите."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Изтриване на потребителите от таблицата с привилегиите."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Позволява стартирането на съхранени процедури; Няма ефект в тази версия "
-#~ "на MySQL."
-
-#~ msgid "Process list"
-#~ msgstr "Списък на процесите"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Презареждане на привилегиите"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "Потребителите все още ще имат USAGE привилегия докато не се презаредят "
-#~ "привилегиите."
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Селектиране на всичко"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Селектиране на всичко"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Вмъкване"
-
-#, fuzzy
-#~| msgid "Update Query"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Допълни Запитването"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Изтриване"
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "януари0"
-
-#~ msgid "Jan1"
-#~ msgstr "януари1"
-
-#~ msgid "Jan2"
-#~ msgstr "януари2"
+msgstr "Преименуване на изгледа на"
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via e05ced2a2163c05fea8c21795b01d62fae2e8165 (commit)
via 122d86c1c5ef058f45b993fd55908d165d5decc7 (commit)
from 3c05f0792d9375f0f9dc3a4d6f7bf772bf4323ae (commit)
- Log -----------------------------------------------------------------
commit e05ced2a2163c05fea8c21795b01d62fae2e8165
Merge: 3c05f0792d9375f0f9dc3a4d6f7bf772bf4323ae 122d86c1c5ef058f45b993fd55908d165d5decc7
Author: Marc Delisle <marc(a)infomarc.info>
Date: Tue Jun 8 12:41:56 2010 -0400
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
Documentation.html | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0189e96..2a60fbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,8 @@ $Id$
"Would you like to delete..." option
- bug [privileges] List of tables not shown when the db name has a wildcard
- bug #3011126 [display] Edit link missing after long query
+- patch #3013264 [doc] FAQ 1.40 uses a comma instead of a period,
+ thanks to Isaac Bennetch - ibennetch
3.3.3.0 (2010-05-10)
- patch #2982480 [navi] Do not group if there would be one table in group,
diff --git a/Documentation.html b/Documentation.html
index 659cd68..d1d589d 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -3141,7 +3141,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
in your Apache configuration. See <a href="http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions">http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions</a>.</p>
<h4 id="faq1_40">
- <a href="#faq1_40">1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work,</a></h4>
+ <a href="#faq1_40">1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work.</a></h4>
<p>To be able to use cookie auth Apache must know that it has to rewrite the set-cookie headers.<br />
Example from the Apache 2.2 documentation:</p>
hooks/post-receive
--
phpMyAdmin
The branch, QA_3_3 has been updated
via 122d86c1c5ef058f45b993fd55908d165d5decc7 (commit)
from c3ea6fb22bdc7c728d68388e715aeeffeaa422cb (commit)
- Log -----------------------------------------------------------------
commit 122d86c1c5ef058f45b993fd55908d165d5decc7
Author: Isaac Bennetch <ibennetch(a)users.sourceforge.net>
Date: Tue Jun 8 12:41:26 2010 -0400
patch #3013264 FAQ 1.40 correction
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
Documentation.html | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 395def4..c020c52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
"Would you like to delete..." option
- bug [privileges] List of tables not shown when the db name has a wildcard
- bug #3011126 [display] Edit link missing after long query
+- patch #3013264 [doc] FAQ 1.40 uses a comma instead of a period,
+ thanks to Isaac Bennetch - ibennetch
3.3.3.0 (2010-05-10)
- patch #2982480 [navi] Do not group if there would be one table in group,
diff --git a/Documentation.html b/Documentation.html
index 15744ca..caf02b7 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -3104,7 +3104,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
in your Apache configuration. See <a href="http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions">http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions</a>.</p>
<h4 id="faq1_40">
- <a href="#faq1_40">1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work,</a></h4>
+ <a href="#faq1_40">1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work.</a></h4>
<p>To be able to use cookie auth Apache must know that it has to rewrite the set-cookie headers.<br />
Example from the Apache 2.2 documentation:</p>
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 5ed4790db0b45a5bb00a67e452d8e8d5d3fef46f (commit)
from 95d0e532f66dfdea306791ce26798d0e2068ab71 (commit)
- Log -----------------------------------------------------------------
commit 5ed4790db0b45a5bb00a67e452d8e8d5d3fef46f
Author: Marc Delisle <marc(a)infomarc.info>
Date: Tue Jun 8 12:32:18 2010 -0400
move remaining old-format messages to the script that uses them, when possible
-----------------------------------------------------------------------
Summary of changes:
libraries/messages.inc.php | 169 -----------------------------------------
libraries/select_lang.lib.php | 22 +++++-
server_privileges.php | 39 ++++++++++
server_status.php | 111 +++++++++++++++++++++++++++
4 files changed, 170 insertions(+), 171 deletions(-)
delete mode 100644 libraries/messages.inc.php
diff --git a/libraries/messages.inc.php b/libraries/messages.inc.php
deleted file mode 100644
index 7ea17e1..0000000
--- a/libraries/messages.inc.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/* $Id$ */
-/**
- * Messages for phpMyAdmin.
- *
- * This file is here for easy transition to Gettext. You should not add any
- * new messages here, use instead gettext directly in your template/PHP
- * file.
- */
-
-if (!function_exists('__')) {
- die('Bad invocation!');
-}
-
-/* We use only utf-8 */
-$charset = 'utf-8';
-
-/* l10n: Text direction, use either ltr or rtl */
-$text_dir = __('ltr');
-
-$strLatexContent = __('Content of table __TABLE__');
-$strLatexContinued = __('(continued)');
-$strLatexStructure = __('Structure of table __TABLE__');
-
-$strPrivDescAllPrivileges = __('Includes all privileges except GRANT.');
-$strPrivDescAlter = __('Allows altering the structure of existing tables.');
-$strPrivDescAlterRoutine = __('Allows altering and dropping stored routines.');
-$strPrivDescCreateDb = __('Allows creating new databases and tables.');
-$strPrivDescCreateRoutine = __('Allows creating stored routines.');
-$strPrivDescCreateTbl = __('Allows creating new tables.');
-$strPrivDescCreateTmpTable = __('Allows creating temporary tables.');
-$strPrivDescCreateUser = __('Allows creating, dropping and renaming user accounts.');
-$strPrivDescCreateView = __('Allows creating new views.');
-$strPrivDescDelete = __('Allows deleting data.');
-$strPrivDescDropDb = __('Allows dropping databases and tables.');
-$strPrivDescDropTbl = __('Allows dropping tables.');
-$strPrivDescEvent = __('Allows to set up events for the event scheduler');
-$strPrivDescExecute = __('Allows executing stored routines.');
-$strPrivDescFile = __('Allows importing data from and exporting data into files.');
-$strPrivDescGrant = __('Allows adding users and privileges without reloading the privilege tables.');
-$strPrivDescIndex = __('Allows creating and dropping indexes.');
-$strPrivDescInsert = __('Allows inserting and replacing data.');
-$strPrivDescLockTables = __('Allows locking tables for the current thread.');
-$strPrivDescMaxConnections = __('Limits the number of new connections the user may open per hour.');
-$strPrivDescMaxQuestions = __('Limits the number of queries the user may send to the server per hour.');
-$strPrivDescMaxUpdates = __('Limits the number of commands that change any table or database the user may execute per hour.');
-$strPrivDescMaxUserConnections = __('Limits the number of simultaneous connections the user may have.');
-$strPrivDescProcess = __('Allows viewing processes of all users');
-$strPrivDescReferences = __('Has no effect in this MySQL version.');
-$strPrivDescReload = __('Allows reloading server settings and flushing the server\'s caches.');
-$strPrivDescReplClient = __('Allows the user to ask where the slaves / masters are.');
-$strPrivDescReplSlave = __('Needed for the replication slaves.');
-$strPrivDescSelect = __('Allows reading data.');
-$strPrivDescShowDb = __('Gives access to the complete list of databases.');
-$strPrivDescShowView = __('Allows performing SHOW CREATE VIEW queries.');
-$strPrivDescShutdown = __('Allows shutting down the server.');
-$strPrivDescSuper = __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.');
-$strPrivDescTrigger = __('Allows creating and dropping triggers');
-$strPrivDescUpdate = __('Allows changing data.');
-$strPrivDescUsage = __('No privileges.');
-
-$strShowStatusBinlog_cache_disk_useDescr = __('The number of transactions that used the temporary binary log cache but that exceeded the value of binlog_cache_size and used a temporary file to store statements from the transaction.');
-$strShowStatusBinlog_cache_useDescr = __('The number of transactions that used the temporary binary log cache.');
-$strShowStatusCreated_tmp_disk_tablesDescr = __('The number of temporary tables on disk created automatically by the server while executing statements. If Created_tmp_disk_tables is big, you may want to increase the tmp_table_size value to cause temporary tables to be memory-based instead of disk-based.');
-$strShowStatusCreated_tmp_filesDescr = __('How many temporary files mysqld has created.');
-$strShowStatusCreated_tmp_tablesDescr = __('The number of in-memory temporary tables created automatically by the server while executing statements.');
-$strShowStatusDelayed_errorsDescr = __('The number of rows written with INSERT DELAYED for which some error occurred (probably duplicate key).');
-$strShowStatusDelayed_insert_threadsDescr = __('The number of INSERT DELAYED handler threads in use. Every different table on which one uses INSERT DELAYED gets its own thread.');
-$strShowStatusDelayed_writesDescr = __('The number of INSERT DELAYED rows written.');
-$strShowStatusFlush_commandsDescr = __('The number of executed FLUSH statements.');
-$strShowStatusHandler_commitDescr = __('The number of internal COMMIT statements.');
-$strShowStatusHandler_deleteDescr = __('The number of times a row was deleted from a table.');
-$strShowStatusHandler_discoverDescr = __('The MySQL server can ask the NDB Cluster storage engine if it knows about a table with a given name. This is called discovery. Handler_discover indicates the number of time tables have been discovered.');
-$strShowStatusHandler_read_firstDescr = __('The number of times the first entry was read from an index. If this is high, it suggests that the server is doing a lot of full index scans; for example, SELECT col1 FROM foo, assuming that col1 is indexed.');
-$strShowStatusHandler_read_keyDescr = __('The number of requests to read a row based on a key. If this is high, it is a good indication that your queries and tables are properly indexed.');
-$strShowStatusHandler_read_nextDescr = __('The number of requests to read the next row in key order. This is incremented if you are querying an index column with a range constraint or if you are doing an index scan.');
-$strShowStatusHandler_read_prevDescr = __('The number of requests to read the previous row in key order. This read method is mainly used to optimize ORDER BY ... DESC.');
-$strShowStatusHandler_read_rndDescr = __('The number of requests to read a row based on a fixed position. This is high if you are doing a lot of queries that require sorting of the result. You probably have a lot of queries that require MySQL to scan whole tables or you have joins that don\'t use keys properly.');
-$strShowStatusHandler_read_rnd_nextDescr = __('The number of requests to read the next row in the data file. This is high if you are doing a lot of table scans. Generally this suggests that your tables are not properly indexed or that your queries are not written to take advantage of the indexes you have.');
-$strShowStatusHandler_rollbackDescr = __('The number of internal ROLLBACK statements.');
-$strShowStatusHandler_updateDescr = __('The number of requests to update a row in a table.');
-$strShowStatusHandler_writeDescr = __('The number of requests to insert a row in a table.');
-$strShowStatusInnodb_buffer_pool_pages_dataDescr = __('The number of pages containing data (dirty or clean).');
-$strShowStatusInnodb_buffer_pool_pages_dirtyDescr = __('The number of pages currently dirty.');
-$strShowStatusInnodb_buffer_pool_pages_flushedDescr = __('The number of buffer pool pages that have been requested to be flushed.');
-$strShowStatusInnodb_buffer_pool_pages_freeDescr = __('The number of free pages.');
-$strShowStatusInnodb_buffer_pool_pages_latchedDescr = __('The number of latched pages in InnoDB buffer pool. These are pages currently being read or written or that can\'t be flushed or removed for some other reason.');
-$strShowStatusInnodb_buffer_pool_pages_miscDescr = __('The number of pages busy because they have been allocated for administrative overhead such as row locks or the adaptive hash index. This value can also be calculated as Innodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_data.');
-$strShowStatusInnodb_buffer_pool_pages_totalDescr = __('Total size of buffer pool, in pages.');
-$strShowStatusInnodb_buffer_pool_read_ahead_rndDescr = __('The number of "random" read-aheads InnoDB initiated. This happens when a query is to scan a large portion of a table but in random order.');
-$strShowStatusInnodb_buffer_pool_read_ahead_seqDescr = __('The number of sequential read-aheads InnoDB initiated. This happens when InnoDB does a sequential full table scan.');
-$strShowStatusInnodb_buffer_pool_read_requestsDescr = __('The number of logical read requests InnoDB has done.');
-$strShowStatusInnodb_buffer_pool_readsDescr = __('The number of logical reads that InnoDB could not satisfy from buffer pool and had to do a single-page read.');
-$strShowStatusInnodb_buffer_pool_wait_freeDescr = __('Normally, writes to the InnoDB buffer pool happen in the background. However, if it\'s necessary to read or create a page and no clean pages are available, it\'s necessary to wait for pages to be flushed first. This counter counts instances of these waits. If the buffer pool size was set properly, this value should be small.');
-$strShowStatusInnodb_buffer_pool_write_requestsDescr = __('The number writes done to the InnoDB buffer pool.');
-$strShowStatusInnodb_data_fsyncsDescr = __('The number of fsync() operations so far.');
-$strShowStatusInnodb_data_pending_fsyncsDescr = __('The current number of pending fsync() operations.');
-$strShowStatusInnodb_data_pending_readsDescr = __('The current number of pending reads.');
-$strShowStatusInnodb_data_pending_writesDescr = __('The current number of pending writes.');
-$strShowStatusInnodb_data_readDescr = __('The amount of data read so far, in bytes.');
-$strShowStatusInnodb_data_readsDescr = __('The total number of data reads.');
-$strShowStatusInnodb_data_writesDescr = __('The total number of data writes.');
-$strShowStatusInnodb_data_writtenDescr = __('The amount of data written so far, in bytes.');
-$strShowStatusInnodb_dblwr_pages_writtenDescr = __('The number of pages that have been written for doublewrite operations.');
-$strShowStatusInnodb_dblwr_writesDescr = __('The number of doublewrite operations that have been performed.');
-$strShowStatusInnodb_log_waitsDescr = __('The number of waits we had because log buffer was too small and we had to wait for it to be flushed before continuing.');
-$strShowStatusInnodb_log_write_requestsDescr = __('The number of log write requests.');
-$strShowStatusInnodb_log_writesDescr = __('The number of physical writes to the log file.');
-$strShowStatusInnodb_os_log_fsyncsDescr = __('The number of fsync() writes done to the log file.');
-$strShowStatusInnodb_os_log_pending_fsyncsDescr = __('The number of pending log file fsyncs.');
-$strShowStatusInnodb_os_log_pending_writesDescr = __('Pending log file writes.');
-$strShowStatusInnodb_os_log_writtenDescr = __('The number of bytes written to the log file.');
-$strShowStatusInnodb_pages_createdDescr = __('The number of pages created.');
-$strShowStatusInnodb_page_sizeDescr = __('The compiled-in InnoDB page size (default 16KB). Many values are counted in pages; the page size allows them to be easily converted to bytes.');
-$strShowStatusInnodb_pages_readDescr = __('The number of pages read.');
-$strShowStatusInnodb_pages_writtenDescr = __('The number of pages written.');
-$strShowStatusInnodb_row_lock_current_waitsDescr = __('The number of row locks currently being waited for.');
-$strShowStatusInnodb_row_lock_time_avgDescr = __('The average time to acquire a row lock, in milliseconds.');
-$strShowStatusInnodb_row_lock_timeDescr = __('The total time spent in acquiring row locks, in milliseconds.');
-$strShowStatusInnodb_row_lock_time_maxDescr = __('The maximum time to acquire a row lock, in milliseconds.');
-$strShowStatusInnodb_row_lock_waitsDescr = __('The number of times a row lock had to be waited for.');
-$strShowStatusInnodb_rows_deletedDescr = __('The number of rows deleted from InnoDB tables.');
-$strShowStatusInnodb_rows_insertedDescr = __('The number of rows inserted in InnoDB tables.');
-$strShowStatusInnodb_rows_readDescr = __('The number of rows read from InnoDB tables.');
-$strShowStatusInnodb_rows_updatedDescr = __('The number of rows updated in InnoDB tables.');
-$strShowStatusKey_blocks_not_flushedDescr = __('The number of key blocks in the key cache that have changed but haven\'t yet been flushed to disk. It used to be known as Not_flushed_key_blocks.');
-$strShowStatusKey_blocks_unusedDescr = __('The number of unused blocks in the key cache. You can use this value to determine how much of the key cache is in use.');
-$strShowStatusKey_blocks_usedDescr = __('The number of used blocks in the key cache. This value is a high-water mark that indicates the maximum number of blocks that have ever been in use at one time.');
-$strShowStatusKey_read_requestsDescr = __('The number of requests to read a key block from the cache.');
-$strShowStatusKey_readsDescr = __('The number of physical reads of a key block from disk. If Key_reads is big, then your key_buffer_size value is probably too small. The cache miss rate can be calculated as Key_reads/Key_read_requests.');
-$strShowStatusKey_write_requestsDescr = __('The number of requests to write a key block to the cache.');
-$strShowStatusKey_writesDescr = __('The number of physical writes of a key block to disk.');
-$strShowStatusLast_query_costDescr = __('The total cost of the last compiled query as computed by the query optimizer. Useful for comparing the cost of different query plans for the same query. The default value of 0 means that no query has been compiled yet.');
-$strShowStatusNot_flushed_delayed_rowsDescr = __('The number of rows waiting to be written in INSERT DELAYED queues.');
-$strShowStatusOpened_tablesDescr = __('The number of tables that have been opened. If opened tables is big, your table cache value is probably too small.');
-$strShowStatusOpen_filesDescr = __('The number of files that are open.');
-$strShowStatusOpen_streamsDescr = __('The number of streams that are open (used mainly for logging).');
-$strShowStatusOpen_tablesDescr = __('The number of tables that are open.');
-$strShowStatusQcache_free_blocksDescr = __('The number of free memory blocks in query cache.');
-$strShowStatusQcache_free_memoryDescr = __('The amount of free memory for query cache.');
-$strShowStatusQcache_hitsDescr = __('The number of cache hits.');
-$strShowStatusQcache_insertsDescr = __('The number of queries added to the cache.');
-$strShowStatusQcache_lowmem_prunesDescr = __('The number of queries that have been removed from the cache to free up memory for caching new queries. This information can help you tune the query cache size. The query cache uses a least recently used (LRU) strategy to decide which queries to remove from the cache.');
-$strShowStatusQcache_not_cachedDescr = __('The number of non-cached queries (not cachable, or not cached due to the query_cache_type setting).');
-$strShowStatusQcache_queries_in_cacheDescr = __('The number of queries registered in the cache.');
-$strShowStatusQcache_total_blocksDescr = __('The total number of blocks in the query cache.');
-$strShowStatusReset = _pgettext('$strShowStatusReset', 'Reset');
-$strShowStatusRpl_statusDescr = __('The status of failsafe replication (not yet implemented).');
-$strShowStatusSelect_full_joinDescr = __('The number of joins that do not use indexes. If this value is not 0, you should carefully check the indexes of your tables.');
-$strShowStatusSelect_full_range_joinDescr = __('The number of joins that used a range search on a reference table.');
-$strShowStatusSelect_range_checkDescr = __('The number of joins without keys that check for key usage after each row. (If this is not 0, you should carefully check the indexes of your tables.)');
-$strShowStatusSelect_rangeDescr = __('The number of joins that used ranges on the first table. (It\'s normally not critical even if this is big.)');
-$strShowStatusSelect_scanDescr = __('The number of joins that did a full scan of the first table.');
-$strShowStatusSlave_open_temp_tablesDescr = __('The number of temporary tables currently open by the slave SQL thread.');
-$strShowStatusSlave_retried_transactionsDescr = __('Total (since startup) number of times the replication slave SQL thread has retried transactions.');
-$strShowStatusSlave_runningDescr = __('This is ON if this server is a slave that is connected to a master.');
-$strShowStatusSlow_launch_threadsDescr = __('The number of threads that have taken more than slow_launch_time seconds to create.');
-$strShowStatusSlow_queriesDescr = __('The number of queries that have taken more than long_query_time seconds.');
-$strShowStatusSort_merge_passesDescr = __('The number of merge passes the sort algorithm has had to do. If this value is large, you should consider increasing the value of the sort_buffer_size system variable.');
-$strShowStatusSort_rangeDescr = __('The number of sorts that were done with ranges.');
-$strShowStatusSort_rowsDescr = __('The number of sorted rows.');
-$strShowStatusSort_scanDescr = __('The number of sorts that were done by scanning the table.');
-$strShowStatusTable_locks_immediateDescr = __('The number of times that a table lock was acquired immediately.');
-$strShowStatusTable_locks_waitedDescr = __('The number of times that a table lock could not be acquired immediately and a wait was needed. If this is high, and you have performance problems, you should first optimize your queries, and then either split your table or tables or use replication.');
-$strShowStatusThreads_cachedDescr = __('The number of threads in the thread cache. The cache hit rate can be calculated as Threads_created/Connections. If this value is red you should raise your thread_cache_size.');
-$strShowStatusThreads_connectedDescr = __('The number of currently open connections.');
-$strShowStatusThreads_createdDescr = __('The number of threads created to handle connections. If Threads_created is big, you may want to increase the thread_cache_size value. (Normally this doesn\'t give a notable performance improvement if you have a good thread implementation.)');
-$strShowStatusThreads_runningDescr = __('The number of threads that are not sleeping.');
-?>
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index a6c93bb..0f7cab7 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -472,9 +472,27 @@ _bindtextdomain('phpmyadmin', $GLOBALS['lang_path']);
_bind_textdomain_codeset('phpmyadmin', 'UTF-8');
_textdomain('phpmyadmin');
+/**
+ * Messages for phpMyAdmin.
+ *
+ * These messages are here for easy transition to Gettext.
+ * You should not add any messages here, use instead gettext directly
+ * in your template/PHP file.
+ */
+
+if (! function_exists('__')) {
+ die('Bad invocation!');
+}
+
+/* We use only utf-8 */
+$charset = 'utf-8';
+
+/* l10n: Text direction, use either ltr or rtl */
+$text_dir = __('ltr');
-// Load messages
-require_once './libraries/messages.inc.php';
+$strLatexContent = __('Content of table __TABLE__');
+$strLatexContinued = __('(continued)');
+$strLatexStructure = __('Structure of table __TABLE__');
// now, that we have loaded the language strings we can send the errors
if ($GLOBALS['lang_failed_cfg']) {
diff --git a/server_privileges.php b/server_privileges.php
index 87c71b8..576c0a1 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -18,6 +18,45 @@ $GLOBALS['js_include'][] = 'server_privileges.js';
$GLOBALS['js_include'][] = 'functions.js';
require './libraries/server_common.inc.php';
+/**
+ * Messages are built using the message name
+ */
+$strPrivDescAllPrivileges = __('Includes all privileges except GRANT.');
+$strPrivDescAlter = __('Allows altering the structure of existing tables.');
+$strPrivDescAlterRoutine = __('Allows altering and dropping stored routines.');
+$strPrivDescCreateDb = __('Allows creating new databases and tables.');
+$strPrivDescCreateRoutine = __('Allows creating stored routines.');
+$strPrivDescCreateTbl = __('Allows creating new tables.');
+$strPrivDescCreateTmpTable = __('Allows creating temporary tables.');
+$strPrivDescCreateUser = __('Allows creating, dropping and renaming user accounts.');
+$strPrivDescCreateView = __('Allows creating new views.');
+$strPrivDescDelete = __('Allows deleting data.');
+$strPrivDescDropDb = __('Allows dropping databases and tables.');
+$strPrivDescDropTbl = __('Allows dropping tables.');
+$strPrivDescEvent = __('Allows to set up events for the event scheduler');
+$strPrivDescExecute = __('Allows executing stored routines.');
+$strPrivDescFile = __('Allows importing data from and exporting data into files.');
+$strPrivDescGrant = __('Allows adding users and privileges without reloading the privilege tables.');
+$strPrivDescIndex = __('Allows creating and dropping indexes.');
+$strPrivDescInsert = __('Allows inserting and replacing data.');
+$strPrivDescLockTables = __('Allows locking tables for the current thread.');
+$strPrivDescMaxConnections = __('Limits the number of new connections the user may open per hour.');
+$strPrivDescMaxQuestions = __('Limits the number of queries the user may send to the server per hour.');
+$strPrivDescMaxUpdates = __('Limits the number of commands that change any table or database the user may execute per hour.');
+$strPrivDescMaxUserConnections = __('Limits the number of simultaneous connections the user may have.');
+$strPrivDescProcess = __('Allows viewing processes of all users');
+$strPrivDescReferences = __('Has no effect in this MySQL version.');
+$strPrivDescReload = __('Allows reloading server settings and flushing the server\'s caches.');
+$strPrivDescReplClient = __('Allows the user to ask where the slaves / masters are.');
+$strPrivDescReplSlave = __('Needed for the replication slaves.');
+$strPrivDescSelect = __('Allows reading data.');
+$strPrivDescShowDb = __('Gives access to the complete list of databases.');
+$strPrivDescShowView = __('Allows performing SHOW CREATE VIEW queries.');
+$strPrivDescShutdown = __('Allows shutting down the server.');
+$strPrivDescSuper = __('Allows connecting, even if maximum number of connections is reached; required for most administrative operations like setting global variables or killing threads of other users.');
+$strPrivDescTrigger = __('Allows creating and dropping triggers');
+$strPrivDescUpdate = __('Allows changing data.');
+$strPrivDescUsage = __('No privileges.');
/**
* Checks if a dropdown box has been used for selecting a database / table
diff --git a/server_status.php b/server_status.php
index 3ab8a49..5ebd835 100644
--- a/server_status.php
+++ b/server_status.php
@@ -35,6 +35,117 @@ require './libraries/replication.inc.php';
require_once './libraries/replication_gui.lib.php';
/**
+ * Messages are built using the message name
+ */
+$strShowStatusBinlog_cache_disk_useDescr = __('The number of transactions that used the temporary binary log cache but that exceeded the value of binlog_cache_size and used a temporary file to store statements from the transaction.');
+$strShowStatusBinlog_cache_useDescr = __('The number of transactions that used the temporary binary log cache.');
+$strShowStatusCreated_tmp_disk_tablesDescr = __('The number of temporary tables on disk created automatically by the server while executing statements. If Created_tmp_disk_tables is big, you may want to increase the tmp_table_size value to cause temporary tables to be memory-based instead of disk-based.');
+$strShowStatusCreated_tmp_filesDescr = __('How many temporary files mysqld has created.');
+$strShowStatusCreated_tmp_tablesDescr = __('The number of in-memory temporary tables created automatically by the server while executing statements.');
+$strShowStatusDelayed_errorsDescr = __('The number of rows written with INSERT DELAYED for which some error occurred (probably duplicate key).');
+$strShowStatusDelayed_insert_threadsDescr = __('The number of INSERT DELAYED handler threads in use. Every different table on which one uses INSERT DELAYED gets its own thread.');
+$strShowStatusDelayed_writesDescr = __('The number of INSERT DELAYED rows written.');
+$strShowStatusFlush_commandsDescr = __('The number of executed FLUSH statements.');
+$strShowStatusHandler_commitDescr = __('The number of internal COMMIT statements.');
+$strShowStatusHandler_deleteDescr = __('The number of times a row was deleted from a table.');
+$strShowStatusHandler_discoverDescr = __('The MySQL server can ask the NDB Cluster storage engine if it knows about a table with a given name. This is called discovery. Handler_discover indicates the number of time tables have been discovered.');
+$strShowStatusHandler_read_firstDescr = __('The number of times the first entry was read from an index. If this is high, it suggests that the server is doing a lot of full index scans; for example, SELECT col1 FROM foo, assuming that col1 is indexed.');
+$strShowStatusHandler_read_keyDescr = __('The number of requests to read a row based on a key. If this is high, it is a good indication that your queries and tables are properly indexed.');
+$strShowStatusHandler_read_nextDescr = __('The number of requests to read the next row in key order. This is incremented if you are querying an index column with a range constraint or if you are doing an index scan.');
+$strShowStatusHandler_read_prevDescr = __('The number of requests to read the previous row in key order. This read method is mainly used to optimize ORDER BY ... DESC.');
+$strShowStatusHandler_read_rndDescr = __('The number of requests to read a row based on a fixed position. This is high if you are doing a lot of queries that require sorting of the result. You probably have a lot of queries that require MySQL to scan whole tables or you have joins that don\'t use keys properly.');
+$strShowStatusHandler_read_rnd_nextDescr = __('The number of requests to read the next row in the data file. This is high if you are doing a lot of table scans. Generally this suggests that your tables are not properly indexed or that your queries are not written to take advantage of the indexes you have.');
+$strShowStatusHandler_rollbackDescr = __('The number of internal ROLLBACK statements.');
+$strShowStatusHandler_updateDescr = __('The number of requests to update a row in a table.');
+$strShowStatusHandler_writeDescr = __('The number of requests to insert a row in a table.');
+$strShowStatusInnodb_buffer_pool_pages_dataDescr = __('The number of pages containing data (dirty or clean).');
+$strShowStatusInnodb_buffer_pool_pages_dirtyDescr = __('The number of pages currently dirty.');
+$strShowStatusInnodb_buffer_pool_pages_flushedDescr = __('The number of buffer pool pages that have been requested to be flushed.');
+$strShowStatusInnodb_buffer_pool_pages_freeDescr = __('The number of free pages.');
+$strShowStatusInnodb_buffer_pool_pages_latchedDescr = __('The number of latched pages in InnoDB buffer pool. These are pages currently being read or written or that can\'t be flushed or removed for some other reason.');
+$strShowStatusInnodb_buffer_pool_pages_miscDescr = __('The number of pages busy because they have been allocated for administrative overhead such as row locks or the adaptive hash index. This value can also be calculated as Innodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_data.');
+$strShowStatusInnodb_buffer_pool_pages_totalDescr = __('Total size of buffer pool, in pages.');
+$strShowStatusInnodb_buffer_pool_read_ahead_rndDescr = __('The number of "random" read-aheads InnoDB initiated. This happens when a query is to scan a large portion of a table but in random order.');
+$strShowStatusInnodb_buffer_pool_read_ahead_seqDescr = __('The number of sequential read-aheads InnoDB initiated. This happens when InnoDB does a sequential full table scan.');
+$strShowStatusInnodb_buffer_pool_read_requestsDescr = __('The number of logical read requests InnoDB has done.');
+$strShowStatusInnodb_buffer_pool_readsDescr = __('The number of logical reads that InnoDB could not satisfy from buffer pool and had to do a single-page read.');
+$strShowStatusInnodb_buffer_pool_wait_freeDescr = __('Normally, writes to the InnoDB buffer pool happen in the background. However, if it\'s necessary to read or create a page and no clean pages are available, it\'s necessary to wait for pages to be flushed first. This counter counts instances of these waits. If the buffer pool size was set properly, this value should be small.');
+$strShowStatusInnodb_buffer_pool_write_requestsDescr = __('The number writes done to the InnoDB buffer pool.');
+$strShowStatusInnodb_data_fsyncsDescr = __('The number of fsync() operations so far.');
+$strShowStatusInnodb_data_pending_fsyncsDescr = __('The current number of pending fsync() operations.');
+$strShowStatusInnodb_data_pending_readsDescr = __('The current number of pending reads.');
+$strShowStatusInnodb_data_pending_writesDescr = __('The current number of pending writes.');
+$strShowStatusInnodb_data_readDescr = __('The amount of data read so far, in bytes.');
+$strShowStatusInnodb_data_readsDescr = __('The total number of data reads.');
+$strShowStatusInnodb_data_writesDescr = __('The total number of data writes.');
+$strShowStatusInnodb_data_writtenDescr = __('The amount of data written so far, in bytes.');
+$strShowStatusInnodb_dblwr_pages_writtenDescr = __('The number of pages that have been written for doublewrite operations.');
+$strShowStatusInnodb_dblwr_writesDescr = __('The number of doublewrite operations that have been performed.');
+$strShowStatusInnodb_log_waitsDescr = __('The number of waits we had because log buffer was too small and we had to wait for it to be flushed before continuing.');
+$strShowStatusInnodb_log_write_requestsDescr = __('The number of log write requests.');
+$strShowStatusInnodb_log_writesDescr = __('The number of physical writes to the log file.');
+$strShowStatusInnodb_os_log_fsyncsDescr = __('The number of fsync() writes done to the log file.');
+$strShowStatusInnodb_os_log_pending_fsyncsDescr = __('The number of pending log file fsyncs.');
+$strShowStatusInnodb_os_log_pending_writesDescr = __('Pending log file writes.');
+$strShowStatusInnodb_os_log_writtenDescr = __('The number of bytes written to the log file.');
+$strShowStatusInnodb_pages_createdDescr = __('The number of pages created.');
+$strShowStatusInnodb_page_sizeDescr = __('The compiled-in InnoDB page size (default 16KB). Many values are counted in pages; the page size allows them to be easily converted to bytes.');
+$strShowStatusInnodb_pages_readDescr = __('The number of pages read.');
+$strShowStatusInnodb_pages_writtenDescr = __('The number of pages written.');
+$strShowStatusInnodb_row_lock_current_waitsDescr = __('The number of row locks currently being waited for.');
+$strShowStatusInnodb_row_lock_time_avgDescr = __('The average time to acquire a row lock, in milliseconds.');
+$strShowStatusInnodb_row_lock_timeDescr = __('The total time spent in acquiring row locks, in milliseconds.');
+$strShowStatusInnodb_row_lock_time_maxDescr = __('The maximum time to acquire a row lock, in milliseconds.');
+$strShowStatusInnodb_row_lock_waitsDescr = __('The number of times a row lock had to be waited for.');
+$strShowStatusInnodb_rows_deletedDescr = __('The number of rows deleted from InnoDB tables.');
+$strShowStatusInnodb_rows_insertedDescr = __('The number of rows inserted in InnoDB tables.');
+$strShowStatusInnodb_rows_readDescr = __('The number of rows read from InnoDB tables.');
+$strShowStatusInnodb_rows_updatedDescr = __('The number of rows updated in InnoDB tables.');
+$strShowStatusKey_blocks_not_flushedDescr = __('The number of key blocks in the key cache that have changed but haven\'t yet been flushed to disk. It used to be known as Not_flushed_key_blocks.');
+$strShowStatusKey_blocks_unusedDescr = __('The number of unused blocks in the key cache. You can use this value to determine how much of the key cache is in use.');
+$strShowStatusKey_blocks_usedDescr = __('The number of used blocks in the key cache. This value is a high-water mark that indicates the maximum number of blocks that have ever been in use at one time.');
+$strShowStatusKey_read_requestsDescr = __('The number of requests to read a key block from the cache.');
+$strShowStatusKey_readsDescr = __('The number of physical reads of a key block from disk. If Key_reads is big, then your key_buffer_size value is probably too small. The cache miss rate can be calculated as Key_reads/Key_read_requests.');
+$strShowStatusKey_write_requestsDescr = __('The number of requests to write a key block to the cache.');
+$strShowStatusKey_writesDescr = __('The number of physical writes of a key block to disk.');
+$strShowStatusLast_query_costDescr = __('The total cost of the last compiled query as computed by the query optimizer. Useful for comparing the cost of different query plans for the same query. The default value of 0 means that no query has been compiled yet.');
+$strShowStatusNot_flushed_delayed_rowsDescr = __('The number of rows waiting to be written in INSERT DELAYED queues.');
+$strShowStatusOpened_tablesDescr = __('The number of tables that have been opened. If opened tables is big, your table cache value is probably too small.');
+$strShowStatusOpen_filesDescr = __('The number of files that are open.');
+$strShowStatusOpen_streamsDescr = __('The number of streams that are open (used mainly for logging).');
+$strShowStatusOpen_tablesDescr = __('The number of tables that are open.');
+$strShowStatusQcache_free_blocksDescr = __('The number of free memory blocks in query cache.');
+$strShowStatusQcache_free_memoryDescr = __('The amount of free memory for query cache.');
+$strShowStatusQcache_hitsDescr = __('The number of cache hits.');
+$strShowStatusQcache_insertsDescr = __('The number of queries added to the cache.');
+$strShowStatusQcache_lowmem_prunesDescr = __('The number of queries that have been removed from the cache to free up memory for caching new queries. This information can help you tune the query cache size. The query cache uses a least recently used (LRU) strategy to decide which queries to remove from the cache.');
+$strShowStatusQcache_not_cachedDescr = __('The number of non-cached queries (not cachable, or not cached due to the query_cache_type setting).');
+$strShowStatusQcache_queries_in_cacheDescr = __('The number of queries registered in the cache.');
+$strShowStatusQcache_total_blocksDescr = __('The total number of blocks in the query cache.');
+$strShowStatusReset = _pgettext('$strShowStatusReset', 'Reset');
+$strShowStatusRpl_statusDescr = __('The status of failsafe replication (not yet implemented).');
+$strShowStatusSelect_full_joinDescr = __('The number of joins that do not use indexes. If this value is not 0, you should carefully check the indexes of your tables.');
+$strShowStatusSelect_full_range_joinDescr = __('The number of joins that used a range search on a reference table.');
+$strShowStatusSelect_range_checkDescr = __('The number of joins without keys that check for key usage after each row. (If this is not 0, you should carefully check the indexes of your tables.)');
+$strShowStatusSelect_rangeDescr = __('The number of joins that used ranges on the first table. (It\'s normally not critical even if this is big.)');
+$strShowStatusSelect_scanDescr = __('The number of joins that did a full scan of the first table.');
+$strShowStatusSlave_open_temp_tablesDescr = __('The number of temporary tables currently open by the slave SQL thread.');
+$strShowStatusSlave_retried_transactionsDescr = __('Total (since startup) number of times the replication slave SQL thread has retried transactions.');
+$strShowStatusSlave_runningDescr = __('This is ON if this server is a slave that is connected to a master.');
+$strShowStatusSlow_launch_threadsDescr = __('The number of threads that have taken more than slow_launch_time seconds to create.');
+$strShowStatusSlow_queriesDescr = __('The number of queries that have taken more than long_query_time seconds.');
+$strShowStatusSort_merge_passesDescr = __('The number of merge passes the sort algorithm has had to do. If this value is large, you should consider increasing the value of the sort_buffer_size system variable.');
+$strShowStatusSort_rangeDescr = __('The number of sorts that were done with ranges.');
+$strShowStatusSort_rowsDescr = __('The number of sorted rows.');
+$strShowStatusSort_scanDescr = __('The number of sorts that were done by scanning the table.');
+$strShowStatusTable_locks_immediateDescr = __('The number of times that a table lock was acquired immediately.');
+$strShowStatusTable_locks_waitedDescr = __('The number of times that a table lock could not be acquired immediately and a wait was needed. If this is high, and you have performance problems, you should first optimize your queries, and then either split your table or tables or use replication.');
+$strShowStatusThreads_cachedDescr = __('The number of threads in the thread cache. The cache hit rate can be calculated as Threads_created/Connections. If this value is red you should raise your thread_cache_size.');
+$strShowStatusThreads_connectedDescr = __('The number of currently open connections.');
+$strShowStatusThreads_createdDescr = __('The number of threads created to handle connections. If Threads_created is big, you may want to increase the thread_cache_size value. (Normally this doesn\'t give a notable performance improvement if you have a good thread implementation.)');
+$strShowStatusThreads_runningDescr = __('The number of threads that are not sleeping.');
+
+/**
* Displays the sub-page heading
*/
echo '<div id="serverstatus">' . "\n";
hooks/post-receive
--
phpMyAdmin