[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14976-g95308f4
by Michal Čihař 15 Aug '11
by Michal Čihař 15 Aug '11
15 Aug '11
The branch, master has been updated
via 95308f4205be95e9bebf9dfd77061098f2d4f870 (commit)
from 6d62ee60aa324bd8aea539d0f99cb80b99446f52 (commit)
- Log -----------------------------------------------------------------
commit 95308f4205be95e9bebf9dfd77061098f2d4f870
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon Aug 15 09:35:59 2011 +0200
Remove forgotten line
-----------------------------------------------------------------------
Summary of changes:
libraries/advisor.class.php | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/libraries/advisor.class.php b/libraries/advisor.class.php
index 79e37a8..2b411b0 100644
--- a/libraries/advisor.class.php
+++ b/libraries/advisor.class.php
@@ -97,7 +97,6 @@ class Advisor
if (is_null($param)) {
return sprintf(_gettext(Advisor::escapePercent($str)));
} else {
- $value = $this->ruleExprEvaluate($param);
$printf = 'sprintf("' . _gettext(Advisor::escapePercent($str)) . '",';
return $this->ruleExprEvaluate(
$printf . $param . ')',
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14975-g6d62ee6
by Michal Čihař 15 Aug '11
by Michal Čihař 15 Aug '11
15 Aug '11
The branch, master has been updated
via 6d62ee60aa324bd8aea539d0f99cb80b99446f52 (commit)
from 18698ad6ada502eca7d48bbd4c59e98c7c7e4a1b (commit)
- Log -----------------------------------------------------------------
commit 6d62ee60aa324bd8aea539d0f99cb80b99446f52
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon Aug 15 09:32:06 2011 +0200
This needs an instance
-----------------------------------------------------------------------
Summary of changes:
libraries/advisor.class.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libraries/advisor.class.php b/libraries/advisor.class.php
index 544aa84..79e37a8 100644
--- a/libraries/advisor.class.php
+++ b/libraries/advisor.class.php
@@ -129,7 +129,7 @@ class Advisor
if (count($jst) > 1) {
try {
/* Translate */
- $str = Advisor::translate($jst[0], $jst[1]);
+ $str = $this->translate($jst[0], $jst[1]);
} catch (Exception $e) {
$this->runResult['errors'][] = 'Failed formattingstring for rule \''.$rule['name'].'\'. PHP threw following error: '.$e->getMessage();
return;
@@ -137,15 +137,15 @@ class Advisor
$rule['justification'] = $str;
} else {
- $rule['justification'] = Advisor::translate($rule['justification']);
+ $rule['justification'] = $this->translate($rule['justification']);
}
- $rule['name'] = Advisor::translate($rule['name']);
- $rule['issue'] = Advisor::translate($rule['issue']);
+ $rule['name'] = $this->translate($rule['name']);
+ $rule['issue'] = $this->translate($rule['issue']);
$rule['recommendation'] = preg_replace(
'/\{([a-z_0-9]+)\}/Ui',
'<a href="server_variables.php' . PMA_generate_common_url() . '#filter=\1">\1</a>',
- Advisor::translate($rule['recommendation']));
+ $this->translate($rule['recommendation']));
break;
}
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14974-g18698ad
by Michal Čihař 15 Aug '11
by Michal Čihař 15 Aug '11
15 Aug '11
The branch, master has been updated
via 18698ad6ada502eca7d48bbd4c59e98c7c7e4a1b (commit)
from ee2578764ab8106ad519daa70077418f9749676f (commit)
- Log -----------------------------------------------------------------
commit 18698ad6ada502eca7d48bbd4c59e98c7c7e4a1b
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon Aug 15 09:30:53 2011 +0200
Fix what I broke for multi param formats
-----------------------------------------------------------------------
Summary of changes:
libraries/advisor.class.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/libraries/advisor.class.php b/libraries/advisor.class.php
index f8f6020..544aa84 100644
--- a/libraries/advisor.class.php
+++ b/libraries/advisor.class.php
@@ -98,7 +98,11 @@ class Advisor
return sprintf(_gettext(Advisor::escapePercent($str)));
} else {
$value = $this->ruleExprEvaluate($param);
- return sprintf(_gettext(Advisor::escapePercent($str)), $value);
+ $printf = 'sprintf("' . _gettext(Advisor::escapePercent($str)) . '",';
+ return $this->ruleExprEvaluate(
+ $printf . $param . ')',
+ strlen($printf)
+ );
}
}
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14973-gee25787
by Michal Čihař 15 Aug '11
by Michal Čihař 15 Aug '11
15 Aug '11
The branch, master has been updated
via ee2578764ab8106ad519daa70077418f9749676f (commit)
from 4a4933c294ca719d8c9a825fcc65c5c0f1d5600c (commit)
- Log -----------------------------------------------------------------
commit ee2578764ab8106ad519daa70077418f9749676f
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon Aug 15 09:27:20 2011 +0200
Fix typo
-----------------------------------------------------------------------
Summary of changes:
libraries/advisor.class.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libraries/advisor.class.php b/libraries/advisor.class.php
index 71d3a82..f8f6020 100644
--- a/libraries/advisor.class.php
+++ b/libraries/advisor.class.php
@@ -97,7 +97,7 @@ class Advisor
if (is_null($param)) {
return sprintf(_gettext(Advisor::escapePercent($str)));
} else {
- $value = $this->ruleExprEvaluate($jst[1]);
+ $value = $this->ruleExprEvaluate($param);
return sprintf(_gettext(Advisor::escapePercent($str)), $value);
}
}
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14972-g4a4933c
by Michal Čihař 15 Aug '11
by Michal Čihař 15 Aug '11
15 Aug '11
The branch, master has been updated
via 4a4933c294ca719d8c9a825fcc65c5c0f1d5600c (commit)
via c13898ade1cca07fcf962239b5e402c9517f0af0 (commit)
via e7cc67a5f6b6c7e71b3c79ff501cf04cca443cc9 (commit)
via 9be2507a58d4a32b4daaa55f39bd0cd844f99533 (commit)
from 621d17957310868eaa4f497be5846c550dcd622b (commit)
- Log -----------------------------------------------------------------
commit 4a4933c294ca719d8c9a825fcc65c5c0f1d5600c
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon Aug 15 09:22:03 2011 +0200
Add testscase for advisor escaping
commit c13898ade1cca07fcf962239b5e402c9517f0af0
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon Aug 15 09:19:04 2011 +0200
Escape %
commit e7cc67a5f6b6c7e71b3c79ff501cf04cca443cc9
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon Aug 15 09:18:15 2011 +0200
Always escape % for gettext
Otherwise it is treated like format string.
commit 9be2507a58d4a32b4daaa55f39bd0cd844f99533
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon Aug 15 08:56:02 2011 +0200
Factor out percent escaping
-----------------------------------------------------------------------
Summary of changes:
libraries/advisor.class.php | 37 +++++++++++++++++++++++++++----------
po/ja.po | 4 ++--
scripts/advisor2php | 13 ++++---------
test/classes/Advisor_test.php | 33 +++++++++++++++++++++++++++++++++
4 files changed, 66 insertions(+), 21 deletions(-)
create mode 100644 test/classes/Advisor_test.php
diff --git a/libraries/advisor.class.php b/libraries/advisor.class.php
index 75c8a8d..71d3a82 100644
--- a/libraries/advisor.class.php
+++ b/libraries/advisor.class.php
@@ -82,13 +82,34 @@ class Advisor
}
/**
+ * Escapes percent string to be used in format string.
+ */
+ function escapePercent($str)
+ {
+ return preg_replace('/%( |,|\.|$)/','%%\1', $str);
+ }
+
+ /**
+ * Wrapper function for translating.
+ */
+ function translate($str, $param = null)
+ {
+ if (is_null($param)) {
+ return sprintf(_gettext(Advisor::escapePercent($str)));
+ } else {
+ $value = $this->ruleExprEvaluate($jst[1]);
+ return sprintf(_gettext(Advisor::escapePercent($str)), $value);
+ }
+ }
+
+ /**
* Splits justification to text and formula.
*/
function splitJustification($rule)
{
$jst = preg_split('/\s*\|\s*/', $rule['justification'], 2);
if (count($jst) > 1) {
- $jst[0] = preg_replace('/%( |,|\.|$)/','%%\1',$jst[0]);
+ $jst[0] = Advisor::escapePercent($jst[0]);
return array($jst[0], $jst[1]);
}
return array($rule['justification']);
@@ -104,11 +125,7 @@ class Advisor
if (count($jst) > 1) {
try {
/* Translate */
- $jst[0] = _gettext($jst[0]);
- $str = $this->ruleExprEvaluate(
- 'sprintf("'.$jst[0].'",'.$jst[1].')',
- strlen('sprintf("'.$jst[0].'"')
- );
+ $str = Advisor::translate($jst[0], $jst[1]);
} catch (Exception $e) {
$this->runResult['errors'][] = 'Failed formattingstring for rule \''.$rule['name'].'\'. PHP threw following error: '.$e->getMessage();
return;
@@ -116,15 +133,15 @@ class Advisor
$rule['justification'] = $str;
} else {
- $rule['justification'] = _gettext($rule['justification']);
+ $rule['justification'] = Advisor::translate($rule['justification']);
}
- $rule['name'] = _gettext($rule['name']);
- $rule['issue'] = _gettext($rule['issue']);
+ $rule['name'] = Advisor::translate($rule['name']);
+ $rule['issue'] = Advisor::translate($rule['issue']);
$rule['recommendation'] = preg_replace(
'/\{([a-z_0-9]+)\}/Ui',
'<a href="server_variables.php' . PMA_generate_common_url() . '#filter=\1">\1</a>',
- _gettext($rule['recommendation']));
+ Advisor::translate($rule['recommendation']));
break;
}
diff --git a/po/ja.po b/po/ja.po
index 6699fa8..b78754a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11681,8 +11681,8 @@ msgid "Query Cache usage"
msgstr "クエリキャッシュの使用状況"
#: po/advisory_rules.php:81
-msgid "Less than 80% of the query cache is being utilized."
-msgstr "クエリキャッシュの利用率が 80% 未満です。"
+msgid "Less than 80%% of the query cache is being utilized."
+msgstr "クエリキャッシュの利用率が 80%% 未満です。"
#: po/advisory_rules.php:82
msgid ""
diff --git a/scripts/advisor2php b/scripts/advisor2php
index 28a5817..7bc8567 100644
--- a/scripts/advisor2php
+++ b/scripts/advisor2php
@@ -18,16 +18,11 @@ echo "/* This is automatically generated file from libraries/advisory_rules.txt
foreach($rules['rules'] as $rule) {
echo "\n";
- echo "echo __('" . addslashes($rule['name']) . "');\n";
- echo "echo __('" . addslashes($rule['issue']) . "');\n";
- echo "echo __('" . addslashes($rule['recommendation']) . "');\n";
+ echo "printf(__('" . addslashes(Advisor::escapePercent($rule['name'])) . "'));\n";
+ echo "printf(__('" . addslashes(Advisor::escapePercent($rule['issue'])) . "'));\n";
+ echo "printf(__('" . addslashes(Advisor::escapePercent($rule['recommendation'])) . "'));\n";
$jst = Advisor::splitJustification($rule);
- if (count($jst) > 1) {
- /* printf is used here just to ensure proper type of string */
- echo "printf(__('" . addslashes($jst[0]) . "'), 0);\n";
- } else {
- echo "echo __('" . addslashes($jst[0]) . "');\n";
- }
+ echo "printf(__('" . addslashes(Advisor::escapePercent($jst[0])) . "'));\n";
}
?>
diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php
new file mode 100644
index 0000000..9bcba01
--- /dev/null
+++ b/test/classes/Advisor_test.php
@@ -0,0 +1,33 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for Advisor class
+ *
+ * @package phpMyAdmin-test
+ */
+
+/*
+ * Include to test.
+ */
+require_once 'libraries/advisor.class.php';
+
+class Advisor_test extends PHPUnit_Framework_TestCase
+{
+ /**
+ * @dataProvider escapeStrings
+ */
+ public function testEscape($text, $expected)
+ {
+ $this->assertEquals(Advisor::escapePercent($text), $expected);
+ }
+
+ public function escapeStrings() {
+ return array(
+ array('80%', '80%%'),
+ array('%s%', '%s%%'),
+ array('80% foo', '80%% foo'),
+ array('%s% foo', '%s%% foo'),
+ );
+ }
+}
+?>
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14968-g621d179
by Michal Čihař 15 Aug '11
by Michal Čihař 15 Aug '11
15 Aug '11
The branch, master has been updated
via 621d17957310868eaa4f497be5846c550dcd622b (commit)
via bef6d0be80b5e24d0824301cceee8bd0667baedd (commit)
via 709317f0799711aa3c2896e6f9968aac3e38279f (commit)
via 05aa2b0e6951d012ac18a9630cffb58eb0f31807 (commit)
via 566ab9ba528be5fee6f094b0af4a9d4da0c3c376 (commit)
via 8f8a5e613917944bcfce630fd6643a026c9ec40d (commit)
via a77df73a85bce6c25d80ac4793e1d184f6086371 (commit)
via 2a6137229fa9ed4d78475f108edbeef3c9bb5d2e (commit)
via 2cf4a679fcab333f47451917db9f10945a603358 (commit)
via 99c6c3bcf20528cb138840efa83a21d94a597fdf (commit)
via e1ae20f77414084cefa4f1115bd91d95405c5133 (commit)
via b5dde63bd58f031e878ad62b32a9c4f4aefe3bd2 (commit)
via 298ac7a108809ef7d3545b31ba88419a864b0c52 (commit)
via c1c49afe15266c5111b17baab7353231b063e7bd (commit)
via 02ef6c9ee0afc878088112537ea011bcab898d44 (commit)
via 33ba09e1a40583a0c62a6d0ef42a133b6b9da7cc (commit)
via e17b21b1dc473cf4674611275177875e38416ca4 (commit)
via 5c5875b4dc2b460b35308d10137e4b4ee6d1bc2d (commit)
via 63abb1fd8db866e7106a8699642c46f9c8f904cd (commit)
via 9584da6bb2850968e5262cafa7c10d9a6eb27c0b (commit)
via c5249e9a7133b63539dae27c0bcddcd5d581121f (commit)
via c52e5072ba3aa779105e4e2e13bcd43ca8ef646f (commit)
via ef3177b2c4e33608d3ee3b43881c4a51b87362b8 (commit)
via fd7b4f7f15247d8c23cc9a353982bd12e6645a8e (commit)
via 3c401bfd52b0c089e525385fd4aa44c588a3d669 (commit)
via cb8fcdbd3d3ca37dff1b09e49cdd8dd8f6acce6d (commit)
via 93928ac3640e15daef24bc5beb3848ad284bdfb9 (commit)
via 8ebf0e32cca4d33552f36793dde546984f1b1d4a (commit)
via f15df7859e9715956004f115d38c75aef24d5fea (commit)
via b8f985873af74a2ad70681e9753ea5a5c510c179 (commit)
via d951839abcc5d3e3d354f6eee28d79ca2e55faeb (commit)
via bd65eff40b178cf759b77d59d900f948cecf4935 (commit)
via 910024442f11aa309c48a18434f83ce7f0d8d386 (commit)
via 46bf9931af94a7581cd4a1931acc88b1cde004d2 (commit)
via a6240c50e173d3c1987fcb9a95874a531feb2a2d (commit)
via 5a37b237544f4a46081c858c7cc974885a26a982 (commit)
via de7e169ff548f2f269eae107be6b7e73e9e77555 (commit)
via c83008770153346df9c9233300d7840f4dd38621 (commit)
via 1932935c8bef04adf011199c4a47da8042245cd1 (commit)
via 1885d1bb052b1ae11b6b0353d60ae70e64ecc9a4 (commit)
via 606598a0a297a054c2940af7bedf7d31b6a0b788 (commit)
via 0acf443a41df06cb3d4e8ce41d466b1db5a0433e (commit)
via 73c688a50b2992dfcaaaf859d352523b858a21c2 (commit)
via fe3fa66ffd2a3e7b1f2ebcaf525f1d77f545a78f (commit)
via 783e14e1544928f09423c4a3bdc08f4e2e68298b (commit)
via fc2b61cd57d2d0c6ad6589ac36908679fc6b02b6 (commit)
via b4adcd3ec4283c431982ed5514e1c521707baef4 (commit)
via 052d618be8dd8d2cbf5473e6a32dca3e6ebf7c10 (commit)
via 615676142aa074f2c78e35e052f1a836cf82fcbd (commit)
via dfce12d76ef8db00a87cca58a6f0cd171384156c (commit)
via adebeccf2a287883439082408365a44e00a1d68e (commit)
via 9416dc737b1222fe17ca3c0940be05d95dd766d5 (commit)
via a16f8d4129f3978e577af62f0c7189c633cb2162 (commit)
via d3be33e40792dd2589340f7f5e886b57cee4aac2 (commit)
via c298da473bf23bead6687901ff3e59afe7e2670f (commit)
via 44f906e7e144d749231c5ce2f7c8f18a549c20b9 (commit)
via e6bf04d421a95ef1eb3794854c8476685d472792 (commit)
via 5dd7c4e3cc9b354a041cdbd84f3b67a75cc34181 (commit)
via 40767505d6acb5dcb2da3435359bdfe56faeb929 (commit)
via e18a8cd7454503d614c9aac9f4fcbe17ef784e19 (commit)
via 81e8a52b5321dac2aadee0d73ddecaec6fe0695d (commit)
via b8217b7b1e15d23dd5901d06ed973eba381a00e3 (commit)
via 6a8ead4cff779f89d345a8869ea9528a96743bc9 (commit)
via 50b647f4d851e3663dd11b202516b004736e9088 (commit)
via 88183d5fe89ebc21d34482e39cce777758d191f6 (commit)
via fb3496128aafc6b49e6d5b00342d26d63260dfe1 (commit)
via 0196452a215ee25d2be9cf7e241cb731f7ffac7d (commit)
via 95c130c147b5d755147f96df2555281d9e372db4 (commit)
via 6611bcf8b82a6811c5cf29a4cece2b11d9d41750 (commit)
via 5ee5e0e83f6be7b742f0f935aa017f9852c30c6b (commit)
via 20e5dc105b7eb7040e8815578bcc19e72f2a4863 (commit)
via 0e8da7188bc5c155ae58f49c005fbc470b518a5f (commit)
via e1b8fa855b684c7cb38805b426f9431c76b50b6a (commit)
via 1e9e3bef4785a6c3fd10b615587840749d680086 (commit)
via 52fda4a0004e53ce27b0d6854dcc3b49c65c68f6 (commit)
via 597c9af64f11dff7815ea64cdcc4b8a1bdb28bbb (commit)
via 7e0958920c45547dda9a6416bb54c13053330d04 (commit)
via 84cb72635c486105feea1f72b9704c13c9c2aeac (commit)
via 2b0ebb701fbfe00ef306587833927648e985b87c (commit)
via f4bd55a754d4f06d6a8c66c7bf43e9c4cdba05c2 (commit)
via a14c88b46cdd6936337f7867cf20b5cebda30c94 (commit)
via f9493dee544f0b469ccd00ff68f3b9e122787c82 (commit)
via 8ace7de74853da306b1647b6455584025b7381e8 (commit)
via db9fcf0a5146b190d7fe14d89101dfd334c0f4b1 (commit)
via 1b8205e7b59916f2d21582c42d7a88b223b3c203 (commit)
via db8fea71927f03f5300ddebfbe3da28a574e9e7c (commit)
via e3f763755958c2e22aa1964b1274aee01442ba7d (commit)
via f04ebb730cc25ad67ad13272f0d2509bb7456012 (commit)
via eed03f9dd7e8af7f589ed8b15a0220463e52cf8a (commit)
via e7e83db0de8869c39d21de5eae502ad4211fe57c (commit)
via 6b696eb99b3f9eb9fd26e7006ff34db0ba5f2923 (commit)
via 81fc102d3a5b02f3232c092212316b70e0489640 (commit)
via c36bc80cccf2f6b9adb8b864d19b103c6955d712 (commit)
via 2694919ac568f9ab27cde8d5fdfa911b6a8ce2df (commit)
via 1917f5f0a37923e385502aaf7aed55510494081d (commit)
via 828b12fa1f2b98efbdc76e51daa5581936019965 (commit)
via 0f66ac508536062cc17f7a153b8f16ee74beef4c (commit)
via 15ad953eb6e053c68dd7a0253b302defcdfa15f4 (commit)
via 64229167cde015880493efbc21324ae182946fe0 (commit)
via b1a6c3d415411c6b7213ffb6f59d192b4a519579 (commit)
via 9994317bf96465ee734c1e25149d923ad4b7357a (commit)
via 3c8b2091cec22da0ad1fd2fbc0c712ae6a869cbc (commit)
via fae4f2cb5538b5530c0045719a6626eef8b92f9c (commit)
via ddfa3a2fe66732c1c53b285bf618a28611f9a17f (commit)
via 5eeb68dcbcb37a75de55b47099a1cec08d9180be (commit)
via a54006caf56ce85220d715cb50d46a063101dda4 (commit)
via d035389142d7fdae74619da503329141ea980245 (commit)
via 29ad340db892f00164f8afc922f7f19aaf70cd7c (commit)
via 8a3a4b54fe355910591761ddce27139371a8011d (commit)
via 72c06f62dee8774c2a76c10c664026b2aa7dcb36 (commit)
via f56ecf4cc6ce7094a1e07817a89965f6c8f08281 (commit)
via ce05bf3ed5344e7c93d36bd281ebe2b9d7a59153 (commit)
via b27a43575d493cf5af34a89776094d189aa71be5 (commit)
via d92866c46462f0d04fe6538d492c9ab73dc87e71 (commit)
via 960bd65dd28a5c2c3c61f95cbfdfa8970abaf32e (commit)
via 80e25914ed45d523b0789e95cd40e6921139a5ae (commit)
via 50597dac43ede1ea6bfb5259ee1369aaaf113f2b (commit)
via a63c73a620573f7d084e68b388b85af3c5ede7c1 (commit)
via 30951035566ebe43c77b1f79741aa27c4c71fa30 (commit)
via 8e0c6c8e8c9d0312b52c5cb5e1996750083ea1c6 (commit)
via 5bf23245c207550a6ced6dbce65767611a6381b0 (commit)
via 28d65480457addefb5bc4f7a3131b2ff63ef3a52 (commit)
via c09fb0a8aead61350d3c398bc3c7a3bf5bd99267 (commit)
via 0a47207392af0dc2fccc1ca16adee0bebb355fea (commit)
via f60f93352eae52c22bbc569557062337fe9b89ce (commit)
via 36254cc211f3f842457b7f68af27e742bebd30b6 (commit)
via 18315fdefb6da0493652524f15f3c938d5d6259c (commit)
via 0664428bfaa02c757013738340bcf35218f26c70 (commit)
via 18db3b9a876dcd33b771e200dbc88d2bbd5608b9 (commit)
via f39124fce18f2411b222f80b90f02220ea85e9c8 (commit)
via f5b2a81f623dec991e5e190741cd33b45d554211 (commit)
via 6d9aa1d85f9f232f647ac9f517d8dd74f42673b8 (commit)
via 90cf7f1342a78c7271f93a7533cf3dd9f191fdd9 (commit)
via 6c773c1d5f6bd31e970fde6bd447fcb7d99812c0 (commit)
via 9a1e6cc7b83ad24ba9e0aa4a0be47871b586f4db (commit)
via 07934d36bf20c3ee1e56b7bfdde7c4ebf8fee241 (commit)
via 97152113f608595c89709686350c40525177e49e (commit)
via ddde8e4336951d0a7ec7d3125923ed35c1737093 (commit)
via 2bcd4d161e39d63410d29a066a18c39e93d56834 (commit)
via c0861134eec6057d85624de365d341dd605684d7 (commit)
via e68a321a4ab86a31d00c4d4a73b5cf72970e2f73 (commit)
via fab2fc2008f893a737e27f8c8582738bf3041fe5 (commit)
via 4a5596bdf85e190436334375f1821c7d84753e2f (commit)
via 31c2717250c5e1f2c20adfe69324918df63cb083 (commit)
via 037ed49a4162353c219356f5d3d2ae5e1fde43e9 (commit)
via 6e946df5a74ce8b8c8c88b32381fefbc4ac52ff1 (commit)
via 57e794b9c097ba26ac815ca1509735bf15dec5b8 (commit)
via 3cb3d31cd59915e5c70128196adc773c67838c20 (commit)
via b65b30bf1e5d0edb35c372f63169c2d94ecb0331 (commit)
via db29640897ffcb53ee75ce17dbff3d9d8430687d (commit)
via d7faf3788b481ef7472a255632d8073c3535dd81 (commit)
via 64d47369db323a3dbffd126bfb845a3fa93281d5 (commit)
via 5e32bd96135d5f414eed57e77cec618a4ff414e9 (commit)
via dbd082a8674da9889e26f2e80cff92a2f466bfa8 (commit)
via 6b1c4e608f2ec4e56ae41c74cdf8c010da40bfcf (commit)
via 5307aae67f85d0d20a9ed7d8556345efe7db394c (commit)
via 3a6e929b86a5b0ebbf33ffe4e726113ecafcf003 (commit)
via 082215f85e3ce15c7c1e1700d9dfc8bb8aaa83f9 (commit)
via 69fee4894cd2e1c9b9af1a86bf8fc9203d255074 (commit)
via a5ee5db3c7a6ec055d852a3e6e59a83cc59ed704 (commit)
via b2503a52645db61fa192560be29bce11b6d86701 (commit)
via d657eb63257e6e3b2285614b6d35e1b10df87c3b (commit)
via af72610fb74c186dc113bb5cb2e09d0909281e22 (commit)
via 98eeaead1daaa404881f83938a1736fdd7395bd7 (commit)
via 6a01d3191ed4f0be70bbde9593072f5702f0a186 (commit)
via dd60d8f73a2bff4c36a51ddea9ef9e5e25ab4be7 (commit)
via 21174e98d4abd56361d1d48fd5b4d974d4c2b8bd (commit)
via 6ae786365326d6d911181e5e72a9f3949360cb33 (commit)
via 51c16c4e75830fd8926a706d27bbbbb5b9cdd3fe (commit)
via b15d7e97a05d193915e04bbb91cf8ae080b70563 (commit)
via 58be148195f29ce5cae21e8e50005a00af1f5352 (commit)
via cc618377d5d2d24059fe2f0cf9956417d5c8a270 (commit)
via 03d9919499c354174fec020aaf9abf69c8fa54e9 (commit)
via e46db718139a004bfa7f9015274bb053efc50234 (commit)
via 3c47ad7f58998b9653a02c87a4b7ad79a5eacbb5 (commit)
via 7e901907e35a26a10ddb238d735260cd8ebfce75 (commit)
via a2387a39b11c4cfbbf75f05f2adb5b4ac7cc01e3 (commit)
via 5e693142e8a8dff5bba8323c9c9202d839b1c17e (commit)
via 4de1a0af7874f049e82ba6462480217f3587bcdf (commit)
via cf98293f099c4fcb6c98963bce983ebef6094a84 (commit)
via 5e5616cc49236e34522ec336a676bcd2e4ffdcbf (commit)
via 5fe51865ae565e722264f5abe16ec61b70aa4ca5 (commit)
via c378b0ab11ee3e88fa359cb613bcf035c117953d (commit)
via c01bbf95a827b523934233d355118446de7953d6 (commit)
via d7e96656bc13a54ded7f50e70604415198114e07 (commit)
via 4cf2ea23586dad01a546b8642e737fd14afb4b94 (commit)
via 755f6f9f36abc5edca5cafd1a7a39d3e14a0643d (commit)
via 3c7295aa4cb4e1e161a4595f2e35f12a90170a92 (commit)
via 9ed1570392caef07edc6e2ffb6933581ef6b29a6 (commit)
via 458a5fe1f31bf347b9ea8fd20801bb0322a9ece2 (commit)
via a14dc8fc3f1cc59825986752f84879c23fc3ea8c (commit)
via bb6cdbc8c9bd1bf1587f2d984eeb4ad8400a4b60 (commit)
via 8fe39bc6ed4dac28f9fb53a3519c45f89a5a3e1a (commit)
via e53fd64c340ad69ce7d05ccca1d2d6450b9bdac2 (commit)
via fb3ebb626d564eecb475a031b95095ec1935e2c8 (commit)
via e7a7c23efd52dc78728ce6b82dd0709acd4f5ad2 (commit)
via 1c98e19926a22014a6bd0a678a9ac2f182f91e40 (commit)
via e76a85084b0def6edd3930717689d15300bb6d7e (commit)
via a0ef01c01f689490e4046e897d61713cd12c0cf7 (commit)
via 5b6a9f84c1d3b75ed5321b6161407f56c899cd17 (commit)
via 01cb815aec4266e41d5277dff3a09c9475365ae4 (commit)
via 6abe160ba961e2d76c6d15951a353fbcbf3feba8 (commit)
via c43bced6c0698818d6bdad292ef9409b49a626c7 (commit)
via 6c9c1d51dff02da6a39f48858b6695aa8b64fec3 (commit)
via b719443551b9020f3f0803bd2f5220e3d6c61961 (commit)
via 0f786f00c6398b1e53135b8e91614f9710e30f2d (commit)
via c0f9c1f368dfde8115bcb9ac47201c00bb8f9e51 (commit)
via 076c621149612f68f4cbbeac01de73136c9de63a (commit)
via ce0237bb473e63660bb78f11a3c43d3b0fd4244a (commit)
via 192bcef4563f93e3b74844a665472f00c370fe24 (commit)
via 1b01a42d0ef03ccac6e4aa4c1aba04f5ba907074 (commit)
via b7912722472b53a36978524f81a8cb166123d8d6 (commit)
via 3afde478550440f9a1369e25828cde6090e07dbf (commit)
via 26061be7330a28f6941648f72e607fec0692331a (commit)
via 275ae8a4d337fe1de7da6ea8fdce65bf704d4dd5 (commit)
via e9e05960958151c48bb9210eb458193ae7d28913 (commit)
via b603a66a1cf89fe8235536a61e2190c9bc560a02 (commit)
via bbbd156d49d6b4c82b3186e6ac3406340958152a (commit)
via 6f262b163a4a8fc86c41c43d0e01ee596a071622 (commit)
via dfb1aa839b88de3e2796e9c5b981bf44a6214fa6 (commit)
via 59d4b084a64a1a86177ebff0238fea989f330b4e (commit)
via d1eee7ecbfa3512e1e05e48384ec22b178d86997 (commit)
via c9e635b8c0a6c7a325c33792edad23416e2862c7 (commit)
via 4d95be5010d61e725304da5237210b0b80ee5c29 (commit)
via e6118f4067c909ded38bd58a4a5c804158823923 (commit)
via 535f5f72a5950b5126e99482f7df89f3e260b854 (commit)
via 707f398b9af9814195f33eef91645e4554070f6c (commit)
via 667e891267af4699698b736b9f63fa0847af749d (commit)
via a82c2d1880fd2995d2be5fba04a929e28fdbee40 (commit)
via 350f33a27f7de275d89d493fe5cf602272933ad9 (commit)
via 96e11a92f4c6379c8e334a1dd803242355a222f6 (commit)
via add38736681732ee206663eaa73d0ccbaa19ea86 (commit)
via 71fb5ce0ca19a9038372d39e83a721e26a88193c (commit)
via 50e775dec735d1a8557dfee72a01050e950790c9 (commit)
via 9e29b7dcc85ec6dc2f4fbf17c6f3299e306d5f30 (commit)
via 5303cf989618c3e22bcab1f5b2f6fb17125efe40 (commit)
via 434daf10c6e9b2913037d008b0e98eeb26c07490 (commit)
via b3f53f3d975659040d858470b43899fd62c9abea (commit)
via 019d122ed31c085933a1e80bde03af25c8f42a54 (commit)
via 7192168722dd157cfbe1155d0ce195df65abf914 (commit)
via d40bc09668a446e0322cf05f3139ca297ebbb9c9 (commit)
via d9a6d2c09a576fefdec3e70f24f9c8ed5a5f8f16 (commit)
via fba1d8c30b24360ea2e438cc51dd293295ddc607 (commit)
via a9fe13047d4c43645a412ca8cea984c038b545b4 (commit)
via aa3f0318429268f970bed6286013de5c7061b401 (commit)
via 12eab600f5d073b4a55fde3396d8151f1352284a (commit)
via 68c7e310eeed6cb87689c763b5b0d592375d3c8a (commit)
via 2f83d4f9204cac05804a09d2ab38e256046d81a4 (commit)
via 97299a851486bba1cedcb2fc3b3f49f8b23b9a35 (commit)
via 140fe1d9d866f9637bfad9175ca711cf6c99096c (commit)
via c635a8dd22fc91315edf661460ca4fe9ef33ccab (commit)
via 7a41ce04f70bdafbf21b18b559e586c8fd8dc97f (commit)
via 9b1d851df0f1a0dfe5f1742b241f4a7303c4bf32 (commit)
via 5ed0ca2b2b2ebeb41e3725465fdda099938bf531 (commit)
via 2bc0ea4e2fde6d1f694df63266a24c1c46605d44 (commit)
via d59d05379b30568ab5a32afe1becfe7f79d79fd6 (commit)
via e2a0563ee6cb5f5ac22020aa8a5d8ef104cf1ee9 (commit)
via 4448d70304dc85b63dc1488d4b87203777fbe3fc (commit)
via e542ebfd3d369efaea585740d0782521be47e228 (commit)
from f6c930f002df18c94a68898a4ae857f94aaa554b (commit)
- Log -----------------------------------------------------------------
commit 621d17957310868eaa4f497be5846c550dcd622b
Author: Michal Čihař <michal(a)cihar.com>
Date: Mon Aug 15 08:49:45 2011 +0200
This is not a PHP format
commit bef6d0be80b5e24d0824301cceee8bd0667baedd
Author: stefan <stefan(a)inkopsforum.se>
Date: Mon Aug 15 01:24:53 2011 +0200
Translation update done using Pootle.
commit 709317f0799711aa3c2896e6f9968aac3e38279f
Author: stefan <stefan(a)inkopsforum.se>
Date: Mon Aug 15 01:22:09 2011 +0200
Translation update done using Pootle.
commit 05aa2b0e6951d012ac18a9630cffb58eb0f31807
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:35:06 2011 +0200
Translation update done using Pootle.
commit 566ab9ba528be5fee6f094b0af4a9d4da0c3c376
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:34:14 2011 +0200
Translation update done using Pootle.
commit 8f8a5e613917944bcfce630fd6643a026c9ec40d
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:33:27 2011 +0200
Translation update done using Pootle.
commit a77df73a85bce6c25d80ac4793e1d184f6086371
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:32:58 2011 +0200
Translation update done using Pootle.
commit 2a6137229fa9ed4d78475f108edbeef3c9bb5d2e
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:32:29 2011 +0200
Translation update done using Pootle.
commit 2cf4a679fcab333f47451917db9f10945a603358
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:30:34 2011 +0200
Translation update done using Pootle.
commit 99c6c3bcf20528cb138840efa83a21d94a597fdf
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:30:05 2011 +0200
Translation update done using Pootle.
commit e1ae20f77414084cefa4f1115bd91d95405c5133
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:29:23 2011 +0200
Translation update done using Pootle.
commit b5dde63bd58f031e878ad62b32a9c4f4aefe3bd2
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:28:57 2011 +0200
Translation update done using Pootle.
commit 298ac7a108809ef7d3545b31ba88419a864b0c52
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:27:47 2011 +0200
Translation update done using Pootle.
commit c1c49afe15266c5111b17baab7353231b063e7bd
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:27:37 2011 +0200
Translation update done using Pootle.
commit 02ef6c9ee0afc878088112537ea011bcab898d44
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:21:25 2011 +0200
Translation update done using Pootle.
commit 33ba09e1a40583a0c62a6d0ef42a133b6b9da7cc
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:21:02 2011 +0200
Translation update done using Pootle.
commit e17b21b1dc473cf4674611275177875e38416ca4
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:19:00 2011 +0200
Translation update done using Pootle.
commit 5c5875b4dc2b460b35308d10137e4b4ee6d1bc2d
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:17:51 2011 +0200
Translation update done using Pootle.
commit 63abb1fd8db866e7106a8699642c46f9c8f904cd
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:17:06 2011 +0200
Translation update done using Pootle.
commit 9584da6bb2850968e5262cafa7c10d9a6eb27c0b
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:16:36 2011 +0200
Translation update done using Pootle.
commit c5249e9a7133b63539dae27c0bcddcd5d581121f
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:16:22 2011 +0200
Translation update done using Pootle.
commit c52e5072ba3aa779105e4e2e13bcd43ca8ef646f
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:15:13 2011 +0200
Translation update done using Pootle.
commit ef3177b2c4e33608d3ee3b43881c4a51b87362b8
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:14:36 2011 +0200
Translation update done using Pootle.
commit fd7b4f7f15247d8c23cc9a353982bd12e6645a8e
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:12:41 2011 +0200
Translation update done using Pootle.
commit 3c401bfd52b0c089e525385fd4aa44c588a3d669
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:11:36 2011 +0200
Translation update done using Pootle.
commit cb8fcdbd3d3ca37dff1b09e49cdd8dd8f6acce6d
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:10:53 2011 +0200
Translation update done using Pootle.
commit 93928ac3640e15daef24bc5beb3848ad284bdfb9
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:10:13 2011 +0200
Translation update done using Pootle.
commit 8ebf0e32cca4d33552f36793dde546984f1b1d4a
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:09:51 2011 +0200
Translation update done using Pootle.
commit f15df7859e9715956004f115d38c75aef24d5fea
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:09:25 2011 +0200
Translation update done using Pootle.
commit b8f985873af74a2ad70681e9753ea5a5c510c179
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:08:47 2011 +0200
Translation update done using Pootle.
commit d951839abcc5d3e3d354f6eee28d79ca2e55faeb
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:08:06 2011 +0200
Translation update done using Pootle.
commit bd65eff40b178cf759b77d59d900f948cecf4935
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:07:41 2011 +0200
Translation update done using Pootle.
commit 910024442f11aa309c48a18434f83ce7f0d8d386
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:07:04 2011 +0200
Translation update done using Pootle.
commit 46bf9931af94a7581cd4a1931acc88b1cde004d2
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:06:43 2011 +0200
Translation update done using Pootle.
commit a6240c50e173d3c1987fcb9a95874a531feb2a2d
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:06:26 2011 +0200
Translation update done using Pootle.
commit 5a37b237544f4a46081c858c7cc974885a26a982
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:06:04 2011 +0200
Translation update done using Pootle.
commit de7e169ff548f2f269eae107be6b7e73e9e77555
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:05:29 2011 +0200
Translation update done using Pootle.
commit c83008770153346df9c9233300d7840f4dd38621
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:05:06 2011 +0200
Translation update done using Pootle.
commit 1932935c8bef04adf011199c4a47da8042245cd1
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:02:39 2011 +0200
Translation update done using Pootle.
commit 1885d1bb052b1ae11b6b0353d60ae70e64ecc9a4
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 22:02:16 2011 +0200
Translation update done using Pootle.
commit 606598a0a297a054c2940af7bedf7d31b6a0b788
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 22:01:08 2011 +0200
Translation update done using Pootle.
commit 0acf443a41df06cb3d4e8ce41d466b1db5a0433e
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 22:00:19 2011 +0200
Translation update done using Pootle.
commit 73c688a50b2992dfcaaaf859d352523b858a21c2
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:58:56 2011 +0200
Translation update done using Pootle.
commit fe3fa66ffd2a3e7b1f2ebcaf525f1d77f545a78f
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:58:05 2011 +0200
Translation update done using Pootle.
commit 783e14e1544928f09423c4a3bdc08f4e2e68298b
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:57:15 2011 +0200
Translation update done using Pootle.
commit fc2b61cd57d2d0c6ad6589ac36908679fc6b02b6
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:57:14 2011 +0200
Translation update done using Pootle.
commit b4adcd3ec4283c431982ed5514e1c521707baef4
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:56:46 2011 +0200
Translation update done using Pootle.
commit 052d618be8dd8d2cbf5473e6a32dca3e6ebf7c10
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:56:27 2011 +0200
Translation update done using Pootle.
commit 615676142aa074f2c78e35e052f1a836cf82fcbd
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:56:12 2011 +0200
Translation update done using Pootle.
commit dfce12d76ef8db00a87cca58a6f0cd171384156c
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:55:52 2011 +0200
Translation update done using Pootle.
commit adebeccf2a287883439082408365a44e00a1d68e
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:55:32 2011 +0200
Translation update done using Pootle.
commit 9416dc737b1222fe17ca3c0940be05d95dd766d5
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:53:58 2011 +0200
Translation update done using Pootle.
commit a16f8d4129f3978e577af62f0c7189c633cb2162
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:51:17 2011 +0200
Translation update done using Pootle.
commit d3be33e40792dd2589340f7f5e886b57cee4aac2
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:47:04 2011 +0200
Translation update done using Pootle.
commit c298da473bf23bead6687901ff3e59afe7e2670f
Author: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:46:59 2011 +0200
Translation update done using Pootle.
commit 44f906e7e144d749231c5ce2f7c8f18a549c20b9
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:43:45 2011 +0200
Translation update done using Pootle.
commit e6bf04d421a95ef1eb3794854c8476685d472792
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:43:16 2011 +0200
Translation update done using Pootle.
commit 5dd7c4e3cc9b354a041cdbd84f3b67a75cc34181
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:42:25 2011 +0200
Translation update done using Pootle.
commit 40767505d6acb5dcb2da3435359bdfe56faeb929
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:42:03 2011 +0200
Translation update done using Pootle.
commit e18a8cd7454503d614c9aac9f4fcbe17ef784e19
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:41:11 2011 +0200
Translation update done using Pootle.
commit 81e8a52b5321dac2aadee0d73ddecaec6fe0695d
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:39:41 2011 +0200
Translation update done using Pootle.
commit b8217b7b1e15d23dd5901d06ed973eba381a00e3
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:39:05 2011 +0200
Translation update done using Pootle.
commit 6a8ead4cff779f89d345a8869ea9528a96743bc9
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:38:26 2011 +0200
Translation update done using Pootle.
commit 50b647f4d851e3663dd11b202516b004736e9088
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:38:01 2011 +0200
Translation update done using Pootle.
commit 88183d5fe89ebc21d34482e39cce777758d191f6
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:36:39 2011 +0200
Translation update done using Pootle.
commit fb3496128aafc6b49e6d5b00342d26d63260dfe1
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:35:55 2011 +0200
Translation update done using Pootle.
commit 0196452a215ee25d2be9cf7e241cb731f7ffac7d
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:33:11 2011 +0200
Translation update done using Pootle.
commit 95c130c147b5d755147f96df2555281d9e372db4
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:32:44 2011 +0200
Translation update done using Pootle.
commit 6611bcf8b82a6811c5cf29a4cece2b11d9d41750
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:31:50 2011 +0200
Translation update done using Pootle.
commit 5ee5e0e83f6be7b742f0f935aa017f9852c30c6b
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:30:47 2011 +0200
Translation update done using Pootle.
commit 20e5dc105b7eb7040e8815578bcc19e72f2a4863
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:29:24 2011 +0200
Translation update done using Pootle.
commit 0e8da7188bc5c155ae58f49c005fbc470b518a5f
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:28:46 2011 +0200
Translation update done using Pootle.
commit e1b8fa855b684c7cb38805b426f9431c76b50b6a
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:28:35 2011 +0200
Translation update done using Pootle.
commit 1e9e3bef4785a6c3fd10b615587840749d680086
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:27:59 2011 +0200
Translation update done using Pootle.
commit 52fda4a0004e53ce27b0d6854dcc3b49c65c68f6
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:27:35 2011 +0200
Translation update done using Pootle.
commit 597c9af64f11dff7815ea64cdcc4b8a1bdb28bbb
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:27:32 2011 +0200
Translation update done using Pootle.
commit 7e0958920c45547dda9a6416bb54c13053330d04
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:26:25 2011 +0200
Translation update done using Pootle.
commit 84cb72635c486105feea1f72b9704c13c9c2aeac
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:22:16 2011 +0200
Translation update done using Pootle.
commit 2b0ebb701fbfe00ef306587833927648e985b87c
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:21:56 2011 +0200
Translation update done using Pootle.
commit f4bd55a754d4f06d6a8c66c7bf43e9c4cdba05c2
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:21:48 2011 +0200
Translation update done using Pootle.
commit a14c88b46cdd6936337f7867cf20b5cebda30c94
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:21:36 2011 +0200
Translation update done using Pootle.
commit f9493dee544f0b469ccd00ff68f3b9e122787c82
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:21:10 2011 +0200
Translation update done using Pootle.
commit 8ace7de74853da306b1647b6455584025b7381e8
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:20:34 2011 +0200
Translation update done using Pootle.
commit db9fcf0a5146b190d7fe14d89101dfd334c0f4b1
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:20:04 2011 +0200
Translation update done using Pootle.
commit 1b8205e7b59916f2d21582c42d7a88b223b3c203
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:19:45 2011 +0200
Translation update done using Pootle.
commit db8fea71927f03f5300ddebfbe3da28a574e9e7c
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:19:31 2011 +0200
Translation update done using Pootle.
commit e3f763755958c2e22aa1964b1274aee01442ba7d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:18:22 2011 +0200
Translation update done using Pootle.
commit f04ebb730cc25ad67ad13272f0d2509bb7456012
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:17:40 2011 +0200
Translation update done using Pootle.
commit eed03f9dd7e8af7f589ed8b15a0220463e52cf8a
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:17:29 2011 +0200
Translation update done using Pootle.
commit e7e83db0de8869c39d21de5eae502ad4211fe57c
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:17:18 2011 +0200
Translation update done using Pootle.
commit 6b696eb99b3f9eb9fd26e7006ff34db0ba5f2923
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:16:23 2011 +0200
Translation update done using Pootle.
commit 81fc102d3a5b02f3232c092212316b70e0489640
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:16:20 2011 +0200
Translation update done using Pootle.
commit c36bc80cccf2f6b9adb8b864d19b103c6955d712
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:16:04 2011 +0200
Translation update done using Pootle.
commit 2694919ac568f9ab27cde8d5fdfa911b6a8ce2df
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:15:35 2011 +0200
Translation update done using Pootle.
commit 1917f5f0a37923e385502aaf7aed55510494081d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:15:07 2011 +0200
Translation update done using Pootle.
commit 828b12fa1f2b98efbdc76e51daa5581936019965
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:14:21 2011 +0200
Translation update done using Pootle.
commit 0f66ac508536062cc17f7a153b8f16ee74beef4c
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:13:01 2011 +0200
Translation update done using Pootle.
commit 15ad953eb6e053c68dd7a0253b302defcdfa15f4
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:11:49 2011 +0200
Translation update done using Pootle.
commit 64229167cde015880493efbc21324ae182946fe0
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:10:42 2011 +0200
Translation update done using Pootle.
commit b1a6c3d415411c6b7213ffb6f59d192b4a519579
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:09:55 2011 +0200
Translation update done using Pootle.
commit 9994317bf96465ee734c1e25149d923ad4b7357a
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:09:48 2011 +0200
Translation update done using Pootle.
commit 3c8b2091cec22da0ad1fd2fbc0c712ae6a869cbc
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:09:32 2011 +0200
Translation update done using Pootle.
commit fae4f2cb5538b5530c0045719a6626eef8b92f9c
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:08:57 2011 +0200
Translation update done using Pootle.
commit ddfa3a2fe66732c1c53b285bf618a28611f9a17f
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:08:46 2011 +0200
Translation update done using Pootle.
commit 5eeb68dcbcb37a75de55b47099a1cec08d9180be
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:07:42 2011 +0200
Translation update done using Pootle.
commit a54006caf56ce85220d715cb50d46a063101dda4
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:07:28 2011 +0200
Translation update done using Pootle.
commit d035389142d7fdae74619da503329141ea980245
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:06:51 2011 +0200
Translation update done using Pootle.
commit 29ad340db892f00164f8afc922f7f19aaf70cd7c
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:06:30 2011 +0200
Translation update done using Pootle.
commit 8a3a4b54fe355910591761ddce27139371a8011d
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:06:29 2011 +0200
Translation update done using Pootle.
commit 72c06f62dee8774c2a76c10c664026b2aa7dcb36
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:04:15 2011 +0200
Translation update done using Pootle.
commit f56ecf4cc6ce7094a1e07817a89965f6c8f08281
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:03:41 2011 +0200
Translation update done using Pootle.
commit ce05bf3ed5344e7c93d36bd281ebe2b9d7a59153
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 21:03:41 2011 +0200
Translation update done using Pootle.
commit b27a43575d493cf5af34a89776094d189aa71be5
Author: saskumar <saskumar(a)hotmail.com>
Date: Sun Aug 14 21:03:33 2011 +0200
Translation update done using Pootle.
commit d92866c46462f0d04fe6538d492c9ab73dc87e71
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 20:59:08 2011 +0200
Translation update done using Pootle.
commit 960bd65dd28a5c2c3c61f95cbfdfa8970abaf32e
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 20:58:44 2011 +0200
Translation update done using Pootle.
commit 80e25914ed45d523b0789e95cd40e6921139a5ae
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 19:10:34 2011 +0200
Translation update done using Pootle.
commit 50597dac43ede1ea6bfb5259ee1369aaaf113f2b
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 18:46:21 2011 +0200
Translation update done using Pootle.
commit a63c73a620573f7d084e68b388b85af3c5ede7c1
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 18:42:44 2011 +0200
Translation update done using Pootle.
commit 30951035566ebe43c77b1f79741aa27c4c71fa30
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 18:41:18 2011 +0200
Translation update done using Pootle.
commit 8e0c6c8e8c9d0312b52c5cb5e1996750083ea1c6
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 18:39:06 2011 +0200
Translation update done using Pootle.
commit 5bf23245c207550a6ced6dbce65767611a6381b0
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 18:37:29 2011 +0200
Translation update done using Pootle.
commit 28d65480457addefb5bc4f7a3131b2ff63ef3a52
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 18:36:12 2011 +0200
Translation update done using Pootle.
commit c09fb0a8aead61350d3c398bc3c7a3bf5bd99267
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 18:33:26 2011 +0200
Translation update done using Pootle.
commit 0a47207392af0dc2fccc1ca16adee0bebb355fea
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 18:30:41 2011 +0200
Translation update done using Pootle.
commit f60f93352eae52c22bbc569557062337fe9b89ce
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 18:27:22 2011 +0200
Translation update done using Pootle.
commit 36254cc211f3f842457b7f68af27e742bebd30b6
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 18:24:36 2011 +0200
Translation update done using Pootle.
commit 18315fdefb6da0493652524f15f3c938d5d6259c
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 18:23:36 2011 +0200
Translation update done using Pootle.
commit 0664428bfaa02c757013738340bcf35218f26c70
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 18:23:19 2011 +0200
Translation update done using Pootle.
commit 18db3b9a876dcd33b771e200dbc88d2bbd5608b9
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sun Aug 14 18:20:09 2011 +0200
Translation update done using Pootle.
commit f39124fce18f2411b222f80b90f02220ea85e9c8
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:42:56 2011 +0200
Translation update done using Pootle.
commit f5b2a81f623dec991e5e190741cd33b45d554211
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:42:49 2011 +0200
Translation update done using Pootle.
commit 6d9aa1d85f9f232f647ac9f517d8dd74f42673b8
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:42:10 2011 +0200
Translation update done using Pootle.
commit 90cf7f1342a78c7271f93a7533cf3dd9f191fdd9
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:42:06 2011 +0200
Translation update done using Pootle.
commit 6c773c1d5f6bd31e970fde6bd447fcb7d99812c0
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:41:55 2011 +0200
Translation update done using Pootle.
commit 9a1e6cc7b83ad24ba9e0aa4a0be47871b586f4db
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:41:44 2011 +0200
Translation update done using Pootle.
commit 07934d36bf20c3ee1e56b7bfdde7c4ebf8fee241
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:41:19 2011 +0200
Translation update done using Pootle.
commit 97152113f608595c89709686350c40525177e49e
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:41:00 2011 +0200
Translation update done using Pootle.
commit ddde8e4336951d0a7ec7d3125923ed35c1737093
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:40:43 2011 +0200
Translation update done using Pootle.
commit 2bcd4d161e39d63410d29a066a18c39e93d56834
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:40:25 2011 +0200
Translation update done using Pootle.
commit c0861134eec6057d85624de365d341dd605684d7
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:40:06 2011 +0200
Translation update done using Pootle.
commit e68a321a4ab86a31d00c4d4a73b5cf72970e2f73
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:39:58 2011 +0200
Translation update done using Pootle.
commit fab2fc2008f893a737e27f8c8582738bf3041fe5
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:39:44 2011 +0200
Translation update done using Pootle.
commit 4a5596bdf85e190436334375f1821c7d84753e2f
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:39:23 2011 +0200
Translation update done using Pootle.
commit 31c2717250c5e1f2c20adfe69324918df63cb083
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:34:43 2011 +0200
Translation update done using Pootle.
commit 037ed49a4162353c219356f5d3d2ae5e1fde43e9
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:34:36 2011 +0200
Translation update done using Pootle.
commit 6e946df5a74ce8b8c8c88b32381fefbc4ac52ff1
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:34:27 2011 +0200
Translation update done using Pootle.
commit 57e794b9c097ba26ac815ca1509735bf15dec5b8
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:33:28 2011 +0200
Translation update done using Pootle.
commit 3cb3d31cd59915e5c70128196adc773c67838c20
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:33:06 2011 +0200
Translation update done using Pootle.
commit b65b30bf1e5d0edb35c372f63169c2d94ecb0331
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:32:43 2011 +0200
Translation update done using Pootle.
commit db29640897ffcb53ee75ce17dbff3d9d8430687d
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:31:47 2011 +0200
Translation update done using Pootle.
commit d7faf3788b481ef7472a255632d8073c3535dd81
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:31:27 2011 +0200
Translation update done using Pootle.
commit 64d47369db323a3dbffd126bfb845a3fa93281d5
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:30:48 2011 +0200
Translation update done using Pootle.
commit 5e32bd96135d5f414eed57e77cec618a4ff414e9
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:30:28 2011 +0200
Translation update done using Pootle.
commit dbd082a8674da9889e26f2e80cff92a2f466bfa8
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:30:08 2011 +0200
Translation update done using Pootle.
commit 6b1c4e608f2ec4e56ae41c74cdf8c010da40bfcf
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:28:30 2011 +0200
Translation update done using Pootle.
commit 5307aae67f85d0d20a9ed7d8556345efe7db394c
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:27:54 2011 +0200
Translation update done using Pootle.
commit 3a6e929b86a5b0ebbf33ffe4e726113ecafcf003
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:27:08 2011 +0200
Translation update done using Pootle.
commit 082215f85e3ce15c7c1e1700d9dfc8bb8aaa83f9
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:26:57 2011 +0200
Translation update done using Pootle.
commit 69fee4894cd2e1c9b9af1a86bf8fc9203d255074
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:26:30 2011 +0200
Translation update done using Pootle.
commit a5ee5db3c7a6ec055d852a3e6e59a83cc59ed704
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:25:50 2011 +0200
Translation update done using Pootle.
commit b2503a52645db61fa192560be29bce11b6d86701
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:24:58 2011 +0200
Translation update done using Pootle.
commit d657eb63257e6e3b2285614b6d35e1b10df87c3b
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 23:24:46 2011 +0200
Translation update done using Pootle.
commit af72610fb74c186dc113bb5cb2e09d0909281e22
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Sat Aug 13 21:34:37 2011 +0200
Translation update done using Pootle.
commit 98eeaead1daaa404881f83938a1736fdd7395bd7
Author: ldplopes <ldplopes(a)hotmail.com>
Date: Sat Aug 13 19:21:10 2011 +0200
Translation update done using Pootle.
commit 6a01d3191ed4f0be70bbde9593072f5702f0a186
Author: ldplopes <ldplopes(a)hotmail.com>
Date: Sat Aug 13 19:21:01 2011 +0200
Translation update done using Pootle.
commit dd60d8f73a2bff4c36a51ddea9ef9e5e25ab4be7
Author: ldplopes <ldplopes(a)hotmail.com>
Date: Sat Aug 13 19:20:58 2011 +0200
Translation update done using Pootle.
commit 21174e98d4abd56361d1d48fd5b4d974d4c2b8bd
Author: ldplopes <ldplopes(a)hotmail.com>
Date: Sat Aug 13 19:20:35 2011 +0200
Translation update done using Pootle.
commit 6ae786365326d6d911181e5e72a9f3949360cb33
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 12:52:25 2011 +0200
Translation update done using Pootle.
commit 51c16c4e75830fd8926a706d27bbbbb5b9cdd3fe
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 12:41:25 2011 +0200
Translation update done using Pootle.
commit b15d7e97a05d193915e04bbb91cf8ae080b70563
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 12:39:23 2011 +0200
Translation update done using Pootle.
commit 58be148195f29ce5cae21e8e50005a00af1f5352
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 12:31:07 2011 +0200
Translation update done using Pootle.
commit cc618377d5d2d24059fe2f0cf9956417d5c8a270
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 12:24:02 2011 +0200
Translation update done using Pootle.
commit 03d9919499c354174fec020aaf9abf69c8fa54e9
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 12:23:34 2011 +0200
Translation update done using Pootle.
commit e46db718139a004bfa7f9015274bb053efc50234
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 12:20:24 2011 +0200
Translation update done using Pootle.
commit 3c47ad7f58998b9653a02c87a4b7ad79a5eacbb5
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 12:12:53 2011 +0200
Translation update done using Pootle.
commit 7e901907e35a26a10ddb238d735260cd8ebfce75
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 12:12:30 2011 +0200
Translation update done using Pootle.
commit a2387a39b11c4cfbbf75f05f2adb5b4ac7cc01e3
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 12:11:42 2011 +0200
Translation update done using Pootle.
commit 5e693142e8a8dff5bba8323c9c9202d839b1c17e
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 12:05:19 2011 +0200
Translation update done using Pootle.
commit 4de1a0af7874f049e82ba6462480217f3587bcdf
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 12:03:01 2011 +0200
Translation update done using Pootle.
commit cf98293f099c4fcb6c98963bce983ebef6094a84
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 12:00:38 2011 +0200
Translation update done using Pootle.
commit 5e5616cc49236e34522ec336a676bcd2e4ffdcbf
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 11:55:24 2011 +0200
Translation update done using Pootle.
commit 5fe51865ae565e722264f5abe16ec61b70aa4ca5
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 11:48:56 2011 +0200
Translation update done using Pootle.
commit c378b0ab11ee3e88fa359cb613bcf035c117953d
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Sat Aug 13 11:45:12 2011 +0200
Translation update done using Pootle.
commit c01bbf95a827b523934233d355118446de7953d6
Merge: d7e9665 f6c930f
Author: Pootle server <pootle(a)cihar.com>
Date: Sat Aug 13 08:40:14 2011 +0200
Merge remote-tracking branch 'origin/master'
commit d7e96656bc13a54ded7f50e70604415198114e07
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 02:00:09 2011 +0200
Translation update done using Pootle.
commit 4cf2ea23586dad01a546b8642e737fd14afb4b94
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:59:49 2011 +0200
Translation update done using Pootle.
commit 755f6f9f36abc5edca5cafd1a7a39d3e14a0643d
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:59:39 2011 +0200
Translation update done using Pootle.
commit 3c7295aa4cb4e1e161a4595f2e35f12a90170a92
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:59:31 2011 +0200
Translation update done using Pootle.
commit 9ed1570392caef07edc6e2ffb6933581ef6b29a6
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:59:06 2011 +0200
Translation update done using Pootle.
commit 458a5fe1f31bf347b9ea8fd20801bb0322a9ece2
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:59:00 2011 +0200
Translation update done using Pootle.
commit a14dc8fc3f1cc59825986752f84879c23fc3ea8c
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:58:58 2011 +0200
Translation update done using Pootle.
commit bb6cdbc8c9bd1bf1587f2d984eeb4ad8400a4b60
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:58:45 2011 +0200
Translation update done using Pootle.
commit 8fe39bc6ed4dac28f9fb53a3519c45f89a5a3e1a
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:58:24 2011 +0200
Translation update done using Pootle.
commit e53fd64c340ad69ce7d05ccca1d2d6450b9bdac2
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:57:50 2011 +0200
Translation update done using Pootle.
commit fb3ebb626d564eecb475a031b95095ec1935e2c8
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:57:33 2011 +0200
Translation update done using Pootle.
commit e7a7c23efd52dc78728ce6b82dd0709acd4f5ad2
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:55:28 2011 +0200
Translation update done using Pootle.
commit 1c98e19926a22014a6bd0a678a9ac2f182f91e40
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:54:46 2011 +0200
Translation update done using Pootle.
commit e76a85084b0def6edd3930717689d15300bb6d7e
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:54:24 2011 +0200
Translation update done using Pootle.
commit a0ef01c01f689490e4046e897d61713cd12c0cf7
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:52:57 2011 +0200
Translation update done using Pootle.
commit 5b6a9f84c1d3b75ed5321b6161407f56c899cd17
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:52:18 2011 +0200
Translation update done using Pootle.
commit 01cb815aec4266e41d5277dff3a09c9475365ae4
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:52:00 2011 +0200
Translation update done using Pootle.
commit 6abe160ba961e2d76c6d15951a353fbcbf3feba8
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:51:24 2011 +0200
Translation update done using Pootle.
commit c43bced6c0698818d6bdad292ef9409b49a626c7
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:51:17 2011 +0200
Translation update done using Pootle.
commit 6c9c1d51dff02da6a39f48858b6695aa8b64fec3
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:51:07 2011 +0200
Translation update done using Pootle.
commit b719443551b9020f3f0803bd2f5220e3d6c61961
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:50:59 2011 +0200
Translation update done using Pootle.
commit 0f786f00c6398b1e53135b8e91614f9710e30f2d
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:50:47 2011 +0200
Translation update done using Pootle.
commit c0f9c1f368dfde8115bcb9ac47201c00bb8f9e51
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:50:38 2011 +0200
Translation update done using Pootle.
commit 076c621149612f68f4cbbeac01de73136c9de63a
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:50:18 2011 +0200
Translation update done using Pootle.
commit ce0237bb473e63660bb78f11a3c43d3b0fd4244a
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:50:05 2011 +0200
Translation update done using Pootle.
commit 192bcef4563f93e3b74844a665472f00c370fe24
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:49:53 2011 +0200
Translation update done using Pootle.
commit 1b01a42d0ef03ccac6e4aa4c1aba04f5ba907074
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Sat Aug 13 01:49:34 2011 +0200
Translation update done using Pootle.
commit b7912722472b53a36978524f81a8cb166123d8d6
Merge: 3afde47 9147f30
Author: Pootle server <pootle(a)cihar.com>
Date: Fri Aug 12 22:40:21 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 3afde478550440f9a1369e25828cde6090e07dbf
Merge: 26061be b319651
Author: Pootle server <pootle(a)cihar.com>
Date: Fri Aug 12 16:40:06 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 26061be7330a28f6941648f72e607fec0692331a
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:29:55 2011 +0200
Translation update done using Pootle.
commit 275ae8a4d337fe1de7da6ea8fdce65bf704d4dd5
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:27:36 2011 +0200
Translation update done using Pootle.
commit e9e05960958151c48bb9210eb458193ae7d28913
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:26:36 2011 +0200
Translation update done using Pootle.
commit b603a66a1cf89fe8235536a61e2190c9bc560a02
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:26:24 2011 +0200
Translation update done using Pootle.
commit bbbd156d49d6b4c82b3186e6ac3406340958152a
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:26:12 2011 +0200
Translation update done using Pootle.
commit 6f262b163a4a8fc86c41c43d0e01ee596a071622
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:25:58 2011 +0200
Translation update done using Pootle.
commit dfb1aa839b88de3e2796e9c5b981bf44a6214fa6
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:25:35 2011 +0200
Translation update done using Pootle.
commit 59d4b084a64a1a86177ebff0238fea989f330b4e
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:24:52 2011 +0200
Translation update done using Pootle.
commit d1eee7ecbfa3512e1e05e48384ec22b178d86997
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:24:33 2011 +0200
Translation update done using Pootle.
commit c9e635b8c0a6c7a325c33792edad23416e2862c7
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:24:13 2011 +0200
Translation update done using Pootle.
commit 4d95be5010d61e725304da5237210b0b80ee5c29
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:18:09 2011 +0200
Translation update done using Pootle.
commit e6118f4067c909ded38bd58a4a5c804158823923
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:16:24 2011 +0200
Translation update done using Pootle.
commit 535f5f72a5950b5126e99482f7df89f3e260b854
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:15:33 2011 +0200
Translation update done using Pootle.
commit 707f398b9af9814195f33eef91645e4554070f6c
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:07:15 2011 +0200
Translation update done using Pootle.
commit 667e891267af4699698b736b9f63fa0847af749d
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 16:01:02 2011 +0200
Translation update done using Pootle.
commit a82c2d1880fd2995d2be5fba04a929e28fdbee40
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 15:59:27 2011 +0200
Translation update done using Pootle.
commit 350f33a27f7de275d89d493fe5cf602272933ad9
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 15:45:56 2011 +0200
Translation update done using Pootle.
commit 96e11a92f4c6379c8e334a1dd803242355a222f6
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 15:45:09 2011 +0200
Translation update done using Pootle.
commit add38736681732ee206663eaa73d0ccbaa19ea86
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 15:43:32 2011 +0200
Translation update done using Pootle.
commit 71fb5ce0ca19a9038372d39e83a721e26a88193c
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 15:42:51 2011 +0200
Translation update done using Pootle.
commit 50e775dec735d1a8557dfee72a01050e950790c9
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 15:38:49 2011 +0200
Translation update done using Pootle.
commit 9e29b7dcc85ec6dc2f4fbf17c6f3299e306d5f30
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 15:38:20 2011 +0200
Translation update done using Pootle.
commit 5303cf989618c3e22bcab1f5b2f6fb17125efe40
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:06:19 2011 +0200
Translation update done using Pootle.
commit 434daf10c6e9b2913037d008b0e98eeb26c07490
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:06:06 2011 +0200
Translation update done using Pootle.
commit b3f53f3d975659040d858470b43899fd62c9abea
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:05:41 2011 +0200
Translation update done using Pootle.
commit 019d122ed31c085933a1e80bde03af25c8f42a54
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:05:19 2011 +0200
Translation update done using Pootle.
commit 7192168722dd157cfbe1155d0ce195df65abf914
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:04:47 2011 +0200
Translation update done using Pootle.
commit d40bc09668a446e0322cf05f3139ca297ebbb9c9
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:04:35 2011 +0200
Translation update done using Pootle.
commit d9a6d2c09a576fefdec3e70f24f9c8ed5a5f8f16
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:04:21 2011 +0200
Translation update done using Pootle.
commit fba1d8c30b24360ea2e438cc51dd293295ddc607
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:03:47 2011 +0200
Translation update done using Pootle.
commit a9fe13047d4c43645a412ca8cea984c038b545b4
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:03:31 2011 +0200
Translation update done using Pootle.
commit aa3f0318429268f970bed6286013de5c7061b401
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:03:20 2011 +0200
Translation update done using Pootle.
commit 12eab600f5d073b4a55fde3396d8151f1352284a
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:02:57 2011 +0200
Translation update done using Pootle.
commit 68c7e310eeed6cb87689c763b5b0d592375d3c8a
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:02:50 2011 +0200
Translation update done using Pootle.
commit 2f83d4f9204cac05804a09d2ab38e256046d81a4
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:02:43 2011 +0200
Translation update done using Pootle.
commit 97299a851486bba1cedcb2fc3b3f49f8b23b9a35
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:02:37 2011 +0200
Translation update done using Pootle.
commit 140fe1d9d866f9637bfad9175ca711cf6c99096c
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:02:01 2011 +0200
Translation update done using Pootle.
commit c635a8dd22fc91315edf661460ca4fe9ef33ccab
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:01:51 2011 +0200
Translation update done using Pootle.
commit 7a41ce04f70bdafbf21b18b559e586c8fd8dc97f
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:01:13 2011 +0200
Translation update done using Pootle.
commit 9b1d851df0f1a0dfe5f1742b241f4a7303c4bf32
Author: Sven Strickroth <email(a)cs-ware.de>
Date: Fri Aug 12 15:00:41 2011 +0200
Translation update done using Pootle.
commit 5ed0ca2b2b2ebeb41e3725465fdda099938bf531
Merge: 2bc0ea4 fcb2859
Author: Pootle server <pootle(a)cihar.com>
Date: Fri Aug 12 14:40:15 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 2bc0ea4e2fde6d1f694df63266a24c1c46605d44
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 12:53:10 2011 +0200
Translation update done using Pootle.
commit d59d05379b30568ab5a32afe1becfe7f79d79fd6
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 12:52:44 2011 +0200
Translation update done using Pootle.
commit e2a0563ee6cb5f5ac22020aa8a5d8ef104cf1ee9
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 12:44:19 2011 +0200
Translation update done using Pootle.
commit 4448d70304dc85b63dc1488d4b87203777fbe3fc
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 12:43:40 2011 +0200
Translation update done using Pootle.
commit e542ebfd3d369efaea585740d0782521be47e228
Author: Yuichiro <yuichiro(a)pop07.odn.ne.jp>
Date: Fri Aug 12 12:35:52 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/de.po | 106 +++++++++++++++-------------------
po/ja.po | 94 ++++++++++++++----------------
po/pt.po | 11 +--
po/sv.po | 9 +--
po/ta.po | 193 ++++++++++++++++++++++++++++++++------------------------------
po/tr.po | 162 ++++++++++++++++++++++++++++------------------------
6 files changed, 285 insertions(+), 290 deletions(-)
diff --git a/po/de.po b/po/de.po
index 41ff554..6a7df8a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-12 12:32+0200\n"
-"PO-Revision-Date: 2011-08-07 22:28+0200\n"
+"PO-Revision-Date: 2011-08-13 02:00+0200\n"
"Last-Translator: Sven Strickroth <email(a)cs-ware.de>\n"
"Language-Team: german <de(a)li.org>\n"
"Language: de\n"
@@ -417,7 +417,7 @@ msgstr "Bitte wählen Sie mindestens eine anzuzeigende Spalte"
#, fuzzy, php-format
#| msgid "visual builder"
msgid "Switch to %svisual builder%s"
-msgstr "Wechseln zu %s visual builder %s"
+msgstr "Wechseln zu %svisual builder%s"
#: db_qbe.php:222 libraries/db_structure.lib.php:90
#: libraries/display_tbl.lib.php:955
@@ -1131,10 +1131,9 @@ msgid "Query statistics"
msgstr "Abfrage-Statistiken"
#: js/messages.php:93
-#, fuzzy
#| msgid "Failed to read configuration file"
msgid "Local monitor configuration icompatible"
-msgstr "Fehler beim Lesen der Konfigurationsdatei"
+msgstr "Lokale Monitor-Konfiguration ist inkompatibel"
#: js/messages.php:94
msgid ""
@@ -1145,22 +1144,19 @@ msgid ""
msgstr ""
#: js/messages.php:96
-#, fuzzy
#| msgid "Query cache"
msgid "Query cache efficiency"
-msgstr "Abfragen-Cache"
+msgstr "Abfragen-Cache Effizienz"
#: js/messages.php:97 po/advisory_rules.php:70
-#, fuzzy
#| msgid "Query cache"
msgid "Query cache usage"
-msgstr "Abfragen-Cache"
+msgstr "Abfragen-Cache Ausnutzung"
#: js/messages.php:98
-#, fuzzy
#| msgid "Query cache"
msgid "Query cache used"
-msgstr "Abfragen-Cache"
+msgstr "Abfragen-Cache benutzt"
#: js/messages.php:100
msgid "System CPU Usage"
@@ -1192,19 +1188,18 @@ msgstr "Durchschnittliche Auslastung"
#, fuzzy
#| msgid "System memory"
msgid "Total memory"
-msgstr "Arbeitsspeicher"
+msgstr "Gesamter Speicher"
#: js/messages.php:108
#, fuzzy
#| msgid "System memory"
msgid "Cached memory"
-msgstr "Arbeitsspeicher"
+msgstr "Cached Speicher"
#: js/messages.php:109
-#, fuzzy
#| msgid "Buffer Pool"
msgid "Buffered memory"
-msgstr "Puffer-Pool"
+msgstr "Gepufferter Speicher"
#: js/messages.php:110
msgid "Free memory"
@@ -1218,21 +1213,23 @@ msgstr "Verwendeter Speicher"
#, fuzzy
#| msgid "Total"
msgid "Total Swap"
-msgstr "Insgesamt ausgelagert"
+msgstr "Gesamt Swap"
#: js/messages.php:114
+#, fuzzy
msgid "Cached Swap"
-msgstr ""
+msgstr "Cached Swap"
#: js/messages.php:115
+#, fuzzy
msgid "Used Swap"
-msgstr ""
+msgstr "Benutzer Swap"
#: js/messages.php:116
#, fuzzy
#| msgid "Free pages"
msgid "Free Swap"
-msgstr "Unbenutzte Seiten"
+msgstr "Freier Swap"
#: js/messages.php:118
msgid "Bytes sent"
@@ -1336,8 +1333,8 @@ msgid ""
"Following settings will be applied globally and reset to default on server "
"restart:"
msgstr ""
-"Die folgenden Einstellungen werden global übernommen, und auf ihre "
-"Ursprungswerte zurückgesetzt bei einem Server Neustart."
+"Die folgenden Einstellungen werden global übernommen, und bei einem Server-"
+"Neustart auf ihre Ursprungswerte zurückgesetzt:"
#. l10n: %s is FILE or TABLE
#: js/messages.php:146
@@ -1501,6 +1498,8 @@ msgid ""
"Failed building chart grid with imported config. Resetting to default "
"config..."
msgstr ""
+"Aufbau der Diagramme mit der importierten Konfiguration ist fehlgeschlagen. "
+"Falle auf Standardeinstellungen zurück..."
#: js/messages.php:190 libraries/config/messages.inc.php:170
#: libraries/db_links.inc.php:83 libraries/server_links.inc.php:69
@@ -1510,50 +1509,46 @@ msgid "Import"
msgstr "Importieren"
#: js/messages.php:192
-#, fuzzy
#| msgid "Update Query"
msgid "Analyse Query"
-msgstr "Aktualisieren"
+msgstr "Anfrage analysieren"
#: js/messages.php:196
-#, fuzzy
#| msgid "Advisor"
msgid "Advisor system"
-msgstr "Ratgeber"
+msgstr "Ratgebersystem"
#: js/messages.php:197
msgid "Possible performance issues"
-msgstr ""
+msgstr "Mögliche Performance-Probleme"
#: js/messages.php:198
msgid "Issue"
-msgstr ""
+msgstr "Problem"
#: js/messages.php:199
-#, fuzzy
#| msgid "Documentation"
msgid "Recommendation"
-msgstr "Dokumentation"
+msgstr "Empfehlung"
#: js/messages.php:200
-#, fuzzy
#| msgid "Details"
msgid "Rule details"
-msgstr "Details"
+msgstr "Regel-Details"
#: js/messages.php:201
#, fuzzy
#| msgid "Authentication"
msgid "Justification"
-msgstr "Authentifizierung"
+msgstr "Justierung"
#: js/messages.php:202
msgid "Used variable / formula"
-msgstr ""
+msgstr "Benutzte Variable/Formel"
#: js/messages.php:203
msgid "Test"
-msgstr ""
+msgstr "Test"
#: js/messages.php:208 libraries/tbl_properties.inc.php:763
#: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -1735,13 +1730,15 @@ msgstr "Option hinzufügen zu Spalte "
#: js/messages.php:278
msgid "Press escape to cancel editing"
-msgstr ""
+msgstr "Drücken Sie ESC um das Bearbeiten abzubrechen"
#: js/messages.php:279
msgid ""
"You have edited some data and they have not been saved. Are you sure you "
"want to leave this page before saving the data?"
msgstr ""
+"Sie haben Daten verändert und noch nicht gespeichert. Sind Sie sicher, dass "
+"Sie diese Seite ohne zu speichern verlassen möchten?"
#: js/messages.php:280
msgid "Drag to reorder"
@@ -1807,18 +1804,16 @@ msgid "Done"
msgstr "Fertig"
#: js/messages.php:322
-#, fuzzy
#| msgid "Prev"
msgctxt "Previous month"
msgid "Prev"
-msgstr "Vorherige"
+msgstr "Vorher"
#: js/messages.php:327
-#, fuzzy
#| msgid "Next"
msgctxt "Next month"
msgid "Next"
-msgstr "Nächste"
+msgstr "Nächster"
#. l10n: Display text for current month link in calendar
#: js/messages.php:330
@@ -1964,7 +1959,6 @@ msgstr "Samstag"
#. l10n: Short week day name
#: js/messages.php:383
-#, fuzzy
#| msgctxt "Short week day name"
#| msgid "Sun"
msgid "Sun"
@@ -2058,7 +2052,7 @@ msgstr "Schriftgröße"
#: libraries/File.class.php:220
msgid "File was not an uploaded file."
-msgstr "Bei der Datei handelt es sich um keine hochgeladene Datei,"
+msgstr "Bei der Datei handelt es sich um keine hochgeladene Datei."
#: libraries/File.class.php:259 libraries/File.class.php:388
msgid "Unknown error while uploading."
@@ -2196,10 +2190,9 @@ msgstr[0] "%1$d Datensatz eingefügt."
msgstr[1] "%1$d Datensätze eingefügt."
#: libraries/PDF.class.php:81
-#, fuzzy
#| msgid "Error reading data:"
msgid "Error while creating PDF:"
-msgstr "Fehler beim Lesen der Daten:"
+msgstr "Fehler beim Erstellen der PDF:"
#: libraries/RecentTable.class.php:107
msgid "Could not save recent table"
@@ -2234,10 +2227,9 @@ msgid "This MySQL server does not support the %s storage engine."
msgstr "Dieser MySQL-Server unterstützt %s nicht."
#: libraries/Table.class.php:303
-#, fuzzy
#| msgid "Show slave status"
msgid "unknown table status: "
-msgstr "Zeige den Slave-Status"
+msgstr "Unbekannter Tabellenstatus: "
#: libraries/Table.class.php:1034
msgid "Invalid database"
@@ -2360,7 +2352,7 @@ msgstr "Passwort:"
#: libraries/auth/cookie.auth.lib.php:228
msgid "Server Choice"
-msgstr "Server Auswählen"
+msgstr "Server auswählen"
#: libraries/auth/cookie.auth.lib.php:274 libraries/header.inc.php:87
msgid "Cookies must be enabled past this point."
@@ -2693,7 +2685,7 @@ msgstr "%s Tage, %s Stunden, %s Minuten und %s Sekunden"
#: libraries/common.lib.php:1944
msgid "Missing parameter:"
-msgstr "Fehlender Parameter."
+msgstr "Fehlende(r) Parameter:"
#: libraries/common.lib.php:2267 libraries/common.lib.php:2270
#: libraries/display_tbl.lib.php:306
@@ -4104,10 +4096,9 @@ msgid "Memory limit"
msgstr "Speicher Limit"
#: libraries/config/messages.inc.php:319
-#, fuzzy
#| msgid "These are Edit, Inline edit, Copy and Delete links"
msgid "These are Edit, Copy and Delete links"
-msgstr "Dies sind Bearbeitungs-, Inline-Bearbeitungs-, Kopier- und Löschlinks"
+msgstr "Dies sind Bearbeitungs-, Kopier- und Löschlinks"
#: libraries/config/messages.inc.php:320
msgid "Where to show the table row links"
@@ -4266,7 +4257,7 @@ msgstr "Hilfe-Button anzeigen"
#: libraries/config/messages.inc.php:357
msgid "Save all edited cells at once"
-msgstr ""
+msgstr "Speichere alle bearbeiteten Zellen auf einmal"
#: libraries/config/messages.inc.php:358
msgid "Directory where exports can be saved on server"
@@ -5550,10 +5541,9 @@ msgid "Language"
msgstr "Sprache"
#: libraries/display_tbl.lib.php:401
-#, fuzzy
#| msgid "Save directory"
msgid "Save edited data"
-msgstr "Speicher Verzeichnis"
+msgstr "Speichere bearbeitete Daten"
#: libraries/display_tbl.lib.php:407
msgid "Restore column order"
@@ -7403,7 +7393,7 @@ msgstr "Sie müssen einen Trigger-Namen angeben"
#: libraries/rte/rte_triggers.lib.php:415
msgid "You must provide a valid event for the trigger"
msgstr ""
-"Sie müssen einen Namen und einen Typ für jeden Trugger-Parameter angeben."
+"Sie müssen einen Namen und einen Typ für jeden Trigger-Parameter angeben"
#: libraries/rte/rte_triggers.lib.php:421
msgid "You must provide a valid table name"
@@ -8054,7 +8044,7 @@ msgid ""
"prefix like \"http://www.example.com/\". The second option is a title for "
"the link."
msgstr ""
-"Zeigt einen Link an; die Spalte enthlt den Dateinamen. Die erste Option ist "
+"Zeigt einen Link an; die Spalte enthält den Dateinamen. Die erste Option ist "
"ein Präfix, wie \"http://www.example.com/\". Die zweite Option ist der "
"darzustellende Titel des Links."
@@ -8303,7 +8293,6 @@ msgid "No databases"
msgstr "Keine Datenbanken"
#: navigation.php:270
-#, fuzzy
#| msgid "filter tables by name"
msgid "Filter tables by name"
msgstr "Tabellen nach Namen filtern"
@@ -10258,7 +10247,7 @@ msgstr "Einführung/Einrichtung"
#: server_status.php:1439
msgid "Done rearranging/editing charts"
-msgstr "Umordnen/bearbeiten der Schaubilder beendet."
+msgstr "Umordnen/bearbeiten der Schaubilder beendet"
#: server_status.php:1446
msgid "Add chart"
@@ -10398,7 +10387,7 @@ msgstr "Divisor hinzufügen"
#: server_status.php:1549
msgid "Append unit to data values"
-msgstr "Einheiten an Datenwerte anfügen."
+msgstr "Einheiten an Datenwerte anfügen"
#: server_status.php:1555
msgid "Add this series"
@@ -10410,7 +10399,7 @@ msgstr "Serien löschen"
#: server_status.php:1560
msgid "Series in Chart:"
-msgstr "Serien im Schaubild"
+msgstr "Serien im Schaubild:"
#: server_status.php:1572
msgid "Log statistics"
@@ -11131,8 +11120,9 @@ msgid "Can't rename index to PRIMARY!"
msgstr "Kann Index nicht in PRIMARY umbenennen!"
#: tbl_indexes.php:91
+#, fuzzy
msgid "No index parts defined!"
-msgstr "Keine Indizes definiert"
+msgstr "Keine Indizes definiert!"
#: tbl_indexes.php:169
msgid "Create a new index"
diff --git a/po/ja.po b/po/ja.po
index a8b7330..6699fa8 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-12 12:32+0200\n"
-"PO-Revision-Date: 2011-08-12 12:25+0200\n"
+"PO-Revision-Date: 2011-08-13 12:52+0200\n"
"Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n"
"Language-Team: japanese <jp(a)li.org>\n"
"Language: ja\n"
@@ -10079,6 +10079,9 @@ msgid ""
"table is supported by MySQL 5.1.6 and onwards. You may still use the server "
"charting features however."
msgstr ""
+"残念ながらお使いのデータベースサーバは、phpMyAdmin "
+"でデータベースのログを分析するために必要である、テーブルのログ機能をサポートしていません。テーブルのログ機能は、MySQL 5.1.6 "
+"以降でサポートされています。ですが、サーバのグラフモニタ機能は使用することができます。"
#: server_status.php:1496
msgid ""
@@ -11390,11 +11393,11 @@ msgstr "リネーム後のビューの名前"
#: po/advisory_rules.php:5
msgid "Uptime below one day"
-msgstr ""
+msgstr "稼働時間が 1 日未満"
#: po/advisory_rules.php:6
msgid "Uptime is less than 1 day, performance tuning may not be accurate."
-msgstr ""
+msgstr "稼働時間は 1 日未満です。パフォーマンスチューニングが正確でない可能性があります。"
#: po/advisory_rules.php:7
msgid ""
@@ -11408,16 +11411,15 @@ msgid "The uptime is only %s"
msgstr ""
#: po/advisory_rules.php:10
-#, fuzzy
#| msgid "Questions"
msgid "Questions below 1,000"
-msgstr "問い合わせ"
+msgstr "問い合わせ数が 1000 以下"
#: po/advisory_rules.php:11
msgid ""
"Fewer than 1,000 questions have been run against this server. The "
"recommendations may not be accurate."
-msgstr ""
+msgstr "このサーバで実行された問い合わせ数が 1000 以下と、十分といえる量がありません。推奨事項は正確でない場合があります。"
#: po/advisory_rules.php:12
msgid ""
@@ -11426,10 +11428,10 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:13
-#, fuzzy, php-format
+#, php-format
#| msgid "Current connection"
msgid "Current amount of Questions: %s"
-msgstr "現在の接続"
+msgstr "現在の問い合わせ総数: %s"
#: po/advisory_rules.php:15
#, fuzzy
@@ -11440,7 +11442,7 @@ msgstr "SQL クエリの表示"
#: po/advisory_rules.php:16
msgid ""
"There is a lot of slow queries compared to the overall amount of Queries."
-msgstr ""
+msgstr "クエリの全体量に対して遅いクエリが多く存在します。"
#: po/advisory_rules.php:17 po/advisory_rules.php:22
msgid ""
@@ -11451,61 +11453,57 @@ msgstr ""
#: po/advisory_rules.php:18
#, php-format
msgid "The slow query rate should be below 5%%, your value is %s%%."
-msgstr ""
+msgstr "遅いクエリの割合は 5%% 未満が推奨です。現在は %s%% です。"
#: po/advisory_rules.php:20
-#, fuzzy
#| msgid "Flush query cache"
msgid "Slow query rate"
-msgstr "クエリキャッシュをフラッシュする"
+msgstr "遅いクエリの割合"
#: po/advisory_rules.php:21
msgid ""
"There is a high percentage of slow queries compared to the server uptime."
-msgstr ""
+msgstr "遅いクエリの割合が高い場合は、サーバの稼働時間と比較してあります。"
#: po/advisory_rules.php:23
#, php-format
msgid ""
"You have a slow query rate of %s per hour, you should have less than 1%% per "
"hour."
-msgstr ""
+msgstr "現在の遅いクエリの割合は 1 時間当たり %s です。推奨値は 1 時間当たり 1%% 未満です。"
#: po/advisory_rules.php:25
-#, fuzzy
#| msgid "SQL queries"
msgid "Long query time"
-msgstr "SQL クエリ"
+msgstr "長いクエリ時間"
#: po/advisory_rules.php:26
msgid ""
"long_query_time is set to 10 seconds or more, thus only slow queries that "
"take above 10 seconds are logged."
-msgstr ""
+msgstr "long_query_time は 10 秒以上に設定されています。従って、10 秒を超える遅いクエリだけがログに記録されます。"
#: po/advisory_rules.php:27
msgid ""
"It is suggested to set {long_query_time} to a lower value, depending on your "
"environment. Usually a value of 1-5 seconds is suggested."
-msgstr ""
+msgstr "環境によっては、{long_query_time} を低い値に設定するほうがいいでしょう。通常、1～5 秒の値が推奨されます。"
#: po/advisory_rules.php:28
-#, fuzzy, php-format
+#, php-format
#| msgid "long_query_time is set to %d second(s)."
msgid "long_query_time is currently set to %ds."
-msgstr "long_query_time は %d 秒に設定されています。"
+msgstr "long_query_time は現在 %d 秒に設定されています。"
#: po/advisory_rules.php:30
-#, fuzzy
#| msgid "Show query box"
msgid "Slow query logging"
-msgstr "クエリボックスを表示"
+msgstr "遅いクエリのログへの記録"
#: po/advisory_rules.php:31
-#, fuzzy
#| msgid "slow_query_log is enabled."
msgid "The slow query log is disabled."
-msgstr "slow_query_log は有効です。"
+msgstr "遅いクエリのログへの記録は無効になっています。"
#: po/advisory_rules.php:32
msgid ""
@@ -11525,45 +11523,44 @@ msgstr "系列をクリアする"
#: po/advisory_rules.php:36
msgid "The MySQL server version less then 5.1."
-msgstr ""
+msgstr "MySQL サーバのバージョンが 5.1 未満です。"
#: po/advisory_rules.php:37
msgid ""
"You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 "
"even more so."
-msgstr ""
+msgstr "アップグレードを推奨します。MySQL 5.1 はパフォーマンスが向上していますし、MySQL 5.5 であれば更に向上しています。"
#: po/advisory_rules.php:38 po/advisory_rules.php:43 po/advisory_rules.php:48
-#, fuzzy, php-format
+#, php-format
#| msgid "Create version"
msgid "Current version: %s"
-msgstr "バージョンを作成"
+msgstr "現在のバージョン: %s"
#: po/advisory_rules.php:40 po/advisory_rules.php:45
-#, fuzzy
#| msgid "Version"
msgid "Minor Version"
-msgstr "バージョン"
+msgstr "マイナーバージョン"
#: po/advisory_rules.php:41
msgid "Version less than 5.1.30 (the first GA release of 5.1)."
-msgstr ""
+msgstr "バージョン 5.1.30 (5.1 の 最初の安定版) 未満です。"
#: po/advisory_rules.php:42
msgid ""
"You should upgrade, as recent versions of MySQL 5.1 have improved "
"performance and MySQL 5.5 even more so."
msgstr ""
+"アップグレードを推奨します。最新バージョンの MySQL 5.1 はパフォーマンスが向上していますし、MySQL 5.5 であれば更に向上しています。"
#: po/advisory_rules.php:46
msgid "Version less than 5.5.8 (the first GA release of 5.5)."
-msgstr ""
+msgstr "バージョン 5.5.8 (5.5 の 最初の安定版) 未満です。"
#: po/advisory_rules.php:47
-#, fuzzy
#| msgid "You should upgrade to %s %s or later."
msgid "You should upgrade, to a stable version of MySQL 5.5"
-msgstr "%s を %s 以降にアップグレードしてください"
+msgstr "安定版 MySQL 5.5 へのアップグレードを推奨します。"
#: po/advisory_rules.php:50 po/advisory_rules.php:55
#, fuzzy
@@ -11592,7 +11589,7 @@ msgstr ""
#: po/advisory_rules.php:57
msgid "Percona documentation is at http://www.percona.com/docs/wiki/"
-msgstr ""
+msgstr "Percona ドキュメントは http://www.percona.com/docs/wiki/ にあります。"
#: po/advisory_rules.php:58
msgid "'percona' found in version_comment"
@@ -11606,7 +11603,7 @@ msgstr "MySQL の文字セット"
#: po/advisory_rules.php:61
msgid "MySQL is not compiled as a 64-bit package."
-msgstr ""
+msgstr "MySQL が、64 ビットのパッケージとしてコンパイルされていません。"
#: po/advisory_rules.php:62
msgid ""
@@ -11621,16 +11618,14 @@ msgid "Available memory on this host: %s"
msgstr ""
#: po/advisory_rules.php:65
-#, fuzzy
#| msgid "Query cache"
msgid "Query cache disabled"
-msgstr "クエリキャッシュ"
+msgstr "クエリキャッシュが無効"
#: po/advisory_rules.php:66
-#, fuzzy
#| msgid "The server is not responding"
msgid "The query cache is not enabled."
-msgstr "サーバが応答しません"
+msgstr "クエリキャッシュが有効になっていません。"
#: po/advisory_rules.php:67
msgid ""
@@ -11661,7 +11656,7 @@ msgstr ""
msgid ""
"The query cache is enabled and the server receives %d queries per second. "
"This rule fires if there is more than 100 queries per second."
-msgstr ""
+msgstr "クエリキャッシュが有効で、サーバが毎秒 %d 個のクエリを受信しています。毎秒 100 個以上のクエリがある場合、このルールが適用されます。"
#: po/advisory_rules.php:75
msgid "Query cache efficiency (%)"
@@ -11678,24 +11673,24 @@ msgstr ""
#: po/advisory_rules.php:78
#, php-format
msgid "The current query cache hit rate of %s%% is below 20%%"
-msgstr ""
+msgstr "現在のクエリキャッシュのヒット率が %s%% と、20%% を下回っています。"
#: po/advisory_rules.php:80
-#, fuzzy
#| msgid "Query cache"
msgid "Que uery cache" :80 ャッシュのヒット率が %s%% と、20%% を下回っています。" ��。毎秒 100 個以上のクエリがある場合、このルールが適用されます。" + `� � ��l/+ P� � � � k�-.+ 6 � � ! � ! �� � `� � x4J/+ P� � �b-.+ ��-.+ �� � `b-.+ /� � �/�/+ uj-.+ �/+ �$�/+ �)�/+ ��..+ x4J/+ P� � � � k�-.+ �! �! �� � `� � H�)/+ 0� � �b-.+ ��-.+ �� � `b-.+ /� � � � � � 8�N.+ �p� `� � uj-.+ ��..+ 0� � � � k�-.+ G H I J K M N O P �� � `� � H� /+ �� � �b-.+ ��-.+ �� � 0/�/+ uj-.+ @J/+ ���.+ �/+ �$�/+ �)�/+ ��..+ H� /+ �� � � � k�-.+ 8� /+ �� � @� � k�-.+ (� /+ �� � p� � k�-.+ � /+ �� � �� � k�-.+ �.�/+ uj-.+ �)�/+ � � �8�.+ ei-.+ �$�/+ @� � y8�.+ ei-.+ �/+ p� � Z8�.+ ei-.+ ���.+ @J/+ ���.+ �/+ �DJ/+ �$�/+ �)�/+ ��..+ 8�N.+ ��.+ `� � p{�.+ � � �� � k�-.+ 5 6 7 8 : < = > ? @ B D �� � `� � ୦.+ `� � uj-.+ �N.+ �� � ��.+ ei-.+ �N.+ �_@f �S Q��l�� ��u.+ `� � ୦.+ 0� � � � k�-.+ u]�� 4Q��U^Qʉ� �u������*ēv�� � `� � H�r.+ D�.+ �� � �P0+ �P0+ ���.+ /� � `� � � � �� � OJ/+ uj-.+ �DJ/+ �� � �P0+ �� � @� � ���������P0+ h� � ry Cache usage"
-msgstr "クエリキャッシュ"
+msgstr "クエリキャッシュの使用状況"
#: po/advisory_rules.php:81
-#, php-format
msgid "Less than 80% of the query cache is being utilized."
-msgstr ""
+msgstr "クエリキャッシュの利用率が 80% 未満です。"
#: po/advisory_rules.php:82
msgid ""
"This might be caused by {query_cache_limit} being too low. Flushing the "
"query cache might help as well."
msgstr ""
+"これは、{query_cache_limit} "
+"が低すぎることが原因であると考えられます。クエリキャッシュをフラッシュすることでも改善されるかもしれません。"
#: po/advisory_rules.php:83
#, php-format
@@ -11739,12 +11734,11 @@ msgid "Query cache low memory prunes"
msgstr ""
#: po/advisory_rules.php:91
-#, fuzzy
#| msgid "The amount of free memory for query cache."
msgid ""
"Cached queries are removed due to low query cache memory from the query "
"cache."
-msgstr "クエリキャッシュの空きメモリ量"
+msgstr "キャッシュされたクエリは、クエリキャッシュメモリが小さいためキャッシュから削除されます。"
#: po/advisory_rules.php:92
msgid ""
@@ -11780,7 +11774,7 @@ msgstr ""
#: po/advisory_rules.php:98
#, php-format
msgid "Current query cache size: %s"
-msgstr ""
+msgstr "現在のクエリキャッシュサイズ: %s"
#: po/advisory_rules.php:100
#, fuzzy
@@ -11791,7 +11785,7 @@ msgstr "クエリの結果"
#: po/advisory_rules.php:101
msgid ""
"The max size of the result set in the query cache is the default of 1 MiB."
-msgstr ""
+msgstr "クエリキャッシュ内の結果セットの最大サイズは、デフォルトの 1 MiB です。"
#: po/advisory_rules.php:102
msgid ""
diff --git a/po/pt.po b/po/pt.po
index 125e330..94cff0d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-12 12:32+0200\n"
-"PO-Revision-Date: 2011-03-26 03:23+0200\n"
-"Last-Translator: <efgpinto(a)gmail.com>\n"
+"PO-Revision-Date: 2011-08-13 19:21+0200\n"
+"Last-Translator: <ldplopes(a)hotmail.com>\n"
"Language-Team: portuguese <pt(a)li.org>\n"
"Language: pt\n"
"MIME-Version: 1.0\n"
@@ -579,7 +579,6 @@ msgid "Words are separated by a space character (\" \")."
msgstr "As palavras são separadas pelo caracter espaço (\" \")."
#: db_search.php:292
-#, fuzzy
#| msgid "Inside table(s):"
msgid "Inside tables:"
msgstr "Dentro de Tabela(s):"
@@ -713,15 +712,13 @@ msgid "Analyze table"
msgstr "Analizar tabela"
#: db_structure.php:515
-#, fuzzy
msgid "Add prefix to table"
-msgstr "Sem bases de dados"
+msgstr "Adicionar prefixo à tabela"
#: db_structure.php:517 libraries/mult_submits.inc.php:251
-#, fuzzy
#| msgid "Replace table data with file"
msgid "Replace table prefix"
-msgstr "Substituir os dados da tabela pelos do arquivo"
+msgstr "Substituir prefixo da tabela"
#: db_structure.php:519 libraries/mult_submits.inc.php:251
#, fuzzy
diff --git a/po/sv.po b/po/sv.po
index e12173d..60c16a8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-12 12:32+0200\n"
-"PO-Revision-Date: 2011-07-31 21:19+0200\n"
+"PO-Revision-Date: 2011-08-15 01:24+0200\n"
"Last-Translator: <stefan(a)inkopsforum.se>\n"
"Language-Team: swedish <sv(a)li.org>\n"
"Language: sv\n"
@@ -413,10 +413,10 @@ msgid "You have to choose at least one column to display"
msgstr "Du måste välja minst en kolumn som ska visas"
#: db_qbe.php:186
-#, fuzzy, php-format
+#, php-format
#| msgid "visual builder"
msgid "Switch to %svisual builder%s"
-msgstr "grafisk modellerare"
+msgstr "Växla till %sgrafisk modellerare%s"
#: db_qbe.php:222 libraries/db_structure.lib.php:90
#: libraries/display_tbl.lib.php:955
@@ -1119,10 +1119,9 @@ msgid "Query statistics"
msgstr "Visa statistik"
#: js/messages.php:93
-#, fuzzy
#| msgid "Failed to read configuration file"
msgid "Local monitor configuration icompatible"
-msgstr "Kunde inte läsa konfigurationsfilen"
+msgstr "Lokal övervakningskonfiguration ej kompatibel"
#: js/messages.php:94
msgid ""
diff --git a/po/ta.po b/po/ta.po
index 1676c41..228601d 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,20 +7,20 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-12 12:32+0200\n"
-"PO-Revision-Date: 2010-04-16 10:43+0200\n"
-"Last-Translator: Sutharshan <sutharshan02(a)gmail.com>\n"
+"PO-Revision-Date: 2011-08-14 22:35+0200\n"
+"Last-Translator: சுரேஸ்குமார் செல்வநாயகம் <saskumar(a)hotmail.com>\n"
"Language-Team: Tamil <ta(a)li.org>\n"
"Language: ta\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: Pootle 2.0.1\n"
+"X-Generator: Pootle 2.0.5\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:284
#: libraries/display_tbl.lib.php:358 server_privileges.php:1670
msgid "Show all"
-msgstr ""
+msgstr "அனைத்தையும் காட்டு"
#: browse_foreigners.php:70 libraries/PDF.class.php:42
#: libraries/common.lib.php:2258
@@ -29,7 +29,7 @@ msgstr ""
#: libraries/schema/User_Schema.class.php:355
#: libraries/select_lang.lib.php:482
msgid "Page number:"
-msgstr "ஓலை என்"
+msgstr "பக்க எண்"
#: browse_foreigners.php:133
msgid ""
@@ -37,13 +37,16 @@ msgid ""
"parent window, or your browser's security settings are configured to block "
"cross-window updates."
msgstr ""
+"இலக்கு உலாவி சாளரம் மேம்படுத்தப்பட முடியவில்லை. ஒருவேளை நீங்கள் மூல சாளரத்தை "
+"மூடியிருக்க வேண்டும், அல்லது உங்கள் உலாவி பாதுகாப்பு அமைப்புகள் "
+"குறுக்கு-சாளர மேம்படுத்தல்களை தடுக்க உள்ளமைக்கப்பட்டிருக்கின்றன."
#: browse_foreigners.php:151 libraries/common.lib.php:2869
#: libraries/common.lib.php:2876 libraries/common.lib.php:3062
#: libraries/common.lib.php:3063 libraries/db_links.inc.php:60
#: libraries/tbl_links.inc.php:68
msgid "Search"
-msgstr "தேடல்"
+msgstr "தேடு"
#: browse_foreigners.php:154 db_operations.php:369 db_operations.php:409
#: db_operations.php:517 db_operations.php:544 db_search.php:329
@@ -84,31 +87,31 @@ msgstr "செல் "
#: browse_foreigners.php:169 browse_foreigners.php:173
#: libraries/Index.class.php:432 tbl_tracking.php:304
msgid "Keyname"
-msgstr ""
+msgstr "முக்கியபெயர்"
#: browse_foreigners.php:170 browse_foreigners.php:172
#: server_collations.php:54 server_collations.php:66 server_engines.php:56
#: server_status.php:1353
msgid "Description"
-msgstr ""
+msgstr "விளக்கம்"
#: browse_foreigners.php:249 browse_foreigners.php:258
#: browse_foreigners.php:270 browse_foreigners.php:278
msgid "Use this value"
-msgstr ""
+msgstr "இந்த மதிப்பை பயன்படுத்துக"
#: bs_disp_as_mime_type.php:29 bs_play_media.php:35
#: libraries/blobstreaming.lib.php:343
msgid "No blob streaming server configured!"
-msgstr ""
+msgstr "Blob தொடரோடி சேவையகம் கட்டமைக்கப்படவில்லை!"
#: bs_disp_as_mime_type.php:35
msgid "Failed to fetch headers"
-msgstr ""
+msgstr "தலைப்புக்களைப் பெறுவதில் தவறியது."
#: bs_disp_as_mime_type.php:41
msgid "Failed to open remote URL"
-msgstr ""
+msgstr "தொலை URL திறக்க தவறியது"
#: changelog.php:32 license.php:28
#, php-format
@@ -116,21 +119,23 @@ msgid ""
"The %s file is not available on this system, please visit www.phpmyadmin.net "
"for more information."
msgstr ""
+"%s கோப்பு இந்த அமைப்பில் இல்லை, மேலும் தகவலுக்கு www.phpmyadmin.net "
+"செல்லுங்கள்"
#: db_create.php:58
#, php-format
msgid "Database %1$s has been created."
-msgstr ""
+msgstr "%1$s தரவுத்தளம் உருவாக்கப்பட்டது"
#: db_datadict.php:48 db_operations.php:362
msgid "Database comment: "
-msgstr ""
+msgstr "தரவுத்தள கருத்துரை"
#: db_datadict.php:157 libraries/schema/Pdf_Relation_Schema.class.php:1032
#: libraries/tbl_properties.inc.php:700 tbl_operations.php:366
#: tbl_printview.php:124
msgid "Table comments"
-msgstr ""
+msgstr "அட்டவணைக் கருத்துரைகள்"
#: db_datadict.php:166 db_qbe.php:196 libraries/Index.class.php:436
#: libraries/export/htmlword.php:251 libraries/export/latex.php:361
@@ -141,7 +146,7 @@ msgstr ""
#: tbl_indexes.php:196 tbl_printview.php:136 tbl_relation.php:399
#: tbl_select.php:114 tbl_tracking.php:257 tbl_tracking.php:308
msgid "Column"
-msgstr ""
+msgstr "நிரல்"
#: db_datadict.php:167 db_printview.php:104 libraries/Index.class.php:433
#: libraries/db_structure.lib.php:46 libraries/export/htmlword.php:252
@@ -157,7 +162,7 @@ msgstr ""
#: tbl_printview.php:277 tbl_select.php:115 tbl_structure.php:203
#: tbl_structure.php:761 tbl_tracking.php:258 tbl_tracking.php:305
msgid "Type"
-msgstr ""
+msgstr "வகை"
#: db_datadict.php:169 libraries/Index.class.php:439
#: libraries/export/htmlword.php:253 libraries/export/latex.php:361
@@ -168,7 +173,7 @@ msgstr ""
#: tbl_printview.php:139 tbl_structure.php:206 tbl_tracking.php:260
#: tbl_tracking.php:311
msgid "Null"
-msgstr ""
+msgstr "வெற்று"
#: db_datadict.php:170 db_structure.php:454 libraries/export/htmlword.php:254
#: libraries/export/latex.php:361 libraries/export/odt.php:297
@@ -178,7 +183,7 @@ msgstr ""
#: libraries/tbl_properties.inc.php:109 tbl_printview.php:140
#: tbl_structure.php:207 tbl_tracking.php:261
msgid "Default"
-msgstr ""
+msgstr "முன்னிருப்பு"
#: db_datadict.php:174 libraries/export/htmlword.php:256
#: libraries/export/latex.php:363 libraries/export/odt.php:301
@@ -186,7 +191,7 @@ msgstr ""
#: libraries/schema/Pdf_Relation_Schema.class.php:1064
#: libraries/schema/Pdf_Relation_Schema.class.php:1085 tbl_printview.php:144
msgid "Links to"
-msgstr ""
+msgstr "இணைப்பு"
#: db_datadict.php:176 db_printview.php:110
#: libraries/config/messages.inc.php:94 libraries/config/messages.inc.php:109
@@ -197,7 +202,7 @@ msgstr ""
#: libraries/schema/Pdf_Relation_Schema.class.php:1086
#: libraries/tbl_properties.inc.php:132 tbl_printview.php:146
msgid "Comments"
-msgstr ""
+msgstr "கருத்துரைகள்"
#: db_datadict.php:237 js/messages.php:226 libraries/Index.class.php:349
#: libraries/Index.class.php:376 libraries/Index.class.php:674
@@ -213,7 +218,7 @@ msgstr ""
#: server_privileges.php:2355 sql.php:271 sql.php:332 tbl_printview.php:194
#: tbl_structure.php:347 tbl_tracking.php:321 tbl_tracking.php:326
msgid "No"
-msgstr ""
+msgstr "இல்லை"
#: db_datadict.php:237 js/messages.php:225 libraries/Index.class.php:350
#: libraries/Index.class.php:375 libraries/Index.class.php:674
@@ -235,79 +240,79 @@ msgstr ""
#: tbl_printview.php:194 tbl_structure.php:41 tbl_structure.php:347
#: tbl_tracking.php:319 tbl_tracking.php:324
msgid "Yes"
-msgstr ""
+msgstr "ஆம்"
#: db_datadict.php:291 db_printview.php:264 tbl_printview.php:462
msgid "Print"
-msgstr ""
+msgstr "அச்சிடு"
#: db_export.php:26
msgid "View dump (schema) of database"
-msgstr ""
+msgstr "தரவுத்தளத்தின் திட்ட வடிவத்தைப் பார்"
#: db_export.php:30 db_printview.php:94 db_qbe.php:101 db_tracking.php:48
#: export.php:356 navigation.php:296
msgid "No tables found in database."
-msgstr ""
+msgstr "அட்டவணைகள் எதுவும் தரவுத்தளத்தில் காணப்படவில்லை"
#: db_export.php:40 db_search.php:311 server_export.php:26
msgid "Select All"
-msgstr ""
+msgstr "அனைத்தையும் தெரிவுசெய்"
#: db_export.php:42 db_search.php:314 server_export.php:28
msgid "Unselect All"
-msgstr ""
+msgstr "அனைத்து தெரிவுகளையும் நீக்கு"
#: db_operations.php:41 tbl_create.php:22
msgid "The database name is empty!"
-msgstr ""
+msgstr "தரவுத்தளப் பெயர் வெறுமையாக உள்ளது"
#: db_operations.php:272
#, php-format
msgid "Database %s has been renamed to %s"
-msgstr ""
+msgstr "%s தரவுத்தளமானது %s ஆக பெயர் மாற்றப்பட்டது"
#: db_operations.php:276
#, php-format
msgid "Database %s has been copied to %s"
-msgstr ""
+msgstr "%s தரவுத்தளமானது %s இற்கு பிரதி செய்யப்பட்டது"
#: db_operations.php:403
msgid "Rename database to"
-msgstr ""
+msgstr "தரவுத்தளத்தைப் பெயர் மாற்ற"
#: db_operations.php:427
msgid "Remove database"
-msgstr ""
+msgstr "தரவுத்தளத்தை நீக்கு"
#: db_operations.php:439
#, php-format
msgid "Database %s has been dropped."
-msgstr ""
+msgstr "%s தரவுத்தளம் இரத்துசெய்யப்பட்டது"
#: db_operations.php:444
msgid "Drop the database (DROP)"
-msgstr ""
+msgstr "தரவுத்தளத்தை இரத்து செய் (DROP)"
#: db_operations.php:473
msgid "Copy database to"
-msgstr ""
+msgstr "தரவுத்தளத்தை பிரதிசெய்"
#: db_operations.php:480 tbl_operations.php:552 tbl_tracking.php:409
msgid "Structure only"
-msgstr ""
+msgstr "கட்டமைப்பை மட்டும்"
#: db_operations.php:481 tbl_operations.php:553 tbl_tracking.php:411
msgid "Structure and data"
-msgstr ""
+msgstr "கட்டமைப்பு மற்றும் தரவுகள்"
#: db_operations.php:482 tbl_operations.php:554 tbl_tracking.php:410
msgid "Data only"
-msgstr ""
+msgstr "தரவுகளை மட்டும்"
#: db_operations.php:490
msgid "CREATE DATABASE before copying"
-msgstr ""
+msgstr "பிரதிசெய்யமுன் தரவுத்தளத்தை உருவாக்கு"
#: db_operations.php:493 libraries/config/messages.inc.php:126
#: libraries/config/messages.inc.php:127 libraries/config/messages.inc.php:129
@@ -319,15 +324,15 @@ msgstr "%sஐ சேர்க்க"
#: db_operations.php:497 libraries/config/messages.inc.php:119
#: tbl_operations.php:318 tbl_operations.php:562
msgid "Add AUTO_INCREMENT value"
-msgstr "தானாக அதிகரிக்கும் பெறுமதியை சேர்க்க"
+msgstr "தானாக அதிகரிக்கும் பெறுமதியை சேர்"
#: db_operations.php:501 tbl_operations.php:569
msgid "Add constraints"
-msgstr "தடைகளை சேர்க்க"
+msgstr "கட்டுப்பாடுகளை சேர்க்க"
#: db_operations.php:514
msgid "Switch to copied database"
-msgstr ""
+msgstr "பிரதியான தரவுதளத்துக்கு மாறு"
#: db_operations.php:537 libraries/Index.class.php:438
#: libraries/build_html_for_db.lib.php:20 libraries/db_structure.lib.php:48
@@ -337,7 +342,7 @@ msgstr ""
#: tbl_structure.php:204 tbl_structure.php:866 tbl_tracking.php:259
#: tbl_tracking.php:310
msgid "Collation"
-msgstr ""
+msgstr "அடுக்கு"
#: db_operations.php:550
#, php-format
@@ -345,10 +350,12 @@ msgid ""
"The phpMyAdmin configuration storage has been deactivated. To find out why "
"click %shere%s."
msgstr ""
+"PhpMyAdmin கட்டமைப்பு சேமிப்பகம் முடக்க செய்யப்பட்டுள்ளது. ஏன் எனக் "
+"கண்டுபிடிக்க %shere%s கிளிக் செய்யவும்"
#: db_operations.php:584
msgid "Edit or export relational schema"
-msgstr ""
+msgstr "தொடர்புசார் திட்டத்தை திருத்த அல்லது ஏற்ற"
#: db_printview.php:102 db_tracking.php:85 db_tracking.php:186
#: libraries/config/messages.inc.php:502 libraries/db_structure.lib.php:32
@@ -359,7 +366,7 @@ msgstr ""
#: server_privileges.php:1888 server_privileges.php:2152
#: server_synchronize.php:399 server_synchronize.php:826 tbl_tracking.php:634
msgid "Table"
-msgstr ""
+msgstr "அட்டவணை"
#: db_printview.php:103 libraries/build_html_for_db.lib.php:31
#: libraries/db_structure.lib.php:42 libraries/header_printview.inc.php:62
@@ -367,131 +374,129 @@ msgstr ""
#: tbl_printview.php:358 tbl_structure.php:362 tbl_structure.php:468
#: tbl_structure.php:876
msgid "Rows"
-msgstr ""
+msgstr "வரிசைகள்"
#: db_printview.php:107 libraries/db_structure.lib.php:53 tbl_indexes.php:197
msgid "Size"
-msgstr ""
+msgstr "அளவு"
#: db_printview.php:160 db_structure.php:410 libraries/export/sql.php:756
msgid "in use"
-msgstr ""
+msgstr "பயன்பாட்டில்"
#: db_printview.php:185 libraries/db_info.inc.php:61
#: libraries/export/sql.php:711
#: libraries/schema/Pdf_Relation_Schema.class.php:1037 tbl_printview.php:398
#: tbl_structure.php:908
msgid "Creation"
-msgstr ""
+msgstr "உருவாக்கம்"
#: db_printview.php:194 libraries/db_info.inc.php:66
#: libraries/export/sql.php:716
#: libraries/schema/Pdf_Relation_Schema.class.php:1042 tbl_printview.php:408
#: tbl_structure.php:916
msgid "Last update"
-msgstr ""
+msgstr "இறுதி இற்றைப்படுத்தல்"
#: db_printview.php:203 libraries/db_info.inc.php:71
#: libraries/export/sql.php:721
#: libraries/schema/Pdf_Relation_Schema.class.php:1047 tbl_printview.php:418
#: tbl_structure.php:924
msgid "Last check"
-msgstr ""
+msgstr "கடைசி சோதனை"
#: db_printview.php:220 db_structure.php:433
#, php-format
msgid "%s table"
msgid_plural "%s tables"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s அட்டவணை"
+msgstr[1] "%s அட்டவணைகள்"
#: db_qbe.php:41
msgid "You have to choose at least one column to display"
-msgstr ""
+msgstr "காட்சிப்படுத்த நீங்கள் குறைந்தபட்சம் ஒரு நிரலை தேர்ந்தெடுக்க வேண்டும்"
#: db_qbe.php:186
#, php-format
msgid "Switch to %svisual builder%s"
-msgstr ""
+msgstr "%s காட்சி கட்டுனர் இற்கு %s மாற்றவும்"
#: db_qbe.php:222 libraries/db_structure.lib.php:90
#: libraries/display_tbl.lib.php:955
msgid "Sort"
-msgstr ""
+msgstr "வரிசைப்படுத்து"
#: db_qbe.php:231 db_qbe.php:265 libraries/db_structure.lib.php:97
#: libraries/display_tbl.lib.php:547 libraries/display_tbl.lib.php:916
#: server_databases.php:157 server_databases.php:174 tbl_operations.php:279
#: tbl_select.php:305
msgid "Ascending"
-msgstr ""
+msgstr "ஏறுவரிசை"
#: db_qbe.php:232 db_qbe.php:273 libraries/db_structure.lib.php:105
#: libraries/display_tbl.lib.php:552 libraries/display_tbl.lib.php:913
#: server_databases.php:157 server_databases.php:174 tbl_operations.php:280
#: tbl_select.php:306
msgid "Descending"
-msgstr ""
+msgstr "இறங்குவரிசை"
#: db_qbe.php:286 db_tracking.php:91 libraries/display_tbl.lib.php:422
#: tbl_change.php:282 tbl_tracking.php:639
msgid "Show"
-msgstr ""
+msgstr "காண்பி"
#: db_qbe.php:322
msgid "Criteria"
-msgstr ""
+msgstr "தேர்வளவை"
#: db_qbe.php:375 db_qbe.php:457 db_qbe.php:549 db_qbe.php:580
msgid "Ins"
-msgstr ""
+msgstr "துணைநிரல்கள்"
#: db_qbe.php:379 db_qbe.php:461 db_qbe.php:546 db_qbe.php:577
msgid "And"
-msgstr ""
+msgstr "மற்றும்"
#: db_qbe.php:388 db_qbe.php:469 db_qbe.php:551 db_qbe.php:582
msgid "Del"
-msgstr ""
+msgstr "அழி"
#: db_qbe.php:392 db_qbe.php:473 db_qbe.php:544 db_qbe.php:575
#: server_privileges.php:394 tbl_change.php:890 tbl_indexes.php:264
#: tbl_select.php:279
msgid "Or"
-msgstr ""
+msgstr "அல்லது"
#: db_qbe.php:529
msgid "Modify"
-msgstr ""
+msgstr "மாற்று"
#: db_qbe.php:606
-#, fuzzy
#| msgid "Add/Delete Criteria Row"
msgid "Add/Delete criteria rows"
-msgstr "விதி நிரைகளை சேர்க்க/ நீக்குக"
+msgstr "விதி நிரைகளை சேர்க்க/ நீக்க"
#: db_qbe.php:618
-#, fuzzy
#| msgid "Add/Delete Field Columns"
msgid "Add/Delete columns"
-msgstr "கள நிரல்களை சேர்க்க/ நீக்குக"
+msgstr "நெடுவரிசைகள் சேர்க்க/ நீக்க"
#: db_qbe.php:631 db_qbe.php:656
msgid "Update Query"
-msgstr ""
+msgstr "வினவலை புதுப்பி"
#: db_qbe.php:639
msgid "Use Tables"
-msgstr ""
+msgstr "அட்டவணைகளை பயன்படுத்துக"
#: db_qbe.php:662
#, php-format
msgid "SQL query on database <b>%s</b>:"
-msgstr ""
+msgstr "தரவுத்தளம் மீது <b>%s</b SQL வினவல்:"
#: db_qbe.php:955 libraries/common.lib.php:1137
msgid "Submit Query"
-msgstr ""
+msgstr "வினவலை சமர்ப்பி"
#: db_search.php:30 libraries/auth/config.auth.lib.php:77
#: libraries/auth/config.auth.lib.php:96
@@ -502,42 +507,42 @@ msgstr "அனுமதி நிராகரிக்கப்பட்டு
#: db_search.php:42 db_search.php:278
msgid "at least one of the words"
-msgstr ""
+msgstr "குறைந்தபட்சம் ஒரு சொல்லையாவது"
#: db_search.php:43 db_search.php:279
msgid "all words"
-msgstr ""
+msgstr "அனைத்து சொற்களும்"
#: db_search.php:44 db_search.php:280
msgid "the exact phrase"
-msgstr ""
+msgstr "சரியான சொற்றொடர்"
#: db_search.php:45 db_search.php:281
msgid "as regular expression"
-msgstr ""
+msgstr "வழக்கமான வெளிப்பாடு"
#: db_search.php:200
#, php-format
msgid "Search results for \"<i>%s</i>\" %s:"
-msgstr ""
+msgstr "\"<i>%s</i>\" %s இற்கான தேடல் முடிவுகள்:"
#: db_search.php:218
#, php-format
msgid "%s match inside table <i>%s</i>"
msgid_plural "%s matches inside table <i>%s</i>"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s அட்டவணையில் பொருந்தியவை <i>%s</i>"
+msgstr[1] "%s அட்டவணையில் பொருந்தியவைகள் <i>%s</i>"
#: db_search.php:225 libraries/common.lib.php:2871
#: libraries/common.lib.php:3060 libraries/common.lib.php:3061
#: libraries/tbl_links.inc.php:55 tbl_structure.php:566
msgid "Browse"
-msgstr ""
+msgstr "உலாவு"
#: db_search.php:230
#, php-format
msgid "Delete the matches for the %s table?"
-msgstr ""
+msgstr "%s அட்டவணையில் பொருத்தப்பாடுகளை நீக்குவதா?"
#: db_search.php:230 libraries/display_tbl.lib.php:1362
#: libraries/display_tbl.lib.php:2342
@@ -549,47 +554,47 @@ msgstr ""
#: setup/frames/index.inc.php:139 setup/frames/index.inc.php:230
#: tbl_tracking.php:426 tbl_tracking.php:447 tbl_tracking.php:504
msgid "Delete"
-msgstr ""
+msgstr "அழி"
#: db_search.php:243
#, php-format
msgid "<b>Total:</b> <i>%s</i> match"
msgid_plural "<b>Total:</b> <i>%s</i> matches"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "<b>மொத்தம்:</b> <i>%s</i> பொருத்தம்"
+msgstr[1] "<b>மொத்த:</b> <i>%s</i> பொருத்தங்கள்"
#: db_search.php:266
msgid "Search in database"
-msgstr ""
+msgstr "தரவுத்தளத்தில் தேடு"
#: db_search.php:269
msgid "Words or values to search for (wildcard: \"%\"):"
-msgstr ""
+msgstr "தேட வார்த்தைகள் அல்லது மதிப்புகள் (குழுக்குறி: \"%\"):"
#: db_search.php:274
msgid "Find:"
-msgstr ""
+msgstr "கண்டறி:"
#: db_search.php:278 db_search.php:279
msgid "Words are separated by a space character (\" \")."
-msgstr ""
+msgstr "சொற்கள் ஓர் இடைவெளி எழுத்தால் (\" \") பிரிக்கப்பட்டிருக்கும்."
#: db_search.php:292
msgid "Inside tables:"
-msgstr ""
+msgstr "அட்டவணைகளில்:"
#: db_search.php:322
msgid "Inside column:"
-msgstr ""
+msgstr "நிரல் உள்ளே:"
#: db_structure.php:61
msgid "No tables found in database"
-msgstr ""
+msgstr "தரவுத்தளத்தில் அட்டவணைகள் எதுவுமில்லை"
#: db_structure.php:271 tbl_operations.php:692
#, php-format
msgid "Table %s has been emptied"
-msgstr ""
+msgstr "%s அட்டவணை வெறுமை செய்யப்பட்டது"
#: db_structure.php:280 tbl_operations.php:709
#, php-format
diff --git a/po/tr.po b/po/tr.po
index 32fd16c..3bcc5fb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-12 12:32+0200\n"
-"PO-Revision-Date: 2011-08-11 22:58+0200\n"
+"PO-Revision-Date: 2011-08-14 22:02+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
"Language: tr\n"
@@ -1120,10 +1120,9 @@ msgid "Query statistics"
msgstr "Sorgu istatistikleri"
#: js/messages.php:93
-#, fuzzy
#| msgid "Failed to read configuration file"
msgid "Local monitor configuration icompatible"
-msgstr "Yapılandırma dosyasını okuma başarısız"
+msgstr "Yerel izleme yapılandırması uyumsuz"
#: js/messages.php:94
msgid ""
@@ -1132,24 +1131,25 @@ msgid ""
"likely that your current configuration will not work anymore. Please reset "
"your configuration to default in the <i>Settings</i> menu."
msgstr ""
+"Tarayıcınızın yerel depolamasındaki çizelge ayarlama yapılandırması, izleme "
+"iletisinin en yeni sürümüyle daha fazla uyumlu değil. Şu anki yapılandırma "
+"büyük olasılıkla bundan sonra çalışmayacak. Lütfen <i>Ayarlar</i> menüsünden "
+"yapılandırmanızı varsayılana sıfırlayın."
#: js/messages.php:96
-#, fuzzy
#| msgid "Query cache disabled"
msgid "Query cache efficiency"
-msgstr "Sorgu önbelleği etkisizleştirildi"
+msgstr "Sorgu önbelleği verimi"
#: js/messages.php:97 po/advisory_rules.php:70
-#, fuzzy
#| msgid "Query Cache usage"
msgid "Query cache usage"
-msgstr "Sorgu Önbelleği kullanımı"
+msgstr "Sorgu önbelleği kullanımı"
#: js/messages.php:98
-#, fuzzy
#| msgid "Query Cache usage"
msgid "Query cache used"
-msgstr "Sorgu Önbelleği kullanımı"
+msgstr "Kullanılan sorgu önbelleği"
#: js/messages.php:100
msgid "System CPU Usage"
@@ -5672,7 +5672,7 @@ msgid ""
"The increment size for extending the size of an autoextending tablespace "
"when it becomes full."
msgstr ""
-" Tablo dolduğunda otomatik genişleyen tablo alanının genişlemesi için artış "
+"Tablo dolduğunda otomatik genişleyen tablo alanının genişlemesi için artış "
"miktarı boyutu."
#: libraries/engines/innodb.lib.php:32
@@ -7645,7 +7645,7 @@ msgstr "Sınırlayıcı"
#: libraries/sql_query_form.lib.php:346
msgid "Show this query here again"
-msgstr "Bu sorguyu burada tekrar göster "
+msgstr "Bu sorguyu burada tekrar göster"
#: libraries/sql_query_form.lib.php:402
msgid "View only"
@@ -8770,7 +8770,7 @@ msgstr "Tabloya özgü yetkiler"
#: server_privileges.php:531 server_privileges.php:675
#: server_privileges.php:1697
msgid "Note: MySQL privilege names are expressed in English"
-msgstr "Not: MySQL yetki adları İngilizce olarak belirtilir "
+msgstr "Not: MySQL yetki adları İngilizce olarak belirtilir"
#: server_privileges.php:600
msgid "Administration"
@@ -8943,7 +8943,7 @@ msgid ""
"... delete the old one from the user tables and reload the privileges "
"afterwards."
msgstr ""
-" ... eski olanı kullanıcı tablolarından sil ve sonra da yetkileri yeniden "
+"... eski olanı kullanıcı tablolarından sil ve sonra da yetkileri yeniden "
"yükle."
#: server_privileges.php:2201
@@ -10190,10 +10190,9 @@ msgstr ""
"defa boşaltmak daha fazla izlemeyi gerektirmez."
#: server_status.php:1513
-#, fuzzy
#| msgid "Remove chart"
msgid "Preset chart"
-msgstr "Çizelgeyi kaldır"
+msgstr "Hazır çizelge"
#: server_status.php:1517
msgid "Status variable(s)"
@@ -10765,7 +10764,7 @@ msgstr "Tablo %1$s başarılı olarak değiştirldi"
#: tbl_change.php:683
msgid "Because of its length,<br /> this column might not be editable"
-msgstr "Uzunluğu nedeniyle,<br /> bu sütun düzenlenebilir olmayabilir "
+msgstr "Uzunluğu nedeniyle,<br /> bu sütun düzenlenebilir olmayabilir"
#: tbl_change.php:800
msgid "Remove BLOB Repository Reference"
@@ -11123,7 +11122,7 @@ msgstr "Satır uzunluğu"
#: tbl_printview.php:378 tbl_structure.php:892
msgid "Row size"
-msgstr "Satır boyutu "
+msgstr "Satır boyutu"
#: tbl_printview.php:388 tbl_structure.php:900
msgid "Next autoindex"
@@ -11468,11 +11467,13 @@ msgid ""
"To have more accurate averages it is recommended to let the server run for "
"longer than a day before running this analyzer"
msgstr ""
+"Daha kesin ortalamalara sahip olmak için bu çözümleyiciyi çalıştırmadan önce "
+"sunucunun bir günden daha fazla çalıştırılmasına izin vermek önerilir"
#: po/advisory_rules.php:8
#, php-format
msgid "The uptime is only %s"
-msgstr ""
+msgstr "Çalışma zamanı sadece %s"
#: po/advisory_rules.php:10
msgid "Questions below 1,000"
@@ -11483,12 +11484,16 @@ msgid ""
"Fewer than 1,000 questions have been run against this server. The "
"recommendations may not be accurate."
msgstr ""
+"1,000 sorudan daha azı bu sunucuya karşı çalışır. Tavsiyeler kesin "
+"olmayabilir."
#: po/advisory_rules.php:12
msgid ""
"Let the server run for a longer time until it has executed a greater amount "
"of queries."
msgstr ""
+"Sorguların büyük bir miktarını çalıştırana kadar uzun bir süre için "
+"sunucunun çalıştırmasına izin verir."
#: po/advisory_rules.php:13
#, php-format
@@ -11496,37 +11501,37 @@ msgid "Current amount of Questions: %s"
msgstr "Şu anki Soru miktarı: %s"
#: po/advisory_rules.php:15
-#, fuzzy
#| msgid "% slow queries"
msgid "Percentage of slow queries"
-msgstr "% yavaş sorgular"
+msgstr "Yavaş sorguların yüzdesi"
#: po/advisory_rules.php:16
msgid ""
"There is a lot of slow queries compared to the overall amount of Queries."
-msgstr ""
+msgstr "Sorguların tüm miktarına nazaran çok yavaş sorgular var."
#: po/advisory_rules.php:17 po/advisory_rules.php:22
msgid ""
"You might want to increase {long_query_time} or optimize the queries listed "
"in the slow query log"
msgstr ""
+"{long_query_time} değerini arttırmak isteyebilir ya da yavaş sorgu "
+"günlüğünde listelenen sorguları uyarlamak isteyebilirsiniz"
#: po/advisory_rules.php:18
#, php-format
msgid "The slow query rate should be below 5%%, your value is %s%%."
-msgstr ""
+msgstr "Yavaş sorgu oranı %%5'in altında olmalıdır, sizin değeriniz %%%s."
#: po/advisory_rules.php:20
-#, fuzzy
#| msgid "slow query rate"
msgid "Slow query rate"
-msgstr "yavaş sorgu oranı"
+msgstr "Yavaş sorgu oranı"
#: po/advisory_rules.php:21
msgid ""
"There is a high percentage of slow queries compared to the server uptime."
-msgstr ""
+msgstr "Sunucu çalışma zamanına nazaran yavaş sorguların yüzdesi yüksek."
#: po/advisory_rules.php:23
#, php-format
@@ -11534,6 +11539,8 @@ msgid ""
"You have a slow query rate of %s per hour, you should have less than 1%% per "
"hour."
msgstr ""
+"Saat başına %s yavaş sorgu oranına sahipsiniz, saat başına %%1'den daha "
+"azına sahip olmalısınız."
#: po/advisory_rules.php:25
msgid "Long query time"
@@ -11544,12 +11551,16 @@ msgid ""
"long_query_time is set to 10 seconds or more, thus only slow queries that "
"take above 10 seconds are logged."
msgstr ""
+"long_query_time 10 saniyeye ya da daha fazlasına ayarlı, bu nedenle sadece "
+"yavaş sorguların günlüklenmesi 10 saniyenin üzerinde bir zaman alır."
#: po/advisory_rules.php:27
msgid ""
"It is suggested to set {long_query_time} to a lower value, depending on your "
"environment. Usually a value of 1-5 seconds is suggested."
msgstr ""
+"Ortamınıza bağlı olarak {long_query_time} değerinin daha düşük bir değere "
+"ayarlanması önerilir. Genellikle 1-5 saniye değeri önerilir."
#: po/advisory_rules.php:28
#, php-format
@@ -11569,10 +11580,13 @@ msgid ""
"Enable slow query logging by setting {log_slow_queries} to 'ON'. This will "
"help troubleshooting badly performing queries."
msgstr ""
+"{log_slow_queries} ayarını 'ON' yaparak yavaş sorgu günlüklemeyi "
+"etkinleştirin. Bu, kötü bir şekilde yürütülen sorguların sorunlarını "
+"gidermede yardımcı olacaktır."
#: po/advisory_rules.php:33
msgid "log_slow_queries is set to 'OFF'"
-msgstr ""
+msgstr "log_slow_queries 'OFF'a ayarlı"
#: po/advisory_rules.php:35
msgid "Release Series"
@@ -11580,13 +11594,15 @@ msgstr "Diziyi Yayımla"
#: po/advisory_rules.php:36
msgid "The MySQL server version less then 5.1."
-msgstr ""
+msgstr "MySQL sunucusu sürümü 5.1'den az."
#: po/advisory_rules.php:37
msgid ""
"You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 "
"even more so."
msgstr ""
+"Geliştirilmiş performansa sahip MySQL 5.1'e ve daha çok MySQL 5.5'e "
+"yükseltmelisiniz."
#: po/advisory_rules.php:38 po/advisory_rules.php:43 po/advisory_rules.php:48
#, php-format
@@ -11599,17 +11615,19 @@ msgstr "İkincil Sürüm"
#: po/advisory_rules.php:41
msgid "Version less than 5.1.30 (the first GA release of 5.1)."
-msgstr ""
+msgstr "Sürüm, 5.1.30'dan az (5.1'in ilk GA yayımı)."
#: po/advisory_rules.php:42
msgid ""
"You should upgrade, as recent versions of MySQL 5.1 have improved "
"performance and MySQL 5.5 even more so."
msgstr ""
+"Geliştirilmiş performansa sahip MySQL 5.1'in en son sürümüne ve daha çok "
+"MySQL 5.5'e yükseltmelisiniz."
#: po/advisory_rules.php:46
msgid "Version less than 5.5.8 (the first GA release of 5.5)."
-msgstr ""
+msgstr "Sürüm, 5.5.8'den az (5.5'in ilk GA yayımı)."
#: po/advisory_rules.php:47
msgid "You should upgrade, to a stable version of MySQL 5.5"
@@ -11621,7 +11639,7 @@ msgstr "Dağıtım"
#: po/advisory_rules.php:51
msgid "Version is compiled from source, not a MySQL official binary."
-msgstr ""
+msgstr "Sürüm, kaynaktan derlenmiş, MySQL resmi binariden değil."
#: po/advisory_rules.php:52
msgid ""
@@ -11629,22 +11647,26 @@ msgid ""
"distribution. The MySQL manual only is accurate for official MySQL binaries, "
"not any package distributions (such as RedHat, Debian/Ubuntu etc)."
msgstr ""
+"Eğer kaynaktan derlemediyseniz, dağıtımın değiştirilmiş paketini "
+"kullanıyorsunuzdur. MySQL kılavuzu sadece resmi MySQL binarileri için "
+"doğrudur, herhangi bir paket dağıtımları (RedHat, Debian/Ubuntu v.s. gibi) "
+"için değil."
#: po/advisory_rules.php:53
msgid "'source' found in version_comment"
-msgstr ""
+msgstr "'source', version_comment içinde bulundu"
#: po/advisory_rules.php:56
msgid "The MySQL manual only is accurate for official MySQL binaries."
-msgstr ""
+msgstr "MySQL kılavuzu sadece resmi MySQL binarileri için doğrudur."
#: po/advisory_rules.php:57
msgid "Percona documentation is at http://www.percona.com/docs/wiki/"
-msgstr ""
+msgstr "Percona belgeleri http://www.percona.com/docs/wiki/ adresinde"
#: po/advisory_rules.php:58
msgid "'percona' found in version_comment"
-msgstr ""
+msgstr "'percona', version_comment içinde bulundu"
#: po/advisory_rules.php:60
msgid "MySQL Architecture"
@@ -11652,7 +11674,7 @@ msgstr "MySQL Yapısı"
#: po/advisory_rules.php:61
msgid "MySQL is not compiled as a 64-bit package."
-msgstr ""
+msgstr "MySQL, 64-bit paketi olarak derlenmez."
#: po/advisory_rules.php:62
msgid ""
@@ -11660,11 +11682,14 @@ msgid ""
"so MySQL might not be able to access all of your memory. You might want to "
"consider installing the 64-bit version of MySQL."
msgstr ""
+"Bellek kapasiteniz 3 GiB'in üstünde (Sunucu localhost üzerinde "
+"varsayılıyor), bu yüzden MySQL, belleğinizin tümüne erişemeyebilir. MySQL'in "
+"64-bit sürümünü kurmayı düşünmek isteyebilirsiniz."
#: po/advisory_rules.php:63
#, php-format
msgid "Available memory on this host: %s"
-msgstr ""
+msgstr "Bu anamakinedeki kullanılabilir bellek: %s"
#: po/advisory_rules.php:65
msgid "Query cache disabled"
@@ -11681,10 +11706,14 @@ msgid ""
"and setting {query_cache_type} to 'ON'. <b>Note:</b> If you are using "
"memcached, ignore this recommendation."
msgstr ""
+"Sorgu önbelleğinin, eğer doğru şekilde yapılandırılmışsa fazlasıyla "
+"performansı geliştirdiği biliniyor. {query_cache_size} 2 basamaklı MiB "
+"değeri olarak ve {query_cache_type} ayarı 'ON' ayarlayarak etkinleştirin. "
+"<b>Not:</b> Eğer memcached kullanıyorsanız, bu tavsiyeyi göz ardı edin."
#: po/advisory_rules.php:68
msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'"
-msgstr ""
+msgstr "query_cache_size 0'a ayarlı veya query_cache_type 'OFF'a ayarlı"
#: po/advisory_rules.php:71
msgid "Suboptimal caching method."
@@ -11844,10 +11873,9 @@ msgid "query_cache_limit is set to 1 MiB"
msgstr ""
#: po/advisory_rules.php:105
-#, fuzzy
#| msgid "% sorts that cause temporary tales"
msgid "Percentage of sorts that cause temporary tables"
-msgstr "%, geçici tablolara sebep olanı sıralar"
+msgstr "Geçici tablolara sebep olan sıralamaların yüzdesi"
#: po/advisory_rules.php:106 po/advisory_rules.php:111
msgid "Too many sorts are causing temporary tables."
@@ -11867,10 +11895,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:110
-#, fuzzy
#| msgid "% sorts that cause temporary tales"
msgid "Rate of sorts that cause temporary tables"
-msgstr "%, geçici tablolara sebep olanı sıralar"
+msgstr "Geçici tablolara sebep olan sıralamaların oranı"
#: po/advisory_rules.php:113
#, php-format
@@ -11900,14 +11927,13 @@ msgid "Sorted rows average: %s"
msgstr ""
#: po/advisory_rules.php:120
-#, fuzzy
#| msgid "There are too many joins without indexes."
msgid "Rate of joins without indexes"
-msgstr "İndeksler olmadan çok fazla katılım var."
+msgstr "İndeksler olmaksızın katılım oranı"
#: po/advisory_rules.php:121
msgid "There are too many joins without indexes."
-msgstr "İndeksler olmadan çok fazla katılım var."
+msgstr "İndeksler olmaksızın çok fazla katılım var."
#: po/advisory_rules.php:122
msgid ""
@@ -11966,10 +11992,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:135
-#, fuzzy
#| msgid "The rate of reading the next table row is high."
msgid "Rate of reading next table row"
-msgstr "Sonraki tablo satırını okuma oranı yüksek."
+msgstr "Sonraki tablo satırını okuma oranı"
#: po/advisory_rules.php:136
msgid "The rate of reading the next table row is high."
@@ -12009,10 +12034,9 @@ msgid "Current values are tmp_table_size: %s, max_heap_table_size: %s"
msgstr ""
#: po/advisory_rules.php:145
-#, fuzzy
#| msgid "Where to show the table row links"
msgid "Percentage of temp tables on disk"
-msgstr "Tablo satır bağlantılarının nerede gösterileceği"
+msgstr "Diskteki geçici tabloların yüzdesi"
#: po/advisory_rules.php:146 po/advisory_rules.php:151
msgid ""
@@ -12039,10 +12063,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:150
-#, fuzzy
#| msgid "% temp disk tables"
msgid "Temp disk rate"
-msgstr "% geçici disk tabloları"
+msgstr "Geçici disk oranı"
#: po/advisory_rules.php:152
msgid ""
@@ -12081,10 +12104,9 @@ msgid "key_buffer_size is 0"
msgstr ""
#: po/advisory_rules.php:160
-#, fuzzy
#| msgid "MyISAM key buffer size"
msgid "Max % MyISAM key buffer ever used"
-msgstr "MyISAM anahtar arabellek boyutu"
+msgstr "Şimdiye kadar kullanılan en fazla MyISAM anahtar arabelleği"
#: po/advisory_rules.php:161 po/advisory_rules.php:166
#, php-format
@@ -12104,10 +12126,9 @@ msgid "max %% MyISAM key buffer ever used: %s, this value should be above 95%%"
msgstr ""
#: po/advisory_rules.php:165
-#, fuzzy
#| msgid "MyISAM key buffer size"
msgid "Percentage of MyISAM key buffer used"
-msgstr "MyISAM anahtar arabellek boyutu"
+msgstr "Kullanılan MyISAM anahtar arabellek yüzdesi"
#: po/advisory_rules.php:168
#, php-format
@@ -12133,10 +12154,9 @@ msgid "Index reads from memory: %s%%, this value should be above 95%%"
msgstr ""
#: po/advisory_rules.php:175
-#, fuzzy
#| msgid "rate of table open"
msgid "Rate of table open"
-msgstr "açık tablo oranı"
+msgstr "Açık tablo oranı"
#: po/advisory_rules.php:176
msgid "The rate of opening tables is high."
@@ -12154,10 +12174,9 @@ msgid "Opened table rate: %s, this value should be less than 10 per hour"
msgstr ""
#: po/advisory_rules.php:180
-#, fuzzy
#| msgid "rate of open files"
msgid "Percentage of used open files limit"
-msgstr "açık dosyaların oranı"
+msgstr "Kullanılan açık dosya sınırları yüzdesi"
#: po/advisory_rules.php:181
msgid ""
@@ -12178,10 +12197,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:185
-#, fuzzy
#| msgid "rate of open files"
msgid "Rate of open files"
-msgstr "açık dosyaların oranı"
+msgstr "Açık dosyaların oranı"
#: po/advisory_rules.php:186
msgid "The rate of opening files is high."
@@ -12219,10 +12237,9 @@ msgid "Table lock wait rate: %s, this value should be less than 1 per hour"
msgstr ""
#: po/advisory_rules.php:200
-#, fuzzy
#| msgid "thread cache"
msgid "Thread cache"
-msgstr "işlem önbelleği"
+msgstr "İşlem önbelleği"
#: po/advisory_rules.php:201
msgid ""
@@ -12239,10 +12256,9 @@ msgid "The thread cache is set to 0"
msgstr ""
#: po/advisory_rules.php:205
-#, fuzzy
#| msgid "Thread cache is not efficient."
msgid "Thread cache hit rate %"
-msgstr "İşlem önbelleği etkin değil."
+msgstr "İşlem önbelleği tavan oranı %"
#: po/advisory_rules.php:206
msgid "Thread cache is not efficient."
@@ -12296,10 +12312,9 @@ msgid "slow_launch_time is set to %s"
msgstr "slow_launch_time %s'e ayarlı"
#: po/advisory_rules.php:220
-#, fuzzy
#| msgid "rate of aborted connections"
msgid "Percentage of used connections"
-msgstr "durdurulan bağlantıların oranı"
+msgstr "Kullanılan bağlantıların yüzdesi"
#: po/advisory_rules.php:221
msgid ""
@@ -12321,10 +12336,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:225
-#, fuzzy
#| msgid "rate of aborted connections"
msgid "Percentage of aborted connections"
-msgstr "durdurulan bağlantıların oranı"
+msgstr "Durdurulan bağlantıların yüzdesi"
#: po/advisory_rules.php:226
msgid "Too many connections are aborted."
@@ -12344,10 +12358,9 @@ msgid "%s%% of all connections are aborted. This value should be below 1%%"
msgstr ""
#: po/advisory_rules.php:230
-#, fuzzy
#| msgid "rate of aborted connections"
msgid "Rate of aborted connections"
-msgstr "durdurulan bağlantıların oranı"
+msgstr "Durdurulan bağlantıların oranı"
#: po/advisory_rules.php:231
msgid "Too many connections are aborted"
@@ -12360,10 +12373,9 @@ msgid ""
msgstr ""
#: po/advisory_rules.php:235
-#, fuzzy
#| msgid "rate of aborted clients"
msgid "Percentage of aborted clients"
-msgstr "durdurulan istemcilerin oranı"
+msgstr "Durdurulan istemcilerin yüzdesi"
#: po/advisory_rules.php:236 po/advisory_rules.php:241
msgid "Too many clients are aborted."
@@ -12382,10 +12394,9 @@ msgid "%s%% of all clients are aborted. This value should be below 2%%"
msgstr ""
#: po/advisory_rules.php:240
-#, fuzzy
#| msgid "rate of aborted clients"
msgid "Rate of aborted clients"
-msgstr "durdurulan istemcilerin oranı"
+msgstr "Durdurulan istemcilerin oranı"
#: po/advisory_rules.php:243
#, php-format
@@ -12409,10 +12420,9 @@ msgid "have_innodb is set to 'value'"
msgstr ""
#: po/advisory_rules.php:250
-#, fuzzy
#| msgid "InnoDB buffer pool size"
msgid "InnoDB log size"
-msgstr "InnoDB arabellek havuzu boyutu"
+msgstr "InnoDB günlük boyutu"
#: po/advisory_rules.php:251
msgid ""
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14709-gf6c930f
by Michal Čihař 13 Aug '11
by Michal Čihař 13 Aug '11
13 Aug '11
The branch, master has been updated
via f6c930f002df18c94a68898a4ae857f94aaa554b (commit)
via 6f619e43758ec38d734edc2b69a1c2ae8d60bd35 (commit)
via 8fd3184728d5fe5db96d9783505219edff72a07f (commit)
from 9147f30dc6b00dc63c998f1d2d3972d1a47e6c57 (commit)
- Log -----------------------------------------------------------------
commit f6c930f002df18c94a68898a4ae857f94aaa554b
Author: Michal Čihař <michal(a)cihar.com>
Date: Sat Aug 13 06:51:52 2011 +0200
Revert "Added: Missing rgbcolor.js file"
This reverts commit 1b7e2f6c7be6c7a96d780a7e9870d498f84e7339.
commit 6f619e43758ec38d734edc2b69a1c2ae8d60bd35
Author: Michal Čihař <michal(a)cihar.com>
Date: Sat Aug 13 06:51:34 2011 +0200
Whitespace cleanup
commit 8fd3184728d5fe5db96d9783505219edff72a07f
Author: Michal Čihař <michal(a)cihar.com>
Date: Sat Aug 13 06:51:25 2011 +0200
rgbcolor.js is merged into canvg.js
-----------------------------------------------------------------------
Summary of changes:
js/canvg/rgbcolor.js | 288 --------------------------------------------------
tbl_zoom_select.php | 49 ++++-----
2 files changed, 24 insertions(+), 313 deletions(-)
delete mode 100644 js/canvg/rgbcolor.js
diff --git a/js/canvg/rgbcolor.js b/js/canvg/rgbcolor.js
deleted file mode 100644
index 0338a16..0000000
--- a/js/canvg/rgbcolor.js
+++ /dev/null
@@ -1,288 +0,0 @@
-/**
- * A class to parse color values
- * @author Stoyan Stefanov <sstoo(a)gmail.com>
- * @link http://www.phpied.com/rgb-color-parser-in-javascript/
- * @license Use it if you like it
- */
-function RGBColor(color_string)
-{
- this.ok = false;
-
- // strip any leading #
- if (color_string.charAt(0) == '#') { // remove # if any
- color_string = color_string.substr(1,6);
- }
-
- color_string = color_string.replace(/ /g,'');
- color_string = color_string.toLowerCase();
-
- // before getting into regexps, try simple matches
- // and overwrite the input
- var simple_colors = {
- aliceblue: 'f0f8ff',
- antiquewhite: 'faebd7',
- aqua: '00ffff',
- aquamarine: '7fffd4',
- azure: 'f0ffff',
- beige: 'f5f5dc',
- bisque: 'ffe4c4',
- black: '000000',
- blanchedalmond: 'ffebcd',
- blue: '0000ff',
- blueviolet: '8a2be2',
- brown: 'a52a2a',
- burlywood: 'deb887',
- cadetblue: '5f9ea0',
- chartreuse: '7fff00',
- chocolate: 'd2691e',
- coral: 'ff7f50',
- cornflowerblue: '6495ed',
- cornsilk: 'fff8dc',
- crimson: 'dc143c',
- cyan: '00ffff',
- darkblue: '00008b',
- darkcyan: '008b8b',
- darkgoldenrod: 'b8860b',
- darkgray: 'a9a9a9',
- darkgreen: '006400',
- darkkhaki: 'bdb76b',
- darkmagenta: '8b008b',
- darkolivegreen: '556b2f',
- darkorange: 'ff8c00',
- darkorchid: '9932cc',
- darkred: '8b0000',
- darksalmon: 'e9967a',
- darkseagreen: '8fbc8f',
- darkslateblue: '483d8b',
- darkslategray: '2f4f4f',
- darkturquoise: '00ced1',
- darkviolet: '9400d3',
- deeppink: 'ff1493',
- deepskyblue: '00bfff',
- dimgray: '696969',
- dodgerblue: '1e90ff',
- feldspar: 'd19275',
- firebrick: 'b22222',
- floralwhite: 'fffaf0',
- forestgreen: '228b22',
- fuchsia: 'ff00ff',
- gainsboro: 'dcdcdc',
- ghostwhite: 'f8f8ff',
- gold: 'ffd700',
- goldenrod: 'daa520',
- gray: '808080',
- green: '008000',
- greenyellow: 'adff2f',
- honeydew: 'f0fff0',
- hotpink: 'ff69b4',
- indianred : 'cd5c5c',
- indigo : '4b0082',
- ivory: 'fffff0',
- khaki: 'f0e68c',
- lavender: 'e6e6fa',
- lavenderblush: 'fff0f5',
- lawngreen: '7cfc00',
- lemonchiffon: 'fffacd',
- lightblue: 'add8e6',
- lightcoral: 'f08080',
- lightcyan: 'e0ffff',
- lightgoldenrodyellow: 'fafad2',
- lightgrey: 'd3d3d3',
- lightgreen: '90ee90',
- lightpink: 'ffb6c1',
- lightsalmon: 'ffa07a',
- lightseagreen: '20b2aa',
- lightskyblue: '87cefa',
- lightslateblue: '8470ff',
- lightslategray: '778899',
- lightsteelblue: 'b0c4de',
- lightyellow: 'ffffe0',
- lime: '00ff00',
- limegreen: '32cd32',
- linen: 'faf0e6',
- magenta: 'ff00ff',
- maroon: '800000',
- mediumaquamarine: '66cdaa',
- mediumblue: '0000cd',
- mediumorchid: 'ba55d3',
- mediumpurple: '9370d8',
- mediumseagreen: '3cb371',
- mediumslateblue: '7b68ee',
- mediumspringgreen: '00fa9a',
- mediumturquoise: '48d1cc',
- mediumvioletred: 'c71585',
- midnightblue: '191970',
- mintcream: 'f5fffa',
- mistyrose: 'ffe4e1',
- moccasin: 'ffe4b5',
- navajowhite: 'ffdead',
- navy: '000080',
- oldlace: 'fdf5e6',
- olive: '808000',
- olivedrab: '6b8e23',
- orange: 'ffa500',
- orangered: 'ff4500',
- orchid: 'da70d6',
- palegoldenrod: 'eee8aa',
- palegreen: '98fb98',
- paleturquoise: 'afeeee',
- palevioletred: 'd87093',
- papayawhip: 'ffefd5',
- peachpuff: 'ffdab9',
- peru: 'cd853f',
- pink: 'ffc0cb',
- plum: 'dda0dd',
- powderblue: 'b0e0e6',
- purple: '800080',
- red: 'ff0000',
- rosybrown: 'bc8f8f',
- royalblue: '4169e1',
- saddlebrown: '8b4513',
- salmon: 'fa8072',
- sandybrown: 'f4a460',
- seagreen: '2e8b57',
- seashell: 'fff5ee',
- sienna: 'a0522d',
- silver: 'c0c0c0',
- skyblue: '87ceeb',
- slateblue: '6a5acd',
- slategray: '708090',
- snow: 'fffafa',
- springgreen: '00ff7f',
- steelblue: '4682b4',
- tan: 'd2b48c',
- teal: '008080',
- thistle: 'd8bfd8',
- tomato: 'ff6347',
- turquoise: '40e0d0',
- violet: 'ee82ee',
- violetred: 'd02090',
- wheat: 'f5deb3',
- white: 'ffffff',
- whitesmoke: 'f5f5f5',
- yellow: 'ffff00',
- yellowgreen: '9acd32'
- };
- for (var key in simple_colors) {
- if (color_string == key) {
- color_string = simple_colors[key];
- }
- }
- // emd of simple type-in colors
-
- // array of color definition objects
- var color_defs = [
- {
- re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,
- example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'],
- process: function (bits){
- return [
- parseInt(bits[1]),
- parseInt(bits[2]),
- parseInt(bits[3])
- ];
- }
- },
- {
- re: /^(\w{2})(\w{2})(\w{2})$/,
- example: ['#00ff00', '336699'],
- process: function (bits){
- return [
- parseInt(bits[1], 16),
- parseInt(bits[2], 16),
- parseInt(bits[3], 16)
- ];
- }
- },
- {
- re: /^(\w{1})(\w{1})(\w{1})$/,
- example: ['#fb0', 'f0f'],
- process: function (bits){
- return [
- parseInt(bits[1] + bits[1], 16),
- parseInt(bits[2] + bits[2], 16),
- parseInt(bits[3] + bits[3], 16)
- ];
- }
- }
- ];
-
- // search through the definitions to find a match
- for (var i = 0; i < color_defs.length; i++) {
- var re = color_defs[i].re;
- var processor = color_defs[i].process;
- var bits = re.exec(color_string);
- if (bits) {
- channels = processor(bits);
- this.r = channels[0];
- this.g = channels[1];
- this.b = channels[2];
- this.ok = true;
- }
-
- }
-
- // validate/cleanup values
- this.r = (this.r < 0 || isNaN(this.r)) ? 0 : ((this.r > 255) ? 255 : this.r);
- this.g = (this.g < 0 || isNaN(this.g)) ? 0 : ((this.g > 255) ? 255 : this.g);
- this.b = (this.b < 0 || isNaN(this.b)) ? 0 : ((this.b > 255) ? 255 : this.b);
-
- // some getters
- this.toRGB = function () {
- return 'rgb(' + this.r + ', ' + this.g + ', ' + this.b + ')';
- }
- this.toHex = function () {
- var r = this.r.toString(16);
- var g = this.g.toString(16);
- var b = this.b.toString(16);
- if (r.length == 1) r = '0' + r;
- if (g.length == 1) g = '0' + g;
- if (b.length == 1) b = '0' + b;
- return '#' + r + g + b;
- }
-
- // help
- this.getHelpXML = function () {
-
- var examples = new Array();
- // add regexps
- for (var i = 0; i < color_defs.length; i++) {
- var example = color_defs[i].example;
- for (var j = 0; j < example.length; j++) {
- examples[examples.length] = example[j];
- }
- }
- // add type-in colors
- for (var sc in simple_colors) {
- examples[examples.length] = sc;
- }
-
- var xml = document.createElement('ul');
- xml.setAttribute('id', 'rgbcolor-examples');
- for (var i = 0; i < examples.length; i++) {
- try {
- var list_item = document.createElement('li');
- var list_color = new RGBColor(examples[i]);
- var example_div = document.createElement('div');
- example_div.style.cssText =
- 'margin: 3px; '
- + 'border: 1px solid black; '
- + 'background:' + list_color.toHex() + '; '
- + 'color:' + list_color.toHex()
- ;
- example_div.appendChild(document.createTextNode('test'));
- var list_item_value = document.createTextNode(
- ' ' + examples[i] + ' -> ' + list_color.toRGB() + ' -> ' + list_color.toHex()
- );
- list_item.appendChild(example_div);
- list_item.appendChild(list_item_value);
- xml.appendChild(list_item);
-
- } catch(e){}
- }
- return xml;
-
- }
-
-}
-
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index cdb784d..c69a690 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -25,23 +25,22 @@ $GLOBALS['js_include'][] = 'highcharts/highcharts.js';
/* Files required for chart exporting */
$GLOBALS['js_include'][] = 'highcharts/exporting.js';
$GLOBALS['js_include'][] = 'canvg/canvg.js';
-$GLOBALS['js_include'][] = 'canvg/rgbcolor.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
-/**
+/**
* Handle AJAX request for data row on point select
* @var post_params Object containing parameters for the POST request
*/
if (isset($_REQUEST['get_data_row']) && $_REQUEST['get_data_row'] == true) {
-
- $extra_data = array();
- $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`' . $_REQUEST['table'] . '` WHERE ' . $_REQUEST['where_clause'];
+
+ $extra_data = array();
+ $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`' . $_REQUEST['table'] . '` WHERE ' . $_REQUEST['where_clause'];
$result = PMA_DBI_query( $row_info_query . ";" , null, PMA_DBI_QUERY_STORE);
$fields_meta = PMA_DBI_get_fields_meta($result);
- while ($row = PMA_DBI_fetch_assoc($result))
+ while ($row = PMA_DBI_fetch_assoc($result))
$extra_data['row_info'] = $row;
PMA_ajaxResponse(NULL, true, $extra_data);
@@ -121,7 +120,7 @@ if(isset($inputs) && ($inputs[0] != __('pma_null') || $inputs[1] != __('pma_null
?>
<?php
-
+
/*
* Form for input criteria
*/
@@ -144,14 +143,14 @@ if(isset($inputs) && ($inputs[0] != __('pma_null') || $inputs[1] != __('pma_null
<tbody>
<?php
$odd_row = true;
-
+
for($i = 0 ; $i < 4 ; $i++){
-
+
if($i == 2){
echo "<tr><td>";
echo __("Additional search criteria");
echo "</td><tr>";
- }
+ }
?>
<tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
@@ -171,7 +170,7 @@ for($i = 0 ; $i < 4 ; $i++){
</select></th>
<td><?php if(isset($tbl_fields_type[$i]))echo $tbl_fields_type[$i]; ?></td>
<td><?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?></td>
-
+
<td>
<?php if(isset($inputs) && $inputs[$i] != __('pma_null')){ ?>
<select name="zoomFunc[]">
@@ -217,7 +216,7 @@ for($i = 0 ; $i < 4 ; $i++){
}
}
} // end if... else...
-
+
if ($tbl_fields_null[$i]) {
foreach ($GLOBALS['cfg']['NullOperators'] as $fc) {
if(isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc){
@@ -238,16 +237,16 @@ for($i = 0 ; $i < 4 ; $i++){
<td>
<?php
$field = $inputs[$i];
-
+
$foreignData = PMA_getForeignData($foreigners, $field, false, '', '');
if (isset($fields))
echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], $fields);
else
echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], '');
-
+
}
else{ ?>
-
+
</td><td></td>
<?php } ?>
@@ -274,7 +273,7 @@ for($i = 0 ; $i < 4 ; $i++){
//Set default datalabel if not selected
if(isset($zoom_submit) && $inputs[0] != __('pma_null') && $inputs[1] != __('pma_null')) {
- if ($dataLabel == '')
+ if ($dataLabel == '')
$dataLabel = PMA_getDisplayField($db,$table);
}
?>
@@ -304,7 +303,7 @@ for($i = 0 ; $i < 4 ; $i++){
else { ?>
<input type="text" name="maxPlotLimit" value="<?php echo $GLOBALS['cfg']['maxRowPlotLimit']; ?>" /></td></tr>
<?php
- } ?>
+ } ?>
</table>
</fieldset>
@@ -315,7 +314,7 @@ for($i = 0 ; $i < 4 ; $i++){
</fieldset>
</form>
-<?php
+<?php
/*
* Handle the input criteria and gerate the query result
@@ -326,11 +325,11 @@ if(isset($zoom_submit) && $inputs[0] != __('pma_null') && $inputs[1] != __('pma_
/*
* Query generation part
*/
- $w = $data = array();
+ $w = $data = array();
$sql_query = 'SELECT *';
//Add the table
-
+
$sql_query .= ' FROM ' . PMA_backquote($table);
for($i = 0 ; $i < 4 ; $i++){
if($inputs[$i] == __('pma_null'))
@@ -371,7 +370,7 @@ if(isset($zoom_submit) && $inputs[0] != __('pma_null') && $inputs[1] != __('pma_
$data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], 'where_clause' => $uniqueCondition[0]);
else
$data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => $row[$dataLabel], 'where_clause' => $uniqueCondition[0]);
- }
+ }
?>
@@ -379,7 +378,7 @@ if(isset($zoom_submit) && $inputs[0] != __('pma_null') && $inputs[1] != __('pma_
/*
* Form for displaying point data and also the scatter plot
*/
-?>
+?>
<form method="post" action="tbl_zoom_select.php" name="displayResultForm" id="zoom_display_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>>
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<input type="hidden" name="goto" value="<?php echo $goto; ?>" />
@@ -398,7 +397,7 @@ if(isset($zoom_submit) && $inputs[0] != __('pma_null') && $inputs[1] != __('pma_
</div>
<div id="querychart" style="float:right"></div>
</div>
- <?php
+ <?php
} ?>
</center>
<fieldset id='dataDisplay' style="display:none">
@@ -424,7 +423,7 @@ if(isset($zoom_submit) && $inputs[0] != __('pma_null') && $inputs[1] != __('pma_
<th><?php echo '<input type="checkbox" class="checkbox_null" name="fields_null[ ' . $i . ' ]" id="fields_null_id_' . $i . '" />'; ?></th>
<th><?php echo PMA_getForeignFields_Values($foreigners, $foreignData, $fieldpopup, $tbl_fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '' ); ?> </th>
</tr>
- <?php
+ <?php
} ?>
</tbody>
</table>
@@ -438,7 +437,7 @@ if(isset($zoom_submit) && $inputs[0] != __('pma_null') && $inputs[1] != __('pma_
<input type="hidden" id="queryID" name="sql_query" />
</form>
</fieldset>
- <?php
+ <?php
}
?>
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14706-g9147f30
by Marc Delisle 12 Aug '11
by Marc Delisle 12 Aug '11
12 Aug '11
The branch, master has been updated
via 9147f30dc6b00dc63c998f1d2d3972d1a47e6c57 (commit)
via 8f7312956d76eefd1fbf9567a3bb18634e8db560 (commit)
via 1b7e2f6c7be6c7a96d780a7e9870d498f84e7339 (commit)
via ae5ef42beff0475de4a841ff18953e4f66880c40 (commit)
via 67dc02f23db70391220dc0336f2110645a34a9d2 (commit)
via 557734c57f45e24abae08a031dde25dab73f1a05 (commit)
via 201331275bff7e3e67e3d5f3fb2bc706e302ad27 (commit)
via e3cb99d540a305caaa58f91d71a5f87d96f28e50 (commit)
via 57af6f950289ce2283ebe0d4d56b68119b75322b (commit)
via 33ad955596696415c0cfe0422a067f64f95d1d15 (commit)
via 241caff7818f69531400eecd1ea63849009bffa9 (commit)
via e4b676e3567f2992d9b77f623d328af2fa90cef8 (commit)
via 7880782588e1609dac657a3c2b2f5a3630929859 (commit)
via 00c420c74b4663fddf0b5fc47ac50fdd15dd23c6 (commit)
via df0848fa9c94a100d153cb4500d723566e8c25c0 (commit)
via e83f3acd26fbfb51366cae9b184e69e5376ae10d (commit)
via 32969f3d4211a96575e2fd7e609cc21ddc63bbaf (commit)
via 9388cd35b643ea65473ffa95cdf21213bcc4785f (commit)
via cb63a92b44a3ab1ee38ec66d63d33432a6273f94 (commit)
via d9486e259721b812cb0cd56ca057e55359250cc9 (commit)
via e09759bef84ae8113f2e468117be66fb43d4b932 (commit)
via 18a6f0b0701457dd6a33d6517915c89729d1c11c (commit)
via 6cc3ff46f853960bdc90eb00fd595591e6a26f2e (commit)
via 95ea722d73fc635b4b27c6731aeedfd430628ce8 (commit)
via bedd413217a87770852671c4a2b211ca067df5e0 (commit)
via 830f2fdaa72a05497448b5b83b6fb961bf2bd7d2 (commit)
via 7c66a8bed58fffd66becd643c845027e57e43862 (commit)
via b6cb93b017ddd35ab7c2083591228a9874eab60d (commit)
via 1ce7ea6fb0180722ffadd056b565f63eaf215d4f (commit)
via 36ec09e6ccec0f46ebc1c92b8c8bc5a396b9a136 (commit)
via c01e39a716c5ba33d00ff45f1791d3094fe1c777 (commit)
via 04e82bb1e908e233f1eb619324b84b18312282d7 (commit)
via 811996e92a9365afc4c2ff8549ae887336ace5ad (commit)
via cdf70921a4976d6fbd79793ba7fa2b5c873bbe2b (commit)
via d5d9b38af093708d443a01f9172cc97867343796 (commit)
via d90a58d06150f27f008d63c9fee8b92e56afaeea (commit)
via 362a57f7e1663de26149f27abc4ef49144e8f744 (commit)
via ea171beebec90c31107b5972d58761100f9cd122 (commit)
via c520c098ad1b4728c751d334dc356bead56a4937 (commit)
via 12c1471c9b7683f150db76082506d4d90f034787 (commit)
via 57dc8ce4a595498a7de06ee34c7aa5129da7f934 (commit)
via 41715e512a7eca3bdc83524fb1c1bf8c3f88fa51 (commit)
via 28b142b5c314204ddf8590eb194eca2efd4061e5 (commit)
via 03a1a84b7886d7a8170d8520ad9b8948f1403d7a (commit)
via 602a64a1d2bf596d51de87618d11eba67c8bf1b4 (commit)
via 78f93fdd3c64dfe84d1f8459c4c16a39fbf61d60 (commit)
via 2a4c47c0a244366f3bc623a375ce8280c8dfddcd (commit)
via 543df4c802d7f21dc0443b207390c4353cfacf4f (commit)
via eaea0030641c6be215915684bcd40930ae2d61c8 (commit)
via fb8a4956a8fb948f3e2a9e6c2ef3debf5797f2ca (commit)
via 1653fd340c080d2caefb4c6bf1bd21a98443baa9 (commit)
via 9498f5d4cd59799f6c7753354180952936cd4680 (commit)
via 64425ccb66a518fe7c38bfd1c5f09d2e35afce3e (commit)
via f64dffd44ab787598eedf500bf8718a3e8d448cf (commit)
via f939564bfdfafe0960840b8482fd0a35e249c491 (commit)
via 763fa66d7281930d57f618c1fba6712394d0a05c (commit)
via 18694f2d7c81110c35aaa56942cbad5e3d7a4904 (commit)
via a4fda9e8f9910a7dc7bec484b722a940e5eec8c0 (commit)
via af1f872d81ed31e457094a4294fb3bedda826b85 (commit)
via 70167fed52368079d1cbffd445514480f29d9ff3 (commit)
via c7cef3b0ba0de9af03bcd9d733290e69882d5a29 (commit)
via e794690417b8ff32824862909a08fd2b9165e391 (commit)
via 91d372f9bcca4b92e6e63d7354fcf2a81b6b8f18 (commit)
via b225436331c6a770914fdd180327690697d3c478 (commit)
via 459b57ca578ee4bfcfa6839136dbedbbdabb33a2 (commit)
via 7396fa3aa9544c480b11edc1b3b2d687b1bca5e8 (commit)
via ae44636606a9c7b98d9f5d4998486579a4610a83 (commit)
via aac58fd425e4ee4064fa5dbbe666304c5e2b6f2c (commit)
via 699ca1d3904b0324a8d1fe0359ac40a725e6e92f (commit)
from b319651b70b95c1c70d084ab8519109dae9e5450 (commit)
- Log -----------------------------------------------------------------
commit 9147f30dc6b00dc63c998f1d2d3972d1a47e6c57
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Aug 12 14:44:55 2011 -0400
Zoom-search in table Search
commit 8f7312956d76eefd1fbf9567a3bb18634e8db560
Merge: b319651 1b7e2f6
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Aug 12 14:40:56 2011 -0400
Merge commit '1b7e2f6c7be6c7a96d780a7e9870d498f84e7339'
commit 1b7e2f6c7be6c7a96d780a7e9870d498f84e7339
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Aug 12 23:30:21 2011 +0530
Added: Missing rgbcolor.js file
commit ae5ef42beff0475de4a841ff18953e4f66880c40
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Aug 12 23:15:38 2011 +0530
Fixed: Timestamp for time associated fields needed extra 19800000 (+5:30) value
commit 67dc02f23db70391220dc0336f2110645a34a9d2
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Aug 12 20:06:27 2011 +0530
Fixed: false timestamp error
commit 557734c57f45e24abae08a031dde25dab73f1a05
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Aug 12 20:03:03 2011 +0530
bug fix
commit 201331275bff7e3e67e3d5f3fb2bc706e302ad27
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Aug 12 18:38:53 2011 +0530
Fixed: yAxis min value determined on plot generation and not 0 by default
commit e3cb99d540a305caaa58f91d71a5f87d96f28e50
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Aug 12 01:39:22 2011 +0530
Added better support for datetime fields
commit 57af6f950289ce2283ebe0d4d56b68119b75322b
Merge: 33ad955 d585bba
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Aug 12 00:10:17 2011 +0530
Merge remote branch 'phpmyadmin/master'
Conflicts:
js/tbl_select.js
commit 33ad955596696415c0cfe0422a067f64f95d1d15
Merge: 241caff a5394bd
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Sun Aug 7 10:55:41 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit 241caff7818f69531400eecd1ea63849009bffa9
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Wed Aug 3 09:17:16 2011 +0530
Used AJAX to get data row on point select, hence reducing the amount of data to be sent from server initially for plot.
commit e4b676e3567f2992d9b77f623d328af2fa90cef8
Merge: 7880782 54fbcaa
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Wed Aug 3 09:15:29 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit 7880782588e1609dac657a3c2b2f5a3630929859
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Mon Aug 1 10:01:42 2011 +0530
Added 'Max rows to plot' as input criteria
commit 00c420c74b4663fddf0b5fc47ac50fdd15dd23c6
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Sun Jul 31 12:50:24 2011 +0530
Edit feature with support for string plot. Also made some optimizations to avoid unnecesarry replot
commit df0848fa9c94a100d153cb4500d723566e8c25c0
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Sun Jul 31 12:41:09 2011 +0530
String plotting: truncated axis labels with length greater than 10.
commit e83f3acd26fbfb51366cae9b184e69e5376ae10d
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Sun Jul 31 12:35:07 2011 +0530
Added to 'How to use' message content, strings are converted into integers for plotting purpose.
commit 32969f3d4211a96575e2fd7e609cc21ddc63bbaf
Merge: 9388cd3 e3b91b7
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Sun Jul 31 07:14:01 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit 9388cd35b643ea65473ffa95cdf21213bcc4785f
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Mon Jul 25 19:50:02 2011 +0530
Re:Validations for input form submit (missed addidng messages.php file)
commit cb63a92b44a3ab1ee38ec66d63d33432a6273f94
Merge: d9486e2 c63172f
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Mon Jul 25 19:46:55 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit d9486e259721b812cb0cd56ca057e55359250cc9
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Mon Jul 25 19:45:00 2011 +0530
Validations for input form submit
commit e09759bef84ae8113f2e468117be66fb43d4b932
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Mon Jul 25 04:50:47 2011 +0530
Added support for ploting strings(char,varchar,enums)
commit 18a6f0b0701457dd6a33d6517915c89729d1c11c
Merge: 6cc3ff4 73ee863
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Mon Jul 25 04:49:22 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit 6cc3ff46f853960bdc90eb00fd595591e6a26f2e
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 22 17:53:13 2011 +0530
Data point content is now displayed as a dialog box which opens on clicking a point and closes on finishing an edit
commit 95ea722d73fc635b4b27c6731aeedfd430628ce8
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 22 17:51:53 2011 +0530
Fixed redirection issue on tbl_zoom_select.php page
commit bedd413217a87770852671c4a2b211ca067df5e0
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 22 17:50:09 2011 +0530
Resolved merge conflict
commit 830f2fdaa72a05497448b5b83b6fb961bf2bd7d2
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 22 16:58:52 2011 +0530
Merge remote tracking branch 'phpmyadmin'
commit 7c66a8bed58fffd66becd643c845027e57e43862
Merge: b6cb93b 8489f41
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 22 16:50:30 2011 +0530
Merge remote branch 'phpmyadmin/master'
Conflicts:
js/highcharts/highcharts.js
commit b6cb93b017ddd35ab7c2083591228a9874eab60d
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 15 20:04:15 2011 +0530
Default datalabel bugfix (defaulted to display field everytime)
commit 1ce7ea6fb0180722ffadd056b565f63eaf215d4f
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 15 19:39:42 2011 +0530
Display field is set as the defualt selected item in the datalabel select element
commit 36ec09e6ccec0f46ebc1c92b8c8bc5a396b9a136
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 15 02:18:29 2011 +0530
Changed 'How to use?' lnk message onClick event function from this.remove() to PMA_ajaxRemoveMessage()
commit c01e39a716c5ba33d00ff45f1791d3094fe1c777
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 15 00:43:41 2011 +0530
xAxis type changed to linear (earliear it defaulted to timeseries)
commit 04e82bb1e908e233f1eb619324b84b18312282d7
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 15 00:38:51 2011 +0530
Default data label now taken from table display field
commit 811996e92a9365afc4c2ff8549ae887336ace5ad
Merge: cdf7092 117dd68
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 15 00:38:31 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit cdf70921a4976d6fbd79793ba7fa2b5c873bbe2b
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Tue Jul 12 06:51:20 2011 +0530
Fixed misfunction of edit mode
commit d5d9b38af093708d443a01f9172cc97867343796
Merge: d90a58d 4bb11fd
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Tue Jul 12 06:50:46 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit d90a58d06150f27f008d63c9fee8b92e56afaeea
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Sun Jul 10 08:37:15 2011 +0530
Some indentation errors fixed from previous commit
commit 362a57f7e1663de26149f27abc4ef49144e8f744
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Sun Jul 10 08:14:00 2011 +0530
Functionality for edit data points added (primitive)
commit ea171beebec90c31107b5972d58761100f9cd122
Merge: c520c09 1962e36
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Sun Jul 10 08:13:46 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit c520c098ad1b4728c751d334dc356bead56a4937
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 8 02:34:49 2011 +0530
On submit of an edit, the data point remains selected in the plot.
commit 12c1471c9b7683f150db76082506d4d90f034787
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 8 02:26:56 2011 +0530
Changed text for 'How to use?' link 9$js_messages['strDisplayHelp'])
commit 57dc8ce4a595498a7de06ee34c7aa5129da7f934
Merge: 41715e5 5140c38
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Thu Jul 7 21:00:10 2011 +0530
Merge remote branch 'phpmyadmin/master'
Conflicts:
libraries/config.default.php
tbl_select.php
commit 41715e512a7eca3bdc83524fb1c1bf8c3f88fa51
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Thu Jul 7 20:53:32 2011 +0530
Removed mode feature, appended a missing configuration directive and changed help link duration to 10sec
commit 28b142b5c314204ddf8590eb194eca2efd4061e5
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Tue Jul 5 05:22:38 2011 +0530
Made some changes
-> Browse Mode makes the dialog fields disabled
-> New name for max row to plot directive
-> Show/Hide search criteria
-> Link for displaying Help
commit 03a1a84b7886d7a8170d8520ad9b8948f1403d7a
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Tue Jul 5 05:21:16 2011 +0530
Test
commit 602a64a1d2bf596d51de87618d11eba67c8bf1b4
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Mon Jul 4 21:59:17 2011 +0530
Added the Show/Hide search criteria feature
commit 78f93fdd3c64dfe84d1f8459c4c16a39fbf61d60
Merge: 2a4c47c 064d399
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Mon Jul 4 21:58:47 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit 2a4c47c0a244366f3bc623a375ce8280c8dfddcd
Merge: 543df4c 2279fd9
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 1 15:34:39 2011 +0530
Merge remote branch 'phpmyadmin/master'
Conflicts:
tbl_select.php
commit 543df4c802d7f21dc0443b207390c4353cfacf4f
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jul 1 15:31:56 2011 +0530
Added interface for browsing/editing points
commit eaea0030641c6be215915684bcd40930ae2d61c8
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Tue Jun 21 05:04:00 2011 +0530
Added some features
-> Limit on max number of rows retreived(500)
-> An instruction link regarding how to use
-> Resize plot by dragging it by the bottom right corner
-> Two additional search criteria
commit fb8a4956a8fb948f3e2a9e6c2ef3debf5797f2ca
Merge: 1653fd3 d9304ef
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Tue Jun 21 04:35:24 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit 1653fd340c080d2caefb4c6bf1bd21a98443baa9
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jun 17 01:31:31 2011 +0530
Plot functionality using Hihcharts
commit 9498f5d4cd59799f6c7753354180952936cd4680
Merge: 64425cc 4338b70
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jun 17 01:06:38 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit 64425ccb66a518fe7c38bfd1c5f09d2e35afce3e
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jun 10 06:58:23 2011 +0530
Fixed some issues and added support for plotting strings
commit f64dffd44ab787598eedf500bf8718a3e8d448cf
Merge: f939564 cd5cddb
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri Jun 10 06:56:52 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit f939564bfdfafe0960840b8482fd0a35e249c491
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Thu Jun 9 03:03:22 2011 +0530
Created the SVG based scatter-plot functionality
-> Created classes corresponding to the plot and data objects, currently only data points
-> Plots only for numeric fields
commit 763fa66d7281930d57f618c1fba6712394d0a05c
Merge: 18694f2 90099b7
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Thu Jun 9 02:54:33 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit 18694f2d7c81110c35aaa56942cbad5e3d7a4904
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Mon Jun 6 04:18:47 2011 +0530
Added generate plot feature using SVG ( only for numeric fields )
commit a4fda9e8f9910a7dc7bec484b722a940e5eec8c0
Merge: af1f872 8b47a1d
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Mon Jun 6 04:16:55 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit af1f872d81ed31e457094a4294fb3bedda826b85
Merge: 70167fe 75091e5
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Sat Jun 4 13:55:18 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit 70167fed52368079d1cbffd445514480f29d9ff3
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Wed Jun 1 01:22:31 2011 +0530
Made suggested change to tbl_select.php and tbl_zoom_select.php
commit c7cef3b0ba0de9af03bcd9d733290e69882d5a29
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Tue May 31 19:02:50 2011 +0530
Refactored the tbl_select.php and tbl_zoom_select.php code in libraries/tbl_select.lib.php
Parts refactored are:
-> Setting titles
-> getting fields list
-> setting sub-tabs
-> setting table header of QBE display
-> displaying foreign data
-> search criteria input elements
commit e794690417b8ff32824862909a08fd2b9165e391
Merge: 91d372f a47ac24
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Tue May 31 18:59:28 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit 91d372f9bcca4b92e6e63d7354fcf2a81b6b8f18
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Sun May 29 12:16:13 2011 +0530
Added a library file for the table-search and zoom-search code
Contains two functions:
-> Get Field list and details
-> Get where clause of query generation process
commit b225436331c6a770914fdd180327690697d3c478
Merge: 459b57c ae0af9e
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Sun May 29 12:14:04 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit 459b57ca578ee4bfcfa6839136dbedbbdabb33a2
Merge: 7396fa3 434d233
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Fri May 27 17:46:30 2011 +0530
Merge remote branch 'phpmyadmin/master'
commit 7396fa3aa9544c480b11edc1b3b2d687b1bca5e8
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Thu May 26 12:22:16 2011 +0530
Designed the zoom-search form(tbl_zoom_select.php)
-> User selecte exactly two columns.
-> Generates two queries, one for each column criteria.
commit ae44636606a9c7b98d9f5d4998486579a4610a83
Author: Ammar Yasir <ammaryasir.88(a)gmail.com>
Date: Mon May 23 21:26:07 2011 +0530
Made some changes on the tbl_select.php page to add a link for Zoom Search.
Please dont mind the coding, I just coded very quickly to get back comments. If the flow of the interface is ok I'll code it properly.
commit aac58fd425e4ee4064fa5dbbe666304c5e2b6f2c
Author: root <root(a)localhost.localdomain>
Date: Wed May 18 22:40:33 2011 +0530
testing for push
commit 699ca1d3904b0324a8d1fe0359ac40a725e6e92f
Author: root <root(a)localhost.localdomain>
Date: Wed May 18 22:30:26 2011 +0530
Just testing upload
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
config.sample.inc.php | 2 +-
db_structure.php | 1 +
js/canvg/canvg.js | 304 +++-----------
js/canvg/rgbcolor.js | 288 +++++++++++++
js/date.js | 335 +++++++++++++++
js/messages.php | 6 +
js/tbl_select.js | 2 +-
js/tbl_zoom_plot.js | 605 +++++++++++++++++++++++++++
libraries/common.inc.php | 1 +
libraries/config.default.php | 425 +++++++++++++++++--
libraries/svg_plot/pma_scatter_plot.php | 267 ++++++++++++
libraries/svg_plot/pma_svg_data_element.php | 50 +++
libraries/svg_plot/pma_svg_data_point.php | 86 ++++
libraries/tbl_select.lib.php | 390 +++++++++++++++++
tbl_select.php | 280 +++----------
tbl_zoom_select.php | 447 ++++++++++++++++++++
17 files changed, 2976 insertions(+), 514 deletions(-)
create mode 100644 js/canvg/rgbcolor.js
create mode 100644 js/date.js
create mode 100644 js/tbl_zoom_plot.js
create mode 100644 libraries/svg_plot/pma_scatter_plot.php
create mode 100644 libraries/svg_plot/pma_svg_data_element.php
create mode 100644 libraries/svg_plot/pma_svg_data_point.php
create mode 100644 libraries/tbl_select.lib.php
create mode 100644 tbl_zoom_select.php
diff --git a/ChangeLog b/ChangeLog
index 633d481..e6c1bc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@ phpMyAdmin - ChangeLog
+ AJAX for table Operations copy table
- bug #3380946 [export] no uid Query result export (Suhosin limit)
+ Grid editing in browse mode (replaces row inline edit)
++ Zoom-search in table Search
3.4.5.0 (not yet released)
- bug #3375325 [interface] Page list in navigation frame looks odd
diff --git a/config.sample.inc.php b/config.sample.inc.php
index edffd03..778785e 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -14,7 +14,7 @@
* This is needed for cookie based authentication to encrypt password in
* cookie
*/
-$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
/*
* Servers configuration
diff --git a/db_structure.php b/db_structure.php
index d76bcca..9c2e045 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -57,6 +57,7 @@ require_once './libraries/db_structure.lib.php';
$titles = PMA_buildActionTitles();
// 1. No tables
+
if ($num_tables == 0) {
echo '<p>' . __('No tables found in database') . '</p>' . "\n";
diff --git a/js/canvg/canvg.js b/js/canvg/canvg.js
index 19a47a7..dbc5a9d 100644
--- a/js/canvg/canvg.js
+++ b/js/canvg/canvg.js
@@ -12,6 +12,7 @@ if(!window.console) {
window.console.dir = function(str) {};
}
+// <3 IE
if(!Array.indexOf){
Array.prototype.indexOf = function(obj){
for(var i=0; i<this.length; i++){
@@ -27,7 +28,7 @@ if(!Array.indexOf){
// canvg(target, s)
// empty parameters: replace all 'svg' elements on page with 'canvas' elements
// target: canvas element or the id of a canvas element
- // s: svg string, url to svg file, or xml document
+ // s: svg string or url to svg file
// opts: optional hash of options
// ignoreMouse: true => ignore mouse events
// ignoreAnimation: true => ignore animations
@@ -74,11 +75,7 @@ if(!Array.indexOf){
svg.opts = opts;
var ctx = target.getContext('2d');
- if (typeof(s.documentElement) != 'undefined') {
- // load from xml doc
- svg.loadXmlDoc(ctx, s);
- }
- else if (s.substr(0,1) == '<') {
+ if (s.substr(0,1) == '<') {
// load from xml string
svg.loadXml(ctx, s);
}
@@ -92,7 +89,6 @@ if(!Array.indexOf){
var svg = { };
svg.FRAMERATE = 30;
- svg.MAX_VIRTUAL_PIXELS = 30000;
// globals
svg.init = function(ctx) {
@@ -103,7 +99,6 @@ if(!Array.indexOf){
svg.ctx = ctx;
svg.ViewPort = new (function () {
this.viewPorts = [];
- this.Clear = function() { this.viewPorts = []; }
this.SetCurrent = function(width, height) { this.viewPorts.push({ width: width, height: height }); }
this.RemoveCurrent = function() { this.viewPorts.pop(); }
this.Current = function() { return this.viewPorts[this.viewPorts.length - 1]; }
@@ -556,7 +551,7 @@ if(!Array.indexOf){
}
}
- var data = svg.trim(svg.compressSpaces(v)).split(/\s(?=[a-z])/);
+ var data = v.split(/\s(?=[a-z])/);
for (var i=0; i<data.length; i++) {
var type = data[i].split('(')[0];
var s = data[i].split('(')[1].replace(')','');
@@ -621,7 +616,7 @@ if(!Array.indexOf){
return a;
}
- // get or create style, crawls up node tree
+ // get or create style
this.style = function(name, createIfNotExists) {
var s = this.styles[name];
if (s != null) return s;
@@ -630,14 +625,6 @@ if(!Array.indexOf){
if (a != null && a.hasValue()) {
return a;
}
-
- var p = this.parent;
- if (p != null) {
- var ps = p.style(name);
- if (ps != null && ps.hasValue()) {
- return ps;
- }
- }
s = new svg.Property(name, '');
if (createIfNotExists == true) this.styles[name] = s;
@@ -648,9 +635,6 @@ if(!Array.indexOf){
this.render = function(ctx) {
// don't render display=none
if (this.attribute('display').value == 'none') return;
-
- // don't render visibility=hidden
- if (this.attribute('visibility').value == 'hidden') return;
ctx.save();
this.setContext(ctx);
@@ -697,7 +681,7 @@ if(!Array.indexOf){
}
// add tag styles
- var styles = svg.Styles[node.nodeName];
+ var styles = svg.Styles[this.type];
if (styles != null) {
for (var name in styles) {
this.styles[name] = styles[name];
@@ -714,12 +698,6 @@ if(!Array.indexOf){
this.styles[name] = styles[name];
}
}
- styles = svg.Styles[node.nodeName+'.'+classes[j]];
- if (styles != null) {
- for (var name in styles) {
- this.styles[name] = styles[name];
- }
- }
}
}
@@ -878,7 +856,7 @@ if(!Array.indexOf){
var width = svg.ViewPort.width();
var height = svg.ViewPort.height();
- if (typeof(this.root) == 'undefined' && this.attribute('width').hasValue() && this.attribute('height').hasValue()) {
+ if (this.attribute('width').hasValue() && this.attribute('height').hasValue()) {
width = this.attribute('width').Length.toPixels('x');
height = this.attribute('height').Length.toPixels('y');
@@ -1208,6 +1186,9 @@ if(!Array.indexOf){
pp.reset();
var bb = new svg.BoundingBox();
+
+ if(this.attribute('visibility').value=='hidden') return;
+
if (ctx != null) ctx.beginPath();
while (!pp.isEnd()) {
pp.nextCommand();
@@ -1488,37 +1469,6 @@ if(!Array.indexOf){
for (var i=0; i<stopsContainer.stops.length; i++) {
g.addColorStop(stopsContainer.stops[i].offset, stopsContainer.stops[i].color);
}
-
- if (this.attribute('gradientTransform').hasValue()) {
- // render as transformed pattern on temporary canvas
- var rootView = svg.ViewPort.viewPorts[0];
-
- var rect = new svg.Element.rect();
- rect.attributes['x'] = new svg.Property('x', -svg.MAX_VIRTUAL_PIXELS/3.0);
- rect.attributes['y'] = new svg.Property('y', -svg.MAX_VIRTUAL_PIXELS/3.0);
- rect.attributes['width'] = new svg.Property('width', svg.MAX_VIRTUAL_PIXELS);
- rect.attributes['height'] = new svg.Property('height', svg.MAX_VIRTUAL_PIXELS);
-
- var group = new svg.Element.g();
- group.attributes['transform'] = new svg.Property('transform', this.attribute('gradientTransform').value);
- group.children = [ rect ];
-
- var tempSvg = new svg.Element.svg();
- tempSvg.attributes['x'] = new svg.Property('x', 0);
- tempSvg.attributes['y'] = new svg.Property('y', 0);
- tempSvg.attributes['width'] = new svg.Property('width', rootView.width);
- tempSvg.attributes['height'] = new svg.Property('height', rootView.height);
- tempSvg.children = [ group ];
-
- var c = document.createElement('canvas');
- c.width = rootView.width;
- c.height = rootView.height;
- var tempCtx = c.getContext('2d');
- tempCtx.fillStyle = g;
- tempSvg.render(tempCtx);
- return tempCtx.createPattern(c, 'no-repeat');
- }
-
return g;
}
}
@@ -1544,8 +1494,16 @@ if(!Array.indexOf){
var y2 = (this.gradientUnits == 'objectBoundingBox'
? bb.y() + bb.height() * this.attribute('y2').numValue()
: this.attribute('y2').Length.toPixels('y'));
-
- return ctx.createLinearGradient(x1, y1, x2, y2);
+
+ var p1 = new svg.Point(x1, y1);
+ var p2 = new svg.Point(x2, y2);
+ if (this.attribute('gradientTransform').hasValue()) {
+ var transform = new svg.Transform(this.attribute('gradientTransform').value);
+ transform.applyToPoint(p1);
+ transform.applyToPoint(p2);
+ }
+
+ return ctx.createLinearGradient(p1.x, p1.y, p2.x, p2.y);
}
}
svg.Element.linearGradient.prototype = new svg.Element.GradientBase;
@@ -1582,7 +1540,22 @@ if(!Array.indexOf){
? (bb.width() + bb.height()) / 2.0 * this.attribute('r').numValue()
: this.attribute('r').Length.toPixels());
- return ctx.createRadialGradient(fx, fy, 0, cx, cy, r);
+ var c = new svg.Point(cx, cy);
+ var f = new svg.Point(fx, fy);
+ if (this.attribute('gradientTransform').hasValue()) {
+ var transform = new svg.Transform(this.attribute('gradientTransform').value);
+ transform.applyToPoint(c);
+ transform.applyToPoint(f);
+
+ for (var i=0; i<transform.transforms.length; i++) {
+ // average the scaling part of the transform, apply to radius
+ var scale1 = transform.transforms[i].m[0];
+ var scale2 = transform.transforms[i].m[3];
+ r = r * ((scale1 + scale2) / 2.0);
+ }
+ }
+
+ return ctx.createRadialGradient(f.x, f.y, 0, c.x, c.y, r);
}
}
svg.Element.radialGradient.prototype = new svg.Element.GradientBase;
@@ -1720,73 +1693,6 @@ if(!Array.indexOf){
}
svg.Element.animateTransform.prototype = new svg.Element.animate;
- // font element
- svg.Element.font = function(node) {
- this.base = svg.Element.ElementBase;
- this.base(node);
-
- this.horizAdvX = this.attribute('horiz-adv-x').numValue();
-
- this.isRTL = false;
- this.isArabic = false;
- this.fontFace = null;
- this.missingGlyph = null;
- this.glyphs = [];
- for (var i=0; i<this.children.length; i++) {
- var child = this.children[i];
- if (child.type == 'font-face') {
- this.fontFace = child;
- if (child.style('font-family').hasValue()) {
- svg.Definitions[child.style('font-family').value] = this;
- }
- }
- else if (child.type == 'missing-glyph') this.missingGlyph = child;
- else if (child.type == 'glyph') {
- if (child.arabicForm != '') {
- this.isRTL = true;
- this.isArabic = true;
- if (typeof(this.glyphs[child.unicode]) == 'undefined') this.glyphs[child.unicode] = [];
- this.glyphs[child.unicode][child.arabicForm] = child;
- }
- else {
- this.glyphs[child.unicode] = child;
- }
- }
- }
- }
- svg.Element.font.prototype = new svg.Element.ElementBase;
-
- // font-face element
- svg.Element.fontface = function(node) {
- this.base = svg.Element.ElementBase;
- this.base(node);
-
- this.ascent = this.attribute('ascent').value;
- this.descent = this.attribute('descent').value;
- this.unitsPerEm = this.attribute('units-per-em').numValue();
- }
- svg.Element.fontface.prototype = new svg.Element.ElementBase;
-
- // missing-glyph element
- svg.Element.missingglyph = function(node) {
- this.base = svg.Element.path;
- this.base(node);
-
- this.horizAdvX = 0;
- }
- svg.Element.missingglyph.prototype = new svg.Element.path;
-
- // glyph element
- svg.Element.glyph = function(node) {
- this.base = svg.Element.path;
- this.base(node);
-
- this.horizAdvX = this.attribute('horiz-adv-x').numValue();
- this.unicode = this.attribute('unicode').value;
- this.arabicForm = this.attribute('arabic-form').value;
- }
- svg.Element.glyph.prototype = new svg.Element.path;
-
// text element
svg.Element.text = function(node) {
this.base = svg.Element.RenderedElementBase;
@@ -1809,16 +1715,19 @@ if(!Array.indexOf){
this.baseSetContext = this.setContext;
this.setContext = function(ctx) {
this.baseSetContext(ctx);
- if (this.style('text-anchor').hasValue()) {
- var textAnchor = this.style('text-anchor').value;
+ if (this.attribute('text-anchor').hasValue()) {
+ var textAnchor = this.attribute('text-anchor').value;
ctx.textAlign = textAnchor == 'middle' ? 'center' : textAnchor;
}
if (this.attribute('alignment-baseline').hasValue()) ctx.textBaseline = this.attribute('alignment-baseline').value;
}
this.renderChildren = function(ctx) {
+ if(this.attribute('visibility').value=='hidden') return;
+
var x = this.attribute('x').Length.toPixels('x');
var y = this.attribute('y').Length.toPixels('y');
+
for (var i=0; i<this.children.length; i++) {
var child = this.children[i];
@@ -1850,63 +1759,8 @@ if(!Array.indexOf){
this.base = svg.Element.RenderedElementBase;
this.base(node);
- this.getGlyph = function(font, text, i) {
- var c = text[i];
- var glyph = null;
- if (font.isArabic) {
- var arabicForm = 'isolated';
- if ((i==0 || text[i-1]==' ') && i<text.length-2 && text[i+1]!=' ') arabicForm = 'terminal';
- if (i>0 && text[i-1]!=' ' && i<text.length-2 && text[i+1]!=' ') arabicForm = 'medial';
- if (i>0 && text[i-1]!=' ' && (i == text.length-1 || text[i+1]==' ')) arabicForm = 'initial';
- if (typeof(font.glyphs[c]) != 'undefined') {
- glyph = font.glyphs[c][arabicForm];
- if (glyph == null && font.glyphs[c].type == 'glyph') glyph = font.glyphs[c];
- }
- }
- else {
- glyph = font.glyphs[c];
- }
- if (glyph == null) glyph = font.missingGlyph;
- return glyph;
- }
-
this.renderChildren = function(ctx) {
- var customFont = this.parent.style('font-family').Definition.getDefinition();
- if (customFont != null) {
- var fontSize = this.parent.style('font-size').numValueOrDefault(svg.Font.Parse(svg.ctx.font).fontSize);
- var fontStyle = this.parent.style('font-style').valueOrDefault(svg.Font.Parse(svg.ctx.font).fontStyle);
- var text = this.getText();
- if (customFont.isRTL) text = text.split("").reverse().join("");
-
- if (this.parent.style('text-anchor').value == 'middle') {
- this.x = this.x - this.measureText(ctx) / 2.0;
- }
-
- var dx = svg.ToNumberArray(this.parent.attribute('dx').value);
- for (var i=0; i<text.length; i++) {
- var glyph = this.getGlyph(customFont, text, i);
- var scale = fontSize / customFont.fontFace.unitsPerEm;
- ctx.translate(this.x, this.y);
- ctx.scale(scale, -scale);
- var lw = ctx.lineWidth;
- ctx.lineWidth = ctx.lineWidth * customFont.fontFace.unitsPerEm / fontSize;
- if (fontStyle == 'italic') ctx.transform(1, 0, .4, 1, 0, 0);
- glyph.render(ctx);
- if (fontStyle == 'italic') ctx.transform(1, 0, -.4, 1, 0, 0);
- ctx.lineWidth = lw;
- ctx.scale(1/scale, -1/scale);
- ctx.translate(-this.x, -this.y);
-
- this.x += fontSize * (glyph.horizAdvX || customFont.horizAdvX) / customFont.fontFace.unitsPerEm;
- if (typeof(dx[i]) != 'undefined' && !isNaN(dx[i])) {
- this.x += dx[i];
- }
- }
- return;
- }
-
- if (ctx.strokeStyle != '') ctx.strokeText(svg.compressSpaces(this.getText()), this.x, this.y);
- if (ctx.fillStyle != '') ctx.fillText(svg.compressSpaces(this.getText()), this.x, this.y);
+ ctx.fillText(svg.compressSpaces(this.getText()), this.x, this.y);
}
this.getText = function() {
@@ -1914,23 +1768,6 @@ if(!Array.indexOf){
}
this.measureText = function(ctx) {
- var customFont = this.parent.style('font-family').Definition.getDefinition();
- if (customFont != null) {
- var fontSize = this.parent.style('font-size').numValueOrDefault(svg.Font.Parse(svg.ctx.font).fontSize);
- var measure = 0;
- var text = this.getText();
- if (customFont.isRTL) text = text.split("").reverse().join("");
- var dx = svg.ToNumberArray(this.parent.attribute('dx').value);
- for (var i=0; i<text.length; i++) {
- var glyph = this.getGlyph(customFont, text, i);
- measure += (glyph.horizAdvX || customFont.horizAdvX) * fontSize / customFont.fontFace.unitsPerEm;
- if (typeof(dx[i]) != 'undefined' && !isNaN(dx[i])) {
- measure += dx[i];
- }
- }
- return measure;
- }
-
var textToMeasure = svg.compressSpaces(this.getText());
if (!ctx.measureText) return textToMeasure.length * 10;
return ctx.measureText(textToMeasure).width;
@@ -1943,9 +1780,8 @@ if(!Array.indexOf){
this.base = svg.Element.TextElementBase;
this.base(node);
- this.text = node.nodeType == 3 ? node.nodeValue : // text
- node.childNodes.length > 0 ? node.childNodes[0].nodeValue : // element
- node.text;
+ // TEXT ELEMENT
+ this.text = node.nodeType == 3 ? node.nodeValue : node.childNodes[0].nodeValue;
this.getText = function() {
return this.text;
}
@@ -2095,9 +1931,8 @@ if(!Array.indexOf){
this.base = svg.Element.ElementBase;
this.base(node);
- // text, or spaces then CDATA
- var css = node.childNodes[0].nodeValue + (node.childNodes.length > 1 ? node.childNodes[1].nodeValue : '');
- css = css.replace(/(\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\/)|(^[\s]*\/\/.*)/gm, ''); // remove comments
+ var css = node.childNodes[0].nodeValue;
+ css = css.replace(/(\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\/)|(\/\/.*)/gm, ''); // remove comments
css = svg.compressSpaces(css); // replace whitespace
var cssDefs = css.split('}');
for (var i=0; i<cssDefs.length; i++) {
@@ -2110,31 +1945,14 @@ if(!Array.indexOf){
if (cssClass != '') {
var props = {};
for (var k=0; k<cssProps.length; k++) {
- var prop = cssProps[k].indexOf(':');
- var name = cssProps[k].substr(0, prop);
- var value = cssProps[k].substr(prop + 1, cssProps[k].length - prop);
+ var prop = cssProps[k].split(':');
+ var name = prop[0];
+ var value = prop[1];
if (name != null && value != null) {
- props[svg.trim(name)] = new svg.Property(svg.trim(name), svg.trim(value));
+ props[svg.trim(prop[0])] = new svg.Property(svg.trim(prop[0]), svg.trim(prop[1]));
}
}
svg.Styles[cssClass] = props;
- if (cssClass == '@font-face') {
- var fontFamily = props['font-family'].value.replace(/"/g,'');
- var srcs = props['src'].value.split(',');
- for (var s=0; s<srcs.length; s++) {
- if (srcs[s].indexOf('format("svg")') > 0) {
- var urlStart = srcs[s].indexOf('url');
- var urlEnd = srcs[s].indexOf(')', urlStart);
- var url = srcs[s].substr(urlStart + 5, urlEnd - urlStart - 6);
- var doc = svg.parseXml(svg.ajax(url));
- var fonts = doc.getElementsByTagName('font');
- for (var f=0; f<fonts.length; f++) {
- var font = svg.CreateElement(fonts[f]);
- svg.Definitions[fontFamily] = font;
- }
- }
- }
- }
}
}
}
@@ -2186,10 +2004,6 @@ if(!Array.indexOf){
}
}
}
-
- this.render = function(ctx) {
- // NO RENDER
- }
}
svg.Element.clipPath.prototype = new svg.Element.ElementBase;
@@ -2210,8 +2024,7 @@ if(!Array.indexOf){
// element factory
svg.CreateElement = function(node) {
- var className = node.nodeName.replace(/^[^:]+:/,''); // remove namespace
- className = className.replace(/\-/g,''); // remove dashes
+ var className = node.nodeName.replace(/^[^:]+:/,'');
var e = null;
if (typeof(svg.Element[className]) != 'undefined') {
e = new svg.Element[className](node);
@@ -2231,10 +2044,6 @@ if(!Array.indexOf){
// load from xml
svg.loadXml = function(ctx, xml) {
- svg.loadXmlDoc(ctx, svg.parseXml(xml));
- }
-
- svg.loadXmlDoc = function(ctx, dom) {
svg.init(ctx);
var mapXY = function(p) {
@@ -2261,24 +2070,19 @@ if(!Array.indexOf){
};
}
+ var dom = svg.parseXml(xml);
var e = svg.CreateElement(dom.documentElement);
- e.root = true;
// render loop
var isFirstRender = true;
var draw = function() {
- svg.ViewPort.Clear();
- if (ctx.canvas.parentNode) svg.ViewPort.SetCurrent(ctx.canvas.parentNode.clientWidth, ctx.canvas.parentNode.clientHeight);
-
if (svg.opts == null || svg.opts['ignoreDimensions'] != true) {
// set canvas size
if (e.style('width').hasValue()) {
- ctx.canvas.width = e.style('width').Length.toPixels('x');
- ctx.canvas.style.width = ctx.canvas.width + 'px';
+ ctx.canvas.width = e.style('width').Length.toPixels(ctx.canvas.parentNode.clientWidth);
}
if (e.style('height').hasValue()) {
- ctx.canvas.height = e.style('height').Length.toPixels('y');
- ctx.canvas.style.height = ctx.canvas.height + 'px';
+ ctx.canvas.height = e.style('height').Length.toPixels(ctx.canvas.parentNode.clientHeight);
}
}
svg.ViewPort.SetCurrent(ctx.canvas.clientWidth, ctx.canvas.clientHeight);
diff --git a/js/canvg/rgbcolor.js b/js/canvg/rgbcolor.js
new file mode 100644
index 0000000..0338a16
--- /dev/null
+++ b/js/canvg/rgbcolor.js
@@ -0,0 +1,288 @@
+/**
+ * A class to parse color values
+ * @author Stoyan Stefanov <sstoo(a)gmail.com>
+ * @link http://www.phpied.com/rgb-color-parser-in-javascript/
+ * @license Use it if you like it
+ */
+function RGBColor(color_string)
+{
+ this.ok = false;
+
+ // strip any leading #
+ if (color_string.charAt(0) == '#') { // remove # if any
+ color_string = color_string.substr(1,6);
+ }
+
+ color_string = color_string.replace(/ /g,'');
+ color_string = color_string.toLowerCase();
+
+ // before getting into regexps, try simple matches
+ // and overwrite the input
+ var simple_colors = {
+ aliceblue: 'f0f8ff',
+ antiquewhite: 'faebd7',
+ aqua: '00ffff',
+ aquamarine: '7fffd4',
+ azure: 'f0ffff',
+ beige: 'f5f5dc',
+ bisque: 'ffe4c4',
+ black: '000000',
+ blanchedalmond: 'ffebcd',
+ blue: '0000ff',
+ blueviolet: '8a2be2',
+ brown: 'a52a2a',
+ burlywood: 'deb887',
+ cadetblue: '5f9ea0',
+ chartreuse: '7fff00',
+ chocolate: 'd2691e',
+ coral: 'ff7f50',
+ cornflowerblue: '6495ed',
+ cornsilk: 'fff8dc',
+ crimson: 'dc143c',
+ cyan: '00ffff',
+ darkblue: '00008b',
+ darkcyan: '008b8b',
+ darkgoldenrod: 'b8860b',
+ darkgray: 'a9a9a9',
+ darkgreen: '006400',
+ darkkhaki: 'bdb76b',
+ darkmagenta: '8b008b',
+ darkolivegreen: '556b2f',
+ darkorange: 'ff8c00',
+ darkorchid: '9932cc',
+ darkred: '8b0000',
+ darksalmon: 'e9967a',
+ darkseagreen: '8fbc8f',
+ darkslateblue: '483d8b',
+ darkslategray: '2f4f4f',
+ darkturquoise: '00ced1',
+ darkviolet: '9400d3',
+ deeppink: 'ff1493',
+ deepskyblue: '00bfff',
+ dimgray: '696969',
+ dodgerblue: '1e90ff',
+ feldspar: 'd19275',
+ firebrick: 'b22222',
+ floralwhite: 'fffaf0',
+ forestgreen: '228b22',
+ fuchsia: 'ff00ff',
+ gainsboro: 'dcdcdc',
+ ghostwhite: 'f8f8ff',
+ gold: 'ffd700',
+ goldenrod: 'daa520',
+ gray: '808080',
+ green: '008000',
+ greenyellow: 'adff2f',
+ honeydew: 'f0fff0',
+ hotpink: 'ff69b4',
+ indianred : 'cd5c5c',
+ indigo : '4b0082',
+ ivory: 'fffff0',
+ khaki: 'f0e68c',
+ lavender: 'e6e6fa',
+ lavenderblush: 'fff0f5',
+ lawngreen: '7cfc00',
+ lemonchiffon: 'fffacd',
+ lightblue: 'add8e6',
+ lightcoral: 'f08080',
+ lightcyan: 'e0ffff',
+ lightgoldenrodyellow: 'fafad2',
+ lightgrey: 'd3d3d3',
+ lightgreen: '90ee90',
+ lightpink: 'ffb6c1',
+ lightsalmon: 'ffa07a',
+ lightseagreen: '20b2aa',
+ lightskyblue: '87cefa',
+ lightslateblue: '8470ff',
+ lightslategray: '778899',
+ lightsteelblue: 'b0c4de',
+ lightyellow: 'ffffe0',
+ lime: '00ff00',
+ limegreen: '32cd32',
+ linen: 'faf0e6',
+ magenta: 'ff00ff',
+ maroon: '800000',
+ mediumaquamarine: '66cdaa',
+ mediumblue: '0000cd',
+ mediumorchid: 'ba55d3',
+ mediumpurple: '9370d8',
+ mediumseagreen: '3cb371',
+ mediumslateblue: '7b68ee',
+ mediumspringgreen: '00fa9a',
+ mediumturquoise: '48d1cc',
+ mediumvioletred: 'c71585',
+ midnightblue: '191970',
+ mintcream: 'f5fffa',
+ mistyrose: 'ffe4e1',
+ moccasin: 'ffe4b5',
+ navajowhite: 'ffdead',
+ navy: '000080',
+ oldlace: 'fdf5e6',
+ olive: '808000',
+ olivedrab: '6b8e23',
+ orange: 'ffa500',
+ orangered: 'ff4500',
+ orchid: 'da70d6',
+ palegoldenrod: 'eee8aa',
+ palegreen: '98fb98',
+ paleturquoise: 'afeeee',
+ palevioletred: 'd87093',
+ papayawhip: 'ffefd5',
+ peachpuff: 'ffdab9',
+ peru: 'cd853f',
+ pink: 'ffc0cb',
+ plum: 'dda0dd',
+ powderblue: 'b0e0e6',
+ purple: '800080',
+ red: 'ff0000',
+ rosybrown: 'bc8f8f',
+ royalblue: '4169e1',
+ saddlebrown: '8b4513',
+ salmon: 'fa8072',
+ sandybrown: 'f4a460',
+ seagreen: '2e8b57',
+ seashell: 'fff5ee',
+ sienna: 'a0522d',
+ silver: 'c0c0c0',
+ skyblue: '87ceeb',
+ slateblue: '6a5acd',
+ slategray: '708090',
+ snow: 'fffafa',
+ springgreen: '00ff7f',
+ steelblue: '4682b4',
+ tan: 'd2b48c',
+ teal: '008080',
+ thistle: 'd8bfd8',
+ tomato: 'ff6347',
+ turquoise: '40e0d0',
+ violet: 'ee82ee',
+ violetred: 'd02090',
+ wheat: 'f5deb3',
+ white: 'ffffff',
+ whitesmoke: 'f5f5f5',
+ yellow: 'ffff00',
+ yellowgreen: '9acd32'
+ };
+ for (var key in simple_colors) {
+ if (color_string == key) {
+ color_string = simple_colors[key];
+ }
+ }
+ // emd of simple type-in colors
+
+ // array of color definition objects
+ var color_defs = [
+ {
+ re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,
+ example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'],
+ process: function (bits){
+ return [
+ parseInt(bits[1]),
+ parseInt(bits[2]),
+ parseInt(bits[3])
+ ];
+ }
+ },
+ {
+ re: /^(\w{2})(\w{2})(\w{2})$/,
+ example: ['#00ff00', '336699'],
+ process: function (bits){
+ return [
+ parseInt(bits[1], 16),
+ parseInt(bits[2], 16),
+ parseInt(bits[3], 16)
+ ];
+ }
+ },
+ {
+ re: /^(\w{1})(\w{1})(\w{1})$/,
+ example: ['#fb0', 'f0f'],
+ process: function (bits){
+ return [
+ parseInt(bits[1] + bits[1], 16),
+ parseInt(bits[2] + bits[2], 16),
+ parseInt(bits[3] + bits[3], 16)
+ ];
+ }
+ }
+ ];
+
+ // search through the definitions to find a match
+ for (var i = 0; i < color_defs.length; i++) {
+ var re = color_defs[i].re;
+ var processor = color_defs[i].process;
+ var bits = re.exec(color_string);
+ if (bits) {
+ channels = processor(bits);
+ this.r = channels[0];
+ this.g = channels[1];
+ this.b = channels[2];
+ this.ok = true;
+ }
+
+ }
+
+ // validate/cleanup values
+ this.r = (this.r < 0 || isNaN(this.r)) ? 0 : ((this.r > 255) ? 255 : this.r);
+ this.g = (this.g < 0 || isNaN(this.g)) ? 0 : ((this.g > 255) ? 255 : this.g);
+ this.b = (this.b < 0 || isNaN(this.b)) ? 0 : ((this.b > 255) ? 255 : this.b);
+
+ // some getters
+ this.toRGB = function () {
+ return 'rgb(' + this.r + ', ' + this.g + ', ' + this.b + ')';
+ }
+ this.toHex = function () {
+ var r = this.r.toString(16);
+ var g = this.g.toString(16);
+ var b = this.b.toString(16);
+ if (r.length == 1) r = '0' + r;
+ if (g.length == 1) g = '0' + g;
+ if (b.length == 1) b = '0' + b;
+ return '#' + r + g + b;
+ }
+
+ // help
+ this.getHelpXML = function () {
+
+ var examples = new Array();
+ // add regexps
+ for (var i = 0; i < color_defs.length; i++) {
+ var example = color_defs[i].example;
+ for (var j = 0; j < example.length; j++) {
+ examples[examples.length] = example[j];
+ }
+ }
+ // add type-in colors
+ for (var sc in simple_colors) {
+ examples[examples.length] = sc;
+ }
+
+ var xml = document.createElement('ul');
+ xml.setAttribute('id', 'rgbcolor-examples');
+ for (var i = 0; i < examples.length; i++) {
+ try {
+ var list_item = document.createElement('li');
+ var list_color = new RGBColor(examples[i]);
+ var example_div = document.createElement('div');
+ example_div.style.cssText =
+ 'margin: 3px; '
+ + 'border: 1px solid black; '
+ + 'background:' + list_color.toHex() + '; '
+ + 'color:' + list_color.toHex()
+ ;
+ example_div.appendChild(document.createTextNode('test'));
+ var list_item_value = document.createTextNode(
+ ' ' + examples[i] + ' -> ' + list_color.toRGB() + ' -> ' + list_color.toHex()
+ );
+ list_item.appendChild(example_div);
+ list_item.appendChild(list_item_value);
+ xml.appendChild(list_item);
+
+ } catch(e){}
+ }
+ return xml;
+
+ }
+
+}
+
diff --git a/js/date.js b/js/date.js
new file mode 100644
index 0000000..9a92340
--- /dev/null
+++ b/js/date.js
@@ -0,0 +1,335 @@
+// ===================================================================
+// Author: Matt Kruse <matt(a)mattkruse.com>
+// WWW: http://www.mattkruse.com/
+//
+// NOTICE: You may use this code for any purpose, commercial or
+// private, without any further permission from the author. You may
+// remove this notice from your final code if you wish, however it is
+// appreciated by the author if at least my web site address is kept.
+//
+// You may *NOT* re-distribute this code in any way except through its
+// use. That means, you can include it in your product, or your web
+// site, or any other form where the code is actually being used. You
+// may not put the plain javascript up on your site for download or
+// include it in your javascript libraries for download.
+// If you wish to share this code with others, please just point them
+// to the URL instead.
+// Please DO NOT link directly to my .js files from your site. Copy
+// the files to your server and use them there. Thank you.
+// ===================================================================
+
+// HISTORY
+// ------------------------------------------------------------------
+// May 17, 2003: Fixed bug in parseDate() for dates <1970
+// March 11, 2003: Added parseDate() function
+// March 11, 2003: Added "NNN" formatting option. Doesn't match up
+// perfectly with SimpleDateFormat formats, but
+// backwards-compatability was required.
+
+// ------------------------------------------------------------------
+// These functions use the same 'format' strings as the
+// java.text.SimpleDateFormat class, with minor exceptions.
+// The format string consists of the following abbreviations:
+//
+// Field | Full Form | Short Form
+// -------------+--------------------+-----------------------
+// Year | yyyy (4 digits) | yy (2 digits), y (2 or 4 digits)
+// Month | MMM (name or abbr.)| MM (2 digits), M (1 or 2 digits)
+// | NNN (abbr.) |
+// Day of Month | dd (2 digits) | d (1 or 2 digits)
+// Day of Week | EE (name) | E (abbr)
+// Hour (1-12) | hh (2 digits) | h (1 or 2 digits)
+// Hour (0-23) | HH (2 digits) | H (1 or 2 digits)
+// Hour (0-11) | KK (2 digits) | K (1 or 2 digits)
+// Hour (1-24) | kk (2 digits) | k (1 or 2 digits)
+// Minute | mm (2 digits) | m (1 or 2 digits)
+// Second | ss (2 digits) | s (1 or 2 digits)
+// AM/PM | a |
+//
+// NOTE THE DIFFERENCE BETWEEN MM and mm! Month=MM, not mm!
+// Examples:
+// "MMM d, y" matches: January 01, 2000
+// Dec 1, 1900
+// Nov 20, 00
+// "M/d/yy" matches: 01/20/00
+// 9/2/00
+// "MMM dd, yyyy hh:mm:ssa" matches: "January 01, 2000 12:30:45AM"
+// ------------------------------------------------------------------
+
+var MONTH_NAMES=new Array('January','February','March','April','May','June','July','August','September','October','November','December','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
+var DAY_NAMES=new Array('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sun','Mon','Tue','Wed','Thu','Fri','Sat');
+function LZ(x) {return(x<0||x>9?"":"0")+x}
+
+// ------------------------------------------------------------------
+// isDate ( date_string, format_string )
+// Returns true if date string matches format of format string and
+// is a valid date. Else returns false.
+// It is recommended that you trim whitespace around the value before
+// passing it to this function, as whitespace is NOT ignored!
+// ------------------------------------------------------------------
+function isDate(val,format) {
+ var date=getDateFromFormat(val,format);
+ if (date==0) { return false; }
+ return true;
+ }
+
+// -------------------------------------------------------------------
+// compareDates(date1,date1format,date2,date2format)
+// Compare two date strings to see which is greater.
+// Returns:
+// 1 if date1 is greater than date2
+// 0 if date2 is greater than date1 of if they are the same
+// -1 if either of the dates is in an invalid format
+// -------------------------------------------------------------------
+function compareDates(date1,dateformat1,date2,dateformat2) {
+ var d1=getDateFromFormat(date1,dateformat1);
+ var d2=getDateFromFormat(date2,dateformat2);
+ if (d1==0 || d2==0) {
+ return -1;
+ }
+ else if (d1 > d2) {
+ return 1;
+ }
+ return 0;
+ }
+
+// ------------------------------------------------------------------
+// formatDate (date_object, format)
+// Returns a date in the output format specified.
+// The format string uses the same abbreviations as in getDateFromFormat()
+// ------------------------------------------------------------------
+function formatDate(date,format) {
+ format=format+"";
+ var result="";
+ var i_format=0;
+ var c="";
+ var token="";
+ var y=date.getYear()+"";
+ var M=date.getMonth()+1;
+ var d=date.getDate();
+ var E=date.getDay();
+ var H=date.getHours();
+ var m=date.getMinutes();
+ var s=date.getSeconds();
+ var yyyy,yy,MMM,MM,dd,hh,h,mm,ss,ampm,HH,H,KK,K,kk,k;
+ // Convert real date parts into formatted versions
+ var value=new Object();
+ if (y.length < 4) {y=""+(y-0+1900);}
+ value["y"]=""+y;
+ value["yyyy"]=y;
+ value["yy"]=y.substring(2,4);
+ value["M"]=M;
+ value["MM"]=LZ(M);
+ value["MMM"]=MONTH_NAMES[M-1];
+ value["NNN"]=MONTH_NAMES[M+11];
+ value["d"]=d;
+ value["dd"]=LZ(d);
+ value["E"]=DAY_NAMES[E+7];
+ value["EE"]=DAY_NAMES[E];
+ value["H"]=H;
+ value["HH"]=LZ(H);
+ if (H==0){value["h"]=12;}
+ else if (H>12){value["h"]=H-12;}
+ else {value["h"]=H;}
+ value["hh"]=LZ(value["h"]);
+ if (H>11){value["K"]=H-12;} else {value["K"]=H;}
+ value["k"]=H+1;
+ value["KK"]=LZ(value["K"]);
+ value["kk"]=LZ(value["k"]);
+ if (H > 11) { value["a"]="PM"; }
+ else { value["a"]="AM"; }
+ value["m"]=m;
+ value["mm"]=LZ(m);
+ value["s"]=s;
+ value["ss"]=LZ(s);
+ while (i_format < format.length) {
+ c=format.charAt(i_format);
+ token="";
+ while ((format.charAt(i_format)==c) && (i_format < format.length)) {
+ token += format.charAt(i_format++);
+ }
+ if (value[token] != null) { result=result + value[token]; }
+ else { result=result + token; }
+ }
+ return result;
+ }
+
+// ------------------------------------------------------------------
+// Utility functions for parsing in getDateFromFormat()
+// ------------------------------------------------------------------
+function _isInteger(val) {
+ var digits="1234567890";
+ for (var i=0; i < val.length; i++) {
+ if (digits.indexOf(val.charAt(i))==-1) { return false; }
+ }
+ return true;
+ }
+function _getInt(str,i,minlength,maxlength) {
+ for (var x=maxlength; x>=minlength; x--) {
+ var token=str.substring(i,i+x);
+ if (token.length < minlength) { return null; }
+ if (_isInteger(token)) { return token; }
+ }
+ return null;
+ }
+
+// ------------------------------------------------------------------
+// getDateFromFormat( date_string , format_string )
+//
+// This function takes a date string and a format string. It matches
+// If the date string matches the format string, it returns the
+// getTime() of the date. If it does not match, it returns 0.
+// ------------------------------------------------------------------
+function getDateFromFormat(val,format) {
+ val=val+"";
+ format=format+"";
+ var i_val=0;
+ var i_format=0;
+ var c="";
+ var token="";
+ var token2="";
+ var x,y;
+ var now=new Date();
+ var year=now.getYear();
+ var month=now.getMonth()+1;
+ var date=1;
+ var hh=now.getHours();
+ var mm=now.getMinutes();
+ var ss=now.getSeconds();
+ var ampm="";
+
+ while (i_format < format.length) {
+ // Get next token from format string
+ c=format.charAt(i_format);
+ token="";
+ while ((format.charAt(i_format)==c) && (i_format < format.length)) {
+ token += format.charAt(i_format++);
+ }
+ // Extract contents of value based on format token
+ if (token=="yyyy" || token=="yy" || token=="y") {
+ if (token=="yyyy") { x=4;y=4; }
+ if (token=="yy") { x=2;y=2; }
+ if (token=="y") { x=2;y=4; }
+ year=_getInt(val,i_val,x,y);
+ if (year==null) { return 0; }
+ i_val += year.length;
+ if (year.length==2) {
+ if (year > 70) { year=1900+(year-0); }
+ else { year=2000+(year-0); }
+ }
+ }
+ else if (token=="MMM"||token=="NNN"){
+ month=0;
+ for (var i=0; i<MONTH_NAMES.length; i++) {
+ var month_name=MONTH_NAMES[i];
+ if (val.substring(i_val,i_val+month_name.length).toLowerCase()==month_name.toLowerCase()) {
+ if (token=="MMM"||(token=="NNN"&&i>11)) {
+ month=i+1;
+ if (month>12) { month -= 12; }
+ i_val += month_name.length;
+ break;
+ }
+ }
+ }
+ if ((month < 1)||(month>12)){return 0;}
+ }
+ else if (token=="EE"||token=="E"){
+ for (var i=0; i<DAY_NAMES.length; i++) {
+ var day_name=DAY_NAMES[i];
+ if (val.substring(i_val,i_val+day_name.length).toLowerCase()==day_name.toLowerCase()) {
+ i_val += day_name.length;
+ break;
+ }
+ }
+ }
+ else if (token=="MM"||token=="M") {
+ month=_getInt(val,i_val,token.length,2);
+ if(month==null||(month<1)||(month>12)){return 0;}
+ i_val+=month.length;}
+ else if (token=="dd"||token=="d") {
+ date=_getInt(val,i_val,token.length,2);
+ if(date==null||(date<1)||(date>31)){return 0;}
+ i_val+=date.length;}
+ else if (token=="hh"||token=="h") {
+ hh=_getInt(val,i_val,token.length,2);
+ if(hh==null||(hh<1)||(hh>12)){return 0;}
+ i_val+=hh.length;}
+ else if (token=="HH"||token=="H") {
+ hh=_getInt(val,i_val,token.length,2);
+ if(hh==null||(hh<0)||(hh>23)){return 0;}
+ i_val+=hh.length;}
+ else if (token=="KK"||token=="K") {
+ hh=_getInt(val,i_val,token.length,2);
+ if(hh==null||(hh<0)||(hh>11)){return 0;}
+ i_val+=hh.length;}
+ else if (token=="kk"||token=="k") {
+ hh=_getInt(val,i_val,token.length,2);
+ if(hh==null||(hh<1)||(hh>24)){return 0;}
+ i_val+=hh.length;hh--;}
+ else if (token=="mm"||token=="m") {
+ mm=_getInt(val,i_val,token.length,2);
+ if(mm==null||(mm<0)||(mm>59)){return 0;}
+ i_val+=mm.length;}
+ else if (token=="ss"||token=="s") {
+ ss=_getInt(val,i_val,token.length,2);
+ if(ss==null||(ss<0)||(ss>59)){return 0;}
+ i_val+=ss.length;}
+ else if (token=="a") {
+ if (val.substring(i_val,i_val+2).toLowerCase()=="am") {ampm="AM";}
+ else if (val.substring(i_val,i_val+2).toLowerCase()=="pm") {ampm="PM";}
+ else {return 0;}
+ i_val+=2;}
+ else {
+ if (val.substring(i_val,i_val+token.length)!=token) {return 0;}
+ else {i_val+=token.length;}
+ }
+ }
+ // If there are any trailing characters left in the value, it doesn't match
+ if (i_val != val.length) { return 0; }
+ // Is date valid for month?
+ if (month==2) {
+ // Check for leap year
+ if ( ( (year%4==0)&&(year%100 != 0) ) || (year%400==0) ) { // leap year
+ if (date > 29){ return 0; }
+ }
+ else { if (date > 28) { return 0; } }
+ }
+ if ((month==4)||(month==6)||(month==9)||(month==11)) {
+ if (date > 30) { return 0; }
+ }
+ // Correct hours value
+ if (hh<12 && ampm=="PM") { hh=hh-0+12; }
+ else if (hh>11 && ampm=="AM") { hh-=12; }
+ var newdate=new Date(year,month-1,date,hh,mm,ss);
+ return newdate.getTime();
+ }
+
+// ------------------------------------------------------------------
+// parseDate( date_string [, prefer_euro_format] )
+//
+// This function takes a date string and tries to match it to a
+// number of possible date formats to get the value. It will try to
+// match against the following international formats, in this order:
+// y-M-d MMM d, y MMM d,y y-MMM-d d-MMM-y MMM d
+// M/d/y M-d-y M.d.y MMM-d M/d M-d
+// d/M/y d-M-y d.M.y d-MMM d/M d-M
+// A second argument may be passed to instruct the method to search
+// for formats like d/M/y (european format) before M/d/y (American).
+// Returns a Date object or null if no patterns match.
+// ------------------------------------------------------------------
+function parseDate(val) {
+ var preferEuro=(arguments.length==2)?arguments[1]:false;
+ generalFormats=new Array('y-M-d','MMM d, y','MMM d,y','y-MMM-d','d-MMM-y','MMM d');
+ monthFirst=new Array('M/d/y','M-d-y','M.d.y','MMM-d','M/d','M-d');
+ dateFirst =new Array('d/M/y','d-M-y','d.M.y','d-MMM','d/M','d-M');
+ var checkList=new Array('generalFormats',preferEuro?'dateFirst':'monthFirst',preferEuro?'monthFirst':'dateFirst');
+ var d=null;
+ for (var i=0; i<checkList.length; i++) {
+ var l=window[checkList[i]];
+ for (var j=0; j<l.length; j++) {
+ d=getDateFromFormat(val,l[j]);
+ if (d!=0) { return new Date(d); }
+ }
+ }
+ return null;
+ }
diff --git a/js/messages.php b/js/messages.php
index 63fb182..b942a18 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -258,6 +258,12 @@ $js_messages['strSave'] = __('Save');
$js_messages['strHideSearchCriteria'] = __('Hide search criteria');
$js_messages['strShowSearchCriteria'] = __('Show search criteria');
+/* For tbl_zoom_plot.js */
+$js_messages['strZoomSearch'] = __('Zoom Search');
+$js_messages['strDisplayHelp'] = __('* Each point represents a data row.<br>* Hovering over a point will show its label.<br>* Drag and select an area in the plot to zoom into it.<br>* Click reset zoom link to come back to original state.<br>* Click a data point to view and possibly edit the data row.<br>* The plot can be resized by dragging it along the bottom right corner.<br>* Strings are converted into integer for plotting');
+$js_messages['strInputNull'] = __('<b>Select two columns</b>');
+$js_messages['strSameInputs'] = __('<b>Select two different columns</b>');
+
/* For tbl_change.js */
$js_messages['strIgnore'] = __('Ignore');
diff --git a/js/tbl_select.js b/js/tbl_select.js
index 3bc1137..af2242a 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -66,7 +66,7 @@ $(document).ready(function() {
if (typeof response == 'string') {
// found results
$("#sqlqueryresults").html(response);
- $("#sqlqueryresults").trigger('makegrid');
+ $("#sqlqueryresults").trigger('appendAnchor');
$('#tbl_search_form')
// work around for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome.
.slideToggle()
diff --git a/js/tbl_zoom_plot.js b/js/tbl_zoom_plot.js
new file mode 100644
index 0000000..b9c0d75
--- /dev/null
+++ b/js/tbl_zoom_plot.js
@@ -0,0 +1,605 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ ** @fileoverview JavaScript functions used on tbl_select.php
+ **
+ ** @requires jQuery
+ ** @requires js/functions.js
+ **/
+
+
+/**
+ ** Display Help/Info
+ **/
+function displayHelp() {
+ var msgbox = PMA_ajaxShowMessage(PMA_messages['strDisplayHelp'],10000);
+ msgbox.click(function() {
+ PMA_ajaxRemoveMessage(msgbox);
+ });
+}
+
+/**
+ ** Extend the array object for max function
+ ** @param array
+ **/
+Array.max = function (array) {
+ return Math.max.apply( Math, array );
+}
+
+/**
+ ** Extend the array object for min function
+ ** @param array
+ **/
+Array.min = function (array) {
+ return Math.min.apply( Math, array );
+}
+
+/**
+ ** Checks if a string contains only numeric value
+ ** @param n: String (to be checked)
+ **/
+function isNumeric(n) {
+ return !isNaN(parseFloat(n)) && isFinite(n);
+}
+
+/**
+ ** Checks if an object is empty
+ ** @param n: Object (to be checked)
+ **/
+function isEmpty(obj) {
+ var name;
+ for (name in obj) {
+ return false;
+ }
+ return true;
+}
+
+/**
+ ** Converts a timestamp into the format of its field type
+ ** @param val Integer Timestamp
+ ** @param type String Field type(datetime/timestamp/time/date)
+ **/
+function getDate(val,type) {
+ if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) {
+ return Highcharts.dateFormat('%Y-%m-%e %H:%M:%S', val)
+ }
+ else if(type.toString().search(/time/i) != -1) {
+ return Highcharts.dateFormat('%H:%M:%S', val + 19800000)
+ }
+ else if (type.toString().search(/date/i) != -1) {
+ return Highcharts.dateFormat('%Y-%m-%e', val)
+ }
+}
+
+/**
+ ** Converts a date/time into timestamp
+ ** @param val String Date
+ ** @param type Sring Field type(datetime/timestamp/time/date)
+ **/
+function getTimeStamp(val,type) {
+ if(type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) {
+ return getDateFromFormat(val,'yyyy-MM-dd HH:mm:ss', val)
+ }
+ else if(type.toString().search(/time/i) != -1) {
+ return getDateFromFormat('1970-01-01 ' + val,'yyyy-MM-dd HH:mm:ss')
+ }
+ else if (type.toString().search(/date/i) != -1) {
+ return getDateFromFormat(val,'yyyy-MM-dd')
+ }
+}
+
+/**
+ ** Classifies the field type into numeric,timeseries or text
+ ** @param field: field type (as in database structure)
+ **/
+function getType(field) {
+ if(field.toString().search(/int/i) != -1 || field.toString().search(/decimal/i) != -1 || field.toString().search(/year/i) != -1)
+ return 'numeric';
+ else if(field.toString().search(/time/i) != -1 || field.toString().search(/date/i) != -1)
+ return 'time';
+ else
+ return 'text';
+}
+/**
+ ** Converts a categorical array into numeric array
+ ** @param array categorical values array
+ **/
+function getCord(arr) {
+ var newCord = new Array();
+ var original = $.extend(true,[],arr);
+ var arr = jQuery.unique(arr).sort();
+ $.each(original, function(index,value) {
+ newCord.push(jQuery.inArray(value,arr));
+ });
+ return [newCord,arr,original];
+}
+
+/**
+ ** Scrolls the view to the display section
+ **/
+function scrollToChart() {
+ var x = $('#dataDisplay').offset().top - 100; // 100 provides buffer in viewport
+ $('html,body').animate({scrollTop: x}, 500);
+}
+
+$(document).ready(function() {
+
+ /**
+ ** Set a parameter for all Ajax queries made on this page. Don't let the
+ ** web server serve cached pages
+ **/
+ $.ajaxSetup({
+ cache: 'false'
+ });
+
+ var cursorMode = ($("input[name='mode']:checked").val() == 'edit') ? 'crosshair' : 'pointer';
+ var currentChart = null;
+ var currentData = null;
+ var xLabel = $('#tableid_0').val();
+ var yLabel = $('#tableid_1').val();
+ var xType = $('#types_0').val();
+ var yType = $('#types_1').val();
+ var dataLabel = $('#dataLabel').val();
+
+ // Get query result
+ var data = jQuery.parseJSON($('#querydata').html());
+
+ /**
+ ** Input form submit on field change
+ **/
+ $('#tableid_0').change(function() {
+ $('#zoom_search_form').submit();
+ })
+
+ $('#tableid_1').change(function() {
+ $('#zoom_search_form').submit();
+ })
+
+ $('#tableid_2').change(function() {
+ $('#zoom_search_form').submit();
+ })
+
+ $('#tableid_3').change(function() {
+ $('#zoom_search_form').submit();
+ })
+
+ /**
+ * Input form validation
+ **/
+ $('#inputFormSubmitId').click(function() {
+ if ($('#tableid_0').get(0).selectedIndex == 0 || $('#tableid_1').get(0).selectedIndex == 0)
+ PMA_ajaxShowMessage(PMA_messages['strInputNull']);
+ else if (xLabel == yLabel)
+ PMA_ajaxShowMessage(PMA_messages['strSameInputs']);
+ });
+
+ /**
+ ** Prepare a div containing a link, otherwise it's incorrectly displayed
+ ** after a couple of clicks
+ **/
+ $('<div id="togglesearchformdiv"><a id="togglesearchformlink"></a></div>')
+ .insertAfter('#zoom_search_form')
+ // don't show it until we have results on-screen
+ .hide();
+
+ $('#togglesearchformlink')
+ .html(PMA_messages['strShowSearchCriteria'])
+ .bind('click', function() {
+ var $link = $(this);
+ $('#zoom_search_form').slideToggle();
+ if ($link.text() == PMA_messages['strHideSearchCriteria']) {
+ $link.text(PMA_messages['strShowSearchCriteria']);
+ } else {
+ $link.text(PMA_messages['strHideSearchCriteria']);
+ }
+ // avoid default click action
+ return false;
+ });
+
+ /**
+ ** Set dialog properties for the data display form
+ **/
+ $("#dataDisplay").dialog({
+ autoOpen: false,
+ title: 'Data point content',
+ modal: false, //false otherwise other dialogues like timepicker may not function properly
+ height: $('#dataDisplay').height() + 80,
+ width: $('#dataDisplay').width() + 80
+ });
+
+ /*
+ * Handle submit of zoom_display_form
+ */
+
+ $("#submitForm").click(function(event) {
+
+ //Prevent default submission of form
+ event.preventDefault();
+
+ //Find changed values by comparing form values with selectedRow Object
+ var newValues = new Array();//Stores the values changed from original
+ var it = 4;
+ var xChange = false;
+ var yChange = false;
+ for (key in selectedRow) {
+ if (key != 'where_clause'){
+ var oldVal = selectedRow[key];
+ var newVal = ($('#fields_null_id_' + it).attr('checked')) ? null : $('#fieldID_' + it).val();
+ if (oldVal != newVal){
+ selectedRow[key] = newVal;
+ newValues[key] = newVal;
+ if(key == xLabel) {
+ xChange = true;
+ data[currentData][xLabel] = newVal;
+ }
+ else if(key == yLabel) {
+ yChange = true;
+ data[currentData][yLabel] = newVal;
+ }
+ }
+ }
+ it++
+ }//End data update
+
+ //Update the chart series and replot
+ if (xChange || yChange) {
+ var newSeries = new Array();
+ newSeries[0] = new Object();
+ newSeries[0].marker = {
+ symbol: 'circle'
+ };
+ //Logic similar to plot generation, replot only if xAxis changes or yAxis changes. Code includes a lot of checks so as to replot only when necessary
+ if(xChange) {
+ xCord[currentData] = selectedRow[xLabel];
+ if(xType == 'numeric') {
+ currentChart.series[0].data[currentData].update({ x : selectedRow[xLabel] });
+ currentChart.xAxis[0].setExtremes(Array.min(xCord) - 6,Array.max(xCord) + 6);
+ }
+ else if(xType == 'time') {
+ currentChart.series[0].data[currentData].update({ x : getTimeStamp(selectedRow[xLabel],$('#types_0').val())});
+ }
+ else {
+ var tempX = getCord(xCord);
+ var tempY = getCord(yCord);
+ var i = 0;
+ newSeries[0].data = new Array();
+ xCord = tempX[2];
+ yCord = tempY[2];
+
+ $.each(data,function(key,value) {
+ if(yType != 'text')
+ newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: value[yLabel], marker: {fillColor: colorCodes[i % 8]} , id: i } );
+ else
+ newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } );
+ i++;
+ });
+ currentSettings.xAxis.labels = { formatter : function() {
+ if(tempX[1][this.value] && tempX[1][this.value].length > 10)
+ return tempX[1][this.value].substring(0,10)
+ else
+ return tempX[1][this.value];
+ }
+ }
+ currentSettings.series = newSeries;
+ currentChart = PMA_createChart(currentSettings);
+ }
+
+ }
+ if(yChange) {
+
+ yCord[currentData] = selectedRow[yLabel];
+ if(yType == 'numeric') {
+ currentChart.series[0].data[currentData].update({ y : selectedRow[yLabel] });
+ currentChart.yAxis[0].setExtremes(Array.min(yCord) - 6,Array.max(yCord) + 6);
+ }
+ else if(yType =='time') {
+ currentChart.series[0].data[currentData].update({ y : getTimeStamp(selectedRow[yLabel],$('#types_1').val())});
+ }
+ else {
+ var tempX = getCord(xCord);
+ var tempY = getCord(yCord);
+ var i = 0;
+ newSeries[0].data = new Array();
+ xCord = tempX[2];
+ yCord = tempY[2];
+
+ $.each(data,function(key,value) {
+ if(xType != 'text' )
+ newSeries[0].data.push({ name: value[dataLabel], x: value[xLabel], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } );
+ else
+ newSeries[0].data.push({ name: value[dataLabel], x: tempX[0][i], y: tempY[0][i], marker: {fillColor: colorCodes[i % 8]} , id: i } );
+ i++;
+ });
+ currentSettings.yAxis.labels = { formatter : function() {
+ if(tempY[1][this.value] && tempY[1][this.value].length > 10)
+ return tempY[1][this.value].substring(0,10)
+ else
+ return tempY[1][this.value];
+ }
+ }
+ currentSettings.series = newSeries;
+ currentChart = PMA_createChart(currentSettings);
+ }
+ }
+ currentChart.series[0].data[currentData].select();
+ }
+ //End plot update
+
+ //Generate SQL query for update
+ if (!isEmpty(newValues)) {
+ var sql_query = 'UPDATE `' + window.parent.table + '` SET ';
+ for (key in newValues) {
+ if(key != 'where_clause') {
+ sql_query += '`' + key + '`=' ;
+ var value = newValues[key];
+ if(!isNumeric(value) && value != null)
+ sql_query += '\'' + value + '\' ,';
+ else
+ sql_query += value + ' ,';
+ }
+ }
+ sql_query = sql_query.substring(0, sql_query.length - 1);
+ sql_query += ' WHERE ' + PMA_urldecode(data[currentData]['where_clause']);
+
+ //Post SQL query to sql.php
+ $.post('sql.php', {
+ 'token' : window.parent.token,
+ 'db' : window.parent.db,
+ 'ajax_request' : true,
+ 'sql_query' : sql_query,
+ 'inline_edit' : false
+ }, function(data) {
+ if(data.success == true) {
+ $('#sqlqueryresults').html(data.sql_query);
+ $("#sqlqueryresults").trigger('appendAnchor');
+ }
+ else
+ PMA_ajaxShowMessage(data.error);
+ })//End $.post
+ }//End database update
+ $("#dataDisplay").dialog("close");
+ });//End submit handler
+
+ /*
+ * Generate plot using Highcharts
+ */
+
+ if (data != null) {
+ $('#zoom_search_form')
+ .slideToggle()
+ .hide();
+ $('#togglesearchformlink')
+ .text(PMA_messages['strShowSearchCriteria'])
+ $('#togglesearchformdiv').show();
+ var selectedRow;
+ var columnNames = new Array();
+ var colorCodes = ['#FF0000','#00FFFF','#0000FF','#0000A0','#FF0080','#800080','#FFFF00','#00FF00','#FF00FF'];
+ var series = new Array();
+ var xCord = new Array();
+ var yCord = new Array();
+ var xCat = new Array();
+ var yCat = new Array();
+ var tempX, tempY;
+ var it = 0;
+
+ // Set the basic plot settings
+ var currentSettings = {
+ chart: {
+ renderTo: 'querychart',
+ type: 'scatter',
+ zoomType: 'xy',
+ width:$('#resizer').width() -3,
+ height:$('#resizer').height()-20
+ },
+ credits: {
+ enabled: false
+ },
+ exporting: { enabled: false },
+ label: { text: $('#dataLabel').val() },
+ plotOptions: {
+ series: {
+ allowPointSelect: true,
+ cursor: 'pointer',
+ showInLegend: false,
+ dataLabels: {
+ enabled: false,
+ },
+ point: {
+ events: {
+ click: function() {
+ var id = this.id;
+ var fid = 4;
+ currentData = id;
+ // Make AJAX request to tbl_zoom_select.php for getting the complete row info
+ var post_params = {
+ 'ajax_request' : true,
+ 'get_data_row' : true,
+ 'db' : window.parent.db,
+ 'table' : window.parent.table,
+ 'where_clause' : data[id]['where_clause'],
+ 'token' : window.parent.token,
+ }
+ $.post('tbl_zoom_select.php', post_params, function(data) {
+ // Row is contained in data.row_info, now fill the displayResultForm with row values
+ for ( key in data.row_info) {
+ if (data.row_info[key] == null)
+ $('#fields_null_id_' + fid).attr('checked', true);
+ else
+ $('#fieldID_' + fid).val(data.row_info[key]);
+ fid++;
+ }
+ selectedRow = new Object();
+ selectedRow = data.row_info;
+ });
+
+ $("#dataDisplay").dialog("open");
+ },
+ }
+ }
+ }
+ },
+ tooltip: {
+ formatter: function() {
+ return this.point.name;
+ }
+ },
+ title: { text: 'Query Results' },
+ xAxis: {
+ title: { text: $('#tableid_0').val() },
+ },
+ yAxis: {
+ min: null,
+ title: { text: $('#tableid_1').val() },
+ },
+ }
+
+ $('#resizer').resizable({
+ resize: function() {
+ currentChart.setSize(
+ this.offsetWidth -3,
+ this.offsetHeight -20,
+ false
+ );
+ }
+ });
+
+ // Classify types as either numeric,time,text
+ xType = getType(xType);
+ yType = getType(yType);
+
+ //Set the axis type based on the field
+ currentSettings.xAxis.type = (xType == 'time') ? 'datetime' : 'linear';
+ currentSettings.yAxis.type = (yType == 'time') ? 'datetime' : 'linear';
+
+ // Formulate series data for plot
+ series[0] = new Object();
+ series[0].data = new Array();
+ series[0].marker = {
+ symbol: 'circle'
+ };
+ if (xType != 'text' && yType != 'text') {
+ $.each(data,function(key,value) {
+ var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val());
+ var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val());
+ series[0].data.push({ name: value[dataLabel], x: xVal, y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } );
+ xCord.push(value[xLabel]);
+ yCord.push(value[yLabel]);
+ it++;
+ });
+ if(xType == 'numeric') {
+ currentSettings.xAxis.max = Array.max(xCord) + 6
+ currentSettings.xAxis.min = Array.min(xCord) - 6
+ }
+ else {
+ currentSettings.xAxis.labels = { formatter : function() {
+ return getDate(this.value, $('#types_0').val());
+ }}
+ }
+ if(yType == 'numeric') {
+ currentSettings.yAxis.max = Array.max(yCord) + 6
+ currentSettings.yAxis.min = Array.min(yCord) - 6
+ }
+ else {
+ currentSettings.yAxis.labels = { formatter : function() {
+ return getDate(this.value, $('#types_1').val());
+ }}
+ }
+
+ }
+
+ else if (xType =='text' && yType !='text') {
+ $.each(data,function(key,value) {
+ xCord.push(value[xLabel]);
+ yCord.push(value[yLabel]);
+ });
+
+ tempX = getCord(xCord);
+ $.each(data,function(key,value) {
+ var yVal = (yType == 'numeric') ? value[yLabel] : getTimeStamp(value[yLabel],$('#types_1').val());
+ series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: yVal, marker: {fillColor: colorCodes[it % 8]} , id: it } );
+ it++;
+ });
+
+ currentSettings.xAxis.labels = { formatter : function() {
+ if(tempX[1][this.value] && tempX[1][this.value].length > 10)
+ return tempX[1][this.value].substring(0,10)
+ else
+ return tempX[1][this.value];
+ }
+ }
+ if(yType == 'numeric') {
+ currentSettings.yAxis.max = Array.max(yCord) + 6
+ currentSettings.yAxis.min = Array.min(yCord) - 6
+ }
+ else {
+ currentSettings.yAxis.labels = { formatter : function() {
+ return getDate(this.value, $('#types_1').val());
+ }}
+ }
+ xCord = tempX[2];
+ }
+
+ else if (xType !='text' && yType =='text') {
+ $.each(data,function(key,value) {
+ xCord.push(value[xLabel]);
+ yCord.push(value[yLabel]);
+ });
+ tempY = getCord(yCord);
+ $.each(data,function(key,value) {
+ var xVal = (xType == 'numeric') ? value[xLabel] : getTimeStamp(value[xLabel],$('#types_0').val());
+ series[0].data.push({ name: value[dataLabel], y: tempY[0][it], x: xVal, marker: {fillColor: colorCodes[it % 8]} , id: it } );
+ it++;
+ });
+ if(xType == 'numeric') {
+ currentSettings.xAxis.max = Array.max(xCord) + 6
+ currentSettings.xAxis.min = Array.min(xCord) - 6
+ }
+ else {
+ currentSettings.xAxis.labels = { formatter : function() {
+ return getDate(this.value, $('#types_0').val());
+ }}
+ }
+ currentSettings.yAxis.labels = { formatter : function() {
+ if(tempY[1][this.value] && tempY[1][this.value].length > 10)
+ return tempY[1][this.value].substring(0,10)
+ else
+ return tempY[1][this.value];
+ }
+ }
+ yCord = tempY[2];
+ }
+
+ else if (xType =='text' && yType =='text') {
+ $.each(data,function(key,value) {
+ xCord.push(value[xLabel]);
+ yCord.push(value[yLabel]);
+ });
+ tempX = getCord(xCord);
+ tempY = getCord(yCord);
+ $.each(data,function(key,value) {
+ series[0].data.push({ name: value[dataLabel], x: tempX[0][it], y: tempY[0][it], marker: {fillColor: colorCodes[it % 8]} , id: it } );
+ it++;
+ });
+ currentSettings.xAxis.labels = { formatter : function() {
+ if(tempX[1][this.value] && tempX[1][this.value].length > 10)
+ return tempX[1][this.value].substring(0,10)
+ else
+ return tempX[1][this.value];
+ }
+ }
+ currentSettings.yAxis.labels = { formatter : function() {
+ if(tempY[1][this.value] && tempY[1][this.value].length > 10)
+ return tempY[1][this.value].substring(0,10)
+ else
+ return tempY[1][this.value];
+ }
+ }
+ xCord = tempX[2];
+ yCord = tempY[2];
+
+ }
+
+ currentSettings.series = series;
+ currentChart = PMA_createChart(currentSettings);
+ scrollToChart();
+ }
+});
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index c806923..d40cd7b 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -413,6 +413,7 @@ $goto_whitelist = array(
'tbl_replace.php',
'tbl_row_action.php',
'tbl_select.php',
+ 'tbl_zoom_select.php',
//'themes.php',
'transformation_overview.php',
'transformation_wrapper.php',
diff --git a/libraries/config.default.php b/libraries/config.default.php
index efb0cbb..d8367e5 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -1137,7 +1137,6 @@ $cfg['DefaultTabDatabase'] = 'db_structure.php';
*/
$cfg['DefaultTabTable'] = 'sql.php';
-
/*******************************************************************************
* Export defaults
*/
@@ -1845,7 +1844,6 @@ $cfg['Export']['xml_export_contents'] = true;
*/
$cfg['Export']['yaml_structure_or_data'] = 'data';
-
/*******************************************************************************
* Import defaults
*/
@@ -2443,7 +2441,6 @@ $cfg['UserprefsDisallow'] = array();
*/
$cfg['UserprefsDeveloperTab'] = false;
-
/*******************************************************************************
* Window title settings
*/
@@ -2554,9 +2551,7 @@ $cfg['DefaultQueryDatabase'] = '';
/*******************************************************************************
* SQL Query box settings
* These are the links display in all of the SQL Query boxes
- */
-
-/**
+ *
* @global array $cfg['SQLQuery']
*/
$cfg['SQLQuery'] = array();
@@ -2628,7 +2623,7 @@ $cfg['SaveDir'] = '';
$cfg['TempDir'] = '';
-/*******************************************************************************
+/**
* Misc. settings
*/
@@ -2673,12 +2668,7 @@ $cfg['LinkLengthLimit'] = 1000;
*/
$cfg['DisableMultiTableMaintenance'] = false;
-
/*******************************************************************************
- * SQL Parser
- */
-
-/**
* SQL Parser Settings
*
* @global array $cfg['SQP']
@@ -2708,10 +2698,6 @@ $cfg['SQP']['fmtIndUnit'] = 'em';
/*******************************************************************************
- * SQL Validator
- */
-
-/**
* If you wish to use the SQL Validator service, you should be aware of the
* following:
* All SQL statements are stored anonymously for statistical purposes.
@@ -2746,10 +2732,6 @@ $cfg['SQLValidator']['password'] = '';
/*******************************************************************************
* Developers ONLY!
- */
-
-/**
- * Debugging settings
*
* @global array $cfg['DBG']
*/
@@ -2768,50 +2750,328 @@ $cfg['DBG']['sql'] = false;
*/
/**
- * Column types
- *
- * Fill in this array to overwrite data from data_*.inc.php files
+ * Column types;
+ * VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity
*
* @global array $cfg['ColumnTypes']
*/
-$cfg['ColumnTypes'] = array();
+$cfg['ColumnTypes'] = array(
+ // most used
+ 'INT',
+ 'VARCHAR',
+ 'TEXT',
+ 'DATE',
+
+ // numeric
+ 'NUMERIC' => array(
+ 'TINYINT',
+ 'SMALLINT',
+ 'MEDIUMINT',
+ 'INT',
+ 'BIGINT',
+ '-',
+ 'DECIMAL',
+ 'FLOAT',
+ 'DOUBLE',
+ 'REAL',
+ '-',
+ 'BIT',
+ 'BOOLEAN',
+ 'SERIAL',
+ ),
+
+
+ // Date/Time
+ 'DATE and TIME' => array(
+ 'DATE',
+ 'DATETIME',
+ 'TIMESTAMP',
+ 'TIME',
+ 'YEAR',
+ ),
+
+ // Text
+ 'STRING' => array(
+ 'CHAR',
+ 'VARCHAR',
+ '-',
+ 'TINYTEXT',
+ 'TEXT',
+ 'MEDIUMTEXT',
+ 'LONGTEXT',
+ '-',
+ 'BINARY',
+ 'VARBINARY',
+ '-',
+ 'TINYBLOB',
+ 'MEDIUMBLOB',
+ 'BLOB',
+ 'LONGBLOB',
+ '-',
+ 'ENUM',
+ 'SET',
+ ),
+
+ 'SPATIAL' => array(
+ 'GEOMETRY',
+ 'POINT',
+ 'LINESTRING',
+ 'POLYGON',
+ 'MULTIPOINT',
+ 'MULTILINESTRING',
+ 'MULTIPOLYGON',
+ 'GEOMETRYCOLLECTION',
+ ),
+);
/**
* Attributes
*
- * Fill in this array to overwrite data from data_*.inc.php files
- *
* @global array $cfg['AttributeTypes']
*/
-$cfg['AttributeTypes'] = array();
+$cfg['AttributeTypes'] = array(
+ '',
+ 'BINARY',
+ 'UNSIGNED',
+ 'UNSIGNED ZEROFILL',
+ 'on update CURRENT_TIMESTAMP',
+);
+
if ($cfg['ShowFunctionFields']) {
/**
* Available functions
*
- * Fill in this array to overwrite data from data_*.inc.php files
- *
* @global array $cfg['Functions']
*/
- $cfg['Functions'] = array();
+ $cfg['Functions'] = array(
+ 'ABS',
+ 'ACOS',
+ 'ASCII',
+ 'ASIN',
+ 'ATAN',
+ 'BIN',
+ 'BIT_COUNT',
+ 'BIT_LENGTH',
+ 'CEILING',
+ 'CHAR',
+ 'CHAR_LENGTH',
+ 'COMPRESS',
+ 'COS',
+ 'COT',
+ 'CRC32',
+ 'CURDATE',
+ 'CURRENT_USER',
+ 'CURTIME',
+ 'DATE',
+ 'DAYNAME',
+ 'DEGREES',
+ 'DES_DECRYPT',
+ 'DES_ENCRYPT',
+ 'ENCRYPT',
+ 'EXP',
+ 'FLOOR',
+ 'FROM_DAYS',
+ 'FROM_UNIXTIME',
+ 'HEX',
+ 'INET_ATON',
+ 'INET_NTOA',
+ 'LENGTH',
+ 'LN',
+ 'LOG',
+ 'LOG10',
+ 'LOG2',
+ 'LOWER',
+ 'MD5',
+ 'NOW',
+ 'OCT',
+ 'OLD_PASSWORD',
+ 'ORD',
+ 'PASSWORD',
+ 'RADIANS',
+ 'RAND',
+ 'REVERSE',
+ 'ROUND',
+ 'SEC_TO_TIME',
+ 'SHA1',
+ 'SOUNDEX',
+ 'SPACE',
+ 'SQRT',
+ 'STDDEV_POP',
+ 'STDDEV_SAMP',
+ 'TAN',
+ 'TIMESTAMP',
+ 'TIME_TO_SEC',
+ 'UNCOMPRESS',
+ 'UNHEX',
+ 'UNIX_TIMESTAMP',
+ 'UPPER',
+ 'USER',
+ 'UTC_DATE',
+ 'UTC_TIME',
+ 'UTC_TIMESTAMP',
+ 'UUID',
+ 'VAR_POP',
+ 'VAR_SAMP',
+ 'YEAR',
+ );
/**
* Which column types will be mapped to which Group?
*
- * Fill in this array to overwrite data from data_*.inc.php files
- *
* @global array $cfg['RestrictColumnTypes']
*/
- $cfg['RestrictColumnTypes'] = array();
+ $cfg['RestrictColumnTypes'] = array(
+ 'TINYINT' => 'FUNC_NUMBER',
+ 'SMALLINT' => 'FUNC_NUMBER',
+ 'MEDIUMINT' => 'FUNC_NUMBER',
+ 'INT' => 'FUNC_NUMBER',
+ 'BIGINT' => 'FUNC_NUMBER',
+ 'DECIMAL' => 'FUNC_NUMBER',
+ 'FLOAT' => 'FUNC_NUMBER',
+ 'DOUBLE' => 'FUNC_NUMBER',
+ 'REAL' => 'FUNC_NUMBER',
+ 'BIT' => 'FUNC_NUMBER',
+ 'BOOLEAN' => 'FUNC_NUMBER',
+ 'SERIAL' => 'FUNC_NUMBER',
+
+ 'DATE' => 'FUNC_DATE',
+ 'DATETIME' => 'FUNC_DATE',
+ 'TIMESTAMP' => 'FUNC_DATE',
+ 'TIME' => 'FUNC_DATE',
+ 'YEAR' => 'FUNC_DATE',
+
+ 'CHAR' => 'FUNC_CHAR',
+ 'VARCHAR' => 'FUNC_CHAR',
+ 'TINYTEXT' => 'FUNC_CHAR',
+ 'TEXT' => 'FUNC_CHAR',
+ 'MEDIUMTEXT' => 'FUNC_CHAR',
+ 'LONGTEXT' => 'FUNC_CHAR',
+ 'BINARY' => 'FUNC_CHAR',
+ 'VARBINARY' => 'FUNC_CHAR',
+ 'TINYBLOB' => 'FUNC_CHAR',
+ 'MEDIUMBLOB' => 'FUNC_CHAR',
+ 'BLOB' => 'FUNC_CHAR',
+ 'LONGBLOB' => 'FUNC_CHAR',
+ 'ENUM' => '',
+ 'SET' => '',
+
+ 'GEOMETRY' => 'FUNC_SPATIAL',
+ 'POINT' => 'FUNC_SPATIAL',
+ 'LINESTRING' => 'FUNC_SPATIAL',
+ 'POLYGON' => 'FUNC_SPATIAL',
+ 'MULTIPOINT' => 'FUNC_SPATIAL',
+ 'MULTILINESTRING' => 'FUNC_SPATIAL',
+ 'MULTIPOLYGON' => 'FUNC_SPATIAL',
+ 'GEOMETRYCOLLECTION' => 'FUNC_SPATIAL',
+
+ );
/**
* Map above defined groups to any function
*
- * Fill in this array to overwrite data from data_*.inc.php files
- *
* @global array $cfg['RestrictFunctions']
*/
- $cfg['RestrictFunctions'] = array();
+ $cfg['RestrictFunctions'] = array(
+ 'FUNC_CHAR' => array(
+ 'BIN',
+ 'CHAR',
+ 'CURRENT_USER',
+ 'COMPRESS',
+ 'DAYNAME',
+ 'DES_DECRYPT',
+ 'DES_ENCRYPT',
+ 'ENCRYPT',
+ 'HEX',
+ 'INET_NTOA',
+ 'LOWER',
+ 'MD5',
+ 'OLD_PASSWORD',
+ 'PASSWORD',
+ 'REVERSE',
+ 'SHA1',
+ 'SOUNDEX',
+ 'SPACE',
+ 'UNCOMPRESS',
+ 'UNHEX',
+ 'UPPER',
+ 'USER',
+ 'UUID',
+ ),
+
+ 'FUNC_DATE' => array(
+ 'CURDATE',
+ 'CURTIME',
+ 'DATE',
+ 'FROM_DAYS',
+ 'FROM_UNIXTIME',
+ 'NOW',
+ 'SEC_TO_TIME',
+ 'TIMESTAMP',
+ 'UTC_DATE',
+ 'UTC_TIME',
+ 'UTC_TIMESTAMP',
+ 'YEAR',
+ ),
+
+ 'FUNC_NUMBER' => array(
+ 'ABS',
+ 'ACOS',
+ 'ASCII',
+ 'ASIN',
+ 'ATAN',
+ 'BIT_LENGTH',
+ 'BIT_COUNT',
+ 'CEILING',
+ 'CHAR_LENGTH',
+ 'COS',
+ 'COT',
+ 'CRC32',
+ 'DEGREES',
+ 'EXP',
+ 'FLOOR',
+ 'INET_ATON',
+ 'LENGTH',
+ 'LN',
+ 'LOG',
+ 'LOG2',
+ 'LOG10',
+ 'OCT',
+ 'ORD',
+ 'RADIANS',
+ 'RAND',
+ 'ROUND',
+ 'SQRT',
+ 'STDDEV_POP',
+ 'STDDEV_SAMP',
+ 'TAN',
+ 'TIME_TO_SEC',
+ 'UNIX_TIMESTAMP',
+ 'VAR_POP',
+ 'VAR_SAMP',
+ ),
+
+ 'FUNC_SPATIAL' => array(
+ 'GeomFromText',
+ 'GeomFromWKB',
+
+ 'GeomCollFromText',
+ 'LineFromText',
+ 'MLineFromText',
+ 'PointFromText',
+ 'MPointFromText',
+ 'PolyFromText',
+ 'MPolyFromText',
+
+ 'GeomCollFromWKB',
+ 'LineFromWKB',
+ 'MLineFromWKB',
+ 'PointFromWKB',
+ 'MPointFromWKB',
+ 'PolyFromWKB',
+ 'MPolyFromWKB',
+ ),
+ );
/**
* Default functions for above defined groups
@@ -2825,6 +3085,97 @@ if ($cfg['ShowFunctionFields']) {
'first_timestamp' => 'NOW',
'pk_char36' => 'UUID',
);
-}
+
+
+} // end if
+
+/**
+ * Search operators
+ *
+ * @global array $cfg['NumOperators']
+ */
+$cfg['NumOperators'] = array(
+ '=',
+ '>',
+ '>=',
+ '<',
+ '<=',
+ '!=',
+ 'LIKE',
+ 'NOT LIKE',
+ 'IN (...)',
+ 'NOT IN (...)',
+ 'BETWEEN',
+ 'NOT BETWEEN',
+);
+
+/**
+ * Search operators
+ *
+ * @global array $cfg['TextOperators']
+ */
+$cfg['TextOperators'] = array(
+ 'LIKE',
+ 'LIKE %...%',
+ 'NOT LIKE',
+ '=',
+ '!=',
+ 'REGEXP',
+ 'REGEXP ^...$',
+ 'NOT REGEXP',
+ "= ''",
+ "!= ''",
+ 'IN (...)',
+ 'NOT IN (...)',
+ 'BETWEEN',
+ 'NOT BETWEEN',
+);
+
+/**
+ * Search operators
+ *
+ * @global array $cfg['EnumOperators']
+ */
+$cfg['EnumOperators'] = array(
+ '=',
+ '!=',
+);
+
+/**
+ * Search operators
+ *
+ * @global array $cfg['SetOperators']
+ */
+$cfg['SetOperators'] = array(
+ 'IN',
+ 'NOT IN',
+);
+
+/**
+ * Search operators
+ *
+ * @global array $cfg['NullOperators']
+ */
+$cfg['NullOperators'] = array(
+ 'IS NULL',
+ 'IS NOT NULL',
+);
+
+/**
+ * Search operators
+ *
+ * @global array $cfg['UnaryOperators']
+ */
+$cfg['UnaryOperators'] = array(
+ 'IS NULL' => 1,
+ 'IS NOT NULL' => 1,
+ "= ''" => 1,
+ "!= ''" => 1
+);
+
+/**
+ * Max rows retreived for zoom search
+ */
+$cfg['maxRowPlotLimit'] = 500;
?>
diff --git a/libraries/svg_plot/pma_scatter_plot.php b/libraries/svg_plot/pma_scatter_plot.php
new file mode 100644
index 0000000..10c0aea
--- /dev/null
+++ b/libraries/svg_plot/pma_scatter_plot.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ * Generates the SVG needed for the plot
+ *
+ * @package phpMyAdmin
+ */
+
+require_once 'pma_svg_data_point.php';
+
+class PMA_Scatter_Plot
+{
+ /**
+ * @var array Raw data for the plot
+ */
+ private $_data;
+
+ /**
+ * @var array Data points of the plot
+ */
+ private $_dataPoints;
+
+ /**
+ * @var array Set of default settigs values are here.
+ */
+ private $_settings = array(
+
+ // Array of colors to be used for plot.
+ 'colors' => array(
+ '#BCE02E',
+ '#E0642E',
+ '#E0D62E',
+ '#2E97E0',
+ '#B02EE0',
+ '#E02E75',
+ '#5CE02E',
+ '#E0B02E',
+ '#000000',
+ '#0022E0',
+ '#726CB1',
+ '#481A36',
+ '#BAC658',
+ '#127224',
+ '#825119',
+ '#238C74',
+ '#4C489B',
+ '#87C9BF',
+ ),
+ // Plot background color.
+ 'bgColor' => '#84AD83',
+
+ // The width of the plot.
+ 'width' => 520,
+
+ // The height of the plot.
+ 'height' => 325,
+
+ // Default X Axis label. If empty, label will be taken from the data.
+ 'xLabel' => '',
+
+ // Default Y Axis label. If empty, label will be taken from the data.
+ 'yLabel' => '',
+
+ // Data point label. If empty, label will be taken from the data.
+ 'dataLabel' => '',
+
+ );
+
+ /**
+ * @var array Options that the user has specified.
+ */
+ private $_userSpecifiedSettings = null;
+
+ /**
+ * Returns the settings array
+ *
+ * @return the settings array.
+ */
+ public function getSettings()
+ {
+ return $this->_settings;
+ }
+
+ /**
+ * Returns the data array
+ *
+ * @return the data array.
+ */
+ public function getData()
+ {
+ return $this->_data;
+ }
+
+ /**
+ * Constructor. Stores user specified options.
+ *
+ * @param array $data Data for the visualization
+ * @param array $options Users specified options
+ */
+ public function __construct($data, $options)
+ {
+ $this->_userSpecifiedSettings = $options;
+ $this->_data = $data;
+ }
+
+ /**
+ * All the variable initialization, options handling has to be done here.
+ */
+ protected function init()
+ {
+ $this->_handleOptions();
+ }
+
+ /**
+ * A function which handles passed parameters. Useful if desired
+ * chart needs to be a little bit different from the default one.
+ */
+ private function _handleOptions()
+ {
+ $this->_dataPoints = array();
+ if (! is_null($this->_userSpecifiedSettings)) {
+ foreach (array_keys($this->_userSpecifiedSettings) as $key){
+ $this->_settings[$key] = $this->_userSpecifiedSettings[$key];
+ }
+ }
+ if ($this->_settings['dataLabel'] == '') {
+ $labels = array_keys($this->_data[0]);
+ $this->_settings['dataLabel'] = $labels[0];
+ }
+ }
+
+ /**
+ * Generate the visualization in SVG format.
+ *
+ * @return the generated image resource
+ */
+ private function _svg()
+ {
+ $this->init();
+
+ $output = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . "\n";
+ $output .= '<svg version="1.1" xmlns:svg="http://www.w3.org/2000/svg"'
+ . ' xmlns="http://www.w3.org/2000/svg" width="' . $this->_settings['width'] . '"'
+ . ' height="' . $this->_settings['height'] . '">';
+ $output .= '<g id="groupPanel">';
+ $output .= '<defs>
+ <path id="myTextPath1"
+ d="M10,190 L10,50"/>
+ <path id="myTextPath2"
+ d="M250,10 L370,10"/>
+ </defs>';
+ $output .= '<text x="6" y="190" style="font-family: Arial; font-size : 54; stroke:none; fill:#000000;" >
+ <textPath xlink:href="#myTextPath1" >';
+ $output .= $this->_settings['yLabel'];
+ $output .= '</textPath>
+ </text>';
+
+ $output .= '<text x="250" y="10" style="font-family: Arial; font-size : 54; stroke:none; fill:#000000;" >
+ <textPath xlink:href="#myTextPath2" >';
+ $output .= $this->_settings['xLabel'];
+ $output .= '</textPath>
+ </text>';
+
+
+ $scale_data = $this->_scaleDataSet($this->_data, $this->_settings['xLabel'], $this->_settings['yLabel']);
+ $output .= $this->_prepareDataSet($this->_data, 0, $scale_data, $this->_settings['dataLabel']);
+
+ $output .= '</g>';
+ $output .= '</svg>';
+
+ return $output;
+ }
+
+ /**
+ * Get the visualization as a SVG.
+ *
+ * @return the visualization as a SVG
+ */
+ public function asSVG()
+ {
+ $output = $this->_svg();
+ return $output;
+ }
+
+ /**
+ * Calculates the scale, horizontal and vertical offset that should be used.
+ *
+ * @param array $data Row data
+ *
+ * @return an array containing the scale, x and y offsets
+ */
+ private function _scaleDataSet($data,$xField,$yField)
+ {
+
+ // Currently assuming only numeric fields are selected
+ $coordinates = array();
+ foreach ($data as $row) {
+ $coordinates[0][] = $row[$xField];
+ $coordinates[1][] = $row[$yField];
+ }
+ for ($i = 0 ; $i < 2 ; $i++) {
+
+ $maxC = ($i == 0) ? 500 : 320;
+
+ if( !is_numeric($coordinates[$i][0])) {
+ $uniqueC = array_unique($coordinates[$i]);
+ $countC = count(array_unique($coordinates[$i]));
+ $map = $tmp = array();
+ foreach ($uniqueC as $uc) {
+ $tmp[] = $uc;
+ }
+ for ($j = 0 ; $j < $countC ; $j++) {
+ $map[$tmp[$j]] = 20 + $j * $maxC / $countC;
+ }
+ for($j = 0 ; $j < count($coordinates[$i]) ; $j++) {
+ $coordinates[$i][$j] = $map[$coordinates[$i][$j]];
+ }
+
+ }
+ elseif (is_numeric($coordinates[$i][0])) {
+
+ $maxC = max($coordinates[$i]);
+ for($j = 0 ; $j < count($coordinates[$i]) ; $j++) {
+
+ if ($i == 0)
+ $coordinates[$i][$j] = 20 + 500 * $coordinates[$i][$j] / $maxC;
+ else
+ $coordinates[$i][$j] = 20 + 320 * (1 - $coordinates[$i][$j] / $maxC);
+ }
+ }
+ }
+ return $coordinates;
+ }
+
+ /**
+ * Prepares and return the dataset as needed by the visualization.
+ *
+ * @param array $data Raw data
+ * @param int $color_number Start index to the color array
+ * @param array $scale_data Data related to scaling
+ * @param string $label Label for the data points
+ * @param image $results Image object in the case of png
+ *
+ * @return the formatted array of data.
+ */
+ private function _prepareDataSet($data, $color_number, $scale_data, $label)
+ {
+ $result = '';
+ // loop through the rows
+ for($i = 0 ; $i < count($data) ; $i++) {
+
+ $index = $color_number % sizeof($this->_settings['colors']);
+
+ $data_element = new PMA_SVG_Data_Point($scale_data[0][$i],$scale_data[1][$i],$data[$i][$label],$data[$i]);
+
+ $options = array('color' => $this->_settings['colors'][$index], 'id' => $i);
+ $this->_dataPoints[] = $data_element;
+
+ $result .= $data_element->prepareRowAsSVG($options);
+ $color_number++;
+ }
+
+
+ return $result;
+ }
+}
+?>
+
diff --git a/libraries/svg_plot/pma_svg_data_element.php b/libraries/svg_plot/pma_svg_data_element.php
new file mode 100644
index 0000000..97f7734
--- /dev/null
+++ b/libraries/svg_plot/pma_svg_data_element.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Base class for the plot data type classes.
+ *
+ * @package phpMyAdmin
+ */
+abstract class PMA_SVG_Data_Element{
+
+ protected $label = '';
+
+ protected $dataRow = array();
+
+ /**
+ * Store user specified label and dataRow
+ * @param string $label users specified label
+ * @param array $dataRow A data row from the query result
+ */
+ function __construct($label,$dataRow)
+ {
+ $this->label = $label;
+ $this->dataRow = $dataRow;
+ }
+
+ /**
+ * Handles the generation of each Data Row/Element as a SVG element
+ * @return the code related to a row in the GIS dataset
+ */
+ public abstract function prepareRowAsSVG($options);
+
+ public function getLabel()
+ {
+ return $this->label;
+ }
+
+ public function setLabel($label)
+ {
+ $this->label = $label;
+ }
+
+ public function getDataRow()
+ {
+ return $this->dataRow;
+ }
+
+ public function setDataRow($dataRow)
+ {
+ $this->dataRow = $dataRow;
+ }
+}
+?>
diff --git a/libraries/svg_plot/pma_svg_data_point.php b/libraries/svg_plot/pma_svg_data_point.php
new file mode 100644
index 0000000..7d01b2b
--- /dev/null
+++ b/libraries/svg_plot/pma_svg_data_point.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Handles the visualization of Data Point objects.
+ *
+ * @package phpMyAdmin
+ */
+
+require_once 'pma_svg_data_element.php';
+
+class PMA_SVG_Data_Point extends PMA_SVG_Data_Element
+{
+ /*
+ * X-Coordinate of the point
+ */
+ private $cx;
+
+ /*
+ * Y-Coordinate of the point
+ */
+ private $cy;
+
+ /*
+ * A private constructor; prevents direct creation of object.
+ */
+ public function __construct($cx, $cy, $label, $dataRow)
+ {
+ parent::__construct($label,$dataRow);
+ $this->cx = $cx;
+ $this->cy = $cy;
+
+ }
+
+ public function prepareRowAsSVG($options)
+ {
+ return $this->prepareSvg($options);
+ }
+
+ /**
+ * Prepares and returns the code related to a row in the query result as SVG.
+ *
+ * @param array $options Array containing options related to properties of the point
+ *
+ * @return the code related to a row in the query result.
+ */
+
+ protected function prepareSvg($options)
+ {
+ $point_options = array(
+ 'name' => $this->label . '_' .$options['id'],
+ 'id' => $this->label . 'id' . '_' . $options['id'],
+ 'class' => 'point',
+ 'fill' => 'white',
+ 'stroke' => $options['color'],
+ 'stroke-width'=> 2,
+ );
+
+ $row = '<circle cx="' . $this->cx . '" cy="' . $this->cy . '" r=".1"';
+ foreach ($point_options as $option => $val) {
+ $row .= ' ' . $option . '="' . trim($val) . '"';
+ }
+ $row .= '/>';
+
+ return $row;
+ }
+
+ public function getCx()
+ {
+ return $this->cx;
+ }
+
+ public function setCx($cx)
+ {
+ $this->cx = $cx;
+ }
+
+ public function getCy()
+ {
+ return $this->cy;
+ }
+
+ public function setCy($cy)
+ {
+ $this->cy = $cy;
+ }
+}
+?>
diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php
new file mode 100644
index 0000000..6384f60
--- /dev/null
+++ b/libraries/tbl_select.lib.php
@@ -0,0 +1,390 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Functions for the table-search page and zoom-search page
+ *
+ * Funtion PMA_tbl_getFields : Returns the fields of a table
+ * Funtion PMA_tbl_search_getWhereClause : Returns the where clause for query generation
+ *
+ * @package phpMyAdmin
+ */
+
+require_once 'url_generating.lib.php';
+
+ /**
+ * PMA_tbl_setTitle() sets the title for foreign keys display link
+ *
+ * @param $propertiesIconic Type of icon property
+ * @param $themeImage Icon Image
+ * @return string $str Value of the Title
+ *
+ */
+
+function PMA_tbl_setTitle($propertiesIconic,$pmaThemeImage){
+ if ($propertiesIconic == true) {
+ $str = '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
+ .'b_browse.png" alt="' . __('Browse foreign values') . '" title="'
+ . __('Browse foreign values') . '" />';
+
+ if ($propertiesIconic === 'both') {
+ $str .= __('Browse foreign values');
+ return $str;
+ }
+ } else {
+ return __('Browse foreign values');
+ }
+}
+
+ /**
+ * PMA_tbl_getFields() gets all the fields of a table along with their types,collations and whether null or not.
+ *
+ * @uses PMA_DBI_query()
+ * @uses PMA_backquote()
+ * @uses PMA_DBI_num_rows()
+ * @uses PMA_DBI_fetch_assoc()
+ * @uses PMA_DBI_free_result()
+ * @uses preg_replace()
+ * @uses str_replace()
+ * @uses strncasecmp()
+ * @uses empty()
+ *
+ * @param $db Selected database
+ * @param $table Selected table
+ *
+ * @return array($fields_list,$fields_type,$fields_collation,$fields_null) Array containing the field list, field types, collations and null constatint
+ *
+ */
+
+function PMA_tbl_getFields($table,$db) {
+
+ // Gets the list and number of fields
+
+ $result = PMA_DBI_query('SHOW FULL FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
+ $fields_cnt = PMA_DBI_num_rows($result);
+ $fields_list = $fields_null = $fields_type = $fields_collation = array();
+ while ($row = PMA_DBI_fetch_assoc($result)) {
+ $fields_list[] = $row['Field'];
+ $type = $row['Type'];
+ // reformat mysql query output
+ if (strncasecmp($type, 'set', 3) == 0
+ || strncasecmp($type, 'enum', 4) == 0) {
+ $type = str_replace(',', ', ', $type);
+ } else {
+
+ // strip the "BINARY" attribute, except if we find "BINARY(" because
+ // this would be a BINARY or VARBINARY field type
+ if (!preg_match('@BINARY[\(]@i', $type)) {
+ $type = preg_replace('@BINARY@i', '', $type);
+ }
+ $type = preg_replace('@ZEROFILL@i', '', $type);
+ $type = preg_replace('@UNSIGNED@i', '', $type);
+
+ $type = strtolower($type);
+ }
+ if (empty($type)) {
+ $type = ' ';
+ }
+ $fields_null[] = $row['Null'];
+ $fields_type[] = $type;
+ $fields_collation[] = !empty($row['Collation']) && $row['Collation'] != 'NULL'
+ ? $row['Collation']
+ : '';
+ } // end while
+ PMA_DBI_free_result($result);
+ unset($result, $type);
+
+ return array($fields_list,$fields_type,$fields_collation,$fields_null);
+
+}
+
+/* PMA_tbl_setTableHeader() sets the table header for displaying a table in query-by-example format
+ *
+ * @return HTML content, the tags and content for table header
+ *
+ */
+
+function PMA_tbl_setTableHeader(){
+
+return '<thead>
+ <tr><th>' . __('Column') . '</th>
+ <th>' . __('Type') . '</th>
+ <th>' . __('Collation') . '</th>
+ <th>' . __('Operator') . '</th>
+ <th>' . __('Value') . '</th>
+ </tr>
+ </thead>';
+
+
+}
+
+/* PMA_tbl_getSubTabs() returns an array with necessary configrations to create sub-tabs(Table Search and Zoom Search) in the table_select page
+ *
+ * @return array $subtabs Array containing configuration (icon,text,link,id,args) of sub-tabs for Table Search and Zoom search
+ *
+ */
+
+function PMA_tbl_getSubTabs(){
+
+ $subtabs = array();
+
+ $subtabs['search']['icon'] = 'b_search.png';
+ $subtabs['search']['text'] = __('Table Search');
+ $subtabs['search']['link'] = 'tbl_select.php';
+ $subtabs['search']['id'] = 'tbl_search_id';
+ $subtabs['search']['args']['pos'] = 0;
+
+ $subtabs['zoom']['icon'] = 'b_props.png';
+ $subtabs['zoom']['link'] = 'tbl_zoom_select.php';
+ $subtabs['zoom']['text'] = __('Zoom Search');
+ $subtabs['zoom']['id'] = 'zoom_search_id';
+
+ return $subtabs;
+
+}
+
+
+/* PMA_tbl_getForeignFields_Values() creates the HTML content for: 1) Browsing foreign data for a field. 2) Creating elements for search criteria input on fields.
+ *
+ * @uses PMA_foreignDropdown
+ * @uses PMA_generate_common_url
+ * @uses isset()
+ * @uses is_array()
+ * @uses in_array()
+ * @uses urlencode()
+ * @uses str_replace()
+ * @uses stbstr()
+ *
+ * @param $foreigners Array of foreign keys
+ * @param $foreignData Foreign keys data
+ * @param $field Column name
+ * @param $tbl_fields_type Column type
+ * @param $i Column index
+ * @param $db Selected database
+ * @param $table Selected table
+ * @param $titles Selected title
+ * @param $foreignMaxLimit Max limit of displaying foreign elements
+ * @param $fields Array of search criteria inputs
+ *
+ * @return string $str HTML content for viewing foreing data and elements for search criteria input.
+ *
+ */
+
+function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i, $db, $table,$titles,$foreignMaxLimit, $fields){
+
+ $str = '';
+
+ if ($foreigners && isset($foreigners[$field]) && is_array($foreignData['disp_row'])) {
+ // f o r e i g n k e y s
+ $str .= ' <select name="fields[' . $i . ']" id="fieldID_' . $i .'">' . "\n";
+ // go back to first row
+ // here, the 4th parameter is empty because there is no current
+ // value of data for the dropdown (the search page initial values
+ // are displayed empty)
+ $str .= PMA_foreignDropdown($foreignData['disp_row'],
+ $foreignData['foreign_field'],
+ $foreignData['foreign_display'],
+ '', $foreignMaxLimit);
+ $str .= ' </select>' . "\n";
+ }
+ elseif ($foreignData['foreign_link'] == true) {
+ if(isset($fields[$i]) && is_string($fields[$i])){
+ $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . '] " value="' . $fields[$i] . '"';
+ 'id="field_' . md5($field) . '[' . $i .']"
+ class="textfield"/>' ;
+ }
+ else{
+ $str .= '<input type="text" id="fieldID_' . $i .'"name="fields[' . $i . '] "';
+ 'id="field_' . md5($field) . '[' . $i .']"
+ class="textfield" />' ;
+ }
+ ?>
+ <?php $str .= '<script type="text/javascript">';
+ // <![CDATA[
+ $str .= <<<EOT
+<a target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes'); return false" href="browse_foreigners.php?
+EOT;
+ $str .= '' . PMA_generate_common_url($db, $table) . '&field=' . urlencode($field) . '&fieldkey=' . $i . '">' . str_replace("'", "\'", $titles['Browse']) . '</a>';
+ // ]]
+ $str .= '</script>';
+ }
+ elseif (strncasecmp($tbl_fields_type[$i], 'enum', 4) == 0) {
+ // e n u m s
+ $enum_value=explode(', ', str_replace("'", '', substr($tbl_fields_type[$i], 5, -1)));
+ $cnt_enum_value = count($enum_value);
+ $str .= '<select name="fields[' . ($i) . '][]" id="fieldID_' . $i .'"'
+ .' multiple="multiple" size="' . min(3, $cnt_enum_value) . '">' . "\n";
+ for ($j = 0; $j < $cnt_enum_value; $j++) {
+ if(isset($fields[$i]) && is_array($fields[$i]) && in_array($enum_value[$j],$fields[$i])){
+ $str .= ' <option value="' . $enum_value[$j] . '" Selected>'
+ . $enum_value[$j] . '</option>';
+ }
+ else{
+ $str .= ' <option value="' . $enum_value[$j] . '">'
+ . $enum_value[$j] . '</option>';
+ }
+ } // end for
+ $str .= ' </select>' . "\n";
+ }
+ else {
+ // o t h e r c a s e s
+ $the_class = 'textfield';
+ $type = $tbl_fields_type[$i];
+ if ($type == 'date') {
+ $the_class .= ' datefield';
+ } elseif ($type == 'datetime' || substr($type, 0, 9) == 'timestamp') {
+ $the_class .= ' datetimefield';
+ }
+ if(isset($fields[$i]) && is_string($fields[$i])){
+ $str .= ' <input type="text" name="fields[' . $i . ']" '
+ .' size="40" class="' . $the_class . '" id="fieldID_' . $i .'" value = "' . $fields[$i] . '"/>' . "\n";
+ }
+ else{
+ $str .= ' <input type="text" name="fields[' . $i . ']"'
+ .' size="40" class="' . $the_class . '" id="fieldID_' . $i .'" />' . "\n";
+ }
+ };
+ return $str;
+
+}
+
+
+/* PMA_tbl_search_getWhereClause() Return the where clause for query generation based on the inputs provided.
+ *
+ * @uses PMA_backquote
+ * @uses PMA_sqlAddslashes
+ * @uses preg_match
+ * @uses isset()
+ * @uses in_array()
+ * @uses str_replace()
+ * @uses strpos()
+ * @uses explode()
+ * @uses trim()
+ *
+ * @param $fields Search criteria input
+ * @param $names Name of the field(column) on which search criteria is submitted
+ * @param $types Type of the field
+ * @param $collations Field collation
+ * @param $func_type Search fucntion/operator
+ * @param $unaryFlag Whether operator unary or not
+ *
+ * @return string $str HTML content for viewing foreing data and elements for search criteria input.
+ *
+ */
+
+function PMA_tbl_search_getWhereClause($fields, $names, $types, $collations, $func_type, $unaryFlag){
+
+
+ $w = '';
+ if($unaryFlag){
+ $fields = '';
+ $w = PMA_backquote($names) . ' ' . $func_type;
+
+ } elseif (strncasecmp($types, 'enum', 4) == 0) {
+ if (!empty($fields)) {
+ if (! is_array($fields)) {
+ $fields = explode(',', $fields);
+ }
+ $enum_selected_count = count($fields);
+ if ($func_type == '=' && $enum_selected_count > 1) {
+ $func_type = 'IN';
+ $parens_open = '(';
+ $parens_close = ')';
+
+ } elseif ($func_type == '!=' && $enum_selected_count > 1) {
+ $func_type = 'NOT IN';
+ $parens_open = '(';
+ $parens_close = ')';
+
+ } else {
+ $parens_open = '';
+ $parens_close = '';
+ }
+ $enum_where = '\'' . PMA_sqlAddslashes($fields[0]) . '\'';
+ for ($e = 1; $e < $enum_selected_count; $e++) {
+ $enum_where .= ', \'' . PMA_sqlAddslashes($fields[$e]) . '\'';
+ }
+
+ $w = PMA_backquote($names) . ' ' . $func_type . ' ' . $parens_open . $enum_where . $parens_close;
+ }
+
+ } elseif ($fields != '') {
+ // For these types we quote the value. Even if it's another type (like INT),
+ // for a LIKE we always quote the value. MySQL converts strings to numbers
+ // and numbers to strings as necessary during the comparison
+ if (preg_match('@char|binary|blob|text|set|date|time|year@i', $types) || strpos(' ' . $func_type, 'LIKE')) {
+ $quot = '\'';
+ } else {
+ $quot = '';
+ }
+
+ // LIKE %...%
+ if ($func_type == 'LIKE %...%') {
+ $func_type = 'LIKE';
+ $fields = '%' . $fields . '%';
+ }
+ if ($func_type == 'REGEXP ^...$') {
+ $func_type = 'REGEXP';
+ $fields = '^' . $fields . '$';
+ }
+
+ if ($func_type == 'IN (...)' || $func_type == 'NOT IN (...)' || $func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN') {
+ $func_type = str_replace(' (...)', '', $func_type);
+
+ // quote values one by one
+ $values = explode(',', $fields);
+ foreach ($values as &$value)
+ $value = $quot . PMA_sqlAddslashes(trim($value)) . $quot;
+
+ if ($func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN')
+ $w = PMA_backquote($names) . ' ' . $func_type . ' ' . (isset($values[0]) ? $values[0] : '') . ' AND ' . (isset($values[1]) ? $values[1] : '');
+ else
+ $w = PMA_backquote($names) . ' ' . $func_type . ' (' . implode(',', $values) . ')';
+ }
+ else {
+ $w = PMA_backquote($names) . ' ' . $func_type . ' ' . $quot . PMA_sqlAddslashes($fields) . $quot;;
+ }
+
+ } // end if
+
+ return $w;
+}
+
+/**
+ * Formats a SVG plot for the query results.
+ *
+ * @param array $data Data for the status chart
+ * @param array &$settings Settings used to generate the chart
+ *
+ * @return string HTML and JS code for the SVG plot
+ */
+function PMA_SVG_scatter_plot($data, &$settings)
+{
+ require_once './libraries/svg_plot/pma_scatter_plot.php';
+
+ if (empty($data)) {
+ // empty data
+ return '';
+ } else {
+ $scatter_plot = new PMA_Scatter_Plot($data, $settings);
+
+ if ($settings != null) {
+ foreach ($scatter_plot->getSettings() as $setting => $val) {
+ if (! isset($settings[$setting])) {
+ $settings[$setting] = $val;
+ }
+ }
+ }
+ return $scatter_plot->asSVG();
+ }
+
+}
+
+
+
+
+
+
+
+
+
+?>
diff --git a/tbl_select.php b/tbl_select.php
index c6b0a35..e9b1eae 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -15,6 +15,7 @@
*/
require_once './libraries/common.inc.php';
require_once './libraries/mysql_charsets.lib.php';
+require_once './libraries/tbl_select.lib.php';
$GLOBALS['js_include'][] = 'makegrid.js';
$GLOBALS['js_include'][] = 'sql.js';
@@ -22,18 +23,8 @@ $GLOBALS['js_include'][] = 'tbl_select.js';
$GLOBALS['js_include'][] = 'tbl_change.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'jquery/timepicker.js';
-if ($GLOBALS['cfg']['PropertiesIconic'] == true) {
- $titles['Browse'] =
- '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
- .'b_browse.png" alt="' . __('Browse foreign values') . '" title="'
- . __('Browse foreign values') . '" />';
-
- if ($GLOBALS['cfg']['PropertiesIconic'] === 'both') {
- $titles['Browse'] .= __('Browse foreign values');
- }
-} else {
- $titles['Browse'] = __('Browse foreign values');
-}
+
+$titles['Browse'] = PMA_tbl_setTitle($GLOBALS['cfg']['PropertiesIconic'], $pmaThemeImage);
/**
* Not selection yet required -> displays the selection form
@@ -61,45 +52,26 @@ if (! isset($param) || $param[0] == '') {
$err_url = $goto . '?' . PMA_generate_common_url($db, $table);
// Gets the list and number of fields
- $result = PMA_DBI_query('SHOW FULL FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($db) . ';', null, PMA_DBI_QUERY_STORE);
- $fields_cnt = PMA_DBI_num_rows($result);
- $fields_list = $fields_null = $fields_type = $fields_collation = array();
- while ($row = PMA_DBI_fetch_assoc($result)) {
- $fields_list[] = $row['Field'];
- $type = $row['Type'];
- // reformat mysql query output
- if (strncasecmp($type, 'set', 3) == 0
- || strncasecmp($type, 'enum', 4) == 0) {
- $type = str_replace(',', ', ', $type);
- } else {
- // strip the "BINARY" attribute, except if we find "BINARY(" because
- // this would be a BINARY or VARBINARY field type
- if (!preg_match('@BINARY[\(]@i', $type)) {
- $type = preg_replace('@BINARY@i', '', $type);
- }
- $type = preg_replace('@ZEROFILL@i', '', $type);
- $type = preg_replace('@UNSIGNED@i', '', $type);
-
- $type = strtolower($type);
- }
- if (empty($type)) {
- $type = ' ';
- }
- $fields_null[] = $row['Null'];
- $fields_type[] = $type;
- $fields_collation[] = !empty($row['Collation']) && $row['Collation'] != 'NULL'
- ? $row['Collation']
- : '';
- } // end while
- PMA_DBI_free_result($result);
- unset($result, $type);
+ list($fields_list, $fields_type, $fields_collation, $fields_null) = PMA_tbl_getFields($table,$db);
+ $fields_cnt = count($fields_list);
// retrieve keys into foreign fields, if any
// check also foreigners even if relwork is FALSE (to get
// foreign keys from innodb)
$foreigners = PMA_getForeigners($db, $table);
?>
+
+<fieldset id="fieldset_subtab">
+<?php
+$url_params = array();
+$url_params['db'] = $db;
+$url_params['table'] = $table;
+
+echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params);
+
+?>
+
<form method="post" action="tbl_select.php" name="insertForm" id="tbl_search_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>>
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<input type="hidden" name="goto" value="<?php echo $goto; ?>" />
@@ -110,14 +82,7 @@ if (! isset($param) || $param[0] == '') {
<fieldset id="fieldset_table_qbe">
<legend><?php echo __('Do a "query by example" (wildcard: "%")') ?></legend>
<table class="data">
- <thead>
- <tr><th><?php echo __('Column'); ?></th>
- <th><?php echo __('Type'); ?></th>
- <th><?php echo __('Collation'); ?></th>
- <th><?php echo __('Operator'); ?></th>
- <th><?php echo __('Value'); ?></th>
- </tr>
- </thead>
+ <?php echo PMA_tbl_setTableHeader(); ?>
<tbody>
<?php
$odd_row = true;
@@ -130,57 +95,31 @@ if (! isset($param) || $param[0] == '') {
<td><?php echo $fields_collation[$i]; ?></td>
<td><select name="func[]">
<?php
- // determine valid operators
if (strncasecmp($fields_type[$i], 'enum', 4) == 0) {
- // enum operators
- $operators = array(
- '=',
- '!=',
- );
+ foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) {
+ echo "\n" . ' '
+ . '<option value="' . htmlspecialchars($fc) . '">'
+ . htmlspecialchars($fc) . '</option>';
+ }
} elseif (preg_match('@char|blob|text|set@i', $fields_type[$i])) {
- // text operators
- $operators = array(
- 'LIKE',
- 'LIKE %...%',
- 'NOT LIKE',
- '=',
- '!=',
- 'REGEXP',
- 'REGEXP ^...$',
- 'NOT REGEXP',
- "= ''",
- "!= ''",
- 'IN (...)',
- 'NOT IN (...)',
- 'BETWEEN',
- 'NOT BETWEEN',
- );
+ foreach ($GLOBALS['cfg']['TextOperators'] as $fc) {
+ echo "\n" . ' '
+ . '<option value="' . htmlspecialchars($fc) . '">'
+ . htmlspecialchars($fc) . '</option>';
+ }
} else {
- // numeric operators
- $operators = array(
- '=',
- '>',
- '>=',
- '<',
- '<=',
- '!=',
- 'LIKE',
- 'NOT LIKE',
- 'IN (...)',
- 'NOT IN (...)',
- 'BETWEEN',
- 'NOT BETWEEN',
- );
+ foreach ($GLOBALS['cfg']['NumOperators'] as $fc) {
+ echo "\n" . ' '
+ . '<option value="' . htmlspecialchars($fc) . '">'
+ . htmlspecialchars($fc) . '</option>';
+ }
} // end if... else...
-
- // if field can be NULL, add IS NULL and IS NOT NULL
if ($fields_null[$i]) {
- $operators[] = 'IS NULL';
- $operators[] = 'IS NOT NULL';
- }
- foreach ($operators as $op) {
- echo "\n" . ' '
- . '<option value="' . htmlspecialchars($op) . '">' . htmlspecialchars($op) . '</option>';
+ foreach ($GLOBALS['cfg']['NullOperators'] as $fc) {
+ echo "\n" . ' '
+ . '<option value="' . htmlspecialchars($fc) . '">'
+ . htmlspecialchars($fc) . '</option>';
+ }
}
?>
@@ -192,54 +131,9 @@ if (! isset($param) || $param[0] == '') {
$foreignData = PMA_getForeignData($foreigners, $field, false, '', '');
- if ($foreigners && isset($foreigners[$field]) && is_array($foreignData['disp_row'])) {
- // f o r e i g n k e y s
- echo ' <select name="fields[' . $i . ']">' . "\n";
- // go back to first row
-
- // here, the 4th parameter is empty because there is no current
- // value of data for the dropdown (the search page initial values
- // are displayed empty)
- echo PMA_foreignDropdown($foreignData['disp_row'],
- $foreignData['foreign_field'],
- $foreignData['foreign_display'],
- '', $GLOBALS['cfg']['ForeignKeyMaxLimit']);
- echo ' </select>' . "\n";
- } elseif ($foreignData['foreign_link'] == true) {
- ?>
- <input type="text" name="fields[<?php echo $i; ?>]"
- id="field_<?php echo md5($field); ?>[<?php echo $i; ?>]"
- class="textfield" />
- <script type="text/javascript">
- // <![CDATA[
- document.writeln('<a target="_blank" onclick="window.open(this.href, \'foreigners\', \'width=640,height=240,scrollbars=yes\'); return false" href="browse_foreigners.php?<?php echo PMA_generate_common_url($db, $table); ?>&field=<?php echo urlencode($field); ?>&fieldkey=<?php echo $i; ?>"><?php echo str_replace("'", "\'", $titles['Browse']); ?></a>');
- // ]]>
- </script>
- <?php
- } elseif (strncasecmp($fields_type[$i], 'enum', 4) == 0) {
- // e n u m s
- $enum_value=explode(', ', str_replace("'", '', substr($fields_type[$i], 5, -1)));
- $cnt_enum_value = count($enum_value);
- echo ' <select name="fields[' . $i . '][]"'
- .' multiple="multiple" size="' . min(3, $cnt_enum_value) . '">' . "\n";
- for ($j = 0; $j < $cnt_enum_value; $j++) {
- echo ' <option value="' . $enum_value[$j] . '">'
- . $enum_value[$j] . '</option>';
- } // end for
- echo ' </select>' . "\n";
- } else {
- // o t h e r c a s e s
- $the_class = 'textfield';
- $type = $fields_type[$i];
- if ($type == 'date') {
- $the_class .= ' datefield';
- } elseif ($type == 'datetime' || substr($type, 0, 9) == 'timestamp') {
- $the_class .= ' datetimefield';
- }
- echo ' <input type="text" name="fields[' . $i . ']"'
- .' size="40" class="' . $the_class . '" id="field_' . $i . '" />' . "\n";
- };
- ?>
+ echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '' );
+
+ ?>
<input type="hidden" name="names[<?php echo $i; ?>]"
value="<?php echo htmlspecialchars($fields_list[$i]); ?>" />
<input type="hidden" name="types[<?php echo $i; ?>]"
@@ -321,13 +215,20 @@ if (! isset($param) || $param[0] == '') {
<div id="sqlqueryresults"></div>
<?php
require './libraries/footer.inc.php';
+?>
+
+</fieldset>
+
+<?php
}
+
/**
* Selection criteria have been submitted -> do the work
*/
else {
+ echo "ZZ";
// Builds the query
$sql_query = 'SELECT ' . (isset($distinct) ? 'DISTINCT ' : '');
@@ -354,88 +255,18 @@ else {
$sql_query .= ' WHERE ' . $where;
} else {
$w = $charsets = array();
- $unary_operators = array(
- 'IS NULL' => 1,
- 'IS NOT NULL' => 1,
- "= ''" => 1,
- "!= ''" => 1
- );
$cnt_func = count($func);
reset($func);
while (list($i, $func_type) = each($func)) {
- list($charsets[$i]) = explode('_', $collations[$i]);
- if (isset($unary_operators[$func_type])) {
- $fields[$i] = '';
- $w[] = PMA_backquote($names[$i]) . ' ' . $func_type;
-
- } elseif (strncasecmp($types[$i], 'enum', 4) == 0) {
- if (!empty($fields[$i])) {
- if (! is_array($fields[$i])) {
- $fields[$i] = explode(',', $fields[$i]);
- }
- $enum_selected_count = count($fields[$i]);
- if ($func_type == '=' && $enum_selected_count > 1) {
- $func_type = $func[$i] = 'IN';
- $parens_open = '(';
- $parens_close = ')';
-
- } elseif ($func_type == '!=' && $enum_selected_count > 1) {
- $func_type = $func[$i] = 'NOT IN';
- $parens_open = '(';
- $parens_close = ')';
-
- } else {
- $parens_open = '';
- $parens_close = '';
- }
- $enum_where = '\'' . PMA_sqlAddSlashes($fields[$i][0]) . '\'';
- for ($e = 1; $e < $enum_selected_count; $e++) {
- $enum_where .= ', \'' . PMA_sqlAddSlashes($fields[$i][$e]) . '\'';
- }
-
- $w[] = PMA_backquote($names[$i]) . ' ' . $func_type . ' ' . $parens_open . $enum_where . $parens_close;
- }
-
- } elseif ($fields[$i] != '') {
- // For these types we quote the value. Even if it's another type (like INT),
- // for a LIKE we always quote the value. MySQL converts strings to numbers
- // and numbers to strings as necessary during the comparison
- if (preg_match('@char|binary|blob|text|set|date|time|year@i', $types[$i]) || strpos(' ' . $func_type, 'LIKE')) {
- $quot = '\'';
- } else {
- $quot = '';
- }
-
- // LIKE %...%
- if ($func_type == 'LIKE %...%') {
- $func_type = 'LIKE';
- $fields[$i] = '%' . $fields[$i] . '%';
- }
- if ($func_type == 'REGEXP ^...$') {
- $func_type = 'REGEXP';
- $fields[$i] = '^' . $fields[$i] . '$';
- }
-
- if ($func_type == 'IN (...)' || $func_type == 'NOT IN (...)' || $func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN') {
- $func_type = str_replace(' (...)', '', $func_type);
-
- // quote values one by one
- $values = explode(',', $fields[$i]);
- foreach ($values as &$value)
- $value = $quot . PMA_sqlAddSlashes(trim($value)) . $quot;
-
- if ($func_type == 'BETWEEN' || $func_type == 'NOT BETWEEN')
- $w[] = PMA_backquote($names[$i]) . ' ' . $func_type . ' ' . (isset($values[0]) ? $values[0] : '') . ' AND ' . (isset($values[1]) ? $values[1] : '');
- else
- $w[] = PMA_backquote($names[$i]) . ' ' . $func_type . ' (' . implode(',', $values) . ')';
- }
- else {
- $w[] = PMA_backquote($names[$i]) . ' ' . $func_type . ' ' . $quot . PMA_sqlAddSlashes($fields[$i]) . $quot;;
- }
-
- } // end if
+
+ list($charsets[$i]) = explode('_', $collations[$i]);
+ $unaryFlag = (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) ? true : false;
+ $whereClause = PMA_tbl_search_getWhereClause($fields[$i],$names[$i], $types[$i], $collations[$i], $func_type, $unaryFlag);
+ if($whereClause)
+ $w[] = $whereClause;
+
} // end for
-
+ //print_r($w);
if ($w) {
$sql_query .= ' WHERE ' . implode(' AND ', $w);
}
@@ -444,7 +275,6 @@ else {
if ($orderField != '--nil--') {
$sql_query .= ' ORDER BY ' . PMA_backquote($orderField) . ' ' . $order;
} // end if
-
require './sql.php';
}
diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
new file mode 100644
index 0000000..cdb784d
--- /dev/null
+++ b/tbl_zoom_select.php
@@ -0,0 +1,447 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Handles table zoom search tab
+ *
+ * display table zoom search form, create SQL queries from form data
+ *
+ */
+
+/**
+ * Gets some core libraries
+ */
+require_once './libraries/common.inc.php';
+require_once './libraries/mysql_charsets.lib.php';
+require_once './libraries/tbl_select.lib.php';
+require_once './libraries/relation.lib.php';
+require_once './libraries/tbl_info.inc.php';
+
+$GLOBALS['js_include'][] = 'makegrid.js';
+$GLOBALS['js_include'][] = 'sql.js';
+$GLOBALS['js_include'][] = 'functions.js';
+$GLOBALS['js_include'][] = 'tbl_zoom_plot.js';
+$GLOBALS['js_include'][] = 'date.js';
+$GLOBALS['js_include'][] = 'highcharts/highcharts.js';
+/* Files required for chart exporting */
+$GLOBALS['js_include'][] = 'highcharts/exporting.js';
+$GLOBALS['js_include'][] = 'canvg/canvg.js';
+$GLOBALS['js_include'][] = 'canvg/rgbcolor.js';
+$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
+$GLOBALS['js_include'][] = 'jquery/timepicker.js';
+
+
+/**
+ * Handle AJAX request for data row on point select
+ * @var post_params Object containing parameters for the POST request
+ */
+
+if (isset($_REQUEST['get_data_row']) && $_REQUEST['get_data_row'] == true) {
+
+ $extra_data = array();
+ $row_info_query = 'SELECT * FROM `' . $_REQUEST['db'] . '`.`' . $_REQUEST['table'] . '` WHERE ' . $_REQUEST['where_clause'];
+ $result = PMA_DBI_query( $row_info_query . ";" , null, PMA_DBI_QUERY_STORE);
+ $fields_meta = PMA_DBI_get_fields_meta($result);
+ while ($row = PMA_DBI_fetch_assoc($result))
+ $extra_data['row_info'] = $row;
+
+ PMA_ajaxResponse(NULL, true, $extra_data);
+}
+
+$titles['Browse'] = PMA_tbl_setTitle($GLOBALS['cfg']['PropertiesIconic'], $pmaThemeImage);
+/**
+ * Not selection yet required -> displays the selection form
+ */
+
+ // Gets some core libraries
+ require_once './libraries/tbl_common.php';
+ //$err_url = 'tbl_select.php' . $err_url;
+ $url_query .= '&goto=tbl_select.php&back=tbl_select.php';
+
+ /**
+ * Gets tables informations
+ */
+ require_once './libraries/tbl_info.inc.php';
+
+ /**
+ * Displays top menu links
+ */
+ require_once './libraries/tbl_links.inc.php';
+
+ if (! isset($goto)) {
+ $goto = $GLOBALS['cfg']['DefaultTabTable'];
+ }
+ // Defines the url to return to in case of error in the next sql statement
+ $err_url = $goto . '?' . PMA_generate_common_url($db, $table);
+
+ // Gets the list and number of fields
+
+ list($fields_list, $fields_type, $fields_collation, $fields_null) = PMA_tbl_getFields($table,$db);
+ $fields_cnt = count($fields_list);
+
+ // retrieve keys into foreign fields, if any
+ // check also foreigners even if relwork is FALSE (to get
+ // foreign keys from innodb)
+ $foreigners = PMA_getForeigners($db, $table);
+ $flag = 1;
+ $tbl_fields_type = $tbl_fields_collation = $tbl_fields_null = array();
+ if(!isset($zoom_submit) && !isset($inputs))
+ $dataLabel = PMA_getDisplayField($db,$table);
+
+ ?>
+
+
+<div id="sqlqueryresults"></div>
+<fieldset id="fieldset_subtab">
+<?php
+$url_params = array();
+$url_params['db'] = $db;
+$url_params['table'] = $table;
+echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params);
+
+/**
+ * Set the field name,type,collation and whether null on select of a coulmn
+ */
+if(isset($inputs) && ($inputs[0] != __('pma_null') || $inputs[1] != __('pma_null')))
+{
+ $flag = 2;
+ for($i = 0 ; $i < 4 ; $i++)
+ {
+ if($inputs[$i] != __('pma_null'))
+ {
+ $key = array_search($inputs[$i],$fields_list);
+ $tbl_fields_type[$i] = $fields_type[$key];
+ $tbl_fields_collation[$i] = $fields_collation[$key];
+ $tbl_fields_null[$i] = $fields_null[$key];
+ }
+
+ }
+}
+
+
+?>
+
+<?php
+
+/*
+ * Form for input criteria
+ */
+
+?>
+<form method="post" action="tbl_zoom_select.php" name="zoomInputForm" id="zoom_search_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>>
+<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
+<input type="hidden" name="goto" value="<?php echo $goto; ?>" />
+<input type="hidden" name="back" value="tbl_zoom_select.php" />
+<input type="hidden" name="flag" id="id_flag" value=<?php echo $flag; ?> />
+
+
+
+
+<fieldset id="inputSection">
+
+<legend><?php echo __('Do a "query by example" (wildcard: "%") for two different columns') ?></legend>
+<table class="data">
+<?php echo PMA_tbl_setTableHeader();?>
+<tbody>
+<?php
+ $odd_row = true;
+
+for($i = 0 ; $i < 4 ; $i++){
+
+ if($i == 2){
+ echo "<tr><td>";
+ echo __("Additional search criteria");
+ echo "</td><tr>";
+ }
+
+?>
+ <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
+ <th><select name="inputs[]" id=<?php echo 'tableid_' . $i?> >
+ <option value= <?php echo __('pma_null')?>><?php echo __('None'); ?> </option>
+ <?php
+ for ($j = 0 ; $j < $fields_cnt ; $j++){
+ if(isset($inputs[$i]) && $inputs[$i] == htmlspecialchars($fields_list[$j])){?>
+ <option value=<?php echo htmlspecialchars($fields_list[$j]);?> Selected> <?php echo htmlspecialchars($fields_list[$j]);?></option>
+ <?php
+ }
+ else{ ?>
+ <option value=<?php echo htmlspecialchars($fields_list[$j]);?> > <?php echo htmlspecialchars($fields_list[$j]);?></option>
+ <?php
+ }
+ } ?>
+ </select></th>
+ <td><?php if(isset($tbl_fields_type[$i]))echo $tbl_fields_type[$i]; ?></td>
+ <td><?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?></td>
+
+ <td>
+ <?php if(isset($inputs) && $inputs[$i] != __('pma_null')){ ?>
+ <select name="zoomFunc[]">
+ <?php
+
+ if (strncasecmp($tbl_fields_type[$i], 'enum', 4) == 0) {
+ foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) {
+ if(isset($zoomFunc[$i]) && $zoomFunc[$i] == htmlspecialchars($fc)){
+ echo "\n" . ' '
+ . '<option value="' . htmlspecialchars($fc) . '" Selected>'
+ . htmlspecialchars($fc) . '</option>';
+ }
+ else {
+ echo "\n" . ' '
+ . '<option value="' . htmlspecialchars($fc) . '">'
+ . htmlspecialchars($fc) . '</option>';
+ }
+ }
+ } elseif (preg_match('@char|blob|text|set@i', $tbl_fields_type[$i])) {
+ foreach ($GLOBALS['cfg']['TextOperators'] as $fc) {
+ if(isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc){
+ echo "\n" . ' '
+ . '<option value="' . htmlspecialchars($fc) . '" Selected>'
+ . htmlspecialchars($fc) . '</option>';
+ }
+ else {
+ echo "\n" . ' '
+ . '<option value="' . htmlspecialchars($fc) . '">'
+ . htmlspecialchars($fc) . '</option>';
+ }
+ }
+ } else {
+ foreach ($GLOBALS['cfg']['NumOperators'] as $fc) {
+ if(isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc){
+ echo "\n" . ' '
+ . '<option value="' . htmlspecialchars($fc) . '" Selected>'
+ . htmlspecialchars($fc) . '</option>';
+ }
+ else {
+ echo "\n" . ' '
+ . '<option value="' . htmlspecialchars($fc) . '">'
+ . htmlspecialchars($fc) . '</option>';
+ }
+ }
+ } // end if... else...
+
+ if ($tbl_fields_null[$i]) {
+ foreach ($GLOBALS['cfg']['NullOperators'] as $fc) {
+ if(isset($zoomFunc[$i]) && $zoomFunc[$i] == $fc){
+ echo "\n" . ' '
+ . '<option value="' . htmlspecialchars($fc) . '" Selected>'
+ . htmlspecialchars($fc) . '</option>';
+ }
+ else {
+ echo "\n" . ' '
+ . '<option value="' . htmlspecialchars($fc) . '">'
+ . htmlspecialchars($fc) . '</option>';
+ }
+ }
+ }
+ ?>
+ </select>
+ </td>
+ <td>
+ <?php
+ $field = $inputs[$i];
+
+ $foreignData = PMA_getForeignData($foreigners, $field, false, '', '');
+ if (isset($fields))
+ echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], $fields);
+ else
+ echo PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fields_type, $i ,$db, $table, $titles, $GLOBALS['cfg']['ForeignKeyMaxLimit'], '');
+
+ }
+ else{ ?>
+
+ </td><td></td>
+
+ <?php } ?>
+
+ </td>
+ </tr>
+
+ <input type="hidden" name="types[<?php echo $i; ?>]" id="types_<?php echo $i; ?>"
+ value="<?php if(isset($tbl_fields_type[$i]))echo $tbl_fields_type[$i]; ?>" />
+ <input type="hidden" name="collations[<?php echo $i; ?>]"
+ value="<?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?>" />
+
+
+
+<?php
+ }//end for
+?>
+ </table>
+
+ <?php
+ /*
+ * Other inputs like data label and mode go after selection of column criteria
+ */
+
+ //Set default datalabel if not selected
+ if(isset($zoom_submit) && $inputs[0] != __('pma_null') && $inputs[1] != __('pma_null')) {
+ if ($dataLabel == '')
+ $dataLabel = PMA_getDisplayField($db,$table);
+ }
+ ?>
+ <table class="data">
+ <tr><td><label for="label"><?php echo __("Data Label"); ?></label>        </td>
+ <td><select name="dataLabel" id='dataLabel' >
+ <option value = ''> <?php echo __('None'); ?> </option>
+ <?php
+ for ($j = 0 ; $j < $fields_cnt ; $j++){
+ if(isset($dataLabel) && $dataLabel == htmlspecialchars($fields_list[$j])){?>
+ <option value=<?php echo htmlspecialchars($fields_list[$j]);?> Selected> <?php echo htmlspecialchars($fields_list[$j]);?></option>
+ <?php
+ }
+ else{ ?>
+ <option value=<?php echo htmlspecialchars($fields_list[$j]);?> > <?php echo htmlspecialchars($fields_list[$j]);?></option>
+ <?php
+ }
+ } ?>
+ </select>
+ </td></tr>
+ <tr><td><label for="label"><?php echo __("Maximum rows to plot"); ?></label></td>
+ <td>
+ <?php if(isset($maxPlotLimit)) { ?>
+ <input type="text" name="maxPlotLimit" value="<?php echo $maxPlotLimit; ?>" /></td></tr>
+ <?php
+ }
+ else { ?>
+ <input type="text" name="maxPlotLimit" value="<?php echo $GLOBALS['cfg']['maxRowPlotLimit']; ?>" /></td></tr>
+ <?php
+ } ?>
+ </table>
+
+</fieldset>
+<fieldset class="tblFooters">
+ <input type="hidden" name="max_number_of_fields"
+ value="<?php echo $fields_cnt; ?>" />
+ <input type="submit" name="zoom_submit" id="inputFormSubmitId" value="<?php echo __('Go'); ?>" />
+</fieldset>
+</form>
+
+<?php
+
+/*
+ * Handle the input criteria and gerate the query result
+ * Form for displaying query results
+ */
+if(isset($zoom_submit) && $inputs[0] != __('pma_null') && $inputs[1] != __('pma_null') && $inputs[0] != $inputs[1]) {
+
+ /*
+ * Query generation part
+ */
+ $w = $data = array();
+ $sql_query = 'SELECT *';
+
+ //Add the table
+
+ $sql_query .= ' FROM ' . PMA_backquote($table);
+ for($i = 0 ; $i < 4 ; $i++){
+ if($inputs[$i] == __('pma_null'))
+ continue;
+ $tmp = array();
+ // The where clause
+ $charsets = array();
+ $cnt_func = count($zoomFunc[$i]);
+ $func_type = $zoomFunc[$i];
+ list($charsets[$i]) = explode('_', $collations[$i]);
+ $unaryFlag = (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) ? true : false;
+ $whereClause = PMA_tbl_search_getWhereClause($fields[$i],$inputs[$i], $types[$i], $collations[$i], $func_type, $unaryFlag);
+ if($whereClause)
+ $w[] = $whereClause;
+
+ } // end for
+ if ($w) {
+ $sql_query .= ' WHERE ' . implode(' AND ', $w);
+ }
+ $sql_query .= ' LIMIT ' . $maxPlotLimit;
+
+ /*
+ * Query execution part
+ */
+ $result = PMA_DBI_query( $sql_query . ";" , null, PMA_DBI_QUERY_STORE);
+ $fields_meta = PMA_DBI_get_fields_meta($result);
+ while ($row = PMA_DBI_fetch_assoc($result)) {
+ //Need a row with indexes as 0,1,2 for the PMA_getUniqueCondition hence using a temporary array
+ $tmpRow = array();
+ foreach($row as $val)
+ $tmpRow[] = $val;
+ //Get unique conditon on each row (will be needed for row update)
+ $uniqueCondition = PMA_getUniqueCondition($result, $fields_cnt, $fields_meta, $tmpRow, true);
+
+ //Append it to row array as where_clause
+ $row['where_clause'] = $uniqueCondition[0];
+ if($dataLabel == $inputs[0] || $dataLabel == $inputs[1])
+ $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], 'where_clause' => $uniqueCondition[0]);
+ else
+ $data[] = array($inputs[0] => $row[$inputs[0]], $inputs[1] => $row[$inputs[1]], $dataLabel => $row[$dataLabel], 'where_clause' => $uniqueCondition[0]);
+ }
+
+?>
+
+<?php
+ /*
+ * Form for displaying point data and also the scatter plot
+ */
+?>
+ <form method="post" action="tbl_zoom_select.php" name="displayResultForm" id="zoom_display_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>>
+ <?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
+ <input type="hidden" name="goto" value="<?php echo $goto; ?>" />
+ <input type="hidden" name="back" value="tbl_zoom_select.php" />
+
+ <fieldset id="displaySection">
+ <legend><?php echo __('Browse/Edit the points') ?></legend>
+ <center>
+ <?php
+ //JSON encode the data(query result)
+ if(isset($zoom_submit) && !empty($data)){ ?>
+ <div id='resizer' style="width:600px;height:400px">
+ <?php if (isset($data)) ?><center> <a href="#" onClick="displayHelp();"><?php echo __('How to use'); ?></a> </center>
+ <div id="querydata" style="display:none">
+ <?php if(isset($data)) echo json_encode($data); ?>
+ </div>
+ <div id="querychart" style="float:right"></div>
+ </div>
+ <?php
+ } ?>
+ </center>
+ <fieldset id='dataDisplay' style="display:none">
+ <fieldset>
+ <table class="data">
+ <thead>
+ <tr>
+ <th> <?php echo __('Column'); ?> </th>
+ <th> <?php echo __('Null'); ?> </th>
+ <th> <?php echo __('Value'); ?> </th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php
+ $odd_row = true;
+ for ($i = 4; $i < $fields_cnt + 4 ; $i++) {
+ $tbl_fields_type[$i] = $fields_type[$i - 4];
+ $fieldpopup = $fields_list[$i - 4];
+ $foreignData = PMA_getForeignData($foreigners, $fieldpopup, false, '', '');
+ ?>
+ <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
+ <th><?php echo htmlspecialchars($fields_list[$i - 4]); ?></th>
+ <th><?php echo '<input type="checkbox" class="checkbox_null" name="fields_null[ ' . $i . ' ]" id="fields_null_id_' . $i . '" />'; ?></th>
+ <th><?php echo PMA_getForeignFields_Values($foreigners, $foreignData, $fieldpopup, $tbl_fields_type, $i, $db, $table, $titles,$GLOBALS['cfg']['ForeignKeyMaxLimit'], '' ); ?> </th>
+ </tr>
+ <?php
+ } ?>
+ </tbody>
+ </table>
+ </fieldset>
+ <fieldset class="tblFooters">
+ <input type="submit" id="submitForm" name="edit_point" value="<?php echo __('Submit'); ?>" />
+ </fieldset>
+ </fieldset>
+
+ </fieldset>
+ <input type="hidden" id="queryID" name="sql_query" />
+ </form>
+ </fieldset>
+ <?php
+}
+?>
+
+ <?php
+ require './libraries/footer.inc.php';
+?>
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14637-gb319651
by Michal Čihař 12 Aug '11
by Michal Čihař 12 Aug '11
12 Aug '11
The branch, master has been updated
via b319651b70b95c1c70d084ab8519109dae9e5450 (commit)
via d330bcf0aa0070f51644fc81567acdcde231da0d (commit)
from fcb28593e87435a327ad25a5b9e838638821c877 (commit)
- Log -----------------------------------------------------------------
commit b319651b70b95c1c70d084ab8519109dae9e5450
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Aug 12 14:59:13 2011 +0200
Cleanup
commit d330bcf0aa0070f51644fc81567acdcde231da0d
Author: Michal Čihař <michal(a)cihar.com>
Date: Fri Aug 12 14:58:16 2011 +0200
Fix format string
-----------------------------------------------------------------------
Summary of changes:
po/af.po | 3 ---
po/ar.po | 6 ------
po/az.po | 5 -----
po/be.po | 6 ------
po/be(a)latin.po | 6 ------
po/bg.po | 6 ------
po/bn.po | 6 ------
po/br.po | 2 --
po/bs.po | 5 -----
po/ca.po | 6 ------
po/cs.po | 4 ----
po/cy.po | 2 --
po/da.po | 4 ----
po/de.po | 4 ----
po/el.po | 4 ----
po/en_GB.po | 4 ----
po/es.po | 4 ----
po/et.po | 6 ------
po/eu.po | 5 -----
po/fa.po | 3 ---
po/fi.po | 6 ------
po/fr.po | 4 ----
po/gl.po | 6 ------
po/he.po | 5 -----
po/hi.po | 6 ------
po/hr.po | 6 ------
po/hu.po | 6 ------
po/id.po | 5 -----
po/it.po | 4 ----
po/ja.po | 4 ----
po/ka.po | 6 ------
po/ko.po | 5 -----
po/lt.po | 4 ----
po/lv.po | 5 -----
po/mk.po | 5 -----
po/mn.po | 6 ------
po/ms.po | 5 -----
po/nb.po | 6 ------
po/nl.po | 6 ------
po/pl.po | 6 ------
po/pt.po | 5 -----
po/pt_BR.po | 7 -------
po/ro.po | 6 ------
po/ru.po | 6 ------
po/si.po | 6 ------
po/sk.po | 6 ------
po/sl.po | 4 ----
po/sq.po | 5 -----
po/sr.po | 6 ------
po/sr(a)latin.po | 6 ------
po/sv.po | 4 ----
po/te.po | 4 ----
po/th.po | 5 -----
po/tr.po | 2 +-
po/tt.po | 6 ------
po/ug.po | 2 --
po/uk.po | 5 -----
po/ur.po | 3 ---
po/uz.po | 6 ------
po/uz(a)latin.po | 6 ------
po/zh_CN.po | 4 ----
po/zh_TW.po | 6 ------
62 files changed, 1 insertions(+), 306 deletions(-)
diff --git a/po/af.po b/po/af.po
index 5701423..996d207 100644
--- a/po/af.po
+++ b/po/af.po
@@ -12303,7 +12303,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Spasie verbruik"
@@ -12312,12 +12311,10 @@ msgstr ""
#~ msgstr "Wys tabelle"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Gebruik"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Gebruik"
diff --git a/po/ar.po b/po/ar.po
index 22ff24e..2080d11 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -12329,32 +12329,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "المساحة المستخدمة"
#, fuzzy
-#~| msgid "Could not open file: %s"
#~ msgid "% open files"
#~ msgstr "لايمكن فتح الملف : %s"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "اتصالات"
#, fuzzy
-#~| msgid "Force SSL connection"
#~ msgid "% aborted connections"
#~ msgstr "فرض إتصال SSL"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "المساحة"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "المساحة"
diff --git a/po/az.po b/po/az.po
index 47b784a..286201b 100644
--- a/po/az.po
+++ b/po/az.po
@@ -12535,7 +12535,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Yer istifadesi"
@@ -12544,22 +12543,18 @@ msgstr ""
#~ msgstr "Cedvelleri göster"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Elaqeler"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "Elaqeler"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Miqdar"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Miqdar"
diff --git a/po/be.po b/po/be.po
index 45d9845..ac4d3b5 100644
--- a/po/be.po
+++ b/po/be.po
@@ -13003,32 +13003,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Выкарыстаньне прасторы"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Паказаць адкрытыя табліцы"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Падлучэньні"
#, fuzzy
-#~| msgid "max. concurrent connections"
#~ msgid "% aborted connections"
#~ msgstr "максымум адначасовых злучэньняў"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Выкарыстаньне"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Выкарыстаньне"
diff --git a/po/be(a)latin.po b/po/be(a)latin.po
index e73860c..d922079 100644
--- a/po/be(a)latin.po
+++ b/po/be(a)latin.po
@@ -12972,32 +12972,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Vykarystańnie prastory"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Pakazać adkrytyja tablicy"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Padłučeńni"
#, fuzzy
-#~| msgid "max. concurrent connections"
#~ msgid "% aborted connections"
#~ msgstr "maksymum adnačasovych złučeńniaŭ"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Vykarystańnie"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Vykarystańnie"
diff --git a/po/bg.po b/po/bg.po
index 7a6d1fb..5e31000 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -12081,32 +12081,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Използвано място"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Показване на отворените теблици"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Конекции"
#, fuzzy
-#~| msgid "max. concurrent connections"
#~ msgid "% aborted connections"
#~ msgstr "максимален брой едновременни връзки"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Използвани"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Използвани"
diff --git a/po/bn.po b/po/bn.po
index 9f2e7e0..8e9170c 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -12858,32 +12858,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Space usage"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Show open tables"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "সংযোগসমূহ"
#, fuzzy
-#~| msgid "max. concurrent connections"
#~ msgid "% aborted connections"
#~ msgstr "max. concurrent connections"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "ব্যাবহার"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "ব্যাবহার"
diff --git a/po/br.po b/po/br.po
index bab5fde..ceada49 100644
--- a/po/br.po
+++ b/po/br.po
@@ -11945,12 +11945,10 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Could not open file: %s"
#~ msgid "% open files"
#~ msgstr "N'eus ket bet gallet digeriñ ar restr : %s"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Kevreadennoù"
diff --git a/po/bs.po b/po/bs.po
index 6b38226..8a17061 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -12510,7 +12510,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Zauzeće"
@@ -12519,22 +12518,18 @@ msgstr ""
#~ msgstr "Prikaži tabele"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Konekcije"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "Konekcije"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Zauzeće"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Zauzeće"
diff --git a/po/ca.po b/po/ca.po
index 71d67ca..e87139d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12885,32 +12885,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Utilització d'espai"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Mostra taules obertes"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Connexions"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Connexió comprimida"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Ús"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Ús"
diff --git a/po/cs.po b/po/cs.po
index 4581ee5..4efe4ab 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12456,22 +12456,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Využití místa"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Zobrazit otevřené tabulky"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Připojení"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Komprimovat připojení"
diff --git a/po/cy.po b/po/cy.po
index b3c16c3..e26844a 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -12372,12 +12372,10 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Latched pages"
#~ msgid "memcached usage"
#~ msgstr "Tudalennau "
#, fuzzy
-#~| msgid "MySQL connection collation"
#~ msgid "% connections used"
#~ msgstr "Coladiad cysylltiad MySQL"
diff --git a/po/da.po b/po/da.po
index 812e964..63b1f08 100644
--- a/po/da.po
+++ b/po/da.po
@@ -12672,22 +12672,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Pladsforbrug"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Vis åbne tabeller"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Forbindelser"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Komprimer forbindelse"
diff --git a/po/de.po b/po/de.po
index 07ec58e..41ff554 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12781,22 +12781,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Speicherplatzverbrauch"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Zeige alle offenen Tabellen"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Verbindungen"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Verbindung komprimieren"
diff --git a/po/el.po b/po/el.po
index c1c42ad..d8f005a 100644
--- a/po/el.po
+++ b/po/el.po
@@ -12836,22 +12836,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Χρήση χώρου"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Εμφάνιση ανοιχτών πινάκων"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Συνδέσεις"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Σύνδεση συμπίεσης"
diff --git a/po/en_GB.po b/po/en_GB.po
index cdd5fa5..37fd5f6 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -12562,22 +12562,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Space usage"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Show open tables"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Connections"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Compress connection"
diff --git a/po/es.po b/po/es.po
index 424d0c1..8dcc641 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12792,22 +12792,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Espacio utilizado"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Mostrar las tablas que están abiertas"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Conexiones"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Conexión de compresión"
diff --git a/po/et.po b/po/et.po
index 9d0b659..e8c2ce2 100644
--- a/po/et.po
+++ b/po/et.po
@@ -12856,32 +12856,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Ruumivõtt"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Näita avatud tabeleid"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Ühendused"
#, fuzzy
-#~| msgid "max. concurrent connections"
#~ msgid "% aborted connections"
#~ msgstr "maks. parallel ühendusi"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Kasutus"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Kasutus"
diff --git a/po/eu.po b/po/eu.po
index e30198c..d2f016f 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -12537,7 +12537,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Erabilitako lekua"
@@ -12546,22 +12545,18 @@ msgstr ""
#~ msgstr "Taulak erakutsi"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Konexioak"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "Konexioak"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Erabilpena"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Erabilpena"
diff --git a/po/fa.po b/po/fa.po
index 98b25bc..fd3ecb7 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -12276,7 +12276,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "فضاي استفادهشده"
@@ -12285,12 +12284,10 @@ msgstr ""
#~ msgstr "نمايش جدولها"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "استفاده"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "استفاده"
diff --git a/po/fi.po b/po/fi.po
index 4b80087..ba7f107 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13228,32 +13228,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Levytilan käyttö"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Näytä avoimet taulut"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Yhteydet"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Pakkaa yhteys"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Käyttö"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Käyttö"
diff --git a/po/fr.po b/po/fr.po
index 60e9489..8d3106f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12712,22 +12712,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Espace utilisé"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Montrer les tables ouvertes"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Connexions"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Utiliser le mode compression sur la connexion"
diff --git a/po/gl.po b/po/gl.po
index 70d2342..1f7e57f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13464,32 +13464,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Uso do espazo"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Mostrar as táboas abertas"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Conexións"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Comprimir a conexión"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Uso"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Uso"
diff --git a/po/he.po b/po/he.po
index 5aecfb0..83f87e6 100644
--- a/po/he.po
+++ b/po/he.po
@@ -12459,7 +12459,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "שימוש מקום"
@@ -12468,22 +12467,18 @@ msgstr ""
#~ msgstr "ראיית טבלאות"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "חיבורים"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "חיבורים"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "שימוש"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "שימוש"
diff --git a/po/hi.po b/po/hi.po
index 0093961..363a980 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -12301,32 +12301,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "स्थान उपयोग"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "खुला टेबल शो"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "कनेक्शन"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "कनेक्शन संक्षिप्त करना"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "उपयोग"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "उपयोग"
diff --git a/po/hr.po b/po/hr.po
index 906cbba..2ed2cf62 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -12959,32 +12959,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Iskorištenost prostora"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Prikaži otvorene tablice"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Veze"
#, fuzzy
-#~| msgid "max. concurrent connections"
#~ msgid "% aborted connections"
#~ msgstr "najv. uzastopnih veza"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Upotreba"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Upotreba"
diff --git a/po/hu.po b/po/hu.po
index 49ced46..6423853 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -13052,32 +13052,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Területhasználat"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Nyitott táblák megjelenítése"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Kapcsolatok"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "A kapcsolat tömörítése"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Méret"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Méret"
diff --git a/po/id.po b/po/id.po
index 0d43fdc..dfe9fee 100644
--- a/po/id.po
+++ b/po/id.po
@@ -12596,7 +12596,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Penggunaan tempat"
@@ -12605,22 +12604,18 @@ msgstr ""
#~ msgstr "Tampilkan tabel"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Koneksi"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "Koneksi"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Penggunaan"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Penggunaan"
diff --git a/po/it.po b/po/it.po
index e5d3050..328c03c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12785,22 +12785,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Spazio utilizzato"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Mostra le tabelle aperte"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Connessioni"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Comprimi la connessione"
diff --git a/po/ja.po b/po/ja.po
index a71912d..a8b7330 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12517,22 +12517,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "ディスク使用量"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "開いているテーブルを表示する"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "接続"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "圧縮通信を行う"
diff --git a/po/ka.po b/po/ka.po
index 604c278..f71789f 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -13294,32 +13294,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "ადგილის გამოყენება"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Show open tables"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "კავშირები"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "კავშირის შეკუმშვა"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "გამოყენება"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "გამოყენება"
diff --git a/po/ko.po b/po/ko.po
index 9952306..3135e80 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -12338,7 +12338,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "공간 사용량"
@@ -12347,22 +12346,18 @@ msgstr ""
#~ msgstr "테이블 보기"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "연결 수"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "연결 수"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "사용법(량)"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "사용법(량)"
diff --git a/po/lt.po b/po/lt.po
index 7a00723..350984f 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -12326,22 +12326,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Vietos naudojimas"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Rodyti atidarytas lenteles"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Prisijungimai"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Naudoti suspaustą susijungimą"
diff --git a/po/lv.po b/po/lv.po
index d6ca97b..562da3e 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -12567,7 +12567,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Diska vietas lietošana"
@@ -12576,22 +12575,18 @@ msgstr ""
#~ msgstr "Rādīt tabulas"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Konekcijas"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "Konekcijas"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Aizņem"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Aizņem"
diff --git a/po/mk.po b/po/mk.po
index 0813c59..0f7847a 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -12647,7 +12647,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Големина"
@@ -12656,22 +12655,18 @@ msgstr ""
#~ msgstr "Прикажи табели"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Конекции"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "Конекции"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Големина"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Големина"
diff --git a/po/mn.po b/po/mn.po
index e85ba80..30e26d3 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -12678,32 +12678,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Ашиглалтын зай"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Нээлттэй хүснэгтүүдийг харуулах"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Холболт"
#, fuzzy
-#~| msgid "max. concurrent connections"
#~ msgid "% aborted connections"
#~ msgstr "ХИ. давхацсан холболтууд"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Ашиглалт"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Ашиглалт"
diff --git a/po/ms.po b/po/ms.po
index e80804e..f443ee0 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -12359,7 +12359,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Penggunaan ruang"
@@ -12368,22 +12367,18 @@ msgstr ""
#~ msgstr "Papar jadual"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Hubungan"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "Hubungan"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Penggunaan"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Penggunaan"
diff --git a/po/nb.po b/po/nb.po
index 3ff2cc1..186266c 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -12968,32 +12968,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Plassbruk"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Vis åpne tabeller"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "tilkoblinger"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Komprimer tilkobling"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Bruk"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Bruk"
diff --git a/po/nl.po b/po/nl.po
index 0d83980..bd25c3d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12888,32 +12888,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Ruimtegebruik"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Toon open tabellen"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Connecties"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Comprimeer verbinding"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Gebruik"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Gebruik"
diff --git a/po/pl.po b/po/pl.po
index 623f194..5891e81 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13250,27 +13250,22 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Wykorzystanie przestrzeni"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Pokaż otwarte tabele"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Połączenia"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Kompresja połączenia"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Wykorzystanie"
@@ -13279,7 +13274,6 @@ msgstr ""
#~ msgstr "[2. Użycie]"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Wykorzystanie"
diff --git a/po/pt.po b/po/pt.po
index 7ce7c61..125e330 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -12486,7 +12486,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Espaço ocupado"
@@ -12495,22 +12494,18 @@ msgstr ""
#~ msgstr "Mostra tabelas"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Ligações"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "Ligações"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Utilização"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Utilização"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a2c95c5..657e77e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12751,37 +12751,30 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Uso do espaço"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Exibir tabelas abertas"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Conexões"
#, fuzzy
-#~| msgid "Persistent connections"
#~ msgid "% aborted connections"
#~ msgstr "Conexões persistentes"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Uso"
#, fuzzy
-#~| msgid "2. Usage"
#~ msgid "Memory Usage"
#~ msgstr "2. Utilização"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Uso"
diff --git a/po/ro.po b/po/ro.po
index d442686..75ca8bd 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -12973,32 +12973,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Utilizare spațiu"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Afișează tabele deschise"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Conexiuni"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Comprimă conexiunea"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Utilizare"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Utilizare"
diff --git a/po/ru.po b/po/ru.po
index fef7f8a..ee52b59 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12821,32 +12821,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Используемое пространство"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Список открытых таблиц"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Соединения"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Соединение со сжатием"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Использование"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Использование"
diff --git a/po/si.po b/po/si.po
index a83da68..3f328c4 100644
--- a/po/si.po
+++ b/po/si.po
@@ -12542,32 +12542,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "අවකාශ භාවිතය"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "විවෘත වගු පෙන්වන්න"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "සම්බන්ධතා"
#, fuzzy
-#~| msgid "Force SSL connection"
#~ msgid "% aborted connections"
#~ msgstr "SSL සම්බන්දතාවක් යොදා ගැනීමට බල කරන්න"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "භාවිතය"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "භාවිතය"
diff --git a/po/sk.po b/po/sk.po
index 4cebaea..c4baacb 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -12547,32 +12547,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Zabrané miesto"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Zobraziť otvorené tabuľky"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Spojenia"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Komprimovať pripojenie"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Využitie"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Využitie"
diff --git a/po/sl.po b/po/sl.po
index 3a96be3..b709ca4 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -12596,22 +12596,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Poraba prostora"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Pokaži odprte tabele"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Povezave"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Stisni povezavo"
diff --git a/po/sq.po b/po/sq.po
index 511a7aa..bfbc5a2 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -12561,7 +12561,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Hapësira e përdorur"
@@ -12570,22 +12569,18 @@ msgstr ""
#~ msgstr "Shfaq tabelat"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Lidhje"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "Lidhje"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Përdorimi"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Përdorimi"
diff --git a/po/sr.po b/po/sr.po
index ec2acbc..5dded49 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -12877,32 +12877,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Заузеће"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Прикажи отворене табеле"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Конекције"
#, fuzzy
-#~| msgid "max. concurrent connections"
#~ msgid "% aborted connections"
#~ msgstr "макс. истовремених веза"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Заузеће"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Заузеће"
diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po
index e3758b6..318d62e 100644
--- a/po/sr(a)latin.po
+++ b/po/sr(a)latin.po
@@ -12869,32 +12869,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Zauzeće"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Prikaži otvorene tabele"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Konekcije"
#, fuzzy
-#~| msgid "max. concurrent connections"
#~ msgid "% aborted connections"
#~ msgstr "maks. istovremenih veza"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Zauzeće"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Zauzeće"
diff --git a/po/sv.po b/po/sv.po
index 9f3553d..e12173d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -12605,22 +12605,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Visa använt utrymme"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Visa öppna tabeller"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Förbindelser"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Komprimera anslutning"
diff --git a/po/te.po b/po/te.po
index 9c99828..34e3cba 100644
--- a/po/ 828..34e3cba 100644 o current_insert is set to 0" ගැනීමට බල කරන්න" rɠ��* @�~P� ��~P� uJ���* �j���* e���* �X���* ��~P� �p߶�* ��~P� p�~P� k`���* 6 � � ! � ! @�~P� ��~P� x���* ��~P� �B���* �`���* @�~P� `B���* �~P� �!��* uJ���* !��* �!��* � !��* �j���* x���* ��~P� p�~P� k`���* �! �! @�~P� ��~P� Hޜ��* ��~P� �B���* �`���* @�~P� `B���* �~P� p�~P� h�~P� 8k���* �p� ��~P� uJ���* �j���* ��~P� P�~P� k`���* G H I J K M N O P @�~P� ��~P� H�s��* �~P� �B���* �`���* @�~P� 0!��* uJ���* ���* ��P��* !��* �!��* � !��* �j���* H�s��* �~P� `�~P� k`���* 8�s��* �~P� ��~P� k`���* (�s��* �~P� ��~P� k`���* �s��* �~P� ��~P� k`���* �!��* uJ���* � !��* p�~P� �Q��* eI���* �!��* ��~P� yQ��* eI���* !��* ��~P� ZQ��* eI���* ��P��* ���* ��P��* !��* �$���* �!��* � !��* �j���* 8k���* � ��* ��~P� p[P��* p�~P� @�~P� k`���* 5 6 7 8 : < = > ? @ B D @�~P� ��~P� ����* ��~P� uJ���* e���* ��~P� � ��* eI���* e���* �_@f �S Q��l�� ����* ��~P� ����* ��~P� P�~P� k`���* u]�� 4Q��U^Qʉ� �u������*ēv@�~P� ��~P� H���* $"��* ��~P� �0���* �0���* �v ��* �~P� ��~P� h�~P� ��~P� /���* uJ���* �$���* 0�~P� �0���* �~P� ��~P� ���������0���* ��~P� te.po
+++ b/po/te.po
@@ -12077,22 +12077,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "అనుసంధానాలు"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "అనుసంధానాలు"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "వాడుక"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "వాడుక"
diff --git a/po/th.po b/po/th.po
index 817b1c1..ccac83d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -12442,7 +12442,6 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "เนื้อที่ที่ใช้"
@@ -12451,22 +12450,18 @@ msgstr ""
#~ msgstr "แสดงตาราง"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "การเชื่อมต่อ"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "การเชื่อมต่อ"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "ใช้งาน"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "ใช้งาน"
diff --git a/po/tr.po b/po/tr.po
index 98f6d2e..32fd16c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12293,7 +12293,7 @@ msgstr ""
#: po/advisory_rules.php:218
#, php-format
msgid "slow_launch_time is set to %s"
-msgstr "slow_launch_time %d'e ayarlı"
+msgstr "slow_launch_time %s'e ayarlı"
#: po/advisory_rules.php:220
#, fuzzy
diff --git a/po/tt.po b/po/tt.po
index 71461b6..d43ff9a 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -12672,32 +12672,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Totılğan Alan"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Açıq tüşämä tezmäse"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Totaşular"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "Totaşular"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Totılu"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Totılu"
diff --git a/po/ug.po b/po/ug.po
index 4bfd4fa..a9ae6d0 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -12199,12 +12199,10 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Latched pages"
#~ msgid "memcached usage"
#~ msgstr "قۇلۇپلانغان بەت"
#, fuzzy
-#~| msgid "PBMS connection failed:"
#~ msgid "% connections used"
#~ msgstr "PBMS ئۇلىنالمىدى:"
diff --git a/po/uk.po b/po/uk.po
index 7498d8c..0ec1090 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -12241,27 +12241,22 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Простір, що використовується"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "З'єднань"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% aborted connections"
#~ msgstr "З'єднань"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Використання"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Використання"
diff --git a/po/ur.po b/po/ur.po
index beb582e..50ffbbe 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -12231,17 +12231,14 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Could not open file: %s"
#~ msgid "% open files"
#~ msgstr "مسل نہیں کھول سکتا: %s"
#, fuzzy
-#~| msgid "PBMS connection failed:"
#~ msgid "% connections used"
#~ msgstr "PBMS جڑت ناکام ہوا:"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "جڑنے کو سکیڑیں"
diff --git a/po/uz.po b/po/uz.po
index 0d38041..6498f1f 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -13484,32 +13484,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Фойдаланилаётган жой"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Очиқ жадваллар рўйхати"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Уланишлар"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Уланишни қисиш"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Ишлатилиш"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Ишлатилиш"
diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po
index 6a485b2..1a45f3c 100644
--- a/po/uz(a)latin.po
+++ b/po/uz(a)latin.po
@@ -13549,32 +13549,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "Foydalanilayotgan joy"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "Ochiq jadvallar ro‘yxati"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "Ulanishlar"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "Ulanishni qisish"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "Ishlatilish"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "Ishlatilish"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9b483f0..1b89d18 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12158,22 +12158,18 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "已用空间"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "显示打开的表"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "连接"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "压缩连接"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4dd2374..7a40464 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -12372,32 +12372,26 @@ msgid "concurrent_insert is set to 0"
msgstr ""
#, fuzzy
-#~| msgid "Space usage"
#~ msgid "memcached usage"
#~ msgstr "已用空間"
#, fuzzy
-#~| msgid "Show open tables"
#~ msgid "% open files"
#~ msgstr "顯示開啟的表"
#, fuzzy
-#~| msgid "Connections"
#~ msgid "% connections used"
#~ msgstr "連線"
#, fuzzy
-#~| msgid "Compress connection"
#~ msgid "% aborted connections"
#~ msgstr "壓縮連線"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "CPU Usage"
#~ msgstr "已用"
#, fuzzy
-#~| msgid "Usage"
#~ msgid "Swap Usage"
#~ msgstr "已用"
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14635-gfcb2859
by Marc Delisle 12 Aug '11
by Marc Delisle 12 Aug '11
12 Aug '11
The branch, master has been updated
via fcb28593e87435a327ad25a5b9e838638821c877 (commit)
via 98773d55427388a13976e6a126c8fd94c214bfdc (commit)
via 19b475694a073208391230a3ee54632b653b37db (commit)
via f45075db92b93192c78de2415feafdb9ecfe90be (commit)
via 70b664a3bd9820435d0a40fcaa4d090b6a30cc90 (commit)
via 3a672d43b814dbf63276f4631eb0a4fa83a235c5 (commit)
via 3f10465d71beb3b942da7a48fbc61fa65331dc8d (commit)
via a24eeef70c807e0980588120981a9559eb6acda5 (commit)
via fe7eadab72e3f318986f36e47749364b2d3077dd (commit)
via faa11abaed21b60dcaa3e6438fde7c176f1445ba (commit)
via 8073b74f20e2b6d265368a3833b4dadb95709d9b (commit)
from a3c0a9935f7c8e6c52e04713ac5d99bb2677aa6f (commit)
- Log -----------------------------------------------------------------
commit fcb28593e87435a327ad25a5b9e838638821c877
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Aug 12 08:21:05 2011 -0400
In this context, field is really a column
commit 98773d55427388a13976e6a126c8fd94c214bfdc
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Aug 12 08:17:39 2011 -0400
Typo
commit 19b475694a073208391230a3ee54632b653b37db
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Aug 12 08:16:33 2011 -0400
Row is a better term for record
commit f45075db92b93192c78de2415feafdb9ecfe90be
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Aug 12 08:12:51 2011 -0400
Reword some doc
commit 70b664a3bd9820435d0a40fcaa4d090b6a30cc90
Merge: a3c0a99 3a672d4
Author: Marc Delisle <marc(a)infomarc.info>
Date: Fri Aug 12 08:01:31 2011 -0400
Merge commit '3a672d43b814dbf63276f4631eb0a4fa83a235c5'
commit 3a672d43b814dbf63276f4631eb0a4fa83a235c5
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Fri Aug 12 16:11:17 2011 +0800
Change the default MaxTableUiprefs to 100
commit 3f10465d71beb3b942da7a48fbc61fa65331dc8d
Merge: a24eeef 45aac8d
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Fri Aug 12 15:56:26 2011 +0800
Fix merge conflict with origin/master
commit a24eeef70c807e0980588120981a9559eb6acda5
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Fri Aug 12 15:53:30 2011 +0800
Only send column order and visibility when AjaxEnable is set to true
commit fe7eadab72e3f318986f36e47749364b2d3077dd
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Fri Aug 12 15:49:53 2011 +0800
Add configuration for maximum tbl_uiprefs records, as suggested by Piotr
commit faa11abaed21b60dcaa3e6438fde7c176f1445ba
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Fri Aug 12 11:56:51 2011 +0800
Fixed go to link text
commit 8073b74f20e2b6d265368a3833b4dadb95709d9b
Author: Aris Feryanto <aris_feryanto(a)yahoo.com>
Date: Fri Aug 12 11:30:25 2011 +0800
Added hint for grid editing feature when hovering 'Edit' link in each table rows
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 25 ++++++++++++++-------
js/makegrid.js | 43 ++++++++++++++++++++++++-------------
js/messages.php | 2 +
libraries/Table.class.php | 24 +++++++++++++++++++-
libraries/config.default.php | 13 +++++++++++
libraries/config/messages.inc.php | 2 +
libraries/config/setup.forms.php | 3 +-
scripts/create_tables.sql | 1 +
sql.php | 9 +++++++-
9 files changed, 96 insertions(+), 26 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 5195df9..8f7e66f 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1086,9 +1086,9 @@ ALTER TABLE `pma_column_comments`
</dt>
<dd>
Since release 3.5.0 phpMyAdmin can be configured to remember several things
- (table sorting
+ (sorted column
<a href="#cfg_RememberSorting" class="configrule">$cfg['RememberSorting']</a>
- , etc.) for browsing tables.
+ , column order, and column visibility from a database table) for browsing tables.
Without configuring the storage, these features still can be used,
but the values will disappear after you logout.<br/><br/>
@@ -1223,6 +1223,15 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
</ul>
</dd>
+ <dt><span id="cfg_Servers_MaxTableUiprefs">$cfg['Servers'][$i]['MaxTableUiprefs']</span> integer
+ </dt>
+ <dd>Maximum number of rows saved in <a
+ href="#cfg_Servers_table_uiprefs">$cfg['Servers'][$i]['table_uiprefs']</a> table.<br /><br />
+
+ When tables are dropped or renamed, table_uiprefs may contain invalid
+ data (referring to tables which no longer exist).<br />
+ We only keep this number of newest rows in table_uiprefs and automatically delete older rows.</dd>
+
<dt><span id="cfg_Servers_verbose_check">$cfg['Servers'][$i]['verbose_check']</span> boolean
</dt>
<dd>Because release 2.5.0 introduced the new MIME-transformation support, the
@@ -1636,7 +1645,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<dt id="cfg_ShowAll">$cfg['ShowAll'] boolean</dt>
<dd>Defines whether a user should be displayed a
- "show all (records)" button in browse mode or not.</dd>
+ "show all (rows)" button in browse mode or not.</dd>
<dt id="cfg_MaxRows">$cfg['MaxRows'] integer</dt>
<dd>Number of rows displayed when browsing a result set. If the result set
@@ -3230,7 +3239,7 @@ the <tt>mysql_upgrade</tt> command on the server.</p>
please upgrade to a plain revision.</p>
<h4 id="faq2_5">
- <a href="#faq2_5">2.5 Each time I want to insert or change a record or drop a database
+ <a href="#faq2_5">2.5 Each time I want to insert or change a row or drop a database
or a table, an error 404 (page not found) is displayed or, with <abbr title="HyperText Transfer Protocol">HTTP</abbr> or
cookie authentication, I'm asked to log in again. What's wrong?</a></h4>
@@ -3469,7 +3478,7 @@ have either the <a href="http://pecl.php.net/package/APC">APC</a> extension
can use it for the Edit and Delete links.</p>
<h4 id="faq3_11">
- <a href="#faq3_11">3.11 The number of records for InnoDB tables is not correct.</a></h4>
+ <a href="#faq3_11">3.11 The number of rows for InnoDB tables is not correct.</a></h4>
<p> phpMyAdmin uses a quick method to get the row count, and this method
only returns an approximate count in the case of InnoDB tables. See
@@ -5020,8 +5029,8 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai".
<li><a href="http://www.wikipedia.org/wiki/Field_%28computer_science%29">Field</a>
- one part of divided data/columns.</li>
<li><a href="http://www.wikipedia.org/wiki/Foreign_key">foreign key</a>
- - a field or group of fields in a database record that point to a key
- field or group of fields forming a key of another database record in some
+ - a column or group of columns in a database row that point to a key
+ column or group of columns forming a key of another database row in some
(usually different) table.</li>
<li><a href="http://www.fpdf.org/">FPDF (FreePDF)</a>
- the free PDF library</li>
@@ -5112,7 +5121,7 @@ Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai".
Internet technologies.</li>
<li><a href="http://www.ietf.org/rfc/rfc1952.txt">RFC 1952</a>
- GZIP file format specification version 4.3</li>
- <li><a href="http://www.wikipedia.org/wiki/Row_%28database%29">Row (record, tulpel)</a>
+ <li><a href="http://www.wikipedia.org/wiki/Row_%28database%29">Row (record, tuple)</a>
- represents a single, implicitly structured data item in a table.</li>
<li><a href="http://www.wikipedia.org/wiki/Server_%28computing%29">Server</a>
- a computer system that provides services to other computing
diff --git a/js/makegrid.js b/js/makegrid.js
index b8ca5fa..91fa8a5 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -353,22 +353,31 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
* Send column preferences (column order and visibility) to the server.
*/
sendColPrefs: function() {
- var post_params = {
- ajax_request: true,
- db: g.db,
- table: g.table,
- token: g.token,
- server: g.server,
- set_col_prefs: true,
- table_create_time: g.tableCreateTime
- };
- if (g.colOrder.length > 0) {
- $.extend(post_params, { col_order: g.colOrder.toString() });
- }
- if (g.colVisib.length > 0) {
- $.extend(post_params, { col_visib: g.colVisib.toString() });
+ if ($(g.t).is('.ajax')) { // only send preferences if AjaxEnable is true
+ var post_params = {
+ ajax_request: true,
+ db: g.db,
+ table: g.table,
+ token: g.token,
+ server: g.server,
+ set_col_prefs: true,
+ table_create_time: g.tableCreateTime
+ };
+ if (g.colOrder.length > 0) {
+ $.extend(post_params, { col_order: g.colOrder.toString() });
+ }
+ if (g.colVisib.length > 0) {
+ $.extend(post_params, { col_visib: g.colVisib.toString() });
+ }
+ $.post('sql.php', post_params, function(data) {
+ if (data.success != true) {
+ var $temp_div = $(document.createElement('div'));
+ $temp_div.html(data.error);
+ $temp_div.addClass("error");
+ PMA_ajaxShowMessage($temp_div);
+ }
+ });
}
- $.post('sql.php', post_params);
},
/**
@@ -1500,6 +1509,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
g.cellEditHint = PMA_messages['strCellEditHint'];
g.saveCellWarning = PMA_messages['strSaveCellWarning'];
g.alertNonUnique = PMA_messages['strAlertNonUnique'];
+ g.gotoLinkText = PMA_messages['strGoToLink'];
// initialize cell editing configuration
g.saveCellsAtOnce = $('#save_cells_at_once').val();
@@ -1560,6 +1570,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
// attach to global div
$(g.gDiv).append(g.cEdit);
+
+ // add hint for grid editing feature when hovering "Edit" link in each table row
+ PMA_createqTip($(g.t).find('.edit_row_anchor a'), PMA_messages['strGridEditFeatureHint']);
}
}
diff --git a/js/messages.php b/js/messages.php
index e032af7..63fb182 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -283,6 +283,8 @@ $js_messages['strColMarkHint'] = __('Click to mark/unmark');
$js_messages['strColVisibHint'] = __('Click the drop-down arrow<br />to toggle column\'s visibility');
$js_messages['strShowAllCol'] = __('Show all');
$js_messages['strAlertNonUnique'] = __('This table does not contain a unique column. Features related to the grid edit, checkbox, Edit, Copy and Delete links may not work after saving.');
+$js_messages['strGridEditFeatureHint'] = __('You can also edit most columns<br />by clicking directly on their content.');
+$js_messages['strGoToLink'] = __('Go to link');
/* password generation */
$js_messages['strGeneratePassword'] = __('Generate password');
diff --git a/libraries/Table.class.php b/libraries/Table.class.php
index 80ab727..87fb50a 100644
--- a/libraries/Table.class.php
+++ b/libraries/Table.class.php
@@ -1266,7 +1266,7 @@ class PMA_Table
" REPLACE INTO " . $pma_table .
" VALUES ('" . $username . "', '" . PMA_sqlAddSlashes($this->db_name) . "', '" .
PMA_sqlAddSlashes($this->name) . "', '" .
- PMA_sqlAddSlashes(json_encode($this->uiprefs)) . "')";
+ PMA_sqlAddSlashes(json_encode($this->uiprefs)) . "', NULL)";
$success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']);
@@ -1276,6 +1276,28 @@ class PMA_Table
$message->addMessage(PMA_Message::rawError(PMA_DBI_getError($GLOBALS['controllink'])));
return $message;
}
+
+ // Remove some old rows in table_uiprefs if it exceeds the configured maximum rows
+ $sql_query = 'SELECT COUNT(*) FROM ' . $pma_table;
+ $rows_count = PMA_DBI_fetch_value($sql_query);
+ $max_rows = $GLOBALS['cfg']['Server']['MaxTableUiprefs'];
+ if ($rows_count > $max_rows) {
+ $num_rows_to_delete = $rows_count - $max_rows;
+ $sql_query =
+ ' DELETE FROM ' . $pma_table .
+ ' ORDER BY last_update ASC' .
+ ' LIMIT ' . $num_rows_to_delete;
+ $success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']);
+
+ if (!$success) {
+ $message = PMA_Message::error(__('Failed to cleanup table UI preferences (see cfg["Server"]["MaxTableUiprefs"] documentation)'));
+ $message->addMessage('<br /><br />');
+ $message->addMessage(PMA_Message::rawError(PMA_DBI_getError($GLOBALS['controllink'])));
+ print_r($message);
+ return $message;
+ }
+ }
+
return true;
}
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 0568e2d..efb0cbb 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -378,6 +378,19 @@ $cfg['Servers'][$i]['tracking'] = '';
$cfg['Servers'][$i]['userconfig'] = '';
/**
+ * Maximum number of records saved in $cfg['Servers'][$i]['table_uiprefs'] table.
+ *
+ * In case where tables in databases is modified (e.g. dropped or renamed),
+ * table_uiprefs may contains invalid data (referring to tables which are not
+ * exist anymore).
+ * This configuration make sure that we only keep N (N = MaxTableUiprefs)
+ * newest record in table_uiprefs and automatically delete older records.
+ *
+ * @global integer $cfg['Servers'][$i]['userconfig'] = '';
+ */
+$cfg['Servers'][$i]['MaxTableUiprefs'] = 100;
+
+/**
* set to false if you know that your pma_* tables are up to date.
* This prevents compatibility checks and thereby increases performance.
*
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 6cb9f20..77f5370 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -395,6 +395,8 @@ $strConfigServers_history_name = __('SQL query history table');
$strConfigServers_host_desc = __('Hostname where MySQL server is running');
$strConfigServers_host_name = __('Server hostname');
$strConfigServers_LogoutURL_name = __('Logout URL');
+$strConfigServers_MaxTableUiprefs_desc = __('This configuration make sure that we only keep N (N = MaxTableUiprefs) newest record in "table_uiprefs" and automatically delete older records');
+$strConfigServers_MaxTableUiprefs_name = __('Maximum number of records saved in "table_uiprefs" table');
$strConfigServers_nopassword_desc = __('Try to connect without password');
$strConfigServers_nopassword_name = __('Connect without password');
$strConfigServers_only_db_desc = __('You can use MySQL wildcard characters (% and _), escape them if you want to use their literal instances, i.e. use [kbd]\'my\_db\'[/kbd] and not [kbd]\'my_db\'[/kbd]. Using this option you can sort database list, just enter their names in order and use [kbd]*[/kbd] at the end to show the rest in alphabetical order.');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 1ccb89f..8ab2874 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -78,7 +78,8 @@ $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array(
'tracking' => 'pma_tracking',
'table_coords' => 'pma_table_coords',
'pdf_pages' => 'pma_pdf_pages',
- 'designer_coords' => 'pma_designer_coords')));
+ 'designer_coords' => 'pma_designer_coords',
+ 'MaxTableUiprefs' => 100)));
$forms['Servers']['Server_tracking'] = array('Servers' => array(1 => array(
'tracking_version_auto_create',
'tracking_default_statements',
diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql
index 5db0de4..b0a5220 100644
--- a/scripts/create_tables.sql
+++ b/scripts/create_tables.sql
@@ -128,6 +128,7 @@ CREATE TABLE IF NOT EXISTS `pma_table_uiprefs` (
`db_name` varchar(64) NOT NULL,
`table_name` varchar(64) NOT NULL,
`prefs` text NOT NULL,
+ `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`username`,`db_name`,`table_name`)
)
ENGINE=MyISAM COMMENT='Tables'' UI preferences'
diff --git a/sql.php b/sql.php
index 1070bda..7e9c0f6 100644
--- a/sql.php
+++ b/sql.php
@@ -174,12 +174,19 @@ if (isset($_REQUEST['set_col_prefs']) && $_REQUEST['set_col_prefs'] == true) {
if (isset($_REQUEST['col_order'])) {
$col_order = explode(',', $_REQUEST['col_order']);
$retval = $pmatable->setUiProp(PMA_Table::PROP_COLUMN_ORDER, $col_order, $_REQUEST['table_create_time']);
+ if ($retval !== true) {
+ PMA_ajaxResponse($retval->getString(), false);
+ }
}
+
// set column visibility
if (isset($_REQUEST['col_visib'])) {
$col_visib = explode(',', $_REQUEST['col_visib']);
- $retval &= $pmatable->setUiProp(PMA_Table::PROP_COLUMN_VISIB, $col_visib, $_REQUEST['table_create_time']);
+ $retval = $pmatable->setUiProp(PMA_Table::PROP_COLUMN_VISIB, $col_visib, $_REQUEST['table_create_time']);
+ if ($retval !== true) {
+ PMA_ajaxResponse($retval->getString(), false);
+ }
}
PMA_ajaxResponse(NULL, ($retval == true));
hooks/post-receive
--
phpMyAdmin
1
0