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

Merge remote-tracking branch 'origin/master' into browsemode

Browse Source
This commit is contained in:
Aris Feryanto 2011-05-10 01:55:59 +07:00
commit 48092de206
118 changed files with 868 additions and 799 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -3,6 +3,8 @@
3.5.0.0 (not yet released)
3.4.1.0 (not yet released)
3.4.0.0 (not yet released)
+ rfe #2890226 [view] Enable VIEW rename
+ rfe #838637 [privileges] Export a user's privileges

2
browse_foreigners.php
View File

@ -27,7 +27,7 @@ $foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE
$override_total = TRUE;
if (!isset($pos)) {
if (! isset($pos)) {
$pos = 0;
}

4
db_datadict.php
View File

@ -10,7 +10,7 @@
*/
require_once './libraries/common.inc.php';
if (!isset($selected_tbl)) {
if (! isset($selected_tbl)) {
require_once './libraries/header.inc.php';
}
@ -220,7 +220,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) {
if ($zerofill) {
$attribute = 'UNSIGNED ZEROFILL';
}
if (!isset($row['Default'])) {
if (! isset($row['Default'])) {
if ($row['Null'] != 'NO') {
$row['Default'] = '<i>NULL</i>';
}

4
db_operations.php
View File

@ -37,7 +37,7 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
$move = false;
}
if (!isset($newname) || !strlen($newname)) {
if (! isset($newname) || ! strlen($newname)) {
$message = PMA_Message::error(__('The database name is empty!'));
} else {
$sql_query = ''; // in case target db exists
@ -561,7 +561,7 @@ echo __('Remove database');
. '</form></div>' . "\n";
if ($num_tables > 0
&& !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
&& ! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
$message = PMA_Message::notice(__('The phpMyAdmin configuration storage has been deactivated. To find out why click %shere%s.'));
$message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">', false);
$message->addParam('</a>', false);

2
db_printview.php
View File

@ -52,7 +52,7 @@ if ($cfg['SkipLockedTables'] == true) {
$result = PMA_DBI_query('SHOW TABLES FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
if ($result != false && PMA_DBI_num_rows($result) > 0) {
while ($tmp = PMA_DBI_fetch_row($result)) {
if (!isset($sot_cache[$tmp[0]])) {
if (! isset($sot_cache[$tmp[0]])) {
$sts_result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . addslashes($tmp[0]) . '\';');
$sts_tmp = PMA_DBI_fetch_assoc($sts_result);
$tables[] = $sts_tmp;

10
db_qbe.php
View File

@ -339,7 +339,7 @@ for ($x = 0; $x < $col; $x++) {
if (isset($criteria[$x])) {
$tmp_criteria = $criteria[$x];
}
if ((empty($prev_criteria) || !isset($prev_criteria[$x]))
if ((empty($prev_criteria) || ! isset($prev_criteria[$x]))
|| $prev_criteria[$x] != htmlspecialchars($tmp_criteria)) {
$curCriteria[$z] = $tmp_criteria;
} else {
@ -497,7 +497,7 @@ for ($y = 0; $y <= $row; $y++) {
echo "\n";
$or = 'Or' . $y;
if (!isset(${$or})) {
if (! isset(${$or})) {
${$or} = '';
}
if (!empty(${$or}) && isset(${$or}[$x])) {
@ -667,7 +667,7 @@ foreach ($tbl_names as $key => $val) {
<?php
// 1. SELECT
$last_select = 0;
if (!isset($qry_select)) {
if (! isset($qry_select)) {
$qry_select = '';
}
for ($x = 0; $x < $col; $x++) {
@ -892,7 +892,7 @@ if ($criteria_cnt > 1) {
$qry_where = '(' . $qry_where . ')';
}
// OR rows ${'cur' . $or}[$x]
if (!isset($curAndOrRow)) {
if (! isset($curAndOrRow)) {
$curAndOrRow = array();
}
for ($y = 0; $y <= $row; $y++) {
@ -929,7 +929,7 @@ if (!empty($qry_where) && $qry_where != '()') {
// 4. ORDER BY
$last_orderby = 0;
if (!isset($qry_orderby)) {
if (! isset($qry_orderby)) {
$qry_orderby = '';
}
for ($x = 0; $x < $col; $x++) {

4
export.php
View File

@ -21,7 +21,7 @@ $export_list = PMA_getPlugins('./libraries/export/', array('export_type' => $exp
$type = $what;
// Check export type
if (!isset($export_list[$type])) {
if (! isset($export_list[$type])) {
die('Bad type!');
}
@ -451,7 +451,7 @@ if ($export_type == 'server') {
// Walk over databases
foreach ($GLOBALS['pma']->databases as $current_db) {
if ((isset($tmp_select) && strpos(' ' . $tmp_select, '|' . $current_db . '|'))
|| !isset($tmp_select)) {
|| ! isset($tmp_select)) {
if (!PMA_exportDBHeader($current_db)) {
break 2;
}

2
import.php
View File

@ -332,7 +332,7 @@ if ($import_file != 'none' && !$error) {
$error = TRUE;
}
} elseif (!$error) {
if (!isset($import_text) || empty($import_text)) {
if (! isset($import_text) || empty($import_text)) {
$message = PMA_Message::error(__('No data was received to import. Either no file name was submitted, or the file size exceeded the maximum size permitted by your PHP configuration. See [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a].'));
$error = TRUE;
}

2
js/functions.js
View File

@ -1118,7 +1118,7 @@ function changeMIMEType(db, table, reference, mime_type)
* Jquery Coding for inline editing SQL_QUERY
*/
$(document).ready(function(){
$(".inline_edit").click( function(){
$(".inline_edit_sql").click( function(){
var db = $(this).prev().find("input[name='db']").val();
var table = $(this).prev().find("input[name='table']").val();
var token = $(this).prev().find("input[name='token']").val();

16
libraries/Config.class.php
View File

@ -148,7 +148,7 @@ class PMA_Config
{
if (PMA_getenv('HTTP_USER_AGENT')) {
$HTTP_USER_AGENT = PMA_getenv('HTTP_USER_AGENT');
} elseif (!isset($HTTP_USER_AGENT)) {
} elseif (! isset($HTTP_USER_AGENT)) {
$HTTP_USER_AGENT = '';
}
@ -441,7 +441,7 @@ class PMA_Config
if ($server > 0 && !defined('PMA_MINIMUM_COMMON')) {
$config_mtime = max($this->default_source_mtime, $this->source_mtime);
// cache user preferences, use database only when needed
if (!isset($_SESSION['cache'][$cache_key]['userprefs'])
if (! isset($_SESSION['cache'][$cache_key]['userprefs'])
|| $_SESSION['cache'][$cache_key]['config_mtime'] < $config_mtime) {
// load required libraries
require_once './libraries/user_preferences.lib.php';
@ -451,7 +451,7 @@ class PMA_Config
$_SESSION['cache'][$cache_key]['userprefs_type'] = $prefs['type'];
$_SESSION['cache'][$cache_key]['config_mtime'] = $config_mtime;
}
} else if ($server == 0 || !isset($_SESSION['cache'][$cache_key]['userprefs'])) {
} else if ($server == 0 || ! isset($_SESSION['cache'][$cache_key]['userprefs'])) {
$this->set('user_preferences', false);
return;
}
@ -476,7 +476,7 @@ class PMA_Config
// save theme
$tmanager = $_SESSION['PMA_Theme_Manager'];
if ($tmanager->getThemeCookie() || isset($_REQUEST['set_theme'])) {
if ((!isset($config_data['ThemeDefault']) && $tmanager->theme->getId() != 'original')
if ((! isset($config_data['ThemeDefault']) && $tmanager->theme->getId() != 'original')
|| isset($config_data['ThemeDefault']) && $config_data['ThemeDefault'] != $tmanager->theme->getId()) {
// new theme was set in common.inc.php
$this->setUserValue(null, 'ThemeDefault', $tmanager->theme->getId(), 'original');
@ -491,14 +491,14 @@ class PMA_Config
}
// save font size
if ((!isset($config_data['fontsize']) && $org_fontsize != '82%')
if ((! isset($config_data['fontsize']) && $org_fontsize != '82%')
|| isset($config_data['fontsize']) && $org_fontsize != $config_data['fontsize']) {
$this->setUserValue(null, 'fontsize', $org_fontsize, '82%');
}
// save language
if (isset($_COOKIE['pma_lang']) || isset($_POST['lang'])) {
if ((!isset($config_data['lang']) && $GLOBALS['lang'] != 'en')
if ((! isset($config_data['lang']) && $GLOBALS['lang'] != 'en')
|| isset($config_data['lang']) && $GLOBALS['lang'] != $config_data['lang']) {
$this->setUserValue(null, 'lang', $GLOBALS['lang'], 'en');
}
@ -511,7 +511,7 @@ class PMA_Config
// save connection collation
if (isset($_COOKIE['pma_collation_connection']) || isset($_POST['collation_connection'])) {
if ((!isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci')
if ((! isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != 'utf8_general_ci')
|| isset($config_data['collation_connection']) && $GLOBALS['collation_connection'] != $config_data['collation_connection']) {
$this->setUserValue(null, 'collation_connection', $GLOBALS['collation_connection'], 'utf8_general_ci');
}
@ -678,7 +678,7 @@ class PMA_Config
*/
function set($setting, $value)
{
if (!isset($this->settings[$setting]) || $this->settings[$setting] != $value) {
if (! isset($this->settings[$setting]) || $this->settings[$setting] != $value) {
$this->settings[$setting] = $value;
$this->set_mtime = time();
}

2
libraries/List_Database.class.php
View File

@ -498,7 +498,7 @@ require_once './libraries/List.class.php';
if (isset($tmp_mydbs[$tmp_db]) && $tmp_mydbs[$tmp_db] == 1) {
$dblist[] = $tmp_db;
$tmp_mydbs[$tmp_db] = 0;
} elseif (!isset($dblist[$tmp_db])) {
} elseif (! isset($dblist[$tmp_db])) {
foreach ($tmp_mydbs as $tmp_matchpattern => $tmp_value) {
// fixed bad regexp
// TODO: db names may contain characters

2
libraries/Table.class.php
View File

@ -889,7 +889,7 @@ class PMA_Table
} else {
// we are copying
// Create new entries as duplicates from old PMA DBs
if ($what != 'dataonly' && !isset($maintain_relations)) {
if ($what != 'dataonly' && ! isset($maintain_relations)) {
if ($GLOBALS['cfgRelation']['commwork']) {
// Get all comments and MIME-Types for current table
$comments_copy_query = 'SELECT

4
libraries/chart.lib.php
View File

@ -104,7 +104,7 @@ function PMA_chart_results($data, &$chartSettings)
// default for muti series
$chartSettings['multi'] = false;
if (!isset($data[0])) {
if (! isset($data[0])) {
// empty data
return __('No data found for the chart.');
}
@ -192,7 +192,7 @@ function PMA_chart_results($data, &$chartSettings)
// the value os for this serie
$chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = (int)$row[$yAxisKey];
}
else if (!isset($chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]])) {
else if (! isset($chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]])) {
// if the value for this serie is not set, set it to 0
$chartData[$yAxisKey][$seriesLabelsValue][$row[$xAxisKey]] = 0;
}

4
libraries/common.inc.php
View File

@ -608,7 +608,7 @@ $GLOBALS['server'] = 0;
* @todo merge into PMA_Config
*/
// Do we have some server?
if (!isset($cfg['Servers']) || count($cfg['Servers']) == 0) {
if (! isset($cfg['Servers']) || count($cfg['Servers']) == 0) {
// No server => create one with defaults
$cfg['Servers'] = array(1 => $default_server);
} else {
@ -664,7 +664,7 @@ if (! isset($_SESSION['PMA_Theme_Manager'])) {
}
// for the theme per server feature
if (isset($_REQUEST['server']) && !isset($_REQUEST['set_theme'])) {
if (isset($_REQUEST['server']) && ! isset($_REQUEST['set_theme'])) {
$GLOBALS['server'] = $_REQUEST['server'];
$tmp = $_SESSION['PMA_Theme_Manager']->getThemeCookie();
if (empty($tmp)) {

28
libraries/common.lib.php
View File

@ -301,7 +301,7 @@ function PMA_formatSql($parsed_sql, $unparsed_sql = '')
return htmlspecialchars($parsed_sql['raw']);
}
// then check for an array
if (!is_array($parsed_sql)) {
if (! is_array($parsed_sql)) {
// We don't so just return the input directly
// This is intended to be used for when the SQL Parser is turned off
$formatted_sql = '<pre>' . "\n"
@ -663,7 +663,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
if ($exit) {
/**
* If in an Ajax request
* - avoid displaying a Back link
* - avoid displaying a Back link
* - use PMA_ajaxResponse() to transmit the message and exit
*/
if($GLOBALS['is_ajax_request'] == true) {
@ -781,12 +781,12 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
$group_name = $parts[$i] . $sep;
$group_name_full .= $group_name;
if (!isset($group[$group_name])) {
if (! isset($group[$group_name])) {
$group[$group_name] = array();
$group[$group_name]['is' . $sep . 'group'] = true;
$group[$group_name]['tab' . $sep . 'count'] = 1;
$group[$group_name]['tab' . $sep . 'group'] = $group_name_full;
} elseif (!isset($group[$group_name]['is' . $sep . 'group'])) {
} elseif (! isset($group[$group_name]['is' . $sep . 'group'])) {
$table = $group[$group_name];
$group[$group_name] = array();
$group[$group_name][$group_name] = $table;
@ -801,7 +801,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
$i++;
}
} else {
if (!isset($table_groups[$table_name])) {
if (! isset($table_groups[$table_name])) {
$table_groups[$table_name] = array();
}
$group =& $table_groups;
@ -963,7 +963,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
* in a string. In some special cases on sql.php, buffering has to be disabled
* and hence we check with $GLOBALS['buffer_message']
*/
if( $GLOBALS['is_ajax_request'] == true && !isset($GLOBALS['buffer_message']) ) {
if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) {
ob_start();
}
global $cfg;
@ -1255,7 +1255,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
// in the tools div, only display the Inline link when not in ajax
// mode because 1) it currently does not work and 2) we would
// have two similar mechanisms on the page for the same goal
// have two similar mechanisms on the page for the same goal
if ($is_select || $GLOBALS['is_ajax_request'] === false) {
// see in js/functions.js the jQuery code attached to id inline_edit
// document.write conflicts with jQuery, hence used $().append()
@ -1263,7 +1263,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
"//<![CDATA[\n" .
"$('.tools form').last().after('[<a href=\"#\" title=\"" .
PMA_escapeJsString(__('Inline edit of this query')) .
"\" class=\"inline_edit\">" .
"\" class=\"inline_edit_sql\">" .
PMA_escapeJsString(__('Inline')) .
"</a>]');\n" .
"//]]>\n" .
@ -1280,7 +1280,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
// If we are in an Ajax request, we have most probably been called in
// PMA_ajaxResponse(). Hence, collect the buffer contents and return it
// to PMA_ajaxResponse(), which will encode it for JSON.
if( $GLOBALS['is_ajax_request'] == true && !isset($GLOBALS['buffer_message']) ) {
if( $GLOBALS['is_ajax_request'] == true && ! isset($GLOBALS['buffer_message']) ) {
$buffer_contents = ob_get_contents();
ob_end_clean();
return $buffer_contents;
@ -2001,7 +2001,7 @@ function PMA_checkParameters($params, $die = true, $request = true)
{
global $checked_special;
if (!isset($checked_special)) {
if (! isset($checked_special)) {
$checked_special = false;
}
@ -2014,7 +2014,7 @@ function PMA_checkParameters($params, $die = true, $request = true)
$checked_special = true;
}
if (!isset($GLOBALS[$param])) {
if (! isset($GLOBALS[$param])) {
$error_message .= $reported_script_name
. ': Missing parameter: ' . $param
. PMA_showDocu('faqmissingparameters')
@ -2112,7 +2112,7 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force
. PMA_backquote($meta->orgname) . ' ';
} // end if... else...
if (!isset($row[$i]) || is_null($row[$i])) {
if (! isset($row[$i]) || is_null($row[$i])) {
$condition .= 'IS NULL AND';
} else {
// timestamp is numeric on some MySQL 4.1
@ -2434,8 +2434,8 @@ function PMA_userDir($dir)
*/
function PMA_getDbLink($database = null)
{
if (!strlen($database)) {
if (!strlen($GLOBALS['db'])) {
if (! strlen($database)) {
if (! strlen($GLOBALS['db'])) {
return '';
}
$database = $GLOBALS['db'];

10
libraries/core.lib.php
View File

@ -386,7 +386,7 @@ function PMA_array_merge_recursive()
break;
case 2 :
$args = func_get_args();
if (!is_array($args[0]) || !is_array($args[1])) {
if (! is_array($args[0]) || ! is_array($args[1])) {
return $args[1];
}
foreach ($args[1] as $key2 => $value2) {
@ -603,7 +603,7 @@ function PMA_array_read($path, $array, $default = null)
$keys = explode('/', $path);
$value =& $array;
foreach ($keys as $key) {
if (!isset($value[$key])) {
if (! isset($value[$key])) {
return $default;
}
$value =& $value[$key];
@ -624,7 +624,7 @@ function PMA_array_write($path, &$array, $value)
$last_key = array_pop($keys);
$a =& $array;
foreach ($keys as $key) {
if (!isset($a[$key])) {
if (! isset($a[$key])) {
$a[$key] = array();
}
$a =& $a[$key];
@ -650,7 +650,7 @@ function PMA_array_remove($path, &$array)
$found = true;
// go as deep as required or possible
foreach ($keys as $key) {
if (!isset($path[$depth][$key])) {
if (! isset($path[$depth][$key])) {
$found = false;
break;
}
@ -665,7 +665,7 @@ function PMA_array_remove($path, &$array)
// remove empty nested arrays
for (; $depth >= 0; $depth--) {
if (!isset($path[$depth+1]) || count($path[$depth+1]) == 0) {
if (! isset($path[$depth+1]) || count($path[$depth+1]) == 0) {
unset($path[$depth][$keys[$depth]]);
} else {
break;

2
libraries/database_interface.lib.php
View File

@ -196,7 +196,7 @@ function PMA_usort_comparison_callback($a, $b)
$sorter = 'strcasecmp';
}
/* No sorting when key is not present */
if (!isset($a[$GLOBALS['callback_sort_by']]) || ! isset($b[$GLOBALS['callback_sort_by']])) {
if (! isset($a[$GLOBALS['callback_sort_by']]) || ! isset($b[$GLOBALS['callback_sort_by']])) {
return 0;
}
// produces f.e.:

4
libraries/db_info.inc.php
View File

@ -152,7 +152,7 @@ if (true === $cfg['SkipLockedTables']) {
null, PMA_DBI_QUERY_STORE);
if ($db_info_result && PMA_DBI_num_rows($db_info_result) > 0) {
while ($tmp = PMA_DBI_fetch_row($db_info_result)) {
if (!isset($sot_cache[$tmp[0]])) {
if (! isset($sot_cache[$tmp[0]])) {
$sts_result = PMA_DBI_query(
'SHOW TABLE STATUS FROM ' . PMA_backquote($db)
. ' LIKE \'' . addslashes($tmp[0]) . '\';');
@ -160,7 +160,7 @@ if (true === $cfg['SkipLockedTables']) {
PMA_DBI_free_result($sts_result);
unset($sts_result);
if (!isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) {
if (! isset($sts_tmp['Type']) && isset($sts_tmp['Engine'])) {
$sts_tmp['Type'] =& $sts_tmp['Engine'];
}

2
libraries/display_export.lib.php
View File

@ -65,7 +65,7 @@ echo '<input type="hidden" name="export_type" value="' . $export_type . '" />' .
// If the export method was not set, the default is quick
if(isset($_GET['export_method'])) {
$cfg['Export']['method'] = $_GET['export_method'];
} elseif(!isset($cfg['Export']['method'])) {
} elseif(! isset($cfg['Export']['method'])) {
$cfg['Export']['method'] = 'quick';
}
// The export method (quick, custom or custom-no-form)

38
libraries/display_tbl.lib.php
View File

@ -1091,7 +1091,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
}
}
if (!is_array($map)) {
if (! is_array($map)) {
$map = array();
}
$row_no = 0;
@ -1272,7 +1272,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$condition_field = false;
}
if ($_SESSION['tmp_user_values']['disp_direction'] == 'vertical' && (!isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1'))) {
if ($_SESSION['tmp_user_values']['disp_direction'] == 'vertical' && (! isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1'))) {
// the row number corresponds to a data row, not HTML table row
$class .= ' row_' . $row_no;
if ($GLOBALS['cfg']['BrowsePointerEnable'] == true) {
@ -1328,7 +1328,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// will show both fields NULL even if only one is NULL,
// so use the $pointer
if (!isset($row[$i]) || is_null($row[$i])) {
if (! isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field);
} elseif ($row[$i] != '') {
@ -1351,7 +1351,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$class = str_replace('inline_edit', '', $class);
if (stristr($field_flags, 'BINARY')) {
if (!isset($row[$i]) || is_null($row[$i])) {
if (! isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field);
} else {
// for blobstreaming
@ -1367,7 +1367,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
}
// not binary:
} else {
if (!isset($row[$i]) || is_null($row[$i])) {
if (! isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field);
} elseif ($row[$i] != '') {
// if a transform function for blob is set, none of these replacements will be made
@ -1395,7 +1395,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// n o t n u m e r i c a n d n o t B L O B
} else {
if (!isset($row[$i]) || is_null($row[$i])) {
if (! isset($row[$i]) || is_null($row[$i])) {
$vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field);
} elseif ($row[$i] != '') {
// support blanks in the key
@ -1477,7 +1477,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// 4. Gather links of del_urls and edit_urls in an array for later
// output
if (!isset($vertical_display['edit'][$row_no])) {
if (! isset($vertical_display['edit'][$row_no])) {
$vertical_display['edit'][$row_no] = '';
$vertical_display['copy'][$row_no] = '';
$vertical_display['delete'][$row_no] = '';
@ -1563,7 +1563,7 @@ function PMA_displayVerticalTable()
// Displays "edit" link at top if required
if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
if (!is_array($vertical_display['row_delete'])) {
if (! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
}
$foo_counter = 0;
@ -1581,7 +1581,7 @@ function PMA_displayVerticalTable()
// Displays "copy" link at top if required
if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
if (!is_array($vertical_display['row_delete'])) {
if (! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
}
$foo_counter = 0;
@ -1599,7 +1599,7 @@ function PMA_displayVerticalTable()
// Displays "delete" link at top if required
if ($GLOBALS['cfg']['ModifyDeleteAtLeft'] && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
if (!is_array($vertical_display['edit']) && !is_array($vertical_display['row_delete'])) {
if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
}
$foo_counter = 0;
@ -1652,7 +1652,7 @@ function PMA_displayVerticalTable()
// Displays "edit" link at bottom if required
if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['edit']) && (count($vertical_display['edit']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
if (!is_array($vertical_display['row_delete'])) {
if (! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
}
$foo_counter = 0;
@ -1670,7 +1670,7 @@ function PMA_displayVerticalTable()
// Displays "copy" link at bottom if required
if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['copy']) && (count($vertical_display['copy']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
if (!is_array($vertical_display['row_delete'])) {
if (! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
}
$foo_counter = 0;
@ -1688,7 +1688,7 @@ function PMA_displayVerticalTable()
// Displays "delete" link at bottom if required
if ($GLOBALS['cfg']['ModifyDeleteAtRight'] && is_array($vertical_display['delete']) && (count($vertical_display['delete']) > 0 || !empty($vertical_display['textbtn']))) {
echo '<tr>' . "\n";
if (!is_array($vertical_display['edit']) && !is_array($vertical_display['row_delete'])) {
if (! is_array($vertical_display['edit']) && ! is_array($vertical_display['row_delete'])) {
echo $vertical_display['textbtn'];
}
$foo_counter = 0;
@ -2070,7 +2070,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
PMA_showMessage($message, $sql_query, 'success');
} elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
} elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
PMA_showMessage(__('Your SQL query has been executed successfully'), $sql_query, 'success');
}
@ -2090,7 +2090,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
if ($is_display['nav_bar'] == '1') {
PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, 'top_direction_dropdown');
echo "\n";
} elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
} elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
echo "\n" . '<br /><br />' . "\n";
}
@ -2212,12 +2212,12 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
if ($is_display['nav_bar'] == '1') {
echo '<br />' . "\n";
PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, 'bottom_direction_dropdown');
} elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
} elseif (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
echo "\n" . '<br /><br />' . "\n";
}
// 6. ----- Displays "Query results operations"
if (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
if (! isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') {
PMA_displayResultsOperations($the_disp_mode, $analyzed_sql);
}
} // end of the 'PMA_displayTable()' function
@ -2298,8 +2298,8 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) {
// If the parser found a PROCEDURE clause
// (most probably PROCEDURE ANALYSE()) it makes no sense to
// display the Export link).
if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT' && !isset($printview) && ! isset($analyzed_sql[0]['queryflags']['procedure'])) {
if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name']) && !isset($analyzed_sql[0]['table_ref'][1]['table_true_name'])) {
if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT' && ! isset($printview) && ! isset($analyzed_sql[0]['queryflags']['procedure'])) {
if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name']) && ! isset($analyzed_sql[0]['table_ref'][1]['table_true_name'])) {
$_url_params['single_table'] = 'true';
}
if (!$header_shown) {

2
libraries/footer.inc.php
View File

@ -166,7 +166,7 @@ if (window.parent.frame_content) {
}
// Link to itself to replicate windows including frameset
if (!isset($GLOBALS['checked_special'])) {
if (! isset($GLOBALS['checked_special'])) {
$GLOBALS['checked_special'] = false;
}

4
libraries/header.inc.php
View File

@ -45,7 +45,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
// if database storage for user preferences is transient, offer to load
// exported settings from localStorage (detection will be done in JavaScript)
$userprefs_offer_import = $GLOBALS['PMA_Config']->get('user_preferences') == 'session'
&& !isset($_SESSION['userprefs_autoload']);
&& ! isset($_SESSION['userprefs_autoload']);
if ($userprefs_offer_import) {
$GLOBALS['js_include'][] = 'config.js';
}
@ -158,7 +158,7 @@ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) {
* @uses $show_comment from libraries/tbl_info.inc.php
* @uses $GLOBALS['avoid_show_comment'] from tbl_relation.php
*/
if (!empty($show_comment) && !isset($GLOBALS['avoid_show_comment'])) {
if (!empty($show_comment) && ! isset($GLOBALS['avoid_show_comment'])) {
if (strstr($show_comment, '; InnoDB free')) {
$show_comment = preg_replace('@; InnoDB free:.*?$@', '', $show_comment);
}

4
libraries/import.lib.php
View File

@ -127,7 +127,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false)
}
$msg = '# ';
if ($result === FALSE) { // execution failed
if (!isset($my_die)) {
if (! isset($my_die)) {
$my_die = array();
}
$my_die[] = array('sql' => $import_run_buffer['full'], 'error' => PMA_DBI_getError());
@ -697,7 +697,7 @@ function PMA_detectSize($last_cumulative_size, $last_cumulative_type, $curr_type
/**
* This is the first row to be analyzed
*/
elseif (!isset($last_cumulative_type) || $last_cumulative_type == NONE) {
elseif (! isset($last_cumulative_type) || $last_cumulative_type == NONE) {
return $curr_size;
}
/**

4
libraries/mysql_charsets.lib.php
View File

@ -37,7 +37,7 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) {
: 'SELECT * FROM information_schema.COLLATIONS';
$res = PMA_DBI_query($sql);
while ($row = PMA_DBI_fetch_assoc($res)) {
if (!is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) {
if (! is_array($mysql_collations[$row['CHARACTER_SET_NAME']])) {
$mysql_collations[$row['CHARACTER_SET_NAME']] = array($row['COLLATION_NAME']);
} else {
$mysql_collations[$row['CHARACTER_SET_NAME']][] = $row['COLLATION_NAME'];
@ -46,7 +46,7 @@ if (! PMA_cacheExists('mysql_charsets_count', true)) {
if ($row['IS_DEFAULT'] == 'Yes') {
$mysql_default_collations[$row['CHARACTER_SET_NAME']] = $row['COLLATION_NAME'];
}
//$mysql_collations_available[$row['Collation']] = !isset($row['Compiled']) || $row['Compiled'] == 'Yes';
//$mysql_collations_available[$row['Collation']] = ! isset($row['Compiled']) || $row['Compiled'] == 'Yes';
$mysql_collations_available[$row['COLLATION_NAME']] = true;
$mysql_charsets_available[$row['CHARACTER_SET_NAME']] =
!empty($mysql_charsets_available[$row['CHARACTER_SET_NAME']])

6
libraries/plugin_interface.lib.php
View File

@ -71,7 +71,7 @@ function PMA_getString($name)
function PMA_pluginCheckboxCheck($section, $opt)
{
// If the form is being repopulated using $_GET data, that is priority
if (isset($_GET[$opt]) || !isset($_GET['repopulate']) && ((isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) ||
if (isset($_GET[$opt]) || ! isset($_GET['repopulate']) && ((isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed'] && isset($_REQUEST[$opt])) ||
(isset($GLOBALS['cfg'][$section][$opt]) && $GLOBALS['cfg'][$section][$opt]))) {
return ' checked="checked"';
}
@ -160,7 +160,7 @@ function PMA_pluginIsActive($section, $opt, $val)
*/
function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL)
{
if (!isset($cfgname)) {
if (! isset($cfgname)) {
$cfgname = $name;
}
$ret = '<select id="plugins" name="' . $name . '">';
@ -168,7 +168,7 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = NULL)
foreach ($list as $plugin_name => $val) {
$ret .= '<option';
// If the form is being repopulated using $_GET data, that is priority
if(isset($_GET[$name]) && $plugin_name == $_GET[$name] || !isset($_GET[$name]) && $plugin_name == $default) {
if(isset($_GET[$name]) && $plugin_name == $_GET[$name] || ! isset($_GET[$name]) && $plugin_name == $default) {
$ret .= ' selected="selected"';
}
$ret .= ' value="' . $plugin_name . '">' . PMA_getString($val['text']) . '</option>' . "\n";

6
libraries/schema/Dia_Relation_Schema.class.php
View File

@ -680,7 +680,7 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
$dia->startDiaDoc($this->paper,$this->_topMargin,$this->_bottomMargin,$this->_leftMargin,$this->_rightMargin,$this->orientation);
$alltables = $this->getAllTables($db,$this->pageNumber);
foreach ($alltables as $table) {
if (!isset($this->tables[$table])) {
if (! isset($this->tables[$table])) {
$this->tables[$table] = new Table_Stats($table, $this->pageNumber, $this->showKeys);
}
}
@ -725,10 +725,10 @@ class PMA_Dia_Relation_Schema extends PMA_Export_Relation_Schema
*/
private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showKeys)
{
if (!isset($this->tables[$masterTable])) {
if (! isset($this->tables[$masterTable])) {
$this->tables[$masterTable] = new Table_Stats($masterTable, $this->pageNumber, $showKeys);
}
if (!isset($this->tables[$foreignTable])) {
if (! isset($this->tables[$foreignTable])) {
$this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->pageNumber, $showKeys);
}
$this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField);

6
libraries/schema/Eps_Relation_Schema.class.php
View File

@ -759,7 +759,7 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema
$alltables = $this->getAllTables($db,$this->pageNumber);
foreach ($alltables AS $table) {
if (!isset($this->tables[$table])) {
if (! isset($this->tables[$table])) {
$this->tables[$table] = new Table_Stats($table,$eps->getFont(),$eps->getFontSize(), $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension);
}
@ -809,10 +809,10 @@ class PMA_Eps_Relation_Schema extends PMA_Export_Relation_Schema
*/
private function _addRelation($masterTable,$font,$fontSize, $masterField, $foreignTable, $foreignField, $showInfo)
{
if (!isset($this->tables[$masterTable])) {
if (! isset($this->tables[$masterTable])) {
$this->tables[$masterTable] = new Table_Stats($masterTable, $font, $fontSize, $this->pageNumber, $this->_tablewidth, false, $showInfo);
}
if (!isset($this->tables[$foreignTable])) {
if (! isset($this->tables[$foreignTable])) {
$this->tables[$foreignTable] = new Table_Stats($foreignTable,$font,$fontSize,$this->pageNumber, $this->_tablewidth, false, $showInfo);
}
$this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField);

8
libraries/schema/Pdf_Relation_Schema.class.php
View File

@ -882,7 +882,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
/* snip */
foreach ($alltables as $table) {
if (!isset($this->tables[$table])) {
if (! isset($this->tables[$table])) {
$this->tables[$table] = new Table_Stats($table, $this->_ff, $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension);
}
if ($this->sameWide) {
@ -962,11 +962,11 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
*/
private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showInfo)
{
if (!isset($this->tables[$masterTable])) {
if (! isset($this->tables[$masterTable])) {
$this->tables[$masterTable] = new Table_Stats($masterTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo);
$this->_setMinMax($this->tables[$masterTable]);
}
if (!isset($this->tables[$foreignTable])) {
if (! isset($this->tables[$foreignTable])) {
$this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->_ff, $this->pageNumber, $this->_tablewidth, false, $showInfo);
$this->_setMinMax($this->tables[$foreignTable]);
}
@ -1305,7 +1305,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
if ($zerofill) {
$attribute = 'UNSIGNED ZEROFILL';
}
if (!isset($row['Default'])) {
if (! isset($row['Default'])) {
if ($row['Null'] != '' && $row['Null'] != 'NO') {
$row['Default'] = 'NULL';
}

6
libraries/schema/Svg_Relation_Schema.class.php
View File

@ -742,7 +742,7 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
$alltables = $this->getAllTables($db,$this->pageNumber);
foreach ($alltables AS $table) {
if (!isset($this->tables[$table])) {
if (! isset($this->tables[$table])) {
$this->tables[$table] = new Table_Stats($table,$svg->getFont(),$svg->getFontSize(), $this->pageNumber, $this->_tablewidth, $this->showKeys, $this->tableDimension);
}
@ -805,11 +805,11 @@ class PMA_Svg_Relation_Schema extends PMA_Export_Relation_Schema
*/
private function _addRelation($masterTable,$font,$fontSize, $masterField, $foreignTable, $foreignField, $showInfo)
{
if (!isset($this->tables[$masterTable])) {
if (! isset($this->tables[$masterTable])) {
$this->tables[$masterTable] = new Table_Stats($masterTable, $font, $fontSize, $this->pageNumber, $this->_tablewidth, false, $showInfo);
$this->_setMinMax($this->tables[$masterTable]);
}
if (!isset($this->tables[$foreignTable])) {
if (! isset($this->tables[$foreignTable])) {
$this->tables[$foreignTable] = new Table_Stats($foreignTable,$font,$fontSize,$this->pageNumber, $this->_tablewidth, false, $showInfo);
$this->_setMinMax($this->tables[$foreignTable]);
}

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

@ -222,7 +222,7 @@ class PMA_User_Schema
* Display WYSIWYG parts
*/
if (!isset($_POST['with_field_names']) && !isset($_POST['showwysiwyg'])) {
if (! isset($_POST['with_field_names']) && ! isset($_POST['showwysiwyg'])) {
$with_field_names = TRUE;
}
$this->_displayScratchboardTables($array_sh_page);
@ -783,10 +783,10 @@ class PMA_User_Schema
$arrvalue = 'c_table_' . $i;
global $$arrvalue;
$arrvalue = $$arrvalue;
if (!isset($arrvalue['x']) || $arrvalue['x'] == '') {
if (! isset($arrvalue['x']) || $arrvalue['x'] == '') {
$arrvalue['x'] = 0;
}
if (!isset($arrvalue['y']) || $arrvalue['y'] == '') {
if (! isset($arrvalue['y']) || $arrvalue['y'] == '') {
$arrvalue['y'] = 0;
}
if (isset($arrvalue['name']) && $arrvalue['name'] != '--') {

6
libraries/schema/Visio_Relation_Schema.class.php
View File

@ -505,7 +505,7 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema
$alltables = $this->getAllTables($db,$this->pageNumber);
foreach ($alltables as $table) {
if (!isset($this->tables[$table])) {
if (! isset($this->tables[$table])) {
$this->tables[$table] = new Table_Stats($table, $this->pageNumber, $this->showKeys);
}
}
@ -550,10 +550,10 @@ class PMA_Visio_Relation_Schema extends PMA_Export_Relation_Schema
*/
private function _addRelation($masterTable, $masterField, $foreignTable, $foreignField, $showKeys)
{
if (!isset($this->tables[$masterTable])) {
if (! isset($this->tables[$masterTable])) {
$this->tables[$masterTable] = new Table_Stats($masterTable, $this->pageNumber, $showKeys);
}
if (!isset($this->tables[$foreignTable])) {
if (! isset($this->tables[$foreignTable])) {
$this->tables[$foreignTable] = new Table_Stats($foreignTable, $this->pageNumber, $showKeys);
}
$this->_relations[] = new Relation_Stats($this->tables[$masterTable], $masterField, $this->tables[$foreignTable], $foreignField);

2
libraries/server_links.inc.php
View File

@ -27,7 +27,7 @@ if (!$GLOBALS['is_ajax_request']) {
/**
* Put something in $sub_part
*/
if (!isset($sub_part)) {
if (! isset($sub_part)) {
$sub_part = '';
}

2
libraries/session.inc.php
View File

@ -95,7 +95,7 @@ if (! isset($_COOKIE[$session_name])) {
* Token which is used for authenticating access queries.
* (we use "space PMA_token space" to prevent overwriting)
*/
if (!isset($_SESSION[' PMA_token '])) {
if (! isset($_SESSION[' PMA_token '])) {
$_SESSION[' PMA_token '] = md5(uniqid(rand(), true));
}

6
libraries/sqlparser.lib.php
View File

@ -46,7 +46,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
if (!defined('TESTSUITE')) {
require_once './libraries/mysql_charsets.lib.php';
}
if (!isset($mysql_charsets)) {
if (! isset($mysql_charsets)) {
$mysql_charsets = array();
$mysql_charsets_count = 0;
$mysql_collations_flat = array();
@ -828,7 +828,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
*/
function PMA_SQP_analyze($arr)
{
if ($arr == array() || !isset($arr['len'])) {
if ($arr == array() || ! isset($arr['len'])) {
return array();
}
$result = array();
@ -2090,7 +2090,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
{
//DEBUG echo 'in Format<pre>'; print_r($arr); echo '</pre>';
// then check for an array
if (!is_array($arr)) {
if (! is_array($arr)) {
return htmlspecialchars($arr);
}
// first check for the SQL parser having hit an error

2
libraries/tbl_info.inc.php
View File

@ -102,7 +102,7 @@ if ($showtable) {
}
}
// we need explicit DEFAULT value here (different from '0')
$pack_keys = (!isset($pack_keys) || strlen($pack_keys) == 0) ? 'DEFAULT' : $pack_keys;
$pack_keys = (! isset($pack_keys) || strlen($pack_keys) == 0) ? 'DEFAULT' : $pack_keys;
unset($create_options, $each_create_option);
} // end if
?>

2
libraries/tbl_properties.inc.php
View File

@ -378,7 +378,7 @@ for ($i = 0; $i < $num_fields; $i++) {
* having NULL enabled does not implicit having Default with NULL
*
if (isset($row)
&& !isset($row['Default']) && isset($row['Null']) && $row['Null'] == 'YES') {
&& ! isset($row['Default']) && isset($row['Null']) && $row['Null'] == 'YES') {
$row['Default'] = 'NULL';
}
*/

4
libraries/user_preferences.inc.php
View File

@ -15,7 +15,7 @@ require './libraries/server_links.inc.php';
// build user preferences menu
$form_param = filter_input(INPUT_GET, 'form');
if (!isset($forms[$form_param])) {
if (! isset($forms[$form_param])) {
$forms_keys = array_keys($forms);
$form_param = array_shift($forms_keys);
}
@ -64,7 +64,7 @@ $msg->display();
// warn about using session storage for settings
$cfgRelation = PMA_getRelationsParam();
if (!$cfgRelation['userconfigwork']) {
if (! $cfgRelation['userconfigwork']) {
$msg = __('Your preferences will be saved for current session only. Storing them permanently requires %sphpMyAdmin configuration storage%s.');
$msg = PMA_sanitize(sprintf($msg, '[a@./Documentation.html#linked-tables@_blank]', '[/a]'));
PMA_Message::notice($msg)->display();

8
libraries/user_preferences.lib.php
View File

@ -49,9 +49,9 @@ function PMA_userprefs_pageinit()
function PMA_load_userprefs()
{
$cfgRelation = PMA_getRelationsParam();
if (!$cfgRelation['userconfigwork']) {
if (! $cfgRelation['userconfigwork']) {
// no pmadb table, use session storage
if (!isset($_SESSION['userconfig'])) {
if (! isset($_SESSION['userconfig'])) {
$_SESSION['userconfig'] = array(
'db' => array(),
'ts' => time());
@ -104,7 +104,7 @@ function PMA_save_userprefs(array $config_array)
? $GLOBALS['server']
: $GLOBALS['cfg']['ServerDefault'];
$cache_key = 'server_' . $server;
if (!$cfgRelation['userconfigwork']) {
if (! $cfgRelation['userconfigwork']) {
// no pmadb table, use session storage
$_SESSION['userconfig'] = array(
'db' => $config_array,
@ -175,7 +175,7 @@ function PMA_apply_userprefs(array $config_data)
$whitelist['Server/hide_db'] = true;
$whitelist['Server/only_db'] = true;
foreach ($config_data as $path => $value) {
if (!isset($whitelist[$path]) || isset($blacklist[$path])) {
if (! isset($whitelist[$path]) || isset($blacklist[$path])) {
continue;
}
PMA_array_write($path, $cfg, $value);

2
main.php
View File

@ -292,7 +292,7 @@ if (file_exists('./config')) {
*/
if ($server > 0) {
$cfgRelation = PMA_getRelationsParam();
if(!$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
if(! $cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) {
$message = PMA_Message::notice(__('The phpMyAdmin configuration storage is not completely configured, some extended features have been deactivated. To find out why click %shere%s.'));
$message->addParam('<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $common_url_query . '">', false);
$message->addParam('</a>', false);

4
po/af.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-03-30 23:04+0200\n"
"Last-Translator: Michal <michal@cihar.com>\n"
"Language-Team: afrikaans <af@li.org>\n"

4
po/ar.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-04-21 13:56+0200\n"
"Last-Translator: <u4504712@anu.edu.au>\n"
"Language-Team: arabic <ar@li.org>\n"

4
po/az.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-03-12 09:11+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: azerbaijani <az@li.org>\n"

4
po/be.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-03-12 09:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: belarusian_cyrillic <be@li.org>\n"

4
po/be@latin.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-03-30 23:09+0200\n"
"Last-Translator: Michal <michal@cihar.com>\n"
"Language-Team: belarusian_latin <be@latin@li.org>\n"

4
po/bg.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-03-22 12:51+0200\n"
"Last-Translator: <stoyanster@gmail.com>\n"
"Language-Team: bulgarian <bg@li.org>\n"

4
po/bn.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-10-21 01:36+0200\n"
"Last-Translator: Nobin নবীন <nobin@cyberbogra.com>\n"
"Language-Team: bangla <bn@li.org>\n"

4
po/bs.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-03-12 09:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: bosnian <bs@li.org>\n"

4
po/ca.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-02-23 09:57+0200\n"
"Last-Translator: Xavier Navarro <xvnavarro@gmail.com>\n"
"Language-Team: catalan <ca@li.org>\n"

4
po/cs.po
View File

@ -4,9 +4,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-02-10 14:03+0100\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: czech <cs@li.org>\n"

4
po/cy.po
View File

@ -4,9 +4,9 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-06-07 20:23+0200\n"
"Last-Translator: <ardavies@tiscali.co.uk>\n"
"Language-Team: Welsh <cy@li.org>\n"

4
po/da.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-03-07 01:17+0200\n"
"Last-Translator: <hjortholm@gmail.com>\n"
"Language-Team: danish <da@li.org>\n"

4
po/de.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-04-23 04:28+0200\n"
"Last-Translator: Dominik Geyer <dominik.geyer@gmx.de>\n"
"Language-Team: german <de@li.org>\n"

4
po/el.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-04-05 11:15+0200\n"
"Last-Translator: Panagiotis Papazoglou <papaz_p@yahoo.com>\n"
"Language-Team: greek <el@li.org>\n"

4
po/en_GB.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-02-10 16:24+0200\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: english-gb <en_GB@li.org>\n"

4
po/es.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-04-02 11:10+0200\n"
"Last-Translator: Matías Bellone <matiasbellone@gmail.com>\n"
"Language-Team: spanish <es@li.org>\n"

4
po/et.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-03-12 09:14+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: estonian <et@li.org>\n"

4
po/eu.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-07-21 14:53+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: basque <eu@li.org>\n"

4
po/fa.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-05-19 03:54+0200\n"
"Last-Translator: <ahmad_usa2007@yahoo.com>\n"
"Language-Team: persian <fa@li.org>\n"

4
po/fi.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-11-26 21:29+0200\n"
"Last-Translator: <asdfsdf@asdfasdfasdf.com>\n"
"Language-Team: finnish <fi@li.org>\n"

4
po/fr.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-02-10 19:23+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: french <fr@li.org>\n"

4
po/gl.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-07-21 14:50+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: galician <gl@li.org>\n"

4
po/he.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-03-02 20:17+0200\n"
"Last-Translator: <zippoxer@gmail.com>\n"
"Language-Team: hebrew <he@li.org>\n"

8
po/hi.po
View File

@ -1,11 +1,11 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"PO-Revision-Date: 2011-04-24 00:23+0200\n"
"Last-Translator: <rsedwardian@gmail.com>\n"
"PO-Revision-Date: 2011-05-06 09:13+0200\n"
"Last-Translator: <manojonemail@gmail.com>\n"
"Language-Team: hindi <hi@li.org>\n"
"Language: hi\n"
"MIME-Version: 1.0\n"
@ -95,7 +95,7 @@ msgstr "इस मूल्य का उपयोग करें"
#: bs_disp_as_mime_type.php:29 bs_play_media.php:35
#: libraries/blobstreaming.lib.php:331
msgid "No blob streaming server configured!"
msgstr ""
msgstr "ब्लोब स्ट्रीमिंग सर्वर संरचना उपस्थित नहीं है !"
#: bs_disp_as_mime_type.php:35
msgid "Failed to fetch headers"

4
po/hr.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-07-21 14:54+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: croatian <hr@li.org>\n"

1009
po/hu.po
View File

File diff suppressed because it is too large Load Diff

4
po/id.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-04-16 22:04+0200\n"
"Last-Translator: <aris_feryanto@yahoo.com>\n"
"Language-Team: indonesian <id@li.org>\n"

4
po/it.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-04-05 14:27+0200\n"
"Last-Translator: <rebeluca@gmail.com>\n"
"Language-Team: italian <it@li.org>\n"

100
po/ja.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-05-05 11:38+0200\n"
"Last-Translator: Yuichiro <yuichiro@pop07.odn.ne.jp>\n"
"Language-Team: japanese <jp@li.org>\n"
@ -111,7 +111,13 @@ msgstr "リモート URL を開けませんでした。"
msgid ""
"The %s file is not available on this system, please visit www.phpmyadmin.net "
"for more information."
<<<<<<< HEAD
msgstr "ファイル %s は、このシステムでは使用できません。詳細については www.phpmyadmin.net をご覧ください。"
=======
msgstr ""
"ファイル %s は、このシステムでは使用できません。詳細については www."
"phpmyadmin.net をご覧ください。"
>>>>>>> QA_3_4
#: db_create.php:58
#, php-format
@ -532,10 +538,13 @@ msgid "Browse"
msgstr "表示"
#: db_search.php:259
#, fuzzy, php-format
#, php-format
<<<<<<< HEAD
#| msgid "Dumping data for table"
=======
>>>>>>> QA_3_4
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
@ -3444,7 +3453,7 @@ msgstr ""
#: libraries/config/messages.inc.php:328
msgid "Missing phpMyAdmin configuration storage tables"
msgstr "phpMyAdmin の設定保存用テーブルがありません"
msgstr "phpMyAdmin の設定保存用テーブルが不明"
#: libraries/config/messages.inc.php:330
msgid "Iconic table operations"
@ -5094,7 +5103,13 @@ msgstr "ポート"
msgid ""
"The port for the PBMS stream-based communications. Setting this value to 0 "
"will disable HTTP communication with the daemon."
<<<<<<< HEAD
msgstr "PBMS ストリームに基づいた通信用のポートです。この値を 0 に設定すると、デーモンとの HTTP 通信を無効にします。"
=======
msgstr ""
"PBMS ストリームに基づいた通信用のポートです。この値を 0 に設定すると、デーモ"
"ンとの HTTP 通信を無効にします。"
>>>>>>> QA_3_4
#: libraries/engines/pbms.lib.php:40
msgid "Repository Threshold"
@ -5165,21 +5180,28 @@ msgstr ""
msgid ""
"Documentation and further information about PBMS can be found on %sThe "
"PrimeBase Media Streaming home page%s."
msgstr ""
<<<<<<< HEAD
msgstr "PBMS に関するドキュメントおよび詳細な情報は、%sPrimeBase Media Streaming オフィシャルサイト%sにあります。"
#: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127
#, fuzzy
#| msgid "Relations"
=======
msgstr ""
"PBMS に関するドキュメントおよび詳細な情報は、%sPrimeBase Media Streaming オ"
"フィシャルサイト%sにあります。"
#: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127
>>>>>>> QA_3_4
msgid "Related Links"
msgstr "リレーション"
msgstr "関連リンク"
#: libraries/engines/pbms.lib.php:98
msgid "The PrimeBase Media Streaming Blog by Barry Leslie"
msgstr ""
msgstr "Barry Leslie 氏による PrimeBase Media Streaming ブログ"
#: libraries/engines/pbms.lib.php:99
msgid "PrimeBase XT Home Page"
msgstr ""
msgstr "PrimeBase XT オフィシャルサイト"
#: libraries/engines/pbxt.lib.php:22
msgid "Index cache size"
@ -5333,15 +5355,21 @@ msgstr ""
msgid ""
"Documentation and further information about PBXT can be found on the "
"%sPrimeBase XT Home Page%s."
<<<<<<< HEAD
msgstr "PBXT に関するドキュメントおよび詳細な情報は、%sPrimeBase XT オフィシャルサイト%sにあります。"
=======
msgstr ""
"PBXT に関するドキュメントおよび詳細な情報は、%sPrimeBase XT オフィシャルサイ"
"ト%sにあります。"
>>>>>>> QA_3_4
#: libraries/engines/pbxt.lib.php:129
msgid "The PrimeBase XT Blog by Paul McCullagh"
msgstr ""
msgstr "Paul McCullagh 氏による PrimeBase XT ブログ"
#: libraries/engines/pbxt.lib.php:130
msgid "The PrimeBase Media Streaming (PBMS) home page"
msgstr ""
msgstr "PrimeBase Media Streaming (PBMS) オフィシャルサイト"
#: libraries/export/csv.php:21 libraries/import/csv.php:27
msgid "Columns separated with:"
@ -6788,9 +6816,7 @@ msgstr "設定を保存しました"
msgid ""
"Your preferences will be saved for current session only. Storing them "
"permanently requires %sphpMyAdmin configuration storage%s."
msgstr ""
"環境設定は、現在のセッションでのみ有効です。この設定を永続的に有効にするに"
"は、%sphpMyAdminの設定保存場所%sが必要です。"
msgstr "環境設定は、現在のセッションでのみ有効です。この設定を永続的に有効にするには、%sphpMyAdmin の設定保存場所%sが必要です。"
#: libraries/user_preferences.lib.php:142
msgid "Could not save configuration"
@ -7110,10 +7136,12 @@ msgid "Operator"
msgstr "演算子"
#: pmd_general.php:810
#, fuzzy
<<<<<<< HEAD
#| msgid "Table options"
=======
>>>>>>> QA_3_4
msgid "Active options"
msgstr "テーブルオプション"
msgstr "アクティブオプション"
#: pmd_help.php:26
msgid "To select relation, click :"
@ -9032,7 +9060,12 @@ msgstr "フォームを表示する"
#: setup/lib/index.lib.php:119
msgid ""
"Neither URL wrapper nor CURL is available. Version check is not possible."
<<<<<<< HEAD
msgstr "URL ラッパ、cURL、いずれも利用できません。バージョンチェックが行えません。"
=======
msgstr ""
"URL ラッパ、cURL、いずれも利用できません。バージョンチェックが行えません。"
>>>>>>> QA_3_4
#: setup/lib/index.lib.php:126
msgid ""
@ -9071,6 +9104,18 @@ msgid ""
"proxies list%s. However, IP-based protection may not be reliable if your IP "
"belongs to an ISP where thousands of users, including you, are connected to."
msgstr ""
<<<<<<< HEAD
"この%sオプション%sは無効にするべきです。そうしなければ、いずれかの MySQL "
"サーバへのブルートフォース（しらみつぶし）ログインによる攻撃を許すことになります。これが必要と思われる場合には、%s信頼されたプロキシリスト%"
"sを使用します。しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接続されている場合には、IP "
"アドレスを基にした保護は信頼性が高いとはいえません。"
=======
"この%sオプション%sは無効にするべきです。そうしなければ、いずれかの MySQL サー"
"バへのブルートフォース（しらみつぶし）ログインによる攻撃を許すことになりま"
"す。これが必要と思われる場合には、%s信頼されたプロキシリスト%sを使用します。"
"しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接"
"続されている場合には、IP アドレスを基にした保護は信頼性が高いとはいえません。"
>>>>>>> QA_3_4
#: setup/lib/index.lib.php:252
msgid ""
@ -9153,11 +9198,9 @@ msgid ""
"protection may not be reliable if your IP belongs to an ISP where thousands "
"of users, including you, are connected to."
msgstr ""
"それでも、[kbd]config[/kbd] 認証が必要であると思われる場合、追加の保護設定"
"（%sホスト認証%s設定および%s信頼されたプロキシのリスト%s）を使用してくださ"
"い。しかしながら、ユーザが数千人もいるような ISP に所属している、使用してい"
"る、接続されている場合には、IP アドレスを基にした保護は信頼性が高いとはいえま"
"せん。"
"それでも、[kbd]config[/kbd] 認証が必要であると思われる場合、追加の保護設定（%sホスト認証%s設定および%s信頼されたプロキシのリスト"
"%s）を使用してください。しかしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接続されている場合には、IP "
"アドレスを基にした保護は信頼性が高いとはいえません。"
#: setup/lib/index.lib.php:268
#, php-format
@ -9216,7 +9259,7 @@ msgstr "参照されている値を表示する"
#: sql.php:163
#, php-format
msgid "Using bookmark \"%s\" as default browse query."
msgstr ""
msgstr "デフォルトの表示クエリとしてブックマーク \"%s\" を使用する。"
#: sql.php:600 tbl_replace.php:387
#, php-format
@ -9396,7 +9439,12 @@ msgstr ""
#: tbl_chart.php:166
msgid ""
"When drawing a radar chart all values are normalized to a range [0..10]."
<<<<<<< HEAD
msgstr "レーダグラフを描画する時は、全ての値が範囲 [0..10] に正規化されています。"
=======
msgstr ""
"レーダグラフを描画する時は、全ての値が範囲 [0..10] に正規化されています。"
>>>>>>> QA_3_4
#: tbl_chart.php:173
msgid ""
@ -9712,10 +9760,12 @@ msgid "An index has been added on %s"
msgstr "%s にインデックスを追加しました"
#: tbl_structure.php:471
#, fuzzy
<<<<<<< HEAD
#| msgid "Show PHP information"
=======
>>>>>>> QA_3_4
msgid "Show more actions"
msgstr "PHP 情報"
msgstr "他の操作を表示する"
#: tbl_structure.php:600 tbl_structure.php:602
msgid "Relation view"

4
po/ka.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-03-12 09:14+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: georgian <ka@li.org>\n"

4
po/ko.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-06-16 18:18+0200\n"
"Last-Translator: <cihar@nvyu.net>\n"
"Language-Team: korean <ko@li.org>\n"

4
po/lt.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-04-05 15:52+0200\n"
"Last-Translator: Kęstutis <forkik@gmail.com>\n"
"Language-Team: lithuanian <lt@li.org>\n"

4
po/lv.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-03-12 09:16+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: latvian <lv@li.org>\n"

4
po/mk.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-03-12 09:16+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: macedonian_cyrillic <mk@li.org>\n"

4
po/ml.po
View File

@ -3,9 +3,9 @@
# This file is distributed under the same license as the phpMyAdmin package.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-02-10 14:03+0100\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Malayalam <ml@li.org>\n"

4
po/mn.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-03-12 09:17+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: mongolian <mn@li.org>\n"

4
po/ms.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-03-12 09:17+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: malay <ms@li.org>\n"

4
po/nb.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-03-07 11:21+0200\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: norwegian <no@li.org>\n"

4
po/nl.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-03-16 20:18+0200\n"
"Last-Translator: Dieter Adriaenssens <ruleant@users.sourceforge.net>\n"
"Language-Team: dutch <nl@li.org>\n"

4
po/phpmyadmin.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

4
po/pl.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-02-24 16:21+0200\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: polish <pl@li.org>\n"

4
po/pt.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-03-26 03:23+0200\n"
"Last-Translator: <efgpinto@gmail.com>\n"
"Language-Team: portuguese <pt@li.org>\n"

4
po/pt_BR.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-04-14 17:44+0200\n"
"Last-Translator: <vitorpc.18@gmail.com>\n"
"Language-Team: brazilian_portuguese <pt_BR@li.org>\n"

4
po/ro.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-07-22 02:28+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: romanian <ro@li.org>\n"

4
po/ru.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-03-13 21:17+0200\n"
"Last-Translator: Victor Volkov <hanut@php-myadmin.ru>\n"
"Language-Team: russian <ru@li.org>\n"

4
po/si.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-05-04 14:56+0200\n"
"Last-Translator: Madhura Jayaratne <madhura.cj@gmail.com>\n"
"Language-Team: sinhala <si@li.org>\n"

4
po/sk.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-07-22 02:26+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: slovak <sk@li.org>\n"

4
po/sl.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-03-24 22:38+0200\n"
"Last-Translator: Domen <dbc334@gmail.com>\n"
"Language-Team: slovenian <sl@li.org>\n"

4
po/sq.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-07-21 14:51+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: albanian <sq@li.org>\n"

4
po/sr.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-04-06 18:43+0200\n"
"Last-Translator: <theranchcowboy@googlemail.com>\n"
"Language-Team: serbian_cyrillic <sr@li.org>\n"

4
po/sr@latin.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-12-02 14:49+0200\n"
"Last-Translator: Sasa Kostic <sasha.kostic@gmail.com>\n"
"Language-Team: serbian_latin <sr@latin@li.org>\n"

4
po/sv.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-02-16 21:42+0200\n"
"Last-Translator: <stefan@inkopsforum.se>\n"
"Language-Team: swedish <sv@li.org>\n"

4
po/ta.po
View File

@ -4,9 +4,9 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-04-16 10:43+0200\n"
"Last-Translator: Sutharshan <sutharshan02@gmail.com>\n"
"Language-Team: Tamil <ta@li.org>\n"

4
po/te.po
View File

@ -4,9 +4,9 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-04-07 17:06+0200\n"
"Last-Translator: <veeven@gmail.com>\n"
"Language-Team: Telugu <te@li.org>\n"

4
po/th.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-03-12 09:19+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: thai <th@li.org>\n"

4
po/tr.po
View File

@ -1,9 +1,9 @@
# Automatically generated <>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-04-17 19:11+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
"Language-Team: turkish <tr@li.org>\n"

4
po/tt.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-07-22 02:25+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: tatarish <tt@li.org>\n"

4
po/ug.po
View File

@ -4,9 +4,9 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-08-26 11:59+0200\n"
"Last-Translator: <gheni@yahoo.cn>\n"
"Language-Team: Uyghur <ug@li.org>\n"

4
po/uk.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-12-28 22:26+0200\n"
"Last-Translator: Olexiy Zagorskyi <zalex_ua@i.ua>\n"
"Language-Team: ukrainian <uk@li.org>\n"

4
po/ur.po
View File

@ -4,9 +4,9 @@
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2011-04-23 08:37+0200\n"
"Last-Translator: Mehbooob Khan <mehboobbugti@gmail.com>\n"
"Language-Team: Urdu <ur@li.org>\n"

4
po/uz.po
View File

@ -1,9 +1,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-rc3-dev\n"
"Project-Id-Version: phpMyAdmin 3.4.0\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2011-05-05 13:15+0200\n"
"POT-Creation-Date: 2011-05-09 07:40+0200\n"
"PO-Revision-Date: 2010-07-22 02:31+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: uzbek_cyrillic <uz@li.org>\n"

Some files were not shown because too many files have changed in this diff Show More