Git
Threads by month
- ----- 2026 -----
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 9 participants
- 39110 discussions
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1973-g1835d93
by Piotr Przybylski 24 May '11
by Piotr Przybylski 24 May '11
24 May '11
The branch, master has been updated
via 1835d93534d7e82b10c4e08805204b5d10459e63 (commit)
from 9f5fad2697564642aa88f3652f08d75cb3ac0b04 (commit)
- Log -----------------------------------------------------------------
commit 1835d93534d7e82b10c4e08805204b5d10459e63
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Tue May 24 15:03:17 2011 +0200
Indentation fixes
-----------------------------------------------------------------------
Summary of changes:
server_databases.php | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/server_databases.php b/server_databases.php
index a4fbf89..365055a 100644
--- a/server_databases.php
+++ b/server_databases.php
@@ -263,13 +263,13 @@ if ($databases_count > 0) {
}
if (empty($dbstats)) {
- echo '<ul><li id="li_switch_dbstats"><strong>' . "\n";
- echo ' <a href="./server_databases.php?' . $url_query . '&dbstats=1"'
- .' title="' . __('Enable Statistics') . '">' . "\n"
- .' ' . __('Enable Statistics');
- echo '</a></strong><br />' . "\n";
- PMA_Message::notice(__('Note: Enabling the database statistics here might cause heavy traffic between the web server and the MySQL server.'))->display();
- echo '</li>' . "\n" . '</ul>' . "\n";
+ echo '<ul><li id="li_switch_dbstats"><strong>' . "\n";
+ echo ' <a href="./server_databases.php?' . $url_query . '&dbstats=1"'
+ .' title="' . __('Enable Statistics') . '">' . "\n"
+ .' ' . __('Enable Statistics');
+ echo '</a></strong><br />' . "\n";
+ PMA_Message::notice(__('Note: Enabling the database statistics here might cause heavy traffic between the web server and the MySQL server.'))->display();
+ echo '</li>' . "\n" . '</ul>' . "\n";
}
echo '</form>';
echo '</div>';
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1972-g9f5fad2
by Piotr Przybylski 24 May '11
by Piotr Przybylski 24 May '11
24 May '11
The branch, master has been updated
via 9f5fad2697564642aa88f3652f08d75cb3ac0b04 (commit)
via 8ec702efece928a6ab4cedb91680b39591b5b7f7 (commit)
from 8f2a040f41f2cd03e359bcadeb8d9f24c23290fa (commit)
- Log -----------------------------------------------------------------
commit 9f5fad2697564642aa88f3652f08d75cb3ac0b04
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Tue May 24 14:58:03 2011 +0200
Cleanup: fixed argument names and order in comments, removed @uses of builtin functions, removed unused variables
commit 8ec702efece928a6ab4cedb91680b39591b5b7f7
Author: Piotr Przybylski <piotrprz(a)gmail.com>
Date: Tue May 24 10:25:49 2011 +0200
Remove unnecessary assign in PMA_formatByteDown
-----------------------------------------------------------------------
Summary of changes:
libraries/common.lib.php | 259 ++++++++++++++++++++--------------------------
1 files changed, 111 insertions(+), 148 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index e8e6b8a..538d8ac 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -9,14 +9,9 @@
/**
* Exponential expression / raise number into power
*
- * @uses function_exists()
- * @uses bcpow()
- * @uses gmp_pow()
- * @uses gmp_strval()
- * @uses pow()
- * @param number $base
- * @param number $exp
- * @param string pow function use, or false for auto-detect
+ * @param string $base
+ * @param string $exp
+ * @param mixed $use_function pow function to use, or false for auto-detect
* @return mixed string or float
*/
function PMA_pow($base, $exp, $use_function = false)
@@ -69,12 +64,11 @@ function PMA_pow($base, $exp, $use_function = false)
*
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['cfg']['PropertiesIconic']
- * @uses htmlspecialchars()
- * @param string $icon name of icon file
- * @param string $alternate alternate text
- * @param boolean $container include in container
- * @param boolean $$force_text whether to force alternate text to be displayed
- * @return html img tag
+ * @param string $icon name of icon file
+ * @param string $alternate alternate text
+ * @param boolean $container include in container
+ * @param boolean $force_text whether to force alternate text to be displayed
+ * @return html img tag
*/
function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = false)
{
@@ -127,9 +121,7 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f
* Displays the maximum size for an upload
*
* @uses PMA_formatByteDown()
- * @uses sprintf()
- * @param integer the size
- *
+ * @param integer $max_upload_size the size
* @return string the message
*
* @access public
@@ -146,8 +138,7 @@ function PMA_displayMaximumUploadSize($max_upload_size)
* Generates a hidden field which should indicate to the browser
* the maximum size for upload
*
- * @param integer the size
- *
+ * @param integer $max_size the size
* @return string the INPUT field
*
* @access public
@@ -161,15 +152,13 @@ function PMA_displayMaximumUploadSize($max_upload_size)
* Add slashes before "'" and "\" characters so a value containing them can
* be used in a sql comparison.
*
- * @uses str_replace()
- * @param string the string to slash
- * @param boolean whether the string will be used in a 'LIKE' clause
- * (it then requires two more escaped sequences) or not
- * @param boolean whether to treat cr/lfs as escape-worthy entities
- * (converts \n to \\n, \r to \\r)
- *
- * @param boolean whether this function is used as part of the
- * "Create PHP code" dialog
+ * @param string $a_string the string to slash
+ * @param bool $is_like whether the string will be used in a 'LIKE' clause
+ * (it then requires two more escaped sequences) or not
+ * @param bool $crlf whether to treat cr/lfs as escape-worthy entities
+ * (converts \n to \\n, \r to \\r)
+ * @param bool $php_code whether this function is used as part of the
+ * "Create PHP code" dialog
*
* @return string the slashed string
*
@@ -204,9 +193,7 @@ function PMA_sqlAddslashes($a_string = '', $is_like = false, $crlf = false, $php
* database, table and field names.
* Note: This function does not escape backslashes!
*
- * @uses str_replace()
- * @param string the string to escape
- *
+ * @param string $name the string to escape
* @return string the escaped string
*
* @access public
@@ -223,7 +210,6 @@ function PMA_escape_mysql_wildcards($name)
* removes slashes before "_" and "%" characters
* Note: This function does not unescape backslashes!
*
- * @uses str_replace()
* @param string $name the string to escape
* @return string the escaped string
* @access public
@@ -241,8 +227,6 @@ function PMA_unescape_mysql_wildcards($name)
*
* checks if the sting is quoted and removes this quotes
*
- * @uses str_replace()
- * @uses substr()
* @param string $quoted_string string to remove quotes from
* @param string $quote type of quote to remove
* @return string unqoted string
@@ -279,10 +263,9 @@ function PMA_unQuote($quoted_string, $quote = null)
* @uses PMA_SQP_isError()
* @uses PMA_SQP_formatHtml()
* @uses PMA_SQP_formatNone()
- * @uses is_array()
- * @param mixed pre-parsed SQL structure
- *
- * @return string the formatted sql
+ * @param mixed $parsed_sql pre-parsed SQL structure
+ * @param string $unparsed_sql
+ * @return string the formatted sql
*
* @global array the configuration array
* @global boolean whether the current statement is a multiple one or not
@@ -342,12 +325,11 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '')
* @uses $cfg['ReplaceHelpImg']
* @uses $GLOBALS['pmaThemeImage']
* @uses PMA_MYSQL_INT_VERSION
- * @uses strtolower()
- * @uses str_replace()
- * @param string chapter of "HTML, one page per chapter" documentation
- * @param string contains name of page/anchor that is being linked
- * @param bool whether to use big icon (like in left frame)
- * @param string anchor to page part
+ * @param string $chapter chapter of "HTML, one page per chapter" documentation
+ * @param string $link contains name of page/anchor that is being linked
+ * @param bool $big_icon whether to use big icon (like in left frame)
+ * @param string $anchor anchor to page part
+ * @param bool $just_open whether only the opening <a> tag should be returned
*
* @return string the html link
*
@@ -434,8 +416,7 @@ function PMA_showMySQLDocu($chapter, $link, $big_icon = false, $anchor = '', $ju
/**
* Displays a link to the phpMyAdmin documentation
*
- * @param string anchor in documentation
- *
+ * @param string $anchor anchor in documentation
* @return string the html link
*
* @access public
@@ -451,9 +432,8 @@ function PMA_showDocu($anchor) {
/**
* Displays a link to the PHP documentation
*
- * @param string anchor in documentation
- *
- * @return string the html link
+ * @param string $target anchor in documentation
+ * @return string the html link
*
* @access public
*/
@@ -471,7 +451,9 @@ function PMA_showPHPDocu($target) {
* returns HTML for a footnote marker and add the messsage to the footnotes
*
* @uses $GLOBALS['footnotes']
- * @param string the error message
+ * @param string $message the error message
+ * @param bool $bbcode
+ * @param string $type
* @return string html code for a footnote marker
* @access public
*/
@@ -532,25 +514,11 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
* @uses PMA_SQP_isError()
* @uses PMA_SQP_parse()
* @uses PMA_SQP_getErrorString()
- * @uses strtolower()
- * @uses urlencode()
- * @uses str_replace()
- * @uses nl2br()
- * @uses substr()
- * @uses preg_replace()
- * @uses preg_match()
- * @uses explode()
- * @uses implode()
- * @uses is_array()
- * @uses function_exists()
- * @uses htmlspecialchars()
- * @uses trim()
- * @uses strstr()
- * @param string the error message
- * @param string the sql query that failed
- * @param boolean whether to show a "modify" link or not
- * @param string the "back" link url (full path is not required)
- * @param boolean EXIT the page?
+ * @param string $error_message the error message
+ * @param string $the_query the sql query that failed
+ * @param bool $is_modify_link whether to show a "modify" link or not
+ * @param string $back_url the "back" link url (full path is not required)
+ * @param bool $exit EXIT the page?
*
* @global string the curent table
* @global string the current db
@@ -1377,25 +1345,22 @@ function PMA_profilingResults($profiling_results, $show_chart = false)
/**
* Formats $value to byte view
*
- * @param double the value to format
- * @param integer the sensitiveness
- * @param integer the number of decimals to retain
+ * @param double $value the value to format
+ * @param int $limes the sensitiveness
+ * @param int $comma the number of decimals to retain
*
* @return array the formatted value and its unit
*
* @access public
- *
- * @version 1.2 - 18 July 2002
*/
function PMA_formatByteDown($value, $limes = 6, $comma = 0)
{
/* l10n: shortcuts for Byte, Kilo, Mega, Giga, Tera, Peta, Exa+ */
$byteUnits = array(__('B'), __('KiB'), __('MiB'), __('GiB'), __('TiB'), __('PiB'), __('EiB'));
- $dh = PMA_pow(10, $comma);
- $li = PMA_pow(10, $limes);
- $return_value = $value;
- $unit = $byteUnits[0];
+ $dh = PMA_pow(10, $comma);
+ $li = PMA_pow(10, $limes);
+ $unit = $byteUnits[0];
for ($d = 6, $ex = 15; $d >= 1; $d--, $ex-=3) {
if (isset($byteUnits[$d]) && $value >= $li * PMA_pow(10, $ex)) {
@@ -1421,6 +1386,9 @@ function PMA_formatByteDown($value, $limes = 6, $comma = 0)
/**
* Changes thousands and decimal separators to locale specific values.
+ *
+ * @param $value
+ * @return string
*/
function PMA_localizeNumber($value)
{
@@ -1535,7 +1503,7 @@ function PMA_formatNumber($value, $length = 3, $comma = 0, $only_down = false)
/**
* Returns the number of bytes when a formatted size is given
*
- * @param string $size the size expression (for example 8MB)
+ * @param string $formatted_size the size expression (for example 8MB)
* @uses PMA_pow()
* @return integer The numerical part of the expression (for example 8)
*/
@@ -1556,8 +1524,8 @@ function PMA_extractValueFromFormattedSize($formatted_size)
/**
* Writes localised date
*
- * @param string the current timestamp
- *
+ * @param string $timestamp the current timestamp
+ * @param string $format format
* @return string the formatted date
*
* @access public
@@ -1767,12 +1735,14 @@ function PMA_generate_html_tabs($tabs, $url_params)
* Displays a link, or a button if the link's URL is too large, to
* accommodate some browsers' limitations
*
- * @param string the URL
- * @param string the link message
+ * @param string $url the URL
+ * @param string $message the link message
* @param mixed $tag_params string: js confirmation
* array: additional tag params (f.e. style="")
* @param boolean $new_form we set this to false when we are already in
* a form, to avoid generating nested forms
+ * @param boolean $strip_img
+ * @param string $target
*
* @return string the results to be echoed or saved in an array
*/
@@ -1902,13 +1872,12 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
*
* @uses sprintf()
* @uses floor()
- * @param int the timespan
+ * @param int $seconds the timespan
*
* @return string the formatted value
*/
function PMA_timespanFormat($seconds)
{
- $return_string = '';
$days = floor($seconds / 86400);
if ($days > 0) {
$seconds -= $days * 86400;
@@ -1933,8 +1902,8 @@ function PMA_timespanFormat($seconds)
*
* @todo add a multibyte safe function PMA_STR_split()
* @uses strlen
- * @param string The string
- * @param string The Separator (defaults to "<br />\n")
+ * @param string $string The string
+ * @param string $Separator The Separator (defaults to "<br />\n")
*
* @access public
* @return string The flipped string
@@ -1985,13 +1954,11 @@ function PMA_flipstring($string, $Separator = "<br />\n")
* @uses PMA_getenv()
* @uses header_meta_style.inc.php
* @uses $GLOBALS['PMA_PHP_SELF']
- * basename
- * @param array The names of the parameters needed by the calling
- * script.
- * @param boolean Stop the execution?
+ * @param array $params The names of the parameters needed by the calling script.
+ * @param bool $die Stop the execution?
* (Set this manually to false in the calling script
* until you know all needed parameters to check).
- * @param boolean Whether to include this list in checking for special params.
+ * @param bool $request Whether to include this list in checking for special params.
* @global string path to current script
* @global boolean flag whether any special variable was required
*
@@ -2171,11 +2138,12 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force
* @uses PMA_USR_BROWSER_AGENT
* @uses $GLOBALS['pmaThemeImage']
* @uses $GLOBALS['cfg']['PropertiesIconic']
- * @param string name of button element
- * @param string class of button element
- * @param string name of image element
- * @param string text to display
- * @param string image to display
+ * @param string $button_name name of button element
+ * @param string $button_class class of button element
+ * @param string $image_name name of image element
+ * @param string $text text to display
+ * @param string $image image to display
+ * @param string $value
*
* @access public
*/
@@ -2211,24 +2179,19 @@ function PMA_buttonOrImage($button_name, $button_class, $image_name, $text,
/**
* Generate a pagination selector for browsing resultsets
*
- * @uses range()
- * @param string Number of rows in the pagination set
- * @param string current page number
- * @param string number of total pages
- * @param string If the number of pages is lower than this
- * variable, no pages will be omitted in
- * pagination
- * @param string How many rows at the beginning should always
- * be shown?
- * @param string How many rows at the end should always
- * be shown?
- * @param string Percentage of calculation page offsets to
- * hop to a next page
- * @param string Near the current page, how many pages should
- * be considered "nearby" and displayed as
- * well?
- * @param string The prompt to display (sometimes empty)
- *
+ * @param int $rows Number of rows in the pagination set
+ * @param int $pageNow current page number
+ * @param int $nbTotalPage number of total pages
+ * @param int $showAll If the number of pages is lower than this
+ * variable, no pages will be omitted in pagination
+ * @param int $sliceStart How many rows at the beginning should always be shown?
+ * @param int $sliceEnd How many rows at the end should always be shown?
+ * @param int $percent Percentage of calculation page offsets to hop to a next page
+ * @param int $range Near the current page, how many pages should
+ * be considered "nearby" and displayed as well?
+ * @param string $prompt The prompt to display (sometimes empty)
+ *
+ * @return string
* @access public
*/
function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1,
@@ -2795,14 +2758,13 @@ function PMA_replace_binary_contents($content) {
}
/**
- *
* If the string starts with a \r\n pair (0x0d0a) add an extra \n
*
- * @uses strpos()
+ * @param string $string
* @return string with the chars replaced
*/
-function PMA_duplicateFirstNewline($string){
+function PMA_duplicateFirstNewline($string) {
$first_occurence = strpos($string, "\r\n");
if ($first_occurence === 0){
$string = "\n".$string;
@@ -2811,41 +2773,40 @@ function PMA_duplicateFirstNewline($string){
}
/**
- * get the action word corresponding to a script name
+ * Get the action word corresponding to a script name
* in order to display it as a title in navigation panel
*
- * @uses $GLOBALS
- * @param string a valid value for $cfg['LeftDefaultTabTable']
- * or $cfg['DefaultTabTable']
- * or $cfg['DefaultTabDatabase']
+ * @param string $target a valid value for $cfg['LeftDefaultTabTable'], $cfg['DefaultTabTable']
+ * or $cfg['DefaultTabDatabase']
+ * @return array
*/
function PMA_getTitleForTarget($target) {
-
-$mapping = array(
- // Values for $cfg['DefaultTabTable']
- 'tbl_structure.php' => __('Structure'),
- 'tbl_sql.php' => __('SQL'),
- 'tbl_select.php' =>__('Search'),
- 'tbl_change.php' =>__('Insert'),
- 'sql.php' => __('Browse'),
-
- // Values for $cfg['DefaultTabDatabase']
- 'db_structure.php' => __('Structure'),
- 'db_sql.php' => __('SQL'),
- 'db_search.php' => __('Search'),
- 'db_operations.php' => __('Operations'),
-);
+ $mapping = array(
+ // Values for $cfg['DefaultTabTable']
+ 'tbl_structure.php' => __('Structure'),
+ 'tbl_sql.php' => __('SQL'),
+ 'tbl_select.php' =>__('Search'),
+ 'tbl_change.php' =>__('Insert'),
+ 'sql.php' => __('Browse'),
+
+ // Values for $cfg['DefaultTabDatabase']
+ 'db_structure.php' => __('Structure'),
+ 'db_sql.php' => __('SQL'),
+ 'db_search.php' => __('Search'),
+ 'db_operations.php' => __('Operations'),
+ );
return $mapping[$target];
}
/**
* Formats user string, expading @VARIABLES@, accepting strftime format string.
*
- * @param string Text where to do expansion.
- * @param function Function to call for escaping variable values.
- * @param array Array with overrides for default parameters (obtained from GLOBALS).
+ * @param string $string Text where to do expansion.
+ * @param function $escape Function to call for escaping variable values.
+ * @param array $updates Array with overrides for default parameters (obtained from GLOBALS).
+ * @return string
*/
-function PMA_expandUserString($string, $escape = NULL, $updates = array()) {
+function PMA_expandUserString($string, $escape = null, $updates = array()) {
/* Content */
$vars['http_host'] = PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : '';
$vars['server_name'] = $GLOBALS['cfg']['Server']['host'];
@@ -2911,12 +2872,10 @@ function PMA_expandUserString($string, $escape = NULL, $updates = array()) {
* function that generates a json output for an ajax request and ends script
* execution
*
- * @param boolean success whether the ajax request was successfull
- * @param string message string containing the html of the message
- * @param array extra_data optional - any other data as part of the json request
+ * @param bool $message message string containing the html of the message
+ * @param bool $success success whether the ajax request was successfull
+ * @param array $extra_data extra_data optional - any other data as part of the json request
*
- * @uses header()
- * @uses json_encode()
*/
function PMA_ajaxResponse($message, $success = true, $extra_data = array())
{
@@ -2960,9 +2919,10 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array())
/**
* Display the form used to browse anywhere on the local server for the file to import
+ *
+ * @param $max_upload_size
*/
function PMA_browseUploadFile($max_upload_size) {
- $uid = uniqid("");
echo '<label for="radio_import_file">' . __("Browse your computer:") . '</label>';
echo '<div id="upload_form_status" style="display: none;"></div>';
echo '<div id="upload_form_status_info" style="display: none;"></div>';
@@ -2974,6 +2934,9 @@ function PMA_browseUploadFile($max_upload_size) {
/**
* Display the form used to select a file to import from the server upload directory
+ *
+ * @param $import_list
+ * @param $uploaddir
*/
function PMA_selectUploadFile($import_list, $uploaddir) {
echo '<label for="radio_local_import_file">' . sprintf(__("Select from the web server upload directory <b>%s</b>:"), htmlspecialchars(PMA_userDir($uploaddir))) . '</label>';
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1970-g8f2a040
by Marc Delisle 24 May '11
by Marc Delisle 24 May '11
24 May '11
The branch, master has been updated
via 8f2a040f41f2cd03e359bcadeb8d9f24c23290fa (commit)
via ab6d16ed2f4728c9f066353a851621a352ef969f (commit)
via c2edb0a165115b71a13b26f7e27d870f1cd3c1d7 (commit)
via 5dee868bfff80abfb7aea70d1d41a083117fd2ba (commit)
via 456640c457d62ff0e0a0d7965cca4aa0135aed93 (commit)
via 963d77e3bef98f6f8624dd5ee28b92405ad77149 (commit)
via fadd8994ccc41f1a7bc74509428a50a89d8789ac (commit)
via 44d05b522c7cfb7cd3a36bb20257441248761bdd (commit)
via 4ab5d6aded69bd4ce43777326cc225324cbbd39a (commit)
via b49922c14b4ac6ca98042f755c95a2b80ac5a563 (commit)
via 6e4abf02d6af2a32fc9ebff6410a3603dc50ba4b (commit)
via b8c654d748c7de1fde1c388743c734a6a6b30d9c (commit)
via 0c0b4376799ebf517d026c7489ea5d746d5a3607 (commit)
via 48092de206fd1c07bf4696ace0071a565be6630a (commit)
via c468705538f034e06447b85123063cdcfffc1b59 (commit)
via ed646a067f057ba8e133a06c3224a7ab9f98a1c1 (commit)
via 04bbe91b52ca660d0743d0bc644823e8960fffb0 (commit)
via d5421a41f9491edeebfde55c49823ada7f5dabed (commit)
via 23021911b14cf6834fa4e04f5cbe79c736e2c425 (commit)
via 576fca3dc2a45800c4e9a7bdea6ef3a3f17863bb (commit)
via 21bceed4148081c50f0b2b03126717d41b65f10a (commit)
via 4b7e65e6107706b9d9ea9b671f509935ed49f3f0 (commit)
via e4820139bf284418956e3cf6ea86cb292155f61e (commit)
via 175ffa5c4ea914bcffcf139902857b8d35ded5f6 (commit)
from 755fc28b49b3012cc80881720f54f5c3781285ea (commit)
- Log -----------------------------------------------------------------
commit 8f2a040f41f2cd03e359bcadeb8d9f24c23290fa
Merge: 755fc28b49b3012cc80881720f54f5c3781285ea ab6d16ed2f4728c9f066353a851621a352ef969f
Author: Marc Delisle <marc(a)infomarc.info>
Date: Tue May 24 08:18:25 2011 -0400
Merge commit 'ab6d16ed2f4728c9f066353a851621a352ef969f'
commit ab6d16ed2f4728c9f066353a851621a352ef969f
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Tue May 24 08:38:09 2011 +0700
Set default LeftRecentTable to 10
commit c2edb0a165115b71a13b26f7e27d870f1cd3c1d7
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Tue May 24 08:31:50 2011 +0700
Remove inline javascript and use jQuery instead
commit 5dee868bfff80abfb7aea70d1d41a083117fd2ba
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Sat May 14 12:34:13 2011 +0700
Move recent tables trimming to correct place
commit 456640c457d62ff0e0a0d7965cca4aa0135aed93
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Sat May 14 12:21:49 2011 +0700
Some fix for ajaxification
commit 963d77e3bef98f6f8624dd5ee28b92405ad77149
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Sat May 14 02:46:15 2011 +0700
Ajaxification of recent tables list
commit fadd8994ccc41f1a7bc74509428a50a89d8789ac
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Wed May 11 11:27:47 2011 +0700
Documentation for cfg_LeftRecentTable updated
commit 44d05b522c7cfb7cd3a36bb20257441248761bdd
Merge: 4ab5d6aded69bd4ce43777326cc225324cbbd39a 071bc679dbd8bd2ece5182bdb471c027f33daf6c
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Tue May 10 21:40:53 2011 +0700
Merge remote-tracking branch 'origin/master' into browsemode
commit 4ab5d6aded69bd4ce43777326cc225324cbbd39a
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Tue May 10 20:42:48 2011 +0700
Update documentation and string for the pma_recent
commit b49922c14b4ac6ca98042f755c95a2b80ac5a563
Merge: 6e4abf02d6af2a32fc9ebff6410a3603dc50ba4b 7698df152041315049ad0e8b7db235e7fbbe7d7c
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Tue May 10 20:29:18 2011 +0700
Merge remote-tracking branch 'origin/master' into browsemode
commit 6e4abf02d6af2a32fc9ebff6410a3603dc50ba4b
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Tue May 10 16:18:18 2011 +0700
Validation (non-negative number) for LeftRecentTable
commit b8c654d748c7de1fde1c388743c734a6a6b30d9c
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Tue May 10 09:56:24 2011 +0700
Updated target release 3.5.0 for 'recent' feature in Documentation.html
commit 0c0b4376799ebf517d026c7489ea5d746d5a3607
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Tue May 10 09:20:17 2011 +0700
Not refresh the navigation if the recent tables is not configured, added some checking
commit 48092de206fd1c07bf4696ace0071a565be6630a
Merge: c468705538f034e06447b85123063cdcfffc1b59 8d3ebd746dfbfe4e2ca86121f0448ba7d5187432
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Tue May 10 01:55:59 2011 +0700
Merge remote-tracking branch 'origin/master' into browsemode
commit c468705538f034e06447b85123063cdcfffc1b59
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Tue May 10 01:55:02 2011 +0700
Add PMA_addRecentTable function, jQuery for recent tables 'onchange' event
commit ed646a067f057ba8e133a06c3224a7ab9f98a1c1
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Mon May 9 20:35:08 2011 +0700
Added array_merge (RecentTable.class.php) to ensure the keys are continuous
commit 04bbe91b52ca660d0743d0bc644823e8960fffb0
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Sun May 8 22:40:46 2011 +0700
Recently used tables (fix bug & add pma_recent in /setup)
commit d5421a41f9491edeebfde55c49823ada7f5dabed
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Sun May 8 03:11:09 2011 +0700
Recently used tables (add SQL in scripts/create_tables.sql)
commit 23021911b14cf6834fa4e04f5cbe79c736e2c425
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Sun May 8 02:42:38 2011 +0700
Recently used tables (class, configuration, remember in pma database)
commit 576fca3dc2a45800c4e9a7bdea6ef3a3f17863bb
Merge: 21bceed4148081c50f0b2b03126717d41b65f10a fd1ac3cdac0a302ace44c966337822d7589a129c
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Sat May 7 14:52:13 2011 +0700
Merge remote branch 'origin/master' into browsemode
commit 21bceed4148081c50f0b2b03126717d41b65f10a
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Sat May 7 14:52:07 2011 +0700
Recently used tables (now with configuration)
commit 4b7e65e6107706b9d9ea9b671f509935ed49f3f0
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Mon May 2 10:09:05 2011 +0700
Recently used tables (works, but only in temporary session variable)
commit e4820139bf284418956e3cf6ea86cb292155f61e
Merge: 175ffa5c4ea914bcffcf139902857b8d35ded5f6 3256a4407600b6d1cbba29b1cb05ffadb6a1ad67
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Mon May 2 09:41:32 2011 +0700
Merge remote branch 'origin/master' into browsemode
commit 175ffa5c4ea914bcffcf139902857b8d35ded5f6
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Sun May 1 22:58:47 2011 +0700
Recently used tables (simple version, only works with LeftDefaultTablTable=tbl_structure.php)
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 27 ++++
config.sample.inc.php | 1 +
js/functions.js | 4 +
js/navigation.js | 23 +++
libraries/RecentTable.class.php | 200 +++++++++++++++++++++++++++
libraries/config.default.php | 14 ++
libraries/config.values.php | 1 +
libraries/config/messages.inc.php | 4 +
libraries/config/setup.forms.php | 4 +-
libraries/config/user_preferences.forms.php | 3 +-
libraries/header.inc.php | 23 +++-
libraries/relation.lib.php | 16 ++-
navigation.php | 18 +++
scripts/create_tables.sql | 12 ++
themes/original/css/theme_left.css.php | 10 ++
themes/pmahomme/css/theme_left.css.php | 12 ++-
16 files changed, 365 insertions(+), 7 deletions(-)
create mode 100644 libraries/RecentTable.class.php
diff --git a/Documentation.html b/Documentation.html
index 5b3da22..3bbb832 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1054,6 +1054,29 @@ ALTER TABLE `pma_column_comments`
</ul>
</dd>
+ <dt id="recent">
+ <span id="cfg_Servers_recent">$cfg['Servers'][$i]['recent']</span> string
+ </dt>
+ <dd>
+ Since release 3.5.0 you can show recently used tables in the left navigation frame.
+ It helps you to jump across table directly, without the need to select the database,
+ and then select the table. Using
+ <a href="#cfg_LeftRecentTable" class="configrule">$cfg['LeftRecentTable']</a>
+ you can configure the maximum number of recent tables shown. When you select a table
+ from the list, it will jump to the page specified in
+ <a href="#cfg_LeftDefaultTabTable" class="configrule">$cfg['LeftDefaultTabTable']</a>.<br/><br/>
+
+ Without configuring the storage, you can still access the recently used tables,
+ but it will disappear after you logout.<br/><br/>
+
+ To allow the usage of this functionality:
+
+ <ul>
+ <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li>
+ <li>put the table name in <tt>$cfg['Servers'][$i]['recent']</tt> (e.g. 'pma_recent')</li>
+ </ul>
+ </dd>
+
<dt id="tracking">
<span id="cfg_Servers_tracking">$cfg['Servers'][$i]['tracking']</span> string
</dt>
@@ -1469,6 +1492,10 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<dd>Defines how many sublevels should be displayed when splitting
up tables by the above separator.</dd>
+ <dt id="cfg_LeftRecentTable">$cfg['LeftRecentTable'] integer</dt>
+ <dd>The maximum number of recently used tables shown in the left navigation
+ frame. Set this to 0 (zero) to disable the listing of recent tables.</dd>
+
<dt id="cfg_ShowTooltip">$cfg['ShowTooltip'] boolean</dt>
<dd>Defines whether to display table comment as tool-tip in left frame or
not.</dd>
diff --git a/config.sample.inc.php b/config.sample.inc.php
index 0ea16d5..95d3a1a 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -52,6 +52,7 @@ $cfg['Servers'][$i]['AllowNoPassword'] = false;
// $cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages';
// $cfg['Servers'][$i]['column_info'] = 'pma_column_info';
// $cfg['Servers'][$i]['history'] = 'pma_history';
+// $cfg['Servers'][$i]['recent'] = 'pma_recent';
// $cfg['Servers'][$i]['tracking'] = 'pma_tracking';
// $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords';
// $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig';
diff --git a/js/functions.js b/js/functions.js
index a5118df..f745e8c 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2287,6 +2287,10 @@ $(document).ready(function() {
}
});
+ $('#update_recent_tables').ready(function() {
+ window.parent.frame_navigation.PMA_reloadRecentTable();
+ });
+
}) // end of $(document).ready()
/**
diff --git a/js/navigation.js b/js/navigation.js
index 5052848..52d13cf 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -167,6 +167,19 @@ function clear_fast_filter() {
elm.focus();
}
+/**
+ * Reloads the recent tables list.
+ */
+function PMA_reloadRecentTable() {
+ $.get('navigation.php',
+ { 'token' : window.parent.token, 'ajax_request' : true, 'recent_table' : true },
+ function (data) {
+ if (data.success == true) {
+ $('#recentTable').html(data.options);
+ }
+ });
+}
+
/* Performed on load */
$(document).ready(function(){
/* Display filter */
@@ -179,4 +192,14 @@ $(document).ready(function(){
$('#clear_fast_filter').click(clear_fast_filter);
$('#fast_filter').focus(function (evt) {evt.target.select();});
$('#fast_filter').keyup(function (evt) {fast_filter(evt.target.value);});
+
+ /* Jump to recent table */
+ $('#recentTable').change(function() {
+ if (this.value != '') {
+ var arr = this.value.split('.');
+ window.parent.setDb(arr[0]);
+ window.parent.setTable(arr[1]);
+ window.parent.refreshMain($('#LeftDefaultTabTable')[0].value);
+ }
+ });
});
diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php
new file mode 100644
index 0000000..ebe93f5
--- /dev/null
+++ b/libraries/RecentTable.class.php
@@ -0,0 +1,200 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ *
+ * @package phpMyAdmin
+ */
+
+require_once './libraries/Message.class.php';
+
+/**
+ * Handles the recently used tables.
+ *
+ * @TODO Change the release version in table pma_recent (#recent in Documentation.html)
+ *
+ * @package phpMyAdmin
+ */
+class RecentTable
+{
+ /**
+ * Defines the internal PMA table which contains recent tables.
+ *
+ * @access private
+ * @var string
+ */
+ private $pma_table;
+
+ /**
+ * Reference to session variable containing recently used tables.
+ *
+ * @access public
+ * @var array
+ */
+ public $tables;
+
+ /**
+ * RecentTable instance.
+ *
+ * @var RecentTable
+ */
+ private static $_instance;
+
+ public function __construct()
+ {
+ if (strlen($GLOBALS['cfg']['Server']['pmadb']) &&
+ strlen($GLOBALS['cfg']['Server']['recent'])) {
+ $this->pma_table = PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) .".".
+ PMA_backquote($GLOBALS['cfg']['Server']['recent']);
+ }
+ if (! isset($_SESSION['tmp_user_values']['recent_tables'])) {
+ $_SESSION['tmp_user_values']['recent_tables'] =
+ isset($this->pma_table) ? $this->getFromDb() : array();
+ }
+ $this->tables =& $_SESSION['tmp_user_values']['recent_tables'];
+ }
+
+ /**
+ * Returns class instance.
+ *
+ * @return RecentTable
+ */
+ public static function getInstance()
+ {
+ if (is_null(self::$_instance)) {
+ self::$_instance = new RecentTable();
+ }
+ return self::$_instance;
+ }
+
+ /**
+ * Returns recently used tables from phpMyAdmin database.
+ *
+ * @uses $pma_table
+ * @uses PMA_query_as_controluser()
+ * @uses PMA_DBI_fetch_array()
+ * @uses json_decode()
+ *
+ * @return array
+ */
+ public function getFromDb()
+ {
+ // Read from phpMyAdmin database, if recent tables is not in session
+ $sql_query =
+ " SELECT `tables` FROM " . $this->pma_table .
+ " WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'";
+
+ $row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query));
+ if (isset($row[0])) {
+ return json_decode($row[0]);
+ } else {
+ return array();
+ }
+ }
+
+ /**
+ * Save recent tables into phpMyAdmin database.
+ *
+ * @uses PMA_DBI_try_query()
+ * @uses json_decode()
+ * @uses PMA_Message
+ *
+ * @return true|PMA_Message
+ */
+ public function saveToDb()
+ {
+ $username = $GLOBALS['cfg']['Server']['user'];
+ $sql_query =
+ " REPLACE INTO " . $this->pma_table . " (`username`, `tables`)" .
+ " VALUES ('" . $username . "', '" . PMA_sqlAddslashes(json_encode($this->tables)) . "')";
+
+ $success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']);
+
+ if (!$success) {
+ $message = PMA_Message::error(__('Could not save recent table'));
+ $message->addMessage('<br /><br />');
+ $message->addMessage(PMA_Message::rawError(PMA_DBI_getError($GLOBALS['controllink'])));
+ return $message;
+ }
+ return true;
+ }
+
+ /**
+ * Trim recent table according to the LeftRecentTable configuration.
+ *
+ * @return boolean True if trimming occurred
+ */
+ public function trim()
+ {
+ $max = max($GLOBALS['cfg']['LeftRecentTable'], 0);
+ $trimming_occured = count($this->tables) > $max;
+ while (count($this->tables) > $max) {
+ array_pop($this->tables);
+ }
+ return $trimming_occured;
+ }
+
+ /**
+ * Return options for HTML select.
+ *
+ * @return string
+ */
+ public function getHtmlSelectOption()
+ {
+ // trim and save, in case where the configuration is changed
+ if ($this->trim() && isset($this->pma_table)) {
+ $this->saveToDb();
+ }
+
+ $html = '<option value="">(' . __('Recent tables') . ') ...</option>';
+ if (count($this->tables)) {
+ foreach ($this->tables as $table) {
+ $html .= '<option value="' . $table . '">' . $table . '</option>';
+ }
+ } else {
+ $html .= '<option value="">' . __('There are no recent tables') . '</option>';
+ }
+ return $html;
+ }
+
+ /**
+ * Return HTML select.
+ *
+ * @return string
+ */
+ public function getHtmlSelect()
+ {
+ $html = '<input type="hidden" id="LeftDefaultTabTable" value="' .
+ $GLOBALS['cfg']['LeftDefaultTabTable'] . '" />';
+ $html .= '<select id="recentTable">';
+ $html .= $this->getHtmlSelectOption();
+ $html .= '</select>';
+
+ return $html;
+ }
+
+ /**
+ * Add recently used tables.
+ *
+ * @param string $db Database name where the table is located
+ * @param string $table Table name
+ *
+ * @return true|PMA_Message True if success, PMA_Message if not
+ */
+ public function add($db, $table)
+ {
+ $table_str = $db . '.' . $table;
+
+ // add only if this is new table
+ if (! isset($this->tables[0]) || $this->tables[0] != $table_str) {
+ array_unshift($this->tables, $table_str);
+ $this->tables = array_merge(array_unique($this->tables));
+ $this->trim();
+ if (isset($this->pma_table)) {
+ return $this->saveToDb();
+ }
+ }
+ return true;
+ }
+
+}
+?>
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 4ca31e7..5c0b1b2 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -339,6 +339,13 @@ $cfg['Servers'][$i]['history'] = '';
$cfg['Servers'][$i]['designer_coords'] = '';
/**
+ * table to store recently used tables
+ * - leave blank for no "persistent" recently used tables
+ * SUGGESTED: 'pma_recent'
+ */
+$cfg['Servers'][$i]['recent'] = '';
+
+/**
* table to store SQL tracking
* - leave blank for no SQL tracking
* SUGGESTED: 'pma_tracking'
@@ -795,6 +802,13 @@ $cfg['LeftLogoLink'] = 'main.php';
$cfg['LeftLogoLinkWindow'] = 'main';
/**
+ * number of recently used tables displayed in the navigation frame
+ *
+ * @global integer $cfg['LeftRecentTable']
+ */
+$cfg['LeftRecentTable'] = 10;
+
+/**
* display a JavaScript table filter in the left frame
* when more then x tables are present
*
diff --git a/libraries/config.values.php b/libraries/config.values.php
index b519037..d884e59 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -159,6 +159,7 @@ $cfg_db['_validators'] = array(
'Import/skip_queries' => 'validate_non_negative_number',
'InsertRows' => 'validate_positive_number',
'LeftFrameTableLevel' => 'validate_positive_number',
+ 'LeftRecentTable' => 'validate_non_negative_number',
'LimitChars' => 'validate_positive_number',
'LoginCookieValidity' => 'validate_positive_number',
'LoginCookieStore' => 'validate_non_negative_number',
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 8ea3cef..e8ce0df 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -283,6 +283,8 @@ $strConfigLeftLogoLinkWindow_desc = __('Open the linked page in the main window
$strConfigLeftLogoLinkWindow_name = __('Logo link target');
$strConfigLeftPointerEnable_desc = __('Highlight server under the mouse cursor');
$strConfigLeftPointerEnable_name = __('Enable highlighting');
+$strConfigLeftRecentTable_desc = __('Maximum number of recently used tables; set 0 to disable');
+$strConfigLeftRecentTable_name = __('Recently used tables');
$strConfigLightTabs_desc = __('Use less graphically intense tabs');
$strConfigLightTabs_name = __('Light tabs');
$strConfigLimitChars_desc = __('Maximum number of characters shown in any non-numeric column on browse view');
@@ -401,6 +403,8 @@ $strConfigServers_pmadb_desc = __('Database used for relations, bookmarks, and P
$strConfigServers_pmadb_name = __('Database name');
$strConfigServers_port_desc = __('Port on which MySQL server is listening, leave empty for default');
$strConfigServers_port_name = __('Server port');
+$strConfigServers_recent_desc = __('Leave blank for no "persistent" recently used tables across sessions, suggested: [kbd]pma_recent[/kbd]');
+$strConfigServers_recent_name = __('Recently used table');
$strConfigServers_relation_desc = __('Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links[/a] support, suggested: [kbd]pma_relation[/kbd]');
$strConfigServers_relation_name = __('Relation table');
$strConfigServers_ShowDatabasesCommand_desc = __('SQL command to fetch available databases');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 5287aad..7269823 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -73,6 +73,7 @@ $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array(
'table_info' => 'pma_table_info',
'column_info' => 'pma_column_info',
'history' => 'pma_history',
+ 'recent' => 'pma_recent',
'tracking' => 'pma_tracking',
'table_coords' => 'pma_table_coords',
'pdf_pages' => 'pma_pdf_pages',
@@ -162,7 +163,8 @@ $forms['Left_frame']['Left_frame'] = array(
'LeftDisplayLogo',
'LeftLogoLink',
'LeftLogoLinkWindow',
- 'LeftPointerEnable');
+ 'LeftPointerEnable',
+ 'LeftRecentTable');
$forms['Left_frame']['Left_servers'] = array(
'LeftDisplayServers',
'DisplayServersList');
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index d23edda..ffe0366 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -77,7 +77,8 @@ $forms['Left_frame']['Left_frame'] = array(
'LeftDisplayLogo',
'LeftLogoLink',
'LeftLogoLinkWindow',
- 'LeftPointerEnable');
+ 'LeftPointerEnable',
+ 'LeftRecentTable');
$forms['Left_frame']['Left_databases'] = array(
'DisplayDatabasesList',
'LeftFrameDBTree',
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index f6c3dcd..4036f86 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -8,11 +8,25 @@ if (! defined('PHPMYADMIN')) {
exit;
}
+require_once './libraries/common.inc.php';
+require_once './libraries/RecentTable.class.php';
+
+
/**
+ * Add recently used table and reload the navigation.
*
+ * @param string $db Database name where the table is located.
+ * @param string $table The table name
*/
-require_once './libraries/common.inc.php';
-
+function PMA_addRecentTable($db, $table) {
+ $tmp_result = RecentTable::getInstance()->add($db, $table);
+ if ($tmp_result === true) {
+ echo '<span class="hide" id="update_recent_tables"></span>';
+ } else {
+ $error = $tmp_result;
+ $error->display();
+ }
+}
/**
* This is not an Ajax request so we need to generate all this output.
@@ -151,6 +165,11 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
.'"' . htmlspecialchars($show_comment)
.'"</span>' . "\n";
} // end if
+
+ // add recently used table and reload the navigation
+ if ($GLOBALS['cfg']['LeftRecentTable'] > 0) {
+ PMA_addRecentTable($GLOBALS['db'], $GLOBALS['table']);
+ }
} else {
// no table selected, display database comment if present
/**
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 338f833..87521a9 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -138,6 +138,10 @@ function PMA_printRelationsParamDiagnostic($cfgRelation)
PMA_printDiagMessageForFeature(__('Designer'), 'designerwork', $messages);
+ PMA_printDiagMessageForParameter('recent', isset($cfgRelation['recent']), $messages, 'recent');
+
+ PMA_printDiagMessageForFeature(__('Persistent recently used tables'), 'recentwork', $messages);
+
PMA_printDiagMessageForParameter('tracking', isset($cfgRelation['tracking']), $messages, 'tracking');
PMA_printDiagMessageForFeature(__('Tracking'), 'trackingwork', $messages);
@@ -220,6 +224,7 @@ function PMA__getRelationsParam()
$cfgRelation['commwork'] = false;
$cfgRelation['mimework'] = false;
$cfgRelation['historywork'] = false;
+ $cfgRelation['recentwork'] = false;
$cfgRelation['trackingwork'] = false;
$cfgRelation['designerwork'] = false;
$cfgRelation['userconfigwork'] = false;
@@ -271,6 +276,8 @@ function PMA__getRelationsParam()
$cfgRelation['pdf_pages'] = $curr_table[0];
} elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['history']) {
$cfgRelation['history'] = $curr_table[0];
+ } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['recent']) {
+ $cfgRelation['recent'] = $curr_table[0];
} elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['tracking']) {
$cfgRelation['tracking'] = $curr_table[0];
} elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['userconfig']) {
@@ -325,6 +332,10 @@ function PMA__getRelationsParam()
$cfgRelation['historywork'] = true;
}
+ if (isset($cfgRelation['recent'])) {
+ $cfgRelation['recentwork'] = true;
+ }
+
if (isset($cfgRelation['tracking'])) {
$cfgRelation['trackingwork'] = true;
}
@@ -346,8 +357,9 @@ function PMA__getRelationsParam()
if ($cfgRelation['relwork'] && $cfgRelation['displaywork']
&& $cfgRelation['pdfwork'] && $cfgRelation['commwork']
&& $cfgRelation['mimework'] && $cfgRelation['historywork']
- && $cfgRelation['trackingwork'] && $cfgRelation['userconfigwork']
- && $cfgRelation['bookmarkwork'] && $cfgRelation['designerwork']) {
+ && $cfgRelation['recentwork'] && $cfgRelation['trackingwork']
+ && $cfgRelation['userconfigwork'] && $cfgRelation['bookmarkwork']
+ && $cfgRelation['designerwork']) {
$cfgRelation['allworks'] = true;
}
diff --git a/navigation.php b/navigation.php
index a07a516..ac12807 100644
--- a/navigation.php
+++ b/navigation.php
@@ -53,6 +53,16 @@ function PMA_exitNavigationFrame()
exit;
}
+require_once './libraries/common.lib.php';
+require_once './libraries/RecentTable.class.php';
+
+/**
+ * Check if it is an ajax request to reload the recent tables list.
+ */
+if ($GLOBALS['is_ajax_request'] && $_REQUEST['recent_table']) {
+ PMA_ajaxResponse('', true, array('options' => RecentTable::getInstance()->getHtmlSelectOption()) );
+}
+
// keep the offset of the db list in session before closing it
if (! isset($_SESSION['tmp_user_values']['navi_limit_offset'])) {
$_SESSION['tmp_user_values']['navi_limit_offset'] = 0;
@@ -179,6 +189,14 @@ require_once './libraries/header_http.inc.php';
<body id="body_leftFrame">
<?php
require './libraries/navigation_header.inc.php';
+
+// display recently used tables
+if ($GLOBALS['cfg']['LeftRecentTable'] > 0) {
+ echo '<div id="recentTableList">';
+ echo RecentTable::getInstance()->getHtmlSelect();
+ echo '</div>';
+}
+
if (! $GLOBALS['server']) {
// no server selected
PMA_exitNavigationFrame();
diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql
index 1efdaad..2d6cb56 100644
--- a/scripts/create_tables.sql
+++ b/scripts/create_tables.sql
@@ -105,6 +105,18 @@ CREATE TABLE IF NOT EXISTS `pma_pdf_pages` (
-- --------------------------------------------------------
+--
+-- Table structure for table `pma_recent`
+--
+
+CREATE TABLE IF NOT EXISTS `pma_recent` (
+ `username` varchar(64) COLLATE utf8_bin NOT NULL,
+ `tables` blob NOT NULL,
+ PRIMARY KEY (`username`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+
+-- --------------------------------------------------------
+
--
-- Table structure for table `pma_relation`
--
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index 50ffc39..f21bca2 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -83,6 +83,16 @@ div#pmalogo {
background-color: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
padding:.3em;
}
+
+div#recentTableList {
+ text-align: center;
+ margin-bottom: 0.5em;
+}
+
+div#recentTableList select {
+ width: 100%;
+}
+
div#pmalogo,
div#leftframelinks,
div#databaseList {
diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php
index 467e70a..e0a6393 100644
--- a/themes/pmahomme/css/theme_left.css.php
+++ b/themes/pmahomme/css/theme_left.css.php
@@ -94,11 +94,21 @@ button {
div#pmalogo {
<?php //better echo $GLOBALS['cfg']['logoBGC']; ?>
}
+
+div#recentTableList {
+ text-align: center;
+ margin: 20px 10px 0px 10px;
+}
+
+div#recentTableList select {
+ width: 100%;
+}
+
div#pmalogo,
div#leftframelinks,
div#databaseList {
text-align: center;
- margin: 20px 10px 0px 10px;
+ margin: 5px 10px 0px 10px;
}
ul#databaseList {
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1946-g755fc28
by Michal Čihař 24 May '11
by Michal Čihař 24 May '11
24 May '11
The branch, master has been updated
via 755fc28b49b3012cc80881720f54f5c3781285ea (commit)
from 4b3780760ce251cdcb351ba51a5374f1529951ad (commit)
- Log -----------------------------------------------------------------
commit 755fc28b49b3012cc80881720f54f5c3781285ea
Author: Michal Čihař <mcihar(a)novell.com>
Date: Tue May 24 13:08:10 2011 +0200
Add space between size and unit
-----------------------------------------------------------------------
Summary of changes:
libraries/display_tbl.lib.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 6fa8e9b..036536c 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -2381,7 +2381,7 @@ function PMA_handle_non_printable_contents($category, $content, $transform_funct
} elseif (isset($content)) {
$size = strlen($content);
$display_size = PMA_formatByteDown($size, 3, 1);
- $result .= ' - '. $display_size[0] . $display_size[1];
+ $result .= ' - '. $display_size[0] . ' ' . $display_size[1];
}
$result .= ']';
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-37-gc761877
by Michal Čihař 24 May '11
by Michal Čihař 24 May '11
24 May '11
The branch, QA_3_4 has been updated
via c76187732bea3c95c6beab20229c9584803396f4 (commit)
from eb52f22eb013a12f25f23225a15cb29ba0825f86 (commit)
- Log -----------------------------------------------------------------
commit c76187732bea3c95c6beab20229c9584803396f4
Author: Michal Čihař <mcihar(a)novell.com>
Date: Tue May 24 08:53:10 2011 +0200
Update from master
-----------------------------------------------------------------------
Summary of changes:
po/zh_TW.po | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 17a1037..a17815c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -869,6 +869,8 @@ msgid ""
"file size exceeded the maximum size permitted by your PHP configuration. See "
"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
msgstr ""
+"未接收到要匯入的資料. 可能是檔案名稱未送出, 也可能是檔案大小超出 PHP 限制. 請"
+"參閱 [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]。"
#: import.php:371 libraries/display_import.lib.php:23
msgid "Could not load import plugins, please check your installation!"
@@ -903,6 +905,8 @@ msgid ""
"However on last run no data has been parsed, this usually means phpMyAdmin "
"won't be able to finish this import unless you increase php time limits."
msgstr ""
+"在最後一次執行時, 解析失敗. 請增加 PHP 運行時間限制, 否則 phpMyAdmin 將無法完"
+"成資料匯入."
#: import.php:453 libraries/Message.class.php:185
#: libraries/display_tbl.lib.php:2074 libraries/sql_query_form.lib.php:140
@@ -974,7 +978,7 @@ msgstr "您將要關閉一個BLOB儲存"
#: js/messages.php:41
#, php-format
msgid "Are you sure you want to disable all BLOB references for database %s?"
-msgstr ""
+msgstr "您確定要在資料庫 %s 上停用 BLOB 功能?"
#: js/messages.php:44
msgid "Missing value in the form!"
@@ -1130,7 +1134,7 @@ msgstr "儲存"
#: js/messages.php:90 libraries/display_tbl.lib.php:593 pmd_general.php:158
#: tbl_change.php:315 tbl_change.php:321
msgid "Hide"
-msgstr ""
+msgstr "隱藏"
#: js/messages.php:93
#, fuzzy
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1945-g4b37807
by Michal Čihař 24 May '11
by Michal Čihař 24 May '11
24 May '11
The branch, master has been updated
via 4b3780760ce251cdcb351ba51a5374f1529951ad (commit)
via 1495f395ff7ac1492b0040f7bc1df6cb76aa4ad8 (commit)
via cefdbbc360d8bc71b0eeab022efe86acf0695a12 (commit)
via 8273ba46b6e5bdc80d2104a9681cd3530efb1fe6 (commit)
via a05141c4d7b8d24f01de8e9732c2bf8469155eb2 (commit)
via bc6a18e690d7e2fd91f56bc8b26d60416080ce50 (commit)
via be4064c25f88544d65b335effdd7dfc74b3d9177 (commit)
via d1a6d0e94186537afd36a5c51958bf4ac09c5680 (commit)
via 8453144463849757dc259a062025addb83a0d985 (commit)
via 8f9cb3677401ed43f27069f57e3397f2414848a8 (commit)
via 5d52b6501ffe7ebb0eef0ce62785280b8a6fe1f2 (commit)
via 2dc7647f3063a41088096108b83cd7d48ca8a81f (commit)
via 9d35d0ea7a56fcbdce941f2c4af36b575bab5c55 (commit)
via 837ee8da46b0071aa74c656109ab10e4038e51a8 (commit)
via 04e8d2df4e59949af8af96855e2bb33c78460d6d (commit)
via f729298be270e9ffd9bd0ef4fe874ac1b59a884c (commit)
via 3c27763341eb9a031489db627fd6a1fd4d53fa86 (commit)
via 4ed9c7dc278a473080bb4f6a93e2dbc67e144a45 (commit)
via ef72087178bbb64af1b2d46f587343f3d109df5c (commit)
via 16d90c232d51a79d1823b1e13908222fa3909b2d (commit)
via fd8259a496364e1d3c7a006dde6a8e74f5baed22 (commit)
via d51a00938fb095bd03382986986a012716473de7 (commit)
via 11e7d9c4110a58b7cb39aa71b4359f4819d9c887 (commit)
via 06dd27b4b10c286b423b28a5738cb32e4d892a0a (commit)
via f690b5dace8f25f1276feefe1f37678068dad5d2 (commit)
via 73ccea6d99ee0fa9663d5422e833a384ce85d1fc (commit)
via 5ef8f41d123e41f1cb577af74d79d032a72fd023 (commit)
via 1ac922804d30983049a633408e4918cb253c89a8 (commit)
via 6412466efaf111c8c7579de23c2c31b310c5611b (commit)
via b743eb3f2640be07b1ca5df1b8444701d15b8a55 (commit)
via 8176d93bca29f9d2703691fe3fcf9596e0644678 (commit)
via 0f9eee8a049a585eb02270e5aab83a5f248597ce (commit)
via 33092e1ea4f0ef5746fb4664a3f7a0fe1b24d84a (commit)
via eb62d0474006ab4530a2b76fc5593aa63d23fc04 (commit)
via e268e72a4d28bfaccfffbf61ff35c81415a9f390 (commit)
via c9ced044ef5c9a4d18d0150c64029f7ddcfe296d (commit)
via e2f0f2fa034a48e970f4b44bc65488d7ca00e32d (commit)
via 5b5f38c3771baf8b76ed12e3c08973dede407048 (commit)
via e8d6ea6a48a81f6587175f75ace38b843d767e85 (commit)
via 859fd3ced64ba17bd8ddda42c6016fff9fb8f19c (commit)
via af4acd9ef6986a44d10d24c421d3e79ee3d9c819 (commit)
via f04c28a0542ffdf6b80d4fb08c3a33cc71766408 (commit)
via cff207af23ff16189ba678c0ce73370d1b68ad36 (commit)
via 312c06d02f1a35f453826f980e492768fae5298d (commit)
via d83b0d193589fa95544f6eb9f640f98656c3c5a6 (commit)
via 0c4fa526fc08a5833114313724ca4739d5fe48a4 (commit)
via df2224b6df5e41a385c29579e8fa1298478d8c5e (commit)
via 5c171ed5879a0bdfecd2fb147a3899ba6a3d8bf4 (commit)
via 839bbcb91a9bc68bf3f3987b59a90431b91131b0 (commit)
via f9ed73eef958fb7ded03cf74b9180cc716bb3c65 (commit)
via 2b1257ee9429e23be5a011eeff3885f7543b0d69 (commit)
via 219818671026b7a5e21e5899f21f4b125cc93d64 (commit)
via 5871b6ba3d4673ad1934a02bc770d92a380d3e05 (commit)
via ffe862556beb1dec30182bee2de4affafa7a8e93 (commit)
via cd7b134a28f9fe0892aaf6c886853d1eef34fdd5 (commit)
from e6026f6fafb40081bb8014dd25c8102c8d97a746 (commit)
- Log -----------------------------------------------------------------
commit 4b3780760ce251cdcb351ba51a5374f1529951ad
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:48:03 2011 +0200
Translation update done using Pootle.
commit 1495f395ff7ac1492b0040f7bc1df6cb76aa4ad8
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:47:13 2011 +0200
Translation update done using Pootle.
commit cefdbbc360d8bc71b0eeab022efe86acf0695a12
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:47:08 2011 +0200
Translation update done using Pootle.
commit 8273ba46b6e5bdc80d2104a9681cd3530efb1fe6
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:46:36 2011 +0200
Translation update done using Pootle.
commit a05141c4d7b8d24f01de8e9732c2bf8469155eb2
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:46:12 2011 +0200
Translation update done using Pootle.
commit bc6a18e690d7e2fd91f56bc8b26d60416080ce50
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:45:28 2011 +0200
Translation update done using Pootle.
commit be4064c25f88544d65b335effdd7dfc74b3d9177
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:45:04 2011 +0200
Translation update done using Pootle.
commit d1a6d0e94186537afd36a5c51958bf4ac09c5680
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:44:00 2011 +0200
Translation update done using Pootle.
commit 8453144463849757dc259a062025addb83a0d985
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:43:13 2011 +0200
Translation update done using Pootle.
commit 8f9cb3677401ed43f27069f57e3397f2414848a8
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:42:40 2011 +0200
Translation update done using Pootle.
commit 5d52b6501ffe7ebb0eef0ce62785280b8a6fe1f2
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:41:09 2011 +0200
Translation update done using Pootle.
commit 2dc7647f3063a41088096108b83cd7d48ca8a81f
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:40:50 2011 +0200
Translation update done using Pootle.
commit 9d35d0ea7a56fcbdce941f2c4af36b575bab5c55
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:39:23 2011 +0200
Translation update done using Pootle.
commit 837ee8da46b0071aa74c656109ab10e4038e51a8
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:38:38 2011 +0200
Translation update done using Pootle.
commit 04e8d2df4e59949af8af96855e2bb33c78460d6d
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:37:57 2011 +0200
Translation update done using Pootle.
commit f729298be270e9ffd9bd0ef4fe874ac1b59a884c
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:37:32 2011 +0200
Translation update done using Pootle.
commit 3c27763341eb9a031489db627fd6a1fd4d53fa86
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:37:13 2011 +0200
Translation update done using Pootle.
commit 4ed9c7dc278a473080bb4f6a93e2dbc67e144a45
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:36:17 2011 +0200
Translation update done using Pootle.
commit ef72087178bbb64af1b2d46f587343f3d109df5c
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:35:32 2011 +0200
Translation update done using Pootle.
commit 16d90c232d51a79d1823b1e13908222fa3909b2d
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:34:18 2011 +0200
Translation update done using Pootle.
commit fd8259a496364e1d3c7a006dde6a8e74f5baed22
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:33:39 2011 +0200
Translation update done using Pootle.
commit d51a00938fb095bd03382986986a012716473de7
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:33:02 2011 +0200
Translation update done using Pootle.
commit 11e7d9c4110a58b7cb39aa71b4359f4819d9c887
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:32:59 2011 +0200
Translation update done using Pootle.
commit 06dd27b4b10c286b423b28a5738cb32e4d892a0a
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:32:41 2011 +0200
Translation update done using Pootle.
commit f690b5dace8f25f1276feefe1f37678068dad5d2
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:32:10 2011 +0200
Translation update done using Pootle.
commit 73ccea6d99ee0fa9663d5422e833a384ce85d1fc
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:31:57 2011 +0200
Translation update done using Pootle.
commit 5ef8f41d123e41f1cb577af74d79d032a72fd023
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:31:09 2011 +0200
Translation update done using Pootle.
commit 1ac922804d30983049a633408e4918cb253c89a8
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:30:20 2011 +0200
Translation update done using Pootle.
commit 6412466efaf111c8c7579de23c2c31b310c5611b
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:29:46 2011 +0200
Translation update done using Pootle.
commit b743eb3f2640be07b1ca5df1b8444701d15b8a55
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:29:26 2011 +0200
Translation update done using Pootle.
commit 8176d93bca29f9d2703691fe3fcf9596e0644678
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:29:20 2011 +0200
Translation update done using Pootle.
commit 0f9eee8a049a585eb02270e5aab83a5f248597ce
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:28:09 2011 +0200
Translation update done using Pootle.
commit 33092e1ea4f0ef5746fb4664a3f7a0fe1b24d84a
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:12:32 2011 +0200
Translation update done using Pootle.
commit eb62d0474006ab4530a2b76fc5593aa63d23fc04
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 19:12:11 2011 +0200
Translation update done using Pootle.
commit e268e72a4d28bfaccfffbf61ff35c81415a9f390
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:50:37 2011 +0200
Translation update done using Pootle.
commit c9ced044ef5c9a4d18d0150c64029f7ddcfe296d
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:50:07 2011 +0200
Translation update done using Pootle.
commit e2f0f2fa034a48e970f4b44bc65488d7ca00e32d
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:49:56 2011 +0200
Translation update done using Pootle.
commit 5b5f38c3771baf8b76ed12e3c08973dede407048
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:49:13 2011 +0200
Translation update done using Pootle.
commit e8d6ea6a48a81f6587175f75ace38b843d767e85
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:49:03 2011 +0200
Translation update done using Pootle.
commit 859fd3ced64ba17bd8ddda42c6016fff9fb8f19c
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:48:54 2011 +0200
Translation update done using Pootle.
commit af4acd9ef6986a44d10d24c421d3e79ee3d9c819
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:48:38 2011 +0200
Translation update done using Pootle.
commit f04c28a0542ffdf6b80d4fb08c3a33cc71766408
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:48:21 2011 +0200
Translation update done using Pootle.
commit cff207af23ff16189ba678c0ce73370d1b68ad36
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:47:48 2011 +0200
Translation update done using Pootle.
commit 312c06d02f1a35f453826f980e492768fae5298d
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:47:34 2011 +0200
Translation update done using Pootle.
commit d83b0d193589fa95544f6eb9f640f98656c3c5a6
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:47:15 2011 +0200
Translation update done using Pootle.
commit 0c4fa526fc08a5833114313724ca4739d5fe48a4
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:45:17 2011 +0200
Translation update done using Pootle.
commit df2224b6df5e41a385c29579e8fa1298478d8c5e
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:42:06 2011 +0200
Translation update done using Pootle.
commit 5c171ed5879a0bdfecd2fb147a3899ba6a3d8bf4
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:41:37 2011 +0200
Translation update done using Pootle.
commit 839bbcb91a9bc68bf3f3987b59a90431b91131b0
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:41:03 2011 +0200
Translation update done using Pootle.
commit f9ed73eef958fb7ded03cf74b9180cc716bb3c65
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:40:49 2011 +0200
Translation update done using Pootle.
commit 2b1257ee9429e23be5a011eeff3885f7543b0d69
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:40:11 2011 +0200
Translation update done using Pootle.
commit 219818671026b7a5e21e5899f21f4b125cc93d64
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:39:45 2011 +0200
Translation update done using Pootle.
commit 5871b6ba3d4673ad1934a02bc770d92a380d3e05
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:38:36 2011 +0200
Translation update done using Pootle.
commit ffe862556beb1dec30182bee2de4affafa7a8e93
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:38:09 2011 +0200
Translation update done using Pootle.
commit cd7b134a28f9fe0892aaf6c886853d1eef34fdd5
Author: joehorn <joehorn(a)gmail.com>
Date: Mon May 23 17:37:51 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/zh_TW.po | 115 ++++++++++++++++++++++++++--------------------------------
1 files changed, 52 insertions(+), 63 deletions(-)
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a7eadf5..37210f7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-18 07:46-0400\n"
-"PO-Revision-Date: 2011-05-14 10:37+0200\n"
-"Last-Translator: <thsiao(a)yahoo.com>\n"
+"PO-Revision-Date: 2011-05-23 19:48+0200\n"
+"Last-Translator: <joehorn(a)gmail.com>\n"
"Language-Team: chinese_traditional <zh_TW(a)li.org>\n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -338,14 +338,14 @@ msgid "Collation"
msgstr "校對"
#: db_operations.php:565
-#, fuzzy, php-format
+#, php-format
#| msgid ""
#| "The additional features for working with linked tables have been "
#| "deactivated. To find out why click %shere%s."
msgid ""
"The phpMyAdmin configuration storage has been deactivated. To find out why "
"click %shere%s."
-msgstr "關聯資料表的附加功能未能啟動, %s請按此%s 查出問題原因."
+msgstr "phpMyAdmin 設定儲存功能未能啟動, %s請按此%s 查出問題原因."
#: db_operations.php:600
msgid "Edit or export relational schema"
@@ -400,12 +400,11 @@ msgid "Last check"
msgstr "最後檢查"
#: db_printview.php:220 db_structure.php:439
-#, fuzzy, php-format
+#, php-format
#| msgid "%s table(s)"
msgid "%s table"
msgid_plural "%s tables"
-msgstr[0] "%s 資料表"
-msgstr[1] "%s 資料表"
+msgstr[0] "%s 張資料表"
#: db_qbe.php:41
msgid "You have to choose at least one column to display"
@@ -523,12 +522,11 @@ msgid "Search results for \"<i>%s</i>\" %s:"
msgstr "搜索 \"<i>%s</i>\" 的結果 %s:"
#: db_search.php:247
-#, fuzzy, php-format
+#, php-format
#| msgid "%s match(es) inside table <i>%s</i>"
msgid "%s match inside table <i>%s</i>"
msgid_plural "%s matches inside table <i>%s</i>"
-msgstr[0] "%s 項資料符合 - 於資料表 <i>%s</i>"
-msgstr[1] "%s 項資料符合 - 於資料表 <i>%s</i>"
+msgstr[0] "%s 筆資料符合 - 於資料表 <i>%s</i>"
#: db_search.php:254 libraries/common.lib.php:2830
#: libraries/common.lib.php:3012 libraries/common.lib.php:3013
@@ -537,10 +535,10 @@ msgid "Browse"
msgstr "瀏覽"
#: db_search.php:259
-#, fuzzy, php-format
+#, php-format
#| msgid "Delete tracking data for this table"
msgid "Delete the matches for the %s table?"
-msgstr "刪除此資料表的追蹤資料"
+msgstr "刪除 %s 資料表中符合的資料?"
#: db_search.php:259 libraries/display_tbl.lib.php:1223
#: libraries/display_tbl.lib.php:2153
@@ -555,12 +553,11 @@ msgid "Delete"
msgstr "刪除"
#: db_search.php:272
-#, fuzzy, php-format
+#, php-format
#| msgid "<b>Total:</b> <i>%s</i> match(es)"
msgid "<b>Total:</b> <i>%s</i> match"
msgid_plural "<b>Total:</b> <i>%s</i> matches"
msgstr[0] "<b>總計:</b> <i>%s</i> 項資料符合"
-msgstr[1] "<b>總計:</b> <i>%s</i> 項資料符合"
#: db_search.php:295
msgid "Search in database"
@@ -583,13 +580,11 @@ msgid "Inside table(s):"
msgstr "於以下資料表:"
#: db_search.php:351
-#, fuzzy
#| msgid "Inside table(s):"
msgid "Inside column:"
-msgstr "於以下資料表:"
+msgstr "於以下欄位:"
#: db_structure.php:59
-#, fuzzy
#| msgid "No tables found in database."
msgid "No tables found in database"
msgstr "資料庫中沒有資料表"
@@ -712,24 +707,25 @@ msgid "Analyze table"
msgstr "分析資料表"
#: db_structure.php:521
+#, fuzzy
msgid "Add prefix to table"
-msgstr ""
+msgstr "增加檔案於資料表"
#: db_structure.php:523 libraries/mult_submits.inc.php:246
#, fuzzy
#| msgid "Replace table data with file"
msgid "Replace table prefix"
-msgstr "以檔案取代資料表資料"
+msgstr "以檔案置換資料表"
#: db_structure.php:525 libraries/mult_submits.inc.php:246
#, fuzzy
#| msgid "Replace table data with file"
msgid "Copy table with prefix"
-msgstr "以檔案取代資料表資料"
+msgstr "將檔案複製至資料表"
#: db_structure.php:574 libraries/schema/User_Schema.class.php:387
msgid "Data Dictionary"
-msgstr "數據字典"
+msgstr "資料字典"
#: db_tracking.php:79
msgid "Tracked tables"
@@ -750,7 +746,7 @@ msgstr "資料庫"
#: db_tracking.php:86
msgid "Last version"
-msgstr "上一個版本"
+msgstr "最新版本"
#: db_tracking.php:87 tbl_tracking.php:645
msgid "Created"
@@ -771,7 +767,7 @@ msgstr "狀態"
#: server_privileges.php:1612 server_privileges.php:1805
#: server_privileges.php:2154 tbl_structure.php:208
msgid "Action"
-msgstr "執行"
+msgstr "動作"
#: db_tracking.php:101 js/messages.php:36
msgid "Delete tracking data for this table"
@@ -783,7 +779,7 @@ msgstr "啟用"
#: db_tracking.php:121 tbl_tracking.php:601 tbl_tracking.php:659
msgid "not active"
-msgstr "未啟用"
+msgstr "停用"
#: db_tracking.php:134
msgid "Versions"
@@ -791,7 +787,7 @@ msgstr "版本"
#: db_tracking.php:135 tbl_tracking.php:409 tbl_tracking.php:676
msgid "Tracking report"
-msgstr "追蹤報表"
+msgstr "追蹤報告"
#: db_tracking.php:136 tbl_tracking.php:244 tbl_tracking.php:676
msgid "Structure snapshot"
@@ -804,7 +800,7 @@ msgstr "未追蹤的資料表"
#: db_tracking.php:201 db_tracking.php:203 tbl_structure.php:622
#: tbl_structure.php:624
msgid "Track table"
-msgstr "檢查資料表"
+msgstr "追蹤資料表"
#: db_tracking.php:229
msgid "Database Log"
@@ -813,7 +809,7 @@ msgstr "資料庫紀錄"
#: enum_editor.php:21 libraries/tbl_properties.inc.php:793
#, php-format
msgid "Values for the column \"%s\""
-msgstr "%s 欄的數值"
+msgstr "%s 欄位的值"
#: enum_editor.php:22 libraries/tbl_properties.inc.php:794
msgid "Enter each value in a separate field."
@@ -821,7 +817,7 @@ msgstr "給每一欄位輸入數值"
#: enum_editor.php:57
msgid "+ Restart insertion and add a new value"
-msgstr "+重啟插入並加入新值"
+msgstr "+重新執行插入並增加新值"
#: enum_editor.php:67
msgid "Output"
@@ -829,44 +825,44 @@ msgstr "輸出"
#: enum_editor.php:68
msgid "Copy and paste the joined values into the \"Length/Values\" field"
-msgstr "複製並貼上結合數值至\"Length/Values\"欄位"
+msgstr "複製並貼上結合的數值至 \"Length/Values\" 欄位"
#: export.php:73
msgid "Selected export type has to be saved in file!"
-msgstr "選擇匯出模式必須存入檔案!"
+msgstr "選擇的匯出模式必須被存入檔案!"
#: export.php:164 export.php:189 export.php:671
#, php-format
msgid "Insufficient space to save the file %s."
-msgstr "空間不足儲存檔案 %s."
+msgstr "空間不足以儲存檔案 %s."
#: export.php:307
#, php-format
msgid ""
"File %s already exists on server, change filename or check overwrite option."
-msgstr "檔案 %s 已存在,請更改檔案名稱或選擇「覆寫己存在檔案」選項."
+msgstr "檔案 %s 已存在, 請更改檔案名稱或選擇「覆寫己存在檔案」選項."
#: export.php:311 export.php:315
#, php-format
msgid "The web server does not have permission to save the file %s."
-msgstr "Web 伺服器沒有權限儲存檔案 %s."
+msgstr "權限不足以在 Web 伺服器儲存檔案 %s."
#: export.php:673
#, php-format
msgid "Dump has been saved to file %s."
-msgstr "備份已儲到檔案 %s."
+msgstr "備份已儲存至檔案 %s."
#: import.php:58
#, php-format
msgid ""
"You probably tried to upload too large file. Please refer to %sdocumentation%"
"s for ways to workaround this limit."
-msgstr "你正嘗試上載大容量檔案,請查看此 %s文件%s 如何略過此限制."
+msgstr "您上傳的檔案過大, 請查看此 %s 文件 %s 了解如何解決此限制."
#: import.php:278 import.php:331 libraries/File.class.php:501
#: libraries/File.class.php:611
msgid "File could not be read"
-msgstr "讀案無法讀取"
+msgstr "檔案無法讀取"
#: import.php:286 import.php:295 import.php:314 import.php:323
#: libraries/File.class.php:681 libraries/File.class.php:689
@@ -875,9 +871,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:336
msgid ""
@@ -885,6 +879,8 @@ msgid ""
"file size exceeded the maximum size permitted by your PHP configuration. See "
"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
msgstr ""
+"未接收到要匯入的資料. 可能是檔案名稱未送出, 也可能是檔案大小超出 PHP 限制. 請參閱 "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]。"
#: import.php:371 libraries/display_import.lib.php:23
msgid "Could not load import plugins, please check your installation!"
@@ -892,7 +888,7 @@ msgstr "無法讀取載入的外掛程式, 請檢查安裝程序!"
#: import.php:396
msgid "The bookmark has been deleted."
-msgstr "書籤已經刪除."
+msgstr "書籤已被刪除."
#: import.php:400
msgid "Showing bookmark"
@@ -906,26 +902,26 @@ msgstr "書籤 %s 已建立"
#: import.php:408 import.php:414
#, php-format
msgid "Import has been successfully finished, %d queries executed."
-msgstr "載入成功, 共 %d 句語法已執行."
+msgstr "匯入成功, 共 %d 個查詢語法被執行."
#: import.php:423
msgid ""
"Script timeout passed, if you want to finish import, please resubmit same "
"file and import will resume."
-msgstr "指令已逾時, 如果想完成匯入, 請重提交相同檔案然後匯入會繼續."
+msgstr "指令已逾時, 如果想完成匯入, 請重新送出相同檔案, 送出後匯入動作會繼續執行."
#: import.php:425
msgid ""
"However on last run no data has been parsed, this usually means phpMyAdmin "
"won't be able to finish this import unless you increase php time limits."
-msgstr ""
+msgstr "在最後一次執行時, 解析失敗. 請增加 PHP 運行時間限制, 否則 phpMyAdmin 將無法完成資料匯入."
#: import.php:453 libraries/Message.class.php:185
#: libraries/display_tbl.lib.php:2074 libraries/sql_query_form.lib.php:140
#: tbl_operations.php:228 tbl_relation.php:289 tbl_row_action.php:126
#: view_operations.php:60
msgid "Your SQL query has been executed successfully"
-msgstr "您的SQL語法已順利執行"
+msgstr "您的 SQL 語法已順利執行"
#: import_status.php:30 libraries/common.lib.php:682
#: libraries/schema/Export_Relation_Schema.class.php:215 user_password.php:123
@@ -934,18 +930,18 @@ msgstr "回上一頁"
#: index.php:185
msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
-msgstr "phpMyAdmin 較為適合使用在支援<b>頁框</b>的瀏覽器."
+msgstr "phpMyAdmin 較適合使用在支援<b>頁框</b>的瀏覽器."
#: js/messages.php:25 server_synchronize.php:344 server_synchronize.php:356
#: server_synchronize.php:372 server_synchronize.php:379
#: server_synchronize.php:738 server_synchronize.php:766
#: server_synchronize.php:794 server_synchronize.php:806
msgid "Click to select"
-msgstr "按選"
+msgstr "點擊選取"
#: js/messages.php:26
msgid "Click to unselect"
-msgstr "反按選"
+msgstr "點擊取消"
#: js/messages.php:27 libraries/import.lib.php:103 sql.php:195
msgid "\"DROP DATABASE\" statements are disabled."
@@ -960,16 +956,14 @@ msgid "You are about to DESTROY a complete database!"
msgstr "您將會刪除整個資料庫!"
#: js/messages.php:32
-#, fuzzy
#| msgid "You are about to DESTROY a complete database!"
msgid "You are about to DESTROY a complete table!"
-msgstr "您將會刪除整個資料庫!"
+msgstr "您將會刪除整個資料表!"
#: js/messages.php:33
-#, fuzzy
#| msgid "You are about to DESTROY a complete database!"
msgid "You are about to TRUNCATE a complete table!"
-msgstr "您將會刪除整個資料庫!"
+msgstr "您將會清空整個資料表!"
#: js/messages.php:34
msgid "Dropping Event"
@@ -999,7 +993,7 @@ msgstr "您將要關閉一個BLOB儲存"
#: js/messages.php:43
#, php-format
msgid "Are you sure you want to disable all BLOB references for database %s?"
-msgstr ""
+msgstr "您確定要在資料庫 %s 上停用 BLOB 功能?"
#: js/messages.php:46
msgid "Missing value in the form!"
@@ -1107,31 +1101,27 @@ msgid "Searching"
msgstr "搜索"
#: js/messages.php:84
-#, fuzzy
msgid "Hide search results"
-msgstr "SQL 語法"
+msgstr "隱藏搜尋結果"
#: js/messages.php:85
-#, fuzzy
msgid "Show search results"
-msgstr "SQL 語法"
+msgstr "顯示搜尋結果"
#: js/messages.php:86
-#, fuzzy
#| msgid "Browse"
msgid "Browsing"
msgstr "瀏覽"
#: js/messages.php:87
-#, fuzzy
#| msgid "Deleting %s"
msgid "Deleting"
-msgstr "刪除 %s"
+msgstr "刪除"
#: js/messages.php:90
msgid ""
"Note: If the file contains multiple tables, they will be combined into one"
-msgstr ""
+msgstr "注意: 若檔案包含多個資料表, 它們會被結合成一個資料表."
#: js/messages.php:93
msgid "Hide query box"
@@ -1165,7 +1155,7 @@ msgstr "儲存"
#: js/messages.php:98 libraries/display_tbl.lib.php:593 pmd_general.php:158
#: tbl_change.php:315 tbl_change.php:321
msgid "Hide"
-msgstr ""
+msgstr "隱藏"
#: js/messages.php:101
msgid "Hide search criteria"
@@ -1254,7 +1244,6 @@ msgstr "不適用"
#. l10n: Display text for previous month link in calendar
#: js/messages.php:149
-#, fuzzy
#| msgid "Previous"
msgid "Prev"
msgstr "前一頁"
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1890-ge6026f6
by Michal Čihař 23 May '11
by Michal Čihař 23 May '11
23 May '11
The branch, master has been updated
via e6026f6fafb40081bb8014dd25c8102c8d97a746 (commit)
via eb52f22eb013a12f25f23225a15cb29ba0825f86 (commit)
from 6f1302a4dbe899754d64b421eb6baf7148c0ccb1 (commit)
- Log -----------------------------------------------------------------
commit e6026f6fafb40081bb8014dd25c8102c8d97a746
Merge: 6f1302a4dbe899754d64b421eb6baf7148c0ccb1 eb52f22eb013a12f25f23225a15cb29ba0825f86
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 23 13:22:11 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
index.php | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4ad5111..63fbbea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@
- bug #3305517 [config] Config for export compression not used
- bug #3305883 [interface] Table is dropped regardless of confirmation
- [auth] Fixed error handling for signon auth method.
+- bug #3276001 [core] Avoid caching of index.php.
3.4.1.0 (2011-05-20)
- bug #3301108 [interface] Synchronize and already configured host
diff --git a/index.php b/index.php
index 1a10103..66f6bf5 100644
--- a/index.php
+++ b/index.php
@@ -89,7 +89,7 @@ $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1];
// start output
-header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
+include ('./libraries/header_http.inc.php');
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-36-geb52f22
by Michal Čihař 23 May '11
by Michal Čihař 23 May '11
23 May '11
The branch, QA_3_4 has been updated
via eb52f22eb013a12f25f23225a15cb29ba0825f86 (commit)
from 548b62e93f2281805aff12f286e4df011c8791c4 (commit)
- Log -----------------------------------------------------------------
commit eb52f22eb013a12f25f23225a15cb29ba0825f86
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 23 13:19:43 2011 +0200
bug #3276001 [core] Avoid caching of index.php.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
index.php | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0bed539..07a810a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
- bug #3305517 [config] Config for export compression not used
- bug #3305883 [interface] Table is dropped regardless of confirmation
- [auth] Fixed error handling for signon auth method.
+- bug #3276001 [core] Avoid caching of index.php.
3.4.1.0 (2011-05-20)
- bug #3301108 [interface] Synchronize and already configured host
diff --git a/index.php b/index.php
index 5d19758..5f78320 100644
--- a/index.php
+++ b/index.php
@@ -89,7 +89,7 @@ $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1];
// start output
-header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
+include ('./libraries/header_http.inc.php');
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-1888-g6f1302a
by Michal Čihař 23 May '11
by Michal Čihař 23 May '11
23 May '11
The branch, master has been updated
via 6f1302a4dbe899754d64b421eb6baf7148c0ccb1 (commit)
via 1ec75facafab7fc88e486a20222c07c88730a925 (commit)
via 0c2a2a6220b8f1084c70f7dfdd14b4ab4fc4f4a4 (commit)
via 1300510d3686b40adefafb7f1778a6f06d0a553a (commit)
via 452669a1746898a08129d3a555ac4b1ec084b423 (commit)
from ea10000042cfc3f5cc3415cf17d096b93f290ed4 (commit)
- Log -----------------------------------------------------------------
commit 6f1302a4dbe899754d64b421eb6baf7148c0ccb1
Merge: ea10000042cfc3f5cc3415cf17d096b93f290ed4 1ec75facafab7fc88e486a20222c07c88730a925
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 23 12:01:09 2011 +0200
Merge remote-tracking branch 'origin/QA_3_3'
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. d2f75009d2204c171dfcd64999f8809a8bd1319a
by Michal Čihař 23 May '11
by Michal Čihař 23 May '11
23 May '11
The branch, master has been updated
via d2f75009d2204c171dfcd64999f8809a8bd1319a (commit)
via 26bb3abde05c47327e78fa8999836b35ddabe4a2 (commit)
via 7fe5409a8736fe66cc07ba30ee3cf3ca649deb4a (commit)
via 83bd15e77693f6e58d3884ad0b4ac62d0edd985f (commit)
via 5923080d9dde6160608adc6b03948b261b95dcf6 (commit)
via 19ca40eae807bed1234f78f57f47f812cd074adc (commit)
via adb66418f8d28842831ed6e432235fe37f5b9dd7 (commit)
via 5c3b08548f4ff26692162fe211f1cd0aa4725d6f (commit)
via 5b06c3e90fcaac8fb2e72afc2397310f254e5dad (commit)
via 87d68d9c685dfcbd33d945bf36af8f8a2eb28dd8 (commit)
via 45bae0e634c728169d0247e4ce92c3958107ec90 (commit)
via 6a0c68c1d6a66f7691fa7e17f7ede9f58dd500b1 (commit)
via f96be2ee716abc6b4f58e64ffb56825ebc6083e9 (commit)
via af0a02d9bf0039c8b26c8b7933b3cb4c7a264918 (commit)
via 29338f9b6e50ab162713fdf4e1d4632562e88036 (commit)
via 2dd72e3af6a17b0b52a1276adbf8f5fdaa0cf49e (commit)
via f057887d3a9af06c4b19946785a48fc9db1762b6 (commit)
via 6e44adfcbc36809c190235fce1b92c7b661860a9 (commit)
via 6d49134e02b34893dc9addd2601704c33dc9c647 (commit)
via 31998f5c07c5dcd8b3f529ebeabe5634da41009e (commit)
via de8e8ae3bc6836a015cbc09bb66c31dbe30cd04f (commit)
via a4b66da367816122c03a998b294f0b37de2895bc (commit)
via 698159e21cbaf73d67abd33fb6b6b3fad6042837 (commit)
via bdeb8504583d0aac91fd5912a767691938c9c559 (commit)
via be5abbbe7f915ee22920a8c7e3f035c60c46dc4e (commit)
via 409fbc256b3e0f045e1317c771ed6f642f81c0ca (commit)
via 4970ff188da8f6a0e943844c997e2e01485d2548 (commit)
via 55872c08f7d174efdce39035bcac8ec43c547335 (commit)
via 1521f2e3ede8f10d8636eca3cd0c543b6481a0e2 (commit)
via bba89a553f46284c1b2dd1ca44b8a003ae1b2123 (commit)
via 48519dfa8f2cff0ec41f12259f3384771733dbcc (commit)
via 059b38dee6f086c2fcf06752afe5c977f6ef91d1 (commit)
via 20a44a5e6ec0c1193e6d2f3c16b255280b9e9ee6 (commit)
via b6255da8a54e9b9befe2cb198f8869482f37c81e (commit)
via c65b07a07bff5341448ae2d29c8cf5f1335c8f31 (commit)
via 92c9f325556f1bf2fe0f025248f23865f2029559 (commit)
via 4db1c3afb88dc5d0c822cf1bebe3c42fc46ae202 (commit)
via 679364943688a67d98b84c16294d88958a6e95a7 (commit)
via 1718cfa2acb98ae847e19ed9e8511a3b945b4d32 (commit)
via 2c4e45fcb327196480dc0712e9c18e27c234655d (commit)
via bab46bba9efd160a67121f64b09207ad94908c26 (commit)
via 669311907785bc1a4e5d5bc11d1d893a20bde9ba (commit)
via 71926d8f8444727600123d27e5cc3e163979fbc2 (commit)
via e0f0d3f702269d9a4f3c2a5aee5e6bcd075e165d (commit)
via afff505b4819a0bf1727026345b48da09f75ee6b (commit)
via 1f611c024a734e05aefa1b77d0abc7edbbce1e8e (commit)
via 738f3bf23f3d08188856e3d8269190ee911fa618 (commit)
via a66ab7d9c9269506f7f4ec1599def64cf09cc67c (commit)
via f48d8952704c548fa1dc37ddd2834aa362d73e38 (commit)
via acdaeee06966f78f7efbbbf757d448bfbd65779c (commit)
via 9822def101eef3b6326a350510ea0817a0a39ca0 (commit)
via ff43179ee081e5af7ce4a833c31712584e26b9b8 (commit)
via 965176a0d704c356f8d9a3b7e40c79822a629411 (commit)
via 6c1e6fae09c3e9a6187a7c6ef449166c89dbf93b (commit)
via 352b2d17f6e1662800324f2661368e465009c953 (commit)
via 9150f8f8bc7ccc1c762b9eea07a359be3f712683 (commit)
via 17981a27570c424db0098a63a20a57f1e857837c (commit)
via a66c330410f1bd764867689014b0d145326d6290 (commit)
via 95283b6a935fdfb44a71097c257db546d27dd14b (commit)
via 5192fa1aad43dce2ab6488463a9b341709f26175 (commit)
via 18addac3eb35b50fcace90cc4e778c752e888229 (commit)
via e476a55bc00907a9392344f6a182e382169dec9f (commit)
via aa04b975ec1c7ef9b8a73cdbda436b14e9a90632 (commit)
via 6453decec16051ddba22bf2e714fa8e572d9c0ac (commit)
via d49e03ec2b1d90ec6856d86811c7e907eba231e1 (commit)
via 0d4daca08da82cb3ec7459c2b8f979f4ec303adf (commit)
via 5e14f89b15f7791224c247ed4144767f7ca503e5 (commit)
via e2568103702ac5603a0c7a9ce8dce67bb4fd167c (commit)
via 03a86f5eb1886a2d4ba4561670956dfdddd61eb3 (commit)
via e3f33cf81a49d787648b27d00cfce1f6979fe352 (commit)
via 855dacff00b2a05dfb3b36cab2429237b7b5a799 (commit)
via 3ebdc39964a4f50cf63d4bc7bf6b77b48776f13f (commit)
via 8682aa1547adb2ebc6d62d38ee6f76dba706bd61 (commit)
via a672c1d63434d43d6fda4e6810e742bf4cee302f (commit)
via a94247eec3c624ad7b01985487742d3a60d0c8ee (commit)
via e4b5bc2f9380d81c32703ead9c2eab8efce15fdf (commit)
via 18b8d7b71c46957e474bf3dfdbbc742c22a405b9 (commit)
via 30d29a7af0f5a2a49bb5d1903c9b562ac0657f23 (commit)
via cfa93caf9ee53efcd82f320ba3b383eaf52754d5 (commit)
via d3732682942f94ecfc852555b3d378c8551b4f3d (commit)
via 792e6adfcb5d5e1b60f477e2107a899cc841a22f (commit)
via 8c0f93cd849cfd2ce7d3b73e98e0bd9b13d14b75 (commit)
via d754e9bf1f561c29ec0354f53f9755f5a366e86d (commit)
via 2bf38ad27e04f0106022b869b6b7c72314f86a2c (commit)
via ba3cd8d01bd3aee2d51b933265068cb7f9188e0a (commit)
via 9b4738f7e5497046d387efe313b2ed2ec0409e0e (commit)
via b1e227a0227728a13dce7d5acecb070e32a0ccfd (commit)
via 7ce9b2ab3c434be1233b2dd373a02315d791cd4a (commit)
via 946457758ac758122bd5553640c677c03e7299bc (commit)
via cfe7d2058ef73e56a1a14e34bbe100e2b5bcf9a7 (commit)
via 08a0098543c2724ee9e796a293089094fd149c6c (commit)
via 78a71e0c94719c24df3319c14e76d53fa09220af (commit)
via 6e968c39a035eb100729a9875d3b06af3127a04b (commit)
via f13d13ba1f7aef7205c80c3c3e940180e2f7ca2e (commit)
via 2133c5bc0e928312f92272a7e61ca78eef205d8d (commit)
via d09790e82b4db8fd5479aff3835be86b05ce4d2a (commit)
via 3f2be824c4c6246ab526d4d66d7669dc9dbda69b (commit)
via 7feb4102037f544e7ef7705c7188d4887d9f2e82 (commit)
via 32140cdd74842c1debd22f37c909d70e3acf2035 (commit)
via 004a31fa7b41facdedb5cd2336d01d344bcfa957 (commit)
via df2d2c0b712d944fe5d582f6e35ef579b268ca71 (commit)
via fd5e92927088bf6e89f813996b791f2c03323fe6 (commit)
via 8717642208557dec780a3846cb7846e8e1b97b12 (commit)
via 1eeaf3bdca0fe634632040976d54e145a3eac8c3 (commit)
via 4c506fe464e9910c4a0fd446d96a15db93d71e31 (commit)
via d84953198fbaf6bbcca80503af9531c87f39b538 (commit)
via 9f0c762ceffcb51c4fab3a55b7e0e1d67996a28a (commit)
via d087abf33313e3625bbe50df8cd4ebb8ef342f32 (commit)
via d1690798c8a393bed46e44f621586a19478750a3 (commit)
via 563032ef3510f1bb1abde761f4acfcfd7b9c8dbf (commit)
via 9ad3522d4e96056fbd10449aed514f9a0fde47c8 (commit)
via 4a3a7acebcd30bdc63300293fcbea72aec3959ff (commit)
via 2de7216fee8937a5d7fd00d198b60b546a66cbb8 (commit)
via e1995deb2851b581a48e31aa4d1d05e1510a65ce (commit)
via 56b070d26d5e33dd35f1e0075ec25410abd4d07c (commit)
via d79bce6675b1c26f98d1e859940d38c62faffa6b (commit)
via ac51b0a8c45e5fab9adf4b2e5f41fc6c985ae097 (commit)
via 66e761fdf2997708147aa467d3d167b9e0441393 (commit)
via 6073d4b9a735984c3d89bc8e91d224ac00d804ee (commit)
via 5fde0be78ea581c352bec626d2342de20883ebd2 (commit)
via b8382f2396893dcfde984abe901c325653925b4c (commit)
from 63b91e7a3b6dbea6beb9c30a56fd75784b371795 (commit)
- Log -----------------------------------------------------------------
commit d2f75009d2204c171dfcd64999f8809a8bd1319a
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 23 10:42:29 2011 +0200
Update
commit 26bb3abde05c47327e78fa8999836b35ddabe4a2
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:35:26 2011 +0200
Translation update done using Pootle.
commit 7fe5409a8736fe66cc07ba30ee3cf3ca649deb4a
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:34:59 2011 +0200
Translation update done using Pootle.
commit 83bd15e77693f6e58d3884ad0b4ac62d0edd985f
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:34:08 2011 +0200
Translation update done using Pootle.
commit 5923080d9dde6160608adc6b03948b261b95dcf6
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:33:33 2011 +0200
Translation update done using Pootle.
commit 19ca40eae807bed1234f78f57f47f812cd074adc
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:33:02 2011 +0200
Translation update done using Pootle.
commit adb66418f8d28842831ed6e432235fe37f5b9dd7
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:32:35 2011 +0200
Translation update done using Pootle.
commit 5c3b08548f4ff26692162fe211f1cd0aa4725d6f
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:32:13 2011 +0200
Translation update done using Pootle.
commit 5b06c3e90fcaac8fb2e72afc2397310f254e5dad
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:31:59 2011 +0200
Translation update done using Pootle.
commit 87d68d9c685dfcbd33d945bf36af8f8a2eb28dd8
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:31:18 2011 +0200
Translation update done using Pootle.
commit 45bae0e634c728169d0247e4ce92c3958107ec90
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:31:01 2011 +0200
Translation update done using Pootle.
commit 6a0c68c1d6a66f7691fa7e17f7ede9f58dd500b1
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:30:46 2011 +0200
Translation update done using Pootle.
commit f96be2ee716abc6b4f58e64ffb56825ebc6083e9
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:29:31 2011 +0200
Translation update done using Pootle.
commit af0a02d9bf0039c8b26c8b7933b3cb4c7a264918
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:28:20 2011 +0200
Translation update done using Pootle.
commit 29338f9b6e50ab162713fdf4e1d4632562e88036
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:27:28 2011 +0200
Translation update done using Pootle.
commit 2dd72e3af6a17b0b52a1276adbf8f5fdaa0cf49e
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:26:58 2011 +0200
Translation update done using Pootle.
commit f057887d3a9af06c4b19946785a48fc9db1762b6
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:24:48 2011 +0200
Translation update done using Pootle.
commit 6e44adfcbc36809c190235fce1b92c7b661860a9
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:23:20 2011 +0200
Translation update done using Pootle.
commit 6d49134e02b34893dc9addd2601704c33dc9c647
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:21:15 2011 +0200
Translation update done using Pootle.
commit 31998f5c07c5dcd8b3f529ebeabe5634da41009e
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:20:48 2011 +0200
Translation update done using Pootle.
commit de8e8ae3bc6836a015cbc09bb66c31dbe30cd04f
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:20:13 2011 +0200
Translation update done using Pootle.
commit a4b66da367816122c03a998b294f0b37de2895bc
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:19:48 2011 +0200
Translation update done using Pootle.
commit 698159e21cbaf73d67abd33fb6b6b3fad6042837
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:19:12 2011 +0200
Translation update done using Pootle.
commit bdeb8504583d0aac91fd5912a767691938c9c559
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:19:05 2011 +0200
Translation update done using Pootle.
commit be5abbbe7f915ee22920a8c7e3f035c60c46dc4e
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:19:01 2011 +0200
Translation update done using Pootle.
commit 409fbc256b3e0f045e1317c771ed6f642f81c0ca
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:18:22 2011 +0200
Translation update done using Pootle.
commit 4970ff188da8f6a0e943844c997e2e01485d2548
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:17:58 2011 +0200
Translation update done using Pootle.
commit 55872c08f7d174efdce39035bcac8ec43c547335
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:17:03 2011 +0200
Translation update done using Pootle.
commit 1521f2e3ede8f10d8636eca3cd0c543b6481a0e2
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:16:19 2011 +0200
Translation update done using Pootle.
commit bba89a553f46284c1b2dd1ca44b8a003ae1b2123
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:15:57 2011 +0200
Translation update done using Pootle.
commit 48519dfa8f2cff0ec41f12259f3384771733dbcc
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:15:26 2011 +0200
Translation update done using Pootle.
commit 059b38dee6f086c2fcf06752afe5c977f6ef91d1
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:14:33 2011 +0200
Translation update done using Pootle.
commit 20a44a5e6ec0c1193e6d2f3c16b255280b9e9ee6
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:14:13 2011 +0200
Translation update done using Pootle.
commit b6255da8a54e9b9befe2cb198f8869482f37c81e
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:13:43 2011 +0200
Translation update done using Pootle.
commit c65b07a07bff5341448ae2d29c8cf5f1335c8f31
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:13:02 2011 +0200
Translation update done using Pootle.
commit 92c9f325556f1bf2fe0f025248f23865f2029559
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:12:45 2011 +0200
Translation update done using Pootle.
commit 4db1c3afb88dc5d0c822cf1bebe3c42fc46ae202
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:12:16 2011 +0200
Translation update done using Pootle.
commit 679364943688a67d98b84c16294d88958a6e95a7
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:11:23 2011 +0200
Translation update done using Pootle.
commit 1718cfa2acb98ae847e19ed9e8511a3b945b4d32
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:11:09 2011 +0200
Translation update done using Pootle.
commit 2c4e45fcb327196480dc0712e9c18e27c234655d
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:10:25 2011 +0200
Translation update done using Pootle.
commit bab46bba9efd160a67121f64b09207ad94908c26
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:10:04 2011 +0200
Translation update done using Pootle.
commit 669311907785bc1a4e5d5bc11d1d893a20bde9ba
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:09:35 2011 +0200
Translation update done using Pootle.
commit 71926d8f8444727600123d27e5cc3e163979fbc2
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:09:22 2011 +0200
Translation update done using Pootle.
commit e0f0d3f702269d9a4f3c2a5aee5e6bcd075e165d
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:09:07 2011 +0200
Translation update done using Pootle.
commit afff505b4819a0bf1727026345b48da09f75ee6b
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:07:25 2011 +0200
Translation update done using Pootle.
commit 1f611c024a734e05aefa1b77d0abc7edbbce1e8e
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:07:12 2011 +0200
Translation update done using Pootle.
commit 738f3bf23f3d08188856e3d8269190ee911fa618
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:06:19 2011 +0200
Translation update done using Pootle.
commit a66ab7d9c9269506f7f4ec1599def64cf09cc67c
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:04:59 2011 +0200
Translation update done using Pootle.
commit f48d8952704c548fa1dc37ddd2834aa362d73e38
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:04:28 2011 +0200
Translation update done using Pootle.
commit acdaeee06966f78f7efbbbf757d448bfbd65779c
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:03:29 2011 +0200
Translation update done using Pootle.
commit 9822def101eef3b6326a350510ea0817a0a39ca0
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:02:59 2011 +0200
Translation update done using Pootle.
commit ff43179ee081e5af7ce4a833c31712584e26b9b8
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:02:07 2011 +0200
Translation update done using Pootle.
commit 965176a0d704c356f8d9a3b7e40c79822a629411
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:01:51 2011 +0200
Translation update done using Pootle.
commit 6c1e6fae09c3e9a6187a7c6ef449166c89dbf93b
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:01:20 2011 +0200
Translation update done using Pootle.
commit 352b2d17f6e1662800324f2661368e465009c953
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 04:00:48 2011 +0200
Translation update done using Pootle.
commit 9150f8f8bc7ccc1c762b9eea07a359be3f712683
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 03:59:46 2011 +0200
Translation update done using Pootle.
commit 17981a27570c424db0098a63a20a57f1e857837c
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 03:59:09 2011 +0200
Translation update done using Pootle.
commit a66c330410f1bd764867689014b0d145326d6290
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 03:58:49 2011 +0200
Translation update done using Pootle.
commit 95283b6a935fdfb44a71097c257db546d27dd14b
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sun May 22 03:57:55 2011 +0200
Translation update done using Pootle.
commit 5192fa1aad43dce2ab6488463a9b341709f26175
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Sat May 21 21:17:25 2011 +0200
Translation update done using Pootle.
commit 18addac3eb35b50fcace90cc4e778c752e888229
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:56:52 2011 +0200
Translation update done using Pootle.
commit e476a55bc00907a9392344f6a182e382169dec9f
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:42:59 2011 +0200
Translation update done using Pootle.
commit aa04b975ec1c7ef9b8a73cdbda436b14e9a90632
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:42:49 2011 +0200
Translation update done using Pootle.
commit 6453decec16051ddba22bf2e714fa8e572d9c0ac
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:40:55 2011 +0200
Translation update done using Pootle.
commit d49e03ec2b1d90ec6856d86811c7e907eba231e1
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:40:46 2011 +0200
Translation update done using Pootle.
commit 0d4daca08da82cb3ec7459c2b8f979f4ec303adf
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:38:10 2011 +0200
Translation update done using Pootle.
commit 5e14f89b15f7791224c247ed4144767f7ca503e5
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:38:00 2011 +0200
Translation update done using Pootle.
commit e2568103702ac5603a0c7a9ce8dce67bb4fd167c
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:37:44 2011 +0200
Translation update done using Pootle.
commit 03a86f5eb1886a2d4ba4561670956dfdddd61eb3
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:37:41 2011 +0200
Translation update done using Pootle.
commit e3f33cf81a49d787648b27d00cfce1f6979fe352
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:36:27 2011 +0200
Translation update done using Pootle.
commit 855dacff00b2a05dfb3b36cab2429237b7b5a799
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:36:23 2011 +0200
Translation update done using Pootle.
commit 3ebdc39964a4f50cf63d4bc7bf6b77b48776f13f
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:34:18 2011 +0200
Translation update done using Pootle.
commit 8682aa1547adb2ebc6d62d38ee6f76dba706bd61
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:34:02 2011 +0200
Translation update done using Pootle.
commit a672c1d63434d43d6fda4e6810e742bf4cee302f
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:29:51 2011 +0200
Translation update done using Pootle.
commit a94247eec3c624ad7b01985487742d3a60d0c8ee
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:29:27 2011 +0200
Translation update done using Pootle.
commit e4b5bc2f9380d81c32703ead9c2eab8efce15fdf
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:29:18 2011 +0200
Translation update done using Pootle.
commit 18b8d7b71c46957e474bf3dfdbbc742c22a405b9
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:29:05 2011 +0200
Translation update done using Pootle.
commit 30d29a7af0f5a2a49bb5d1903c9b562ac0657f23
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:28:53 2011 +0200
Translation update done using Pootle.
commit cfa93caf9ee53efcd82f320ba3b383eaf52754d5
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:28:38 2011 +0200
Translation update done using Pootle.
commit d3732682942f94ecfc852555b3d378c8551b4f3d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:28:05 2011 +0200
Translation update done using Pootle.
commit 792e6adfcb5d5e1b60f477e2107a899cc841a22f
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:28:02 2011 +0200
Translation update done using Pootle.
commit 8c0f93cd849cfd2ce7d3b73e98e0bd9b13d14b75
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:27:05 2011 +0200
Translation update done using Pootle.
commit d754e9bf1f561c29ec0354f53f9755f5a366e86d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:27:03 2011 +0200
Translation update done using Pootle.
commit 2bf38ad27e04f0106022b869b6b7c72314f86a2c
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:18:51 2011 +0200
Translation update done using Pootle.
commit ba3cd8d01bd3aee2d51b933265068cb7f9188e0a
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:15:14 2011 +0200
Translation update done using Pootle.
commit 9b4738f7e5497046d387efe313b2ed2ec0409e0e
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:15:05 2011 +0200
Translation update done using Pootle.
commit b1e227a0227728a13dce7d5acecb070e32a0ccfd
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:14:24 2011 +0200
Translation update done using Pootle.
commit 7ce9b2ab3c434be1233b2dd373a02315d791cd4a
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:14:16 2011 +0200
Translation update done using Pootle.
commit 946457758ac758122bd5553640c677c03e7299bc
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 11:13:53 2011 +0200
Translation update done using Pootle.
commit cfe7d2058ef73e56a1a14e34bbe100e2b5bcf9a7
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 10:43:07 2011 +0200
Translation update done using Pootle.
commit 08a0098543c2724ee9e796a293089094fd149c6c
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 10:34:02 2011 +0200
Translation update done using Pootle.
commit 78a71e0c94719c24df3319c14e76d53fa09220af
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat May 21 10:33:41 2011 +0200
Translation update done using Pootle.
commit 6e968c39a035eb100729a9875d3b06af3127a04b
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:18:03 2011 +0200
Translation update done using Pootle.
commit f13d13ba1f7aef7205c80c3c3e940180e2f7ca2e
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:16:49 2011 +0200
Translation update done using Pootle.
commit 2133c5bc0e928312f92272a7e61ca78eef205d8d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:16:40 2011 +0200
Translation update done using Pootle.
commit d09790e82b4db8fd5479aff3835be86b05ce4d2a
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:16:29 2011 +0200
Translation update done using Pootle.
commit 3f2be824c4c6246ab526d4d66d7669dc9dbda69b
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:16:16 2011 +0200
Translation update done using Pootle.
commit 7feb4102037f544e7ef7705c7188d4887d9f2e82
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:16:01 2011 +0200
Translation update done using Pootle.
commit 32140cdd74842c1debd22f37c909d70e3acf2035
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:15:40 2011 +0200
Translation update done using Pootle.
commit 004a31fa7b41facdedb5cd2336d01d344bcfa957
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:15:29 2011 +0200
Translation update done using Pootle.
commit df2d2c0b712d944fe5d582f6e35ef579b268ca71
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:14:25 2011 +0200
Translation update done using Pootle.
commit fd5e92927088bf6e89f813996b791f2c03323fe6
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:14:14 2011 +0200
Translation update done using Pootle.
commit 8717642208557dec780a3846cb7846e8e1b97b12
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:13:29 2011 +0200
Translation update done using Pootle.
commit 1eeaf3bdca0fe634632040976d54e145a3eac8c3
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:13:17 2011 +0200
Translation update done using Pootle.
commit 4c506fe464e9910c4a0fd446d96a15db93d71e31
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:13:04 2011 +0200
Translation update done using Pootle.
commit d84953198fbaf6bbcca80503af9531c87f39b538
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:12:06 2011 +0200
Translation update done using Pootle.
commit 9f0c762ceffcb51c4fab3a55b7e0e1d67996a28a
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:11:58 2011 +0200
Translation update done using Pootle.
commit d087abf33313e3625bbe50df8cd4ebb8ef342f32
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:10:00 2011 +0200
Translation update done using Pootle.
commit d1690798c8a393bed46e44f621586a19478750a3
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:09:52 2011 +0200
Translation update done using Pootle.
commit 563032ef3510f1bb1abde761f4acfcfd7b9c8dbf
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:08:11 2011 +0200
Translation update done using Pootle.
commit 9ad3522d4e96056fbd10449aed514f9a0fde47c8
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:07:55 2011 +0200
Translation update done using Pootle.
commit 4a3a7acebcd30bdc63300293fcbea72aec3959ff
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:07:38 2011 +0200
Translation update done using Pootle.
commit 2de7216fee8937a5d7fd00d198b60b546a66cbb8
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:06:36 2011 +0200
Translation update done using Pootle.
commit e1995deb2851b581a48e31aa4d1d05e1510a65ce
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 23:06:17 2011 +0200
Translation update done using Pootle.
commit 56b070d26d5e33dd35f1e0075ec25410abd4d07c
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 22:37:24 2011 +0200
Translation update done using Pootle.
commit d79bce6675b1c26f98d1e859940d38c62faffa6b
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 22:34:12 2011 +0200
Translation update done using Pootle.
commit ac51b0a8c45e5fab9adf4b2e5f41fc6c985ae097
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 22:34:00 2011 +0200
Translation update done using Pootle.
commit 66e761fdf2997708147aa467d3d167b9e0441393
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 22:33:50 2011 +0200
Translation update done using Pootle.
commit 6073d4b9a735984c3d89bc8e91d224ac00d804ee
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 22:22:54 2011 +0200
Translation update done using Pootle.
commit 5fde0be78ea581c352bec626d2342de20883ebd2
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 22:22:43 2011 +0200
Translation update done using Pootle.
commit b8382f2396893dcfde984abe901c325653925b4c
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Fri May 20 20:51:17 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
output/es/Documentation.html | 6 +-
output/ja/Documentation.html | 243 ++++++++++++++++++------------------------
output/ja/TODO | 2 +-
output/tr/Documentation.html | 174 ++++++++++++++++---------------
po/es.po | 5 +-
po/ja.po | 236 ++++++++++++++++++++++-------------------
po/tr.po | 116 ++++++++++++++++----
7 files changed, 421 insertions(+), 361 deletions(-)
diff --git a/output/es/Documentation.html b/output/es/Documentation.html
index 9a246f6..0819b42 100644
--- a/output/es/Documentation.html
+++ b/output/es/Documentation.html
@@ -1376,9 +1376,9 @@ bases de datos para el marco de navegación.
</dd>
<dt>cadena <span
id="cfg_Servers_SignonSession">$cfg['Servers'][$i]['SignonSession']</span></dt>
- <dd>Name of session which will be used for signon authentication method. You
-should use something different than <code>phpMyAdmin</code>, because this is
-session which phpMyAdmin uses internally.
+ <dd>El nombre de la sesión a utilizar para el método de autenticación
+signon. Deberías de utilizar algo distinto a <code>phpMyAdmin</code> ya que
+ese es el nombre de sesión phpMyAdmin utiliza internamente.
</dd>
<dt>cadena <span
id="cfg_Servers_SignonURL">$cfg['Servers'][$i]['SignonURL']</span></dt>
diff --git a/output/ja/Documentation.html b/output/ja/Documentation.html
index 4a17dc1..b75ce52 100644
--- a/output/ja/Documentation.html
+++ b/output/ja/Documentation.html
@@ -55,7 +55,7 @@ class="myadmin">MyAdmin</span></a> 3.5.0-dev ドキュメント
href="http://www.phpmyadmin.net/documentation/">phpMyAdminドキュメント</a>の翻訳版です。<a
href="https://l10n.cihar.com/projects/pmadoc/">翻訳サーバ</a>にて翻訳作業に貢献することができます。
</p>
-<ul><li><a href="http://www.phpmyadmin.net/"> phpMyAdmin ホームページ</a></li>
+<ul><li><a href="http://www.phpmyadmin.net/">phpMyAdmin オフィシャルサイト</a></li>
<li><a href="https://sourceforge.net/projects/phpmyadmin/">SourceForge
phpMyAdmin プロジェクトページ</a></li>
<li><a href="http://wiki.phpmyadmin.net">オフィシャル phpMyAdmin wiki</a></li>
@@ -342,7 +342,7 @@ you might find near the end of your configuration file.</p>
<h3 id="authentication_modes">認証モードの使い方</h3>
<ul><li><b>マルチユーザ環境</b>では、ユーザが自分のデータベースにアクセスできるよう、また他人のデータベースにいたずらできないよう、<abbr
-title="HyperText Transfer Protocol">HTTP</abbr>/クッキー認証モードにするのがお奨めです。<br />
+title="HyperText Transfer Protocol">HTTP</abbr>/クッキー認証モードにするのがお勧めです。<br />
ただし、ご注意ください。マイクロソフトの Internet Explorer は、クッキーに関しては本当にバグが多いようです。少なくともバージョン 6
まではそうです。<br />
また、<b>シングルユーザ環境</b>であっても <abbr title="HyperText Transfer
@@ -355,8 +355,7 @@ href="#controluser">「管理ユーザ」</a>は別かもしれませんが)
ただし、忘れてはなりません。HTTPS プロトコルを使わない限り、パスワードはプレーンテキストのままやりとりされます。<br />
また、クッキーモードでは、blowfish アルゴリズムで暗号化されてはいますが、パスワードは一時的にクッキーに保管されます。</li>
- <li id="pmausr">Note: this section is only applicable if your MySQL server is running with
-<tt>--skip-show-database</tt>.<br /><br />
+ <li id="pmausr">注:この項目は、MySQL サーバが <tt>--skip-show-database</tt> を適用して稼動している場合のみに使用できます。<br /><br />
「HTTP」/「クッキー」モードでは管理ユーザが必要です。このユーザは <i>`mysql`.`user` (`Password`
以外の全カラム)</i>、<i>`mysql`.`db` (全カラム)</i>、<i>`mysql`.`host`
@@ -366,10 +365,9 @@ class="configrule">$cfg['Servers'][$i]['controluser']</a></tt> と <tt><a
href="#cfg_Servers_controlpass"
class="configrule">$cfg['Servers'][$i]['controlpass']</a></tt> 項目には<a
href="#controluser">管理ユーザ</a>の情報を登録しなければなりません。<br />
- The following example assumes you want to use <tt>pma</tt> as the
-controluser and <tt>pmapass</tt> as the controlpass, but <b>this is only an
-example: use something else in your file!</b> Input these statements from
-the phpMyAdmin SQL Query window or mysql command–line client.<br />
+ 下記の例では <tt>pma</tt> を管理ユーザ、<tt>pmapass</tt>
+を管理パスワードと想定していますが、<b>これはあくまでも例です。ご自分のファイルでは設定を変えてください!</b> phpMyAdmin の SQL
+クエリウィンドウまたは mysql コマンドラインクライアントからこれらのコマンドを入力します。<br />
もちろん MySQL サーバのホストがウェブサーバのホストと異なる場合は <tt>localhost</tt>
をウェブサーバのホストで差し替える必要があります。
@@ -431,8 +429,7 @@ title="HyperText Transfer Protocol">HTTP</abbr>」認証モードと <i>.htacces
<ul><li><abbr title="HyperText Transfer Protocol">HTTP</abbr> 認証のかわりに利用できます(たとえば
<abbr title="Internet Information Services">IIS</abbr> を稼動させている場合など)。</li>
<li>もちろんユーザがブラウザのクッキーを有効にしている必要がありますが、現在では全ての認証方式でクッキーが必要となっています。</li>
- <li>With this mode, the user can truly log out of phpMyAdmin and log in back
-with the same username.</li>
+ <li>このモードでは、ユーザは phpMyAdmin のログアウトが確実に行え、同じユーザー名でログインし直すことができます。</li>
<li>任意のサーバにログインしたい場合は、<a href="#AllowArbitraryServer"
class="configrule">$cfg['AllowArbitraryServer']</a> ディレクティブをご覧ください。</li>
<li><a href="#require">「必要なもの」</a>の章にも書いてある通り、<tt>mcrypt</tt>
@@ -602,7 +599,7 @@ MySQL サーバでもほぼ確実に利用できるためです。ソケット
<tt><i>mysql</i></tt> : 古典的な MySQL 拡張です。現時点ではおすすめできるデフォルトの方法です。<br /><br />
<tt><i>mysqli</i></tt> : MySQL 拡張の改良版です。この拡張は PHP 5.0.0 で利用できるようになりました。MySQL
-4.1.x 以降が稼動しているサーバに接続する場合はお奨めです。</dd>
+4.1.x 以降が稼動しているサーバに接続する場合はお勧めです。</dd>
<dt id="cfg_Servers_compress">$cfg['Servers'][$i]['compress'] boolean</dt>
<dd>MySQL サーバとの接続に圧縮プロトコルを使うかどうかが入ります(実験段階です)。<br />
@@ -1071,7 +1068,7 @@ superuser.<br /><br />
このチェック機能はこの変数を false にすることで無効にできます。無効にするとパフォーマンスが向上します。<br /><br />
- 確実にテーブル構造が最新になっているときは FALSE にするのがおすすめです。</dd>
+ 確実にテーブル構造が最新になっているときは FALSE にするのがお勧めです。</dd>
<dt><span id="cfg_Servers_AllowRoot">$cfg['Servers'][$i]['AllowRoot']</span>
boolean</dt>
<dd>ルートのアクセスを許可するかどうか。これは下記の規則を簡略化しただけのものです。
@@ -1112,7 +1109,7 @@ detecting IP address behind proxies.
<dt id="servers_allowdeny_rules">
<span
id="cfg_Servers_AllowDeny_rules">$cfg['Servers'][$i]['AllowDeny']['rules']</span>
-strings の array
+文字列の配列
</dt>
<dd>この規則の一般的なフォーマットは次の通りです。
@@ -1122,8 +1119,8 @@ strings の array
すべてのユーザに一致させたいのであれば、<i>username</i> フィールドにワイルドカードとして <tt>'%'</tt>
を入れることもできます。<br />
- また、<i>ipmask</i>
-フィールドでもいくつかショートカットが利用できます(ご注意ください。SERVER_ADDRESSの部分はどんなサーバでも利用できるとは限りません):
+ また、<i>ipmask</i> フィールドでもいくつかショートカットが利用できます(SERVER_ADDRESS
+の部分はどんなウェブサーバでも利用できるとは限りませんので注意してください)。
<pre>
'all' -> 0.0.0.0/0
'localhost' -> 127.0.0.1/8
@@ -1136,18 +1133,17 @@ strings の array
と、適用順が <tt>「allow,deny」</tt> ないし <tt>「explicit」</tt> の場合は <tt>「deny % from
all」</tt> と等価になります。<br /><br />
- For the <abbr title="Internet Protocol">IP</abbr> matching system, the
-following work:<br />
- <tt>xxx.xxx.xxx.xxx</tt> (an exact <abbr title="Internet Protocol">IP</abbr>
-address)<br />
- <tt>xxx.xxx.xxx.[yyy-zzz]</tt> (an <abbr title="Internet Protocol">IP</abbr>
-address range)<br />
- <tt>xxx.xxx.xxx.xxx/nn</tt> (CIDR, Classless Inter-Domain Routing type <abbr
-title="Internet Protocol">IP</abbr> addresses)<br />
- ただし、下記は利用できません:<br />
- <tt>xxx.xxx.xxx.xx[yyy-zzz]</tt> (partial <abbr title="Internet
-Protocol">IP</abbr> address range)<br />
- Also IPv6 addresses are not supported.
+ <abbr title="インターネット・プロトコル">IP</abbr> のマッチング規則としては、下記が利用できます。<br />
+ <tt>xxx.xxx.xxx.xxx</tt> (単一の <abbr title="インターネット・プロトコル">IP</abbr>
+アドレスそのもの)<br />
+ <tt>xxx.xxx.xxx.xx[yyy-zzz]</tt>(<abbr title="インターネット・プロトコル">IP</abbr>
+アドレスの範囲指定)<br />
+ <tt>xxx.xxx.xxx.xxx/nn</tt> (CIDR(Classless Inter-Domain Routing)タイプの <abbr
+title="インターネット・プロトコル">IP</abbr> アドレス)<br />
+ ただし、以下は利用できません。<br />
+ <tt>xxx.xxx.xxx.xx[yyy-zzz]</tt>(<abbr title="インターネット・プロトコル">IP</abbr>
+アドレスの一部範囲指定)<br />
+ それと、IPv6 アドレスもサポートしていません。
</dd>
<dt><span id="cfg_Servers_DisableIS">$cfg['Servers'][$i]['DisableIS']</span>
boolean</dt>
@@ -1283,7 +1279,7 @@ might limit session validity and if session is lost, login cookie is also
invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code>
not lower than the value of $cfg['LoginCookieValidity'].</dd>
- <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [秒数]</dt>
+ <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] 整数 [秒数]</dt>
<dd>Define how long login cookie should be stored in browser. Default 0 means
that it will be kept for existing session. This is recommended for not
trusted environments.</dd>
@@ -1300,9 +1296,8 @@ from other server, when you are using more of them.</dd>
<dd>複数のクエリを含む文のクエリのひとつが失敗したときに処理を続けるかどうかを定義します。デフォルトでは処理を中止します。</dd>
<dt id="cfg_VerboseMultiSubmit">$cfg['VerboseMultiSubmit'] boolean</dt>
- <dd>Define whether phpMyAdmin will output the results of each query of a
-multi-query statement embedded into the <abbr title="structured query
-language">SQL</abbr> output as inline comments. Defaults to <tt>TRUE</tt>.</dd>
+ <dd>マルチクエリを含む文のそれぞれのクエリの結果を <abbr title="structured query language">SQL</abbr>
+出力のなかにインラインコメントとして埋め込むかどうかを定義します。デフォルトは <tt>TRUE</tt> です。</dd>
<dt id="AllowArbitraryServer">
<span id="cfg_AllowArbitraryServer">$cfg['AllowArbitraryServer']</span>
boolean</dt>
@@ -1315,10 +1310,10 @@ Protocol">HTTP</abbr> サーバが置かれているファイアウォールの
</dd>
<dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt>
- <dd>Whether to display errors from PHP or not.</dd>
+ <dd>PHP からのエラーを表示するかどうか。</dd>
<dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] boolean</dt>
- <dd>Whether to gather errors from PHP or not.</dd>
+ <dd>PHP からのエラーを収集するかどうか。</dd>
<dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt>
<dd>Defines whether to use a select-based menu and display only the current
@@ -1334,12 +1329,12 @@ href="#cfg_LeftFrameDBSeparator"
class="configrule">$cfg['LeftFrameDBSeparator']</a> もご覧ください。
</dd>
- <dt id="cfg_LeftFrameDBSeparator">$cfg['LeftFrameDBSeparator'] string または array</dt>
+ <dt id="cfg_LeftFrameDBSeparator">$cfg['LeftFrameDBSeparator'] 文字列または配列</dt>
<dd>The string used to separate the parts of the database name when showing them
in a tree. Alternatively you can specify more strings in an array and all of
them will be used as a separator.</dd>
- <dt id="cfg_LeftFrameTableSeparator">$cfg['LeftFrameTableSeparator'] string</dt>
+ <dt id="cfg_LeftFrameTableSeparator">$cfg['LeftFrameTableSeparator'] 文字列</dt>
<dd>Defines a string to be used to nest table spaces. Defaults to '__'. This
means if you have tables like 'first__second__third' this will be shown as a
three-level hierarchy like: first > second > third. If set to FALSE
@@ -1347,7 +1342,7 @@ or empty, the feature is disabled. NOTE: You should not use this separator
at the beginning or end of a table name or multiple times after another
without any other characters in between.</dd>
- <dt id="cfg_LeftFrameTableLevel">$cfg['LeftFrameTableLevel'] string</dt>
+ <dt id="cfg_LeftFrameTableLevel">$cfg['LeftFrameTableLevel'] 文字列</dt>
<dd>テーブルを上記の区切り文字で分割表示する際に何層まで表示するかを定義します。</dd>
<dt id="cfg_ShowTooltip">$cfg['ShowTooltip'] boolean</dt>
@@ -1475,7 +1470,7 @@ edit/insert mode. The user can toggle this setting from the interface.
</dd>
<dt id="cfg_CharEditing">$cfg['CharEditing'] 文字列</dt>
- <dd>CHAR カラムと VARCHAR カラムでどちらの編集用コントロールを利用するか定義します。可能な値は次の通りです:
+ <dd>CHAR カラムと VARCHAR カラムでどちらの編集用コントロールを利用するか定義します。可能な値は次の通りです。
<ul><li>input - テキストのサイズを MySQL のカラムのサイズまでに制限できますが、カラムに改行があると問題になります。</li>
<li>textarea - カラムに改行があっても問題ありませんが、長さの制限はできません。</li>
</ul>
@@ -1808,22 +1803,17 @@ you click the database or table name, then the Import tab.
ユーザごとにディレクトリを変えたい場合は、%u を使うとユーザ名に置換されます。<br /><br />
- ご注意ください。ファイル名にはかならず「.sql」(圧縮形式のサポートが有効になっている場合は「sql.bz2」や「sql.gz」)という拡張子でなければなりません。<br /><br />
+ 拡張子に注意してください。ファイル名の末尾は必ず「.sql」(圧縮形式のサポートが有効になっている場合は「.sql.bz2」や「.sql.gz」)でなければなりません。<br /><br />
- This feature is useful when your file is too big to be uploaded via <abbr
-title="HyperText Transfer Protocol">HTTP</abbr>, or when file uploads are
-disabled in PHP.<br /><br />
+ この機能は <abbr title="HyperText Transfer Protocol">HTTP</abbr>
+でアップロードするには大きすぎるファイルがあるときや、PHP のファイルアップロード機能が無効になっている場合に便利です。<br /><br />
- #-#-#-#-# Documentation_ja.html:1149 Documentation_ja.html:1158 #-#-#-#-#
-ご注意ください。PHP がセーフモードになっている場合、このディレクトリは phpMyAdmin
-スクリプトのオーナーと同じユーザがオーナーになっている必要があります。
-#-#-#-#-# Documentation_ja.html:1169 #-#-#-#-#
-また、PHP がセーフモードになっている場合、このディレクトリは phpMyAdmin
-スクリプトのオーナーと同じユーザがオーナーになっている必要があります。
+ このディレクトリのオーナに注意してください。PHP がセーフモードになっている場合、phpMyAdmin
+スクリプトのオーナと同じユーザがオーナになっていなければなりません。
<br /><br />
- See also <a href="#faq1_16"> <abbr title="Frequently Asked
-Questions">FAQ</abbr> 1.16</a> for alternatives.
+ また、別の方法もあります。<a href="#faq1_16"><abbr title="よくある質問">FAQ</abbr>
+1.16</a>をご覧ください。
</dd>
<dt id="cfg_SaveDir">$cfg['SaveDir'] 文字列</dt>
@@ -1832,15 +1822,10 @@ Questions">FAQ</abbr> 1.16</a> for alternatives.
ユーザごとにディレクトリを変えたい場合は、%u を使うとユーザ名に置換されます。<br /><br />
- Please note that the directory must exist and has to be writable for the
-user running webserver.<br /><br />
+ 書き込み権限にご注意ください。このディレクトリはウェブサーバの実行ユーザが書き込みできるようになっている必要があります。<br /><br />
- #-#-#-#-# Documentation_ja.html:1149 Documentation_ja.html:1158 #-#-#-#-#
-ご注意ください。PHP がセーフモードになっている場合、このディレクトリは phpMyAdmin
-スクリプトのオーナーと同じユーザがオーナーになっている必要があります。
-#-#-#-#-# Documentation_ja.html:1169 #-#-#-#-#
-また、PHP がセーフモードになっている場合、このディレクトリは phpMyAdmin
-スクリプトのオーナーと同じユーザがオーナーになっている必要があります。
+ このディレクトリのオーナに注意してください。PHP がセーフモードになっている場合、phpMyAdmin
+スクリプトのオーナと同じユーザがオーナになっていなければなりません。
</dd>
<dt id="cfg_TempDir">$cfg['TempDir'] 文字列</dt>
@@ -2366,22 +2351,18 @@ information about the transformation. Currently following keys can be used:
<li><a href="#faqsynchronization">同期</a></li>
</ol>
-<p> Please have a look at our <a
-href="http://www.phpmyadmin.net/home_page/docs.php">Link section</a> on the
-official phpMyAdmin homepage for in-depth coverage of phpMyAdmin's features
-and or interface.</p>
+<p> phpMyAdmin の機能やインタフェースの詳細については phpMyAdmin のオフィシャルページにある <a
+href="http://www.phpmyadmin.net/home_page/docs.php">Link セクション</a> をご覧ください。</p>
<h3 id="faqserver">サーバ</h3>
<h4 id="faq1_1">
- <a href="#faq1_1">1.1 My server is crashing each time a specific action is
-required or phpMyAdmin sends a blank page or a page full of cryptic
-characters to my browser, what can I do?</a></h4>
+ <a href="#faq1_1">1.1
+特定のアクションが要求されるたびにサーバがクラッシュしたり、ブラウザに空白のページや暗号のような文字だらけのページが表示されます。どうしたらよいのでしょうか?</a></h4>
-<p> Try to set the <a href="#cfg_OBGzip" class="configrule">$cfg['OBGzip']</a>
-directive to <tt>FALSE</tt> in your <i>config.inc.php</i> file and the
-<tt>zlib.output_compression</tt> directive to <tt>Off</tt> in your php
-configuration file.<br /></p>
+<p> <i>config.inc.php</i> ファイルの <a href="#cfg_OBGzip"
+class="configrule">$cfg['OBGzip']</a> ディレクティブを <tt>FALSE</tt> に、PHP の設定ファイルの
+<tt>zlib.output_compression</tt> ディレクティブを <tt>Off</tt> にしてみてください。<br /></p>
<h4 id="faq1_2">
<a href="#faq1_2">1.2 phpMyAdmin を使うと Apache サーバがクラッシュします。</a></h4>
@@ -2431,10 +2412,9 @@ declarations (2 lines) from the scripts <i>libraries/header.inc.php</i>,
<a href="#faq1_7">1.7 どうすればダンプや <abbr title="comma separated
values">CSV</abbr> エクスポートを GZip ないし Bzip 圧縮できるのでしょうか? 動いていないようなんですが。</a></h4>
-<p> These features are based on the <tt>gzencode()</tt> and
-<tt>bzcompress()</tt> PHP functions to be more independent of the platform
-(Unix/Windows, Safe Mode or not, and so on). So, you must have Zlib/Bzip2
-support (<tt>--with-zlib</tt> and <tt>--with-bz2</tt>).<br /></p>
+<p> これらの機能はプラットフォーム(Unix か Windows か、セーフモードかどうか、など)からの独立性を高めるために PHP の
+<tt>gzencode()</tt> と <tt>bzcompress()</tt> 関数をベースにしています。そのため、Zlib/Bzip2
+サポート (<tt>--with-zlib</tt> と <tt>--with-bz2</tt>) が必要です。<br /></p>
<h4 id="faq1_8">
<a href="#faq1_8">1.8 テーブルにテキストファイルを挿入できません。セーフモードになっているというエラーが出ます。</a></h4>
@@ -2459,7 +2439,7 @@ support (<tt>--with-zlib</tt> and <tt>--with-bz2</tt>).<br /></p>
<a href="#faq1_10">1.10 セキュアサーバ上で稼動させている phpMyAdmin のファイルアップロードで困っています。ブラウザは
Internet Explorer、サーバは Apache を使っています。</a></h4>
-<p> phpWizard フォーラムで「Rob M」が勧めていたように、<i>httpd.conf</i> に次の行を追加してください:</p>
+<p> phpWizard フォーラムで「Rob M」が勧めていたように、<i>httpd.conf</i> に以下の行を追加してください。</p>
<pre>SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown</pre>
@@ -2577,7 +2557,7 @@ these files.</p>
<h4 id="faqmysql">
<a href="#faqmysql">1.20 「cannot load MySQL extension, please check PHP
-Configuration(MySQL エクステンションをロードできません。PHP の設定をチェックしてください)」というエラーが出ます。</a></h4>
+Configuration(MySQL 拡張を読み込めません。PHP の設定をチェックしてください)」というエラーが出ます。</a></h4>
<p> PHP が MySQL サーバに接続する際には「MySQL 拡張」という MySQL の関数セットを必要とします。この拡張は PHP
の配布ファイルに含まれている(コンパイルで組み込まれている)こともありますが、そうでない場合、動的に読み込む必要があります。拡張名はたぶん
@@ -2695,9 +2675,8 @@ SetInputFilter PHP
</p>
<h4 id="faq1_32">
- <a href="#faq1_32">1.32 Can I use <abbr title="HyperText Transfer
-Protocol">HTTP</abbr> authentication with <abbr title="Internet Information
-Services">IIS</abbr>?</a></h4>
+ <a href="#faq1_32"><abbr title="Internet Information Services">IIS</abbr> でも
+<abbr title="HyperText Transfer Protocol">HTTP</abbr> 認証を利用できますか?</a></h4>
<p> はい。以下の手順は phpMyAdmin 2.6.1 と、<abbr title="Internet Information
Services">IIS</abbr> 5.1 の <abbr title="Internet Server Application
@@ -2715,7 +2694,7 @@ enabled.) Click <tt>OK</tt>.</li>
<h4 id="faq1_33">
<a href="#faq1_33">1.33 64 ビットのシステムで PHP 5.0.4 を稼動させているときの mysqli
-エクステンションに問題がありませんか?</a></h4>
+拡張に問題がありませんか?</a></h4>
<p> はい。この問題は phpMyAdmin にも影響を与えますので(「Call to undefined function
pma_reloadnavigation(未定義の関数 pma_reloadnavigation の呼び出し)」)、PHP
@@ -3656,7 +3635,7 @@ Format">PDF</abbr> スキーマを作れるのでしょう。</a></h4>
<li>1 ページめの <abbr title="Portable Document Format">PDF</abbr> ページの名前を入力して「実行する
(Go)」をクリックします。お望みなら「自動レイアウト (automatic
layout)」機能を利用して、リンクされているすべてのテーブルを新しいページに配置することもできます。</li>
- <li>新しいページの名前を選択して(「修正(Edit)」のラジオボタンが選択されているのを確かめて)、「実行(Go)」をクリックします。</li>
+ <li>新しいページの名前を選択して(「修正 (Edit)」のラジオボタンが選択されているのを確かめて)、「実行する (Go)」をクリックします。</li>
<li>リストからテーブルを選択して、座標を入力し、「保存(Save)」をクリックします。<br />
座標は相対座標です。図表の大きさはページにあわせて自動的に調整されます。最初にテーブルを配置するときは適当な(たとえば50×50のような)座標を選んでおいてください。「保存(Save)」をクリックしてからは、<a
href="#wysiwyg">グラフィカルエディタ</a>を利用して要素を正確に配置することもできます。</li>
@@ -4030,23 +4009,20 @@ href="https://sourceforge.net/projects/phpmyadmin/forums">https://sourceforge.ne
<h4 id="faq7_2">
<a href="#faq7_2">7.2 メッセージを別の言語に翻訳したい/既存の翻訳を修正したいのですが、まずはどうすればよいでしょうか?</a></h4>
-<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
-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 the mailing list to add the translation to the web
-interface. More details are available on <a
-href="http://wiki.phpmyadmin.net/pma/Gettext_for_translators">our wiki</a>.
+<p> 翻訳する po ファイルは必ず Git の最新版をお使いください。<a
+href="http://l10n.cihar.com/">翻訳サーバ</a>にてオンラインでいつでも翻訳することができます。また、翻訳サーバを通して、最新の
+po
+ファイルを入手したり、翻訳したものをマージすることもできます。新規の翻訳を作成するには、<code>po/phpmyadmin.pot</code>
+を用いて新規用の <code>po/LANG_CODE.po</code> を生成します(この作業は <code>msginit -i
+po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code>
+とすれば行えます)。もしくは、メーリングリストにてウェブインターフェース用の新規翻訳の追加を依頼してください。詳細は <a
+href="http://wiki.phpmyadmin.net/pma/Gettext_for_translators">wiki</a>
+をご覧ください。
</p>
<p>
- Please note that we try not to use HTML entities like &eacute; in 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: quotes, non-breakable
-spaces, ampersands, less than, greater than.
+ エンティティに注意するようにしてください。phpMyAdmin の翻訳では &eacute; のような HTML
+エンティティは利用せず、ファイルに適切な文字セットを定義するようにしています。HTML エンティティを使うと JavaScript
+のメッセージテキストが正しく表示できないためです。ただし、いくつかのエンティティは使う必要があります。クォート(&quot;)、分離されては困るスペース(&nbsp;)、&(&amp;)、<(&lt;)、>(&gt;)です。
</p>
<p>
翻訳は sourceforge.net の<a
@@ -4060,18 +4036,15 @@ href="https://lists.sourceforge.net/lists/listinfo/phpmyadmin-translators">phpmy
</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
+ 現在、ドキュメントは po4a と gettext を用いて翻訳されています(翻訳されているものは <a
+href="http://www.phpmyadmin.net/home_page/docs.php">Documentation</a>
+を参照してください)。翻訳を始めるには、Git から <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>.
+をチェックアウトします。もしくは、<a
+href="https://l10n.cihar.com/projects/pmadoc/">翻訳サーバ</a>にてオンライン翻訳するのもいいでしょう。翻訳したい言語がない場合は、<a
+href="mailto:michal@cihar.com">Michal Čihař</a>
+と連絡を取ってみてください。多分、彼が追加してくれます。直接 po ファイルを翻訳したい場合には、<a
+href="https://sourceforge.net/tracker/?group_id=23067&atid=387645">翻訳トラッカー</a>に翻訳したものをアップロードしてください。
</p>
<h4 id="faq7_3">
@@ -4564,7 +4537,7 @@ Zigmantas, "Manuzhai".
</p>
-<h3>Original Credits of Version 2.1.0</h3>
+<h3>バージョン 2.1.0 当時の貢献者一覧</h3>
<p>
このソフトのベースとなったのは Peter Kuppelwieser の MySQL-Webadmin です。PHP3 を使ってウェブベースの
@@ -4628,17 +4601,15 @@ should have written their names here.
default name of Apache's directory-level configuration file.</li>
<li><a href="http://www.wikipedia.org/wiki/Blowfish_%28cipher%29">Blowfish</a> -
a keyed, symmetric block cipher, designed in 1993 by Bruce Schneier.</li>
- <li><a href="http://en.wikipedia.org/wiki/Web_browser">Browser (Web Browser)</a>
-- a software application that enables a user to display and interact with
-text, images, and other information typically located on a web page at a
-website on the World Wide Web.</li>
- <li><a href="http://www.wikipedia.org/wiki/Bzip2">bzip2</a> - a free
-software/open source data compression algorithm and program developed by
-Julian Seward.</li>
- <li><a href="http://www.wikipedia.org/wiki/CGI">CGI (Common Gateway
-Interface)</a> - an important World Wide Web technology that enables a
-client web browser to request data from a program executed on the Web
-server.</li>
+ <li><a
+href="http://ja.wikipedia.org/wiki/%E3%82%A6%E3%82%A7%E3%83%96%E3%83%96%E3%83%A9%…">ブラウザ(ウェブブラウザ)</a>
+- World Wide Web 上の Web サイトで Web
+ページに一般的に置かれているテキスト、画像、その他の情報をユーザに対して表示や双方向通信することができるアプリケーション</li>
+ <li><a href="http://ja.wikipedia.org/wiki/Bzip2">bzip2</a> - Julian Seward
+により開発されたフリーソフトウェアでオープンソースのデータ圧縮アルゴリズムおよびプログラム</li>
+ <li><a href="http://ja.wikipedia.org/wiki/Common_Gateway_Interface">CGI (Common
+Gateway Interface)</a> - Web サーバー上で実行されるプログラムでクライアントの Web
+ブラウザのデータを要求に応えることができる重要な World Wide Web 技術</li>
<li><a href="http://www.wikipedia.org/wiki/Changelog">Changelog</a> - a log or
record of changes made to a project.</li>
<li><a
@@ -4669,12 +4640,11 @@ field or group of fields in a database record that point to a key field or
group of fields forming a key of another database record in some (usually
different) table.</li>
<li><a href="http://www.fpdf.org/">FPDF (FreePDF)</a> - フリーの PDF ライブラリ</li>
- <li><a id="gd" href="http://www.wikipedia.org/wiki/GD_Graphics_Library"> GD
-Graphics Library</a> - a library by Thomas Boutell and others for
-dynamically manipulating images.</li>
- <li>GD2 - look at <a href="#gd">GD Graphics Library</a>.</li>
- <li><a href="http://www.wikipedia.org/wiki/Gzip">gzip</a> - gzip is short for
-GNU zip, a GNU free software file compression program.</li>
+ <li><a id="gd" href="http://ja.wikipedia.org/wiki/GD_Graphics_Library">GD
+グラフィックライブラリ</a> - Thomas Boutell 他によって開発された動的に画像を操作するためのライブラリ</li>
+ <li>GD2 - → <a href="#gd">GD Graphics Library</a></li>
+ <li><a href="http://ja.wikipedia.org/wiki/Gzip">gzip</a> - GNU zip の略称で、GNU
+フリーソフトウェアファイル圧縮プログラムのこと</li>
<li><a
href="http://ja.wikipedia.org/wiki/%E3%83%9B%E3%82%B9%E3%83%88%E3%82%B3%E3%83%B3%…">ホスト</a>
- コンピュータネットワークに接続された任意のマシンのこと。ホスト名を持っているノード。</li>
@@ -4711,14 +4681,12 @@ Services (IIS).</li>
<li><a
href="http://www.wikipedia.org/wiki/LaTeX">L<sup>A</sup>T<sub><big>E</big></sub>X</a>
- a document preparation system for the T<sub>E</sub>X typesetting program.</li>
- <li><a href="http://www.wikipedia.org/wiki/Mac">Mac (Apple Macintosh)</a> - line
-of personal computers is designed, developed, manufactured, and marketed by
-Apple Computer.</li>
+ <li><a href="http://ja.wikipedia.org/wiki/Macintosh">Mac (Apple Macintosh)</a> -
+Apple Computer が設計、開発、製造、販売しているパソコンの一製品</li>
<li><a id="glossar_mac_os_x"
-href="http://www.wikipedia.org/wiki/Mac_OS_X"><acronym title="Apple
-Macintosh">Mac</acronym> <abbr title="operating system">OS</abbr> X</a> -
-the operating system which is included with all currently shipping Apple
-Macintosh computers in the consumer and professional markets.</li>
+href="http://ja.wikipedia.org/wiki/Mac_OS_X"><acronym title="Apple
+Macintosh">Mac</acronym> <abbr title="オペレーティング・システム">OS</abbr> X</a> -
+一般消費者および専門家の市場向けに現在出荷されている全ての Apple Macintosh コンピュータに含まれているオペレーティングシステム</li>
<li><a href="http://www.wikipedia.org/wiki/MCrypt">MCrypt</a> - a cryptographic
library.</li>
<li><a href="http://php.net/mcrypt">mcrypt</a> - the MCrypt PHP extension.</li>
@@ -4726,9 +4694,10 @@ library.</li>
Mail Extensions)</a> - an Internet Standard for the format of e-mail.</li>
<li><a href="http://www.wikipedia.org/wiki/module">module</a> - some sort of
extension for the Apache Webserver.</li>
- <li><a href="http://www.wikipedia.org/wiki/MySQL">MySQL</a> - a multithreaded,
-multi-user, SQL (Structured Query Language) Database Management System
-(DBMS).</li>
+ <li><a href="http://ja.wikipedia.org/wiki/MySQL">MySQL</a> -
+マルチスレッド、マルチユーザー、<abbr title="structured query
+language">SQL</abbr>が使えるデータベース管理システム (<abbr title="Database Management
+System">DBMS</abbr>)</li>
<li><a href="http://php.net/mysqli">mysqli</a> - 改良された MySQL クライアントの PHP 拡張モジュール</li>
<li><a href="http://php.net/mysql">mysql</a> - MySQL クライアントの PHP 拡張モジュール</li>
<li><a href="http://ja.wikipedia.org/wiki/OpenDocument">OpenDocument</a> -
@@ -4781,8 +4750,8 @@ identified by a label or key or by it?s position in relation to other items.</li
<li>Table type</li>
<li><a href="http://www.wikipedia.org/wiki/Tar_%28file_format%29">tar</a> - a
type of archive file format: the Tape ARchive format.</li>
- <li><a href="http://www.wikipedia.org/wiki/TCP">TCP (Transmission Control
-Protocol)</a> - one of the core protocols of the Internet protocol suite.</li>
+ <li><a href="http://ja.wikipedia.org/wiki/Transmission_Control_Protocol">TCP
+(Transmission Control Protocol)</a> - インターネット・プロトコル群の中核となるプロトコルの一つ</li>
<li><a href="http://www.acko.net/node/56">UFPDF</a> - FPDF 用の Unicode/UTF-8 拡張</li>
<li><a href="http://www.wikipedia.org/wiki/URL">URL (Uniform Resource
Locator)</a> - a sequence of characters, conforming to a standardized
@@ -4798,8 +4767,8 @@ different kinds of data.</li>
<li><a
href="http://ja.wikipedia.org/wiki/ZIP_%28%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E3…">ZIP</a>
- 一般的なデータ圧縮とアーカイブ形式</li>
- <li><a href="http://www.wikipedia.org/wiki/Zlib">zlib</a> - an open-source,
-cross-platform data compression library by Jean-loup Gailly and Mark Adler.</li>
+ <li><a href="http://ja.wikipedia.org/wiki/Zlib">zlib</a> - Jean-loup Gailly および
+Mark Adlerによるオープンソースでクロスプラットフォームのデータ圧縮ライブラリ</li>
</ul>
</div>
diff --git a/output/ja/TODO b/output/ja/TODO
index 917d064..0bf19e1 100644
--- a/output/ja/TODO
+++ b/output/ja/TODO
@@ -1,7 +1,7 @@
phpMyAdmin - ToDo
=================
-We are currently using the Sourceforge Tracker as Todo list:
+現在は Todo リストとして Sourceforge のトラッカーを使用しています。
http://sourceforge.net/tracker/?atid=377411&group_id=23067&func=browse
diff --git a/output/tr/Documentation.html b/output/tr/Documentation.html
index 190ba85..5db501f 100644
--- a/output/tr/Documentation.html
+++ b/output/tr/Documentation.html
@@ -1361,9 +1361,9 @@ tablo sayılarını saymak.
<dt><span
id="cfg_Servers_SignonSession">$cfg['Servers'][$i]['SignonSession']</span>
dizgi</dt>
- <dd>Name of session which will be used for signon authentication method. You
-should use something different than <code>phpMyAdmin</code>, because this is
-session which phpMyAdmin uses internally.
+ <dd>Oturum açma kimlik doğrulaması yöntemi için kullanılacak oturumun
+adı. <code>phpMyAdmin</code>'den farklı bir şey kullanmalısınız çünkü bu
+phpMyAdmin'in dahili olarak kullandığı oturumdur.
</dd>
<dt><span id="cfg_Servers_SignonURL">$cfg['Servers'][$i]['SignonURL']</span>
dizgi</dt>
@@ -1890,122 +1890,128 @@ edilir.</li>
<dt id="cfg_CheckConfigurationPermissions">$cfg['CheckConfigurationPermissions'] boolean</dt>
<dd>
- We normally check the permissions on the configuration file to ensure it's
-not world writable. However, phpMyAdmin could be installed on a NTFS
-filesystem mounted on a non-Windows server, in which case the permissions
-seems wrong but in fact cannot be detected. In this case a sysadmin would
-set this parameter to <tt>FALSE</tt>. Default is <tt>TRUE</tt>.
+ Biz normal olarak herkes tarafından yazılabilir olmadığından emin olmak için
+yapılandırma dosyasındaki izinleri kontrol ederiz. Ancak phpMyAdmin, izinler
+yanlış göründüğü ama aslında algılanamadığı durumda, Windows olmayan
+sunucuya bağlanmış NTFS dosya sistemi üzerine kurulabilir. Bu durumda
+sysadmin bu parametreyi <tt>FALSE</tt> olarak ayarlayacaktır. Varsayılan
+<tt>TRUE</tt>'dur.
</dd>
- <dt id="cfg_LinkLengthLimit">$cfg['LinkLengthLimit'] integer</dt>
+ <dt id="cfg_LinkLengthLimit">$cfg['LinkLengthLimit'] tam sayı</dt>
<dd>
- Limit for length of URL in links. When length would be above this limit, it
-is replaced by form with button. This is required as some web servers (IIS)
-have problems with long URLs. Default is <code>1000</code>.
+ Bağlantılardaki URL uzunluğu için sınırdır. Uzunluk bu sınırın üzerinde
+olduğunda, düğmeyle birlikte form tarafından değiştirilir. Bu uzun URL'lerle
+sorunları olan bazı web sunucuları (IIS) için gerekir. Varsayılan
+<code>1000</code>'dir.
</dd>
- <dt id="cfg_NaviWidth">$cfg['NaviWidth'] integer</dt>
- <dd>Navi frame width in pixels. See <tt>themes/themename/layout.inc.php</tt>.
+ <dt id="cfg_NaviWidth">$cfg['NaviWidth'] tam sayı</dt>
+ <dd>Piksel olarak rehber çerçeve
+genişliği. <tt>themes/themename/layout.inc.php</tt>'ye bakın.
</dd>
- <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> string [CSS
-color for background]<br />
- <span id="cfg_MainBackground">$cfg['MainBackground']</span> string [CSS
-color for background]
+ <dt><span id="cfg_NaviBackground">$cfg['NaviBackground']</span> dizgi [arkaplan
+için CSS rengi]<br />
+ <span id="cfg_MainBackground">$cfg['MainBackground']</span> dizgi [arkaplan
+için CSS rengi]
</dt>
- <dd>The background styles used for both the frames. See
-<tt>themes/themename/layout.inc.php</tt>.</dd>
+ <dd>Her iki çerçeve için kullanılan arkaplan
+stilleri. <tt>themes/themename/layout.inc.php</tt>'ye bakın.</dd>
- <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] string [CSS color for background]<br />
- <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> string [CSS
-color]</dt>
- <dd>The style used for the pointer in the navi frame. See
-<tt>themes/themename/layout.inc.php</tt>.</dd>
+ <dt id="cfg_NaviPointerBackground">$cfg['NaviPointerBackground'] dizgi [arkaplan için CSS rengi]<br />
+ <span id="cfg_NaviPointerColor">$cfg['NaviPointerColor']</span> dizgi [CSS
+rengi]</dt>
+ <dd>Rehber çerçevedeki imleç için kulanılan
+stil. <tt>themes/themename/layout.inc.php</tt>'ye bakın.</dd>
<dt id="cfg_LeftPointerEnable">$cfg['LeftPointerEnable'] boolean</dt>
- <dd>A value of <tt>TRUE</tt> activates the navi pointer (when LeftFrameLight is
-<tt>FALSE</tt>).</dd>
+ <dd><tt>TRUE</tt> değeri rehber imleçi etkinleştirir (LeftFrameLight
+<tt>FALSE</tt> iken).</dd>
- <dt id="cfg_Border">$cfg['Border'] integer</dt>
- <dd>The size of a table's border. See <tt>themes/themename/layout.inc.php</tt>.
+ <dt id="cfg_Border">$cfg['Border'] tam sayı</dt>
+ <dd>Tabloların kenar boyutudur. <tt>themes/themename/layout.inc.php</tt>'ye
+bakın.
</dd>
- <dt id="cfg_ThBackground">$cfg['ThBackground'] string [CSS color for background]<br />
- <span id="cfg_ThColor">$cfg['ThColor']</span> string [CSS color]</dt>
- <dd>The style used for table headers. See
-<tt>themes/themename/layout.inc.php</tt>.</dd>
+ <dt id="cfg_ThBackground">$cfg['ThBackground'] dizgi [arkaplan için CSS rengi]<br />
+ <span id="cfg_ThColor">$cfg['ThColor']</span> dizgi [CSS rengi]</dt>
+ <dd>Tablo başlıkları için kullanılan
+stil. <tt>themes/themename/layout.inc.php</tt>'ye bakın.</dd>
- <dt id="cfg_BgcolorOne">$cfg['BgOne'] string [CSS color]</dt>
- <dd>The color (HTML) #1 for table rows. See
-<tt>themes/themename/layout.inc.php</tt>.
+ <dt id="cfg_BgcolorOne">$cfg['BgOne'] dizgi [CSS rengi]</dt>
+ <dd>Tablo satırları için renk (HTML)
+#1. <tt>themes/themename/layout.inc.php</tt>'ye bakın.
</dd>
- <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] string [CSS color]</dt>
- <dd>The color (HTML) #2 for table rows. See
-<tt>themes/themename/layout.inc.php</tt>.
+ <dt id="cfg_BgcolorTwo">$cfg['BgTwo'] dizgi [CSS rengi]</dt>
+ <dd>Tablo satırları için renk (HTML)
+#2. <tt>themes/themename/layout.inc.php</tt>'ye bakın.
</dd>
- <dt><span id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground']
-</span>string [CSS color]<br />
- <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor'] </span>string
-[CSS color]<br />
- <span id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground']
-</span>string [CSS color]<br />
- <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor'] </span>string
-[CSS color]
+ <dt><span
+id="cfg_BrowsePointerBackground">$cfg['BrowsePointerBackground']</span>
+dizgi [CSS rengi]<br />
+ <span id="cfg_BrowsePointerColor">$cfg['BrowsePointerColor']</span> dizgi
+[CSS rengi]<br />
+ <span id="cfg_BrowseMarkerBackground">$cfg['BrowseMarkerBackground']</span>
+dizgi [CSS rengi]<br />
+ <span id="cfg_BrowseMarkerColor">$cfg['BrowseMarkerColor']</span> dizgi [CSS
+rengi]
</dt>
- <dd>The colors (HTML) uses for the pointer and the marker in browse mode.<br />
- The former feature highlights the row over which your mouse is passing and
-the latter lets you visually mark/unmark rows by clicking on
-them. Highlighting / marking a column is done by hovering over / clicking
-the column's header (outside of the text).<br />
- See <tt>themes/themename/layout.inc.php</tt>.</dd>
+ <dd>Gözatma kipinde imleç ve işaretleyici için kullanılan renkler (HTML).<br />
+ Biçimlendirici özelliği, farenizle üstünden geçerken satırı vurgular ve
+sonrasında onlara tıklayarak görsel olarak işaretlemenize/işareti
+kaldırmanıza izin verir. Sütunun başlığının (metnin dışına) üzerinde kalmak
+/ tıklamak, sütunun vurgulanmasını / işaretlenmesini yapar.<br />
+ <tt>themes/themename/layout.inc.php</tt>'ye bakın.</dd>
- <dt id="cfg_FontFamily">$cfg['FontFamily'] string</dt>
- <dd>You put here a valid CSS font family value, for example <tt>arial,
+ <dt id="cfg_FontFamily">$cfg['FontFamily'] dizgi</dt>
+ <dd>Buraya geçerli bir CSS yazı tipi ailesi değeri koyun, örneğin <tt>arial,
sans-serif</tt>.<br />
- See <tt>themes/themename/layout.inc.php</tt>.</dd>
+ <tt>themes/themename/layout.inc.php</tt>'ye bakın.</dd>
- <dt id="cfg_FontFamilyFixed">$cfg['FontFamilyFixed'] string</dt>
- <dd>You put here a valid CSS font family value, for example
-<tt>monospace</tt>. This one is used in textarea.<br />
- See <tt>themes/themename/layout.inc.php</tt>.</dd>
+ <dt id="cfg_FontFamilyFixed">$cfg['FontFamilyFixed'] dizgi</dt>
+ <dd>Buraya geçerli bir CSS yazı tipi ailesi değeri koyun, örneğin
+<tt>monospace</tt>. Bu metin alanında kullanılır.<br />
+ <tt>themes/themename/layout.inc.php</tt>'ye bakın.</dd>
<dt id="cfg_BrowsePointerEnable">$cfg['BrowsePointerEnable'] boolean</dt>
- <dd>Whether to activate the browse pointer or not.</dd>
+ <dd>Gözatma imlecini etkinleştirir ya da etkinleştirmez.</dd>
<dt id="cfg_BrowseMarkerEnable">$cfg['BrowseMarkerEnable'] boolean</dt>
- <dd>Whether to activate the browse marker or not.</dd>
+ <dd>Gözatma işaretleyicisini etkinleştirir ya da etkinleştirmez.</dd>
- <dt><span id="cfg_TextareaCols">$cfg['TextareaCols'] </span>integer<br />
- <span id="cfg_TextareaRows">$cfg['TextareaRows'] </span>integer<br />
- <span id="cfg_CharTextareaCols">$cfg['CharTextareaCols'] </span>integer<br />
- <span id="cfg_CharTextareaRows">$cfg['CharTextareaRows'] </span>integer
+ <dt><span id="cfg_TextareaCols">$cfg['TextareaCols']</span> tam sayı<br />
+ <span id="cfg_TextareaRows">$cfg['TextareaRows']</span> tam sayı<br />
+ <span id="cfg_CharTextareaCols">$cfg['CharTextareaCols']</span> tam sayı<br />
+ <span id="cfg_CharTextareaRows">$cfg['CharTextareaRows']</span> tam sayı
</dt>
- <dd>Number of columns and rows for the textareas.<br />
- This value will be emphasized (*2) for <abbr title="structured query
-language">SQL</abbr> query textareas and (*1.25) for <abbr title="structured
-query language">SQL</abbr> textareas inside the query window.<br />
- The Char* values are used for CHAR and VARCHAR editing (if configured via <a
-href="#cfg_CharEditing">$cfg['CharEditing']</a>).</dd>
-
- <dt><span id="cfg_LongtextDoubleTextarea">$cfg['LongtextDoubleTextarea']
-</span>boolean
+ <dd>Metin alanı için sütun ve satır sayısı.<br />
+ Bu değer, sorgu penceresi içerisindeki abbr title="structured query
+language">SQL</abbr> sorgu metin alanı için (*2) ve <abbr title="structured
+query language">SQL</abbr> metin alanı için (*1.25) olan önemi
+belirtecektir.<br />
+ Char* değerleri CHAR ve VARCHAR düzenlemesi için kullanılır (eğer <a
+href="#cfg_CharEditing">$cfg['CharEditing']</a> yapılandırılmışsa).</dd>
+
+ <dt><span id="cfg_LongtextDoubleTextarea">$cfg['LongtextDoubleTextarea']</span>
+boolean
</dt>
- <dd>Defines whether textarea for LONGTEXT columns should have double size.</dd>
+ <dd>LONGTEXT sütunlar için metin alanının çift boyut olup olmayacağını tanımlar.</dd>
- <dt><span id="cfg_TextareaAutoSelect">$cfg['TextareaAutoSelect'] </span>boolean
+ <dt><span id="cfg_TextareaAutoSelect">$cfg['TextareaAutoSelect']</span> boolean
</dt>
- <dd>Defines if the whole textarea of the query box will be selected on click.</dd>
+ <dd>Sorgu kutusunun bütün metin alanı tıklamayla seçilecekse tanımlar.</dd>
- <dt id="cfg_LimitChars">$cfg['LimitChars'] integer</dt>
- <dd>Maximum number of characters shown in any non-numeric field on browse view.
-Can be turned off by a toggle button on the browse page.</dd>
+ <dt id="cfg_LimitChars">$cfg['LimitChars'] tam sayı</dt>
+ <dd>Gözatma görünümünde sayısal olmayan herhangi bir alanda gösterilen en fazla
+karakter sayısı. Gözatma sayfasında bir geçiş düğmesiyle kapatılabilir.</dd>
- <dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft'] </span>boolean
-<span id="cfg_ModifyDeleteAtRight">$cfg['ModifyDeleteAtRight']
-</span>boolean
+ <dt><span id="cfg_ModifyDeleteAtLeft">$cfg['ModifyDeleteAtLeft']</span> boolean
+<span id="cfg_ModifyDeleteAtRight">$cfg['ModifyDeleteAtRight']</span>
+boolean
</dt>
<dd>Defines the place where table row links (Edit, Inline edit, Copy, Delete)
would be put when tables contents are displayed (you may have them displayed
diff --git a/po/es.po b/po/es.po
index 72be2fc..15bf6f7 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin-docs VERSION\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-20 08:29+0300\n"
-"PO-Revision-Date: 2011-05-03 14:09+0200\n"
+"PO-Revision-Date: 2011-05-21 21:17+0200\n"
"Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n"
"Language-Team: none\n"
"Language: es\n"
@@ -3431,6 +3431,9 @@ msgid ""
"should use something different than <code>phpMyAdmin</code>, because this is "
"session which phpMyAdmin uses internally."
msgstr ""
+"El nombre de la sesión a utilizar para el método de autenticación signon. "
+"Deberías de utilizar algo distinto a <code>phpMyAdmin</code> ya que ese es "
+"el nombre de sesión phpMyAdmin utiliza internamente."
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:1286
diff --git a/po/ja.po b/po/ja.po
index 5916b55..7ba8b0e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin-docs VERSION\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-20 08:29+0300\n"
-"PO-Revision-Date: 2011-05-19 10:55+0200\n"
+"PO-Revision-Date: 2011-05-22 04:35+0200\n"
"Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n"
"Language-Team: Japan <jp(a)li.org>\n"
"Language: ja\n"
@@ -99,7 +99,7 @@ msgstr "<a href=\"Documentation.html#glossary\">用語集</a>"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:43
msgid "<a href=\"http://www.phpmyadmin.net/\"> phpMyAdmin homepage</a>"
-msgstr "<a href=\"http://www.phpmyadmin.net/\"> phpMyAdmin ホームページ</a>"
+msgstr "<a href=\"http://www.phpmyadmin.net/\">phpMyAdmin オフィシャルサイト</a>"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:45
@@ -963,9 +963,8 @@ msgid ""
"where you want to give users access to their own database and don't want "
"them to play around with others."
msgstr ""
-"<b>マルチユーザ環境</b>では、ユーザが自分のデータベースにアクセスできるよう、"
-"また他人のデータベースにいたずらできないよう、<abbr title=\"HyperText "
-"Transfer Protocol\">HTTP</abbr>/クッキー認証モードにするのがお奨めです。"
+"<b>マルチユーザ環境</b>では、ユーザが自分のデータベースにアクセスできるよう、また他人のデータベースにいたずらできないよう、<abbr "
+"title=\"HyperText Transfer Protocol\">HTTP</abbr>/クッキー認証モードにするのがお勧めです。"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:381
@@ -1024,6 +1023,7 @@ msgid ""
"Note: this section is only applicable if your MySQL server is running with "
"<tt>--skip-show-database</tt>."
msgstr ""
+"注:この項目は、MySQL サーバが <tt>--skip-show-database</tt> を適用して稼動している場合のみに使用できます。"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:400
@@ -1058,16 +1058,15 @@ msgstr ""
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:412
-#, fuzzy
msgid ""
"The following example assumes you want to use <tt>pma</tt> as the "
"controluser and <tt>pmapass</tt> as the controlpass, but <b>this is only an "
"example: use something else in your file!</b> Input these statements from "
"the phpMyAdmin SQL Query window or mysql command–line client."
msgstr ""
-"下記の例では <tt>pma</tt> を管理ユーザ、<tt>pmapass</tt> を管理パスワードと想"
-"定していますが、<b>これはあくまでも例です。ご自分のファイルでは設定を変えてく"
-"ださい!</b>"
+"下記の例では <tt>pma</tt> を管理ユーザ、<tt>pmapass</tt> "
+"を管理パスワードと想定していますが、<b>これはあくまでも例です。ご自分のファイルでは設定を変えてください!</b> phpMyAdmin の SQL "
+"クエリウィンドウまたは mysql コマンドラインクライアントからこれらのコマンドを入力します。"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:417
@@ -1252,13 +1251,10 @@ msgstr ""
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:491
-#, fuzzy
msgid ""
"With this mode, the user can truly log out of phpMyAdmin and log in back "
"with the same username."
-msgstr ""
-"このモードでは、ユーザが本当に phpMyAdmin からログアウトしたり、同じユーザ名"
-"で再ログインしたりできます。"
+msgstr "このモードでは、ユーザは phpMyAdmin のログアウトが確実に行え、同じユーザー名でログインし直すことができます。"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:493
@@ -1806,9 +1802,8 @@ msgid ""
"available with php 5.0.0 and is the recommended way to connect to a server "
"running MySQL 4.1.x or newer."
msgstr ""
-"<tt><i>mysqli</i></tt> : MySQL 拡張の改良版です。この拡張は PHP 5.0.0 で利用"
-"できるようになりました。MySQL 4.1.x 以降が稼動しているサーバに接続する場合は"
-"お奨めです。"
+"<tt><i>mysqli</i></tt> : MySQL 拡張の改良版です。この拡張は PHP 5.0.0 で利用できるようになりました。MySQL "
+"4.1.x 以降が稼動しているサーバに接続する場合はお勧めです。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:708
@@ -2935,8 +2930,7 @@ msgstr ""
msgid ""
"Recommended to set to FALSE, when you are sure, your table structure is up "
"to date."
-msgstr ""
-"確実にテーブル構造が最新になっているときは FALSE にするのがおすすめです。"
+msgstr "確実にテーブル構造が最新になっているときは FALSE にするのがお勧めです。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:1193
@@ -3049,8 +3043,8 @@ msgid ""
"<span id=\"cfg_Servers_AllowDeny_rules\">$cfg['Servers'][$i]['AllowDeny']"
"['rules']</span> array of strings"
msgstr ""
-"<span id=\"cfg_Servers_AllowDeny_rules\">$cfg['Servers'][$i]['AllowDeny']"
-"['rules']</span> strings の array"
+"<span id=\"cfg_Servers_AllowDeny_rules\">$cfg['Servers'][$i]['AllowDeny']['rul"
+"es']</span> 文字列の配列"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1235
@@ -3079,9 +3073,8 @@ msgid ""
"(please note that those containing SERVER_ADDRESS might not be available on "
"all webservers):"
msgstr ""
-"また、<i>ipmask</i> フィールドでもいくつかショートカットが利用できます(ご注"
-"意ください。SERVER_ADDRESSの部分はどんなサーバでも利用できるとは限りませ"
-"ん):"
+"また、<i>ipmask</i> フィールドでもいくつかショートカットが利用できます(SERVER_ADDRESS "
+"の部分はどんなウェブサーバでも利用できるとは限りませんので注意してください)。"
#. type: Content of: <html><body><div><dl><dd><pre>
#: orig-docs/Documentation.html:1247
@@ -3093,6 +3086,11 @@ msgid ""
"'localnetB' -> SERVER_ADDRESS/16\n"
"'localnetC' -> SERVER_ADDRESS/24\n"
msgstr ""
+"'all' -> 0.0.0.0/0\n"
+"'localhost' -> 127.0.0.1/8\n"
+"'localnetA' -> SERVER_ADDRESS/8\n"
+"'localnetB' -> SERVER_ADDRESS/16\n"
+"'localnetC' -> SERVER_ADDRESS/24\n"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1254
@@ -3109,55 +3107,56 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1259
-#, fuzzy
msgid ""
"For the <abbr title=\"Internet Protocol\">IP</abbr> matching system, the "
"following work:"
-msgstr "IP のマッチング規則としては、下記が利用できます:"
+msgstr "<abbr title=\"インターネット・プロトコル\">IP</abbr> のマッチング規則としては、下記が利用できます。"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1261
-#, fuzzy
msgid ""
"<tt>xxx.xxx.xxx.xxx</tt> (an exact <abbr title=\"Internet Protocol\">IP</"
"abbr> address)"
-msgstr "<tt>xxx.xxx.xxx.xxx</tt> (単一の IP アドレスそのもの)"
+msgstr ""
+"<tt>xxx.xxx.xxx.xxx</tt> (単一の <abbr title=\"インターネット・プロトコル\">IP</abbr> "
+"アドレスそのもの)"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1262
-#, fuzzy
msgid ""
"<tt>xxx.xxx.xxx.[yyy-zzz]</tt> (an <abbr title=\"Internet Protocol\">IP</"
"abbr> address range)"
-msgstr "<tt>xxx.xxx.xxx.xx[yyy-zzz]</tt>(IP アドレスの一部範囲指定)"
+msgstr ""
+"<tt>xxx.xxx.xxx.xx[yyy-zzz]</tt>(<abbr title=\"インターネット・プロトコル\">IP</abbr> "
+"アドレスの範囲指定)"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1263
-#, fuzzy
msgid ""
"<tt>xxx.xxx.xxx.xxx/nn</tt> (CIDR, Classless Inter-Domain Routing type <abbr "
"title=\"Internet Protocol\">IP</abbr> addresses)"
msgstr ""
-"<tt>xxx.xxx.xxx.xxx/nn</tt> (CIDR(Classless Inter-Domain Routing)タイプの "
-"IP アドレス)"
+"<tt>xxx.xxx.xxx.xxx/nn</tt> (CIDR(Classless Inter-Domain Routing)タイプの <abbr "
+"title=\"インターネット・プロトコル\">IP</abbr> アドレス)"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1264
msgid "But the following does not work:"
-msgstr "ただし、下記は利用できません:"
+msgstr "ただし、以下は利用できません。"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1265
-#, fuzzy
msgid ""
"<tt>xxx.xxx.xxx.xx[yyy-zzz]</tt> (partial <abbr title=\"Internet Protocol"
"\">IP</abbr> address range)"
-msgstr "<tt>xxx.xxx.xxx.xx[yyy-zzz]</tt>(IP アドレスの一部範囲指定)"
+msgstr ""
+"<tt>xxx.xxx.xxx.xx[yyy-zzz]</tt>(<abbr title=\"インターネット・プロトコル\">IP</abbr> "
+"アドレスの一部範囲指定)"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1267
msgid "Also IPv6 addresses are not supported."
-msgstr ""
+msgstr "それと、IPv6 アドレスもサポートしていません。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:1269
@@ -3584,7 +3583,7 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:1401
msgid "$cfg['LoginCookieStore'] integer [number of seconds]"
-msgstr "$cfg['LoginCookieStore'] integer [秒数]"
+msgstr "$cfg['LoginCookieStore'] 整数 [秒数]"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1402
@@ -3638,14 +3637,13 @@ msgstr "$cfg['VerboseMultiSubmit'] boolean"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1420
-#, fuzzy
msgid ""
"Define whether phpMyAdmin will output the results of each query of a multi-"
"query statement embedded into the <abbr title=\"structured query language"
"\">SQL</abbr> output as inline comments. Defaults to <tt>TRUE</tt>."
msgstr ""
-"複数のクエリを含む文のそれぞれのクエリの結果を SQL 出力のなかにインラインコメ"
-"ントとして埋め込むかどうかを定義します。デフォルトは <tt>TRUE</tt> です。"
+"マルチクエリを含む文のそれぞれのクエリの結果を <abbr title=\"structured query language\">SQL</abbr> "
+"出力のなかにインラインコメントとして埋め込むかどうかを定義します。デフォルトは <tt>TRUE</tt> です。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:1425
@@ -3682,9 +3680,8 @@ msgstr "$cfg['Error_Handler']['display'] boolean"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1435
-#, fuzzy
msgid "Whether to display errors from PHP or not."
-msgstr "表示マーカを有効にするかどうか。"
+msgstr "PHP からのエラーを表示するかどうか。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:1437
@@ -3693,9 +3690,8 @@ msgstr "$cfg['Error_Handler']['gather'] boolean"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1438
-#, fuzzy
msgid "Whether to gather errors from PHP or not."
-msgstr "表示マーカを有効にするかどうか。"
+msgstr "PHP からのエラーを収集するかどうか。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:1440
@@ -3736,7 +3732,7 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:1453
msgid "$cfg['LeftFrameDBSeparator'] string or array"
-msgstr "$cfg['LeftFrameDBSeparator'] string または array"
+msgstr "$cfg['LeftFrameDBSeparator'] 文字列または配列"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1455
@@ -3750,7 +3746,7 @@ msgstr "データベース名をツリー表示するときに利用する区切
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:1459
msgid "$cfg['LeftFrameTableSeparator'] string"
-msgstr "$cfg['LeftFrameTableSeparator'] string"
+msgstr "$cfg['LeftFrameTableSeparator'] 文字列"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1460
@@ -3773,7 +3769,7 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:1468
msgid "$cfg['LeftFrameTableLevel'] string"
-msgstr "$cfg['LeftFrameTableLevel'] string"
+msgstr "$cfg['LeftFrameTableLevel'] 文字列"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1469
@@ -4208,9 +4204,7 @@ msgstr "$cfg['CharEditing'] 文字列"
msgid ""
"Defines which type of editing controls should be used for CHAR and VARCHAR "
"columns. Possible values are:"
-msgstr ""
-"CHAR カラムと VARCHAR カラムでどちらの編集用コントロールを利用するか定義しま"
-"す。可能な値は次の通りです:"
+msgstr "CHAR カラムと VARCHAR カラムでどちらの編集用コントロールを利用するか定義します。可能な値は次の通りです。"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: orig-docs/Documentation.html:1613
@@ -5315,19 +5309,18 @@ msgid ""
"".sql.bz2" or ".sql.gz" if support for compressed "
"formats is enabled)."
msgstr ""
-"ご注意ください。ファイル名にはかならず「.sql」(圧縮形式のサポートが有効に"
-"なっている場合は「sql.bz2」や「sql.gz」)という拡張子でなければなりません。"
+"拡張子に注意してください。ファイル名の末尾は必ず「.sql」(圧縮形式のサポートが有効になっている場合は「.sql.bz2」や「.sql.gz」)でなけ"
+"ればなりません。"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1975
-#, fuzzy
msgid ""
"This feature is useful when your file is too big to be uploaded via <abbr "
"title=\"HyperText Transfer Protocol\">HTTP</abbr>, or when file uploads are "
"disabled in PHP."
msgstr ""
-"この機能は HTTP でアップロードするには大きすぎるファイルがあるときや、PHP の"
-"ファイルアップロード機能が無効になっている場合に便利です。"
+"この機能は <abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> "
+"でアップロードするには大きすぎるファイルがあるときや、PHP のファイルアップロード機能が無効になっている場合に便利です。"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1979 orig-docs/Documentation.html:1998
@@ -5335,22 +5328,17 @@ msgid ""
"Please note that if PHP is running in safe mode, this directory must be "
"owned by the same user as the owner of the phpMyAdmin scripts."
msgstr ""
-"#-#-#-#-# Documentation_ja.html:1149 Documentation_ja.html:1158 #-#-#-#-#\n"
-"ご注意ください。PHP がセーフモードになっている場合、このディレクトリは "
-"phpMyAdmin スクリプトのオーナーと同じユーザがオーナーになっている必要がありま"
-"す。\n"
-"#-#-#-#-# Documentation_ja.html:1169 #-#-#-#-#\n"
-"また、PHP がセーフモードになっている場合、このディレクトリは phpMyAdmin スク"
-"リプトのオーナーと同じユーザがオーナーになっている必要があります。"
+"このディレクトリのオーナに注意してください。PHP がセーフモードになっている場合、phpMyAdmin "
+"スクリプトのオーナと同じユーザがオーナになっていなければなりません。"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1983
-#, fuzzy
msgid ""
"See also <a href=\"#faq1_16\"> <abbr title=\"Frequently Asked Questions"
"\">FAQ</abbr> 1.16</a> for alternatives."
msgstr ""
-"また、別の方法もあります。<a href=\"#faq1_16\">FAQ 1.16</a>をご覧ください。"
+"また、別の方法もあります。<a href=\"#faq1_16\"><abbr title=\"よくある質問\">FAQ</abbr> "
+"1.16</a>をご覧ください。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:1988
@@ -5364,13 +5352,10 @@ msgstr "ダンプを保存するディレクトリ名。"
#. type: Content of: <html><body><div><dl><dd>
#: orig-docs/Documentation.html:1995
-#, fuzzy
msgid ""
"Please note that the directory must exist and has to be writable for the "
"user running webserver."
-msgstr ""
-"ご注意ください。このディレクトリはウェブサーバの実行ユーザが書き込みできるよ"
-"うになっている必要があります。"
+msgstr "書き込み権限にご注意ください。このディレクトリはウェブサーバの実行ユーザが書き込みできるようになっている必要があります。"
#. type: Content of: <html><body><div><dl><dt>
#: orig-docs/Documentation.html:2002
@@ -6955,15 +6940,13 @@ msgstr "<a href=\"#faqsynchronization\">同期</a>"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2573
-#, fuzzy
msgid ""
"Please have a look at our <a href=\"http://www.phpmyadmin.net/home_page/docs."
"php\">Link section</a> on the official phpMyAdmin homepage for in-depth "
"coverage of phpMyAdmin's features and or interface."
msgstr ""
-"phpMyAdmin の機能やインタフェースの詳細については phpMyAdmin のオフィシャル"
-"ホームページにある <a href=\"http://www.phpmyadmin.net/home_page/docs.php"
-"\">Link セクション</a> をご覧ください。"
+"phpMyAdmin の機能やインタフェースの詳細については phpMyAdmin のオフィシャルページにある <a "
+"href=\"http://www.phpmyadmin.net/home_page/docs.php\">Link セクション</a> をご覧ください。"
#. type: Content of: <html><body><div><h3>
#: orig-docs/Documentation.html:2578
@@ -6972,28 +6955,25 @@ msgstr "サーバ"
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:2581
-#, fuzzy
msgid ""
"<a href=\"#faq1_1\">1.1 My server is crashing each time a specific action is "
"required or phpMyAdmin sends a blank page or a page full of cryptic "
"characters to my browser, what can I do?</a>"
msgstr ""
-"[<a href=\"#faq1_1\">1.1</a>] PHP 4+ を走らせているのですが、特定のアクション"
-"が要求されるたびにサーバがクラッシュしたり、ブラウザに空白のページや暗号のよ"
-"うな文字だらけのページが表示されます。どうしたらよいのでしょう。"
+"<a href=\"#faq1_1\">1.1 特定のアクションが要求されるたびにサーバがクラッシュしたり、ブラウザに空白のページや暗号のような文字だらけの"
+"ページが表示されます。どうしたらよいのでしょうか?</a>"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2585
-#, fuzzy
msgid ""
"Try to set the <a href=\"#cfg_OBGzip\" class=\"configrule\">$cfg['OBGzip']</"
"a> directive to <tt>FALSE</tt> in your <i>config.inc.php</i> file and the "
"<tt>zlib.output_compression</tt> directive to <tt>Off</tt> in your php "
"configuration file."
msgstr ""
-"<i>config.inc.php</i> ファイルの <tt>$cfg['OBGzip']</tt> ディレクティブを "
-"<tt>FALSE</tt> に、php の設定ファイルの <tt>zlib.output_compression</tt> ディ"
-"レクティブを <tt>Off</tt> にしてみてください。"
+"<i>config.inc.php</i> ファイルの <a href=\"#cfg_OBGzip\" "
+"class=\"configrule\">$cfg['OBGzip']</a> ディレクティブを <tt>FALSE</tt> に、PHP の設定ファイルの "
+"<tt>zlib.output_compression</tt> ディレクティブを <tt>Off</tt> にしてみてください。"
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:2591
@@ -7122,17 +7102,15 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2641
-#, fuzzy
msgid ""
"These features are based on the <tt>gzencode()</tt> and <tt>bzcompress()</"
"tt> PHP functions to be more independent of the platform (Unix/Windows, Safe "
"Mode or not, and so on). So, you must have Zlib/Bzip2 support (<tt>--with-"
"zlib</tt> and <tt>--with-bz2</tt>)."
msgstr ""
-"これらの機能はプラットフォーム(Unix か Windows か、セーフモードかどうか、な"
-"ど)からの独立性を高めるために PHP の <tt>gzencode()</tt> と <tt>bzcompress()"
-"</tt> 関数をベースにしています。そのため、PHP4 ≧ 4.0.4 と Zlib/"
-"Bzip2 サポート(<tt>--with-zlib</tt> と <tt>--with-bz2</tt>)が必要です。"
+"これらの機能はプラットフォーム(Unix か Windows か、セーフモードかどうか、など)からの独立性を高めるために PHP の "
+"<tt>gzencode()</tt> と <tt>bzcompress()</tt> 関数をベースにしています。そのため、Zlib/Bzip2 "
+"サポート (<tt>--with-zlib</tt> と <tt>--with-bz2</tt>) が必要です。"
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:2647
@@ -7214,15 +7192,13 @@ msgstr ""
msgid ""
"As suggested by "Rob M" in the phpWizard forum, add this line to "
"your <i>httpd.conf</i>:"
-msgstr ""
-"phpWizard フォーラムで「Rob M」が勧めていたように、<i>httpd.conf</i> に次の行"
-"を追加してください:"
+msgstr "phpWizard フォーラムで「Rob M」が勧めていたように、<i>httpd.conf</i> に以下の行を追加してください。"
#. type: Content of: <html><body><div><pre>
#: orig-docs/Documentation.html:2675
-#, fuzzy, no-wrap
+#, no-wrap
msgid "SetEnvIf User-Agent \".*MSIE.*\" nokeepalive ssl-unclean-shutdown"
-msgstr " <tt>SetEnvIf User-Agent \".*MSIE.*\" nokeepalive ssl-unclean-shutdown</tt>"
+msgstr "SetEnvIf User-Agent \".*MSIE.*\" nokeepalive ssl-unclean-shutdown"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2677
@@ -7528,8 +7504,7 @@ msgid ""
"extension, please check PHP Configuration".</a>"
msgstr ""
"<a href=\"#faqmysql\">1.20 「cannot load MySQL extension, please check PHP "
-"Configuration(MySQL エクステンションをロードできません。PHP の設定をチェック"
-"してください)」というエラーが出ます。</a>"
+"Configuration(MySQL 拡張を読み込めません。PHP の設定をチェックしてください)」というエラーが出ます。</a>"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2799
@@ -7875,13 +7850,13 @@ msgstr ""
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:2935
-#, fuzzy
msgid ""
"<a href=\"#faq1_32\">1.32 Can I use <abbr title=\"HyperText Transfer Protocol"
"\">HTTP</abbr> authentication with <abbr title=\"Internet Information "
"Services\">IIS</abbr>?</a>"
msgstr ""
-"HTTP 認証のかわりに利用できます(たとえば IIS を走らせている場合など)。"
+"<a href=\"#faq1_32\"><abbr title=\"Internet Information Services\">IIS</abbr> でも "
+"<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> 認証を利用できますか?</a>"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2937
@@ -7934,8 +7909,8 @@ msgid ""
"<a href=\"#faq1_33\">1.33 Is there a problem with the mysqli extension when "
"running PHP 5.0.4 on 64-bit systems?</a>"
msgstr ""
-"<a href=\"#faq1_33\">1.33 64 ビットのシステムで PHP 5.0.4 を稼動させていると"
-"きの mysqli エクステンションに問題がありませんか?</a>"
+"<a href=\"#faq1_33\">1.33 64 ビットのシステムで PHP 5.0.4 を稼動させているときの mysqli "
+"拡張に問題がありませんか?</a>"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:2954
@@ -10363,9 +10338,7 @@ msgstr ""
msgid ""
"Select the name of the new page (making sure the Edit radio button is "
"selected) and click Go."
-msgstr ""
-"新しいページの名前を選択して(「修正(Edit)」のラジオボタンが選択されている"
-"のを確かめて)、「実行(Go)」をクリックします。"
+msgstr "新しいページの名前を選択して(「修正 (Edit)」のラジオボタンが選択されているのを確かめて)、「実行する (Go)」をクリックします。"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:3945
@@ -11429,10 +11402,17 @@ msgid ""
"on <a href=\"http://wiki.phpmyadmin.net/pma/Gettext_for_translators\">our "
"wiki</a>."
msgstr ""
+"翻訳する po ファイルは必ず Git の最新版をお使いください。<a href=\"http://l10n.cihar.com/\">翻訳サーバ</a>に"
+"てオンラインでいつでも翻訳することができます。また、翻訳サーバを通して、最新の po "
+"ファイルを入手したり、翻訳したものをマージすることもできます。新規の翻訳を作成するには、<code>po/phpmyadmin.pot</code> "
+"を用いて新規用の <code>po/LANG_CODE.po</code> を生成します(この作業は <code>msginit -i "
+"po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code> "
+"とすれば行えます)。もしくは、メーリングリストにてウェブインターフェース用の新規翻訳の追加を依頼してください。詳細は <a "
+"href=\"http://wiki.phpmyadmin.net/pma/Gettext_for_translators\">wiki</a> "
+"をご覧ください。"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:4354
-#, fuzzy
msgid ""
"Please note that we try not to use HTML entities like &eacute; in the "
"translations, since we define the right character set in the file. With "
@@ -11440,12 +11420,10 @@ msgid ""
"However there are some entities that need to be there: quotes, non-breakable "
"spaces, ampersands, less than, greater than."
msgstr ""
-"ご注意ください。phpMyAdmin の翻訳では &eacute; のような HTML エンティティ"
-"は利用せず、ファイルに適切な文字セットを定義するようにしています。HTML エン"
-"ティティを使うと JavaScript のメッセージテキストが正しく表示できないためで"
-"す。ただし、いくつかのエンティティは使う必要があります。クオート(&"
-"quot;)、分離されては困るスペース(&nbsp;)、&(&amp;)、<(&"
-"lt;)、>(&gt;)です。"
+"エンティティに注意するようにしてください。phpMyAdmin の翻訳では &eacute; のような HTML "
+"エンティティは利用せず、ファイルに適切な文字セットを定義するようにしています。HTML エンティティを使うと JavaScript のメッセージテキスト"
+"が正しく表示できないためです。ただし、いくつかのエンティティは使う必要があります。クォート(&quot;)、分離されては困るスペース(&"
+"nbsp;)、&(&amp;)、<(&lt;)、>(&gt;)です。"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:4362
@@ -11485,6 +11463,16 @@ msgid ""
"our <a href=\"https://sourceforge.net/tracker/?group_id=23067&"
"atid=387645\">translation tracker</a>."
msgstr ""
+"現在、ドキュメントは po4a と gettext を用いて翻訳されています(翻訳されているものは <a "
+"href=\"http://www.phpmyadmin.net/home_page/docs.php\">Documentation</a> "
+"を参照してください)。翻訳を始めるには、Git から <a href=\"http://phpmyadmin.git.sourceforge.net/gi"
+"t/gitweb.cgi?p=phpmyadmin/localized_docs;a=tree;f=po\"><code>localized_docs/p"
+"o</code></a> をチェックアウトします。もしくは、<a href=\"https://l10n.cihar.com/projects/pmado"
+"c/\">翻訳サーバ</a>にてオンライン翻訳するのもいいでしょう。翻訳したい言語がない場合は、<a "
+"href=\"mailto:michal@cihar.com\">Michal Čihař</a> "
+"と連絡を取ってみてください。多分、彼が追加してくれます。直接 po ファイルを翻訳したい場合には、<a href=\"https://sourceforg"
+"e.net/tracker/?group_id=23067&atid=387645\">翻訳トラッカー</a>に翻訳したものをアップロードしてくだ"
+"さい。"
#. type: Content of: <html><body><div><h4>
#: orig-docs/Documentation.html:4383
@@ -12669,7 +12657,7 @@ msgstr ""
#. type: Content of: <html><body><div><h3>
#: orig-docs/Documentation.html:4881
msgid "Original Credits of Version 2.1.0"
-msgstr ""
+msgstr "バージョン 2.1.0 当時の貢献者一覧"
#. type: Content of: <html><body><div><p>
#: orig-docs/Documentation.html:4884
@@ -12831,6 +12819,9 @@ msgid ""
"text, images, and other information typically located on a web page at a "
"website on the World Wide Web."
msgstr ""
+"<a href=\"http://ja.wikipedia.org/wiki/%E3%82%A6%E3%82%A7%E3%83%96%E3%83%96%"
+"E3%83%A9%E3%82%A6%E3%82%B6\">ブラウザ(ウェブブラウザ)</a> - World Wide Web 上の Web サイトで "
+"Web ページに一般的に置かれているテキスト、画像、その他の情報をユーザに対して表示や双方向通信することができるアプリケーション"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:4951
@@ -12839,6 +12830,8 @@ msgid ""
"open source data compression algorithm and program developed by Julian "
"Seward."
msgstr ""
+"<a href=\"http://ja.wikipedia.org/wiki/Bzip2\">bzip2</a> - Julian Seward "
+"により開発されたフリーソフトウェアでオープンソースのデータ圧縮アルゴリズムおよびプログラム"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:4954
@@ -12847,6 +12840,9 @@ msgid ""
"</a> - an important World Wide Web technology that enables a client web "
"browser to request data from a program executed on the Web server."
msgstr ""
+"<a href=\"http://ja.wikipedia.org/wiki/Common_Gateway_Interface\">CGI (Common "
+"Gateway Interface)</a> - Web サーバー上で実行されるプログラムでクライアントの Web "
+"ブラウザのデータを要求に応えることができる重要な World Wide Web 技術"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:4957
@@ -12967,11 +12963,13 @@ msgid ""
"Graphics Library</a> - a library by Thomas Boutell and others for "
"dynamically manipulating images."
msgstr ""
+"<a id=\"gd\" href=\"http://ja.wikipedia.org/wiki/GD_Graphics_Library\">GD "
+"グラフィックライブラリ</a> - Thomas Boutell 他によって開発された動的に画像を操作するためのライブラリ"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:4989
msgid "GD2 - look at <a href=\"#gd\">GD Graphics Library</a>."
-msgstr ""
+msgstr "GD2 - → <a href=\"#gd\">GD Graphics Library</a>"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:4990
@@ -12979,6 +12977,8 @@ msgid ""
"<a href=\"http://www.wikipedia.org/wiki/Gzip\">gzip</a> - gzip is short for "
"GNU zip, a GNU free software file compression program."
msgstr ""
+"<a href=\"http://ja.wikipedia.org/wiki/Gzip\">gzip</a> - GNU zip の略称で、GNU "
+"フリーソフトウェアファイル圧縮プログラムのこと"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:4993
@@ -13116,6 +13116,8 @@ msgid ""
"line of personal computers is designed, developed, manufactured, and "
"marketed by Apple Computer."
msgstr ""
+"<a href=\"http://ja.wikipedia.org/wiki/Macintosh\">Mac (Apple Macintosh)</a> - "
+"Apple Computer が設計、開発、製造、販売しているパソコンの一製品"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:5029
@@ -13126,6 +13128,10 @@ msgid ""
"currently shipping Apple Macintosh computers in the consumer and "
"professional markets."
msgstr ""
+"<a id=\"glossar_mac_os_x\" "
+"href=\"http://ja.wikipedia.org/wiki/Mac_OS_X\"><acronym title=\"Apple "
+"Macintosh\">Mac</acronym> <abbr title=\"オペレーティング・システム\">OS</abbr> X</a> - "
+"一般消費者および専門家の市場向けに現在出荷されている全ての Apple Macintosh コンピュータに含まれているオペレーティングシステム"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/Documentation.html:5032
@@ -13161,6 +13167,10 @@ msgid ""
"multi-user, SQL (Structured Query Language) Database Management System "
"(DBMS)."
msgstr ""
+"<a href=\"http://ja.wikipedia.org/wiki/MySQL\">MySQL</a> - "
+"マルチスレッド、マルチユーザー、<abbr title=\"structured query "
+"language\">SQL</abbr>が使えるデータベース管理システム (<abbr title=\"Database Management "
+"System\">DBMS</abbr>)"
#. type: Content of: <html><body><div><ul><li>
#: orig-docs/ nt of: <html><body><div><ul><li>