diff --git a/browse_foreigners.php b/browse_foreigners.php
index 490a06cdee..27781a4a78 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -88,7 +88,7 @@ $current_language = $available_languages[$lang][1];
phpMyAdmin
+ href="phpmyadmin.css.php?&nocache=getThemeUniqueValue(); ?>" />
' . "\n";
foreach ($this->getGroupedDetails($offset, $count) as $group => $dbs) {
if (count($dbs) > 1) {
- $return .= '' . htmlspecialchars($group)
+ $return .= '' . htmlspecialchars($group)
. '' . "\n";
// whether display db_name cut by the group part
$cut = true;
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index 77dbdd2176..814fb75cec 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -15,9 +15,6 @@ if (! defined('PHPMYADMIN')) {
* @todo add the possibility to make a theme depend on another theme
* and by default on original
* @todo make all components optional - get missing components from 'parent' theme
- * @todo make css optionally replacing 'parent' css or extending it
- * (by appending at the end)
- * @todo add an optional global css file - which will be used for both frames
*
* @package PhpMyAdmin
*/
@@ -53,12 +50,6 @@ class PMA_Theme
*/
var $img_path = '';
- /**
- * @var array valid css types
- * @access protected
- */
- var $types = array('left', 'right');
-
/**
* @var integer last modification time for info file
* @access protected
@@ -73,10 +64,23 @@ class PMA_Theme
*/
var $filesize_info = 0;
+ /**
+ * @var array List of css files to load
+ * @access private
+ */
+ private $_cssFiles = array(
+ 'common',
+ 'enum_editor',
+ 'gis',
+ 'navigation',
+ 'pmd',
+ 'rte'
+ );
+
/**
* Loads theme information
*
- * @return boolean whether loading them info was successful or not *
+ * @return boolean whether loading them info was successful or not
* @access public
*/
function loadInfo()
@@ -135,18 +139,18 @@ class PMA_Theme
}
/**
- * checks image path for existance - if not found use img from original theme
+ * checks image path for existance - if not found use img from fallback theme
*
- * @access public
+ * @access public
* @return bool
*/
- function checkImgPath()
+ public function checkImgPath()
{
if (is_dir($this->getPath() . '/img/')) {
$this->setImgPath($this->getPath() . '/img/');
return true;
- } elseif (is_dir($GLOBALS['cfg']['ThemePath'] . '/original/img/')) {
- $this->setImgPath($GLOBALS['cfg']['ThemePath'] . '/original/img/');
+ } elseif (is_dir($GLOBALS['cfg']['ThemePath'] . '/' . PMA_Theme_Manager::FALLBACK_THEME . '/img/')) {
+ $this->setImgPath($GLOBALS['cfg']['ThemePath'] . '/' . PMA_Theme_Manager::FALLBACK_THEME . '/img/');
return true;
} else {
trigger_error(
@@ -163,10 +167,10 @@ class PMA_Theme
/**
* returns path to theme
*
- * @access public
- * @return string $path path to theme
+ * @access public
+ * @return string path to theme
*/
- function getPath()
+ public function getPath()
{
return $this->path;
}
@@ -174,10 +178,10 @@ class PMA_Theme
/**
* returns layout file
*
- * @access public
- * @return string layout file
+ * @access public
+ * @return string layout file
*/
- function getLayoutFile()
+ public function getLayoutFile()
{
return $this->getPath() . '/layout.inc.php';
}
@@ -190,7 +194,7 @@ class PMA_Theme
* @return void
* @access public
*/
- function setPath($path)
+ public function setPath($path)
{
$this->path = trim($path);
}
@@ -203,7 +207,7 @@ class PMA_Theme
* @return void
* @access public
*/
- function setVersion($version)
+ public function setVersion($version)
{
$this->version = trim($version);
}
@@ -212,9 +216,9 @@ class PMA_Theme
* returns version
*
* @return string version
- * @access public
+ * @access public
*/
- function getVersion()
+ public function getVersion()
{
return $this->version;
}
@@ -228,7 +232,7 @@ class PMA_Theme
* @return boolean true if theme version is equal or higher to $version
* @access public
*/
- function checkVersion($version)
+ public function checkVersion($version)
{
return version_compare($this->getVersion(), $version, 'lt');
}
@@ -241,7 +245,7 @@ class PMA_Theme
* @return void
* @access public
*/
- function setName($name)
+ public function setName($name)
{
$this->name = trim($name);
}
@@ -252,7 +256,7 @@ class PMA_Theme
* @access public
* @return string name
*/
- function getName()
+ public function getName()
{
return $this->name;
}
@@ -265,7 +269,7 @@ class PMA_Theme
* @return void
* @access public
*/
- function setId($id)
+ public function setId($id)
{
$this->id = trim($id);
}
@@ -276,7 +280,7 @@ class PMA_Theme
* @return string id
* @access public
*/
- function getId()
+ public function getId()
{
return $this->id;
}
@@ -289,7 +293,7 @@ class PMA_Theme
* @return void
* @access public
*/
- function setImgPath($path)
+ public function setImgPath($path)
{
$this->img_path = $path;
}
@@ -300,7 +304,7 @@ class PMA_Theme
* @access public
* @return string image path for this theme
*/
- function getImgPath()
+ public function getImgPath()
{
return $this->img_path;
}
@@ -308,27 +312,14 @@ class PMA_Theme
/**
* load css (send to stdout, normally the browser)
*
- * @param string &$type left, right or print
- *
* @return bool
* @access public
*/
- function loadCss(&$type)
+ public function loadCss()
{
- if (empty($type) || ! in_array($type, $this->types)) {
- $type = 'left';
- }
+ $success = true;
- if ($type == 'right') {
- echo PMA_SQP_buildCssData();
- }
-
- $_css_file = $this->getPath()
- . '/css/theme_' . $type . '.css.php';
-
- if (! file_exists($_css_file)) {
- return false;
- }
+ echo PMA_SQP_buildCssData();
if ($GLOBALS['text_dir'] === 'ltr') {
$right = 'right';
@@ -338,22 +329,24 @@ class PMA_Theme
$left = 'right';
}
- include $_css_file;
+ foreach ($this->_cssFiles as $file) {
+ $path = $this->getPath() . "/css/$file.css.php";
+ $fallback = "./themes/" . PMA_Theme_Manager::FALLBACK_THEME . "/css/$file.css.php";
- if ($type != 'print') {
- $_sprites_data_file = $this->getPath() . '/sprites.lib.php';
- $_sprites_css_file = './themes/sprites.css.php';
- if (file_exists($_sprites_data_file)
- && is_readable($_sprites_data_file)
- && file_exists($_sprites_css_file)
- && is_readable($_sprites_css_file)
- ) {
- include $_sprites_data_file;
- include $_sprites_css_file;
+ if (is_readable($path)) {
+ echo "\n/* FILE: $file.css.php */\n";
+ include $path;
+ } else if (is_readable($fallback)) {
+ echo "\n/* FILE: $file.css.php */\n";
+ include $fallback;
+ } else {
+ $success = false;
}
}
- return true;
+ include './themes/sprites.css.php';
+
+ return $success;
}
/**
@@ -362,7 +355,7 @@ class PMA_Theme
* @return void
* @access public
*/
- function printPreview()
+ public function printPreview()
{
echo '';
echo '
' . htmlspecialchars($this->getName())
diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
index 440374d8fa..0a83f42bd2 100644
--- a/libraries/Theme_Manager.class.php
+++ b/libraries/Theme_Manager.class.php
@@ -18,7 +18,7 @@ class PMA_Theme_Manager
* @var string path to theme folder
* @access protected
*/
- var $_themes_path;
+ private $_themes_path;
/**
* @var array available themes
@@ -48,9 +48,20 @@ class PMA_Theme_Manager
/**
* @var string
*/
- var $theme_default = 'original';
+ var $theme_default;
- function __construct()
+ /**
+ * @const string The name of the fallback theme
+ */
+ const FALLBACK_THEME = 'pmahomme';
+
+ /**
+ * Constructor for Theme Manager class
+ *
+ * @access public
+ * @return void
+ */
+ public function __construct()
{
$this->init();
}
@@ -58,11 +69,12 @@ class PMA_Theme_Manager
/**
* sets path to folder containing the themes
*
- * @param string $path path to themes folder
+ * @param string $path path to themes folder
*
+ * @access public
* @return boolean success
*/
- function setThemesPath($path)
+ public function setThemesPath($path)
{
if (! $this->_checkThemeFolder($path)) {
return false;
@@ -73,10 +85,12 @@ class PMA_Theme_Manager
}
/**
- * @public
- * @return string
+ * Returns path to folder containing themes
+ *
+ * @access public
+ * @return string theme path
*/
- function getThemesPath()
+ public function getThemesPath()
{
return $this->_themes_path;
}
@@ -85,16 +99,25 @@ class PMA_Theme_Manager
* sets if there are different themes per server
*
* @param boolean $per_server
+ *
+ * @access public
+ * @return void
*/
- function setThemePerServer($per_server)
+ public function setThemePerServer($per_server)
{
$this->per_server = (bool) $per_server;
}
- function init()
+ /**
+ * Initialise the class
+ *
+ * @access public
+ * @return void
+ */
+ public function init()
{
$this->themes = array();
- $this->theme_default = 'original';
+ $this->theme_default = self::FALLBACK_THEME;
$this->active_theme = '';
if (! $this->setThemesPath($GLOBALS['cfg']['ThemePath'])) {
@@ -125,17 +148,23 @@ class PMA_Theme_Manager
if (! $this->getThemeCookie()
|| ! $this->setActiveTheme($this->getThemeCookie())
) {
- // otherwise use default theme
if ($GLOBALS['cfg']['ThemeDefault']) {
- $this->setActiveTheme($GLOBALS['cfg']['ThemeDefault']);
+ // otherwise use default theme
+ $this->setActiveTheme($this->theme_default);
} else {
- // or original theme
- $this->setActiveTheme('original');
+ // or fallback theme
+ $this->setActiveTheme(self::FALLBACK_THEME);
}
}
}
- function checkConfig()
+ /**
+ * Checks configuration
+ *
+ * @access public
+ * @return void
+ */
+ public function checkConfig()
{
if ($this->_themes_path != trim($GLOBALS['cfg']['ThemePath'])
|| $this->theme_default != $GLOBALS['cfg']['ThemeDefault']
@@ -149,7 +178,15 @@ class PMA_Theme_Manager
}
}
- function setActiveTheme($theme = null)
+ /**
+ * Sets active theme
+ *
+ * @param string $theme theme name
+ *
+ * @access public
+ * @return bool true on success
+ */
+ public function setActiveTheme($theme = null)
{
if (! $this->checkTheme($theme)) {
trigger_error(
@@ -172,9 +209,11 @@ class PMA_Theme_Manager
}
/**
- * @return string cookie name
+ *
+ * @return string cookie name
+ * @access public
*/
- function getThemeCookieName()
+ public function getThemeCookieName()
{
// Allow different theme per server
if (isset($GLOBALS['server']) && $this->per_server) {
@@ -186,9 +225,11 @@ class PMA_Theme_Manager
/**
* returns name of theme stored in the cookie
+ *
* @return string theme name from cookie
+ * @access public
*/
- function getThemeCookie()
+ public function getThemeCookie()
{
if (isset($_COOKIE[$this->getThemeCookieName()])) {
return $_COOKIE[$this->getThemeCookieName()];
@@ -201,8 +242,9 @@ class PMA_Theme_Manager
* save theme in cookie
*
* @return bool true
+ * @access public
*/
- function setThemeCookie()
+ public function setThemeCookie()
{
$GLOBALS['PMA_Config']->setCookie(
$this->getThemeCookieName(),
@@ -216,10 +258,10 @@ class PMA_Theme_Manager
}
/**
- * @private
* @param string $folder
*
* @return boolean
+ * @access private
*/
private function _checkThemeFolder($folder)
{
@@ -241,8 +283,9 @@ class PMA_Theme_Manager
* read all themes
*
* @return bool true
+ * @access public
*/
- function loadThemes()
+ public function loadThemes()
{
$this->themes = array();
@@ -278,11 +321,12 @@ class PMA_Theme_Manager
/**
* checks if given theme name is a known theme
*
- * @param string $theme name fo theme to check for
+ * @param string $theme name fo theme to check for
*
* @return bool
+ * @access public
*/
- function checkTheme($theme)
+ public function checkTheme($theme)
{
if (! array_key_exists($theme, $this->themes)) {
return false;
@@ -294,11 +338,12 @@ class PMA_Theme_Manager
/**
* returns HTML selectbox, with or without form enclosed
*
- * @param boolean $form whether enclosed by from tags or not
+ * @param boolean $form whether enclosed by from tags or not
*
* @return string
+ * @access public
*/
- function getHtmlSelectBox($form = true)
+ public function getHtmlSelectBox($form = true)
{
$select_box = '';
@@ -331,8 +376,11 @@ class PMA_Theme_Manager
/**
* enables backward compatibility
+ *
+ * @return void
+ * @access public
*/
- function makeBc()
+ public function makeBc()
{
$GLOBALS['theme'] = $this->theme->getId();
$GLOBALS['pmaThemePath'] = $this->theme->getPath();
@@ -344,15 +392,15 @@ class PMA_Theme_Manager
if (file_exists($this->theme->getLayoutFile())) {
include $this->theme->getLayoutFile();
}
-
-
}
/**
* prints out preview for every theme
*
+ * @return void
+ * @access public
*/
- function printPreviews()
+ public function printPreviews()
{
foreach ($this->themes as $each_theme) {
$each_theme->printPreview();
@@ -361,12 +409,14 @@ class PMA_Theme_Manager
/**
* returns PMA_Theme object for fall back theme
- * @return object PMA_Theme
+ *
+ * @return object PMA_Theme
+ * @access public
*/
- function getFallBackTheme()
+ public function getFallBackTheme()
{
- if (isset($this->themes['original'])) {
- return $this->themes['original'];
+ if (isset($this->themes[self::FALLBACK_THEME])) {
+ return $this->themes[self::FALLBACK_THEME];
}
return false;
@@ -375,19 +425,18 @@ class PMA_Theme_Manager
/**
* prints css data
*
- * @param string $type
- *
* @return bool
+ * @access public
*/
- function printCss($type)
+ public function printCss()
{
- if ($this->theme->loadCss($type)) {
+ if ($this->theme->loadCss()) {
return true;
}
// if loading css for this theme failed, try default theme css
$fallback_theme = $this->getFallBackTheme();
- if ($fallback_theme && $fallback_theme->loadCss($type)) {
+ if ($fallback_theme && $fallback_theme->loadCss()) {
return true;
}
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 0c0392559e..f3b0b183bc 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -554,12 +554,6 @@ if (PMA_isValid($_REQUEST['sql_query'])) {
$GLOBALS['sql_query'] = $_REQUEST['sql_query'];
}
-/**
- * avoid problems in phpmyadmin.css.php in some cases
- * @global string $js_frame
- */
-$_REQUEST['js_frame'] = PMA_ifSetOr($_REQUEST['js_frame'], '');
-
//$_REQUEST['set_theme'] // checked later in this file LABEL_theme_setup
//$_REQUEST['server']; // checked later in this file
//$_REQUEST['lang']; // checked by LABEL_loading_language_file
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index c9684bcaa1..f420204f24 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -97,8 +97,9 @@ require_once './libraries/dbi/'
*
* @return mixed
*/
-function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows = true)
-{
+function PMA_DBI_query($query, $link = null, $options = 0,
+ $cache_affected_rows = true
+) {
$res = PMA_DBI_try_query($query, $link, $options, $cache_affected_rows)
or PMA_mysqlDie(PMA_DBI_getError($link), $query);
return $res;
@@ -114,8 +115,9 @@ function PMA_DBI_query($query, $link = null, $options = 0, $cache_affected_rows
*
* @return mixed
*/
-function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_rows = true)
-{
+function PMA_DBI_try_query($query, $link = null, $options = 0,
+ $cache_affected_rows = true
+) {
if (empty($link)) {
if (isset($GLOBALS['userlink'])) {
$link = $GLOBALS['userlink'];
@@ -131,7 +133,9 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r
$r = PMA_DBI_real_query($query, $link, $options);
if ($cache_affected_rows) {
- $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false);
+ $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows(
+ $link, $get_from_cache = false
+ );
}
if ($GLOBALS['cfg']['DBG']['sql']) {
@@ -144,7 +148,8 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r
} else {
$_SESSION['debug']['queries'][$hash] = array();
if ($r == false) {
- $_SESSION['debug']['queries'][$hash]['error'] = ''.mysqli_error($link).'';
+ $_SESSION['debug']['queries'][$hash]['error']
+ = '' . mysqli_error($link) . '';
}
$_SESSION['debug']['queries'][$hash]['count'] = 1;
$_SESSION['debug']['queries'][$hash]['query'] = $query;
@@ -156,7 +161,6 @@ function PMA_DBI_try_query($query, $link = null, $options = 0, $cache_affected_r
$trace[] = PMA_Error::relPath($trace_step['file']) . '#'
. $trace_step['line'] . ': '
. (isset($trace_step['class']) ? $trace_step['class'] : '')
- //. (isset($trace_step['object']) ? get_class($trace_step['object']) : '')
. (isset($trace_step['type']) ? $trace_step['type'] : '')
. (isset($trace_step['function']) ? $trace_step['function'] : '')
. '('
@@ -314,12 +318,16 @@ 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.:
// return -1 * strnatcasecmp($a["SCHEMA_TABLES"], $b["SCHEMA_TABLES"])
- return ($GLOBALS['callback_sort_order'] == 'ASC' ? 1 : -1) * $sorter($a[$GLOBALS['callback_sort_by']], $b[$GLOBALS['callback_sort_by']]);
+ return ($GLOBALS['callback_sort_order'] == 'ASC' ? 1 : -1) * $sorter(
+ $a[$GLOBALS['callback_sort_by']], $b[$GLOBALS['callback_sort_by']]
+ );
} // end of the 'PMA_usort_comparison_callback()' function
/**
@@ -377,7 +385,8 @@ function PMA_DBI_get_tables_full($database, $table = false,
$sql_where_table = 'AND t.`TABLE_COMMENT` LIKE \''
. PMA_escapeMysqlWildcards(PMA_sqlAddSlashes($table)) . '%\'';
} else {
- $sql_where_table = 'AND t.`TABLE_NAME` = \'' . PMA_sqlAddSlashes($table) . '\'';
+ $sql_where_table = 'AND t.`TABLE_NAME` = \''
+ . PMA_sqlAddSlashes($table) . '\'';
}
} else {
$sql_where_table = '';
@@ -398,11 +407,15 @@ function PMA_DBI_get_tables_full($database, $table = false,
if (isset($engine_info['InnoDB'])
&& $engine_info['InnoDB']['module_library'] == 'innobase'
) {
- $stats_join = "LEFT JOIN data_dictionary.INNODB_SYS_TABLESTATS stat ON (t.ENGINE = 'InnoDB' AND stat.NAME = (t.TABLE_SCHEMA || '/') || t.TABLE_NAME)";
+ $stats_join = "LEFT JOIN data_dictionary.INNODB_SYS_TABLESTATS stat"
+ . " ON (t.ENGINE = 'InnoDB' AND stat.NAME"
+ . " = (t.TABLE_SCHEMA || '/') || t.TABLE_NAME)";
}
- // data_dictionary.table_cache may not contain any data for some tables, it's just a table cache
- // auto_increment == 0 is cast to NULL because currently (2011.03.13 GA) Drizzle doesn't provide correct value
+ // data_dictionary.table_cache may not contain any data for some tables,
+ // it's just a table cache
+ // auto_increment == 0 is cast to NULL because currently (2011.03.13 GA)
+ // Drizzle doesn't provide correct value
$sql = "
SELECT t.*,
t.TABLE_SCHEMA AS `Db`,
@@ -431,7 +444,9 @@ function PMA_DBI_get_tables_full($database, $table = false,
NULL AS `Create_options`, -- CREATE_OPTIONS
t.TABLE_COMMENT AS `Comment`
FROM data_dictionary.TABLES t
- LEFT JOIN data_dictionary.TABLE_CACHE tc ON tc.TABLE_SCHEMA = t.TABLE_SCHEMA AND tc.TABLE_NAME = t.TABLE_NAME
+ LEFT JOIN data_dictionary.TABLE_CACHE tc
+ ON tc.TABLE_SCHEMA = t.TABLE_SCHEMA AND tc.TABLE_NAME
+ = t.TABLE_NAME
$stats_join
WHERE t.TABLE_SCHEMA IN ('" . implode("', '", $this_databases) . "')
" . $sql_where_table;
@@ -460,7 +475,8 @@ function PMA_DBI_get_tables_full($database, $table = false,
`CREATE_OPTIONS` AS `Create_options`,
`TABLE_COMMENT` AS `Comment`
FROM `information_schema`.`TABLES` t
- WHERE ' . (PMA_IS_WINDOWS ? '' : 'BINARY') . ' `TABLE_SCHEMA` IN (\'' . implode("', '", $this_databases) . '\')
+ WHERE ' . (PMA_IS_WINDOWS ? '' : 'BINARY') . ' `TABLE_SCHEMA`
+ IN (\'' . implode("', '", $this_databases) . '\')
' . $sql_where_table;
}
@@ -477,7 +493,8 @@ function PMA_DBI_get_tables_full($database, $table = false,
unset($sql_where_table, $sql);
if (PMA_DRIZZLE) {
- // correct I_S and D_D names returned by D_D.TABLES - Drizzle generally uses lower case for them,
+ // correct I_S and D_D names returned by D_D.TABLES -
+ // Drizzle generally uses lower case for them,
// but TABLES returns uppercase
foreach ((array)$database as $db) {
$db_upper = strtoupper($db);
@@ -509,7 +526,9 @@ function PMA_DBI_get_tables_full($database, $table = false,
if ($table || (true === $tbl_is_group)) {
$sql = 'SHOW TABLE STATUS FROM '
. PMA_backquote($each_database)
- .' LIKE \'' . PMA_escapeMysqlWildcards(PMA_sqlAddSlashes($table, true)) . '%\'';
+ .' LIKE \''
+ . PMA_escapeMysqlWildcards(PMA_sqlAddSlashes($table, true))
+ . '%\'';
} else {
$sql = 'SHOW TABLE STATUS FROM '
. PMA_backquote($each_database);
@@ -519,8 +538,10 @@ function PMA_DBI_get_tables_full($database, $table = false,
if (extension_loaded('apc')
&& isset($GLOBALS['cfg']['Server']['StatusCacheDatabases'])
- && ! empty($GLOBALS['cfg']['Server']['StatusCacheLifetime'])) {
- $statusCacheDatabases = (array) $GLOBALS['cfg']['Server']['StatusCacheDatabases'];
+ && ! empty($GLOBALS['cfg']['Server']['StatusCacheLifetime'])
+ ) {
+ $statusCacheDatabases
+ = (array) $GLOBALS['cfg']['Server']['StatusCacheDatabases'];
if (in_array($each_database, $statusCacheDatabases)) {
$useStatusCache = true;
}
@@ -529,7 +550,8 @@ function PMA_DBI_get_tables_full($database, $table = false,
$each_tables = null;
if ($useStatusCache) {
- $cacheKey = 'phpMyAdmin_tableStatus_' . sha1($GLOBALS['cfg']['Server']['host'] . '_' . $sql);
+ $cacheKey = 'phpMyAdmin_tableStatus_'
+ . sha1($GLOBALS['cfg']['Server']['host'] . '_' . $sql);
$each_tables = apc_fetch($cacheKey);
}
@@ -539,7 +561,10 @@ function PMA_DBI_get_tables_full($database, $table = false,
}
if ($useStatusCache) {
- apc_store($cacheKey, $each_tables, $GLOBALS['cfg']['Server']['StatusCacheLifetime']);
+ apc_store(
+ $cacheKey, $each_tables,
+ $GLOBALS['cfg']['Server']['StatusCacheLifetime']
+ );
}
// Sort naturally if the config allows it and we're sorting
@@ -557,7 +582,9 @@ function PMA_DBI_get_tables_full($database, $table = false,
// Size = Data_length + Index_length
if ($sort_by == 'Data_length') {
foreach ($each_tables as $table_name => $table_data) {
- ${$sort_by}[$table_name] = strtolower($table_data['Data_length'] + $table_data['Index_length']);
+ ${$sort_by}[$table_name] = strtolower(
+ $table_data['Data_length'] + $table_data['Index_length']
+ );
}
} else {
foreach ($each_tables as $table_name => $table_data) {
@@ -576,7 +603,9 @@ function PMA_DBI_get_tables_full($database, $table = false,
}
if ($limit_count) {
- $each_tables = array_slice($each_tables, $limit_offset, $limit_count);
+ $each_tables = array_slice(
+ $each_tables, $limit_offset, $limit_count
+ );
}
foreach ($each_tables as $table_name => $each_table) {
@@ -603,6 +632,8 @@ function PMA_DBI_get_tables_full($database, $table = false,
// MySQL forward compatibility
// so pma could use this array as if every server is of version >5.0
+ // todo : remove and check usage in the rest of the code,
+ // MySQL 5.0 is required by current PMA version
$each_tables[$table_name]['TABLE_SCHEMA'] = $each_database;
$each_tables[$table_name]['TABLE_NAME'] =& $each_tables[$table_name]['Name'];
$each_tables[$table_name]['ENGINE'] =& $each_tables[$table_name]['Engine'];
@@ -649,7 +680,8 @@ function PMA_DBI_get_tables_full($database, $table = false,
// we would lose a db name thats consists only of numbers
foreach ($tables as $one_database => $its_tables) {
if (isset(PMA_Table::$cache[$one_database])) {
- PMA_Table::$cache[$one_database] = PMA_Table::$cache[$one_database] + $tables[$one_database];
+ PMA_Table::$cache[$one_database]
+ = PMA_Table::$cache[$one_database] + $tables[$one_database];
} else {
PMA_Table::$cache[$one_database] = $tables[$one_database];
}
@@ -669,7 +701,8 @@ function PMA_DBI_get_tables_full($database, $table = false,
return $tables[strtolower($database)];
} else {
// one database but inexact letter case match
- // as Drizzle is always case insensitive, we can safely return the only result
+ // as Drizzle is always case insensitive,
+ // we can safely return the only result
if (PMA_DRIZZLE && count($tables) == 1) {
$keys = array_keys($tables);
if (strlen(array_pop($keys)) == strlen($database)) {
@@ -692,7 +725,8 @@ function PMA_DBI_get_tables_full($database, $table = false,
* @param string $sort_by column to order by
* @param string $sort_order ASC or DESC
* @param integer $limit_offset starting offset for LIMIT
- * @param bool|int $limit_count row count for LIMIT or true for $GLOBALS['cfg']['MaxDbList']
+ * @param bool|int $limit_count row count for LIMIT or true
+ * for $GLOBALS['cfg']['MaxDbList']
*
* @todo move into PMA_List_Database?
*
@@ -753,8 +787,12 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false,
if ($force_stats) {
$engine_info = PMA_cacheGet('drizzle_engines', true);
$stats_join = "LEFT JOIN (SELECT 0 NUM_ROWS) AS stat ON false";
- if (isset($engine_info['InnoDB']) && $engine_info['InnoDB']['module_library'] == 'innobase') {
- $stats_join = "LEFT JOIN data_dictionary.INNODB_SYS_TABLESTATS stat ON (t.ENGINE = 'InnoDB' AND stat.NAME = (t.TABLE_SCHEMA || '/') || t.TABLE_NAME)";
+ if (isset($engine_info['InnoDB'])
+ && $engine_info['InnoDB']['module_library'] == 'innobase'
+ ) {
+ $stats_join = "LEFT JOIN data_dictionary.INNODB_SYS_TABLESTATS"
+ . " stat ON (t.ENGINE = 'InnoDB' AND stat.NAME"
+ . " = (t.TABLE_SCHEMA || '/') || t.TABLE_NAME)";
}
$sql .= "
@@ -803,7 +841,9 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false,
// display only databases also in official database list
// f.e. to apply hide_db and only_db
- $drops = array_diff(array_keys($databases), (array) $GLOBALS['pma']->databases);
+ $drops = array_diff(
+ array_keys($databases), (array) $GLOBALS['pma']->databases
+ );
if (count($drops)) {
foreach ($drops as $drop) {
unset($databases[$drop]);
@@ -815,6 +855,8 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false,
foreach ($GLOBALS['pma']->databases as $database_name) {
// MySQL forward compatibility
// so pma could use this array as if every server is of version >5.0
+ // todo : remove and check the rest of the code for usage,
+ // MySQL 5.0 or higher is required for current PMA version
$databases[$database_name]['SCHEMA_NAME'] = $database_name;
if ($force_stats) {
@@ -832,7 +874,8 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false,
$databases[$database_name]['SCHEMA_LENGTH'] = 0;
$databases[$database_name]['SCHEMA_DATA_FREE'] = 0;
- $res = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($database_name) . ';');
+ $res = PMA_DBI_query('SHOW TABLE STATUS FROM '
+ . PMA_backquote($database_name) . ';');
while ($row = PMA_DBI_fetch_assoc($res)) {
$databases[$database_name]['SCHEMA_TABLES']++;
$databases[$database_name]['SCHEMA_TABLE_ROWS']
@@ -903,17 +946,20 @@ function PMA_DBI_get_columns_full($database = null, $table = null,
// get columns information from information_schema
if (null !== $database) {
- $sql_wheres[] = '`TABLE_SCHEMA` = \'' . PMA_sqlAddSlashes($database) . '\' ';
+ $sql_wheres[] = '`TABLE_SCHEMA` = \''
+ . PMA_sqlAddSlashes($database) . '\' ';
} else {
$array_keys[] = 'TABLE_SCHEMA';
}
if (null !== $table) {
- $sql_wheres[] = '`TABLE_NAME` = \'' . PMA_sqlAddSlashes($table) . '\' ';
+ $sql_wheres[] = '`TABLE_NAME` = \''
+ . PMA_sqlAddSlashes($table) . '\' ';
} else {
$array_keys[] = 'TABLE_NAME';
}
if (null !== $column) {
- $sql_wheres[] = '`COLUMN_NAME` = \'' . PMA_sqlAddSlashes($column) . '\' ';
+ $sql_wheres[] = '`COLUMN_NAME` = \''
+ . PMA_sqlAddSlashes($column) . '\' ';
} else {
$array_keys[] = 'COLUMN_NAME';
}
@@ -998,6 +1044,8 @@ function PMA_DBI_get_columns_full($database = null, $table = null,
// MySQL forward compatibility
// so pma could use this array as if every server is of version >5.0
+ // todo : remove and check the rest of the code for usage,
+ // MySQL 5.0 or higher is required for current PMA version
$columns[$column_name]['COLUMN_NAME'] =& $columns[$column_name]['Field'];
$columns[$column_name]['COLUMN_TYPE'] =& $columns[$column_name]['Type'];
$columns[$column_name]['COLLATION_NAME'] =& $columns[$column_name]['Collation'];
@@ -1068,7 +1116,8 @@ function PMA_DBI_get_columns_sql($database, $table, $column = null, $full = fals
// * used in primary key => PRI
// * unique one-column => UNI
// * indexed, one-column or first in multi-column => MUL
- // Promotion of UNI to PRI in case no promary index exists is done after query is executed
+ // Promotion of UNI to PRI in case no promary index exists
+ // is done after query is executed
$sql = "SELECT
column_name AS `Field`,
(CASE
@@ -1124,8 +1173,9 @@ function PMA_DBI_get_columns_sql($database, $table, $column = null, $full = fals
* @return false|array array indexed by column names or,
* if $column is given, flat array description
*/
-function PMA_DBI_get_columns($database, $table, $column = null, $full = false, $link = null)
-{
+function PMA_DBI_get_columns($database, $table, $column = null, $full = false,
+ $link = null
+) {
$sql = PMA_DBI_get_columns_sql($database, $table, $column, $full);
$fields = PMA_DBI_fetch_result($sql, 'Field', null, $link);
if (! is_array($fields) || count($fields) == 0) {
@@ -1139,7 +1189,10 @@ function PMA_DBI_get_columns($database, $table, $column = null, $full = false, $
if ($f['Key'] == 'PRI') {
$has_pk = true;
break;
- } else if ($f['Null'] == 'NO' && ($f['Key'] == 'MUL' || $f['Key'] == 'UNI')) {
+ } else if ($f['Null'] == 'NO'
+ && ($f['Key'] == 'MUL'
+ || $f['Key'] == 'UNI')
+ ) {
$has_pk_candidates = true;
}
}
@@ -1148,7 +1201,8 @@ function PMA_DBI_get_columns($database, $table, $column = null, $full = false, $
$sql = "
SELECT i.index_name, p.column_name
FROM data_dictionary.indexes i
- JOIN data_dictionary.index_parts p USING (table_schema, table_name)
+ JOIN data_dictionary.index_parts p
+ USING (table_schema, table_name)
WHERE i.table_schema = '" . PMA_sqlAddSlashes($database) . "'
AND i.table_name = '" . PMA_sqlAddSlashes($table) . "'
AND i.is_unique
@@ -1214,12 +1268,14 @@ function PMA_DBI_get_table_indexes_sql($database, $table, $where = null)
NULL AS Comment,
i.index_comment AS Index_comment
FROM data_dictionary.index_parts ip
- LEFT JOIN data_dictionary.indexes i USING (table_schema, table_name, index_name)
+ LEFT JOIN data_dictionary.indexes i
+ USING (table_schema, table_name, index_name)
WHERE table_schema = '" . PMA_sqlAddSlashes($database) . "'
AND table_name = '" . PMA_sqlAddSlashes($table) . "'
";
} else {
- $sql = 'SHOW INDEXES FROM ' . PMA_backquote($database) . '.' . PMA_backquote($table);
+ $sql = 'SHOW INDEXES FROM ' . PMA_backquote($database) . '.'
+ . PMA_backquote($table);
}
if ($where) {
$sql .= (PMA_DRIZZLE ? ' AND (' : ' WHERE (') . $where . ')';
@@ -1323,7 +1379,9 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
define('PMA_MYSQL_MAJOR_VERSION', (int)$match[0]);
define(
'PMA_MYSQL_INT_VERSION',
- (int) sprintf('%d%02d%02d', $match[0], $match[1], intval($match[2]))
+ (int) sprintf(
+ '%d%02d%02d', $match[0], $match[1], intval($match[2])
+ )
);
define('PMA_MYSQL_STR_VERSION', $version['@@version']);
define('PMA_MYSQL_VERSION_COMMENT', $version['@@version_comment']);
@@ -1364,7 +1422,8 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
if (! empty($GLOBALS['collation_connection'])) {
PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE);
PMA_DBI_query(
- "SET collation_connection = '" . PMA_sqlAddSlashes($GLOBALS['collation_connection']) . "';",
+ "SET collation_connection = '"
+ . PMA_sqlAddSlashes($GLOBALS['collation_connection']) . "';",
$link,
PMA_DBI_QUERY_STORE
);
@@ -1794,7 +1853,8 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//')
. ' WHERE TRIGGER_SCHEMA= \'' . PMA_sqlAddSlashes($db) . '\'';
if (! empty($table)) {
- $query .= " AND EVENT_OBJECT_TABLE = '" . PMA_sqlAddSlashes($table) . "';";
+ $query .= " AND EVENT_OBJECT_TABLE = '"
+ . PMA_sqlAddSlashes($table) . "';";
}
} else {
$query = "SHOW TRIGGERS FROM " . PMA_backquote($db);
@@ -1823,7 +1883,9 @@ function PMA_DBI_get_triggers($db, $table = '', $delimiter = '//')
// do not prepend the schema name; this way, importing the
// definition into another schema will work
- $one_result['full_trigger_name'] = PMA_backquote($trigger['TRIGGER_NAME']);
+ $one_result['full_trigger_name'] = PMA_backquote(
+ $trigger['TRIGGER_NAME']
+ );
$one_result['drop'] = 'DROP TRIGGER IF EXISTS '
. $one_result['full_trigger_name'];
$one_result['create'] = 'CREATE TRIGGER '
@@ -1870,22 +1932,25 @@ function PMA_DBI_formatError($error_number, $error_message)
if ($error_number == 2002) {
$error .= ' - ' . $error_message;
- $error .= '
' . __('The server is not responding (or the local server\'s socket is not correctly configured).');
+ $error .= '
';
+ $error .= __('The server is not responding (or the local server\'s socket is not correctly configured).');
} elseif ($error_number == 2003) {
$error .= ' - ' . $error_message;
$error .= '
' . __('The server is not responding.');
} elseif ($error_number == 1005) {
if (strpos($error_message, 'errno: 13') !== false) {
$error .= ' - ' . $error_message;
- $error .= '
' . __('Please check privileges of directory containing database.');
+ $error .= '
'
+ . __('Please check privileges of directory containing database.');
} else {
/* InnoDB contraints, see
* http://dev.mysql.com/doc/refman/5.0/en/innodb-foreign-key-constraints.html
*/
$error .= ' - ' . $error_message .
' (' . __('Details...') . ')';
+ PMA_generate_common_url(
+ array('engine' => 'InnoDB', 'page' => 'Status')
+ ) . '">' . __('Details...') . ')';
}
} else {
$error .= ' - ' . $error_message;
diff --git a/libraries/header_meta_style.inc.php b/libraries/header_meta_style.inc.php
index 63cb8d15e8..66c5b75deb 100644
--- a/libraries/header_meta_style.inc.php
+++ b/libraries/header_meta_style.inc.php
@@ -44,7 +44,7 @@ if ($GLOBALS['text_dir'] == 'ltr') {
echo 'phpMyAdmin';
}
?>
-
+
diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php
index 851dee0799..476e5c4f20 100644
--- a/libraries/mult_submits.inc.php
+++ b/libraries/mult_submits.inc.php
@@ -11,7 +11,6 @@ if (! defined('PHPMYADMIN')) {
$request_params = array(
'clause_is_unique',
'goto',
- 'js_frame',
'mult_btn',
'original_sql_query',
'query_type',
diff --git a/navigation.php b/navigation.php
index 7694ae5d2a..a341fd89b9 100644
--- a/navigation.php
+++ b/navigation.php
@@ -98,7 +98,7 @@ require_once 'libraries/header_http.inc.php';
+ href="phpmyadmin.css.php?&nocache=getThemeUniqueValue(); ?>" />
printCss(PMA_FRAME);
+$_SESSION['PMA_Theme_Manager']->printCss();
?>
diff --git a/po/bg.po b/po/bg.po
index c174a8777d..c541948d19 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-17 10:53+0200\n"
-"PO-Revision-Date: 2012-05-15 20:20+0200\n"
+"PO-Revision-Date: 2012-05-17 20:44+0200\n"
"Last-Translator: Стоян Димитров \n"
"Language-Team: bulgarian \n"
"Language: bg\n"
@@ -7332,6 +7332,7 @@ msgstr "Позволено"
#: libraries/relation.lib.php:100 libraries/relation.lib.php:123
#: pmd_relation_new.php:71
+#, fuzzy
msgid "General relation features"
msgstr "Общи свойства на релациите"
@@ -8700,6 +8701,7 @@ msgid "Save position"
msgstr "Запазване на позицията"
#: pmd_general.php:89 pmd_general.php:370
+#, fuzzy
msgid "Create relation"
msgstr "Създаване отношение"
@@ -8732,6 +8734,7 @@ msgid "Toggle small/big"
msgstr ""
#: pmd_general.php:114
+#, fuzzy
msgid "Toggle relation lines"
msgstr "Превключване на редовете с релации"
@@ -8752,6 +8755,7 @@ msgid "Hide/Show all"
msgstr "Показване/скриване всички"
#: pmd_general.php:145
+#, fuzzy
msgid "Hide/Show Tables with no relation"
msgstr "Показване/скриване таблици без релации"
@@ -8764,10 +8768,12 @@ msgid "Number of tables"
msgstr "Брой таблици"
#: pmd_general.php:436
+#, fuzzy
msgid "Delete relation"
msgstr "Изтриване на отношение"
#: pmd_general.php:478 pmd_general.php:537
+#, fuzzy
msgid "Relation operator"
msgstr "Оператор на отношение"
@@ -8834,22 +8840,27 @@ msgid "recommended"
msgstr "препоръчително"
#: pmd_relation_new.php:29
+#, fuzzy
msgid "Error: relation already exists."
msgstr "Грешка: Зависимостта вече съществува."
#: pmd_relation_new.php:64 pmd_relation_new.php:89
+#, fuzzy
msgid "Error: Relation not added."
msgstr "Грешка: Зависимостта не е добавена."
#: pmd_relation_new.php:65
+#, fuzzy
msgid "FOREIGN KEY relation added"
msgstr "FOREIGN KEY зависимост е добавена"
#: pmd_relation_new.php:87
+#, fuzzy
msgid "Internal relation added"
msgstr "Вътрешна зависимост е добавена"
#: pmd_relation_upd.php:60
+#, fuzzy
msgid "Relation deleted"
msgstr "Зависимостта изтрита"
@@ -11478,10 +11489,12 @@ msgstr ""
"Грешка при създаването на външен ключ върху %1$s (проверете типа данни)"
#: tbl_relation.php:404
+#, fuzzy
msgid "Internal relation"
msgstr "Вътрешна релация"
#: tbl_relation.php:406
+#, fuzzy
msgid ""
"An internal relation is not necessary when a corresponding FOREIGN KEY "
"relation exists."
@@ -11575,6 +11588,7 @@ msgid "Edit view"
msgstr "Изглед за редакция"
#: tbl_structure.php:665
+#, fuzzy
msgid "Relation view"
msgstr "Преглед на релациите"
diff --git a/po/ckb.po b/po/ckb.po
index 329ca2fc8f..6a5fe878ce 100644
--- a/po/ckb.po
+++ b/po/ckb.po
@@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-17 10:53+0200\n"
-"PO-Revision-Date: 2012-05-16 23:18+0200\n"
-"Last-Translator: Frman Husein \n"
+"PO-Revision-Date: 2012-05-20 00:56+0200\n"
+"Last-Translator: dilan kurdistani \n"
"Language-Team: none\n"
"Language: ckb\n"
"MIME-Version: 1.0\n"
@@ -240,7 +240,7 @@ msgstr "نیشاندانى بۆشایى (هێڵکارى) لە بنکەى درا
#: db_export.php:30 db_printview.php:93 db_qbe.php:104 db_tracking.php:47
#: export.php:374 navigation.php:298
msgid "No tables found in database."
-msgstr ".هیج خشتەیەک بوونی نیە لە نێو بنکەی دراوە"
+msgstr ".هیج خشتەیەک بوونی نیە لە نێو بنکەی دراو"
#: db_export.php:40 db_search.php:334 server_export.php:22
msgid "Select All"
@@ -306,7 +306,7 @@ msgstr "بنکەی دراوە درووست بکە پێش ڕوونووسکردن"
#: libraries/config/messages.inc.php:139 tbl_operations.php:569
#, php-format
msgid "Add %s"
-msgstr "زۆرکردن %s"
+msgstr "زیادکردن %s"
#: db_operations.php:540 libraries/config/messages.inc.php:123
#: tbl_operations.php:321 tbl_operations.php:571
@@ -315,7 +315,7 @@ msgstr "زۆرکردنی نرخی زۆربوونی خۆکارانە"
#: db_operations.php:544 tbl_operations.php:578
msgid "Add constraints"
-msgstr ""
+msgstr "زیادکردنی مەرج"
#: db_operations.php:559
msgid "Switch to copied database"
@@ -329,7 +329,7 @@ msgstr "بڕۆ بۆ بنکەی دراوەی ڕوونووس کراو"
#: tbl_structure.php:202 tbl_structure.php:938 tbl_tracking.php:305
#: tbl_tracking.php:371
msgid "Collation"
-msgstr ""
+msgstr "ڕێکخستن"
#: db_operations.php:599
#, php-format
@@ -337,6 +337,7 @@ msgid ""
"The phpMyAdmin configuration storage has been deactivated. To find out why "
"click %shere%s."
msgstr ""
+"شێوەی بیرگەی phpMyAdmin ناچالاک کراوە. بۆ دۆزینەوەی کلیک لەمە بکە %shere%s"
#: db_operations.php:633
msgid "Edit or export relational schema"
@@ -438,7 +439,7 @@ msgstr "مەرج"
#: db_qbe.php:380 db_qbe.php:462 db_qbe.php:554 db_qbe.php:585
msgid "Ins"
-msgstr ""
+msgstr "Ins"
#: db_qbe.php:384 db_qbe.php:466 db_qbe.php:551 db_qbe.php:582
msgid "And"
@@ -509,7 +510,7 @@ msgstr ""
#: db_search.php:216
#, php-format
msgid "Search results for \"%s\" %s:"
-msgstr ""
+msgstr "ئەنجامی گەڕان بۆ \"%s\" %s:"
#: db_search.php:239
#, php-format
@@ -522,7 +523,7 @@ msgstr[1] ""
#: libraries/common.lib.php:3149 libraries/common.lib.php:3379
#: libraries/common.lib.php:3380 tbl_structure.php:573
msgid "Browse"
-msgstr ""
+msgstr "گەڕۆک"
#: db_search.php:252
#, php-format
@@ -558,15 +559,16 @@ msgstr ""
#: db_search.php:297
msgid "Find:"
-msgstr "دۆزنەوە:"
+msgstr "دۆزینەوە:"
#: db_search.php:301 db_search.php:302
msgid "Words are separated by a space character (\" \")."
msgstr ""
#: db_search.php:315
+#, fuzzy
msgid "Inside tables:"
-msgstr ""
+msgstr "لەناو خشتە:\n"
#: db_search.php:345
msgid "Inside column:"
@@ -579,7 +581,7 @@ msgstr "هیچ خشتەیەک نەدۆزرایەوە لە بنکەی دراو"
#: db_structure.php:242 libraries/mysql_charsets.lib.php:411
#: libraries/mysql_charsets.lib.php:418
msgid "unknown"
-msgstr ""
+msgstr "نەناسراوە"
#: db_structure.php:367 tbl_operations.php:717
#, php-format
@@ -620,11 +622,11 @@ msgstr "نیشاندان"
#: libraries/db_structure.lib.php:35 server_replication.php:31
#: server_replication.php:189 server_status.php:610
msgid "Replication"
-msgstr ""
+msgstr "دووپاتکاری"
#: db_structure.php:624
msgid "Sum"
-msgstr ""
+msgstr "سەرجەم"
#: db_structure.php:631 libraries/StorageEngine.class.php:344
#, php-format
@@ -637,7 +639,7 @@ msgstr ""
#: server_databases.php:295 server_privileges.php:1920
#: server_privileges.php:1928 tbl_structure.php:559 tbl_structure.php:568
msgid "With selected:"
-msgstr ""
+msgstr "لەگەڵ پەڕگەی دەستنیشانکراو:"
#: db_structure.php:682 libraries/display_tbl.lib.php:2989
#: server_databases.php:292 server_privileges.php:781
@@ -663,18 +665,18 @@ msgstr ""
#: prefs_manage.php:294 server_privileges.php:1565 server_privileges.php:1932
#: server_status.php:1625 setup/frames/menu.inc.php:22
msgid "Export"
-msgstr ""
+msgstr "هەناردن"
#: db_structure.php:701 db_structure.php:749
#: libraries/display_tbl.lib.php:3115 libraries/header_printview.inc.php:42
#: tbl_structure.php:654
msgid "Print view"
-msgstr ""
+msgstr "پارچەیەک بۆ چاپکردن"
#: db_structure.php:705 libraries/common.lib.php:3388
#: libraries/common.lib.php:3389
msgid "Empty"
-msgstr ""
+msgstr "بەتاڵ"
#: db_structure.php:707 db_tracking.php:101 libraries/Index.class.php:507
#: libraries/common.lib.php:3386 libraries/common.lib.php:3387
@@ -685,7 +687,7 @@ msgstr ""
#: db_structure.php:709 tbl_operations.php:620
msgid "Check table"
-msgstr ""
+msgstr "پشکنینی خشتە"
#: db_structure.php:712 tbl_operations.php:677 tbl_structure.php:882
msgid "Optimize table"
@@ -693,27 +695,27 @@ msgstr ""
#: db_structure.php:714 tbl_operations.php:662
msgid "Repair table"
-msgstr ""
+msgstr "چاکردنی خشتە"
#: db_structure.php:717 tbl_operations.php:647
msgid "Analyze table"
-msgstr ""
+msgstr "شیکردنەوەى خشتە"
#: db_structure.php:719
msgid "Add prefix to table"
-msgstr ""
+msgstr "زیادکردنی پێشگر بۆ خشتە"
#: db_structure.php:721 libraries/mult_submits.inc.php:276
msgid "Replace table prefix"
-msgstr ""
+msgstr "گۆڕینی پێشگری خشتە"
#: db_structure.php:723 libraries/mult_submits.inc.php:276
msgid "Copy table with prefix"
-msgstr ""
+msgstr "لەبەرگرتنەوەی خشتە لەگەڵ پێشگر"
#: db_structure.php:752 libraries/schema/User_Schema.class.php:426
msgid "Data Dictionary"
-msgstr ""
+msgstr "فەرهەنگی زانیاریەکان"
#: db_tracking.php:74
msgid "Tracked tables"
@@ -729,25 +731,25 @@ msgstr ""
#: server_status.php:1254 server_synchronize.php:1448
#: server_synchronize.php:1452 sql.php:933 tbl_tracking.php:710
msgid "Database"
-msgstr ""
+msgstr "بنکەی دراو"
#: db_tracking.php:81
msgid "Last version"
-msgstr ""
+msgstr "وەشانی کۆتا"
#: db_tracking.php:82 tbl_tracking.php:713
msgid "Created"
-msgstr ""
+msgstr "دروستکراوە"
#: db_tracking.php:83 tbl_tracking.php:714
msgid "Updated"
-msgstr ""
+msgstr "بارکراوە"
#: db_tracking.php:84 js/messages.php:185 libraries/Menu.class.php:467
#: libraries/rte/rte_events.lib.php:380 libraries/rte/rte_list.lib.php:78
#: server_status.php:1257 sql.php:1006 tbl_tracking.php:715
msgid "Status"
-msgstr ""
+msgstr "ڕەوش"
#: db_tracking.php:85 libraries/Index.class.php:455
#: libraries/db_structure.lib.php:39 libraries/rte/rte_list.lib.php:53
@@ -755,7 +757,7 @@ msgstr ""
#: server_databases.php:221 server_privileges.php:1857
#: server_privileges.php:2075 server_privileges.php:2422 tbl_structure.php:218
msgid "Action"
-msgstr ""
+msgstr "کردار"
#: db_tracking.php:96 js/messages.php:34
msgid "Delete tracking data for this table"
@@ -763,15 +765,15 @@ msgstr ""
#: db_tracking.php:118 tbl_tracking.php:667 tbl_tracking.php:725
msgid "active"
-msgstr ""
+msgstr "چالاک"
#: db_tracking.php:120 tbl_tracking.php:669 tbl_tracking.php:727
msgid "not active"
-msgstr ""
+msgstr "ناچالاکە"
#: db_tracking.php:135
msgid "Versions"
-msgstr ""
+msgstr "وەشانەکان"
#: db_tracking.php:136 tbl_tracking.php:473 tbl_tracking.php:745
msgid "Tracking report"
@@ -799,7 +801,7 @@ msgstr ""
#: export.php:87
msgid "Selected export type has to be saved in file!"
-msgstr ""
+msgstr "دەستنیشانکردنی جۆری هەناردن بۆ پاشەکەوتکردنی لە پەڕگە!"
#: export.php:116
msgid "Bad parameters!"
@@ -841,7 +843,7 @@ msgstr ""
#: gis_data_editor.php:134
msgid "SRID"
-msgstr ""
+msgstr "SRID"
#: gis_data_editor.php:151 js/messages.php:330
#: libraries/display_tbl.lib.php:825
@@ -850,7 +852,7 @@ msgstr ""
#: gis_data_editor.php:171 js/messages.php:326
msgid "Point"
-msgstr ""
+msgstr "خاڵ"
#: gis_data_editor.php:172 gis_data_editor.php:196 gis_data_editor.php:244
#: gis_data_editor.php:296 js/messages.php:324
@@ -871,7 +873,7 @@ msgstr ""
#: gis_data_editor.php:203 gis_data_editor.php:249 gis_data_editor.php:301
#: js/messages.php:333
msgid "Add a point"
-msgstr ""
+msgstr "زیادکردنی خاڵ"
#: gis_data_editor.php:219 js/messages.php:328
msgid "Linestring"
@@ -903,11 +905,11 @@ msgstr ""
#: gis_data_editor.php:309
msgid "Add geometry"
-msgstr ""
+msgstr "زیادکردنی ئەندازەگەری"
#: gis_data_editor.php:316
msgid "Output"
-msgstr ""
+msgstr "بەرهەم"
#: gis_data_editor.php:317
msgid ""
@@ -933,7 +935,7 @@ msgstr ""
#: import.php:315 import.php:368 libraries/File.class.php:425
#: libraries/File.class.php:516
msgid "File could not be read"
-msgstr ""
+msgstr "ناتوانیت پەڕگە بخوێنیتەوە"
#: import.php:323 import.php:332 import.php:351 import.php:360
#: libraries/File.class.php:577
@@ -991,7 +993,7 @@ msgstr ""
#: import_status.php:117 libraries/common.lib.php:728
#: libraries/schema/Export_Relation_Schema.class.php:239 user_password.php:210
msgid "Back"
-msgstr ""
+msgstr "گەڕانەوە"
#: index.php:162
msgid "phpMyAdmin is more friendly with a frames-capable browser."
@@ -1040,11 +1042,11 @@ msgstr ""
#: js/messages.php:42
msgid "Add Index"
-msgstr ""
+msgstr "زیادکردنی نیشاندەر"
#: js/messages.php:43
msgid "Edit Index"
-msgstr ""
+msgstr "چاکردنی نیشاندەر"
#: js/messages.php:44 tbl_indexes.php:311
#, php-format
@@ -1058,15 +1060,15 @@ msgstr ""
#: js/messages.php:51
msgid "The host name is empty!"
-msgstr ""
+msgstr "ناوی خانەخوێ بەتاڵە!"
#: js/messages.php:52
msgid "The user name is empty!"
-msgstr ""
+msgstr "ناوی بەکارهێنانی خانەخوێ بەتاڵە!"
#: js/messages.php:53 server_privileges.php:1432 user_password.php:103
msgid "The password is empty!"
-msgstr ""
+msgstr "وشەی نهێنی بەتاڵە!"
#: js/messages.php:54 server_privileges.php:1430 user_password.php:106
msgid "The passwords aren't the same!"
@@ -1075,7 +1077,7 @@ msgstr ""
#: js/messages.php:55 server_privileges.php:1947 server_privileges.php:1971
#: server_privileges.php:2383 server_privileges.php:2577
msgid "Add user"
-msgstr ""
+msgstr "زیادکردنی بەکارهێنەر"
#: js/messages.php:56
msgid "Reloading Privileges"
@@ -1088,7 +1090,7 @@ msgstr ""
#: js/messages.php:58 js/messages.php:137 tbl_tracking.php:281
#: tbl_tracking.php:473
msgid "Close"
-msgstr ""
+msgstr "داخستن"
#: js/messages.php:61 js/messages.php:284 libraries/Index.class.php:485
#: libraries/common.lib.php:667 libraries/common.lib.php:1211
@@ -1096,7 +1098,7 @@ msgstr ""
#: libraries/config/messages.inc.php:490 libraries/display_tbl.lib.php:1622
#: libraries/schema/User_Schema.class.php:199 setup/frames/index.inc.php:147
msgid "Edit"
-msgstr ""
+msgstr "چاکردن"
#: js/messages.php:62 server_status.php:807
msgid "Live traffic chart"
@@ -1120,7 +1122,7 @@ msgstr ""
#: server_status.php:1132 server_status.php:1201 tbl_printview.php:333
#: tbl_structure.php:870
msgid "Total"
-msgstr ""
+msgstr "سەرجەم"
#. l10n: Other, small valued, queries
#: js/messages.php:70 server_status.php:616 server_status.php:1026
@@ -1130,12 +1132,12 @@ msgstr ""
#. l10n: Thousands separator
#: js/messages.php:72 libraries/common.lib.php:1468
msgid ","
-msgstr ""
+msgstr ","
#. l10n: Decimal separator
#: js/messages.php:74 libraries/common.lib.php:1470
msgid "."
-msgstr ""
+msgstr "."
#: js/messages.php:76
msgid "KiB sent since last refresh"
@@ -1340,7 +1342,7 @@ msgstr ""
#: server_privileges.php:2224 server_status.php:1283 server_status.php:1722
#: tbl_zoom_select.php:226 tbl_zoom_select.php:270
msgid "None"
-msgstr ""
+msgstr "هیچ"
#: js/messages.php:140
msgid "Resume monitor"
@@ -1403,13 +1405,13 @@ msgstr ""
#: js/messages.php:155
#, php-format
msgid "Enable %s"
-msgstr ""
+msgstr "چالاکردن %s"
#. l10n: Disable in this context means setting a status variable to OFF
#: js/messages.php:157
#, php-format
msgid "Disable %s"
-msgstr ""
+msgstr "ناچالاکردن %s"
#. l10n: %d seconds
#: js/messages.php:159
@@ -1429,7 +1431,7 @@ msgstr ""
#: js/messages.php:162
msgid "Current settings"
-msgstr ""
+msgstr "ڕێکخستنەکانی هەنووکە"
#: js/messages.php:164 server_status.php:1670
msgid "Chart Title"
@@ -1443,11 +1445,11 @@ msgstr ""
#: js/messages.php:167
#, php-format
msgid "Divided by %s"
-msgstr ""
+msgstr "دابەشکراوە لەلایەن %s"
#: js/messages.php:168
msgid "Unit"
-msgstr ""
+msgstr "یەکە"
#: js/messages.php:170
msgid "From slow log"
@@ -1467,7 +1469,7 @@ msgstr ""
#: js/messages.php:174
msgid "Cancel request"
-msgstr ""
+msgstr "لابردنی داواکاریی"
#: js/messages.php:175
msgid ""
@@ -1511,11 +1513,11 @@ msgstr ""
#: libraries/export/odt.php:534 libraries/export/texytext.php:408
#: libraries/rte/rte_list.lib.php:68 server_status.php:1256 sql.php:1007
msgid "Time"
-msgstr ""
+msgstr "کات"
#: js/messages.php:187
msgid "Total time:"
-msgstr ""
+msgstr "هەموو کاتەکان:"
#: js/messages.php:188
msgid "Profiling results"
@@ -1524,7 +1526,7 @@ msgstr ""
#: js/messages.php:189
msgctxt "Display format"
msgid "Table"
-msgstr ""
+msgstr "خشتە"
#: js/messages.php:190
msgid "Chart"
@@ -1536,7 +1538,7 @@ msgstr ""
#: js/messages.php:192
msgid "Series"
-msgstr ""
+msgstr "زنجیرە"
#. l10n: A collection of available filters
#: js/messages.php:195
@@ -1546,7 +1548,7 @@ msgstr ""
#. l10n: Filter as in "Start Filtering"
#: js/messages.php:197
msgid "Filter"
-msgstr ""
+msgstr "پاڵێو"
#: js/messages.php:198
msgid "Filter queries by word/regexp:"
@@ -1562,7 +1564,7 @@ msgstr ""
#: js/messages.php:201
msgid "Total:"
-msgstr ""
+msgstr "سەرجەم:"
#: js/messages.php:203
msgid "Loading logs"
@@ -1581,7 +1583,7 @@ msgstr ""
#: js/messages.php:206
msgid "Reload page"
-msgstr ""
+msgstr "بارکردنەوەى پەڕە"
#: js/messages.php:208
msgid "Affected rows:"
@@ -1602,7 +1604,7 @@ msgstr ""
#: libraries/config/messages.inc.php:174 libraries/display_import.lib.php:175
#: prefs_manage.php:237 server_status.php:1625 setup/frames/menu.inc.php:21
msgid "Import"
-msgstr ""
+msgstr "هێنان"
#: js/messages.php:213
msgid "Import monitor configuration"
@@ -1626,7 +1628,7 @@ msgstr ""
#: js/messages.php:222
msgid "Issue"
-msgstr ""
+msgstr "ئەنجام"
#: js/messages.php:223
msgid "Recommendation"
@@ -1652,11 +1654,11 @@ msgstr ""
#: pmd_general.php:563 pmd_general.php:611 pmd_general.php:687
#: pmd_general.php:741 pmd_general.php:804 pmd_general.php:835
msgid "Cancel"
-msgstr ""
+msgstr "لابردن"
#: js/messages.php:235
msgid "Loading"
-msgstr ""
+msgstr "ئامادەکردن"
#: js/messages.php:236
msgid "Processing Request"
@@ -1682,7 +1684,7 @@ msgstr ""
#: pmd_general.php:609 pmd_general.php:685 pmd_general.php:739
#: pmd_general.php:802
msgid "OK"
-msgstr ""
+msgstr "باشە"
#: js/messages.php:242
msgid "Click to dismiss this notification"
@@ -1694,11 +1696,11 @@ msgstr ""
#: js/messages.php:246
msgid "Reload Database"
-msgstr ""
+msgstr "بارکردنەوەى بنکەی دراو"
#: js/messages.php:247
msgid "Copying Database"
-msgstr ""
+msgstr "لەبەرگرتنەوەی بنکەی دراو"
#: js/messages.php:248
msgid "Changing Charset"
@@ -1726,11 +1728,11 @@ msgstr ""
#: js/messages.php:258 libraries/mult_submits.inc.php:321
msgid "(Enabled)"
-msgstr ""
+msgstr "(چالاکە)"
#: js/messages.php:259 libraries/mult_submits.inc.php:321
msgid "(Disabled)"
-msgstr ""
+msgstr "(ناچالاکە)"
#: js/messages.php:262
msgid "Searching"
@@ -1798,7 +1800,7 @@ msgstr ""
#: js/messages.php:286 libraries/display_tbl.lib.php:3007 querywindow.php:88
#: tbl_structure.php:145 tbl_structure.php:579
msgid "Change"
-msgstr ""
+msgstr "گۆڕین"
#: js/messages.php:287
msgid "Query execution time"
@@ -1816,7 +1818,7 @@ msgstr ""
#: setup/frames/index.inc.php:243 tbl_change.php:1061
#: tbl_gis_visualization.php:186 tbl_indexes.php:298 tbl_relation.php:569
msgid "Save"
-msgstr ""
+msgstr "پاشەکەوتکردن"
#: js/messages.php:294
msgid "Hide search criteria"
@@ -4853,7 +4855,7 @@ msgstr ""
#: libraries/config/messages.inc.php:381
msgid "Compress connection"
-msgstr ""
+msgstr "پەستانی پەیوەندی"
#: libraries/config/messages.inc.php:382
msgid "How to connect to server, keep [kbd]tcp[/kbd] if unsure"
@@ -4861,7 +4863,7 @@ msgstr ""
#: libraries/config/messages.inc.php:383
msgid "Connection type"
-msgstr ""
+msgstr "جۆری پەیوەندی"
#: libraries/config/messages.inc.php:384
msgid "Control user password"
@@ -4903,7 +4905,7 @@ msgstr ""
#: libraries/config/messages.inc.php:392
msgid "Designer table"
-msgstr ""
+msgstr "شێوەسازی خشتە"
#: libraries/config/messages.inc.php:393
msgid ""
@@ -4929,7 +4931,7 @@ msgstr ""
#: libraries/config/messages.inc.php:398
msgid "Hide databases"
-msgstr ""
+msgstr "شاردنەوەى بنکەی دراو"
#: libraries/config/messages.inc.php:399
msgid ""
@@ -4951,7 +4953,7 @@ msgstr ""
#: libraries/config/messages.inc.php:403
msgid "Logout URL"
-msgstr ""
+msgstr "چوونەدەرەوە بەستەر"
#: libraries/config/messages.inc.php:404
msgid ""
@@ -4969,7 +4971,7 @@ msgstr ""
#: libraries/config/messages.inc.php:407
msgid "Connect without password"
-msgstr ""
+msgstr "پەیوەندی بەبێ وشەی نهێنی"
#: libraries/config/messages.inc.php:408
msgid ""
@@ -4982,7 +4984,7 @@ msgstr ""
#: libraries/config/messages.inc.php:409
msgid "Show only listed databases"
-msgstr ""
+msgstr "تەنها نیشاندانی لیستی بنکەی دراو"
#: libraries/config/messages.inc.php:410 libraries/config/messages.inc.php:451
msgid "Leave empty if not using config auth"
@@ -5010,7 +5012,7 @@ msgstr ""
#: libraries/config/messages.inc.php:415
msgid "Database name"
-msgstr ""
+msgstr "ناوی بنکەی دراو"
#: libraries/config/messages.inc.php:416
msgid "Port on which MySQL server is listening, leave empty for default"
@@ -5076,7 +5078,7 @@ msgstr ""
#: libraries/config/messages.inc.php:430
msgid "Use SSL"
-msgstr ""
+msgstr "بەکارهێنانی SSL"
#: libraries/config/messages.inc.php:431
msgid ""
@@ -5293,8 +5295,9 @@ msgid "Defines whether SQL queries generated by phpMyAdmin should be displayed"
msgstr ""
#: libraries/config/messages.inc.php:478
+#, fuzzy
msgid "Show SQL queries"
-msgstr ""
+msgstr "نیشاندانی پرسگەی SQL"
#: libraries/config/messages.inc.php:479
msgid ""
@@ -5311,7 +5314,7 @@ msgstr ""
#: libraries/config/messages.inc.php:482
msgid "Show statistics"
-msgstr ""
+msgstr "نیشاندانی سەرژمێری"
#: libraries/config/messages.inc.php:483
msgid ""
@@ -5360,7 +5363,7 @@ msgstr ""
#: server_privileges.php:983 server_privileges.php:994
#: server_privileges.php:1853 server_synchronize.php:1444
msgid "Password"
-msgstr ""
+msgstr "وشەی نهێنی"
#: libraries/config/messages.inc.php:497
msgid ""
@@ -5381,7 +5384,7 @@ msgstr ""
#: libraries/config/messages.inc.php:500 tbl_tracking.php:518
#: tbl_tracking.php:577
msgid "Username"
-msgstr ""
+msgstr "ناوی بەکارهێنەر"
#: libraries/config/messages.inc.php:501
msgid "A warning is displayed on the main page if Suhosin is detected"
@@ -5421,7 +5424,7 @@ msgstr ""
#: libraries/config/messages.inc.php:510
msgid "Default title"
-msgstr ""
+msgstr "سەردێری بنەڕەت"
#: libraries/config/messages.inc.php:511
msgid "Title of browser window when a server is selected"
@@ -5457,7 +5460,7 @@ msgstr ""
#: libraries/config/messages.inc.php:520
msgid "Use database search"
-msgstr ""
+msgstr "بەکارهێنانی گەڕان لە بنکەی دراو"
#: libraries/config/messages.inc.php:521
msgid ""
@@ -5471,7 +5474,7 @@ msgstr ""
#: libraries/config/messages.inc.php:523 setup/frames/index.inc.php:271
msgid "Check for latest version"
-msgstr ""
+msgstr "پشکنین بۆ دۆزینەوەی نوێترین وەشان"
#: libraries/config/messages.inc.php:524
msgid "Enables check for latest version on main phpMyAdmin page"
@@ -5493,7 +5496,7 @@ msgstr ""
#: libraries/config/messages.inc.php:527
msgid "ZIP"
-msgstr ""
+msgstr "ZIP"
#: libraries/config/setup.forms.php:41
msgid "Config authentication"
@@ -5526,12 +5529,12 @@ msgstr ""
#: libraries/config/setup.forms.php:266
#: libraries/config/user_preferences.forms.php:168
msgid "Quick"
-msgstr ""
+msgstr "خێرا"
#: libraries/config/setup.forms.php:270
#: libraries/config/user_preferences.forms.php:172
msgid "Custom"
-msgstr ""
+msgstr "ڕاسپێراو"
#: libraries/config/setup.forms.php:291
#: libraries/config/user_preferences.forms.php:192
@@ -5548,7 +5551,7 @@ msgstr ""
#: libraries/config/user_preferences.forms.php:248
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
-msgstr ""
+msgstr "Microsoft Word 2000"
#: libraries/config/setup.forms.php:356
#: libraries/config/user_preferences.forms.php:257 libraries/export/odt.php:24
@@ -12416,6 +12419,9 @@ msgstr ""
#: libraries/advisory_rules.txt:425
msgid "You do not have InnoDB enabled."
msgstr ""
+"InnoDB\n"
+" که ت چالاک نه کردوه\n"
+" "
#: libraries/advisory_rules.txt:426
msgid "InnoDB is usually the better choice for table engines."
diff --git a/po/et.po b/po/et.po
index 7117f26435..19959753d4 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-17 10:53+0200\n"
-"PO-Revision-Date: 2012-05-12 21:12+0200\n"
+"PO-Revision-Date: 2012-05-17 23:33+0200\n"
"Last-Translator: LiivaneLord \n"
"Language-Team: estonian \n"
"Language: et\n"
@@ -4622,10 +4622,9 @@ msgid "Minimum number of tables to display the table filter box"
msgstr "Tabeli filtri kastis näidatavate tabelite minimaalne hulk"
#: libraries/config/messages.inc.php:281
-#, fuzzy
#| msgid "Minimum number of tables to display the table filter box"
msgid "Minimum number of databases to display the database filter box"
-msgstr "Tabeli filtri kastis näidatavate tabelite minimaalne hulk"
+msgstr "Andmebaasi filtri kastis näidatavate andmebaaside minimaalne hulk"
#: libraries/config/messages.inc.php:282
msgid "String that separates databases into different tree levels"
@@ -8929,10 +8928,9 @@ msgid "No databases"
msgstr "Andmebaasid puuduvad"
#: navigation.php:209
-#, fuzzy
#| msgid "Filter tables by name"
msgid "Filter databases by name"
-msgstr "Filtreeri tabeleid nime alusel"
+msgstr "Filtreeri andmebaase nime alusel"
#: navigation.php:272
msgid "Filter tables by name"
diff --git a/po/fi.po b/po/fi.po
index 2185f19438..3e833b2b99 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-17 10:53+0200\n"
-"PO-Revision-Date: 2012-05-02 10:21+0200\n"
-"Last-Translator: Michal Čihař \n"
+"PO-Revision-Date: 2012-05-20 23:58+0200\n"
+"Last-Translator: Jukka Penttinen \n"
"Language-Team: finnish \n"
"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 0.10\n"
+"X-Generator: Weblate 1.0\n"
#: browse_foreigners.php:35 browse_foreigners.php:59 js/messages.php:358
#: libraries/display_tbl.lib.php:399 server_privileges.php:1828
@@ -1021,10 +1021,10 @@ msgid "\"DROP DATABASE\" statements are disabled."
msgstr "\"DROP DATABASE\" -kyselyjen käyttö on estetty."
#: js/messages.php:30
-#, fuzzy, php-format
+#, php-format
#| msgid "Do you really want to "
msgid "Do you really want to execute \"%s\"?"
-msgstr "Haluatko varmasti "
+msgstr "Haluatko varmasti suorittaa \"%s\"?"
#: js/messages.php:31 libraries/mult_submits.inc.php:307 sql.php:390
msgid "You are about to DESTROY a complete database!"
@@ -1489,10 +1489,9 @@ msgid "From general log"
msgstr "Yleisestä lokista"
#: js/messages.php:172
-#, fuzzy
#| msgid "Loading logs"
msgid "Analysing logs"
-msgstr "Lokien lataus"
+msgstr "Analyysilokit"
#: js/messages.php:173
msgid "Analysing & loading logs. This may take a while."
@@ -1530,10 +1529,9 @@ msgid "Jump to Log table"
msgstr "Siirry lokitauluun"
#: js/messages.php:180
-#, fuzzy
#| msgid "No databases"
msgid "No data found"
-msgstr "Ei tietokantoja"
+msgstr "Tieotoa ei löytynyt"
#: js/messages.php:181
msgid "Log analysed, but no data found in this time span."
@@ -1571,16 +1569,14 @@ msgid "Chart"
msgstr "Kaavio"
#: js/messages.php:191
-#, fuzzy
#| msgid "Apply index(s)"
msgid "Edit chart"
-msgstr "Käytä indeksiä/indeksejä"
+msgstr "Muokkaa kaaviota"
#: js/messages.php:192
-#, fuzzy
#| msgid "SQL queries"
msgid "Series"
-msgstr "SQL-kyselyt"
+msgstr "Sarjat"
#. l10n: A collection of available filters
#: js/messages.php:195
@@ -1645,6 +1641,8 @@ msgid ""
"Failed building chart grid with imported config. Resetting to default "
"config..."
msgstr ""
+"Kaavioruudukon luonti ei onnistunut tuoduilla määrityksillä. Käytetään "
+"oletusmäärityksiä."
#: js/messages.php:212 libraries/Menu.class.php:297
#: libraries/Menu.class.php:384 libraries/Menu.class.php:481
@@ -1654,16 +1652,14 @@ msgid "Import"
msgstr "Tuonti"
#: js/messages.php:213
-#, fuzzy
#| msgid "Could not load default configuration from: \"%1$s\""
msgid "Import monitor configuration"
-msgstr "Oletusasetuksia ei voitu ladata kohteesta: \"%1$s\""
+msgstr "Tuo seurantamääritys"
#: js/messages.php:214
-#, fuzzy
#| msgid "Please select the primary key or a unique key"
msgid "Please select the file you want to import"
-msgstr "Valitse perusavain tai uniikki avain"
+msgstr "Valitse tiedosto jonka haluat tuoda"
#: js/messages.php:216
msgid "Analyse Query"
@@ -1774,22 +1770,19 @@ msgid "Show indexes"
msgstr "Näytä indeksit"
#: js/messages.php:257 libraries/mult_submits.inc.php:317
-#, fuzzy
#| msgid "Disable foreign key checks"
msgid "Foreign key check:"
-msgstr "Älä tarkista viiteavaimia"
+msgstr "Viiteavaimen tarkastus:"
#: js/messages.php:258 libraries/mult_submits.inc.php:321
-#, fuzzy
#| msgid "Enabled"
msgid "(Enabled)"
-msgstr "Päällä"
+msgstr "(Päällä)"
#: js/messages.php:259 libraries/mult_submits.inc.php:321
-#, fuzzy
#| msgid "Disabled"
msgid "(Disabled)"
-msgstr "Pois päältä"
+msgstr "(Pois päältä)"
#: js/messages.php:262
msgid "Searching"
@@ -2005,7 +1998,7 @@ msgstr "Valitse tai poista valinta painamalla"
#: js/messages.php:356
msgid "Double-click to copy column name"
-msgstr ""
+msgstr "Kopoio kentän nimi kaksoisnäpäyksellä"
#: js/messages.php:357
msgid "Click the drop-down arrow
to toggle column's visibility"
@@ -2032,20 +2025,18 @@ msgid "Go to link"
msgstr "Siirry linkkiin"
#: js/messages.php:362
-#, fuzzy
#| msgid "Column names"
msgid "Copy column name"
-msgstr "Sarakkeiden nimet"
+msgstr "Kopioi kenttän nimi"
#: js/messages.php:363
msgid "Right-click the column name to copy it to your clipboard."
msgstr ""
#: js/messages.php:364
-#, fuzzy
#| msgid "Update row(s)"
msgid "Show data row(s)"
-msgstr "Päivitä rivi(t)"
+msgstr "Näytä rivi(t)"
#: js/messages.php:367
msgid "Generate password"
@@ -2339,53 +2330,55 @@ msgstr "Sekunti"
#: libraries/Advisor.class.php:67
#, php-format
msgid "PHP threw following error: %s"
-msgstr ""
+msgstr "PHP:ssä tapahtui seuraava virhe: %s"
#: libraries/Advisor.class.php:89
#, php-format
msgid "Failed evaluating precondition for rule '%s'"
-msgstr ""
+msgstr "Säännön '%s' esiehdon arviointi epäonnistui"
#: libraries/Advisor.class.php:106
#, php-format
msgid "Failed calculating value for rule '%s'"
-msgstr ""
+msgstr "Arvon laskenta säännölle '%s' epäonnistui"
#: libraries/Advisor.class.php:125
#, php-format
msgid "Failed running test for rule '%s'"
-msgstr ""
+msgstr "Säännön '%s' testin suorittaminen epäonnistui"
#: libraries/Advisor.class.php:207
-#, fuzzy, php-format
+#, php-format
#| msgid ""
#| "Failed formatting string for rule '%s'. PHP threw following error: %s"
msgid "Failed formatting string for rule '%s'."
-msgstr ""
-"Säännön '%s' merkkijonon muotoilu epäonnistui. PHP antoi seuraavan virheen: "
-"%s"
+msgstr "Merkkijonon muotoilu epäonnistui '%s' säännöllä."
#: libraries/Advisor.class.php:361
#, php-format
msgid ""
"Invalid rule declaration on line %1$s, expected line %2$s of previous rule"
msgstr ""
+"Epäkelpo säännön määrittely rivillä %1$s, odotti edellisen säännön riviä %"
+"2$s"
#: libraries/Advisor.class.php:378
-#, fuzzy, php-format
+#, php-format
#| msgid "Invalid format of CSV input on line %d."
msgid "Invalid rule declaration on line %s"
-msgstr "Virheellinen muoto CSV-syötteessä rivillä %d."
+msgstr "Virheellinen säännön määrittely rivillä %s"
#: libraries/Advisor.class.php:386
#, php-format
msgid "Unexpected characters on line %s"
-msgstr ""
+msgstr "Odottamattomia merkkejä rivillä %s"
#: libraries/Advisor.class.php:400
#, php-format
msgid "Unexpected character on line %1$s. Expected tab, but found \"%2$s\""
msgstr ""
+"Odottamattomia merkkejä rivillä %1$s. Pitäisi olla sarkain (tab), mutta "
+"löytyi \"%2$s\""
#: libraries/Advisor.class.php:425 server_status.php:956
msgid "per second"
@@ -2612,10 +2605,9 @@ msgid "Designer"
msgstr "Suunnittelija"
#: libraries/Menu.class.php:472
-#, fuzzy
#| msgid "User"
msgid "Users"
-msgstr "Käyttäjä"
+msgstr "Käyttäjät"
#: libraries/Menu.class.php:493 server_synchronize.php:1317
#: server_synchronize.php:1324
@@ -2637,7 +2629,7 @@ msgstr "Merkistöt"
#: libraries/Menu.class.php:518 server_plugins.php:30 server_plugins.php:63
msgid "Plugins"
-msgstr ""
+msgstr "Liitännäiset"
#: libraries/Menu.class.php:522
msgid "Engines"
@@ -2712,16 +2704,16 @@ msgid "unknown table status: "
msgstr "tuntematon taulun tila: "
#: libraries/Table.class.php:771
-#, fuzzy, php-format
+#, php-format
#| msgid "Source database"
msgid "Source database `%s` was not found!"
-msgstr "Lähdetietokanta"
+msgstr "Lähdetietokanta '%s' ei löytynyt!"
#: libraries/Table.class.php:779
-#, fuzzy, php-format
+#, php-format
#| msgid "Theme %s not found!"
msgid "Target database `%s` was not found!"
-msgstr "Teemaa %s ei löydy!"
+msgstr "Kohde tietokantaa '%s' ei löydy!"
#: libraries/Table.class.php:1279
msgid "Invalid database"
@@ -2737,10 +2729,10 @@ msgid "Error renaming table %1$s to %2$s"
msgstr "Virhe annettaessa taululle %1$s nimeä %2$s"
#: libraries/Table.class.php:1413
-#, fuzzy, php-format
+#, php-format
#| msgid "Table %s has been renamed to %s"
msgid "Table %1$s has been renamed to %2$s."
-msgstr "Taulun %s nimi on nyt %s"
+msgstr "Taulu %1$s on nimeltään %2$s."
#: libraries/Table.class.php:1557
msgid "Could not save table UI preferences"
@@ -2802,42 +2794,57 @@ msgstr "Teema"
msgid ""
"A 1-byte integer, signed range is -128 to 127, unsigned range is 0 to 255"
msgstr ""
+"1-tavuinen kokonaisluku, etumerkillisenä arvot välillä -128 - 127, "
+"etumerkittömänä arvot välillä 0 - 255"
#: libraries/Types.class.php:291
msgid ""
"A 2-byte integer, signed range is -32,768 to 32,767, unsigned range is 0 to "
"65,535"
msgstr ""
+"2-tavuinen kokonaisluku, etumerkillisenä arvot olvat -32768 - 32767, "
+"etumerkittömänä arvot ovat 0 - 65535"
#: libraries/Types.class.php:293
msgid ""
"A 3-byte integer, signed range is -8,388,608 to 8,388,607, unsigned range is "
"0 to 16,777,215"
msgstr ""
+"3-tavuinen kokonaisluku, etumerkillisenä arvot ovat -8388608 - 8388607, "
+"etumerkittömänä arvot ovat 0 - 16777215"
#: libraries/Types.class.php:295
msgid ""
"A 4-byte integer, signed range is -2,147,483,648 to 2,147,483,647, unsigned "
"range is 0 to 4,294,967,295."
msgstr ""
+"4-tavuinen kokonaisluku, etumerkillisenä arvot ovat -2147483648 - "
+"2147483647, etumerkittämänä arvot ovat 0 - 4294967295."
#: libraries/Types.class.php:297
msgid ""
"An 8-byte integer, signed range is -9,223,372,036,854,775,808 to "
"9,223,372,036,854,775,807, unsigned range is 0 to 18,446,744,073,709,551,615"
msgstr ""
+"8-tavuinen kokonaisluku, etumerkillisenä arvot ovat -9223372036854775808 - "
+"9223372036854775807, etumerkittämänä arvot ovat 0 - 18446744073709551615"
#: libraries/Types.class.php:299 libraries/Types.class.php:705
msgid ""
"A fixed-point number (M, D) - the maximum number of digits (M) is 65 "
"(default 10), the maximum number of decimals (D) is 30 (default 0)"
msgstr ""
+"Desimaaliluku (M,D) - kokonaislukuosan numeroiden maksimäärä (M) on 65 "
+"(oletuksena 10), desimaaliosan numeroiden maksimäärä (D) on 30 (oletuksena "
+"0)"
#: libraries/Types.class.php:301
msgid ""
"A small floating-point number, allowable values are -3.402823466E+38 to "
"-1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38"
msgstr ""
+"Pieni liukuluku, mahdolliset arvot ovat välillä -3.402823466E+38 - "
+"-1.175494351E-38, 0 ja 1.175494351E-38 - 3.402823466E+38"
#: libraries/Types.class.php:303
msgid ""
@@ -2845,18 +2852,25 @@ msgid ""
"-1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and "
"2.2250738585072014E-308 to 1.7976931348623157E+308"
msgstr ""
+"Kaksoistarkkuuksinen liukuluku, mahdolliset arvot ovat välillä "
+"-1.7976931348623157E+308 - -2.2250738585072014E-308, 0, ja "
+"2.2250738585072014E-308 - 1.7976931348623157E+308"
#: libraries/Types.class.php:305
msgid ""
"Synonym for DOUBLE (exception: in REAL_AS_FLOAT SQL mode it is a synonym for "
"FLOAT)"
msgstr ""
+"Synonyymi DOUBLE:lle (poikkeus: REAL_AS_FLOAT SQL moodissa se on synonyymi "
+"FLOAT:lle)"
#: libraries/Types.class.php:307
msgid ""
"A bit-field type (M), storing M of bits per value (default is 1, maximum is "
"64)"
msgstr ""
+"Bittikenttä tyyppi (M), sisältää M verran bittejä arvoa kohti (oletuksena on "
+"1, maksimi on 64)"
#: libraries/Types.class.php:309
msgid ""
@@ -2869,10 +2883,10 @@ msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE"
msgstr ""
#: libraries/Types.class.php:313 libraries/Types.class.php:715
-#, fuzzy, php-format
+#, php-format
#| msgid "Create version %s of %s.%s"
msgid "A date, supported range is %1$s to %2$s"
-msgstr "Luo versio %s kohteesta %s.%s"
+msgstr "Päiväys, pitää olla välillä %1$s - %2$s"
#: libraries/Types.class.php:315 libraries/Types.class.php:717
#, php-format
@@ -2886,10 +2900,10 @@ msgid ""
msgstr ""
#: libraries/Types.class.php:319 libraries/Types.class.php:721
-#, fuzzy, php-format
+#, php-format
#| msgid "Error renaming table %1$s to %2$s"
msgid "A time, range is %1$s to %2$s"
-msgstr "Virhe annettaessa taululle %1$s nimeä %2$s"
+msgstr "Aika, mahdollinen välillä %1$s - %2$s"
#: libraries/Types.class.php:321
msgid ""
@@ -2994,10 +3008,9 @@ msgid "A curve with linear interpolation between points"
msgstr ""
#: libraries/Types.class.php:357
-#, fuzzy
#| msgid "Add a polygon"
msgid "A polygon"
-msgstr "Lisää monikulmio"
+msgstr "Monikulmio"
#: libraries/Types.class.php:359
msgid "A collection of points"
@@ -3021,25 +3034,22 @@ msgid "Numeric"
msgstr ""
#: libraries/Types.class.php:636 libraries/Types.class.php:970
-#, fuzzy
#| msgid "Create an index"
msgctxt "date and time types"
msgid "Date and time"
-msgstr "Luo uusi indeksi"
+msgstr "Päiväys ja aika"
#: libraries/Types.class.php:645 libraries/Types.class.php:973
-#, fuzzy
#| msgid "Linestring"
msgctxt "string types"
msgid "String"
-msgstr "Rivimerkkijono"
+msgstr "Merkkijono"
#: libraries/Types.class.php:666
-#, fuzzy
#| msgid "Log file count"
msgctxt "spatial types"
msgid "Spatial"
-msgstr "Lokitiedostojen määrä"
+msgstr "Geometrinen"
#: libraries/Types.class.php:701
msgid "A 4-byte integer, range is -2,147,483,648 to 2,147,483,647"
@@ -3125,10 +3135,9 @@ msgid "Failed to use Blowfish from mcrypt!"
msgstr "Mcrypt-laajennuksen Blowfish-toiminnon käyttö epäonnistui!"
#: libraries/auth/cookie.auth.lib.php:204 libraries/header.inc.php:90
-#, fuzzy
#| msgid "Cookies must be enabled past this point."
msgid "Javascript must be enabled past this point"
-msgstr "Selaimessa on oltava evästeet päällä tästä lähtien."
+msgstr "Javaskripti on oltava päällä tämän jälkeen"
#: libraries/auth/cookie.auth.lib.php:223
msgid "Log in"
@@ -3283,7 +3292,6 @@ msgid "Could not load default configuration from: %1$s"
msgstr "Oletusasetuksia ei voitu ladata kohteesta: \"%1$s\""
#: libraries/common.inc.php:630
-#, fuzzy
#| msgid ""
#| "The $cfg['PmaAbsoluteUri'] directive MUST be set in your "
#| "configuration file!"
@@ -3291,7 +3299,7 @@ msgid ""
"The [code]$cfg['PmaAbsoluteUri'][/code] directive MUST be set in your "
"configuration file!"
msgstr ""
-"$cfg['PmaAbsoluteUri'] täytyy määritellä asetustiedostossa!"
+"[code]$cfg['PmaAbsoluteUri'][/code] täytyy määritellä asetustiedostossa!"
#: libraries/common.inc.php:663
#, php-format
@@ -3374,11 +3382,11 @@ msgstr "Älä selitä SQL-kyselyä"
#: libraries/common.lib.php:1224
msgid "Without PHP Code"
-msgstr "Kätke PHP-koodi"
+msgstr "Ilman PHP-koodia"
#: libraries/common.lib.php:1227 libraries/config/messages.inc.php:493
msgid "Create PHP Code"
-msgstr "Näytä PHP-koodi"
+msgstr "Luo PHP-koodi"
#: libraries/common.lib.php:1247 libraries/config/messages.inc.php:492
#: server_status.php:799 server_status.php:821 server_status.php:841
@@ -3744,7 +3752,6 @@ msgid "Bzip2"
msgstr "Bzip2"
#: libraries/config/messages.inc.php:32
-#, fuzzy
#| msgid ""
#| "s which type of editing controls should be used for CHAR and CHAR fields;"
#| "bd]input[/kbd] - allows limiting of input length, [kbd]tarea[/kbd] - ows "
@@ -3754,9 +3761,9 @@ msgid ""
"columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/"
"kbd] - allows newlines in columns"
msgstr ""
-"Määrittää, minkälaista muokkausoliota käytetään CHAR- ja VARCHAR-kentissä; "
-"[kbd]input[/kbd] - sallii syötön pituuden rajoittamisen, [kbd]textarea[/kbd] "
-"- sallii kentissä uudet rivit"
+"Määrittää minkä tyyppistä muokkaustoimintoa tulisi käyttää CHAR- ja VARCHAR-"
+"kentissä; [kbd]input[/kbd] - sallii syötön pituuden rajoittamisen, "
+"[kbd]textarea[/kbd] - sallii kentissä uudet rivit"
#: libraries/config/messages.inc.php:33
msgid "CHAR columns editing"
@@ -3777,6 +3784,8 @@ msgid ""
"Defines the minimum size for input fields generated for CHAR and VARCHAR "
"columns"
msgstr ""
+"Määrittää CHAR ja VARCHAR sarakkeista muodostettujen syötekenttien minimi "
+"koon"
#: libraries/config/messages.inc.php:37
msgid "Minimum size for input field"
@@ -3787,6 +3796,8 @@ msgid ""
"Defines the maximum size for input fields generated for CHAR and VARCHAR "
"columns"
msgstr ""
+"Määrittää CHAR ja VARCHAR sarakkeista muodostettujen syötekenttien maksimi "
+"koon \t"
#: libraries/config/messages.inc.php:39
msgid "Maximum size for input field"
@@ -3847,10 +3858,9 @@ msgid "Debug SQL"
msgstr "Etsi virheitä SQL-kyselystä"
#: libraries/config/messages.inc.php:51
-#, fuzzy
#| msgid "Databases display options"
msgid "Default display direction"
-msgstr "Tietokantojen näyttöasetukset"
+msgstr "Oletus näyttösuunta"
#: libraries/config/messages.inc.php:52
msgid "Tab that is displayed when entering a database"
@@ -3881,10 +3891,9 @@ msgid "Whether the table structure actions should be hidden"
msgstr ""
#: libraries/config/messages.inc.php:59
-#, fuzzy
#| msgid "Propose table structure"
msgid "Hide table structure actions"
-msgstr "Esitä taulun rakenne"
+msgstr "Esitä taulun rakennetoimet"
#: libraries/config/messages.inc.php:60
msgid "Show binary contents as HEX by default"
@@ -3915,12 +3924,13 @@ msgid ""
"Disable the table maintenance mass operations, like optimizing or repairing "
"the selected tables of a database."
msgstr ""
+"Estä taulun massahallintatoiminnot, esimerkiksi optionti tai korjaus "
+"tietokannan valituille tauluille."
#: libraries/config/messages.inc.php:67
-#, fuzzy
#| msgid "Table maintenance"
msgid "Disable multi table maintenance"
-msgstr "Taulun ylläpito"
+msgstr "Estä monen taulun hallinta"
#: libraries/config/messages.inc.php:68
msgid "Edit SQL queries in popup window"
@@ -4279,10 +4289,9 @@ msgid "Microsoft Office"
msgstr "Microsoft Office"
#: libraries/config/messages.inc.php:192
-#, fuzzy
#| msgid "Open Document Text"
msgid "Open Document"
-msgstr "Open Document Text"
+msgstr "Avaa dokumentti"
#: libraries/config/messages.inc.php:194
msgid "Other core settings"
@@ -4358,7 +4367,6 @@ msgid "Configuration storage"
msgstr "Asetusmuisti"
#: libraries/config/messages.inc.php:209
-#, fuzzy
#| msgid ""
#| "ure phpMyAdmin database to gain access to additional features, see "
#| "Documentation.html#linked-tables]linked-tables infrastructure[/a] "
@@ -4368,9 +4376,9 @@ msgid ""
"features, see [a@Documentation.html#linked-tables]phpMyAdmin configuration "
"storage[/a] in documentation"
msgstr ""
-"Määritä phpMyAdmin-tietokannan asetukset käyttääksesi lisäasetuksia; katso "
-"ohjeista [a@../Documentation.html#linked-tables]linkitettyjen taulujen "
-"infrastruktuuri[/a]."
+"Määritä phpMyAdmin määritysten tallennus käyttääksesi lisäasetuksia, katso "
+"ohjeista [a@Documentation.html#linked-tables]phpMyAdmin määritysten "
+"tallennus[/a]"
#: libraries/config/messages.inc.php:210
msgid "Changes tracking"
@@ -4436,20 +4444,18 @@ msgid "Customize startup page"
msgstr "Mukauta käynnistyssivua"
#: libraries/config/messages.inc.php:228
-#, fuzzy
#| msgid "Database for user"
msgid "Database structure"
-msgstr "Tietokanta käyttäjälle"
+msgstr "Tietokannan rakenne"
#: libraries/config/messages.inc.php:229
msgid "Choose which details to show in the database structure (list of tables)"
msgstr ""
#: libraries/config/messages.inc.php:230
-#, fuzzy
#| msgid "Database for user"
msgid "Table structure"
-msgstr "Tietokanta käyttäjälle"
+msgstr "Taulun rakenne"
#: libraries/config/messages.inc.php:231
msgid "Settings for the table structure (list of columns)"
@@ -4468,10 +4474,9 @@ msgid "Text fields"
msgstr "Tekstikentät"
#: libraries/config/messages.inc.php:235
-#, fuzzy
#| msgid "Customize export options"
msgid "Customize text input fields"
-msgstr "Mukauta viennin oletusasetuksia"
+msgstr "Muokkaa tekstikenttiä"
#: libraries/config/messages.inc.php:236 libraries/export/texytext.php:18
msgid "Texy! text"
@@ -4615,16 +4620,14 @@ msgid "Display servers selection"
msgstr "Näytä palvelinten valinta"
#: libraries/config/messages.inc.php:280
-#, fuzzy
#| msgid "Maximum number of tables displayed in table list"
msgid "Minimum number of tables to display the table filter box"
-msgstr "Taululuettelossa näkyvien taulujen enimmäismäärä"
+msgstr "Taululuettelossa näkyvien taulujen minimimäärä"
#: libraries/config/messages.inc.php:281
-#, fuzzy
#| msgid "Maximum number of tables displayed in table list"
msgid "Minimum number of databases to display the database filter box"
-msgstr "Taululuettelossa näkyvien taulujen enimmäismäärä"
+msgstr "Taululuettelossa näkyvien taulujen minimimäärä"
#: libraries/config/messages.inc.php:282
msgid "String that separates databases into different tree levels"
@@ -4695,23 +4698,22 @@ msgid "Enable highlighting"
msgstr "Käytä korostusta"
#: libraries/config/messages.inc.php:297
-#, fuzzy
#| msgid "Maximum number of tables displayed in table list"
msgid "Maximum number of recently used tables; set 0 to disable"
-msgstr "Taululuettelossa näkyvien taulujen enimmäismäärä"
+msgstr "Viimeksi käytettyjen taululuettelo, 0 poistaa käytöstä"
#: libraries/config/messages.inc.php:298
-#, fuzzy
#| msgid "Untracked tables"
msgid "Recently used tables"
-msgstr "Seuraamattomat taulut"
+msgstr "Viimeksi käytetty taulut"
#: libraries/config/messages.inc.php:299
-#, fuzzy
#| msgid "imum number of characters used when a SQL query is displayed"
msgid ""
"Maximum number of characters shown in any non-numeric column on browse view"
-msgstr "Näytettävän SQL-kyselyn enimmäispituus"
+msgstr ""
+"Selainnäkymässä näytettävien merkkien määrä missä tahansa ei numeerisessa "
+"sarakkeessa"
#: libraries/config/messages.inc.php:300
msgid "Limit column characters"
@@ -4855,10 +4857,9 @@ msgid "Use natural order for sorting table and database names"
msgstr ""
#: libraries/config/messages.inc.php:328
-#, fuzzy
#| msgid "Alter table order by"
msgid "Natural order"
-msgstr "Lajittele taulu"
+msgstr "Luonnollinenjärjestys"
#: libraries/config/messages.inc.php:329 libraries/config/messages.inc.php:339
msgid "Use only icons, only text or both"
@@ -4877,7 +4878,6 @@ msgid "GZip output buffering"
msgstr "GZip-ulostulon puskurointi"
#: libraries/config/messages.inc.php:333
-#, fuzzy
#| msgid ""
#| "MART[/kbd] - i.e. descending order for fields of type TIME, DATE, ETIME "
#| "TIMESTAMP, ascending order otherwise"
@@ -4886,7 +4886,7 @@ msgid ""
"DATETIME and TIMESTAMP, ascending order otherwise"
msgstr ""
"[kbd]SMART[/kbd] - eli laskeva järjestys kentille, joiden tyyppi on TIME, "
-"DATE, DATETIME tai TIMESTAMP; muulloin nouseva järjestys"
+"DATE, DATETIME ja TIMESTAMP, muulloin nouseva järjestys"
#: libraries/config/messages.inc.php:334
msgid "Default sorting order"
@@ -4916,19 +4916,16 @@ msgid "Iconic table operations"
msgstr "Kuvakkeellisen taulun toiminnot"
#: libraries/config/messages.inc.php:341
-#, fuzzy
#| msgid "Disallow BLOB and BINARY fields from editing"
msgid "Disallow BLOB and BINARY columns from editing"
-msgstr "Estä BLOB- ja BINARY-kenttien muokkaus"
+msgstr "Poista BLOB ja BINARY kentät muokkauksesta"
#: libraries/config/messages.inc.php:342
-#, fuzzy
#| msgid "Protect binary fields"
msgid "Protect binary columns"
-msgstr "Suojaa binäärikentät"
+msgstr "Suojaa binäärisarakkeet"
#: libraries/config/messages.inc.php:343
-#, fuzzy
#| msgid ""
#| " if you want DB-based query history (requires pmadb). If disabled, s "
#| "lizes JS-routines to display query history (lost by window close)."
@@ -4937,8 +4934,8 @@ msgid ""
"storage). If disabled, this utilizes JS-routines to display query history "
"(lost by window close)."
msgstr ""
-"Ota käyttöön, jos haluat tietokantapohjaisen kyselyhistorian (pmadb-kanta "
-"tarvitaan). Jos poistettu käytöstä, tämä käyttää JavaScript-rutiineja "
+"Ota käyttöön, jos haluat tietokantapohjaisen kyselyhistorian (phpMyAdmin "
+"määritykset). Jos poistettu käytöstä, tämä käyttää JavaScript-rutiineja "
"kyselyhistorian näyttämisessä (katoaa, kun ikkuna suljetaan)."
#: libraries/config/messages.inc.php:344
@@ -4990,20 +4987,18 @@ msgid "When browsing tables, the sorting of each table is remembered"
msgstr ""
#: libraries/config/messages.inc.php:357
-#, fuzzy
#| msgid "Rename table to"
msgid "Remember table's sorting"
-msgstr "Nimeä taulu uudelleen"
+msgstr "Muista taulun järjestys"
#: libraries/config/messages.inc.php:358
msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature"
msgstr ""
#: libraries/config/messages.inc.php:359
-#, fuzzy
#| msgid "Repair threads"
msgid "Repeat headers"
-msgstr "Korjaa säikeet"
+msgstr "Korjaa otsikot"
#: libraries/config/messages.inc.php:361
msgid "Save all edited cells at once"
@@ -5022,7 +5017,6 @@ msgid "Leave blank if not used"
msgstr "Jätä tyhjäksi, jos tätä ei käytetä"
#: libraries/config/messages.inc.php:365
-#, fuzzy
#| msgid "Host authentication order"
msgid "Host authorization order"
msgstr "Palvelintodennuksen järjestys"
@@ -5032,7 +5026,6 @@ msgid "Leave blank for defaults"
msgstr "Käytä oletusarvoja jättämällä tyhjäksi"
#: libraries/config/messages.inc.php:367
-#, fuzzy
#| msgid "Host authentication rules"
msgid "Host authorization rules"
msgstr "Palvelintodennuksen säännöt"
@@ -5138,10 +5131,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:388
-#, fuzzy
#| msgid "Control user"
msgid "Control host"
-msgstr "Hallintakäyttäjä"
+msgstr "Hallintapalvelin"
#: libraries/config/messages.inc.php:389
msgid "Count tables when showing database list"
@@ -5224,10 +5216,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:405
-#, fuzzy
#| msgid "Maximum number of tables displayed in table list"
msgid "Maximal number of table preferences to store"
-msgstr "Taululuettelossa näkyvien taulujen enimmäismäärä"
+msgstr "Tallennettavien taulumääritysten maksimi määrä"
#: libraries/config/messages.inc.php:406
msgid "Try to connect without password"
@@ -5287,7 +5278,6 @@ msgstr ""
"a]. Jätä tyhjäksi, jos et halua tukea. Oletusarvo: [kbd]phpmyadmin[/kbd]"
#: libraries/config/messages.inc.php:415
-#, fuzzy
#| msgid "database name"
msgid "Database name"
msgstr "tietokannan nimi"
@@ -5302,21 +5292,19 @@ msgid "Server port"
msgstr "Palvelinportti"
#: libraries/config/messages.inc.php:418
-#, fuzzy
#| msgid ""
#| "blank for no SQL query history support, suggested: [kbd]pma_historybd]"
msgid ""
"Leave blank for no \"persistent\" recently used tables across sessions, "
"suggested: [kbd]pma_recent[/kbd]"
msgstr ""
-"Jätä tyhjäksi, jos et halua SQL-kyselyhistorian tukea; oletusarvo: [kbd]"
-"pma_history[/kbd]"
+"Jätä tyhjäksi, jos et halua SQL-kyselyhistorian tukea; oletusarvo: "
+"[kbd]pma_recent[/kbd]"
#: libraries/config/messages.inc.php:419
-#, fuzzy
#| msgid "Recall user name"
msgid "Recently used table"
-msgstr "Anna käyttäjänimi"
+msgstr "Viimeisimmäksi käytetty taulu"
#: libraries/config/messages.inc.php:420
msgid ""
@@ -5392,11 +5380,10 @@ msgid ""
"Table to describe the display columns, leave blank for no support; "
"suggested: [kbd]pma_table_info[/kbd]"
msgstr ""
-"Taulu, joka kuvaa näyttökentät; jätä tyhjäksi, jos et halua tukea; "
-"oletusarvo: [kbd]pma_table_info[/kbd]"
+"Taulu kuvaa näyttökentät, jätä tyhjäksi, jos et halua tukea; oletusarvo: "
+"[kbd]pma_table_info[/kbd]"
#: libraries/config/messages.inc.php:434
-#, fuzzy
#| msgid "Display fields table"
msgid "Display columns table"
msgstr "Näyttökenttien taulu"
@@ -5413,10 +5400,9 @@ msgstr ""
"pma_history[/kbd]"
#: libraries/config/messages.inc.php:436
-#, fuzzy
#| msgid "Defragment table"
msgid "UI preferences table"
-msgstr "Eheytä taulu"
+msgstr "Käyttöliittymän ominaisuuksien taulu"
#: libraries/config/messages.inc.php:437
msgid ""
@@ -5453,24 +5439,21 @@ msgid "Defines the list of statements the auto-creation uses for new versions."
msgstr ""
#: libraries/config/messages.inc.php:444
-#, fuzzy
#| msgid "Statements"
msgid "Statements to track"
-msgstr "Tieto"
+msgstr "Jäljitettävä lauseke"
#: libraries/config/messages.inc.php:445
-#, fuzzy
#| msgid ""
#| "blank for no SQL query history support, suggested: [kbd]pma_historybd]"
msgid ""
"Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/"
"kbd]"
msgstr ""
-"Jätä tyhjäksi, jos et halua SQL-kyselyhistorian tukea; oletusarvo: [kbd]"
-"pma_history[/kbd]"
+"Jätä tyhjäksi, jos et halua SQL-kyselyhistorian tukea; oletusarvo: "
+"[kbd]pma_history[/kbd]"
#: libraries/config/messages.inc.php:446
-#, fuzzy
#| msgid "SQL query history table"
msgid "SQL query tracking table"
msgstr "SQL-kyselyhistorian taulu"
@@ -5482,10 +5465,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:448
-#, fuzzy
#| msgid "Automatic recovery mode"
msgid "Automatically create versions"
-msgstr "Automaattinen palautuminen"
+msgstr "Automaattisesti luodut versiot"
#: libraries/config/messages.inc.php:449
#, fuzzy
@@ -5519,10 +5501,9 @@ msgid "Verbose name of this server"
msgstr "Tämän palvelimen yksityiskohtainen nimi"
#: libraries/config/messages.inc.php:455
-#, fuzzy
#| msgid "r a user should be displayed a "show all (records)" button"
msgid "Whether a user should be displayed a "show all (rows)" button"
-msgstr "Pitääkö käyttäjälle näyttää \"Näytä kaikki (tietueet)\" -painike"
+msgstr "Näyttääkö käyttäjälle "Näytä kaikki (rivit)"-painike"
#: libraries/config/messages.inc.php:456
msgid "Allow to display all the rows"
@@ -5595,10 +5576,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:469
-#, fuzzy
#| msgid "Show open tables"
msgid "Show field types"
-msgstr "Näytä avoimet taulut"
+msgstr "Näytä kenttätyypit"
#: libraries/config/messages.inc.php:470
msgid "Display the function fields in edit/insert mode"
@@ -5613,10 +5593,9 @@ msgid "Whether to show hint or not"
msgstr ""
#: libraries/config/messages.inc.php:473
-#, fuzzy
#| msgid "Show grid"
msgid "Show hint"
-msgstr "Näytä ruudukko"
+msgstr "Näytä vihje"
#: libraries/config/messages.inc.php:474
msgid ""
@@ -5648,10 +5627,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:480 libraries/sql_query_form.lib.php:358
-#, fuzzy
#| msgid "Hide query box"
msgid "Retain query box"
-msgstr "Piilota SQL-kyselykenttä"
+msgstr "Säilytä SQL-kyselylaatikko"
#: libraries/config/messages.inc.php:481
msgid "Allow to display database and table statistics (eg. space usage)"
@@ -5754,10 +5732,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:504
-#, fuzzy
#| msgid "CHAR textarea columns"
msgid "Textarea columns"
-msgstr "CHAR-tekstikentän sarakkeet"
+msgstr "Tekstikenttä kentät"
#: libraries/config/messages.inc.php:505
msgid ""
@@ -5766,10 +5743,9 @@ msgid ""
msgstr ""
#: libraries/config/messages.inc.php:506
-#, fuzzy
#| msgid "CHAR textarea rows"
msgid "Textarea rows"
-msgstr "CHAR-tekstikentän rivit"
+msgstr "Tekstikenttä rivit"
#: libraries/config/messages.inc.php:507
msgid "Title of browser window when a database is selected"
@@ -5780,10 +5756,9 @@ msgid "Title of browser window when nothing is selected"
msgstr ""
#: libraries/config/messages.inc.php:510
-#, fuzzy
#| msgid "Default table tab"
msgid "Default title"
-msgstr "Oletusarvoinen tauluvälilehti"
+msgstr "Oletusotsikko"
#: libraries/config/messages.inc.php:511
msgid "Title of browser window when a server is selected"
@@ -5866,28 +5841,24 @@ msgid "ZIP"
msgstr "ZIP"
#: libraries/config/setup.forms.php:41
-#, fuzzy
#| msgid "Host authentication order"
msgid "Config authentication"
-msgstr "Palvelintodennuksen järjestys"
+msgstr "Määritä tunnistautuminen"
#: libraries/config/setup.forms.php:45
-#, fuzzy
#| msgid "Host authentication order"
msgid "Cookie authentication"
-msgstr "Palvelintodennuksen järjestys"
+msgstr "Eväste tunnistautuminen"
#: libraries/config/setup.forms.php:48
-#, fuzzy
#| msgid "Host authentication order"
msgid "HTTP authentication"
-msgstr "Palvelintodennuksen järjestys"
+msgstr "HTTP tunnistautuminen"
#: libraries/config/setup.forms.php:51
-#, fuzzy
#| msgid "Host authentication order"
msgid "Signon authentication"
-msgstr "Palvelintodennuksen järjestys"
+msgstr "Sisäänkirjatumistunnitautuminen"
#: libraries/config/setup.forms.php:250
#: libraries/config/user_preferences.forms.php:153 libraries/import/ldi.php:35
@@ -5908,10 +5879,9 @@ msgstr ""
#: libraries/config/setup.forms.php:270
#: libraries/config/user_preferences.forms.php:172
-#, fuzzy
#| msgid "Custom color"
msgid "Custom"
-msgstr "Muu väri"
+msgstr "Muokattu"
#: libraries/config/setup.forms.php:291
#: libraries/config/user_preferences.forms.php:192
@@ -5940,10 +5910,9 @@ msgid "Could not initialize Drizzle connection library"
msgstr ""
#: libraries/config/validate.lib.php:221 libraries/config/validate.lib.php:229
-#, fuzzy
#| msgid "Could not connect to MySQL server"
msgid "Could not connect to Drizzle server"
-msgstr "MySQL-palvelimeen ei voitu yhdistää"
+msgstr "Ei voi yhdistää Drizzle palvelimeen"
#: libraries/config/validate.lib.php:240 libraries/config/validate.lib.php:247
msgid "Could not connect to MySQL server"
@@ -5991,20 +5960,18 @@ msgid "possible deep recursion attack"
msgstr ""
#: libraries/database_interface.lib.php:1848
-#, fuzzy
#| msgid " the local MySQL server's socket is not correctly configured)"
msgid ""
"The server is not responding (or the local server's socket is not correctly "
"configured)."
msgstr ""
-"(tai paikallisen MySQL-palvelimen pistokkeen asetuksia ei ole määritelty "
-"oikein)"
+"Palvelin ei vastaa (tai paikallisen palvelimen pistokke ei ole määritelty "
+"oikein)."
#: libraries/database_interface.lib.php:1851
-#, fuzzy
#| msgid "The server is not responding"
msgid "The server is not responding."
-msgstr "Palvelin ei vastaa"
+msgstr "Palvelin ei vastaa."
#: libraries/database_interface.lib.php:1855
msgid "Please check privileges of directory containing database."
@@ -6052,10 +6019,9 @@ msgstr "MySQL 4.0 -yhteensopiva"
#: libraries/display_create_database.lib.php:21
#: libraries/display_create_database.lib.php:39
-#, fuzzy
#| msgid "Create new database"
msgid "Create database"
-msgstr "Luo uusi tietokanta"
+msgstr "Luo tietokanta"
#: libraries/display_create_database.lib.php:33
msgid "Create"
@@ -6081,7 +6047,6 @@ msgid "Name"
msgstr "Nimi"
#: libraries/display_create_table.lib.php:55
-#, fuzzy
#| msgid "Number of fields"
msgid "Number of columns"
msgstr "Kenttien määrä"
@@ -6091,22 +6056,21 @@ msgid "Could not load export plugins, please check your installation!"
msgstr "Vientiin tarvittavia lisäosia ei voitu ladata; tarkista asetukset!"
#: libraries/display_export.lib.php:85
-#, fuzzy
#| msgid "Allows locking tables for the current thread."
msgid "Exporting databases from the current server"
-msgstr "Sallii taulujen lukitsemisen nykyiselle säikeelle."
+msgstr "Tuo tietokantoja nykyiseltä palvelimelta"
#: libraries/display_export.lib.php:87
-#, fuzzy, php-format
+#, php-format
#| msgid "Create table on database %s"
msgid "Exporting tables from \"%s\" database"
-msgstr "Luo uusi taulu tietokantaan %s"
+msgstr "Tuo tauluja \"%s\" tietokannasta"
#: libraries/display_export.lib.php:89
-#, fuzzy, php-format
+#, php-format
#| msgid "Create table on database %s"
msgid "Exporting rows from \"%s\" table"
-msgstr "Luo uusi taulu tietokantaan %s"
+msgstr "Tuo rivejä taulusta %s"
#: libraries/display_export.lib.php:95
#, fuzzy
@@ -7106,10 +7070,9 @@ msgid "Export table names"
msgstr "Vie sisällöt"
#: libraries/export/mediawiki.php:60
-#, fuzzy
#| msgid "horizontal (rotated headers)"
msgid "Export table headers"
-msgstr "vaakatasossa (kierretyt otsikot)"
+msgstr "Vie taulun otsikot"
#: libraries/export/pdf.php:18
msgid "PDF"
@@ -9472,22 +9435,19 @@ msgid "Import from selected page"
msgstr "Tuo tiedostoja"
#: pmd_pdf.php:118
-#, fuzzy
#| msgid "Export/Import to scale"
msgid "Export to selected page"
-msgstr "Vie/tuo skaalaan"
+msgstr "Vie valitulle sivulle"
#: pmd_pdf.php:120
-#, fuzzy
#| msgid "Create a new index"
msgid "Create a page and export to it"
-msgstr "Luo uusi indeksi"
+msgstr "Luo sivu ja vie se"
#: pmd_pdf.php:129
-#, fuzzy
#| msgid "User name"
msgid "New page name: "
-msgstr "Käyttäjänimi"
+msgstr "Uuden sivun nimi: "
#: pmd_pdf.php:132
msgid "Export/Import to scale"
@@ -9729,7 +9689,7 @@ msgstr ""
#: server_plugins.php:97 server_plugins.php:132
msgid "License"
-msgstr ""
+msgstr "Lisenssi"
#: server_plugins.php:163
#, fuzzy
diff --git a/po/ja.po b/po/ja.po
index bcf4f985d5..929b4d4831 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-17 10:53+0200\n"
-"PO-Revision-Date: 2012-05-17 15:15+0200\n"
-"Last-Translator: Michal Čihař \n"
+"PO-Revision-Date: 2012-05-18 11:20+0200\n"
+"Last-Translator: Yuichiro Takahashi \n"
"Language-Team: japanese \n"
"Language: ja\n"
"MIME-Version: 1.0\n"
@@ -4617,13 +4617,12 @@ msgstr "サーバ選択を表示する"
#: libraries/config/messages.inc.php:280
msgid "Minimum number of tables to display the table filter box"
-msgstr "テーブルフィルタボックスを表示する最小のテーブル数"
+msgstr "テーブルフィルタボックスを表示させる最小のテーブル数"
#: libraries/config/messages.inc.php:281
-#, fuzzy
#| msgid "Minimum number of tables to display the table filter box"
msgid "Minimum number of databases to display the database filter box"
-msgstr "テーブルフィルタボックスを表示する最小のテーブル数"
+msgstr "データベースフィルタボックスを表示させる最小のテーブル数"
#: libraries/config/messages.inc.php:282
msgid "String that separates databases into different tree levels"
@@ -8927,10 +8926,9 @@ msgid "No databases"
msgstr "データベースが存在しません"
#: navigation.php:209
-#, fuzzy
#| msgid "Filter tables by name"
msgid "Filter databases by name"
-msgstr "名前でテーブルをフィルタする"
+msgstr "名前でデータベースをフィルタする"
#: navigation.php:272
msgid "Filter tables by name"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0242996319..65ca17c911 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-17 10:53+0200\n"
-"PO-Revision-Date: 2012-05-17 15:15+0200\n"
-"Last-Translator: Michal Čihař \n"
+"PO-Revision-Date: 2012-05-18 19:41+0200\n"
+"Last-Translator: ronniery borges \n"
"Language-Team: brazilian_portuguese \n"
"Language: pt_BR\n"
"MIME-Version: 1.0\n"
@@ -5894,6 +5894,8 @@ msgstr "Falha ao conectar com o servidor MySQL"
#: libraries/config/validate.lib.php:280
msgid "Empty username while using config authentication method"
msgstr ""
+"O nome de usuário vazio quando a configuração utilizada e do método de "
+"autenticação"
#: libraries/config/validate.lib.php:287
msgid "Empty signon session name while using signon authentication method"
diff --git a/po/ru.po b/po/ru.po
index 4d1a1bd1cf..740693781a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,16 +4,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-17 10:53+0200\n"
-"PO-Revision-Date: 2012-05-03 21:52+0200\n"
+"PO-Revision-Date: 2012-05-18 09:57+0200\n"
"Last-Translator: Victor Volkov \n"
"Language-Team: russian \n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 0.10\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Weblate 1.0\n"
#: browse_foreigners.php:35 browse_foreigners.php:59 js/messages.php:358
#: libraries/display_tbl.lib.php:399 server_privileges.php:1828
@@ -3068,28 +3068,25 @@ msgstr "Набор геометрических объектов любого т
#: libraries/Types.class.php:617 libraries/Types.class.php:967
msgctxt "numeric types"
msgid "Numeric"
-msgstr ""
+msgstr "Числовые"
#: libraries/Types.class.php:636 libraries/Types.class.php:970
-#, fuzzy
#| msgid "Create an index"
msgctxt "date and time types"
msgid "Date and time"
-msgstr "Создать индекс"
+msgstr "Дата и время"
#: libraries/Types.class.php:645 libraries/Types.class.php:973
-#, fuzzy
#| msgid "Linestring"
msgctxt "string types"
msgid "String"
-msgstr "Линия"
+msgstr "Символьные"
#: libraries/Types.class.php:666
-#, fuzzy
#| msgid "Spatial"
msgctxt "spatial types"
msgid "Spatial"
-msgstr "Пространственный"
+msgstr "Пространственные"
#: libraries/Types.class.php:701
msgid "A 4-byte integer, range is -2,147,483,648 to 2,147,483,647"
@@ -4678,10 +4675,9 @@ msgid "Minimum number of tables to display the table filter box"
msgstr "Минимальное количество таблиц для отображения поля фильтра"
#: libraries/config/messages.inc.php:281
-#, fuzzy
#| msgid "Minimum number of tables to display the table filter box"
msgid "Minimum number of databases to display the database filter box"
-msgstr "Минимальное количество таблиц для отображения поля фильтра"
+msgstr "Минимальное количество баз данных для отображения поля фильтра"
#: libraries/config/messages.inc.php:282
msgid "String that separates databases into different tree levels"
@@ -7372,7 +7368,7 @@ msgstr "Файл ESRI"
#: libraries/import/shp.php:199
#, php-format
msgid "Geometry type '%s' is not supported by MySQL."
-msgstr ""
+msgstr "Геометрический тип '%s' не поддерживается MySQL."
#: libraries/import/shp.php:360
#, php-format
@@ -9053,10 +9049,9 @@ msgid "No databases"
msgstr "Базы данных отсутствуют"
#: navigation.php:209
-#, fuzzy
#| msgid "Filter tables by name"
msgid "Filter databases by name"
-msgstr "Фильтровать таблицы по имени"
+msgstr "Фильтровать базы данных по имени"
#: navigation.php:272
msgid "Filter tables by name"
diff --git a/po/sl.po b/po/sl.po
index 498a10e88d..a34c10a793 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-17 10:53+0200\n"
-"PO-Revision-Date: 2012-05-10 17:02+0200\n"
+"PO-Revision-Date: 2012-05-17 19:01+0200\n"
"Last-Translator: Domen \n"
"Language-Team: slovenian \n"
"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
"X-Generator: Weblate 1.0\n"
#: browse_foreigners.php:35 browse_foreigners.php:59 js/messages.php:358
@@ -4651,11 +4651,11 @@ msgstr ""
"Najmanjše število tabel, potrebnih za prikaz polja za filtriranje tabel"
#: libraries/config/messages.inc.php:281
-#, fuzzy
#| msgid "Minimum number of tables to display the table filter box"
msgid "Minimum number of databases to display the database filter box"
msgstr ""
-"Najmanjše število tabel, potrebnih za prikaz polja za filtriranje tabel"
+"Najmanjše število zbirk podatkov, potrebnih za prikaz polja za filtriranje "
+"zbirk podatkov"
#: libraries/config/messages.inc.php:282
msgid "String that separates databases into different tree levels"
@@ -8991,10 +8991,9 @@ msgid "No databases"
msgstr "Brez zbirk podatkov"
#: navigation.php:209
-#, fuzzy
#| msgid "Filter tables by name"
msgid "Filter databases by name"
-msgstr "Filtriraj tabele po imenu"
+msgstr "Filtriraj zbirke podatkov po imenu"
#: navigation.php:272
msgid "Filter tables by name"
diff --git a/po/sv.po b/po/sv.po
index f9753ef75a..962732b947 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-05-17 10:53+0200\n"
-"PO-Revision-Date: 2012-05-11 20:42+0200\n"
+"PO-Revision-Date: 2012-05-20 21:47+0200\n"
"Last-Translator: ProUser \n"
"Language-Team: swedish \n"
"Language: sv\n"
@@ -2898,6 +2898,8 @@ msgid ""
"A fixed-length (0-255, default 1) string that is always right-padded with "
"spaces to the specified length when stored"
msgstr ""
+"En fast längd (0-255, default 1) sträng som alltid är högerfylld med "
+"blankslag till den angivna längden vid lagring"
#: libraries/Types.class.php:325 libraries/Types.class.php:723
#, php-format
@@ -2905,24 +2907,32 @@ msgid ""
"A variable-length (%s) string, the effective maximum length is subject to "
"the maximum row size"
msgstr ""
+"En variabel-längd (%s) sträng, den effektiva maximala längden är "
+"förutsättningen för den maximala radstorleken"
#: libraries/Types.class.php:327
msgid ""
"A TEXT column with a maximum length of 255 (2^8 - 1) characters, stored with "
"a one-byte prefix indicating the length of the value in bytes"
msgstr ""
+"En TEXT kolumn med en maximal längd av 255 (2^8-1) tecken, lagrat med en en-"
+"bytes prefix vilken anger längden av värdet i bytes"
#: libraries/Types.class.php:329 libraries/Types.class.php:725
msgid ""
"A TEXT column with a maximum length of 65,535 (2^16 - 1) characters, stored "
"with a two-byte prefix indicating the length of the value in bytes"
msgstr ""
+"En TEXT kolumn med en maximal längd av 65.535 (2^16-1) tecken, lagrat med en "
+"två-bytes prefix viken anger längden av värdet i bytes"
#: libraries/Types.class.php:331
msgid ""
"A TEXT column with a maximum length of 16,777,215 (2^24 - 1) characters, "
"stored with a three-byte prefix indicating the length of the value in bytes"
msgstr ""
+"En TEXT kolumn med en maximal längd av 16.777.215 (2^24-1) tecken, lagrat "
+"med en tre-bytes prefix vilken anger längden av värdet i bytes"
#: libraries/Types.class.php:333
msgid ""
@@ -2930,64 +2940,81 @@ msgid ""
"characters, stored with a four-byte prefix indicating the length of the "
"value in bytes"
msgstr ""
+"En TEXT kolumn med en maximal längd av 4,294,967,295 eller 4GB (2^32-1) "
+"tecken, lagrat med en fyra-bytes prefix vilken anger längden av värdet i "
+"bytes"
#: libraries/Types.class.php:335
msgid ""
"Similar to the CHAR type, but stores binary byte strings rather than non-"
"binary character strings"
msgstr ""
+"Liknande en CHAR typ, men lagrar binära byte strängar snarare än icke-binära "
+"teckensträngar"
#: libraries/Types.class.php:337
msgid ""
"Similar to the VARCHAR type, but stores binary byte strings rather than non-"
"binary character strings"
msgstr ""
+"Liknande en VARCHAR typ, men lagrar binära strängar byte snarare än icke-"
+"binära teckensträngar"
#: libraries/Types.class.php:339
msgid ""
"A BLOB column with a maximum length of 255 (2^8 - 1) bytes, stored with a "
"one-byte prefix indicating the length of the value"
msgstr ""
+"En BLOB kolumn med en maximal längd av 255 (2^8-1) bytes, lagrat med en en-"
+"sbyte prefix vilken anger längden av värdet"
#: libraries/Types.class.php:341
msgid ""
"A BLOB column with a maximum length of 16,777,215 (2^24 - 1) bytes, stored "
"with a three-byte prefix indicating the length of the value"
msgstr ""
+"En BLOB kolumn med en maximal längd av 16.777.215 (2^24-1) bytes, lagrat med "
+"en tre-bytes prefix vilken anger längden av värdet"
#: libraries/Types.class.php:343
msgid ""
"A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with "
"a two-byte prefix indicating the length of the value"
msgstr ""
+"En BLOB kolumn med en maximal längd av 65.535 (2^16-1) bytes, lagrad med ett "
+"två bytes prefix vilken anger längden på värdet"
#: libraries/Types.class.php:345
msgid ""
"A BLOB column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) "
"bytes, stored with a four-byte prefix indicating the length of the value"
msgstr ""
+"En BLOB kolumn med en maximal längd av 4,294,967,295 och 4GB (2^32-1) byte, "
+"lagras med en fyra-bytes prefix som anger längden på värdet"
#: libraries/Types.class.php:347
msgid ""
"An enumeration, chosen from the list of up to 65,535 values or the special "
"'' error value"
msgstr ""
+"En uppräkning, vald från listan med upp till 65.535 värden eller det "
+"speciella'' felvärdet"
#: libraries/Types.class.php:349
msgid "A single value chosen from a set of up to 64 members"
-msgstr ""
+msgstr "En enstaka värde valt från en uppsättning av upp till 64 stycken"
#: libraries/Types.class.php:351
msgid "A type that can store a geometry of any type"
-msgstr ""
+msgstr "En typ som kan lagra en geometri av alla typer"
#: libraries/Types.class.php:353
msgid "A point in 2-dimensional space"
-msgstr ""
+msgstr "En punkt det i 2-dimensionella rummet"
#: libraries/Types.class.php:355
msgid "A curve with linear interpolation between points"
-msgstr ""
+msgstr "En kurva med linjär interpolering mellan punkter"
#: libraries/Types.class.php:357
msgid "A polygon"
@@ -2995,24 +3022,24 @@ msgstr "En polygon"
#: libraries/Types.class.php:359
msgid "A collection of points"
-msgstr ""
+msgstr "En samling punkter"
#: libraries/Types.class.php:361
msgid "A collection of curves with linear interpolation between points"
-msgstr ""
+msgstr "En samling kurvor med linjär interpolering mellan punkterna"
#: libraries/Types.class.php:363
msgid "A collection of polygons"
-msgstr ""
+msgstr "En samling polygoner"
#: libraries/Types.class.php:365
msgid "A collection of geometry objects of any type"
-msgstr ""
+msgstr "En samling geometriobjekt av valfri typ"
#: libraries/Types.class.php:617 libraries/Types.class.php:967
msgctxt "numeric types"
msgid "Numeric"
-msgstr ""
+msgstr "Numeriska"
#: libraries/Types.class.php:636 libraries/Types.class.php:970
msgctxt "date and time types"
@@ -3031,51 +3058,59 @@ msgstr "Spatial"
#: libraries/Types.class.php:701
msgid "A 4-byte integer, range is -2,147,483,648 to 2,147,483,647"
-msgstr ""
+msgstr "Ett 4-bytes heltal, intervall -2147483648 till 2147483647"
#: libraries/Types.class.php:703
msgid ""
"An 8-byte integer, range is -9,223,372,036,854,775,808 to "
"9,223,372,036,854,775,807"
msgstr ""
+"Ett 8-bytes heltal, intervallet -9.223.372.036.854.775.808 till "
+"9.223.372.036.854.775.807"
#: libraries/Types.class.php:707
msgid "A system's default double-precision floating-point number"
-msgstr ""
+msgstr "Ett systems förvalda dubbelprecision flyttal"
#: libraries/Types.class.php:709
msgid "True or false"
-msgstr ""
+msgstr "Sant eller falskt"
#: libraries/Types.class.php:711
msgid "An alias for BIGINT NOT NULL AUTO_INCREMENT UNIQUE"
-msgstr ""
+msgstr "Ett alias för BIGINT NOT NULL AUTO_INCREMENT UNIQUE"
#: libraries/Types.class.php:713
msgid "Stores a Universally Unique Identifier (UUID)"
-msgstr ""
+msgstr "Lagrar en universiellt unik identifierare (UUID)"
#: libraries/Types.class.php:719
msgid ""
"A timestamp, range is '0001-01-01 00:00:00' UTC to '9999-12-31 23:59:59' "
"UTC; TIMESTAMP(6) can store microseconds"
msgstr ""
+"En tidsstämpel området är 0001-01-01 00:00:00 'UTC till '9999-12-31 "
+"23:59:59' UTC, TIMESTAMP(6) kan lagra mikrosekunder"
#: libraries/Types.class.php:727
msgid ""
"A variable-length (0-65,535) string, uses binary collation for all "
"comparisons"
msgstr ""
+"En variabel längd (0-65,535) sträng, använder binär kollationering för alla "
+"jämförelser"
#: libraries/Types.class.php:729
msgid ""
"A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with "
"a four-byte prefix indicating the length of the value"
msgstr ""
+"En BLOB kolumn med en maximal längd av 65.535 (2^16-1) bytes, lagrat med en "
+"fyra-bytes prefix som anger längden av värdet"
#: libraries/Types.class.php:731
msgid "An enumeration, chosen from the list of defined values"
-msgstr ""
+msgstr "En uppräkning, vald från listan av definierade värden"
#: libraries/auth/config.auth.lib.php:72
msgid "Cannot connect: invalid settings."
@@ -4594,10 +4629,9 @@ msgid "Minimum number of tables to display the table filter box"
msgstr "Minsta antal tabeller för att visa tabellen filter box"
#: libraries/config/messages.inc.php:281
-#, fuzzy
#| msgid "Minimum number of tables to display the table filter box"
msgid "Minimum number of databases to display the database filter box"
-msgstr "Minsta antal tabeller för att visa tabellen filter box"
+msgstr "Minsta antal databaser för att visa databasens filter box"
#: libraries/config/messages.inc.php:282
msgid "String that separates databases into different tree levels"
@@ -7247,7 +7281,7 @@ msgstr "ESRI Shape-fil"
#: libraries/import/shp.php:199
#, php-format
msgid "Geometry type '%s' is not supported by MySQL."
-msgstr ""
+msgstr "Geometri typ '%s' stöds inte av MySQL."
#: libraries/import/shp.php:360
#, php-format
@@ -8527,7 +8561,7 @@ msgstr "Fulltext"
#: libraries/tbl_properties.inc.php:589
msgid "first"
-msgstr ""
+msgstr "först"
#: libraries/tbl_properties.inc.php:599
#, php-format
@@ -8924,10 +8958,9 @@ msgid "No databases"
msgstr "Inga databaser"
#: navigation.php:209
-#, fuzzy
#| msgid "Filter tables by name"
msgid "Filter databases by name"
-msgstr "Filtrera tabeller efter namn"
+msgstr "Filtrera databaser efter namn"
#: navigation.php:272
msgid "Filter tables by name"
@@ -12028,7 +12061,7 @@ msgstr "Flytta kolumner"
#: tbl_structure.php:622
msgid "Move the columns by dragging them up and down."
-msgstr ""
+msgstr "Flytta kolumner genom att dra dem uppåt och nedåt."
#: tbl_structure.php:648
msgid "Edit view"
diff --git a/test/theme.php b/test/theme.php
index 56e0630779..d6aa6f7851 100644
--- a/test/theme.php
+++ b/test/theme.php
@@ -25,10 +25,10 @@ header('Content-Type: text/html; charset=utf-8');
phpMyAdmin <?php echo PMA_VERSION; ?> -
- <?php echo htmlspecialchars($HTTP_HOST); ?> - Theme Test
+ - Theme Test
+ href="../phpmyadmin.css.php?&nocache=getThemeUniqueValue(); ?>" />
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/common.css.php
similarity index 78%
rename from themes/original/css/theme_right.css.php
rename to themes/original/css/common.css.php
index c47859e710..846025f444 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/common.css.php
@@ -1,14 +1,14 @@
@@ -1659,44 +1659,6 @@ input#input_import_file {
margin: 5px 0 5px 0;
}
-/**
- * GIS data editor styles
- */
-a.close_gis_editor {
- float: right;
-}
-
-#gis_editor {
- display: none;
- position: fixed;
- _position: absolute; /* hack for IE */
- z-index: 1001;
- overflow-y: auto;
- overflow-x: hidden;
-}
-
-#gis_data {
- min-height: 230px;
-}
-
-#gis_data_textarea {
- height: 6em;
-}
-
-#gis_data_editor {
- background: #D0DCE0;
- padding: 15px;
- min-height: 500px;
-}
-
-#gis_data_editor .choice {
- display: none;
-}
-
-#gis_data_editor input[type="text"] {
- width: 75px;
-}
-
#popup_background {
display: none;
position: fixed;
@@ -1710,86 +1672,6 @@ a.close_gis_editor {
overflow: hidden;
}
-/**
- * ENUM/SET editor styles
- */
-p.enum_notice {
- margin: 5px 2px;
- font-size: 80%;
-}
-
-fieldset.enum_editor_no_js {
- width: 40em;
- padding: 1em;
-}
-
-hr.enum_editor_no_js {
- background-color: #aaa;
-}
-
-#enum_editor p {
- font-style:italic;
-}
-
-#enum_editor .values, #enum_editor .add, .enum_editor_no_js #values {
- width: 100%;
-}
-
-#enum_editor .add td {
- vertical-align: middle;
- width: 50%;
- padding: 0 1em;
-}
-
-#enum_editor .values td.drop {
- width: 2em;
- cursor: pointer;
- vertical-align: middle;
-}
-
-#enum_editor .values input {
- margin: 0.1em 0;
- padding-right: 2.5em;
- width: 100%;
-}
-
-#enum_editor .values img {
- width: 2em;
- vertical-align: middle;
-}
-
-#enum_editor input.add_value {
- margin: 1em 0;
-}
-
-#enum_editor_output textarea,
-.enum_editor_no_js input {
- width: 100%;
- float: right;
- margin: 1em 0 0 0;
-}
-
-#enum_editor_no_js {
- width: 100%;
-}
-
-.enum_editor_no_js input.submit {
- margin: 1em 0;
-}
-
-/**
- * ENUM/SET editor integration for the routines editor
- */
-.enum_hint {
- position: relative;
-}
-
-.enum_hint a {
- position: absolute;
- left: 81%;
- bottom: 0.35em;
-}
-
/**
* Create table styles
*/
@@ -2109,34 +1991,6 @@ fieldset .disabled-field td {
margin-bottom: .5em;
}
-.rte_table {
- table-layout: fixed;
-}
-
-.rte_table td {
- vertical-align: middle;
- padding: 0.2em;
-}
-
-.rte_table tr td:nth-child(1) {
- font-weight: bold;
-}
-
-.rte_table input,
-.rte_table select,
-.rte_table textarea {
- width: 100%;
- margin: 0;
- box-sizing: border-box;
- -ms-box-sizing: border-box;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
-}
-
-.rte_table .routine_params_table {
- width: 100%;
-}
-
#placeholder .button {
position: absolute;
cursor: pointer;
@@ -2258,28 +2112,6 @@ fieldset .disabled-field td {
top: 103px;
}
-.gis_table td {
- vertical-align: middle;
-}
-
-.gis_table select {
- min-width: 151px;
-}
-
-.gis_table .save {
- font-weight: bold;
- vertical-align: bottom;
- height: 100px;
-}
-
-.gis_table .button {
- text-align: ;
-}
-
-.gis_table .choice {
- display: none;
-}
-
getCssCodeMirror(true); ?>
.colborder {
@@ -2535,515 +2367,6 @@ fieldset .disabled-field td {
.ui-timepicker-div dl dd { margin: -25px 0 10px 65px; }
.ui-timepicker-div td { font-size: 90%; }
-/* Designer */
-.input_tab {
- background-color: #A6C7E1;
- color: #000;
-}
-
-#canvas {
- background-color: #fff;
- color: #000;
-}
-
-canvas.pmd {
- display: inline-block;
- overflow: hidden;
- text-align: left;
-}
-
-canvas.pmd * {
- behavior: url(#default#VML);
-}
-
-.pmd_tab {
- background-color: #fff;
- color: #000;
- border-collapse: collapse;
- border: 1px solid #aaa;
- z-index: 1;
- -moz-user-select: none;
-}
-
-.tab_zag {
- background-image: url(getImgPath(); ?>pmd/Header.png);
- background-repeat: repeat-x;
- text-align: center;
- cursor: move;
- padding: 1px;
- font-weight: bold;
-}
-
-.tab_zag_2 {
- background-image: url(getImgPath(); ?>pmd/Header_Linked.png);
- background-repeat: repeat-x;
- text-align: center;
- cursor: move;
- padding: 1px;
- font-weight: bold;
-}
-
-.tab_field {
- background: #fff;
- color: #000;
- cursor: default;
-}
-
-.tab_field_2 {
- background-color: #CCFFCC;
- color: #000;
- background-repeat: repeat-x;
- cursor: default;
-}
-
-.tab_field_3 {
- background-color: #FFE6E6; /*#DDEEFF*/
- color: #000;
- cursor: default;
-}
-
-#pmd_hint {
- white-space: nowrap;
- position: absolute;
- background-color: #99FF99;
- color: #000;
- left: 200px;
- top: 50px;
- z-index: 3;
- border: #00CC66 solid 1px;
- display: none;
-}
-
-.scroll_tab {
- overflow: auto;
- width: 100%;
- height: 500px;
-}
-
-.pmd_Tabs {
- cursor: default;
- color: #0055bb;
- white-space: nowrap;
- text-decoration: none;
- text-indent: 3px;
- font-weight: bold;
- margin-left: 2px;
- text-align: left;
- background-color: #fff;
- background-image: url(getImgPath(); ?>pmd/left_panel_butt.png);
- border: #ccc solid 1px;
-}
-
-.pmd_Tabs2 {
- cursor: default;
- color: #0055bb;
- background: #FFEE99;
- text-indent: 3px;
- font-weight: bold;
- white-space: nowrap;
- text-decoration: none;
- border: #9999FF solid 1px;
- text-align: left;
-}
-
-.owner {
- font-weight: normal;
- color: #888;
-}
-
-.option_tab {
- padding-left: 2px;
- padding-right: 2px;
- width: 5px;
-}
-
-.select_all {
- vertical-align: top;
- padding-left: 2px;
- padding-right: 2px;
- cursor: default;
- width: 1px;
- color: #000;
- background-image: url(getImgPath(); ?>pmd/Header.png);
- background-repeat: repeat-x;
-}
-
-.small_tab {
- vertical-align: top;
- background-color: #0064ea;
- color: #fff;
- background-image: url(getImgPath(); ?>pmd/small_tab.png);
- cursor: default;
- text-align: center;
- font-weight: bold;
- padding-left: 2px;
- padding-right: 2px;
- width: 1px;
- text-decoration: none;
-}
-
-.small_tab2 {
- vertical-align: top;
- color: #fff;
- background-color: #FF9966;
- cursor: default;
- padding-left: 2px;
- padding-right: 2px;
- text-align: center;
- font-weight: bold;
- width: 1px;
- text-decoration: none;
-}
-
-.small_tab_pref {
- background-image: url(getImgPath(); ?>pmd/Header.png);
- background-repeat: repeat-x;
- text-align: center;
- width: 1px;
-}
-
-.small_tab_pref2 {
- vertical-align: top;
- color: #fff;
- background-color: #FF9966;
- cursor: default;
- text-align: center;
- font-weight: bold;
- width: 1px;
- text-decoration: none;
-}
-
-.butt {
- border: #4477aa solid 1px;
- font-weight: bold;
- height: 19px;
- width: 70px;
- background-color: #fff;
- color: #000;
- vertical-align: baseline;
-}
-
-.L_butt2_1 {
- padding: 1px;
- text-decoration: none;
- background-color: #fff;
- color: #000;
- vertical-align: middle;
- cursor: default;
-}
-
-.L_butt2_2 {
- padding: 0;
- border: #0099CC solid 1px;
- background: #FFEE99;
- text-decoration: none;
- color: #000;
- cursor: default;
-}
-
-/* ---------------------------------------------------------------------------*/
-.bor {
- width: 10px;
- height: 10px;
-}
-
-.frams1 {
- background: url(getImgPath(); ?>pmd/1.png) no-repeat right bottom;
-}
-
-.frams2 {
- background: url(getImgPath(); ?>pmd/2.png) no-repeat left bottom;
-}
-
-.frams3 {
- background: url(getImgPath(); ?>pmd/3.png) no-repeat left top;
-}
-
-.frams4 {
- background: url(getImgPath(); ?>pmd/4.png) no-repeat right top;
-}
-
-.frams5 {
- background: url(getImgPath(); ?>pmd/5.png) repeat-x center bottom;
-}
-
-.frams6 {
- background: url(getImgPath(); ?>pmd/6.png) repeat-y left;
-}
-
-.frams7 {
- background: url(getImgPath(); ?>pmd/7.png) repeat-x top;
-}
-
-.frams8 {
- background: url(getImgPath(); ?>pmd/8.png) repeat-y right;
-}
-
-#osn_tab {
- background-color: #fff;
- color: #000;
- border: #A9A9A9 solid 1px;
-}
-
-.pmd_header {
- background-color: #EAEEF0;
- color: #000;
- text-align: center;
- font-weight: bold;
- margin: 0;
- padding: 0;
- background-image: url(getImgPath(); ?>pmd/top_panel.png);
- background-position: top;
- background-repeat: repeat-x;
- border-right: #999 solid 1px;
- border-left: #999 solid 1px;
- height: 28px;
-}
-
-.pmd_header a {
- display: block;
- float: left;
- margin: 3px 1px 4px 1px;
- height: 20px;
- border: 1px dotted #fff;
-}
-
-.pmd_header .M_bord {
- display: block;
- float: left;
- margin: 4px;
- height: 20px;
- width: 2px;
-}
-
-.pmd_header a.first {
- margin-right: 1em;
-}
-
-.pmd_header a.last {
- margin-left: 1em;
-}
-
-a.M_butt_Selected_down_IE,
-a.M_butt_Selected_down {
- border: 1px solid #C0C0BB;
- background-color: #99FF99;
- color: #000;
-}
-
-a.M_butt_Selected_down_IE:hover,
-a.M_butt_Selected_down:hover,
-a.M_butt:hover {
- border: 1px solid #0099CC;
- background-color: #FFEE99;
- color: #000;
-}
-
-#layer_menu {
- z-index: 1000;
- position: absolute;
- left: 0;
- background-color: #EAEEF0;
- border: #999 solid 1px;
-}
-
-#layer_upd_relation {
- position: absolute;
- left: 637px;
- top: 224px;
- z-index: 1000;
-}
-
-#layer_new_relation {
- position: absolute;
- left: 636px;
- top: 85px;
- z-index: 1000;
- width: 153px;
-}
-
-#pmd_optionse {
- position: absolute;
- left: 636px;
- top: 85px;
- z-index: 1000;
- width: 153px;
-}
-
-#layer_menu_sizer {
- background-image: url(getImgPath(); ?>pmd/resize.png);
- cursor: nw-resize;
- width: 16px;
- height: 16px;
-}
-
-.panel {
- position: fixed;
- top: 50px;
- right: 0;
- display: none;
- background: #FFF;
- border: 1px solid #F5F5F5;
- width: 350 px;
- height: auto;
- padding: 30px 170px 30px 30px;
- color: #FFF;
- z-index: 99;
-}
-
-a.trigger {
- position: fixed;
- text-decoration: none;
- top: 60px; right: 0;
- color: #fff;
- padding: 10px 40px 10px 15px;
- background: #333 url(getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat;
- border: 1px solid #444;
- display: block;
-}
-
-a.trigger:hover {
- position: fixed;
- text-decoration: none;
- top: 60px; right: 0;
- color: #080808;
- padding: 10px 40px 10px 15px;
- background: #fff696 url(getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat;
- border: 1px solid #999;
- display: block;
-}
-
-a.active.trigger {
- background: #222 url(getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat;
- z-index: 999;
-}
-
-a.active.trigger:hover {
- background: #fff696 url(getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat;
- z-index: 999;
-}
-
-h2.tiger {
- background-repeat: repeat-x;
- padding: 1px;
- font-weight: bold;
- padding: 50 20 50 20px;
- margin: 0 0 5px 0;
- width: 250px;
- float: left;
- color : #333;
- text-align: center;
-}
-
-h2.tiger a {
- background-image: url(getImgPath(); ?>pmd/Header.png);
- text-align: center;
- text-decoration: none;
- color : #333;
- display: block;
-}
-
-h2.tiger a:hover {
- color: #000;
- background-image: url(getImgPath(); ?>pmd/Header_Linked.png);
-}
-
-h2.active {
- background-image: url(getImgPath(); ?>pmd/Header.png);
- background-repeat: repeat-x;
- padding: 1px;
- background-position: left bottom;
-}
-
-.toggle_container {
- margin: 0 0 5px;
- padding: 0;
- border-top: 1px solid #d6d6d6;
- background: #FFF ;
- width: 250px;
- overflow: hidden;
- font-size: 1.2em;
- clear: both;
-}
-
-.toggle_container .block {
- background-color: #DBE4E8;
- padding: 40 15 40 15px; /*--Padding of Container--*/
- border:1px solid #999;
- color: #000;
-}
-
-.history_table {
- text-align: center;
- background-color: #9999CC;
-}
-
-.history_table2 {
- text-align: center;
- background-color: #DBE4E8;
-}
-
-#filter {
- display: none;
- position: absolute;
- top: 0%;
- left: 0%;
- width: 100%;
- height: 100%;
- background-color: #CCA;
- z-index: 10;
- opacity: .5;
- filter: alpha(opacity=50);
-}
-
-#box {
- display: none;
- position: absolute;
- top: 20%;
- left: 30%;
- width: 500px;
- height: 220px;
- padding: 48px;
- margin: 0;
- border: 1px solid #000;
- background-color: #fff;
- z-index: 101;
- overflow: visible;
-}
-
-#boxtitle {
- position: absolute;
- float: center;
- top: 0;
- left: 0;
- width: 593px;
- height: 20px;
- padding: 0;
- padding-top: 4px;
- left-padding: 8px;
- margin: 0;
- border-bottom: 4px solid #3CF;
- background-color: #D0DCE0;
- color: black;
- font-weight: bold;
- padding-left: 2px;
- text-align: left;
-}
-
-#tblfooter {
- background-color: #D3DCE3;
- float: right;
- padding-top: 10px;
- color: black;
- font-weight: normal;
-}
-
-#foreignkeychk {
- align:left;
- position:absolute;
- cursor:pointer;
-}
-
input.btn {
color: #333;
background-color: #D0DCE0;
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/navigation.css.php
similarity index 64%
rename from themes/original/css/theme_left.css.php
rename to themes/original/css/navigation.css.php
index 4a593e2cb1..4d04df07d4 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/navigation.css.php
@@ -1,67 +1,41 @@
+
/******************************************************************************/
-/* general tags */
-html {
- font-size: get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
-}
+/* Navigation */
-input, select, textarea {
- font-size: 1em;
-}
-
-body {
-
- font-family: ;
-
+body#body_leftFrame {
background: ;
color: ;
margin: 0;
- padding: 0.2em 0.2em 0.2em 0.2em;
+ padding: 0.2em;
}
-a img {
- border: 0;
+#body_leftFrame ul {
+ margin: 0;
}
-a:link,
-a:visited,
-a:active {
- text-decoration: none;
- color: #0000FF;
+#body_leftFrame form {
+ margin: 0;
+ padding: 0;
+ display: inline;
}
-ul {
- margin:0;
-}
-
-form {
- margin: 0;
- padding: 0;
- display: inline;
-}
-
-select#select_server,
-select#lightm_db {
- width: 100%;
-}
-
-/* buttons in some browsers (eg. Konqueror) are block elements,
- this breaks design */
-button {
- display: inline;
+#body_leftFrame select#select_server,
+#body_leftFrame select#lightm_db {
+ width: 100%;
}
/******************************************************************************/
@@ -70,74 +44,74 @@ button {
/******************************************************************************/
/* specific elements */
-div#pmalogo {
+#body_leftFrame div#pmalogo {
background-color: ;
padding:.3em;
}
-div#recentTableList {
+#body_leftFrame div#recentTableList {
text-align: center;
margin-bottom: 0.5em;
}
-div#recentTableList select {
+#body_leftFrame div#recentTableList select {
width: 100%;
}
-div#pmalogo,
-div#leftframelinks,
-div#databaseList {
+#body_leftFrame div#pmalogo,
+#body_leftFrame div#leftframelinks,
+#body_leftFrame div#databaseList {
text-align: center;
margin-bottom: 0.5em;
padding-bottom: 0.5em;
}
-ul#databaseList {
+#body_leftFrame ul#databaseList {
margin-bottom: 0.5em;
padding-bottom: 0.5em;
padding-: 1.5em;
font-style: italic;
}
-ul#databaseList a {
+#body_leftFrame ul#databaseList a {
display: block;
font-style: normal;
}
-div#navidbpageselector a,
-ul#databaseList a {
+#body_leftFrame div#navidbpageselector a,
+#body_leftFrame ul#databaseList a {
background: ;
color: ;
}
-ul#databaseList ul {
+#body_leftFrame ul#databaseList ul {
padding-left: 1em;
padding-right: 0;
}
-ul#databaseList a:hover {
+#body_leftFrame ul#databaseList a:hover {
background: ;
color: ;
}
-ul#databaseList li.selected a {
+#body_leftFrame ul#databaseList li.selected a {
background: ;
color: ;
}
-div#leftframelinks .icon {
+#body_leftFrame div#leftframelinks .icon {
padding: 0;
margin: 0;
}
-div#leftframelinks a img.icon {
+#body_leftFrame div#leftframelinks a img.icon {
margin: 2px;
border: 0.1em solid ;
padding: 0;
}
-div#leftframelinks a:hover img {
+#body_leftFrame div#leftframelinks a:hover img {
background-color: ;
color: ;
}
@@ -157,7 +131,7 @@ div#leftframelinks a:hover img {
font-size: 80%;
}
-div#left_tableList ul {
+#body_leftFrame div#left_tableList ul {
list-style-type: none;
list-style-position: outside;
margin: 0;
@@ -166,23 +140,23 @@ div#left_tableList ul {
background: ;
}
-div#left_tableList ul ul {
+#body_leftFrame div#left_tableList ul ul {
font-size: 100%;
}
-div#left_tableList a {
+#body_leftFrame div#left_tableList a {
background: ;
color: ;
text-decoration: none;
}
-div#left_tableList a:hover {
+#body_leftFrame div#left_tableList a:hover {
background: ;
color: ;
text-decoration: underline;
}
-div#left_tableList li {
+#body_leftFrame div#left_tableList li {
margin: 0;
padding: 0;
white-space: nowrap;
@@ -190,50 +164,50 @@ div#left_tableList li {
/* marked items */
-div#left_tableList > ul li.marked > a,
-div#left_tableList > ul li.marked {
+#body_leftFrame div#left_tableList > ul li.marked > a,
+#body_leftFrame div#left_tableList > ul li.marked {
background: ;
color: ;
}
-div#left_tableList > ul li:hover > a,
-div#left_tableList > ul li:hover {
+#body_leftFrame div#left_tableList > ul li:hover > a,
+#body_leftFrame div#left_tableList > ul li:hover {
background: ;
color: ;
}
-div#left_tableList img {
- padding: 0;
- vertical-align: middle;
+#body_leftFrame div#left_tableList img {
+ padding: 0;
+ vertical-align: middle;
}
-div#left_tableList ul ul {
- margin-: 0;
- padding-: 0.1em;
- border-: 0.1em solid ;
- padding-bottom: 0.1em;
- border-bottom: 0.1em solid ;
+#body_leftFrame div#left_tableList ul ul {
+ margin-: 0;
+ padding-: .1em;
+ border-: .1em solid ;
+ padding-bottom: .1em;
+ border-bottom: .1em solid ;
}
/* for the servers list in navi panel */
-#serverinfo .item {
+#body_leftFrame #serverinfo .item {
white-space: nowrap;
color: ;
}
-#serverinfo a:hover {
+#body_leftFrame #serverinfo a:hover {
background: ;
color: ;
}
-#NavFilter {
+#body_leftFrame #NavFilter {
display: none;
}
-#clear_fast_filter,
-#clear_fast_db_filter {
+#body_leftFrame #clear_fast_filter,
+#body_leftFrame #clear_fast_db_filter {
background: white;
color: black;
cursor: pointer;
@@ -243,16 +217,15 @@ div#left_tableList ul ul {
float: right;
}
-#fast_filter,
-#fast_db_filter {
+#body_leftFrame #fast_filter,
+#body_leftFrame #fast_db_filter {
width: 100%;
padding: 2px 0;
margin: 0;
border: 0;
}
-#fast_filter.gray,
-#fast_db_fiter.gray {
+#body_leftFrame #fast_filter.gray,
+#body_leftFrame #fast_db_fiter.gray {
color: gray;
}
-
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/common.css.php
similarity index 80%
rename from themes/pmahomme/css/theme_right.css.php
rename to themes/pmahomme/css/common.css.php
index feb9c2231b..c3454d9a52 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -1,14 +1,14 @@
@@ -2102,44 +2102,6 @@ input#input_import_file {
margin: 5px 0 5px 0;
}
-/**
- * GIS data editor styles
- */
-a.close_gis_editor {
- float: right;
-}
-
-#gis_editor {
- display: none;
- position: fixed;
- _position: absolute; /* hack for IE */
- z-index: 1001;
- overflow-y: auto;
- overflow-x: hidden;
-}
-
-#gis_data {
- min-height: 230px;
-}
-
-#gis_data_textarea {
- height: 6em;
-}
-
-#gis_data_editor {
- background: #D0DCE0;
- padding: 15px;
- min-height: 500px;
-}
-
-#gis_data_editor .choice {
- display: none;
-}
-
-#gis_data_editor input[type="text"] {
- width: 75px;
-}
-
#popup_background {
display: none;
position: fixed;
@@ -2153,89 +2115,6 @@ a.close_gis_editor {
overflow: hidden;
}
-/**
- * ENUM/SET editor styles
- */
-p.enum_notice {
- margin: 5px 2px;
- font-size: 80%;
-}
-
-.enum_editor_no_js fieldset {
- width: 40em;
-}
-
-hr.enum_editor_no_js {
- background-color: #aaa;
-}
-
-#enum_editor p {
- margin-top: 0;
- font-style: italic;
-}
-
-#enum_editor .values,
-#enum_editor .add,
-.enum_editor_no_js #values {
- width: 100%;
-}
-
-#enum_editor .add td {
- vertical-align: middle;
- width: 50%;
- padding: 0 0 0 1em;
-}
-
-#enum_editor .values td.drop {
- width: 1.8em;
- cursor: pointer;
- vertical-align: middle;
-}
-
-#enum_editor .values input {
- margin: .1em 0;
- padding-right: 2em;
- width: 100%;
-}
-
-#enum_editor .values img {
- width: 1.8em;
- vertical-align: middle;
-}
-
-#enum_editor input.add_value {
- margin: 0 .4em 0 0;
-}
-
-#enum_editor_output textarea,
-.enum_editor_no_js input {
- width: 100%;
- float: right;
- margin: 1em 0 0 0;
-}
-
-.enum_editor_no_js {
- width: 40em;
-}
-
-.enum_editor_no_js input.submit {
- float: left;
- margin: 1em 0;
-}
-
-/**
- * ENUM/SET editor integration for the routines editor
- */
-.enum_hint {
- position: relative;
-}
-
-.enum_hint a {
- position: absolute;
- left: 81%;
- bottom: .35em;
-}
-
/**
* Table structure styles
*/
@@ -2580,34 +2459,6 @@ fieldset .disabled-field td {
margin-bottom: .5em;
}
-.rte_table {
- table-layout: fixed;
-}
-
-.rte_table td {
- vertical-align: middle;
- padding: 0.2em;
-}
-
-.rte_table tr td:nth-child(1) {
- font-weight: bold;
-}
-
-.rte_table input,
-.rte_table select,
-.rte_table textarea {
- width: 100%;
- margin: 0;
- box-sizing: border-box;
- -ms-box-sizing: border-box;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
-}
-
-.rte_table .routine_params_table {
- width: 100%;
-}
-
#placeholder .button {
position: absolute;
cursor: pointer;
@@ -2737,30 +2588,6 @@ fieldset .disabled-field td {
top: 103px;
}
-.gis_table td {
- vertical-align: middle;
-}
-
-.gis_table select {
- min-width: 160px;
- margin: 6px;
-}
-
-.gis_table .save {
- color: #111;
- font-weight: bold;
- vertical-align: bottom;
- height: 100px;
-}
-
-.gis_table .button {
- text-align: ;
-}
-
-.gis_table .choice {
- display: none;
-}
-
getCssCodeMirror(true); ?>
.colborder {
@@ -3031,515 +2858,6 @@ fieldset .disabled-field td {
.ui-timepicker-div dl dd { margin: -25px 0 10px 65px; }
.ui-timepicker-div td { font-size: 90%; }
-/* Designer */
-.input_tab {
- background-color: #A6C7E1;
- color: #000;
-}
-
-#canvas {
- background-color: #fff;
- color: #000;
-}
-
-canvas.pmd {
- display: inline-block;
- overflow: hidden;
- text-align: left;
-}
-
-canvas.pmd * {
- behavior: url(#default#VML);
-}
-
-.pmd_tab {
- background-color: #fff;
- color: #000;
- border-collapse: collapse;
- border: 1px solid #aaa;
- z-index: 1;
- -moz-user-select: none;
-}
-
-.tab_zag {
- background-image: url(getImgPath(); ?>pmd/Header.png);
- background-repeat: repeat-x;
- text-align: center;
- cursor: move;
- padding: 1px;
- font-weight: bold;
-}
-
-.tab_zag_2 {
- background-image: url(getImgPath(); ?>pmd/Header_Linked.png);
- background-repeat: repeat-x;
- text-align: center;
- cursor: move;
- padding: 1px;
- font-weight: bold;
-}
-
-.tab_field {
- background: #fff;
- color: #000;
- cursor: default;
-}
-
-.tab_field_2 {
- background-color: #CCFFCC;
- color: #000;
- background-repeat: repeat-x;
- cursor: default;
-}
-
-.tab_field_3 {
- background-color: #FFE6E6; /*#DDEEFF*/
- color: #000;
- cursor: default;
-}
-
-#pmd_hint {
- white-space: nowrap;
- position: absolute;
- background-color: #99FF99;
- color: #000;
- left: 200px;
- top: 50px;
- z-index: 3;
- border: #00CC66 solid 1px;
- display: none;
-}
-
-.scroll_tab {
- overflow: auto;
- width: 100%;
- height: 500px;
-}
-
-.pmd_Tabs {
- cursor: default;
- color: #0055bb;
- white-space: nowrap;
- text-decoration: none;
- text-indent: 3px;
- font-weight: bold;
- margin-left: 2px;
- text-align: left;
- background-color: #fff;
- background-image: url(getImgPath(); ?>pmd/left_panel_butt.png);
- border: #ccc solid 1px;
-}
-
-.pmd_Tabs2 {
- cursor: default;
- color: #0055bb;
- background: #FFEE99;
- text-indent: 3px;
- font-weight: bold;
- white-space: nowrap;
- text-decoration: none;
- border: #9999FF solid 1px;
- text-align: left;
-}
-
-.owner {
- font-weight: normal;
- color: #888;
-}
-
-.option_tab {
- padding-left: 2px;
- padding-right: 2px;
- width: 5px;
-}
-
-.select_all {
- vertical-align: top;
- padding-left: 2px;
- padding-right: 2px;
- cursor: default;
- width: 1px;
- color: #000;
- background-image: url(getImgPath(); ?>pmd/Header.png);
- background-repeat: repeat-x;
-}
-
-.small_tab {
- vertical-align: top;
- background-color: #0064ea;
- color: #fff;
- background-image: url(getImgPath(); ?>pmd/small_tab.png);
- cursor: default;
- text-align: center;
- font-weight: bold;
- padding-left: 2px;
- padding-right: 2px;
- width: 1px;
- text-decoration: none;
-}
-
-.small_tab2 {
- vertical-align: top;
- color: #fff;
- background-color: #FF9966;
- cursor: default;
- padding-left: 2px;
- padding-right: 2px;
- text-align: center;
- font-weight: bold;
- width: 1px;
- text-decoration: none;
-}
-
-.small_tab_pref {
- background-image: url(getImgPath(); ?>pmd/Header.png);
- background-repeat: repeat-x;
- text-align: center;
- width: 1px;
-}
-
-.small_tab_pref2 {
- vertical-align: top;
- color: #fff;
- background-color: #FF9966;
- cursor: default;
- text-align: center;
- font-weight: bold;
- width: 1px;
- text-decoration: none;
-}
-
-.butt {
- border: #4477aa solid 1px;
- font-weight: bold;
- height: 19px;
- width: 70px;
- background-color: #fff;
- color: #000;
- vertical-align: baseline;
-}
-
-.L_butt2_1 {
- padding: 1px;
- text-decoration: none;
- background-color: #fff;
- color: #000;
- vertical-align: middle;
- cursor: default;
-}
-
-.L_butt2_2 {
- padding: 0;
- border: #0099CC solid 1px;
- background: #FFEE99;
- text-decoration: none;
- color: #000;
- cursor: default;
-}
-
-/* ---------------------------------------------------------------------------*/
-.bor {
- width: 10px;
- height: 10px;
-}
-
-.frams1 {
- background: url(getImgPath(); ?>pmd/1.png) no-repeat right bottom;
-}
-
-.frams2 {
- background: url(getImgPath(); ?>pmd/2.png) no-repeat left bottom;
-}
-
-.frams3 {
- background: url(getImgPath(); ?>pmd/3.png) no-repeat left top;
-}
-
-.frams4 {
- background: url(getImgPath(); ?>pmd/4.png) no-repeat right top;
-}
-
-.frams5 {
- background: url(getImgPath(); ?>pmd/5.png) repeat-x center bottom;
-}
-
-.frams6 {
- background: url(getImgPath(); ?>pmd/6.png) repeat-y left;
-}
-
-.frams7 {
- background: url(getImgPath(); ?>pmd/7.png) repeat-x top;
-}
-
-.frams8 {
- background: url(getImgPath(); ?>pmd/8.png) repeat-y right;
-}
-
-#osn_tab {
- background-color: #fff;
- color: #000;
- border: #A9A9A9 solid 1px;
-}
-
-.pmd_header {
- background-color: #EAEEF0;
- color: #000;
- text-align: center;
- font-weight: bold;
- margin: 0;
- padding: 0;
- background-image: url(getImgPath(); ?>pmd/top_panel.png);
- background-position: top;
- background-repeat: repeat-x;
- border-right: #999 solid 1px;
- border-left: #999 solid 1px;
- height: 28px;
-}
-
-.pmd_header a {
- display: block;
- float: left;
- margin: 3px 1px 4px 1px;
- height: 20px;
- border: 1px dotted #fff;
-}
-
-.pmd_header .M_bord {
- display: block;
- float: left;
- margin: 4px;
- height: 20px;
- width: 2px;
-}
-
-.pmd_header a.first {
- margin-right: 1em;
-}
-
-.pmd_header a.last {
- margin-left: 1em;
-}
-
-a.M_butt_Selected_down_IE,
-a.M_butt_Selected_down {
- border: 1px solid #C0C0BB;
- background-color: #99FF99;
- color: #000;
-}
-
-a.M_butt_Selected_down_IE:hover,
-a.M_butt_Selected_down:hover,
-a.M_butt:hover {
- border: 1px solid #0099CC;
- background-color: #FFEE99;
- color: #000;
-}
-
-#layer_menu {
- z-index: 1000;
- position: absolute;
- left: 0;
- background-color: #EAEEF0;
- border: #999 solid 1px;
-}
-
-#layer_upd_relation {
- position: absolute;
- left: 637px;
- top: 224px;
- z-index: 1000;
-}
-
-#layer_new_relation {
- position: absolute;
- left: 636px;
- top: 85px;
- z-index: 1000;
- width: 153px;
-}
-
-#pmd_optionse {
- position: absolute;
- left: 636px;
- top: 85px;
- z-index: 1000;
- width: 153px;
-}
-
-#layer_menu_sizer {
- background-image: url(getImgPath(); ?>pmd/resize.png);
- cursor: nw-resize;
- width: 16px;
- height: 16px;
-}
-
-.panel {
- position: fixed;
- top: 50px;
- right: 0;
- display: none;
- background: #FFF;
- border: 1px solid #F5F5F5;
- width: 350 px;
- height: auto;
- padding: 30px 170px 30px 30px;
- color: #FFF;
- z-index: 99;
-}
-
-a.trigger {
- position: fixed;
- text-decoration: none;
- top: 60px; right: 0;
- color: #fff;
- padding: 10px 40px 10px 15px;
- background: #333 url(getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat;
- border: 1px solid #444;
- display: block;
-}
-
-a.trigger:hover {
- position: fixed;
- text-decoration: none;
- top: 60px; right: 0;
- color: #080808;
- padding: 10px 40px 10px 15px;
- background: #fff696 url(getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat;
- border: 1px solid #999;
- display: block;
-}
-
-a.active.trigger {
- background: #222 url(getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat;
- z-index: 999;
-}
-
-a.active.trigger:hover {
- background: #fff696 url(getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat;
- z-index: 999;
-}
-
-h2.tiger {
- background-repeat: repeat-x;
- padding: 1px;
- font-weight: bold;
- padding: 50 20 50 20px;
- margin: 0 0 5px 0;
- width: 250px;
- float: left;
- color : #333;
- text-align: center;
-}
-
-h2.tiger a {
- background-image: url(getImgPath(); ?>pmd/Header.png);
- text-align: center;
- text-decoration: none;
- color : #333;
- display: block;
-}
-
-h2.tiger a:hover {
- color: #000;
- background-image: url(getImgPath(); ?>pmd/Header_Linked.png);
-}
-
-h2.active {
- background-image: url(getImgPath(); ?>pmd/Header.png);
- background-repeat: repeat-x;
- padding: 1px;
- background-position: left bottom;
-}
-
-.toggle_container {
- margin: 0 0 5px;
- padding: 0;
- border-top: 1px solid #d6d6d6;
- background: #FFF ;
- width: 250px;
- overflow: hidden;
- font-size: 1.2em;
- clear: both;
-}
-
-.toggle_container .block {
- background-color: #DBE4E8;
- padding: 40 15 40 15px; /*--Padding of Container--*/
- border:1px solid #999;
- color: #000;
-}
-
-.history_table {
- text-align: center;
- background-color: #9999CC;
-}
-
-.history_table2 {
- text-align: center;
- background-color: #DBE4E8;
-}
-
-#filter {
- display: none;
- position: absolute;
- top: 0%;
- left: 0%;
- width: 100%;
- height: 100%;
- background-color: #CCA;
- z-index: 10;
- opacity: .5;
- filter: alpha(opacity=50);
-}
-
-#box {
- display: none;
- position: absolute;
- top: 20%;
- left: 30%;
- width: 500px;
- height: 220px;
- padding: 48px;
- margin: 0;
- border: 1px solid #000;
- background-color: #fff;
- z-index: 101;
- overflow: visible;
-}
-
-#boxtitle {
- position: absolute;
- float: center;
- top: 0;
- left: 0;
- width: 593px;
- height: 20px;
- padding: 0;
- padding-top: 4px;
- left-padding: 8px;
- margin: 0;
- border-bottom: 4px solid #3CF;
- background-color: #D0DCE0;
- color: black;
- font-weight: bold;
- padding-left: 2px;
- text-align: left;
-}
-
-#tblfooter {
- background-color: #D3DCE3;
- float: right;
- padding-top: 10px;
- color: black;
- font-weight: normal;
-}
-
-#foreignkeychk {
- align:left;
- position:absolute;
- cursor:pointer;
-}
-
input.btn {
color: #333;
background-color: #D0DCE0;
@@ -3552,3 +2870,4 @@ body .ui-widget {
.ui-dialog fieldset legend a {
color: #235A81;
}
+
diff --git a/themes/pmahomme/css/enum_editor.css.php b/themes/pmahomme/css/enum_editor.css.php
new file mode 100644
index 0000000000..2318ee58d6
--- /dev/null
+++ b/themes/pmahomme/css/enum_editor.css.php
@@ -0,0 +1,78 @@
+
+
+/**
+ * ENUM/SET editor styles
+ */
+p.enum_notice {
+ margin: 5px 2px;
+ font-size: 80%;
+}
+
+#enum_editor p {
+ margin-top: 0;
+ font-style: italic;
+}
+
+#enum_editor .values,
+#enum_editor .add {
+ width: 100%;
+}
+
+#enum_editor .add td {
+ vertical-align: middle;
+ width: 50%;
+ padding: 0 0 0 1em;
+}
+
+#enum_editor .values td.drop {
+ width: 1.8em;
+ cursor: pointer;
+ vertical-align: middle;
+}
+
+#enum_editor .values input {
+ margin: .1em 0;
+ padding-right: 2em;
+ width: 100%;
+}
+
+#enum_editor .values img {
+ width: 1.8em;
+ vertical-align: middle;
+}
+
+#enum_editor input.add_value {
+ margin: 0 .4em 0 0;
+}
+
+#enum_editor_output textarea {
+ width: 100%;
+ float: right;
+ margin: 1em 0 0 0;
+}
+
+/**
+ * ENUM/SET editor integration for the routines editor
+ */
+.enum_hint {
+ position: relative;
+}
+
+.enum_hint a {
+ position: absolute;
+ left: 81%;
+ bottom: .35em;
+}
diff --git a/themes/pmahomme/css/gis.css.php b/themes/pmahomme/css/gis.css.php
new file mode 100644
index 0000000000..b741e91a94
--- /dev/null
+++ b/themes/pmahomme/css/gis.css.php
@@ -0,0 +1,76 @@
+
+
+.gis_table td {
+ vertical-align: middle;
+}
+
+.gis_table select {
+ min-width: 151px;
+ margin: 6px;
+}
+
+.gis_table .save {
+ color: #111;
+ font-weight: bold;
+ vertical-align: bottom;
+ height: 100px;
+}
+
+.gis_table .button {
+ text-align: ;
+}
+
+.gis_table .choice {
+ display: none;
+}
+
+/**
+ * GIS data editor styles
+ */
+a.close_gis_editor {
+ float: ;
+}
+
+#gis_editor {
+ display: none;
+ position: fixed;
+ _position: absolute; /* hack for IE */
+ z-index: 1001;
+ overflow-y: auto;
+ overflow-x: hidden;
+}
+
+#gis_data {
+ min-height: 230px;
+}
+
+#gis_data_textarea {
+ height: 6em;
+}
+
+#gis_data_editor {
+ background: #D0DCE0;
+ padding: 15px;
+ min-height: 500px;
+}
+
+#gis_data_editor .choice {
+ display: none;
+}
+
+#gis_data_editor input[type="text"] {
+ width: 75px;
+}
diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/navigation.css.php
similarity index 65%
rename from themes/pmahomme/css/theme_left.css.php
rename to themes/pmahomme/css/navigation.css.php
index 92f64b0c9a..be681bf8ef 100644
--- a/themes/pmahomme/css/theme_left.css.php
+++ b/themes/pmahomme/css/navigation.css.php
@@ -1,31 +1,22 @@
+
/******************************************************************************/
-/* general tags */
-html {
- font-size: get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
-}
+/* Navigation */
-input, select, textarea {
- font-size: 1em;
-}
-
-body {
-
- font-family: ;
-
+body#body_leftFrame {
background: url(./themes/pmahomme/img/left_nav_bg.png) repeat-y right 0% #f3f3f3;
border-right: 1px solid #aaa;
color: ;
@@ -33,42 +24,25 @@ body {
padding: 0;
}
-a img {
- border: 0;
-}
-
-a:link,
-a:visited,
-a:active {
- text-decoration: none;
- color: #0000FF;
-}
-
-ul {
+#body_leftFrame ul {
margin: 0;
}
-form {
+#body_leftFrame form {
margin: 0;
padding: 0;
display: inline;
}
-select#select_server,
-select#lightm_db {
+#body_leftFrame select#select_server,
+#body_leftFrame select#lightm_db {
width: 100%;
}
-/* buttons in some browsers (eg. Konqueror) are block elements,
- this breaks design */
-button {
- display: inline;
-}
-
/******************************************************************************/
/* classes */
-.navi_dbName {
+#body_leftFrame .navi_dbName {
font-weight: bold;
color: ;
}
@@ -76,38 +50,38 @@ button {
/******************************************************************************/
/* specific elements */
-div#pmalogo {
+#body_leftFrame div#pmalogo {
}
-div#recentTableList {
+#body_leftFrame div#recentTableList {
text-align: center;
margin: 20px 10px 0px 10px;
}
-div#recentTableList select {
+#body_leftFrame div#recentTableList select {
width: 100%;
}
-div#pmalogo,
-div#leftframelinks,
-div#databaseList {
+#body_leftFrame div#pmalogo,
+#body_leftFrame div#leftframelinks,
+#body_leftFrame div#databaseList {
text-align: center;
margin: 5px 10px 0px 10px;
}
-ul#databaseList {
+#body_leftFrame ul#databaseList {
margin: .8em 0px;
padding-bottom: .5em;
padding-: .3em;
font-style: italic;
}
-ul#databaseList span {
+#body_leftFrame ul#databaseList span {
padding: 5px;
}
-ul#databaseList a {
+#body_leftFrame ul#databaseList a {
color: #333;
background: url(./themes/pmahomme/img/database.png) no-repeat 0 5px transparent;
display: block;
@@ -116,51 +90,51 @@ ul#databaseList a {
font-style: normal;
}
-div#navidbpageselector {
+#body_leftFrame div#navidbpageselector {
margin: .1em;
text-align: center;
}
-div#navidbpageselector a,
-div#navidbpageselector select{
+#body_leftFrame div#navidbpageselector a,
+#body_leftFrame div#navidbpageselector select{
color: #333;
margin: .2em;
}
-ul#databaseList ul {
+#body_leftFrame ul#databaseList ul {
margin: 0;
padding: 0;
}
-ul#databaseList li {
+#body_leftFrame ul#databaseList li {
list-style: none;
text-indent: 20px;
margin: 0;
padding: 0;
}
-ul#databaseList a:hover {
+#body_leftFrame ul#databaseList a:hover {
background-color: #e4e4e4;
}
-ul#databaseList li.selected a {
+#body_leftFrame ul#databaseList li.selected a {
background: ;
color: ;
}
-div#leftframelinks .icon {
+#body_leftFrame div#leftframelinks .icon {
padding: 0;
margin: 0;
}
-div#reloadlink a img,
-div#leftframelinks a img.icon {
+#body_leftFrame div#reloadlink a img,
+#body_leftFrame div#leftframelinks a img.icon {
margin: .3em;
margin-top: .7em;
border: 0;
}
-div#leftframelinks a:hover img {
+#body_leftFrame div#leftframelinks a:hover img {
}
@@ -178,40 +152,40 @@ div#leftframelinks a:hover img {
padding: 0;
}
-div#left_tableList {margin:10px 10px 0 10px;}
-div#left_tableList ul {
+#body_leftFrame div#left_tableList {margin:10px 10px 0 10px;}
+#body_leftFrame div#left_tableList ul {
list-style-type: none;
list-style-position: outside;
margin: 0;
padding: 0;
}
-div#left_tableList ul ul {
+#body_leftFrame div#left_tableList ul ul {
font-size: 100%;
}
-div#left_tableList a {
+#body_leftFrame div#left_tableList a {
color: ;
text-decoration: none;
}
-div#left_tableList a:hover {
+#body_leftFrame div#left_tableList a:hover {
background: ;
color: ;
text-decoration: underline;
}
-div#left_tableList li {
+#body_leftFrame div#left_tableList li {
margin: 0;
padding: 2px 0;
white-space: nowrap;
}
-#newtable {
+#body_leftFrame #newtable {
margin-top: 15px !important;
}
-#newtable a {
+#body_leftFrame #newtable a {
display: block;
padding: 1px;
getCssGradient('ffffff', 'cccccc'); ?>
@@ -221,50 +195,42 @@ div#left_tableList li {
border-radius: 20px;
}
-#newtable li:hover {
+#body_leftFrame #newtable li:hover {
background: transparent !important;
}
-#newtable a:hover {
+#body_leftFrame #newtable a:hover {
getCssGradient('cccccc', 'dddddd'); ?>
}
-#newtable li a:hover {
+#body_leftFrame #newtable li a:hover {
text-decoration: none;
}
-select{
- -moz-border-radius: 2px 2px 2px 2px;
- -moz-box-shadow: 0 1px 2px #DDDDDD;
- border: 1px solid #aaa;
- color: #333;
- padding: 3px;
- background: white;
-}
/* marked items */
-div#left_tableList > ul li.marked > a,
-div#left_tableList > ul li.marked {
+#body_leftFrame div#left_tableList > ul li.marked > a,
+#body_leftFrame div#left_tableList > ul li.marked {
background: #e4e4e4;
color: ;
}
-div#left_tableList > ul li:hover > a,
-div#left_tableList > ul li:hover {
+#body_leftFrame div#left_tableList > ul li:hover > a,
+#body_leftFrame div#left_tableList > ul li:hover {
background: #e4e4e4;
color: ;
}
-div#left_tableList img {
+#body_leftFrame div#left_tableList img {
padding: 0;
vertical-align: middle;
}
-div#left_tableList ul ul {
+#body_leftFrame div#left_tableList ul ul {
margin-: 0;
padding-: .1em;
border-: .1em solid ;
@@ -273,27 +239,27 @@ div#left_tableList ul ul {
}
/* for the servers list in navi panel */
-#serverinfo .item {
+#body_leftFrame #serverinfo .item {
white-space: nowrap;
color: ;
}
-#serverinfo a:hover {
+#body_leftFrame #serverinfo a:hover {
background: ;
color: ;
}
-#reloadlink {
+#body_leftFrame #reloadlink {
clear: both;
float: ;
display: block;
padding: 1em;
}
-#NavFilter {
+#body_leftFrame #NavFilter {
display: none;
}
-#clear_fast_filter,
-#clear_fast_db_filter {
+#body_leftFrame #clear_fast_filter,
+#body_leftFrame #clear_fast_db_filter {
background: white;
color: black;
cursor: pointer;
@@ -303,13 +269,13 @@ div#left_tableList ul ul {
right: 3ex;
}
-#fast_filter,
-#fast_db_filter {
+#body_leftFrame #fast_filter,
+#body_leftFrame #fast_db_filter {
width: 85%;
padding: .1em;
}
-#fast_filter.gray,
-#fast_db_filter.gray {
+#body_leftFrame #fast_filter.gray,
+#body_leftFrame #fast_db_filter.gray {
color: gray;
}
diff --git a/themes/pmahomme/css/pmd.css.php b/themes/pmahomme/css/pmd.css.php
new file mode 100644
index 0000000000..df192ffe5e
--- /dev/null
+++ b/themes/pmahomme/css/pmd.css.php
@@ -0,0 +1,523 @@
+
+
+/* Designer */
+.input_tab {
+ background-color: #A6C7E1;
+ color: #000;
+}
+
+#canvas {
+ background-color: #fff;
+ color: #000;
+}
+
+canvas.pmd {
+ display: inline-block;
+ overflow: hidden;
+ text-align: left;
+}
+
+canvas.pmd * {
+ behavior: url(#default#VML);
+}
+
+.pmd_tab {
+ background-color: #fff;
+ color: #000;
+ border-collapse: collapse;
+ border: 1px solid #aaa;
+ z-index: 1;
+ -moz-user-select: none;
+}
+
+.tab_zag {
+ background-image: url(getImgPath(); ?>pmd/Header.png);
+ background-repeat: repeat-x;
+ text-align: center;
+ cursor: move;
+ padding: 1px;
+ font-weight: bold;
+}
+
+.tab_zag_2 {
+ background-image: url(getImgPath(); ?>pmd/Header_Linked.png);
+ background-repeat: repeat-x;
+ text-align: center;
+ cursor: move;
+ padding: 1px;
+ font-weight: bold;
+}
+
+.tab_field {
+ background: #fff;
+ color: #000;
+ cursor: default;
+}
+
+.tab_field_2 {
+ background-color: #CCFFCC;
+ color: #000;
+ background-repeat: repeat-x;
+ cursor: default;
+}
+
+.tab_field_3 {
+ background-color: #FFE6E6; /*#DDEEFF*/
+ color: #000;
+ cursor: default;
+}
+
+#pmd_hint {
+ white-space: nowrap;
+ position: absolute;
+ background-color: #99FF99;
+ color: #000;
+ left: 200px;
+ top: 50px;
+ z-index: 3;
+ border: #00CC66 solid 1px;
+ display: none;
+}
+
+.scroll_tab {
+ overflow: auto;
+ width: 100%;
+ height: 500px;
+}
+
+.pmd_Tabs {
+ cursor: default;
+ color: #0055bb;
+ white-space: nowrap;
+ text-decoration: none;
+ text-indent: 3px;
+ font-weight: bold;
+ margin-left: 2px;
+ text-align: left;
+ background-color: #fff;
+ background-image: url(getImgPath(); ?>pmd/left_panel_butt.png);
+ border: #ccc solid 1px;
+}
+
+.pmd_Tabs2 {
+ cursor: default;
+ color: #0055bb;
+ background: #FFEE99;
+ text-indent: 3px;
+ font-weight: bold;
+ white-space: nowrap;
+ text-decoration: none;
+ border: #9999FF solid 1px;
+ text-align: left;
+}
+
+.owner {
+ font-weight: normal;
+ color: #888;
+}
+
+.option_tab {
+ padding-left: 2px;
+ padding-right: 2px;
+ width: 5px;
+}
+
+.select_all {
+ vertical-align: top;
+ padding-left: 2px;
+ padding-right: 2px;
+ cursor: default;
+ width: 1px;
+ color: #000;
+ background-image: url(getImgPath(); ?>pmd/Header.png);
+ background-repeat: repeat-x;
+}
+
+.small_tab {
+ vertical-align: top;
+ background-color: #0064ea;
+ color: #fff;
+ background-image: url(getImgPath(); ?>pmd/small_tab.png);
+ cursor: default;
+ text-align: center;
+ font-weight: bold;
+ padding-left: 2px;
+ padding-right: 2px;
+ width: 1px;
+ text-decoration: none;
+}
+
+.small_tab2 {
+ vertical-align: top;
+ color: #fff;
+ background-color: #FF9966;
+ cursor: default;
+ padding-left: 2px;
+ padding-right: 2px;
+ text-align: center;
+ font-weight: bold;
+ width: 1px;
+ text-decoration: none;
+}
+
+.small_tab_pref {
+ background-image: url(getImgPath(); ?>pmd/Header.png);
+ background-repeat: repeat-x;
+ text-align: center;
+ width: 1px;
+}
+
+.small_tab_pref2 {
+ vertical-align: top;
+ color: #fff;
+ background-color: #FF9966;
+ cursor: default;
+ text-align: center;
+ font-weight: bold;
+ width: 1px;
+ text-decoration: none;
+}
+
+.butt {
+ border: #4477aa solid 1px;
+ font-weight: bold;
+ height: 19px;
+ width: 70px;
+ background-color: #fff;
+ color: #000;
+ vertical-align: baseline;
+}
+
+.L_butt2_1 {
+ padding: 1px;
+ text-decoration: none;
+ background-color: #fff;
+ color: #000;
+ vertical-align: middle;
+ cursor: default;
+}
+
+.L_butt2_2 {
+ padding: 0;
+ border: #0099CC solid 1px;
+ background: #FFEE99;
+ text-decoration: none;
+ color: #000;
+ cursor: default;
+}
+
+/* ---------------------------------------------------------------------------*/
+.bor {
+ width: 10px;
+ height: 10px;
+}
+
+.frams1 {
+ background: url(getImgPath(); ?>pmd/1.png) no-repeat right bottom;
+}
+
+.frams2 {
+ background: url(getImgPath(); ?>pmd/2.png) no-repeat left bottom;
+}
+
+.frams3 {
+ background: url(getImgPath(); ?>pmd/3.png) no-repeat left top;
+}
+
+.frams4 {
+ background: url(getImgPath(); ?>pmd/4.png) no-repeat right top;
+}
+
+.frams5 {
+ background: url(getImgPath(); ?>pmd/5.png) repeat-x center bottom;
+}
+
+.frams6 {
+ background: url(getImgPath(); ?>pmd/6.png) repeat-y left;
+}
+
+.frams7 {
+ background: url(getImgPath(); ?>pmd/7.png) repeat-x top;
+}
+
+.frams8 {
+ background: url(getImgPath(); ?>pmd/8.png) repeat-y right;
+}
+
+#osn_tab {
+ background-color: #fff;
+ color: #000;
+ border: #A9A9A9 solid 1px;
+}
+
+.pmd_header {
+ background-color: #EAEEF0;
+ color: #000;
+ text-align: center;
+ font-weight: bold;
+ margin: 0;
+ padding: 0;
+ background-image: url(getImgPath(); ?>pmd/top_panel.png);
+ background-position: top;
+ background-repeat: repeat-x;
+ border-right: #999 solid 1px;
+ border-left: #999 solid 1px;
+ height: 28px;
+}
+
+.pmd_header a {
+ display: block;
+ float: left;
+ margin: 3px 1px 4px 1px;
+ height: 20px;
+ border: 1px dotted #fff;
+}
+
+.pmd_header .M_bord {
+ display: block;
+ float: left;
+ margin: 4px;
+ height: 20px;
+ width: 2px;
+}
+
+.pmd_header a.first {
+ margin-right: 1em;
+}
+
+.pmd_header a.last {
+ margin-left: 1em;
+}
+
+a.M_butt_Selected_down_IE,
+a.M_butt_Selected_down {
+ border: 1px solid #C0C0BB;
+ background-color: #99FF99;
+ color: #000;
+}
+
+a.M_butt_Selected_down_IE:hover,
+a.M_butt_Selected_down:hover,
+a.M_butt:hover {
+ border: 1px solid #0099CC;
+ background-color: #FFEE99;
+ color: #000;
+}
+
+#layer_menu {
+ z-index: 1000;
+ position: absolute;
+ left: 0;
+ background-color: #EAEEF0;
+ border: #999 solid 1px;
+}
+
+#layer_upd_relation {
+ position: absolute;
+ left: 637px;
+ top: 224px;
+ z-index: 1000;
+}
+
+#layer_new_relation {
+ position: absolute;
+ left: 636px;
+ top: 85px;
+ z-index: 1000;
+ width: 153px;
+}
+
+#pmd_optionse {
+ position: absolute;
+ left: 636px;
+ top: 85px;
+ z-index: 1000;
+ width: 153px;
+}
+
+#layer_menu_sizer {
+ background-image: url(getImgPath(); ?>pmd/resize.png);
+ cursor: nw-resize;
+ width: 16px;
+ height: 16px;
+}
+
+.panel {
+ position: fixed;
+ top: 50px;
+ right: 0;
+ display: none;
+ background: #FFF;
+ border: 1px solid #F5F5F5;
+ width: 350 px;
+ height: auto;
+ padding: 30px 170px 30px 30px;
+ color: #FFF;
+ z-index: 99;
+}
+
+a.trigger {
+ position: fixed;
+ text-decoration: none;
+ top: 60px; right: 0;
+ color: #fff;
+ padding: 10px 40px 10px 15px;
+ background: #333 url(getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat;
+ border: 1px solid #444;
+ display: block;
+}
+
+a.trigger:hover {
+ position: fixed;
+ text-decoration: none;
+ top: 60px; right: 0;
+ color: #080808;
+ padding: 10px 40px 10px 15px;
+ background: #fff696 url(getImgPath(); ?>pmd/plus.png) 85% 55% no-repeat;
+ border: 1px solid #999;
+ display: block;
+}
+
+a.active.trigger {
+ background: #222 url(getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat;
+ z-index: 999;
+}
+
+a.active.trigger:hover {
+ background: #fff696 url(getImgPath(); ?>pmd/minus.png) 85% 55% no-repeat;
+ z-index: 999;
+}
+
+h2.tiger {
+ background-repeat: repeat-x;
+ padding: 1px;
+ font-weight: bold;
+ padding: 50 20 50 20px;
+ margin: 0 0 5px 0;
+ width: 250px;
+ float: left;
+ color : #333;
+ text-align: center;
+}
+
+h2.tiger a {
+ background-image: url(getImgPath(); ?>pmd/Header.png);
+ text-align: center;
+ text-decoration: none;
+ color : #333;
+ display: block;
+}
+
+h2.tiger a:hover {
+ color: #000;
+ background-image: url(getImgPath(); ?>pmd/Header_Linked.png);
+}
+
+h2.active {
+ background-image: url(getImgPath(); ?>pmd/Header.png);
+ background-repeat: repeat-x;
+ padding: 1px;
+ background-position: left bottom;
+}
+
+.toggle_container {
+ margin: 0 0 5px;
+ padding: 0;
+ border-top: 1px solid #d6d6d6;
+ background: #FFF ;
+ width: 250px;
+ overflow: hidden;
+ font-size: 1.2em;
+ clear: both;
+}
+
+.toggle_container .block {
+ background-color: #DBE4E8;
+ padding: 40 15 40 15px; /*--Padding of Container--*/
+ border:1px solid #999;
+ color: #000;
+}
+
+.history_table {
+ text-align: center;
+ background-color: #9999CC;
+}
+
+.history_table2 {
+ text-align: center;
+ background-color: #DBE4E8;
+}
+
+#filter {
+ display: none;
+ position: absolute;
+ top: 0%;
+ left: 0%;
+ width: 100%;
+ height: 100%;
+ background-color: #CCA;
+ z-index: 10;
+ opacity: .5;
+ filter: alpha(opacity=50);
+}
+
+#box {
+ display: none;
+ position: absolute;
+ top: 20%;
+ left: 30%;
+ width: 500px;
+ height: 220px;
+ padding: 48px;
+ margin: 0;
+ border: 1px solid #000;
+ background-color: #fff;
+ z-index: 101;
+ overflow: visible;
+}
+
+#boxtitle {
+ position: absolute;
+ float: center;
+ top: 0;
+ left: 0;
+ width: 593px;
+ height: 20px;
+ padding: 0;
+ padding-top: 4px;
+ left-padding: 8px;
+ margin: 0;
+ border-bottom: 4px solid #3CF;
+ background-color: #D0DCE0;
+ color: black;
+ font-weight: bold;
+ padding-left: 2px;
+ text-align: left;
+}
+
+#tblfooter {
+ background-color: #D3DCE3;
+ float: right;
+ padding-top: 10px;
+ color: black;
+ font-weight: normal;
+}
+
+#foreignkeychk {
+ align:left;
+ position:absolute;
+ cursor:pointer;
+}
diff --git a/themes/pmahomme/css/rte.css.php b/themes/pmahomme/css/rte.css.php
new file mode 100644
index 0000000000..0db21a805c
--- /dev/null
+++ b/themes/pmahomme/css/rte.css.php
@@ -0,0 +1,43 @@
+
+
+.rte_table {
+ table-layout: fixed;
+}
+
+.rte_table td {
+ vertical-align: middle;
+ padding: 0.2em;
+}
+
+.rte_table tr td:nth-child(1) {
+ font-weight: bold;
+}
+
+.rte_table input,
+.rte_table select,
+.rte_table textarea {
+ width: 100%;
+ margin: 0;
+ box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+}
+
+.rte_table .routine_params_table {
+ width: 100%;
+}
diff --git a/themes/sprites.css.php b/themes/sprites.css.php
index 0657c3349c..e51e1a557a 100644
--- a/themes/sprites.css.php
+++ b/themes/sprites.css.php
@@ -7,11 +7,14 @@
*/
// unplanned execution path
-if (!defined('PMA_MINIMUM_COMMON')) {
+if (! defined('PMA_MINIMUM_COMMON')) {
exit();
}
$bg = $_SESSION['PMA_Theme']->getImgPath() . 'sprites.png';
+/* Check if there is a valid data file for sprites */
+if (is_readable($_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php')) {
+
?>
/* Icon sprites */
.icon, .footnotemarker {
@@ -23,59 +26,57 @@ $bg = $_SESSION['PMA_Theme']->getImgPath() . 'sprites.png';
background-repeat: no-repeat !important;
background-position: top left !important;
}
-
getPath() . '/sprites.lib.php')) {
- include_once $_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php';
- $sprites = array();
- if (function_exists('PMA_sprites')) {
- $sprites = PMA_sprites();
+
+ include_once $_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php';
+ $sprites = array();
+ if (function_exists('PMA_sprites')) {
+ $sprites = PMA_sprites();
+ }
+ $template = ".ic_%s { background-position: 0 -%upx !important;%s%s }\n";
+ foreach ($sprites as $name => $data) {
+ // generate the CSS code for each icon
+ $width = '';
+ $height = '';
+ // if either the height or width of an icon is 16px,
+ // then it's pointless to set this as a parameter,
+ //since it will be inherited from the "icon" class
+ if ($data['width'] != 16) {
+ $width = " width: " . $data['width'] . "px;";
}
- $template = ".ic_%s { background-position: 0 -%upx !important;%s%s }\n";
- foreach ($sprites as $name => $data) {
- // generate the CSS code for each icon
- $width = '';
- $height = '';
- // if either the height or width of an icon is 16px,
- // then it's pointless to set this as a parameter,
- //since it will be inherited from the "icon" class
- if ($data['width'] != 16) {
- $width = " width: " . $data['width'] . "px;";
- }
- if ($data['height'] != 16) {
- $height = " height: " . $data['height'] . "px;";
- }
+ if ($data['height'] != 16) {
+ $height = " height: " . $data['height'] . "px;";
+ }
+ printf(
+ $template,
+ $name,
+ ($data['position'] * 16),
+ $width,
+ $height
+ );
+ }
+ // Here we map some of the classes that we
+ // defined above to other CSS selectors.
+ // The indexes of the array correspond to
+ // already defined classes and the values
+ // are the selectors that we want to map to.
+ $elements = array(
+ 's_sortable' => 'img.sortableIcon',
+ 's_asc' => 'th.headerSortUp img.sortableIcon',
+ 's_desc' => 'th.headerSortDown img.sortableIcon'
+ );
+ $template = "%s { background-position: 0 -%upx; "
+ . "height: %upx; width: %upx; }\n";
+ foreach ($elements as $key => $value) {
+ if (isset($sprites[$key])) { // If the CSS class has been defined
printf(
$template,
- $name,
- ($data['position'] * 16),
- $width,
- $height
+ $value,
+ ($sprites[$key]['position'] * 16),
+ $sprites[$key]['height'],
+ $sprites[$key]['width']
);
}
- // Here we map some of the classes that we
- // defined above to other CSS selectors.
- // The indexes of the array correspond to
- // already defined classes and the values
- // are the selectors that we want to map to.
- $elements = array(
- 's_sortable' => 'img.sortableIcon',
- 's_asc' => 'th.headerSortUp img.sortableIcon',
- 's_desc' => 'th.headerSortDown img.sortableIcon'
- );
- $template = "%s { background-position: 0 -%upx; "
- . "height: %upx; width: %upx; }\n";
- foreach ($elements as $key => $value) {
- if (isset($sprites[$key])) { // If the CSS class has been defined
- printf(
- $template,
- $value,
- ($sprites[$key]['position'] * 16),
- $sprites[$key]['height'],
- $sprites[$key]['width']
- );
- }
- }
}
+}
?>