[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14425-g7166723
by Michal Čihař 11 Aug '11
by Michal Čihař 11 Aug '11
11 Aug '11
The branch, master has been updated
via 7166723120a259dc9bd6a0ec6dfdd372c268f86b (commit)
from f81cf3fc42cbbed46465a639c15ce2256ef2f1ab (commit)
- Log -----------------------------------------------------------------
commit 7166723120a259dc9bd6a0ec6dfdd372c268f86b
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Thu Aug 11 13:48:07 2011 +0200
Update po generating scripts to include advisor rules
-----------------------------------------------------------------------
Summary of changes:
scripts/advisor2php | 13 +++++++++----
scripts/update-po | 9 ++++++++-
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/scripts/advisor2php b/scripts/advisor2php
index 5607f6e..28a5817 100644
--- a/scripts/advisor2php
+++ b/scripts/advisor2php
@@ -18,11 +18,16 @@ echo "/* This is automatically generated file from libraries/advisory_rules.txt
foreach($rules['rules'] as $rule) {
echo "\n";
- echo "echo __('" . $rule['name'] . "');\n";
- echo "echo __('" . $rule['issue'] . "');\n";
- echo "echo __('" . $rule['recommendation'] . "');\n";
+ echo "echo __('" . addslashes($rule['name']) . "');\n";
+ echo "echo __('" . addslashes($rule['issue']) . "');\n";
+ echo "echo __('" . addslashes($rule['recommendation']) . "');\n";
$jst = Advisor::splitJustification($rule);
- echo "echo __('" . $jst[0] . "');\n";
+ 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";
+ }
}
?>
diff --git a/scripts/update-po b/scripts/update-po
index a12e598..9131980 100755
--- a/scripts/update-po
+++ b/scripts/update-po
@@ -1,6 +1,11 @@
#!/bin/sh
# vim: expandtab sw=4 ts=4 sts=4:
export LC_ALL=C
+
+# Generate PHP code for advisor rules
+php ./scripts/advisor2php > po/advisory_rules.php
+
+# Update pot (template), ensure that advisor is at the end
LOCS=`ls po/*.po | sed 's@.*/\(.*\)\.po@\1@'`
xgettext \
-d phpmyadmin \
@@ -12,7 +17,8 @@ xgettext \
--debug \
--keyword=__ --keyword=_pgettext:1c,2 --keyword=_ngettext:1,2 \
--copyright-holder="phpMyAdmin devel team" \
- `find . -name '*.php' -not -path './test/*' | sort`
+ `find . -name '*.php' -not -path './test/*' -not -path './po/*' | sort` \
+ po/advisory_rules.php
ver=`sed -n "/PMA_VERSION', '/ s/.*PMA_VERSION', '\(.*\)'.*/\1/p" libraries/Config.class.php`
@@ -23,6 +29,7 @@ sed -i '
s/VERSION/'$ver'/;
' po/phpmyadmin.pot
+# Update po files (translations)
for loc in $LOCS ; do
sed -i '
s/SOME DESCRIPTIVE TITLE/phpMyAdmin translation/;
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14423-gf53800f
by Michal Čihař 11 Aug '11
by Michal Čihař 11 Aug '11
11 Aug '11
The branch, master has been updated
via f53800fb02dd7a1460ea8e934022b68053a5e9fe (commit)
via 71cb8b410c67f47885531aa1c34f23cada633b86 (commit)
via 66107c8dff29bc4fe20866f1badeacad6f02a202 (commit)
via 0e62172c7de5a46b985e45dfa8a8594acf222e14 (commit)
from 06bb1d9e9ed7c9cec93852e9fca92c664e0caca7 (commit)
- Log -----------------------------------------------------------------
commit f53800fb02dd7a1460ea8e934022b68053a5e9fe
Merge: 06bb1d9 71cb8b4
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Thu Aug 11 13:35:37 2011 +0200
Merge remote-tracking branch 'tyron/master'
commit 71cb8b410c67f47885531aa1c34f23cada633b86
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Aug 11 13:00:18 2011 +0300
Run advisor automatically after opening advisor tab
commit 66107c8dff29bc4fe20866f1badeacad6f02a202
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Aug 11 12:45:17 2011 +0300
Added a rule and notes about memcached as advised by Sheeri
commit 0e62172c7de5a46b985e45dfa8a8594acf222e14
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Thu Aug 11 12:44:25 2011 +0300
Forgot to move some code
-----------------------------------------------------------------------
Summary of changes:
js/server_status.js | 10 +++++++++-
libraries/advisory_rules.txt | 9 ++++++++-
server_status.php | 15 +++++++--------
3 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/js/server_status.js b/js/server_status.js
index d10c097..c798bd3 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -124,6 +124,14 @@ $(function() {
monitorLoaded = true;
}
+
+ // Run the advisor immediately when the user clicks the tab, but only when this is the first time
+ if (ui.tab.hash == '#statustabs_advisor' && $('table#rulesFired').length == 0) {
+ // Start with a small delay because the click event hasn't been setup yet
+ setTimeout(function() {
+ $('a[href="#startAnalyzer"]').trigger('click');
+ }, 25);
+ }
}
});
@@ -667,4 +675,4 @@ $(function() {
);
$('#emptyDialog').dialog({ buttons: btns });
}
-});
+});
\ No newline at end of file
diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt
index dbfa6f0..c440c46 100644
--- a/libraries/advisory_rules.txt
+++ b/libraries/advisory_rules.txt
@@ -124,9 +124,16 @@ rule 'Query cache disabled'
query_cache_size
value == 0 || query_cache_type == 'OFF' || query_cache_type == '0'
The query cache is not enabled.
- The query cache is known to greatly improve performance if configured correctly. Enable it by setting {query_cache_size} to a 2 digit MiB value and setting {query_cache_type} to 'ON'
+ The query cache is known to greatly improve performance if configured correctly. Enable it by setting {query_cache_size} to a 2 digit MiB value and setting {query_cache_type} to 'ON'. <b>Note:</b> If you are using memcached, ignore this recommendation.
query_cache_size is set to 0 or query_cache_type is set to 'OFF'
+rule 'memcached usage' [!fired('Query cache disabled')]
+ Questions / Uptime
+ value > 100
+ Suboptimal caching method.
+ You are using the MySQL Query cache with a fairly high traffic database. It might be worth considering to use <a href="http://dev.mysql.com/doc/refman/5.1/en/ha-memcached.html">memcached</a> instead of the MySQL Query cache, especially if you have multiple slaves.
+ 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. | round(value,1)
+
rule 'Query cache efficiency (%)' [Com_select + Qcache_hits > 0 && !fired('Query cache disabled')]
Qcache_hits / (Com_select + Qcache_hits) * 100
value < 20
diff --git a/server_status.php b/server_status.php
index a03db31..7517362 100644
--- a/server_status.php
+++ b/server_status.php
@@ -594,6 +594,12 @@ if (isset($_REQUEST['show']) && isset($_REQUEST['ajax_request'])) {
}
}
+$server = 1;
+if (isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']);
+
+$server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost'
+ || $cfg['Servers'][$server]['host'] == '127.0.0.1'
+ || $cfg['Servers'][$server]['host'] == '::1';
PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" .
'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n" .
@@ -620,13 +626,6 @@ require './libraries/server_common.inc.php';
*/
require './libraries/server_links.inc.php';
-$server = 1;
-if (isset($_REQUEST['server']) && intval($_REQUEST['server'])) $server = intval($_REQUEST['server']);
-
-$server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost'
- || $cfg['Servers'][$server]['host'] == '127.0.0.1'
- || $cfg['Servers'][$server]['host'] == '::1';
-
?>
<div id="serverstatus">
<h2><?php
@@ -1620,4 +1619,4 @@ function cleanDeprecated(&$server_status)
* Sends the footer
*/
require './libraries/footer.inc.php';
-?>
+?>
\ No newline at end of file
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14419-g06bb1d9
by Michal Čihař 11 Aug '11
by Michal Čihař 11 Aug '11
11 Aug '11
The branch, master has been updated
via 06bb1d9e9ed7c9cec93852e9fca92c664e0caca7 (commit)
via ad488d9d1c1d771a7d4a7a87467502f85465a432 (commit)
from ac1d116c1ccf547e50f36dd622c47220a649c4e4 (commit)
- Log -----------------------------------------------------------------
commit 06bb1d9e9ed7c9cec93852e9fca92c664e0caca7
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Thu Aug 11 11:57:46 2011 +0200
Convertor of advisor rules to PHP for gettext use
commit ad488d9d1c1d771a7d4a7a87467502f85465a432
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Thu Aug 11 11:56:55 2011 +0200
Factor out justification splitting
-----------------------------------------------------------------------
Summary of changes:
libraries/advisor.class.php | 16 ++++++++++++++--
scripts/advisor2php | 28 ++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 2 deletions(-)
create mode 100644 scripts/advisor2php
diff --git a/libraries/advisor.class.php b/libraries/advisor.class.php
index df7178e..bea2aca 100644
--- a/libraries/advisor.class.php
+++ b/libraries/advisor.class.php
@@ -81,14 +81,26 @@ class Advisor
return true;
}
+ /**
+ * 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]);
+ return array($jst[0], $jst[1]);
+ }
+ return array($rule['justification']);
+ }
+
// Adds a rule to the result list
function addRule($type, $rule) {
switch($type) {
case 'notfired':
case 'fired':
- $jst = preg_split('/\s*\|\s*/',$rule['justification'],2);
+ $jst = Advisor::splitJustification($rule['justification']);
if(count($jst) > 1) {
- $jst[0] = preg_replace('/%( |,|\.|$)/','%%\1',$jst[0]);
try {
$str = $this->ruleExprEvaluate(
'sprintf("'.$jst[0].'",'.$jst[1].')',
diff --git a/scripts/advisor2php b/scripts/advisor2php
new file mode 100644
index 0000000..5607f6e
--- /dev/null
+++ b/scripts/advisor2php
@@ -0,0 +1,28 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4 ft=php: */
+/**
+ * Script to parse advisor rules and output them as PHP code which can be used
+ * by gettext for generating po(t) files.
+ */
+
+if (!file_exists('./libraries/advisor.class.php')) {
+ chdir('..');
+}
+include './libraries/advisor.class.php';
+
+$rules = Advisor::parseRulesFile();
+
+echo "<?php\n";
+echo "/* DO NOT EDIT! */\n";
+echo "/* This is automatically generated file from libraries/advisory_rules.txt */\n";
+
+foreach($rules['rules'] as $rule) {
+ echo "\n";
+ echo "echo __('" . $rule['name'] . "');\n";
+ echo "echo __('" . $rule['issue'] . "');\n";
+ echo "echo __('" . $rule['recommendation'] . "');\n";
+ $jst = Advisor::splitJustification($rule);
+ echo "echo __('" . $jst[0] . "');\n";
+}
+
+?>
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14417-gac1d116
by Michal Čihař 11 Aug '11
by Michal Čihař 11 Aug '11
11 Aug '11
The branch, master has been updated
via ac1d116c1ccf547e50f36dd622c47220a649c4e4 (commit)
via b500503e5a904f11385d24178feff5c30d7cc2c2 (commit)
via 9718c45cfe3c2c673d5dd2c3fb0367bc4a4e4bac (commit)
via b6f52f19fbe2b56655bf007502c1b54249342193 (commit)
via e21b40149849fc2935942c65ec0a0148ef44b47d (commit)
via 42b78821d575df302f1008d6e35a455ec781d9ca (commit)
via b23fe235cd67e55329ae707d24629160b26f6b31 (commit)
via ce928967c496ce0e208148473b8347f2162680b6 (commit)
via 4c40208cd87d646d0315fccd9cc55b13c5360819 (commit)
via 4ba16b2bb8903395f2b8ae38b656de3bdee47fbb (commit)
via edb293712c45960d8e1b007d6b24bb6f37f4c5e0 (commit)
via ca574d7bbe1d2d222e04f87fe95501bda1794e23 (commit)
via e0b9b32e1211ecfa865f453545825a19ac295a85 (commit)
via 8133364f8d1704ac98b385fd54f4e34839cd5aa1 (commit)
via 03bbae9bb0d2faf3a7efeb9f9037a2c075b7c300 (commit)
via c03b5fa192cf04210356165be04381a74793c242 (commit)
via 0c594956f889ac17da1aeba999104d09f7bee05d (commit)
via b28dbd594c8371a4006f90629a98649e3b309e36 (commit)
via 41104f561ca451f4d70764cd905c6a2574bffa11 (commit)
via 91f0c6a9e9f5e0367c1a14e85321492ae5b86cbd (commit)
from 490d11fedae1f44237a4b0b9fa41e45220875953 (commit)
- Log -----------------------------------------------------------------
commit ac1d116c1ccf547e50f36dd622c47220a649c4e4
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:38:00 2011 +0200
Translation update done using Pootle.
commit b500503e5a904f11385d24178feff5c30d7cc2c2
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:37:56 2011 +0200
Translation update done using Pootle.
commit 9718c45cfe3c2c673d5dd2c3fb0367bc4a4e4bac
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:37:47 2011 +0200
Translation update done using Pootle.
commit b6f52f19fbe2b56655bf007502c1b54249342193
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:37:40 2011 +0200
Translation update done using Pootle.
commit e21b40149849fc2935942c65ec0a0148ef44b47d
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:37:31 2011 +0200
Translation update done using Pootle.
commit 42b78821d575df302f1008d6e35a455ec781d9ca
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:37:25 2011 +0200
Translation update done using Pootle.
commit b23fe235cd67e55329ae707d24629160b26f6b31
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:37:06 2011 +0200
Translation update done using Pootle.
commit ce928967c496ce0e208148473b8347f2162680b6
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:36:55 2011 +0200
Translation update done using Pootle.
commit 4c40208cd87d646d0315fccd9cc55b13c5360819
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:36:36 2011 +0200
Translation update done using Pootle.
commit 4ba16b2bb8903395f2b8ae38b656de3bdee47fbb
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:36:22 2011 +0200
Translation update done using Pootle.
commit edb293712c45960d8e1b007d6b24bb6f37f4c5e0
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:36:04 2011 +0200
Translation update done using Pootle.
commit ca574d7bbe1d2d222e04f87fe95501bda1794e23
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:36:00 2011 +0200
Translation update done using Pootle.
commit e0b9b32e1211ecfa865f453545825a19ac295a85
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:35:48 2011 +0200
Translation update done using Pootle.
commit 8133364f8d1704ac98b385fd54f4e34839cd5aa1
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:35:42 2011 +0200
Translation update done using Pootle.
commit 03bbae9bb0d2faf3a7efeb9f9037a2c075b7c300
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:35:28 2011 +0200
Translation update done using Pootle.
commit c03b5fa192cf04210356165be04381a74793c242
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:35:23 2011 +0200
Translation update done using Pootle.
commit 0c594956f889ac17da1aeba999104d09f7bee05d
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:35:19 2011 +0200
Translation update done using Pootle.
commit b28dbd594c8371a4006f90629a98649e3b309e36
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:35:07 2011 +0200
Translation update done using Pootle.
commit 41104f561ca451f4d70764cd905c6a2574bffa11
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:34:58 2011 +0200
Translation update done using Pootle.
commit 91f0c6a9e9f5e0367c1a14e85321492ae5b86cbd
Author: Michal Čihař <michal(a)cihar.com>
Date: Thu Aug 11 11:34:50 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 53 +++++++++++++++++++++--------------------------------
1 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index 79265b1..4b5cfc9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,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-11 11:31+0200\n"
-"PO-Revision-Date: 2011-08-10 13:53+0200\n"
+"PO-Revision-Date: 2011-08-11 11:38+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
"Language: cs\n"
@@ -1443,6 +1443,8 @@ msgid ""
"Failed building chart grid with imported config. Resetting to default "
"config..."
msgstr ""
+"Selhalo vytvoření grafu z importované konfigurace. Používám místo ní výchozí "
+"nastavení."
#: js/messages.php:183 libraries/config/messages.inc.php:170
#: libraries/db_links.inc.php:83 libraries/server_links.inc.php:69
@@ -1452,50 +1454,45 @@ msgid "Import"
msgstr "Import"
#: js/messages.php:185
-#, fuzzy
#| msgid "Update Query"
msgid "Analyse Query"
-msgstr "Aktualizovat dotaz"
+msgstr "Analyzovat dotaz"
#: js/messages.php:189
-#, fuzzy
#| msgid "Advisor"
msgid "Advisor system"
msgstr "Poradce"
#: js/messages.php:190
msgid "Possible performance issues"
-msgstr ""
+msgstr "Možné výkonostní problémy"
#: js/messages.php:191
msgid "Issue"
-msgstr ""
+msgstr "Problém"
#: js/messages.php:192
-#, fuzzy
#| msgid "Documentation"
msgid "Recommendation"
-msgstr "Dokumentace"
+msgstr "Doporučení"
#: js/messages.php:193
-#, fuzzy
#| msgid "Details"
msgid "Rule details"
-msgstr "Podrobnosti"
+msgstr "Podrobnosti o pravidle"
#: js/messages.php:194
-#, fuzzy
#| msgid "Authentication"
msgid "Justification"
-msgstr "Přihlašování"
+msgstr "Zdůvodnění"
#: js/messages.php:195
msgid "Used variable / formula"
-msgstr ""
+msgstr "Použitá proměnná / vzorec"
#: js/messages.php:196
msgid "Test"
-msgstr ""
+msgstr "Test"
#: js/messages.php:201 libraries/tbl_properties.inc.php:763
#: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -1673,7 +1670,7 @@ msgstr "Přidat paramer pro sloupec "
#: js/messages.php:271
msgid "Press escape to cancel editing"
-msgstr ""
+msgstr "Klávesou Esc ukončíte editaci"
#: js/messages.php:272
msgid ""
@@ -2127,10 +2124,9 @@ msgstr[1] "Vloženy %1$d řádky."
msgstr[2] "Vloženo %1$d řádek."
#: libraries/PDF.class.php:81
-#, fuzzy
#| msgid "Error reading data:"
msgid "Error while creating PDF:"
-msgstr "Chyba při čtení dat:"
+msgstr "Chyba při vytváření PDF::"
#: libraries/RecentTable.class.php:107
msgid "Could not save recent table"
@@ -4006,10 +4002,9 @@ msgid "Memory limit"
msgstr "Omezení paměti"
#: 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 "Jedná se o odkazy Upravit, Upravit zde, Kopírovat a Odstranit"
+msgstr "Jedná se o odkazy Upravit, Kopírovat a Odstranit"
#: libraries/config/messages.inc.php:320
msgid "Where to show the table row links"
@@ -4164,7 +4159,7 @@ msgstr "Zobrazit ikonu pro nápovědu"
#: libraries/config/messages.inc.php:357
msgid "Save all edited cells at once"
-msgstr ""
+msgstr "Uložit všechny upravené buňky najednou"
#: libraries/config/messages.inc.php:358
msgid "Directory where exports can be saved on server"
@@ -4690,16 +4685,14 @@ msgid "Show function fields"
msgstr "Zobrazit seznam fukncí"
#: libraries/config/messages.inc.php:460
-#, fuzzy
#| msgid "Where to show the table row links"
msgid "Whether to show hint or not"
-msgstr "Kde zobrazit odkazy s akcemi při procházení"
+msgstr "Zda zobrazit nápovědu nebo ne"
#: libraries/config/messages.inc.php:461
-#, fuzzy
#| msgid "Show indexes"
msgid "Show hint"
-msgstr "Zobrazit indexy"
+msgstr "Zobrazit nápovědu"
#: libraries/config/messages.inc.php:462
msgid ""
@@ -5429,10 +5422,9 @@ msgid "Language"
msgstr "Jazyk"
#: libraries/display_tbl.lib.php:401
-#, fuzzy
#| msgid "Save directory"
msgid "Save edited data"
-msgstr "Adresář pro ukládání"
+msgstr "Uložit upravovaná data"
#: libraries/display_tbl.lib.php:407
msgid "Restore column order"
@@ -8122,10 +8114,9 @@ msgid "No databases"
msgstr "Žádné databáze"
#: navigation.php:270
-#, fuzzy
#| msgid "filter tables by name"
msgid "Filter tables by name"
-msgstr "filtrovat tabulky podle jména"
+msgstr "Filtrovat tabulky podle jména"
#: navigation.php:303 navigation.php:304
msgctxt "short form"
@@ -9197,16 +9188,14 @@ msgid "Related links:"
msgstr "Související odkazy:"
#: server_status.php:759
-#, fuzzy
#| msgid "Query analyzer"
msgid "Run analyzer"
-msgstr "Analýza dotazu"
+msgstr "Spustit analýzu"
#: server_status.php:760
-#, fuzzy
#| msgid "Introduction"
msgid "Instructions"
-msgstr "Úvod"
+msgstr "Návod"
#: server_status.php:765
msgid ""
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14396-g0829162
by Michal Čihař 11 Aug '11
by Michal Čihař 11 Aug '11
11 Aug '11
The branch, master has been updated
via 0829162550764de8890bb0e24ec53f89b480c1ef (commit)
via 5caaf0ed2998377c3b9df2016b87fd9baa9adf90 (commit)
via ad99bc70e5acf149b34a4c330918b7e2bbaf14e0 (commit)
via 19469fb44f155d5e5ba54f10a952a4d1ddd106c6 (commit)
via f677136ef90cb6ecd34ce1a0323396df42aeac40 (commit)
via e4924833c71a8cc4e55d7291fa826653d7d4504f (commit)
via 03a76e2c74aba8964e9541ee436e77549a3afe21 (commit)
via f10a0bd1ca60030bb922342d8814ea0b89ab90a5 (commit)
via 82a1f9c033e49bd7e00d006ae0b74289b5907ad5 (commit)
via 0466ac320b284f98678b416a4aa2e14e9a1db27d (commit)
via 949bd599dcde04871e5bd6dd496dd29ba6d8563f (commit)
via d257c39339005c3cdf93df949c815149e672782f (commit)
via 44eac8a5a9a75f32b09ed07c03d04a2cec0a2c64 (commit)
via ce8b3cbda059a1ea4648c5b80917b3852fcd02a9 (commit)
via 8cdfa37d461770a9605a6d37cf07733bb7ae1bc0 (commit)
via cf95fbdcb5ceeab4a916f087967a798b76001b31 (commit)
via 09fdda813176f660be9971fe4cb584cec7e1cd16 (commit)
via 7e22620ec2a55673ac71184754284df0a98fc57f (commit)
via 666732baf2a77178f90497ce77db5ba68b7f2c69 (commit)
via e6e7e893bd2ca56c2eb756351e54e00f1b44bb1f (commit)
via 81d7a95f7428ae3eb1c5a52ec0d32e6cc6e067c0 (commit)
via 8906aab33f69fde22dea02d734c3a7b377ed99c0 (commit)
via f4afe963b6407c6815d4511ae7e3f06f367778d6 (commit)
from f09b391bfdee6da14328d129187fe3dbf3147995 (commit)
- Log -----------------------------------------------------------------
commit 0829162550764de8890bb0e24ec53f89b480c1ef
Merge: f09b391 5caaf0e
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Thu Aug 11 11:25:18 2011 +0200
Merge remote-tracking branch 'tyron/master' into integration
Conflicts:
js/functions.js
commit 5caaf0ed2998377c3b9df2016b87fd9baa9adf90
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Wed Aug 10 13:01:00 2011 +0300
more code cleanup
commit ad99bc70e5acf149b34a4c330918b7e2bbaf14e0
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Wed Aug 10 11:26:38 2011 +0300
code style improvements
commit 19469fb44f155d5e5ba54f10a952a4d1ddd106c6
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Wed Aug 10 11:26:07 2011 +0300
added system_ memory variable
commit f677136ef90cb6ecd34ce1a0323396df42aeac40
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Wed Aug 10 10:52:14 2011 +0300
Fixes IE gradients being in every single row
commit e4924833c71a8cc4e55d7291fa826653d7d4504f
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Wed Aug 10 10:51:42 2011 +0300
Load flashcanvas.js only for IE version below 9
commit 03a76e2c74aba8964e9541ee436e77549a3afe21
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Tue Aug 9 22:51:17 2011 +0300
Lots of codestyle cleanup + 1 bugfix for query analyzer
commit f10a0bd1ca60030bb922342d8814ea0b89ab90a5
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Tue Aug 9 10:36:18 2011 +0300
adjusted to PMA_AddJSCode()
commit 82a1f9c033e49bd7e00d006ae0b74289b5907ad5
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Tue Aug 9 10:35:53 2011 +0300
addded PMA_AddJSCode() to load js code into the page header
commit 0466ac320b284f98678b416a4aa2e14e9a1db27d
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Mon Aug 8 17:11:22 2011 +0300
fix on dynamic monitor loading
commit 949bd599dcde04871e5bd6dd496dd29ba6d8563f
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Mon Aug 8 17:01:52 2011 +0300
Merge l10n string
commit d257c39339005c3cdf93df949c815149e672782f
Merge: 44eac8a f16efa1
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Mon Aug 8 16:58:35 2011 +0300
Merge remote-tracking branch 'origin/master'
commit 44eac8a5a9a75f32b09ed07c03d04a2cec0a2c64
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Mon Aug 8 16:38:41 2011 +0300
change overwritten by previous merge
commit ce8b3cbda059a1ea4648c5b80917b3852fcd02a9
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Mon Aug 8 16:35:33 2011 +0300
removed trailing commas from arrays
commit 8cdfa37d461770a9605a6d37cf07733bb7ae1bc0
Merge: cf95fbd 79df749
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Mon Aug 8 16:35:10 2011 +0300
Merge remote-tracking branch 'origin/master'
Conflicts:
js/functions.js
js/server_status.js
js/server_variables.js
libraries/advisory_rules.txt
server_status.php
commit cf95fbdcb5ceeab4a916f087967a798b76001b31
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Mon Aug 8 16:16:53 2011 +0300
server status page using new qtip function
commit 09fdda813176f660be9971fe4cb584cec7e1cd16
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Mon Aug 8 16:15:35 2011 +0300
- Moved style info from PMA_createQtip() into theme_right.css.php
- Adjusted style to look more like the tooltips we had originally
- Removed dHint class
commit 7e22620ec2a55673ac71184754284df0a98fc57f
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Mon Aug 8 14:13:50 2011 +0300
added mysql < 5.5.8 check
commit 666732baf2a77178f90497ce77db5ba68b7f2c69
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Mon Aug 8 14:05:55 2011 +0300
- Merged rgbcolor.js into canvg.js
- Status monitor now loads on demand (when tab is clicked)
commit e6e7e893bd2ca56c2eb756351e54e00f1b44bb1f
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Fri Aug 5 18:44:20 2011 +0300
Fixed version checks better
commit 81d7a95f7428ae3eb1c5a52ec0d32e6cc6e067c0
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Fri Aug 5 18:41:11 2011 +0300
Fixed db version checks
commit 8906aab33f69fde22dea02d734c3a7b377ed99c0
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Fri Aug 5 18:18:18 2011 +0300
Advisor: Variable names redirect to the variable on the variables page
commit f4afe963b6407c6815d4511ae7e3f06f367778d6
Author: Tyron Madlener <tyronx(a)gmail.com>
Date: Fri Aug 5 15:50:06 2011 +0300
Advisor:
- l10n in php/js code
- code style improvements
- ui style improvements
- syntax/run errors in advisory_rules.txt are now displayed in advisor tab
-----------------------------------------------------------------------
Summary of changes:
js/canvg/canvg.js | 288 +++
js/canvg/rgbcolor.js | 288 ---
js/functions.js | 28 +-
js/messages.php | 15 +-
js/server_status.js | 1986 +++------------------
js/{server_status.js => server_status_monitor.js} | 1669 ++++++-----------
js/server_variables.js | 199 ++-
libraries/{advisor.lib.php => advisor.class.php} | 64 +-
libraries/advisory_rules.txt | 30 +-
libraries/common.inc.php | 7 +
libraries/core.lib.php | 11 +
libraries/header_scripts.inc.php | 7 +-
server_status.php | 113 +-
server_variables.php | 47 +-
sql.php | 5 +-
tbl_chart.php | 5 +-
themes/original/css/theme_right.css.php | 42 +-
themes/pmahomme/css/theme_right.css.php | 43 +-
18 files changed, 1455 insertions(+), 3392 deletions(-)
delete mode 100644 js/canvg/rgbcolor.js
copy js/{server_status.js => server_status_monitor.js} (52%)
rename libraries/{advisor.lib.php => advisor.class.php} (77%)
diff --git a/js/canvg/canvg.js b/js/canvg/canvg.js
index 7b7e963..19a47a7 100644
--- a/js/canvg/canvg.js
+++ b/js/canvg/canvg.js
@@ -2414,4 +2414,292 @@ if (CanvasRenderingContext2D) {
scaleHeight: dh
});
}
+}
+
+/**
+ * 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;
+
+ }
+
}
\ No newline at end of file
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/js/functions.js b/js/functions.js
index 4447a4b..58ad805 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3037,7 +3037,7 @@ $(document).ready(function() {
*/
$(document).ready(function() {
var elm = $('#sqlquery');
- if (elm.length > 0) {
+ if (elm.length > 0 && typeof CodeMirror != 'undefined') {
codemirror_editor = CodeMirror.fromTextArea(elm[0], {lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql"});
}
});
@@ -3081,33 +3081,32 @@ function PMA_createqTip($elements, content, options)
if ($('#no_hint').length > 0) {
return;
}
+
var o = {
content: content,
style: {
- background: '#333',
- border: {
- radius: 5
+ classes: {
+ tooltip: 'normalqTip',
+ content: 'normalqTipContent'
},
- fontSize: '0.8em',
- padding: '0 0.5em',
name: 'dark'
},
position: {
target: 'mouse',
corner: { target: 'rightMiddle', tooltip: 'leftMiddle' },
- adjust: { x: 20 }
+ adjust: { x: 10, y: 20 }
},
show: {
delay: 0,
effect: {
type: 'grow',
- length: 100
+ length: 150
}
},
hide: {
effect: {
type: 'grow',
- length: 150
+ length: 200
}
}
}
@@ -3130,6 +3129,17 @@ function PMA_getCellValue(td) {
}
}
+/* Loads a js file, an array may be passed as well */
+loadJavascript=function(file) {
+ if($.isArray(file)) {
+ for(var i=0; i<file.length; i++) {
+ $('head').append('<script type="text/javascript" src="'+file[i]+'"></script>');
+ }
+ } else {
+ $('head').append('<script type="text/javascript" src="'+file+'"></script>');
+ }
+}
+
$(document).ready(function() {
/**
* Theme selector.
diff --git a/js/messages.php b/js/messages.php
index c941b1c..62950be 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -62,7 +62,6 @@ $js_messages['strClose'] = __('Close');
/* for server_status.js */
$js_messages['strEdit'] = __('Edit');
-
$js_messages['strLiveTrafficChart'] = __('Live traffic chart');
$js_messages['strLiveConnChart'] = __('Live conn./process chart');
$js_messages['strLiveQueryChart'] = __('Live query chart');
@@ -183,6 +182,20 @@ $js_messages['strFailedParsingConfig'] = __('Failed parsing config file. It does
$js_messages['strFailedBuildingGrid'] = __('Failed building chart grid with imported config. Resetting to default config...');
$js_messages['strImport'] = __('Import');
+$js_messages['strAnalyzeQuery'] = __('Analyse Query');
+
+/* Server status advisor */
+
+$js_messages['strAdvisorSystem'] = __('Advisor system');
+$js_messages['strPerformanceIssues'] = __('Possible performance issues');
+$js_messages['strIssuse'] = __('Issue');
+$js_messages['strRecommendation'] = __('Recommendation');
+$js_messages['strRuleDetails'] = __('Rule details');
+$js_messages['strJustification'] = __('Justification');
+$js_messages['strFormula'] = __('Used variable / formula');
+$js_messages['strTest'] = __('Test');
+
+
/* For inline query editing */
$js_messages['strGo'] = __('Go');
$js_messages['strCancel'] = __('Cancel');
diff --git a/js/server_status.js b/js/server_status.js
index 5abb5df..d10c097 100644
--- a/js/server_status.js
+++ b/js/server_status.js
@@ -22,8 +22,8 @@ $(function() {
},
format: function(s) {
var num = jQuery.tablesorter.formatFloat(
- s.replace(PMA_messages['strThousandsSeperator'],'')
- .replace(PMA_messages['strDecimalSeperator'],'.')
+ s.replace(PMA_messages['strThousandsSeperator'], '')
+ .replace(PMA_messages['strDecimalSeperator'], '.')
);
var factor = 1;
@@ -36,7 +36,7 @@ $(function() {
case 'T': factor = 12; break;
}
- return num * Math.pow(10,factor);
+ return num * Math.pow(10, factor);
},
type: "numeric"
});
@@ -60,20 +60,26 @@ $(function() {
var pos = $(this).offset();
// Hide if the mouseclick is outside the popupcontent
- if(event.pageX < pos.left || event.pageY < pos.top || event.pageX > pos.left + $cnt.outerWidth() || event.pageY > pos.top + $cnt.outerHeight())
+ if (event.pageX < pos.left
+ || event.pageY < pos.top
+ || event.pageX > pos.left + $cnt.outerWidth()
+ || event.pageY > pos.top + $cnt.outerHeight()
+ ) {
$cnt.hide().removeClass('openedPopup');
+ }
});
});
});
$(function() {
// Filters for status variables
- var textFilter=null;
+ var textFilter = null;
var alertFilter = false;
- var categoryFilter='';
- var odd_row=false;
- var text=''; // Holds filter text
+ var categoryFilter = '';
+ var odd_row = false;
+ var text = ''; // Holds filter text
var queryPieChart = null;
+ var monitorLoaded = false;
/* Chart configuration */
// Defines what the tabs are currently displaying (realtime or data)
@@ -81,39 +87,8 @@ $(function() {
// Holds the current chart instances for each tab
var tabChart = new Object();
-
/*** Table sort tooltip ***/
-
- var $tableSortHint = $('<div class="dHint" style="display:none;">' + 'Click to sort' + '</div>');
- $('body').append($tableSortHint);
-
- $('table.sortable thead th').live('mouseover mouseout',function(e) {
- if(e.type == 'mouseover') {
- $tableSortHint
- .stop(true, true)
- .css({
- top: e.clientY + 15,
- left: e.clientX + 15
- })
- .show('fast')
- .data('shown',true);
- } else {
- $tableSortHint
- .stop(true, true)
- .hide(300,function() {
- $(this).data('shown',false);
- });
- }
- });
-
- $(document).mousemove(function(e) {
- if($tableSortHint.data('shown') == true)
- $tableSortHint.css({
- top: e.clientY + 15,
- left: e.clientX + 15
- })
- });
-
+ PMA_createqTip($('table.sortable thead th'), PMA_messages['strSortHint']);
// Tell highcarts not to use UTC dates (global setting)
Highcharts.setOptions({
@@ -123,15 +98,33 @@ $(function() {
});
$.ajaxSetup({
- cache:false
+ cache: false
});
// Add tabs
$('#serverStatusTabs').tabs({
// Tab persistence
cookie: { name: 'pma_serverStatusTabs', expires: 1 },
- // Fixes line break in the menu bar when the page overflows and scrollbar appears
- show: function() { menuResize(); }
+ show: function(event, ui) {
+ // Fixes line break in the menu bar when the page overflows and scrollbar appears
+ menuResize();
+ // Load Server status monitor
+ if (ui.tab.hash == '#statustabs_charting' && ! monitorLoaded) {
+ $('div#statustabs_charting').append(
+ '<img class="ajaxIcon" id="loadingMonitorIcon" src="' +
+ pmaThemeImage + 'ajax_clock_small.gif" alt="">'
+ );
+ // Delay loading a bit so the tab loads and the user gets to see a ajax loading icon
+ setTimeout(function() {
+ loadJavascript(['js/jquery/timepicker.js', 'js/jquery/jquery.json-2.2.js',
+ 'js/jquery/jquery.sprintf.js', 'js/jquery/jquery.sortableTable.js',
+ 'js/codemirror/lib/codemirror.js', 'js/codemirror/mode/mysql/mysql.js',
+ 'js/server_status_monitor.js']);
+ }, 50);
+
+ monitorLoaded = true;
+ }
+ }
});
// Fixes wrong tab height with floated elements. See also http://bugs.jqueryui.com/ticket/5601
@@ -139,7 +132,7 @@ $(function() {
// Initialize each tab
$('div.ui-tabs-panel').each(function() {
- initTab($(this),null);
+ initTab($(this), null);
tabStatus[$(this).attr('id')] = 'static';
});
@@ -148,12 +141,13 @@ $(function() {
// Handles refresh rate changing
$('.buttonlinks select').change(function() {
- var chart=tabChart[$(this).parents('div.ui-tabs-panel').attr('id')];
+ var chart = tabChart[$(this).parents('div.ui-tabs-panel').attr('id')];
// Clear current timeout and set timeout with the new refresh rate
clearTimeout(chart_activeTimeouts[chart.options.chart.renderTo]);
- if(chart.options.realtime.postRequest)
+ if (chart.options.realtime.postRequest) {
chart.options.realtime.postRequest.abort();
+ }
chart.options.realtime.refreshRate = 1000*parseInt(this.value);
@@ -172,18 +166,18 @@ $(function() {
// Ajax refresh of variables (always the first element in each tab)
$('.buttonlinks a.tabRefresh').click(function() {
// ui-tabs-panel class is added by the jquery tabs feature
- var tab=$(this).parents('div.ui-tabs-panel');
+ var tab = $(this).parents('div.ui-tabs-panel');
var that = this;
// Show ajax load icon
$(this).find('img').show();
- $.get($(this).attr('href'),{ajax_request:1},function(data) {
+ $.get($(this).attr('href'), { ajax_request: 1 }, function(data) {
$(that).find('img').hide();
- initTab(tab,data);
+ initTab(tab, data);
});
- tabStatus[tab.attr('id')]='data';
+ tabStatus[tab.attr('id')] = 'data';
return false;
});
@@ -194,20 +188,22 @@ $(function() {
// Live traffic charting
$('.buttonlinks a.livetrafficLink').click(function() {
// ui-tabs-panel class is added by the jquery tabs feature
- var $tab=$(this).parents('div.ui-tabs-panel');
+ var $tab = $(this).parents('div.ui-tabs-panel');
var tabstat = tabStatus[$tab.attr('id')];
- if(tabstat=='static' || tabstat=='liveconnections') {
+ if (tabstat == 'static' || tabstat == 'liveconnections') {
var settings = {
series: [
{ name: PMA_messages['strChartKBSent'], data: [] },
{ name: PMA_messages['strChartKBReceived'], data: [] }
],
title: { text: PMA_messages['strChartServerTraffic'] },
- realtime: { url:'server_status.php?' + url_query,
+ realtime: { url: 'server_status.php?' + url_query,
type: 'traffic',
callback: function(chartObj, curVal, lastVal, numLoadedPoints) {
- if(lastVal==null) return;
+ if (lastVal == null) {
+ return;
+ }
chartObj.series[0].addPoint(
{ x: curVal.x, y: (curVal.y_sent - lastVal.y_sent) / 1024 },
false,
@@ -223,13 +219,14 @@ $(function() {
}
}
- setupLiveChart($tab,this,settings);
- if(tabstat == 'liveconnections')
+ setupLiveChart($tab, this, settings);
+ if (tabstat == 'liveconnections') {
$tab.find('.buttonlinks a.liveconnectionsLink').html(PMA_messages['strLiveConnChart']);
- tabStatus[$tab.attr('id')]='livetraffic';
+ }
+ tabStatus[$tab.attr('id')] = 'livetraffic';
} else {
$(this).html(PMA_messages['strLiveTrafficChart']);
- setupLiveChart($tab,this,null);
+ setupLiveChart($tab, this, null);
}
return false;
@@ -237,20 +234,22 @@ $(function() {
// Live connection/process charting
$('.buttonlinks a.liveconnectionsLink').click(function() {
- var $tab=$(this).parents('div.ui-tabs-panel');
+ var $tab = $(this).parents('div.ui-tabs-panel');
var tabstat = tabStatus[$tab.attr('id')];
- if(tabstat == 'static' || tabstat == 'livetraffic') {
+ if (tabstat == 'static' || tabstat == 'livetraffic') {
var settings = {
series: [
{ name: PMA_messages['strChartConnections'], data: [] },
{ name: PMA_messages['strChartProcesses'], data: [] }
],
title: { text: PMA_messages['strChartConnectionsTitle'] },
- realtime: { url:'server_status.php?'+url_query,
+ realtime: { url: 'server_status.php?' + url_query,
type: 'proc',
- callback: function(chartObj, curVal, lastVal,numLoadedPoints) {
- if(lastVal==null) return;
+ callback: function(chartObj, curVal, lastVal, numLoadedPoints) {
+ if (lastVal == null) {
+ return;
+ }
chartObj.series[0].addPoint(
{ x: curVal.x, y: curVal.y_conn - lastVal.y_conn },
false,
@@ -266,13 +265,14 @@ $(function() {
}
};
- setupLiveChart($tab,this,settings);
- if(tabstat == 'livetraffic')
+ setupLiveChart($tab, this, settings);
+ if (tabstat == 'livetraffic') {
$tab.find('.buttonlinks a.livetrafficLink').html(PMA_messages['strLiveTrafficChart']);
- tabStatus[$tab.attr('id')]='liveconnections';
+ }
+ tabStatus[$tab.attr('id')] = 'liveconnections';
} else {
$(this).html(PMA_messages['strLiveConnChart']);
- setupLiveChart($tab,this,null);
+ setupLiveChart($tab, this, null);
}
return false;
@@ -283,17 +283,20 @@ $(function() {
var $tab = $(this).parents('div.ui-tabs-panel');
var settings = null;
- if(tabStatus[$tab.attr('id')] == 'static') {
+ if (tabStatus[$tab.attr('id')] == 'static') {
settings = {
series: [ { name: PMA_messages['strChartIssuedQueries'], data: [] } ],
title: { text: PMA_messages['strChartIssuedQueriesTitle'] },
- tooltip: { formatter:function() { return this.point.name; } },
- realtime: { url:'server_status.php?'+url_query,
+ tooltip: { formatter: function() { return this.point.name; } },
+ realtime: { url: 'server_status.php?' + url_query,
type: 'queries',
- callback: function(chartObj, curVal, lastVal,numLoadedPoints) {
- if(lastVal == null) return;
- chartObj.series[0].addPoint(
- { x: curVal.x, y: curVal.y - lastVal.y, name: sortedQueriesPointInfo(curVal,lastVal) },
+ callback: function(chartObj, curVal, lastVal, numLoadedPoints) {
+ if (lastVal == null) { return; }
+ chartObj.series[0].addPoint({
+ x: curVal.x,
+ y: curVal.y - lastVal.y,
+ name: sortedQueriesPointInfo(curVal, lastVal)
+ },
true,
numLoadedPoints >= chartObj.options.realtime.numMaxPoints
);
@@ -305,23 +308,23 @@ $(function() {
$(this).html(PMA_messages['strLiveQueryChart']);
}
- setupLiveChart($tab,this,settings);
+ setupLiveChart($tab, this, settings);
tabStatus[$tab.attr('id')] = 'livequeries';
return false;
});
- function setupLiveChart($tab,link,settings) {
- if(settings != null) {
+ function setupLiveChart($tab, link, settings) {
+ if (settings != null) {
// Loading a chart with existing chart => remove old chart first
- if(tabStatus[$tab.attr('id')] != 'static') {
+ if (tabStatus[$tab.attr('id')] != 'static') {
clearTimeout(chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]);
- chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"] = null;
+ chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"] = null;
tabChart[$tab.attr('id')].destroy();
// Also reset the select list
$tab.find('.buttonlinks select').get(0).selectedIndex = 2;
}
- if(! settings.chart) settings.chart = {};
+ if (! settings.chart) settings.chart = {};
settings.chart.renderTo = $tab.attr('id') + "_chart_cnt";
$tab.find('.tabInnerContent')
@@ -333,13 +336,13 @@ $(function() {
$tab.find('.buttonlinks .refreshList').show();
} else {
clearTimeout(chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]);
- chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]=null;
+ chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"] = null;
$tab.find('.tabInnerContent').show();
- $tab.find('div#'+$tab.attr('id') + '_chart_cnt').remove();
- tabStatus[$tab.attr('id')]='static';
+ $tab.find('div#' + $tab.attr('id') + '_chart_cnt').remove();
+ tabStatus[$tab.attr('id')] = 'static';
tabChart[$tab.attr('id')].destroy();
$tab.find('.buttonlinks a.tabRefresh').show();
- $tab.find('.buttonlinks select').get(0).selectedIndex=2;
+ $tab.find('.buttonlinks select').get(0).selectedIndex = 2;
$tab.find('.buttonlinks .refreshList').hide();
}
}
@@ -351,10 +354,12 @@ $(function() {
});
$('#filterText').keyup(function(e) {
- word = $(this).val().replace(/_/g,' ');
+ word = $(this).val().replace(/_/g, ' ');
- if(word.length == 0) textFilter = null;
- else textFilter = new RegExp("(^|_)" + word,'i');
+ if (word.length == 0) {
+ textFilter = null;
+ }
+ else textFilter = new RegExp("(^|_)" + word, 'i');
text = word;
@@ -367,27 +372,32 @@ $(function() {
});
$('input#dontFormat').change(function() {
+ // Hiding the table while changing values speeds up the process a lot
+ $('#serverstatusvariables').hide();
$('#serverstatusvariables td.value span.original').toggle(this.checked);
$('#serverstatusvariables td.value span.formatted').toggle(! this.checked);
+ $('#serverstatusvariables').show();
});
/* Adjust DOM / Add handlers to the tabs */
- function initTab(tab,data) {
+ function initTab(tab, data) {
switch(tab.attr('id')) {
case 'statustabs_traffic':
- if(data != null) tab.find('.tabInnerContent').html(data);
+ if (data != null) {
+ tab.find('.tabInnerContent').html(data);
+ }
PMA_convertFootnotesToTooltips();
break;
case 'statustabs_queries':
- if(data != null) {
+ if (data != null) {
queryPieChart.destroy();
tab.find('.tabInnerContent').html(data);
}
// Build query statistics chart
var cdata = new Array();
- $.each(jQuery.parseJSON($('#serverstatusquerieschart span').html()),function(key,value) {
- cdata.push([key,parseInt(value)]);
+ $.each(jQuery.parseJSON($('#serverstatusquerieschart span').html()), function(key, value) {
+ cdata.push([key, parseInt(value)]);
});
queryPieChart = PMA_createChart({
@@ -395,11 +405,11 @@ $(function() {
renderTo: 'serverstatusquerieschart'
},
title: {
- text:'',
- margin:0
+ text: '',
+ margin: 0
},
series: [{
- type:'pie',
+ type: 'pie',
name: PMA_messages['strChartQueryPie'],
data: cdata
}],
@@ -410,21 +420,24 @@ $(function() {
dataLabels: {
enabled: true,
formatter: function() {
- return '<b>'+ this.point.name +'</b><br/> ' + Highcharts.numberFormat(this.percentage, 2) + ' %';
+ return '<b>' + this.point.name +'</b><br/> ' +
+ Highcharts.numberFormat(this.percentage, 2) + ' %';
}
}
}
},
tooltip: {
formatter: function() {
- return '<b>' + this.point.name + '</b><br/>' + Highcharts.numberFormat(this.y, 2) + '<br/>(' + Highcharts.numberFormat(this.percentage, 2) + ' %)';
+ return '<b>' + this.point.name + '</b><br/>' +
+ Highcharts.numberFormat(this.y, 2) + '<br/>(' +
+ Highcharts.numberFormat(this.percentage, 2) + ' %)';
}
}
});
break;
case 'statustabs_allvars':
- if(data != null) {
+ if (data != null) {
tab.find('.tabInnerContent').html(data);
filterVariables();
}
@@ -438,7 +451,7 @@ $(function() {
switch(tabid) {
case 'statustabs_queries':
$('#serverstatusqueriesdetails').tablesorter({
- sortList: [[3,1]],
+ sortList: [[3, 1]],
widgets: ['zebra'],
headers: {
1: { sorter: 'fancyNumber' },
@@ -453,7 +466,7 @@ $(function() {
case 'statustabs_allvars':
$('#serverstatusvariables').tablesorter({
- sortList: [[0,0]],
+ sortList: [[0, 0]],
widgets: ['zebra'],
headers: {
1: { sorter: 'fancyNumber' }
@@ -472,33 +485,38 @@ $(function() {
var useful_links = 0;
var section = text;
- if(categoryFilter.length > 0) section = categoryFilter;
+ if (categoryFilter.length > 0) {
+ section = categoryFilter;
+ }
- if(section.length > 1) {
+ if (section.length > 1) {
$('#linkSuggestions span').each(function() {
- if($(this).attr('class').indexOf('status_'+section) != -1) {
+ if ($(this).attr('class').indexOf('status_' + section) != -1) {
useful_links++;
- $(this).css('display','');
+ $(this).css('display', '');
} else {
- $(this).css('display','none');
+ $(this).css('display', 'none');
}
});
}
- if(useful_links > 0)
- $('#linkSuggestions').css('display','');
- else $('#linkSuggestions').css('display','none');
+ if (useful_links > 0) {
+ $('#linkSuggestions').css('display', '');
+ } else {
+ $('#linkSuggestions').css('display', 'none');
+ }
- odd_row=false;
+ odd_row = false;
$('#serverstatusvariables th.name').each(function() {
- if((textFilter == null || textFilter.exec($(this).text()))
+ if ((textFilter == null || textFilter.exec($(this).text()))
&& (! alertFilter || $(this).next().find('span.attention').length>0)
- && (categoryFilter.length == 0 || $(this).parent().hasClass('s_'+categoryFilter))) {
+ && (categoryFilter.length == 0 || $(this).parent().hasClass('s_' + categoryFilter))
+ ) {
odd_row = ! odd_row;
- $(this).parent().css('display','');
- if(odd_row) {
+ $(this).parent().css('display', '');
+ if (odd_row) {
$(this).parent().addClass('odd');
$(this).parent().removeClass('even');
} else {
@@ -506,22 +524,22 @@ $(function() {
$(this).parent().removeClass('odd');
}
} else {
- $(this).parent().css('display','none');
+ $(this).parent().css('display', 'none');
}
});
}
// Provides a nicely formatted and sorted tooltip of each datapoint of the query statistics
function sortedQueriesPointInfo(queries, lastQueries){
- var max, maxIdx, num=0;
+ var max, maxIdx, num = 0;
var queryKeys = new Array();
var queryValues = new Array();
- var sumOther=0;
- var sumTotal=0;
+ var sumOther = 0;
+ var sumTotal = 0;
// Separate keys and values, then sort them
- $.each(queries.pointInfo, function(key,value) {
- if(value-lastQueries.pointInfo[key] > 0) {
+ $.each(queries.pointInfo, function(key, value) {
+ if (value-lastQueries.pointInfo[key] > 0) {
queryKeys.push(key);
queryValues.push(value-lastQueries.pointInfo[key]);
sumTotal += value-lastQueries.pointInfo[key];
@@ -532,1705 +550,121 @@ $(function() {
while(queryKeys.length > 0) {
max = 0;
- for(var i=0; i < queryKeys.length; i++) {
- if(queryValues[i] > max) {
+ for (var i = 0; i < queryKeys.length; i++) {
+ if (queryValues[i] > max) {
max = queryValues[i];
maxIdx = i;
}
}
- if(numQueries > 8 && num >= 6)
+ if (numQueries > 8 && num >= 6) {
sumOther += queryValues[maxIdx];
- else pointInfo += queryKeys[maxIdx].substr(4).replace('_',' ') + ': ' + queryValues[maxIdx] + '<br>';
+ } else {
+ pointInfo += queryKeys[maxIdx].substr(4).replace('_', ' ') + ': ' + queryValues[maxIdx] + '<br>';
+ }
- queryKeys.splice(maxIdx,1);
- queryValues.splice(maxIdx,1);
+ queryKeys.splice(maxIdx, 1);
+ queryValues.splice(maxIdx, 1);
num++;
}
- if(sumOther>0)
+ if (sumOther>0) {
pointInfo += PMA_messages['strOther'] + ': ' + sumOther;
-
+ }
+
return pointInfo;
}
/**** Server config advisor ****/
$('a[href="#openAdvisorInstructions"]').click(function() {
- $('#advisorInstructionsDialog').dialog();
+ var dlgBtns = {};
+
+ dlgBtns[PMA_messages['strClose']] = function() {
+ $(this).dialog('close');
+ }
+
+ $('#advisorInstructionsDialog').attr('title', PMA_messages['strAdvisorSystem']);
+ $('#advisorInstructionsDialog').dialog({
+ width: 700,
+ buttons: dlgBtns
+ });
});
$('a[href="#startAnalyzer"]').click(function() {
var $cnt = $('#statustabs_advisor .tabInnerContent');
$cnt.html('<img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">');
-
- $.get('server_status.php?'+url_query, { ajax_request: true, advisor: true },function(data) {
+
+ $.get('server_status.php?' + url_query, { ajax_request: true, advisor: true }, function(data) {
var $tbody, $tr, str, even = true;
data = $.parseJSON(data);
- $cnt.html('<p><b>Possible performance issues</b></p>');
- if(data.fired.length > 0) {
- $cnt.append('<table class="data" id="rulesFired" border="0"><thead><tr><th>Issue</th><th>Recommendation</th></tr></thead><tbody></tbody></table>');
+
+ $cnt.html('');
+
+ if (data.parse.errors.length > 0) {
+ $cnt.append('<b>Rules file not well formed, following errors were found:</b><br />- ');
+ $cnt.append(data.parse.errors.join('<br/>- '));
+ $cnt.append('<p></p>');
+ }
+
+ if (data.run.errors.length > 0) {
+ $cnt.append('<b>Errors occured while executing rule expressions:</b><br />- ');
+ $cnt.append(data.run.errors.join('<br/>- '));
+ $cnt.append('<p></p>');
+ }
+
+ if (data.run.fired.length > 0) {
+ $cnt.append('<p><b>' + PMA_messages['strPerformanceIssues'] + '</b></p>');
+ $cnt.append('<table class="data" id="rulesFired" border="0"><thead><tr>' +
+ '<th>' + PMA_messages['strIssuse'] + '</th><th>' + PMA_messages['strRecommendation'] +
+ '</th></tr></thead><tbody></tbody></table>');
$tbody = $cnt.find('table#rulesFired');
- $.each(data.fired, function(key,value) {
- $tbody.append($tr = $('<tr class="linkElem noclick ' + (even ? 'even' : 'odd') + '"><td>' + value.issue + '</td>' +
- '<td>' + value.recommendation + ' </td></tr>'));
+
+ var rc_stripped;
+
+ $.each(data.run.fired, function(key, value) {
+ // recommendation may contain links, don't show those in overview table (clicking on them redirects the user)
+ rc_stripped = $.trim($('<div>').html(value.recommendation).text())
+ $tbody.append($tr = $('<tr class="linkElem noclick ' + (even ? 'even' : 'odd') + '"><td>' +
+ value.issue + '</td><td>' + rc_stripped + ' </td></tr>'));
even = !even;
-
- $tr.data('rule',value);
+ $tr.data('rule', value);
+
$tr.click(function() {
var rule = $(this).data('rule');
- $('div#emptyDialog').attr('title','Rule details');
+ $('div#emptyDialog').attr('title', PMA_messages['strRuleDetails']);
$('div#emptyDialog').html(
- '<p><b>Issue:</b><br />' + rule.issue + '</p>' +
- '<p><b>Recommendation:</b><br />' + rule.recommendation + '</p>' +
- '<p><b>Justification:</b><br />' + rule.justification + '</p>' +
- '<p><b>Used variable / formula:</b><br />' + rule.formula + '</p>' +
- '<p><b>Test:</b><br />' + rule.test + '</p>'
+ '<p><b>' + PMA_messages['strIssuse'] + ':</b><br />' + rule.issue + '</p>' +
+ '<p><b>' + PMA_messages['strRecommendation'] + ':</b><br />' + rule.recommendation + '</p>' +
+ '<p><b>' + PMA_messages['strJustification'] + ':</b><br />' + rule.justification + '</p>' +
+ '<p><b>' + PMA_messages['strFormula'] + ':</b><br />' + rule.formula + '</p>' +
+ '<p><b>' + PMA_messages['strTest'] + ':</b><br />' + rule.test + '</p>'
);
- $('div#emptyDialog').dialog({
- width: 600,
- buttons: {
- 'Close' : function() {
- $(this).dialog('close');
- }
- }
- });
+
+ var dlgBtns = {};
+ dlgBtns[PMA_messages['strClose']] = function() {
+ $(this).dialog('close');
+ };
+
+ $('div#emptyDialog').dialog({ width: 600, buttons: dlgBtns });
});
});
}
});
-
- return false;
- });
-
-
- /**** Monitor charting implementation ****/
- /* Saves the previous ajax response for differential values */
- var oldChartData = null;
- // Holds about to created chart
- var newChart = null;
- var chartSpacing;
-
- // Runtime parameter of the monitor, is being fully set in initGrid()
- var runtime = {
- // Holds all visible charts in the grid
- charts: null,
- // Stores the timeout handler so it can be cleared
- refreshTimeout: null,
- // Stores the GET request to refresh the charts
- refreshRequest: null,
- // Chart auto increment
- chartAI: 0,
- // To play/pause the monitor
- redrawCharts: false,
- // Object that contains a list of nodes that need to be retrieved from the server for chart updates
- dataList: [],
- // Current max points per chart (needed for auto calculation)
- gridMaxPoints: 20,
- // displayed time frame
- xmin: -1,
- xmax: -1
- };
-
- var monitorSettings = null;
-
- var defaultMonitorSettings = {
- columns: 3,
- chartSize: { width: 295, height: 250 },
- // Max points in each chart. Settings it to 'auto' sets gridMaxPoints to (chartwidth - 40) / 12
- gridMaxPoints: 'auto',
- /* Refresh rate of all grid charts in ms */
- gridRefresh: 5000
- };
-
- // Allows drag and drop rearrange and print/edit icons on charts
- var editMode = false;
-
- var presetCharts = {
- 'cpu-WINNT': {
- title: PMA_messages['strSystemCPUUsage'],
- nodes: [{ dataType: 'cpu', name: PMA_messages['strAverageLoad'], dataPoint: 'loadavg', unit: '%'}]
- },
- 'memory-WINNT': {
- title: PMA_messages['strSystemMemory'],
- nodes: [
- { dataType: 'memory', name: PMA_messages['strTotalMemory'], dataPoint: 'MemTotal', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strUsedMemory'], dataPoint: 'MemUsed', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
- ]
- },
- 'swap-WINNT': {
- title: PMA_messages['strSystemSwap'],
- nodes: [
- { dataType: 'memory', name: PMA_messages['strTotalSwap'], dataPoint: 'SwapTotal', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strUsedSwap'], dataPoint: 'SwapUsed', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
- ]
- },
- 'cpu-Linux': {
- title: PMA_messages['strSystemCPUUsage'],
- nodes: [
- { dataType: 'cpu',
- name: PMA_messages['strAverageLoad'],
- unit: '%',
- transformFn: 'cpu-linux'
- }
- ]
- },
- 'memory-Linux': {
- title: PMA_messages['strSystemMemory'],
- nodes: [
- { dataType: 'memory', name: PMA_messages['strUsedMemory'], dataPoint: 'MemUsed', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strCachedMemory'], dataPoint: 'Cached', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strBufferedMemory'], dataPoint: 'Buffers', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strFreeMemory'], dataPoint:'MemFree', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
- ],
- settings: {
- chart: {
- type: 'area',
- animation: false
- },
- plotOptions: {
- area: {
- stacking: 'percent'
- }
- }
- }
- },
- 'swap-Linux': {
- title: PMA_messages['strSystemSwap'],
- nodes: [
- { dataType: 'memory', name: PMA_messages['strTotalSwap'], dataPoint: 'SwapUsed', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strCachedSwap'], dataPoint: 'SwapCached', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strFreeSwap'], dataPoint: 'SwapFree', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
- ],
- settings: {
- chart: {
- type: 'area',
- animation: false
- },
- plotOptions: {
- area: {
- stacking: 'percent'
- }
- }
- }
- }
- };
-
- // Default setting
- defaultChartGrid = {
- 'c0': { title: PMA_messages['strQuestions'],
- nodes: [{ dataType: 'statusvar', name: PMA_messages['strQuestions'], dataPoint: 'Questions', display: 'differential' }]
- },
- 'c1': {
- title: PMA_messages['strChartConnectionsTitle'],
- nodes: [ { dataType: 'statusvar', name: PMA_messages['strConnections'], dataPoint: 'Connections', display: 'differential' },
- { dataType: 'proc', name: PMA_messages['strProcesses'], dataPoint: 'processes'} ]
- },
- 'c2': {
- title: PMA_messages['strTraffic'],
- nodes: [
- { dataType: 'statusvar', name: PMA_messages['strBytesSent'], dataPoint: 'Bytes_sent', display: 'differential', valueDivisor: 1024, unit: PMA_messages['strKiB'] },
- { dataType: 'statusvar', name: PMA_messages['strBytesReceived'], dataPoint: 'Bytes_received', display: 'differential', valueDivisor: 1024, unit: PMA_messages['strKiB'] }
- ]
- }
- };
-
- // Server is localhost => We can add cpu/memory/swap
- if(server_db_isLocal) {
- defaultChartGrid['c3'] = presetCharts['cpu-' + server_os];
- defaultChartGrid['c4'] = presetCharts['memory-' + server_os];
- defaultChartGrid['c5'] = presetCharts['swap-' + server_os];
- }
-
- var gridbuttons = {
- cogButton: {
- //enabled: true,
- symbol: 'url(' + pmaThemeImage + 's_cog.png)',
- x: -36,
- symbolFill: '#B5C9DF',
- hoverSymbolFill: '#779ABF',
- _titleKey: 'settings',
- menuName: 'gridsettings',
- menuItems: [{
- textKey: 'editChart',
- onclick: function() {
- editChart(this);
- }
- }, {
- textKey: 'removeChart',
- onclick: function() {
- removeChart(this);
- }
- }]
- }
- };
-
- Highcharts.setOptions({
- lang: {
- settings: PMA_messages['strSettings'],
- removeChart: PMA_messages['strRemoveChart'],
- editChart: PMA_messages['strEditChart']
- }
- });
-
- $('a[href="#rearrangeCharts"], a[href="#endChartEditMode"]').click(function() {
- editMode = !editMode;
- if($(this).attr('href') == '#endChartEditMode') editMode = false;
-
- // Icon graphics have zIndex 19,20 and 21. Let's just hope nothing else has the same zIndex
- $('table#chartGrid div svg').find('*[zIndex=20], *[zIndex=21], *[zIndex=19]').toggle(editMode)
-
- $('a[href="#endChartEditMode"]').toggle(editMode);
-
- if(editMode) {
- // Close the settings popup
- $('#statustabs_charting .popupContent').hide().removeClass('openedPopup');
-
- $("#chartGrid").sortableTable({
- ignoreRect: {
- top: 8,
- left: chartSize().width - 63,
- width: 54,
- height: 24
- },
- events: {
- // Drop event. The drag child element is moved into the drop element
- // and vice versa. So the parameters are switched.
- drop: function(drag, drop, pos) {
- var dragKey, dropKey, dropRender;
- var dragRender = $(drag).children().first().attr('id');
-
- if($(drop).children().length > 0)
- dropRender = $(drop).children().first().attr('id');
-
- // Find the charts in the array
- $.each(runtime.charts, function(key, value) {
- if(value.chart.options.chart.renderTo == dragRender)
- dragKey = key;
- if(dropRender && value.chart.options.chart.renderTo == dropRender)
- dropKey = key;
- });
-
- // Case 1: drag and drop are charts -> Switch keys
- if(dropKey) {
- if(dragKey) {
- dragChart = runtime.charts[dragKey];
- runtime.charts[dragKey] = runtime.charts[dropKey];
- runtime.charts[dropKey] = dragChart;
- } else {
- // Case 2: drop is a empty cell => just completely rebuild the ids
- var keys = [];
- var dropKeyNum = parseInt(dropKey.substr(1));
- var insertBefore = pos.col + pos.row * monitorSettings.columns;
- var values = [];
- var newChartList = {};
- var c = 0;
-
- $.each(runtime.charts, function(key, value) {
- if(key != dropKey)
- keys.push(key);
- });
-
- keys.sort();
-
- // Rebuilds all ids, with the dragged chart correctly inserted
- for(var i=0; i<keys.length; i++) {
- if(keys[i] == insertBefore) {
- newChartList['c' + (c++)] = runtime.charts[dropKey];
- insertBefore = -1; // Insert ok
- }
- newChartList['c' + (c++)] = runtime.charts[keys[i]];
- }
-
- // Not inserted => put at the end
- if(insertBefore != -1)
- newChartList['c' + (c++)] = runtime.charts[dropKey];
-
- runtime.charts = newChartList;
- }
-
- saveMonitor();
- }
- }
- }
- });
-
- } else {
- $("#chartGrid").sortableTable('destroy');
- saveMonitor(); // Save settings
- }
-
- return false;
- });
-
- // global settings
- $('div#statustabs_charting div.popupContent select[name="chartColumns"]').change(function() {
- monitorSettings.columns = parseInt(this.value);
-
- var newSize = chartSize();
-
- // Empty cells should keep their size so you can drop onto them
- $('table#chartGrid tr td').css('width',newSize.width + 'px');
-
- /* Reorder all charts that it fills all column cells */
- var numColumns;
- var $tr = $('table#chartGrid tr:first');
- var row=0;
- while($tr.length != 0) {
- numColumns = 1;
- // To many cells in one row => put into next row
- $tr.find('td').each(function() {
- if(numColumns > monitorSettings.columns) {
- if($tr.next().length == 0) $tr.after('<tr></tr>');
- $tr.next().prepend($(this));
- }
- numColumns++;
- });
-
- // To little cells in one row => for each cell to little, move all cells backwards by 1
- if($tr.next().length > 0) {
- var cnt = monitorSettings.columns - $tr.find('td').length;
- for(var i=0; i < cnt; i++) {
- $tr.append($tr.next().find('td:first'));
- $tr.nextAll().each(function() {
- if($(this).next().length != 0)
- $(this).append($(this).next().find('td:first'));
- });
- }
- }
-
- $tr = $tr.next();
- row++;
- }
-
- /* Apply new chart size to all charts */
- $.each(runtime.charts, function(key, value) {
- value.chart.setSize(
- newSize.width,
- newSize.height,
- false
- );
- });
-
- if(monitorSettings.gridMaxPoints == 'auto')
- runtime.gridMaxPoints = Math.round((newSize.width - 40) / 12);
-
- runtime.xmin = new Date().getTime() - server_time_diff - runtime.gridMaxPoints * monitorSettings.gridRefresh;
- runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
-
- if(editMode)
- $("#chartGrid").sortableTable('refresh');
-
- saveMonitor(); // Save settings
- });
-
- $('div#statustabs_charting div.popupContent select[name="gridChartRefresh"]').change(function() {
- monitorSettings.gridRefresh = parseInt(this.value) * 1000;
- clearTimeout(runtime.refreshTimeout);
-
- if(runtime.refreshRequest)
- runtime.refreshRequest.abort();
-
- runtime.xmin = new Date().getTime() - server_time_diff - runtime.gridMaxPoints * monitorSettings.gridRefresh;
- runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
-
- $.each(runtime.charts, function(key, value) {
- value.chart.xAxis[0].setExtremes(runtime.xmin, runtime.xmax, false);
- });
-
- runtime.refreshTimeout = setTimeout(refreshChartGrid, monitorSettings.gridRefresh);
-
- saveMonitor(); // Save settings
- });
-
- $('a[href="#addNewChart"]').click(function() {
- var dlgButtons = { };
-
- dlgButtons[PMA_messages['strAddChart']] = function() {
- var type = $('input[name="chartType"]:checked').val();
-
- if(type == 'cpu' || type == 'memory' || type=='swap')
- newChart = presetCharts[type + '-' + server_os];
- else {
- if(! newChart || ! newChart.nodes || newChart.nodes.length == 0) {
- alert(PMA_messages['strAddOneSeriesWarning']);
- return;
- }
- }
-
- newChart.title = $('input[name="chartTitle"]').attr('value');
- // Add a cloned object to the chart grid
- addChart($.extend(true, {}, newChart));
-
- newChart = null;
-
- saveMonitor(); // Save settings
-
- $(this).dialog("close");
- };
-
- dlgButtons[PMA_messages['strClose']] = function() {
- newChart = null;
- $('span#clearSeriesLink').hide();
- $('#seriesPreview').html('');
- $(this).dialog("close");
- };
-
- $('div#addChartDialog').dialog({
- width:'auto',
- height:'auto',
- buttons: dlgButtons
- });
-
- $('div#addChartDialog #seriesPreview').html('<i>' + PMA_messages['strNone'] + '</i>');
-
+
return false;
});
- $('a[href="#exportMonitorConfig"]').click(function() {
- var gridCopy = {};
-
- $.each(runtime.charts, function(key, elem) {
- gridCopy[key] = {};
- gridCopy[key].nodes = elem.nodes;
- gridCopy[key].settings = elem.settings;
- gridCopy[key].title = elem.title;
- });
-
- var exportData = {
- monitorCharts: gridCopy,
- monitorSettings: monitorSettings
- };
- var $form;
-
- $('body').append($form = $('<form method="post" action="file_echo.php?'+url_query+'&filename=1" style="display:none;"></form>'));
-
- $form.append('<input type="hidden" name="monitorconfig" value="' + encodeURI($.toJSON(exportData)) + '">');
- $form.submit();
- $form.remove();
- });
-
- $('a[href="#importMonitorConfig"]').click(function() {
- $('div#emptyDialog').attr('title','Import monitor configuration');
- $('div#emptyDialog').html('Please select the file you want to import:<br/><form action="file_echo.php?'+url_query+'&import=1" method="post" enctype="multipart/form-data">'+
- '<input type="file" name="file"> <input type="hidden" name="import" value="1"> </form>');
-
- var dlgBtns = {};
-
- dlgBtns[PMA_messages['strImport']] = function() {
- var $iframe, $form;
- $('body').append($iframe = $('<iframe id="monitorConfigUpload" style="display:none;"></iframe>'));
- var d = $iframe[0].contentWindow.document;
- d.open(); d.close();
- mew = d;
-
- $iframe.load(function() {
- var json;
-
- // Try loading config
- try {
- var data = $('body',$('iframe#monitorConfigUpload')[0].contentWindow.document).html();
- // Chrome wraps around '<pre style="word-wrap: break-word; white-space: pre-wrap;">' to any text content -.-
- json = $.secureEvalJSON(data.substring(data.indexOf("{"), data.lastIndexOf("}") + 1));
- } catch (err) {
- alert(PMA_messages['strFailedParsingConfig']);
- $('div#emptyDialog').dialog('close');
- return;
- }
-
- // Basic check, is this a monitor config json?
- if(!json || ! json.monitorCharts || ! json.monitorCharts) {
- alert(PMA_messages['strFailedParsingConfig']);
- $('div#emptyDialog').dialog('close');
- return;
- }
-
- // If json ok, try applying config
- try {
- window.localStorage['monitorCharts'] = $.toJSON(json.monitorCharts);
- window.localStorage['monitorSettings'] = $.toJSON(json.monitorSettings);
- rebuildGrid();
- } catch(err) {
- alert(PMA_messages['strFailedBuildingGrid']);
- // If an exception is thrown, load default again
- window.localStorage.removeItem('monitorCharts');
- window.localStorage.removeItem('monitorSettings');
- rebuildGrid();
- }
-
- $('div#emptyDialog').dialog('close');
- });
-
- $("body", d).append($form=$('div#emptyDialog').find('form'));
- $form.submit();
- $('div#emptyDialog').append('<img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">');
- };
-
- dlgBtns[PMA_messages['strCancel']] = function() {
- $(this).dialog('close');
- }
-
-
- $('div#emptyDialog').dialog({
- width: 'auto',
- height: 'auto',
- buttons: dlgBtns
- });
- });
-
- $('a[href="#clearMonitorConfig"]').click(function() {
- window.localStorage.removeItem('monitorCharts');
- window.localStorage.removeItem('monitorSettings');
- $(this).hide();
- rebuildGrid();
- });
-
- $('a[href="#pauseCharts"]').click(function() {
- runtime.redrawCharts = ! runtime.redrawCharts;
- if(! runtime.redrawCharts)
- $(this).html('<img src="themes/dot.gif" class="icon ic_play" alt="" /> ' + PMA_messages['strResumeMonitor']);
- else {
- $(this).html('<img src="themes/dot.gif" class="icon ic_pause" alt="" /> ' + PMA_messages['strPauseMonitor']);
- if(! runtime.charts) {
- initGrid();
- $('a[href="#settingsPopup"]').show();
- }
- }
- return false;
- });
-
- $('a[href="#monitorInstructionsDialog"]').click(function() {
- var $dialog = $('div#monitorInstructionsDialog');
-
- $dialog.dialog({
- width: 595,
- height: 'auto'
- }).find('img.ajaxIcon').show();
-
- var loadLogVars = function(getvars) {
- vars = { ajax_request: true, logging_vars: true };
- if(getvars) $.extend(vars,getvars);
-
- $.get('server_status.php?' + url_query, vars,
- function(data) {
- var logVars = $.parseJSON(data),
- icon = 'ic_s_success', msg='', str='';
-
- if(logVars['general_log'] == 'ON') {
- if(logVars['slow_query_log'] == 'ON')
- msg = PMA_messages['strBothLogOn'];
- else
- msg = PMA_messages['strGenLogOn'];
- }
-
- if(msg.length == 0 && logVars['slow_query_log'] == 'ON') {
- msg = PMA_messages['strSlowLogOn'];
- }
-
- if(msg.length == 0) {
- icon = 'ic_s_error';
- msg = PMA_messages['strBothLogOff'];
- }
-
- str = '<b>' + PMA_messages['strCurrentSettings'] + '</b><br><div class="smallIndent">';
- str += '<img src="themes/dot.gif" class="icon ' + icon + '" alt=""/> ' + msg + '<br />';
-
- if(logVars['log_output'] != 'TABLE')
- str += '<img src="themes/dot.gif" class="icon ic_s_error" alt=""/> ' + PMA_messages['strLogOutNotTable'] + '<br />';
- else
- str += '<img src="themes/dot.gif" class="icon ic_s_success" alt=""/> ' + PMA_messages['strLogOutIsTable'] + '<br />';
-
- if(logVars['slow_query_log'] == 'ON') {
- if(logVars['long_query_time'] > 2)
- str += '<img src="themes/dot.gif" class="icon ic_s_attention" alt=""/> '
- + $.sprintf(PMA_messages['strSmallerLongQueryTimeAdvice'], logVars['long_query_time'])
- + '<br />';
-
- if(logVars['long_query_time'] < 2)
- str += '<img src="themes/dot.gif" class="icon ic_s_success" alt=""/> '
- + $.sprintf(PMA_messages['strLongQueryTimeSet'], logVars['long_query_time'])
- + '<br />';
- }
-
- str += '</div>';
-
- if(is_superuser) {
- str += '<p></p><b>Change settings</b>';
- str += '<div class="smallIndent">';
- str += PMA_messages['strSettingsAppliedGlobal'] + '<br/>';
-
- var varValue = 'TABLE';
- if(logVars['log_output'] == 'TABLE') varValue = 'FILE';
-
- str += '- <a class="set" href="#log_output-' + varValue + '">'
- + $.sprintf(PMA_messages['strSetLogOutput'], varValue)
- + ' </a><br />';
-
- if(logVars['general_log'] != 'ON')
- str += '- <a class="set" href="#general_log-ON">'
- + $.sprintf(PMA_messages['strEnableVar'], 'general_log')
- + ' </a><br />';
- else
- str += '- <a class="set" href="#general_log-OFF">'
- + $.sprintf(PMA_messages['strDisableVar'], 'general_log')
- + ' </a><br />';
-
- if(logVars['slow_query_log'] != 'ON')
- str += '- <a class="set" href="#slow_query_log-ON">'
- + $.sprintf(PMA_messages['strEnableVar'], 'slow_query_log')
- + ' </a><br />';
- else
- str += '- <a class="set" href="#slow_query_log-OFF">'
- + $.sprintf(PMA_messages['strDisableVar'], 'slow_query_log')
- + ' </a><br />';
-
-
- varValue = 5;
- if(logVars['long_query_time'] > 2) varValue = 1;
-
- str += '- <a class="set" href="#long_query_time-' + varValue + '">'
- + $.sprintf(PMA_messages['setSetLongQueryTime'], varValue)
- + ' </a><br />';
-
- } else
- str += PMA_messages['strNoSuperUser'] + '<br/>';
-
- str += '</div>';
-
- $dialog.find('div.monitorUse').toggle(
- logVars['log_output'] == 'TABLE' && (logVars['slow_query_log'] == 'ON' || logVars['general_log'] == 'ON')
- );
-
- $dialog.find('div.ajaxContent').html(str);
- $dialog.find('img.ajaxIcon').hide();
- $dialog.find('a.set').click(function() {
- var nameValue = $(this).attr('href').split('-');
- loadLogVars({ varName: nameValue[0].substr(1), varValue: nameValue[1]});
- $dialog.find('img.ajaxIcon').show();
- });
- }
- );
- };
-
-
- loadLogVars();
-
- return false;
- });
-
- $('input[name="chartType"]').change(function() {
- $('#chartVariableSettings').toggle(this.checked && this.value == 'variable');
- var title = $('input[name="chartTitle"]').attr('value');
- if(title == PMA_messages['strChartTitle'] || title == $('label[for="'+$('input[name="chartTitle"]').data('lastRadio')+'"]').text()) {
- $('input[name="chartTitle"]').data('lastRadio',$(this).attr('id'));
- $('input[name="chartTitle"]').attr('value',$('label[for="'+$(this).attr('id')+'"]').text());
- }
-
- });
-
- $('input[name="useDivisor"]').change(function() {
- $('span.divisorInput').toggle(this.checked);
- });
- $('input[name="useUnit"]').change(function() {
- $('span.unitInput').toggle(this.checked);
- });
-
- $('select[name="varChartList"]').change(function () {
- if(this.selectedIndex!=0)
- $('#variableInput').attr('value',this.value);
- });
-
- $('a[href="#kibDivisor"]').click(function() {
- $('input[name="valueDivisor"]').attr('value',1024);
- $('input[name="valueUnit"]').attr('value',PMA_messages['strKiB']);
- $('span.unitInput').toggle(true);
- $('input[name="useUnit"]').prop('checked',true);
- return false;
- });
-
- $('a[href="#mibDivisor"]').click(function() {
- $('input[name="valueDivisor"]').attr('value',1024*1024);
- $('input[name="valueUnit"]').attr('value',PMA_messages['strMiB']);
- $('span.unitInput').toggle(true);
- $('input[name="useUnit"]').prop('checked',true);
- return false;
- });
-
- $('a[href="#submitClearSeries"]').click(function() {
- $('#seriesPreview').html('<i>' + PMA_messages['strNone'] + '</i>');
- newChart = null;
- $('span#clearSeriesLink').hide();
- });
-
- $('a[href="#submitAddSeries"]').click(function() {
- if($('input#variableInput').attr('value').length == 0) return false;
-
- if(newChart == null) {
- $('#seriesPreview').html('');
-
- newChart = {
- title: $('input[name="chartTitle"]').attr('value'),
- nodes: []
- }
- }
-
- var serie = {
- dataType:'statusvar',
- dataPoint: $('input#variableInput').attr('value'),
- name: $('input#variableInput').attr('value'),
- display: $('input[name="differentialValue"]').attr('checked') ? 'differential' : ''
- };
-
- if(serie.dataPoint == 'Processes') serie.dataType='proc';
-
- if($('input[name="useDivisor"]').attr('checked'))
- serie.valueDivisor = parseInt($('input[name="valueDivisor"]').attr('value'));
-
- if($('input[name="useUnit"]').attr('checked'))
- serie.unit = $('input[name="valueUnit"]').attr('value');
-
-
-
- var str = serie.display == 'differential' ? ', ' + PMA_messages['strDifferential'] : '';
- str += serie.valueDivisor ? (', ' + $.sprintf(PMA_messages['strDividedBy'], serie.valueDivisor)) : '';
-
- $('#seriesPreview').append('- ' + serie.dataPoint + str + '<br>');
-
- newChart.nodes.push(serie);
-
- $('input#variableInput').attr('value','');
- $('input[name="differentialValue"]').attr('checked',true);
- $('input[name="useDivisor"]').attr('checked',false);
- $('input[name="useUnit"]').attr('checked',false);
- $('input[name="useDivisor"]').trigger('change');
- $('input[name="useUnit"]').trigger('change');
- $('select[name="varChartList"]').get(0).selectedIndex=0;
-
- $('span#clearSeriesLink').show();
-
- return false;
- });
-
- $("input#variableInput").autocomplete({
- source: variableNames
- });
-
-
- function initGrid() {
- var settings;
- var series;
-
- /* Apply default values & config */
- if(window.localStorage) {
- if(window.localStorage['monitorCharts'])
- runtime.charts = $.parseJSON(window.localStorage['monitorCharts']);
- if(window.localStorage['monitorSettings'])
- monitorSettings = $.parseJSON(window.localStorage['monitorSettings']);
-
- $('a[href="#clearMonitorConfig"]').toggle(runtime.charts != null);
- }
-
- if(runtime.charts == null)
- runtime.charts = defaultChartGrid;
- if(monitorSettings == null)
- monitorSettings = defaultMonitorSettings;
-
- $('select[name="gridChartRefresh"]').attr('value',monitorSettings.gridRefresh / 1000);
- $('select[name="chartColumns"]').attr('value',monitorSettings.columns);
-
- if(monitorSettings.gridMaxPoints == 'auto')
- runtime.gridMaxPoints = Math.round((monitorSettings.chartSize.width - 40) / 12);
- else
- runtime.gridMaxPoints = monitorSettings.gridMaxPoints;
-
- runtime.xmin = new Date().getTime() - server_time_diff - runtime.gridMaxPoints * monitorSettings.gridRefresh;
- runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
-
- /* Calculate how much spacing there is between each chart */
- $('table#chartGrid').html('<tr><td></td><td></td></tr><tr><td></td><td></td></tr>');
- chartSpacing = {
- width: $('table#chartGrid td:nth-child(2)').offset().left - $('table#chartGrid td:nth-child(1)').offset().left,
- height: $('table#chartGrid tr:nth-child(2) td:nth-child(2)').offset().top - $('table#chartGrid tr:nth-child(1) td:nth-child(1)').offset().top
- }
- $('table#chartGrid').html('');
-
- /* Add all charts - in correct order */
- var keys = [];
- $.each(runtime.charts, function(key, value) {
- keys.push(key);
- });
- keys.sort();
- for(var i=0; i<keys.length; i++)
- addChart(runtime.charts[keys[i]],true);
-
- /* Fill in missing cells */
- var numCharts = $('table#chartGrid .monitorChart').length;
- var numMissingCells = (monitorSettings.columns - numCharts % monitorSettings.columns) % monitorSettings.columns;
- for(var i=0; i < numMissingCells; i++) {
- $('table#chartGrid tr:last').append('<td></td>');
- }
-
- // Empty cells should keep their size so you can drop onto them
- $('table#chartGrid tr td').css('width',chartSize().width + 'px');
-
- buildRequiredDataList();
- refreshChartGrid();
- }
-
- function destroyGrid() {
- if(runtime.charts)
- $.each(runtime.charts, function(key, value) {
- try {
- value.chart.destroy();
- } catch(err) {}
- });
- try {
- runtime.refreshRequest.abort();
- } catch(err) {}
- try {
- clearTimeout(runtime.refreshTimeout);
- } catch(err) {}
-
- $('table#chartGrid').html('');
-
- runtime.charts = null;
- runtime.chartAI = 0;
- monitorSettings = null;
- }
-
- function rebuildGrid() {
- var oldData = null;
- if(runtime.charts) {
- oldData = {};
- $.each(runtime.charts, function(key, chartObj) {
- for(var i=0; i < chartObj.nodes.length; i++) {
- oldData[chartObj.nodes[i].dataPoint] = [];
- for(var j=0; j < chartObj.chart.series[i].data.length; j++)
- oldData[chartObj.nodes[i].dataPoint].push([chartObj.chart.series[i].data[j].x, chartObj.chart.series[i].data[j].y]);
- }
- });
- }
-
- destroyGrid();
- initGrid();
-
- if(oldData) {
- $.each(runtime.charts, function(key, chartObj) {
- for(var j=0; j < chartObj.nodes.length; j++) {
- if(oldData[chartObj.nodes[j].dataPoint])
- chartObj.chart.series[j].setData(oldData[chartObj.nodes[j].dataPoint]);
- }
- });
- }
- }
-
- function chartSize() {
- var wdt = $('div#logTable').innerWidth() / monitorSettings.columns - (monitorSettings.columns - 1) * chartSpacing.width;
- return {
- width: wdt,
- height: 0.75 * wdt
- }
- }
-
- function addChart(chartObj, initialize) {
- series = [];
- for(var j=0; j<chartObj.nodes.length; j++)
- series.push(chartObj.nodes[j]);
-
- settings = {
- chart: {
- renderTo: 'gridchart' + runtime.chartAI,
- width: chartSize().width,
- height: chartSize().height,
- marginRight: 5,
- zoomType: 'x',
- events: {
- selection: function(event) {
- if(editMode) return false;
-
- var extremesObject = event.xAxis[0],
- min = extremesObject.min,
- max = extremesObject.max;
-
- $('#logAnalyseDialog input[name="dateStart"]')
- .attr('value', Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', new Date(min)));
- $('#logAnalyseDialog input[name="dateEnd"]')
- .attr('value', Highcharts.dateFormat('%Y-%m-%d %H:%M:%S', new Date(max)));
-
- var dlgBtns = { };
-
- dlgBtns[PMA_messages['strFromSlowLog']] = function() {
- var dateStart = Date.parse($('#logAnalyseDialog input[name="dateStart"]').attr('value')) || min;
- var dateEnd = Date.parse($('#logAnalyseDialog input[name="dateEnd"]').attr('value')) || max;
-
- loadLogStatistics({
- src: 'slow',
- start: dateStart,
- end: dateEnd,
- removeVariables: $('input#removeVariables').prop('checked'),
- limitTypes: $('input#limitTypes').prop('checked')
- });
-
- $('#logAnalyseDialog').find('dateStart,dateEnd').datepicker('destroy');
-
- $(this).dialog("close");
- };
-
- dlgBtns[PMA_messages['strFromGeneralLog']] = function() {
- var dateStart = Date.parse($('#logAnalyseDialog input[name="dateStart"]').attr('value')) || min;
- var dateEnd = Date.parse($('#logAnalyseDialog input[name="dateEnd"]').attr('value')) || max;
-
- loadLogStatistics({
- src: 'general',
- start: dateStart,
- end: dateEnd,
- removeVariables: $('input#removeVariables').prop('checked'),
- limitTypes: $('input#limitTypes').prop('checked')
- });
-
- $('#logAnalyseDialog').find('dateStart,dateEnd').datepicker('destroy');
-
- $(this).dialog("close");
- };
-
- $('#logAnalyseDialog').dialog({
- width: 'auto',
- height: 'auto',
- buttons: dlgBtns
- });
-
- return false;
- }
- }
- },
- xAxis: {
- min: runtime.xmin,
- max: runtime.xmax
- },
-
- yAxis: {
- title: {
- text: ''
- }
- },
- tooltip: {
- formatter: function() {
- var s = '<b>'+Highcharts.dateFormat('%H:%M:%S', this.x)+'</b>';
-
- $.each(this.points, function(i, point) {
- s += '<br/><span style="color:'+point.series.color+'">'+ point.series.name +':</span> '+
- ((parseInt(point.y) == point.y) ? point.y : Highcharts.numberFormat(this.y, 2)) + ' ' + (point.series.options.unit || '');
- });
-
- return s;
- },
- shared: true
- },
- legend: {
- enabled: false
- },
- series: series,
- buttons: gridbuttons,
- title: { text: chartObj.title }
- };
-
- if(chartObj.settings)
- $.extend(true,settings,chartObj.settings);
-
- if($('#'+settings.chart.renderTo).length==0) {
- var numCharts = $('table#chartGrid .monitorChart').length;
-
- if(numCharts == 0 || !( numCharts % monitorSettings.columns))
- $('table#chartGrid').append('<tr></tr>');
-
- $('table#chartGrid tr:last').append('<td><div class="ui-state-default monitorChart" id="'+settings.chart.renderTo+'"></div></td>');
- }
-
- chartObj.chart = PMA_createChart(settings);
- chartObj.numPoints = 0;
-
- if(initialize != true) {
- runtime.charts['c'+runtime.chartAI] = chartObj;
- buildRequiredDataList();
- }
-
- // Edit,Print icon only in edit mode
- $('table#chartGrid div svg').find('*[zIndex=20], *[zIndex=21], *[zIndex=19]').toggle(editMode)
-
- runtime.chartAI++;
- }
-
- function editChart(chartObj) {
- var htmlnode = chartObj.options.chart.renderTo;
- if(! htmlnode ) return;
-
- var chart=null;
- var chartKey=null;
- $.each(runtime.charts, function(key, value) {
- if(value.chart.options.chart.renderTo == htmlnode) {
- chart = value;
- chartKey = key;
- return false;
- }
- });
-
- if(chart == null) return;
-
- var htmlStr = '<p><b>Chart title: </b> <br/> <input type="text" size="35" name="chartTitle" value="' + chart.title + '" />';
- htmlStr += '</p><p><b>Series:</b> </p><ol>';
- for(var i=0; i<chart.nodes.length; i++) {
- htmlStr += '<li><i>' + chart.nodes[i].dataPoint +': </i><br/><input type="text" name="chartSerie-' + i + '" value=" ' + chart.nodes[i].name + '" /></li>';
- }
-
- dlgBtns = {};
- dlgBtns['Save'] = function() {
- runtime.charts[chartKey].title = $('div#emptyDialog input[name="chartTitle"]').attr('value');
- runtime.charts[chartKey].chart.setTitle({ text: runtime.charts[chartKey].title });
-
- $('div#emptyDialog input[name*="chartSerie"]').each(function() {
- var idx = $(this).attr('name').split('-')[1];
- runtime.charts[chartKey].nodes[idx].name = $(this).attr('value');
- runtime.charts[chartKey].chart.series[idx].name = $(this).attr('value');
- });
-
- $(this).dialog('close');
- saveMonitor();
- };
- dlgBtns['Cancel'] = function() {
- $(this).dialog('close');
- };
-
- $('div#emptyDialog').attr('title','Edit chart');
- $('div#emptyDialog').html(htmlStr+'</ol>');
- $('div#emptyDialog').dialog({
- width: 'auto',
- height: 'auto',
- buttons: dlgBtns
- });
- }
-
- function removeChart(chartObj) {
- var htmlnode = chartObj.options.chart.renderTo;
- if(! htmlnode ) return;
-
- $.each(runtime.charts, function(key, value) {
- if(value.chart.options.chart.renderTo == htmlnode) {
- delete runtime.charts[key];
- return false;
- }
- });
-
- buildRequiredDataList();
-
- // Using settimeout() because clicking the remove link fires an onclick event
- // which throws an error when the chart is destroyed
- setTimeout(function() {
- chartObj.destroy();
- $('div#' + htmlnode).remove();
- },10);
-
- saveMonitor(); // Save settings
- }
-
- function refreshChartGrid() {
- /* Send to server */
- runtime.refreshRequest = $.post('server_status.php?'+url_query, { ajax_request: true, chart_data: 1, type: 'chartgrid', requiredData: $.toJSON(runtime.dataList) },function(data) {
- var chartData;
- try {
- chartData = $.parseJSON(data);
- } catch(err) {
- return serverResponseError();
- }
- var value, i=0;
- var diff;
-
- /* Update values in each graph */
- $.each(runtime.charts, function(orderKey, elem) {
- var key = elem.chartID;
- // If newly added chart, we have no data for it yet
- if(! chartData[key]) return;
- // Draw all points
- for(var j=0; j < elem.nodes.length; j++) {
- value = chartData[key][j].y;
-
- if(i==0 && j==0) {
- if(oldChartData==null) diff = chartData.x - runtime.xmax;
- else diff = parseInt(chartData.x - oldChartData.x);
-
- runtime.xmin+= diff;
- runtime.xmax+= diff;
- }
-
- elem.chart.xAxis[0].setExtremes(runtime.xmin, runtime.xmax, false);
-
- if(elem.nodes[j].display == 'differential') {
- if(oldChartData == null || oldChartData[key] == null) continue;
- value -= oldChartData[key][j].y;
- }
-
- if(elem.nodes[j].valueDivisor)
- value = value / elem.nodes[j].valueDivisor;
-
- if(elem.nodes[j].transformFn) {
- value = chartValueTransform(
- elem.nodes[j].transformFn,
- chartData[key][j],
- (oldChartData == null ? null : oldChartData[key][j])
- );
- }
-
- if(value != undefined)
- elem.chart.series[j].addPoint(
- { x: chartData.x, y: value },
- false,
- elem.numPoints >= runtime.gridMaxPoints
- );
- }
-
- i++;
-
- runtime.charts[orderKey].numPoints++;
- if(runtime.redrawCharts)
- elem.chart.redraw();
- });
-
- oldChartData = chartData;
-
- runtime.refreshTimeout = setTimeout(refreshChartGrid, monitorSettings.gridRefresh);
- });
- }
-
- function chartValueTransform(name,cur,prev) {
- switch(name) {
- case 'cpu-linux':
- if(prev == null) return undefined;
- var diff_total = cur.busy + cur.idle - (prev.busy + prev.idle);
- var diff_idle = cur.idle - prev.idle;
- return 100*(diff_total - diff_idle) / diff_total;
- }
- return undefined;
- }
-
- /* Build list of nodes that need to be retrieved */
- function buildRequiredDataList() {
- runtime.dataList = {};
- // Store an own id, because the property name is subject of reordering, thus destroying our mapping with runtime.charts <=> runtime.dataList
- var chartID = 0;
- $.each(runtime.charts, function(key, chart) {
- runtime.dataList[chartID] = chart.nodes;
- runtime.charts[key].chartID = chartID;
- chartID++;
- });
- }
-
- function loadLogStatistics(opts) {
- var tableStr = '';
- var logRequest = null;
-
- if(! opts.removeVariables)
- opts.removeVariables = false;
- if(! opts.limitTypes)
- opts.limitTypes = false;
-
- $('#emptyDialog').html(PMA_messages['strAnalysingLogs'] + ' <img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">');
-
- $('#emptyDialog').dialog({
- width: 'auto',
- height: 'auto',
- buttons: {
- 'Cancel request': function() {
- if(logRequest != null)
- logRequest.abort();
-
- $(this).dialog("close");
- }
- }
- });
-
-
- logRequest = $.get('server_status.php?'+url_query,
- { ajax_request: true,
- log_data: 1,
- type: opts.src,
- time_start: Math.round(opts.start / 1000),
- time_end: Math.round(opts.end / 1000),
- removeVariables: opts.removeVariables,
- limitTypes: opts.limitTypes
- },
- function(data) {
- var logData;
- try {
- logData = $.parseJSON(data);
- } catch(err) {
- return serverResponseError();
- }
-
- if(logData.rows.length != 0) {
- runtime.logDataCols = buildLogTable(logData);
-
- /* Show some stats in the dialog */
- $('#emptyDialog').attr('title', PMA_messages['strLoadingLogs']);
- $('#emptyDialog').html('<p>' + PMA_messages['strLogDataLoaded'] + '</p>');
- $.each(logData.sum, function(key, value) {
- key = key.charAt(0).toUpperCase() + key.slice(1).toLowerCase();
- if(key == 'Total') key = '<b>' + key + '</b>';
- $('#emptyDialog').append(key + ': ' + value + '<br/>');
- });
-
- /* Add filter options if more than a bunch of rows there to filter */
- if(logData.numRows > 12) {
- $('div#logTable').prepend(
- '<fieldset id="logDataFilter">' +
- ' <legend>' + PMA_messages['strFilters'] + '</legend>' +
- ' <div class="formelement">' +
- ' <label for="filterQueryText">' + PMA_messages['strFilterByWordRegexp'] + '</label>' +
- ' <input name="filterQueryText" type="text" id="filterQueryText" style="vertical-align: baseline;" />' +
- ' </div>' +
- ((logData.numRows > 250) ? ' <div class="formelement"><button name="startFilterQueryText" id="startFilterQueryText">' + PMA_messages['strFilter'] + '</button></div>' : '') +
- ' <div class="formelement">' +
- ' <input type="checkbox" id="noWHEREData" name="noWHEREData" value="1" /> ' +
- ' <label for="noWHEREData"> ' + PMA_messages['strIgnoreWhereAndGroup'] + '</label>' +
- ' </div' +
- '</fieldset>'
- );
-
- $('div#logTable input#noWHEREData').change(function() {
- filterQueries(true);
- });
-
- //preg_replace('/\s+([^=]+)=(\d+|((\'|"|)(?U)(.+)(?<!\\\)\4(\s+|$)))/i',' $1={} ',$str);
-
- if(logData.numRows > 250) {
- $('div#logTable button#startFilterQueryText').click(filterQueries);
- } else {
- $('div#logTable input#filterQueryText').keyup(filterQueries);
- }
-
- }
-
- var dlgBtns = {};
- dlgBtns[PMA_messages['strJumpToTable']] = function() {
- $(this).dialog("close");
- $(document).scrollTop($('div#logTable').offset().top);
- };
-
- $('#emptyDialog').dialog( "option", "buttons", dlgBtns);
-
- } else {
- $('#emptyDialog').html('<p>' + PMA_messages['strNoDataFound'] + '</p>');
-
- var dlgBtns = {};
- dlgBtns[PMA_messages['strClose']] = function() {
- $(this).dialog("close");
- };
-
- $('#emptyDialog').dialog( "option", "buttons", dlgBtns );
- }
- }
- );
-
- function filterQueries(varFilterChange) {
- var odd_row=false, cell, textFilter;
- var val = $('div#logTable input#filterQueryText').val();
-
- if(val.length == 0) textFilter = null;
- else textFilter = new RegExp(val, 'i');
-
- var rowSum = 0, totalSum = 0, i=0, q;
- var noVars = $('div#logTable input#noWHEREData').attr('checked');
- var equalsFilter = /([^=]+)=(\d+|((\'|"|).*?[^\\])\4((\s+)|$))/gi;
- var functionFilter = /([a-z0-9_]+)\(.+?\)/gi;
- var filteredQueries = {};
- var filteredQueriesLines = {};
- var hide = false, rowData;
- var queryColumnName = runtime.logDataCols[runtime.logDataCols.length - 2];
- var sumColumnName = runtime.logDataCols[runtime.logDataCols.length - 1];
-
- var isSlowLog = opts.src == 'slow';
- var columnSums = {};
-
- var countRow = function(query, row) {
- var cells = row.match(/<td>(.*?)<\/td>/gi);
- if(!columnSums[query]) columnSums[query] = [0,0,0,0];
-
- columnSums[query][0] += timeToSec(cells[2].replace(/(<td>|<\/td>)/gi,''));
- columnSums[query][1] += timeToSec(cells[3].replace(/(<td>|<\/td>)/gi,''));
- columnSums[query][2] += parseInt(cells[4].replace(/(<td>|<\/td>)/gi,''));
- columnSums[query][3] += parseInt(cells[5].replace(/(<td>|<\/td>)/gi,''));
- };
-
- // We just assume the sql text is always in the second last column, and that the total count is right of it
- $('div#logTable table tbody tr td:nth-child(' + (runtime.logDataCols.length - 1) + ')').each(function() {
- if(varFilterChange && $(this).html().match(/^SELECT/i)) {
- if(noVars) {
- q = $(this).text().replace(equalsFilter, '$1=...$6').trim();
- q = q.replace(functionFilter, ' $1(...)');
-
- // Js does not specify a limit on property name length, so we can abuse it as index :-)
- if(filteredQueries[q]) {
- filteredQueries[q] += parseInt($(this).next().text());
- totalSum += parseInt($(this).next().text());
- hide = true;
- } else {
- filteredQueries[q] = parseInt($(this).next().text());;
- filteredQueriesLines[q] = i;
- $(this).text(q);
- }
- if(isSlowLog) countRow(q, $(this).parent().html());
-
- // Restore original columns
- } else {
- rowData = $(this).parent().data('query');
-
- // SQL Text
- $(this).text(rowData[queryColumnName]);
- // #
- $(this).next().text(rowData[sumColumnName]);
- // Slow log columns
- if(isSlowLog) {
- $(this).parent().children('td:nth-child(3)').text(rowData['query_time']);
- $(this).parent().children('td:nth-child(4)').text(rowData['lock_time']);
- $(this).parent().children('td:nth-child(5)').text(rowData['rows_sent']);
- $(this).parent().children('td:nth-child(6)').text(rowData['rows_examined']);
- }
- }
- }
-
- if(! hide && (textFilter != null && ! textFilter.exec($(this).text()))) hide = true;
-
- if(hide) {
- $(this).parent().css('display','none');
- } else {
- totalSum += parseInt($(this).next().text());
- rowSum ++;
-
- odd_row = ! odd_row;
- $(this).parent().css('display','');
- if(odd_row) {
- $(this).parent().addClass('odd');
- $(this).parent().removeClass('even');
- } else {
- $(this).parent().addClass('even');
- $(this).parent().removeClass('odd');
- }
- }
-
- hide = false;
- i++;
- });
-
- // Update count values of grouped entries
- if(varFilterChange) {
- if(noVars) {
- var numCol, row, $table = $('div#logTable table tbody');
- $.each(filteredQueriesLines, function(key,value) {
- if(filteredQueries[key] <= 1) return;
-
- row = $table.children('tr:nth-child(' + (value+1) + ')');
- numCol = row.children(':nth-child(' + (runtime.logDataCols.length) + ')');
- numCol.text(filteredQueries[key]);
-
- if(isSlowLog) {
- row.children('td:nth-child(3)').text(secToTime(columnSums[key][0]));
- row.children('td:nth-child(4)').text(secToTime(columnSums[key][1]));
- row.children('td:nth-child(5)').text(columnSums[key][2]);
- row.children('td:nth-child(6)').text(columnSums[key][3]);
- }
- });
- }
-
- $('div#logTable table').trigger("update");
- setTimeout(function() {
- $('div#logTable table').trigger('sorton',[[[runtime.logDataCols.length - 1,1]]]);
- }, 0);
- }
-
- $('div#logTable table tfoot tr')
- .html('<th colspan="' + (runtime.logDataCols.length - 1) + '">' +
- PMA_messages['strSumRows'] + ' '+ rowSum +'<span style="float:right">' +
- PMA_messages['strTotal'] + '</span></th><th align="right">' + totalSum + '</th>');
- }
- }
-
- /*loadLogStatistics({
- src: 'general',
- start:1311076210*1000,
- end:1311162689*1000,
- removeVariables: true,
- limitTypes: true
- });*/
-
- function timeToSec(timeStr) {
- var time = timeStr.split(':');
- return parseInt(time[0]*3600) + parseInt(time[1]*60) + parseInt(time[2]);
- }
-
- function secToTime(timeInt) {
- hours = Math.floor(timeInt / 3600);
- timeInt -= hours*3600;
- minutes = Math.floor(timeInt / 60);
- timeInt -= minutes*60;
-
- if(hours < 10) hours = '0' + hours;
- if(minutes < 10) minutes = '0' + minutes;
- if(timeInt < 10) timeInt = '0' + timeInt;
-
- return hours + ':' + minutes + ':' + timeInt;
- }
-
- function buildLogTable(data) {
- var rows = data.rows;
- var cols = new Array();
- var $table = $('<table border="0" class="sortable"></table>');
- var $tBody, $tRow, $tCell;
-
- $('#logTable').html($table);
-
- var formatValue = function(name, value) {
- switch(name) {
- case 'user_host':
- return value.replace(/(\[.*?\])+/g,'');
- }
- return value;
- };
-
- for(var i=0; i < rows.length; i++) {
- if(i == 0) {
- $.each(rows[0],function(key, value) {
- cols.push(key);
- });
- $table.append( '<thead>' +
- '<tr><th class="nowrap">' + cols.join('</th><th class="nowrap">') + '</th></tr>' +
- '</thead>');
-
- $table.append($tBody = $('<tbody></tbody>'));
- }
-
- $tBody.append($tRow = $('<tr class="noclick"></tr>'));
- var cl=''
- for(var j=0; j < cols.length; j++) {
- // Assuming the query column is the second last
- if(j == cols.length - 2 && rows[i][cols[j]].match(/^SELECT/i)) {
- $tRow.append($tCell=$('<td class="linkElem">' + formatValue(cols[j], rows[i][cols[j]]) + '</td>'));
- $tCell.click(queryAnalyzer);
- } else
- $tRow.append('<td>' + formatValue(cols[j], rows[i][cols[j]]) + '</td>');
-
-
- $tRow.data('query',rows[i]);
- }
- }
-
- $table.append('<tfoot>' +
- '<tr><th colspan="' + (cols.length - 1) + '">' + PMA_messages['strSumRows'] +
- ' '+ data.numRows +'<span style="float:right">' + PMA_messages['strTotal'] +
- '</span></th><th align="right">' + data.sum.TOTAL + '</th></tr></tfoot>');
-
-
- function queryAnalyzer() {
- var query = $(this).parent().data('query').argument || $(this).parent().data('query').sql_text;
- var db = $(this).parent().data('query').db || '';
-
- /* A very basic SQL Formatter. Totally fails in the cases of
- - Any string appearance containing a MySQL Keyword, surrounded by whitespaces, e.g. WHERE bar = "This where the formatter fails"
- - Subqueries too probably
- */
-
- // Matches the columns to be selected
- // .* selector doesn't include whitespace and we have no PCRE_DOTALL modifier, (.|\s)+ crashes Chrome (reported and confirmed),
- // [^]+ results in JS error in IE8, thus we use [^\0]+ for matching each column since the zero-byte char (hopefully) doesn't appear in column names ;)
- var sLists = query.match(/SELECT\s+[^\0]+\s+FROM\s+/gi);
- if(sLists) {
- for(var i=0; i < sLists.length; i++) {
- query = query.replace(sLists[i],sLists[i].replace(/\s*((`|'|"|).*?\1,)\s*/gi,'$1\n\t'));
- }
- query = query
- .replace(/(\s+|^)(SELECT|FROM|WHERE|GROUP BY|HAVING|ORDER BY|LIMIT)(\s+|$)/gi,'\n$2\n\t')
- .replace(/\s+UNION\s+/gi,'\n\nUNION\n\n')
- .replace(/\s+(AND)\s+/gi,' $1\n\t')
- .trim();
- }
-
- codemirror_editor.setValue(query);
-
- var profilingChart = null;
-
- $('div#queryAnalyzerDialog').dialog({
- width: 'auto',
- height: 'auto',
- resizable: false,
- buttons: {
- 'Analyse Query' : function() {
- $('div#queryAnalyzerDialog div.placeHolder').html('Analyzing... ' + '<img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">');
-
- $.post('server_status.php?'+url_query, {
- ajax_request: true,
- query_analyzer: true,
- query: codemirror_editor.getValue(),
- database: db
- }, function(data) {
- data = $.parseJSON(data);
- var totalTime = 0;
-
- if(data.error) {
- $('div#queryAnalyzerDialog div.placeHolder').html('<div class="error">' + data.error + '</div>');
- return;
- }
-
- // Float sux, I'll use table :(
- $('div#queryAnalyzerDialog div.placeHolder')
- .html('<table width="100%" border="0"><tr><td class="explain"></td><td class="chart"></td></tr></table>');
-
- var explain = '<b>Explain output</b> '+explain_docu;
- if(data.explain.length > 1) {
- explain += ' (';
- for(var i=0; i < data.explain.length; i++) {
- if(i > 0) explain += ', ';
- explain += '<a href="#showExplain-' + i + '">' + i + '</a>';
- }
- explain += ')';
- }
- explain +='<p></p>';
- for(var i=0; i < data.explain.length; i++) {
- explain += '<div class="explain-' + i + '"' + (i>0? 'style="display:none;"' : '' ) + '>';
- $.each(data.explain[i], function(key,value) {
- value = (value==null)?'null':value;
-
- if(key == 'type' && value.toLowerCase() == 'all') value = '<span class="attention">' + value +'</span>';
- if(key == 'Extra') value = value.replace(/(using (temporary|filesort))/gi,'<span class="attention">$1</span>');
- explain += key+': ' + value + '<br />';
- });
- explain += '</div>';
- }
-
- // Since there is such a nice free space below the explain, lets put it here for now
- explain += '<p><b>' + PMA_messages['strAffectedRows'] + '</b> ' + data.affectedRows;
-
- $('div#queryAnalyzerDialog div.placeHolder td.explain').append(explain);
-
- $('div#queryAnalyzerDialog div.placeHolder a[href*="#showExplain"]').click(function() {
- var id = $(this).attr('href').split('-')[1];
- $(this).parent().find('div[class*="explain"]').hide();
- $(this).parent().find('div[class*="explain-' + id + '"]').show();
- });
-
- if(data.profiling) {
- var chartData = [];
- var numberTable = '<table class="queryNums"><thead><tr><th>Status</th><th>Time</th></tr></thead><tbody>';
- var duration;
-
- for(var i=0; i < data.profiling.length; i++) {
- duration = parseFloat(data.profiling[i].duration);
-
- chartData.push([data.profiling[i].state, duration]);
- totalTime+=duration;
-
- numberTable += '<tr><td>' + data.profiling[i].state + ' </td><td> ' + PMA_prettyProfilingNum(duration,2) + '</td></tr>';
- }
- numberTable += '<tr><td><b>Total time:</b></td><td>' + PMA_prettyProfilingNum(totalTime,2) + '</td></tr>';
- numberTable += '</tbody></table>';
-
- $('div#queryAnalyzerDialog div.placeHolder td.chart').append('<b>Profiling results ' + profiling_docu + '</b> (<a href="#showNums">Table</a>, <a href="#showChart">Chart</a>)<br/>' + numberTable + ' <div id="queryProfiling"></div>');
-
- $('div#queryAnalyzerDialog div.placeHolder a[href="#showNums"]').click(function() {
- $('div#queryAnalyzerDialog div#queryProfiling').hide();
- $('div#queryAnalyzerDialog table.queryNums').show();
- return false;
- });
-
- $('div#queryAnalyzerDialog div.placeHolder a[href="#showChart"]').click(function() {
- $('div#queryAnalyzerDialog div#queryProfiling').show();
- $('div#queryAnalyzerDialog table.queryNums').hide();
- return false;
- });
-
- profilingChart = PMA_createProfilingChart(chartData, {
- chart: {
- renderTo: 'queryProfiling'
- },
- plotOptions: {
- pie: {
- size: '50%'
- }
- }
- });
-
-
- $('div#queryProfiling').resizable();
- }
-
- });
- },
- 'Close' : function() {
- if(profilingChart != null) {
- profilingChart.destroy();
- }
- $('div#queryAnalyzerDialog div.placeHolder').html('');
- codemirror_editor.setValue('');
-
- $(this).dialog("close");
- }
- }
- });
- }
-
- // Append a tooltip to the count column, if there exist one
- if($('#logTable th:last').html() == '#') {
- $('#logTable th:last').append(' <img class="qroupedQueryInfoIcon icon ic_b_docs" src="themes/dot.gif" alt="" />');
-
- var qtipContent = PMA_messages['strCountColumnExplanation'];
- if(groupInserts) qtipContent += '<p>' + PMA_messages['strMoreCountColumnExplanation'] + '</p>';
-
- $('img.qroupedQueryInfoIcon').qtip({
- content: qtipContent,
- position: {
- corner: {
- target: 'bottomMiddle',
- tooltip: 'topRight'
- }
-
- },
- hide: { delay: 1000 }
- })
- }
-
- $('div#logTable table').tablesorter({
- sortList: [[cols.length - 1,1]],
- widgets: ['zebra']
- });
-
- $('div#logTable table thead th')
- .append('<img class="icon sortableIcon" src="themes/dot.gif" alt="">');
-
- return cols;
- }
-
- function saveMonitor() {
- var gridCopy = {};
-
- $.each(runtime.charts, function(key, elem) {
- gridCopy[key] = {};
- gridCopy[key].nodes = elem.nodes;
- gridCopy[key].settings = elem.settings;
- gridCopy[key].title = elem.title;
- });
-
- if(window.localStorage) {
- window.localStorage['monitorCharts'] = $.toJSON(gridCopy);
- window.localStorage['monitorSettings'] = $.toJSON(monitorSettings);
- }
-
- $('a[href="#clearMonitorConfig"]').show();
- }
-
function serverResponseError() {
var btns = {};
btns[PMA_messages['strReloadPage']] = function() {
window.location.reload();
};
- $('#emptyDialog').attr('title',PMA_messages['strRefreshFailed']);
- $('#emptyDialog').html('<img class="icon ic_s_attention" src="themes/dot.gif" alt=""> ' + PMA_messages['strInvalidResponseExplanation'])
+ $('#emptyDialog').attr('title', PMA_messages['strRefreshFailed']);
+ $('#emptyDialog').html(
+ '<img class="icon ic_s_attention" src="themes/dot.gif" alt=""> ' +
+ PMA_messages['strInvalidResponseExplanation']
+ );
$('#emptyDialog').dialog({ buttons: btns });
}
-
});
diff --git a/js/server_status.js b/js/server_status_monitor.js
similarity index 52%
copy from js/server_status.js
copy to js/server_status_monitor.js
index 5abb5df..cb01ca7 100644
--- a/js/server_status.js
+++ b/js/server_status_monitor.js
@@ -1,609 +1,15 @@
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @fileoverview functions used in server status pages
- * @name Server Status
- *
- * @requires jQuery
- * @requires jQueryUI
- * @requires jQueryCookie
- * @requires jQueryTablesorter
- * @requires Highcharts
- * @requires canvg
- * @requires js/functions.js
- *
- */
-
-// Add a tablesorter parser to properly handle thousands seperated numbers and SI prefixes
$(function() {
- jQuery.tablesorter.addParser({
- id: "fancyNumber",
- is: function(s) {
- return /^[0-9]?[0-9,\.]*\s?(k|M|G|T|%)?$/.test(s);
- },
- format: function(s) {
- var num = jQuery.tablesorter.formatFloat(
- s.replace(PMA_messages['strThousandsSeperator'],'')
- .replace(PMA_messages['strDecimalSeperator'],'.')
- );
-
- var factor = 1;
- switch (s.charAt(s.length - 1)) {
- case '%': factor = -2; break;
- // Todo: Complete this list (as well as in the regexp a few lines up)
- case 'k': factor = 3; break;
- case 'M': factor = 6; break;
- case 'G': factor = 9; break;
- case 'T': factor = 12; break;
- }
-
- return num * Math.pow(10,factor);
- },
- type: "numeric"
- });
-
-
- // Popup behaviour
- $('a[rel="popupLink"]').click( function() {
- var $link = $(this);
-
- $('.' + $link.attr('href').substr(1))
- .show()
- .offset({ top: $link.offset().top + $link.height() + 5, left: $link.offset().left })
- .addClass('openedPopup');
-
- return false;
- });
-
- $(document).click( function(event) {
- $('.openedPopup').each(function() {
- var $cnt = $(this);
- var pos = $(this).offset();
-
- // Hide if the mouseclick is outside the popupcontent
- if(event.pageX < pos.left || event.pageY < pos.top || event.pageX > pos.left + $cnt.outerWidth() || event.pageY > pos.top + $cnt.outerHeight())
- $cnt.hide().removeClass('openedPopup');
- });
- });
-});
-
-$(function() {
- // Filters for status variables
- var textFilter=null;
- var alertFilter = false;
- var categoryFilter='';
- var odd_row=false;
- var text=''; // Holds filter text
- var queryPieChart = null;
-
- /* Chart configuration */
- // Defines what the tabs are currently displaying (realtime or data)
- var tabStatus = new Object();
- // Holds the current chart instances for each tab
- var tabChart = new Object();
-
-
- /*** Table sort tooltip ***/
-
- var $tableSortHint = $('<div class="dHint" style="display:none;">' + 'Click to sort' + '</div>');
- $('body').append($tableSortHint);
-
- $('table.sortable thead th').live('mouseover mouseout',function(e) {
- if(e.type == 'mouseover') {
- $tableSortHint
- .stop(true, true)
- .css({
- top: e.clientY + 15,
- left: e.clientX + 15
- })
- .show('fast')
- .data('shown',true);
- } else {
- $tableSortHint
- .stop(true, true)
- .hide(300,function() {
- $(this).data('shown',false);
- });
- }
- });
-
- $(document).mousemove(function(e) {
- if($tableSortHint.data('shown') == true)
- $tableSortHint.css({
- top: e.clientY + 15,
- left: e.clientX + 15
- })
- });
-
-
- // Tell highcarts not to use UTC dates (global setting)
- Highcharts.setOptions({
- global: {
- useUTC: false
- }
- });
-
- $.ajaxSetup({
- cache:false
- });
-
- // Add tabs
- $('#serverStatusTabs').tabs({
- // Tab persistence
- cookie: { name: 'pma_serverStatusTabs', expires: 1 },
- // Fixes line break in the menu bar when the page overflows and scrollbar appears
- show: function() { menuResize(); }
- });
-
- // Fixes wrong tab height with floated elements. See also http://bugs.jqueryui.com/ticket/5601
- $(".ui-widget-content:not(.ui-tabs):not(.ui-helper-clearfix)").addClass("ui-helper-clearfix");
-
- // Initialize each tab
- $('div.ui-tabs-panel').each(function() {
- initTab($(this),null);
- tabStatus[$(this).attr('id')] = 'static';
- });
-
- // Display button links
- $('div.buttonlinks').show();
-
- // Handles refresh rate changing
- $('.buttonlinks select').change(function() {
- var chart=tabChart[$(this).parents('div.ui-tabs-panel').attr('id')];
-
- // Clear current timeout and set timeout with the new refresh rate
- clearTimeout(chart_activeTimeouts[chart.options.chart.renderTo]);
- if(chart.options.realtime.postRequest)
- chart.options.realtime.postRequest.abort();
-
- chart.options.realtime.refreshRate = 1000*parseInt(this.value);
-
- chart.xAxis[0].setExtremes(
- new Date().getTime() - server_time_diff - chart.options.realtime.numMaxPoints * chart.options.realtime.refreshRate,
- new Date().getTime() - server_time_diff,
- true
- );
-
- chart_activeTimeouts[chart.options.chart.renderTo] = setTimeout(
- chart.options.realtime.timeoutCallBack,
- chart.options.realtime.refreshRate
- );
- });
-
- // Ajax refresh of variables (always the first element in each tab)
- $('.buttonlinks a.tabRefresh').click(function() {
- // ui-tabs-panel class is added by the jquery tabs feature
- var tab=$(this).parents('div.ui-tabs-panel');
- var that = this;
-
- // Show ajax load icon
- $(this).find('img').show();
-
- $.get($(this).attr('href'),{ajax_request:1},function(data) {
- $(that).find('img').hide();
- initTab(tab,data);
- });
-
- tabStatus[tab.attr('id')]='data';
-
- return false;
- });
-
-
- /** Realtime charting of variables **/
-
- // Live traffic charting
- $('.buttonlinks a.livetrafficLink').click(function() {
- // ui-tabs-panel class is added by the jquery tabs feature
- var $tab=$(this).parents('div.ui-tabs-panel');
- var tabstat = tabStatus[$tab.attr('id')];
-
- if(tabstat=='static' || tabstat=='liveconnections') {
- var settings = {
- series: [
- { name: PMA_messages['strChartKBSent'], data: [] },
- { name: PMA_messages['strChartKBReceived'], data: [] }
- ],
- title: { text: PMA_messages['strChartServerTraffic'] },
- realtime: { url:'server_status.php?' + url_query,
- type: 'traffic',
- callback: function(chartObj, curVal, lastVal, numLoadedPoints) {
- if(lastVal==null) return;
- chartObj.series[0].addPoint(
- { x: curVal.x, y: (curVal.y_sent - lastVal.y_sent) / 1024 },
- false,
- numLoadedPoints >= chartObj.options.realtime.numMaxPoints
- );
- chartObj.series[1].addPoint(
- { x: curVal.x, y: (curVal.y_received - lastVal.y_received) / 1024 },
- true,
- numLoadedPoints >= chartObj.options.realtime.numMaxPoints
- );
- },
- error: function() { serverResponseError(); }
- }
- }
-
- setupLiveChart($tab,this,settings);
- if(tabstat == 'liveconnections')
- $tab.find('.buttonlinks a.liveconnectionsLink').html(PMA_messages['strLiveConnChart']);
- tabStatus[$tab.attr('id')]='livetraffic';
- } else {
- $(this).html(PMA_messages['strLiveTrafficChart']);
- setupLiveChart($tab,this,null);
- }
-
- return false;
- });
-
- // Live connection/process charting
- $('.buttonlinks a.liveconnectionsLink').click(function() {
- var $tab=$(this).parents('div.ui-tabs-panel');
- var tabstat = tabStatus[$tab.attr('id')];
-
- if(tabstat == 'static' || tabstat == 'livetraffic') {
- var settings = {
- series: [
- { name: PMA_messages['strChartConnections'], data: [] },
- { name: PMA_messages['strChartProcesses'], data: [] }
- ],
- title: { text: PMA_messages['strChartConnectionsTitle'] },
- realtime: { url:'server_status.php?'+url_query,
- type: 'proc',
- callback: function(chartObj, curVal, lastVal,numLoadedPoints) {
- if(lastVal==null) return;
- chartObj.series[0].addPoint(
- { x: curVal.x, y: curVal.y_conn - lastVal.y_conn },
- false,
- numLoadedPoints >= chartObj.options.realtime.numMaxPoints
- );
- chartObj.series[1].addPoint(
- { x: curVal.x, y: curVal.y_proc },
- true,
- numLoadedPoints >= chartObj.options.realtime.numMaxPoints
- );
- },
- error: function() { serverResponseError(); }
- }
- };
-
- setupLiveChart($tab,this,settings);
- if(tabstat == 'livetraffic')
- $tab.find('.buttonlinks a.livetrafficLink').html(PMA_messages['strLiveTrafficChart']);
- tabStatus[$tab.attr('id')]='liveconnections';
- } else {
- $(this).html(PMA_messages['strLiveConnChart']);
- setupLiveChart($tab,this,null);
- }
-
- return false;
- });
-
- // Live query statistics
- $('.buttonlinks a.livequeriesLink').click(function() {
- var $tab = $(this).parents('div.ui-tabs-panel');
- var settings = null;
-
- if(tabStatus[$tab.attr('id')] == 'static') {
- settings = {
- series: [ { name: PMA_messages['strChartIssuedQueries'], data: [] } ],
- title: { text: PMA_messages['strChartIssuedQueriesTitle'] },
- tooltip: { formatter:function() { return this.point.name; } },
- realtime: { url:'server_status.php?'+url_query,
- type: 'queries',
- callback: function(chartObj, curVal, lastVal,numLoadedPoints) {
- if(lastVal == null) return;
- chartObj.series[0].addPoint(
- { x: curVal.x, y: curVal.y - lastVal.y, name: sortedQueriesPointInfo(curVal,lastVal) },
- true,
- numLoadedPoints >= chartObj.options.realtime.numMaxPoints
- );
- },
- error: function() { serverResponseError(); }
- }
- };
- } else {
- $(this).html(PMA_messages['strLiveQueryChart']);
- }
-
- setupLiveChart($tab,this,settings);
- tabStatus[$tab.attr('id')] = 'livequeries';
- return false;
- });
-
- function setupLiveChart($tab,link,settings) {
- if(settings != null) {
- // Loading a chart with existing chart => remove old chart first
- if(tabStatus[$tab.attr('id')] != 'static') {
- clearTimeout(chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]);
- chart_activeTimeouts[$tab.attr('id')+"_chart_cnt"] = null;
- tabChart[$tab.attr('id')].destroy();
- // Also reset the select list
- $tab.find('.buttonlinks select').get(0).selectedIndex = 2;
- }
-
- if(! settings.chart) settings.chart = {};
- settings.chart.renderTo = $tab.attr('id') + "_chart_cnt";
-
- $tab.find('.tabInnerContent')
- .hide()
- .after('<div class="liveChart" id="' + $tab.attr('id') + '_chart_cnt"></div>');
- tabChart[$tab.attr('id')] = PMA_createChart(settings);
- $(link).html(PMA_messages['strStaticData']);
- $tab.find('.buttonlinks a.tabRefresh').hide();
- $tab.find('.buttonlinks .refreshList').show();
- } else {
- clearTimeout(chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]);
- chart_activeTimeouts[$tab.attr('id') + "_chart_cnt"]=null;
- $tab.find('.tabInnerContent').show();
- $tab.find('div#'+$tab.attr('id') + '_chart_cnt').remove();
- tabStatus[$tab.attr('id')]='static';
- tabChart[$tab.attr('id')].destroy();
- $tab.find('.buttonlinks a.tabRefresh').show();
- $tab.find('.buttonlinks select').get(0).selectedIndex=2;
- $tab.find('.buttonlinks .refreshList').hide();
+ // Show tab links
+ $('div#statustabs_charting div.tabLinks').show();
+ $('div#statustabs_charting img#loadingMonitorIcon').remove();
+ // Codemirror is loaded on demand so we might need to initialize it
+ if (! codemirror_editor) {
+ var elm = $('#sqlquery');
+ if (elm.length > 0 && typeof CodeMirror != 'undefined') {
+ codemirror_editor = CodeMirror.fromTextArea(elm[0], { lineNumbers: true, matchBrackets: true, indentUnit: 4, mode: "text/x-mysql" });
}
}
-
- /* 3 Filtering functions */
- $('#filterAlert').change(function() {
- alertFilter = this.checked;
- filterVariables();
- });
-
- $('#filterText').keyup(function(e) {
- word = $(this).val().replace(/_/g,' ');
-
- if(word.length == 0) textFilter = null;
- else textFilter = new RegExp("(^|_)" + word,'i');
-
- text = word;
-
- filterVariables();
- });
-
- $('#filterCategory').change(function() {
- categoryFilter = $(this).val();
- filterVariables();
- });
-
- $('input#dontFormat').change(function() {
- $('#serverstatusvariables td.value span.original').toggle(this.checked);
- $('#serverstatusvariables td.value span.formatted').toggle(! this.checked);
- });
-
- /* Adjust DOM / Add handlers to the tabs */
- function initTab(tab,data) {
- switch(tab.attr('id')) {
- case 'statustabs_traffic':
- if(data != null) tab.find('.tabInnerContent').html(data);
- PMA_convertFootnotesToTooltips();
- break;
- case 'statustabs_queries':
- if(data != null) {
- queryPieChart.destroy();
- tab.find('.tabInnerContent').html(data);
- }
-
- // Build query statistics chart
- var cdata = new Array();
- $.each(jQuery.parseJSON($('#serverstatusquerieschart span').html()),function(key,value) {
- cdata.push([key,parseInt(value)]);
- });
-
- queryPieChart = PMA_createChart({
- chart: {
- renderTo: 'serverstatusquerieschart'
- },
- title: {
- text:'',
- margin:0
- },
- series: [{
- type:'pie',
- name: PMA_messages['strChartQueryPie'],
- data: cdata
- }],
- plotOptions: {
- pie: {
- allowPointSelect: true,
- cursor: 'pointer',
- dataLabels: {
- enabled: true,
- formatter: function() {
- return '<b>'+ this.point.name +'</b><br/> ' + Highcharts.numberFormat(this.percentage, 2) + ' %';
- }
- }
- }
- },
- tooltip: {
- formatter: function() {
- return '<b>' + this.point.name + '</b><br/>' + Highcharts.numberFormat(this.y, 2) + '<br/>(' + Highcharts.numberFormat(this.percentage, 2) + ' %)';
- }
- }
- });
- break;
-
- case 'statustabs_allvars':
- if(data != null) {
- tab.find('.tabInnerContent').html(data);
- filterVariables();
- }
- break;
- }
-
- initTableSorter(tab.attr('id'));
- }
-
- function initTableSorter(tabid) {
- switch(tabid) {
- case 'statustabs_queries':
- $('#serverstatusqueriesdetails').tablesorter({
- sortList: [[3,1]],
- widgets: ['zebra'],
- headers: {
- 1: { sorter: 'fancyNumber' },
- 2: { sorter: 'fancyNumber' }
- }
- });
-
- $('#serverstatusqueriesdetails tr:first th')
- .append('<img class="icon sortableIcon" src="themes/dot.gif" alt="">');
-
- break;
-
- case 'statustabs_allvars':
- $('#serverstatusvariables').tablesorter({
- sortList: [[0,0]],
- widgets: ['zebra'],
- headers: {
- 1: { sorter: 'fancyNumber' }
- }
- });
-
- $('#serverstatusvariables tr:first th')
- .append('<img class="icon sortableIcon" src="themes/dot.gif" alt="">');
-
- break;
- }
- }
-
- /* Filters the status variables by name/category/alert in the variables tab */
- function filterVariables() {
- var useful_links = 0;
- var section = text;
-
- if(categoryFilter.length > 0) section = categoryFilter;
-
- if(section.length > 1) {
- $('#linkSuggestions span').each(function() {
- if($(this).attr('class').indexOf('status_'+section) != -1) {
- useful_links++;
- $(this).css('display','');
- } else {
- $(this).css('display','none');
- }
-
-
- });
- }
-
- if(useful_links > 0)
- $('#linkSuggestions').css('display','');
- else $('#linkSuggestions').css('display','none');
-
- odd_row=false;
- $('#serverstatusvariables th.name').each(function() {
- if((textFilter == null || textFilter.exec($(this).text()))
- && (! alertFilter || $(this).next().find('span.attention').length>0)
- && (categoryFilter.length == 0 || $(this).parent().hasClass('s_'+categoryFilter))) {
- odd_row = ! odd_row;
- $(this).parent().css('display','');
- if(odd_row) {
- $(this).parent().addClass('odd');
- $(this).parent().removeClass('even');
- } else {
- $(this).parent().addClass('even');
- $(this).parent().removeClass('odd');
- }
- } else {
- $(this).parent().css('display','none');
- }
- });
- }
-
- // Provides a nicely formatted and sorted tooltip of each datapoint of the query statistics
- function sortedQueriesPointInfo(queries, lastQueries){
- var max, maxIdx, num=0;
- var queryKeys = new Array();
- var queryValues = new Array();
- var sumOther=0;
- var sumTotal=0;
-
- // Separate keys and values, then sort them
- $.each(queries.pointInfo, function(key,value) {
- if(value-lastQueries.pointInfo[key] > 0) {
- queryKeys.push(key);
- queryValues.push(value-lastQueries.pointInfo[key]);
- sumTotal += value-lastQueries.pointInfo[key];
- }
- });
- var numQueries = queryKeys.length;
- var pointInfo = '<b>' + PMA_messages['strTotal'] + ': ' + sumTotal + '</b><br>';
-
- while(queryKeys.length > 0) {
- max = 0;
- for(var i=0; i < queryKeys.length; i++) {
- if(queryValues[i] > max) {
- max = queryValues[i];
- maxIdx = i;
- }
- }
- if(numQueries > 8 && num >= 6)
- sumOther += queryValues[maxIdx];
- else pointInfo += queryKeys[maxIdx].substr(4).replace('_',' ') + ': ' + queryValues[maxIdx] + '<br>';
-
- queryKeys.splice(maxIdx,1);
- queryValues.splice(maxIdx,1);
- num++;
- }
-
- if(sumOther>0)
- pointInfo += PMA_messages['strOther'] + ': ' + sumOther;
-
- return pointInfo;
- }
-
- /**** Server config advisor ****/
-
- $('a[href="#openAdvisorInstructions"]').click(function() {
- $('#advisorInstructionsDialog').dialog();
- });
-
- $('a[href="#startAnalyzer"]').click(function() {
- var $cnt = $('#statustabs_advisor .tabInnerContent');
- $cnt.html('<img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">');
-
- $.get('server_status.php?'+url_query, { ajax_request: true, advisor: true },function(data) {
- var $tbody, $tr, str, even = true;
-
- data = $.parseJSON(data);
- $cnt.html('<p><b>Possible performance issues</b></p>');
- if(data.fired.length > 0) {
- $cnt.append('<table class="data" id="rulesFired" border="0"><thead><tr><th>Issue</th><th>Recommendation</th></tr></thead><tbody></tbody></table>');
- $tbody = $cnt.find('table#rulesFired');
- $.each(data.fired, function(key,value) {
- $tbody.append($tr = $('<tr class="linkElem noclick ' + (even ? 'even' : 'odd') + '"><td>' + value.issue + '</td>' +
- '<td>' + value.recommendation + ' </td></tr>'));
- even = !even;
-
- $tr.data('rule',value);
- $tr.click(function() {
- var rule = $(this).data('rule');
- $('div#emptyDialog').attr('title','Rule details');
- $('div#emptyDialog').html(
- '<p><b>Issue:</b><br />' + rule.issue + '</p>' +
- '<p><b>Recommendation:</b><br />' + rule.recommendation + '</p>' +
- '<p><b>Justification:</b><br />' + rule.justification + '</p>' +
- '<p><b>Used variable / formula:</b><br />' + rule.formula + '</p>' +
- '<p><b>Test:</b><br />' + rule.test + '</p>'
- );
- $('div#emptyDialog').dialog({
- width: 600,
- buttons: {
- 'Close' : function() {
- $(this).dialog('close');
- }
- }
- });
- });
- });
- }
- });
-
- return false;
- });
-
-
+
/**** Monitor charting implementation ****/
/* Saves the previous ajax response for differential values */
var oldChartData = null;
@@ -631,7 +37,7 @@ $(function() {
xmin: -1,
xmax: -1
};
-
+
var monitorSettings = null;
var defaultMonitorSettings = {
@@ -681,7 +87,7 @@ $(function() {
{ dataType: 'memory', name: PMA_messages['strUsedMemory'], dataPoint: 'MemUsed', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
{ dataType: 'memory', name: PMA_messages['strCachedMemory'], dataPoint: 'Cached', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
{ dataType: 'memory', name: PMA_messages['strBufferedMemory'], dataPoint: 'Buffers', valueDivisor: 1024, unit: PMA_messages['strMiB'] },
- { dataType: 'memory', name: PMA_messages['strFreeMemory'], dataPoint:'MemFree', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
+ { dataType: 'memory', name: PMA_messages['strFreeMemory'], dataPoint: 'MemFree', valueDivisor: 1024, unit: PMA_messages['strMiB'] }
],
settings: {
chart: {
@@ -736,7 +142,7 @@ $(function() {
};
// Server is localhost => We can add cpu/memory/swap
- if(server_db_isLocal) {
+ if (server_db_isLocal) {
defaultChartGrid['c3'] = presetCharts['cpu-' + server_os];
defaultChartGrid['c4'] = presetCharts['memory-' + server_os];
defaultChartGrid['c5'] = presetCharts['swap-' + server_os];
@@ -775,14 +181,16 @@ $(function() {
$('a[href="#rearrangeCharts"], a[href="#endChartEditMode"]').click(function() {
editMode = !editMode;
- if($(this).attr('href') == '#endChartEditMode') editMode = false;
+ if ($(this).attr('href') == '#endChartEditMode') {
+ editMode = false;
+ }
- // Icon graphics have zIndex 19,20 and 21. Let's just hope nothing else has the same zIndex
+ // Icon graphics have zIndex 19, 20 and 21. Let's just hope nothing else has the same zIndex
$('table#chartGrid div svg').find('*[zIndex=20], *[zIndex=21], *[zIndex=19]').toggle(editMode)
$('a[href="#endChartEditMode"]').toggle(editMode);
- if(editMode) {
+ if (editMode) {
// Close the settings popup
$('#statustabs_charting .popupContent').hide().removeClass('openedPopup');
@@ -800,20 +208,23 @@ $(function() {
var dragKey, dropKey, dropRender;
var dragRender = $(drag).children().first().attr('id');
- if($(drop).children().length > 0)
+ if ($(drop).children().length > 0) {
dropRender = $(drop).children().first().attr('id');
+ }
// Find the charts in the array
$.each(runtime.charts, function(key, value) {
- if(value.chart.options.chart.renderTo == dragRender)
+ if (value.chart.options.chart.renderTo == dragRender) {
dragKey = key;
- if(dropRender && value.chart.options.chart.renderTo == dropRender)
+ }
+ if (dropRender && value.chart.options.chart.renderTo == dropRender) {
dropKey = key;
+ }
});
// Case 1: drag and drop are charts -> Switch keys
- if(dropKey) {
- if(dragKey) {
+ if (dropKey) {
+ if (dragKey) {
dragChart = runtime.charts[dragKey];
runtime.charts[dragKey] = runtime.charts[dropKey];
runtime.charts[dropKey] = dragChart;
@@ -827,15 +238,16 @@ $(function() {
var c = 0;
$.each(runtime.charts, function(key, value) {
- if(key != dropKey)
+ if (key != dropKey) {
keys.push(key);
+ }
});
keys.sort();
// Rebuilds all ids, with the dragged chart correctly inserted
- for(var i=0; i<keys.length; i++) {
- if(keys[i] == insertBefore) {
+ for (var i = 0; i<keys.length; i++) {
+ if (keys[i] == insertBefore) {
newChartList['c' + (c++)] = runtime.charts[dropKey];
insertBefore = -1; // Insert ok
}
@@ -843,8 +255,9 @@ $(function() {
}
// Not inserted => put at the end
- if(insertBefore != -1)
+ if (insertBefore != -1) {
newChartList['c' + (c++)] = runtime.charts[dropKey];
+ }
runtime.charts = newChartList;
}
@@ -870,31 +283,34 @@ $(function() {
var newSize = chartSize();
// Empty cells should keep their size so you can drop onto them
- $('table#chartGrid tr td').css('width',newSize.width + 'px');
+ $('table#chartGrid tr td').css('width', newSize.width + 'px');
/* Reorder all charts that it fills all column cells */
var numColumns;
var $tr = $('table#chartGrid tr:first');
- var row=0;
+ var row = 0;
while($tr.length != 0) {
numColumns = 1;
// To many cells in one row => put into next row
$tr.find('td').each(function() {
- if(numColumns > monitorSettings.columns) {
- if($tr.next().length == 0) $tr.after('<tr></tr>');
+ if (numColumns > monitorSettings.columns) {
+ if ($tr.next().length == 0) {
+ $tr.after('<tr></tr>');
+ }
$tr.next().prepend($(this));
}
numColumns++;
});
// To little cells in one row => for each cell to little, move all cells backwards by 1
- if($tr.next().length > 0) {
+ if ($tr.next().length > 0) {
var cnt = monitorSettings.columns - $tr.find('td').length;
- for(var i=0; i < cnt; i++) {
+ for (var i = 0; i < cnt; i++) {
$tr.append($tr.next().find('td:first'));
$tr.nextAll().each(function() {
- if($(this).next().length != 0)
+ if ($(this).next().length != 0) {
$(this).append($(this).next().find('td:first'));
+ }
});
}
}
@@ -912,14 +328,16 @@ $(function() {
);
});
- if(monitorSettings.gridMaxPoints == 'auto')
+ if (monitorSettings.gridMaxPoints == 'auto') {
runtime.gridMaxPoints = Math.round((newSize.width - 40) / 12);
+ }
runtime.xmin = new Date().getTime() - server_time_diff - runtime.gridMaxPoints * monitorSettings.gridRefresh;
runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
- if(editMode)
+ if (editMode) {
$("#chartGrid").sortableTable('refresh');
+ }
saveMonitor(); // Save settings
});
@@ -928,8 +346,9 @@ $(function() {
monitorSettings.gridRefresh = parseInt(this.value) * 1000;
clearTimeout(runtime.refreshTimeout);
- if(runtime.refreshRequest)
+ if (runtime.refreshRequest) {
runtime.refreshRequest.abort();
+ }
runtime.xmin = new Date().getTime() - server_time_diff - runtime.gridMaxPoints * monitorSettings.gridRefresh;
runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
@@ -949,10 +368,10 @@ $(function() {
dlgButtons[PMA_messages['strAddChart']] = function() {
var type = $('input[name="chartType"]:checked').val();
- if(type == 'cpu' || type == 'memory' || type=='swap')
+ if (type == 'cpu' || type == 'memory' || type == 'swap') {
newChart = presetCharts[type + '-' + server_os];
- else {
- if(! newChart || ! newChart.nodes || newChart.nodes.length == 0) {
+ } else {
+ if (! newChart || ! newChart.nodes || newChart.nodes.length == 0) {
alert(PMA_messages['strAddOneSeriesWarning']);
return;
}
@@ -968,17 +387,17 @@ $(function() {
$(this).dialog("close");
};
-
+
dlgButtons[PMA_messages['strClose']] = function() {
newChart = null;
$('span#clearSeriesLink').hide();
$('#seriesPreview').html('');
$(this).dialog("close");
};
-
+
$('div#addChartDialog').dialog({
- width:'auto',
- height:'auto',
+ width: 'auto',
+ height: 'auto',
buttons: dlgButtons
});
@@ -986,7 +405,7 @@ $(function() {
return false;
});
-
+
$('a[href="#exportMonitorConfig"]').click(function() {
var gridCopy = {};
@@ -996,40 +415,40 @@ $(function() {
gridCopy[key].settings = elem.settings;
gridCopy[key].title = elem.title;
});
-
+
var exportData = {
monitorCharts: gridCopy,
monitorSettings: monitorSettings
};
var $form;
-
- $('body').append($form = $('<form method="post" action="file_echo.php?'+url_query+'&filename=1" style="display:none;"></form>'));
-
+
+ $('body').append($form = $('<form method="post" action="file_echo.php?' + url_query + '&filename=1" style="display:none;"></form>'));
+
$form.append('<input type="hidden" name="monitorconfig" value="' + encodeURI($.toJSON(exportData)) + '">');
$form.submit();
$form.remove();
});
$('a[href="#importMonitorConfig"]').click(function() {
- $('div#emptyDialog').attr('title','Import monitor configuration');
- $('div#emptyDialog').html('Please select the file you want to import:<br/><form action="file_echo.php?'+url_query+'&import=1" method="post" enctype="multipart/form-data">'+
+ $('div#emptyDialog').attr('title', 'Import monitor configuration');
+ $('div#emptyDialog').html('Please select the file you want to import:<br/><form action="file_echo.php?' + url_query + '&import=1" method="post" enctype="multipart/form-data">' +
'<input type="file" name="file"> <input type="hidden" name="import" value="1"> </form>');
-
+
var dlgBtns = {};
-
+
dlgBtns[PMA_messages['strImport']] = function() {
var $iframe, $form;
$('body').append($iframe = $('<iframe id="monitorConfigUpload" style="display:none;"></iframe>'));
var d = $iframe[0].contentWindow.document;
d.open(); d.close();
mew = d;
-
+
$iframe.load(function() {
var json;
// Try loading config
try {
- var data = $('body',$('iframe#monitorConfigUpload')[0].contentWindow.document).html();
+ var data = $('body', $('iframe#monitorConfigUpload')[0].contentWindow.document).html();
// Chrome wraps around '<pre style="word-wrap: break-word; white-space: pre-wrap;">' to any text content -.-
json = $.secureEvalJSON(data.substring(data.indexOf("{"), data.lastIndexOf("}") + 1));
} catch (err) {
@@ -1037,14 +456,14 @@ $(function() {
$('div#emptyDialog').dialog('close');
return;
}
-
+
// Basic check, is this a monitor config json?
- if(!json || ! json.monitorCharts || ! json.monitorCharts) {
+ if (!json || ! json.monitorCharts || ! json.monitorCharts) {
alert(PMA_messages['strFailedParsingConfig']);
$('div#emptyDialog').dialog('close');
return;
}
-
+
// If json ok, try applying config
try {
window.localStorage['monitorCharts'] = $.toJSON(json.monitorCharts);
@@ -1057,20 +476,20 @@ $(function() {
window.localStorage.removeItem('monitorSettings');
rebuildGrid();
}
-
+
$('div#emptyDialog').dialog('close');
});
-
- $("body", d).append($form=$('div#emptyDialog').find('form'));
+
+ $("body", d).append($form = $('div#emptyDialog').find('form'));
$form.submit();
$('div#emptyDialog').append('<img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">');
};
-
+
dlgBtns[PMA_messages['strCancel']] = function() {
$(this).dialog('close');
}
-
-
+
+
$('div#emptyDialog').dialog({
width: 'auto',
height: 'auto',
@@ -1087,18 +506,18 @@ $(function() {
$('a[href="#pauseCharts"]').click(function() {
runtime.redrawCharts = ! runtime.redrawCharts;
- if(! runtime.redrawCharts)
+ if (! runtime.redrawCharts) {
$(this).html('<img src="themes/dot.gif" class="icon ic_play" alt="" /> ' + PMA_messages['strResumeMonitor']);
- else {
+ } else {
$(this).html('<img src="themes/dot.gif" class="icon ic_pause" alt="" /> ' + PMA_messages['strPauseMonitor']);
- if(! runtime.charts) {
+ if (! runtime.charts) {
initGrid();
$('a[href="#settingsPopup"]').show();
}
}
return false;
});
-
+
$('a[href="#monitorInstructionsDialog"]').click(function() {
var $dialog = $('div#monitorInstructionsDialog');
@@ -1109,25 +528,28 @@ $(function() {
var loadLogVars = function(getvars) {
vars = { ajax_request: true, logging_vars: true };
- if(getvars) $.extend(vars,getvars);
+ if (getvars) {
+ $.extend(vars, getvars);
+ }
$.get('server_status.php?' + url_query, vars,
function(data) {
var logVars = $.parseJSON(data),
icon = 'ic_s_success', msg='', str='';
- if(logVars['general_log'] == 'ON') {
- if(logVars['slow_query_log'] == 'ON')
+ if (logVars['general_log'] == 'ON') {
+ if (logVars['slow_query_log'] == 'ON') {
msg = PMA_messages['strBothLogOn'];
- else
+ } else {
msg = PMA_messages['strGenLogOn'];
+ }
}
- if(msg.length == 0 && logVars['slow_query_log'] == 'ON') {
+ if (msg.length == 0 && logVars['slow_query_log'] == 'ON') {
msg = PMA_messages['strSlowLogOn'];
}
- if(msg.length == 0) {
+ if (msg.length == 0) {
icon = 'ic_s_error';
msg = PMA_messages['strBothLogOff'];
}
@@ -1135,65 +557,74 @@ $(function() {
str = '<b>' + PMA_messages['strCurrentSettings'] + '</b><br><div class="smallIndent">';
str += '<img src="themes/dot.gif" class="icon ' + icon + '" alt=""/> ' + msg + '<br />';
- if(logVars['log_output'] != 'TABLE')
+ if (logVars['log_output'] != 'TABLE') {
str += '<img src="themes/dot.gif" class="icon ic_s_error" alt=""/> ' + PMA_messages['strLogOutNotTable'] + '<br />';
- else
+ } else {
str += '<img src="themes/dot.gif" class="icon ic_s_success" alt=""/> ' + PMA_messages['strLogOutIsTable'] + '<br />';
+ }
- if(logVars['slow_query_log'] == 'ON') {
- if(logVars['long_query_time'] > 2)
+ if (logVars['slow_query_log'] == 'ON') {
+ if (logVars['long_query_time'] > 2) {
str += '<img src="themes/dot.gif" class="icon ic_s_attention" alt=""/> '
+ $.sprintf(PMA_messages['strSmallerLongQueryTimeAdvice'], logVars['long_query_time'])
+ '<br />';
-
- if(logVars['long_query_time'] < 2)
+ }
+
+ if (logVars['long_query_time'] < 2) {
str += '<img src="themes/dot.gif" class="icon ic_s_success" alt=""/> '
+ $.sprintf(PMA_messages['strLongQueryTimeSet'], logVars['long_query_time'])
+ '<br />';
+ }
}
str += '</div>';
- if(is_superuser) {
+ if (is_superuser) {
str += '<p></p><b>Change settings</b>';
str += '<div class="smallIndent">';
str += PMA_messages['strSettingsAppliedGlobal'] + '<br/>';
var varValue = 'TABLE';
- if(logVars['log_output'] == 'TABLE') varValue = 'FILE';
-
+ if (logVars['log_output'] == 'TABLE') {
+ varValue = 'FILE';
+ }
+
str += '- <a class="set" href="#log_output-' + varValue + '">'
+ $.sprintf(PMA_messages['strSetLogOutput'], varValue)
+ ' </a><br />';
- if(logVars['general_log'] != 'ON')
+ if (logVars['general_log'] != 'ON') {
str += '- <a class="set" href="#general_log-ON">'
+ $.sprintf(PMA_messages['strEnableVar'], 'general_log')
+ ' </a><br />';
- else
+ } else {
str += '- <a class="set" href="#general_log-OFF">'
+ $.sprintf(PMA_messages['strDisableVar'], 'general_log')
+ ' </a><br />';
+ }
- if(logVars['slow_query_log'] != 'ON')
+ if (logVars['slow_query_log'] != 'ON') {
str += '- <a class="set" href="#slow_query_log-ON">'
+ $.sprintf(PMA_messages['strEnableVar'], 'slow_query_log')
+ ' </a><br />';
- else
+ } else {
str += '- <a class="set" href="#slow_query_log-OFF">'
+ $.sprintf(PMA_messages['strDisableVar'], 'slow_query_log')
+ ' </a><br />';
-
+ }
varValue = 5;
- if(logVars['long_query_time'] > 2) varValue = 1;
+ if (logVars['long_query_time'] > 2) {
+ varValue = 1;
+ }
str += '- <a class="set" href="#long_query_time-' + varValue + '">'
+ $.sprintf(PMA_messages['setSetLongQueryTime'], varValue)
+ ' </a><br />';
- } else
+ } else {
str += PMA_messages['strNoSuperUser'] + '<br/>';
+ }
str += '</div>';
@@ -1211,8 +642,8 @@ $(function() {
}
);
};
-
-
+
+
loadLogVars();
return false;
@@ -1221,9 +652,12 @@ $(function() {
$('input[name="chartType"]').change(function() {
$('#chartVariableSettings').toggle(this.checked && this.value == 'variable');
var title = $('input[name="chartTitle"]').attr('value');
- if(title == PMA_messages['strChartTitle'] || title == $('label[for="'+$('input[name="chartTitle"]').data('lastRadio')+'"]').text()) {
- $('input[name="chartTitle"]').data('lastRadio',$(this).attr('id'));
- $('input[name="chartTitle"]').attr('value',$('label[for="'+$(this).attr('id')+'"]').text());
+ if (title == PMA_messages['strChartTitle']
+ || title == $('label[for="' + $('input[name="chartTitle"]').data('lastRadio') + '"]').text()
+ ) {
+ $('input[name="chartTitle"]')
+ .data('lastRadio', $(this).attr('id'))
+ .attr('value', $('label[for="' + $(this).attr('id') + '"]').text());
}
});
@@ -1236,23 +670,24 @@ $(function() {
});
$('select[name="varChartList"]').change(function () {
- if(this.selectedIndex!=0)
- $('#variableInput').attr('value',this.value);
+ if (this.selectedIndex != 0) {
+ $('#variableInput').attr('value', this.value);
+ }
});
$('a[href="#kibDivisor"]').click(function() {
- $('input[name="valueDivisor"]').attr('value',1024);
- $('input[name="valueUnit"]').attr('value',PMA_messages['strKiB']);
+ $('input[name="valueDivisor"]').attr('value', 1024);
+ $('input[name="valueUnit"]').attr('value', PMA_messages['strKiB']);
$('span.unitInput').toggle(true);
- $('input[name="useUnit"]').prop('checked',true);
+ $('input[name="useUnit"]').prop('checked', true);
return false;
});
$('a[href="#mibDivisor"]').click(function() {
- $('input[name="valueDivisor"]').attr('value',1024*1024);
- $('input[name="valueUnit"]').attr('value',PMA_messages['strMiB']);
+ $('input[name="valueDivisor"]').attr('value', 1024*1024);
+ $('input[name="valueUnit"]').attr('value', PMA_messages['strMiB']);
$('span.unitInput').toggle(true);
- $('input[name="useUnit"]').prop('checked',true);
+ $('input[name="useUnit"]').prop('checked', true);
return false;
});
@@ -1263,33 +698,37 @@ $(function() {
});
$('a[href="#submitAddSeries"]').click(function() {
- if($('input#variableInput').attr('value').length == 0) return false;
-
- if(newChart == null) {
+ if ($('input#variableInput').attr('value').length == 0) {
+ return false;
+ }
+
+ if (newChart == null) {
$('#seriesPreview').html('');
newChart = {
title: $('input[name="chartTitle"]').attr('value'),
nodes: []
- }
+ };
}
var serie = {
- dataType:'statusvar',
+ dataType: 'statusvar',
dataPoint: $('input#variableInput').attr('value'),
name: $('input#variableInput').attr('value'),
display: $('input[name="differentialValue"]').attr('checked') ? 'differential' : ''
};
- if(serie.dataPoint == 'Processes') serie.dataType='proc';
+ if (serie.dataPoint == 'Processes') {
+ serie.dataType='proc';
+ }
- if($('input[name="useDivisor"]').attr('checked'))
+ if ($('input[name="useDivisor"]').attr('checked')) {
serie.valueDivisor = parseInt($('input[name="valueDivisor"]').attr('value'));
+ }
- if($('input[name="useUnit"]').attr('checked'))
+ if ($('input[name="useUnit"]').attr('checked')) {
serie.unit = $('input[name="valueUnit"]').attr('value');
-
-
+ }
var str = serie.display == 'differential' ? ', ' + PMA_messages['strDifferential'] : '';
str += serie.valueDivisor ? (', ' + $.sprintf(PMA_messages['strDividedBy'], serie.valueDivisor)) : '';
@@ -1298,13 +737,13 @@ $(function() {
newChart.nodes.push(serie);
- $('input#variableInput').attr('value','');
- $('input[name="differentialValue"]').attr('checked',true);
- $('input[name="useDivisor"]').attr('checked',false);
- $('input[name="useUnit"]').attr('checked',false);
+ $('input#variableInput').attr('value', '');
+ $('input[name="differentialValue"]').attr('checked', true);
+ $('input[name="useDivisor"]').attr('checked', false);
+ $('input[name="useUnit"]').attr('checked', false);
$('input[name="useDivisor"]').trigger('change');
$('input[name="useUnit"]').trigger('change');
- $('select[name="varChartList"]').get(0).selectedIndex=0;
+ $('select[name="varChartList"]').get(0).selectedIndex = 0;
$('span#clearSeriesLink').show();
@@ -1315,33 +754,38 @@ $(function() {
source: variableNames
});
-
+ /* Initializes the monitor, called only once */
function initGrid() {
var settings;
var series;
/* Apply default values & config */
- if(window.localStorage) {
- if(window.localStorage['monitorCharts'])
+ if (window.localStorage) {
+ if (window.localStorage['monitorCharts']) {
runtime.charts = $.parseJSON(window.localStorage['monitorCharts']);
- if(window.localStorage['monitorSettings'])
+ }
+ if (window.localStorage['monitorSettings']) {
monitorSettings = $.parseJSON(window.localStorage['monitorSettings']);
+ }
$('a[href="#clearMonitorConfig"]').toggle(runtime.charts != null);
}
- if(runtime.charts == null)
+ if (runtime.charts == null) {
runtime.charts = defaultChartGrid;
- if(monitorSettings == null)
+ }
+ if (monitorSettings == null) {
monitorSettings = defaultMonitorSettings;
+ }
- $('select[name="gridChartRefresh"]').attr('value',monitorSettings.gridRefresh / 1000);
- $('select[name="chartColumns"]').attr('value',monitorSettings.columns);
+ $('select[name="gridChartRefresh"]').attr('value', monitorSettings.gridRefresh / 1000);
+ $('select[name="chartColumns"]').attr('value', monitorSettings.columns);
- if(monitorSettings.gridMaxPoints == 'auto')
+ if (monitorSettings.gridMaxPoints == 'auto') {
runtime.gridMaxPoints = Math.round((monitorSettings.chartSize.width - 40) / 12);
- else
+ } else {
runtime.gridMaxPoints = monitorSettings.gridMaxPoints;
+ }
runtime.xmin = new Date().getTime() - server_time_diff - runtime.gridMaxPoints * monitorSettings.gridRefresh;
runtime.xmax = new Date().getTime() - server_time_diff + monitorSettings.gridRefresh;
@@ -1349,81 +793,90 @@ $(function() {
/* Calculate how much spacing there is between each chart */
$('table#chartGrid').html('<tr><td></td><td></td></tr><tr><td></td><td></td></tr>');
chartSpacing = {
- width: $('table#chartGrid td:nth-child(2)').offset().left - $('table#chartGrid td:nth-child(1)').offset().left,
- height: $('table#chartGrid tr:nth-child(2) td:nth-child(2)').offset().top - $('table#chartGrid tr:nth-child(1) td:nth-child(1)').offset().top
+ width: $('table#chartGrid td:nth-child(2)').offset().left
+ - $('table#chartGrid td:nth-child(1)').offset().left,
+ height: $('table#chartGrid tr:nth-child(2) td:nth-child(2)').offset().top
+ - $('table#chartGrid tr:nth-child(1) td:nth-child(1)').offset().top
}
$('table#chartGrid').html('');
-
+
/* Add all charts - in correct order */
var keys = [];
$.each(runtime.charts, function(key, value) {
keys.push(key);
});
keys.sort();
- for(var i=0; i<keys.length; i++)
- addChart(runtime.charts[keys[i]],true);
+ for (var i = 0; i<keys.length; i++)
+ addChart(runtime.charts[keys[i]], true);
/* Fill in missing cells */
var numCharts = $('table#chartGrid .monitorChart').length;
var numMissingCells = (monitorSettings.columns - numCharts % monitorSettings.columns) % monitorSettings.columns;
- for(var i=0; i < numMissingCells; i++) {
+ for (var i = 0; i < numMissingCells; i++) {
$('table#chartGrid tr:last').append('<td></td>');
}
// Empty cells should keep their size so you can drop onto them
- $('table#chartGrid tr td').css('width',chartSize().width + 'px');
-
+ $('table#chartGrid tr td').css('width', chartSize().width + 'px');
+
buildRequiredDataList();
refreshChartGrid();
}
-
+
+ /* Destroys all monitor related resources */
function destroyGrid() {
- if(runtime.charts)
+ if (runtime.charts) {
$.each(runtime.charts, function(key, value) {
try {
value.chart.destroy();
} catch(err) {}
});
+ }
+
try {
runtime.refreshRequest.abort();
} catch(err) {}
- try {
+ try {
clearTimeout(runtime.refreshTimeout);
} catch(err) {}
-
+
$('table#chartGrid').html('');
runtime.charts = null;
runtime.chartAI = 0;
monitorSettings = null;
}
-
+
+ /* Calls destroyGrid() and initGrid(), but before doing so it saves the chart
+ * data from each chart and restores it after the monitor is initialized again */
function rebuildGrid() {
var oldData = null;
- if(runtime.charts) {
+ if (runtime.charts) {
oldData = {};
$.each(runtime.charts, function(key, chartObj) {
- for(var i=0; i < chartObj.nodes.length; i++) {
+ for (var i = 0; i < chartObj.nodes.length; i++) {
oldData[chartObj.nodes[i].dataPoint] = [];
- for(var j=0; j < chartObj.chart.series[i].data.length; j++)
+ for (var j = 0; j < chartObj.chart.series[i].data.length; j++)
oldData[chartObj.nodes[i].dataPoint].push([chartObj.chart.series[i].data[j].x, chartObj.chart.series[i].data[j].y]);
}
});
}
-
+
destroyGrid();
initGrid();
-
- if(oldData) {
+
+ if (oldData) {
$.each(runtime.charts, function(key, chartObj) {
- for(var j=0; j < chartObj.nodes.length; j++) {
- if(oldData[chartObj.nodes[j].dataPoint])
+ for (var j = 0; j < chartObj.nodes.length; j++) {
+ if (oldData[chartObj.nodes[j].dataPoint]) {
chartObj.chart.series[j].setData(oldData[chartObj.nodes[j].dataPoint]);
+ }
}
});
- }
+ }
}
+ /* Calculactes the dynamic chart size that depends on the column width */
function chartSize() {
var wdt = $('div#logTable').innerWidth() / monitorSettings.columns - (monitorSettings.columns - 1) * chartSpacing.width;
return {
@@ -1432,9 +885,10 @@ $(function() {
}
}
+ /* Adds a chart to the chart grid */
function addChart(chartObj, initialize) {
series = [];
- for(var j=0; j<chartObj.nodes.length; j++)
+ for (var j = 0; j<chartObj.nodes.length; j++)
series.push(chartObj.nodes[j]);
settings = {
@@ -1446,7 +900,9 @@ $(function() {
zoomType: 'x',
events: {
selection: function(event) {
- if(editMode) return false;
+ if (editMode) {
+ return false;
+ }
var extremesObject = event.xAxis[0],
min = extremesObject.min,
@@ -1460,28 +916,21 @@ $(function() {
var dlgBtns = { };
dlgBtns[PMA_messages['strFromSlowLog']] = function() {
- var dateStart = Date.parse($('#logAnalyseDialog input[name="dateStart"]').attr('value')) || min;
- var dateEnd = Date.parse($('#logAnalyseDialog input[name="dateEnd"]').attr('value')) || max;
-
- loadLogStatistics({
- src: 'slow',
- start: dateStart,
- end: dateEnd,
- removeVariables: $('input#removeVariables').prop('checked'),
- limitTypes: $('input#limitTypes').prop('checked')
- });
-
- $('#logAnalyseDialog').find('dateStart,dateEnd').datepicker('destroy');
-
+ loadLog('slow');
$(this).dialog("close");
};
-
+
dlgBtns[PMA_messages['strFromGeneralLog']] = function() {
- var dateStart = Date.parse($('#logAnalyseDialog input[name="dateStart"]').attr('value')) || min;
- var dateEnd = Date.parse($('#logAnalyseDialog input[name="dateEnd"]').attr('value')) || max;
+ loadLog('general');
+ $(this).dialog("close");
+ };
+
+ function loadLog(type) {
+ var dateStart = Date.parse($('#logAnalyseDialog input[name="dateStart"]').prop('value')) || min;
+ var dateEnd = Date.parse($('#logAnalyseDialog input[name="dateEnd"]').prop('value')) || max;
loadLogStatistics({
- src: 'general',
+ src: type,
start: dateStart,
end: dateEnd,
removeVariables: $('input#removeVariables').prop('checked'),
@@ -1489,10 +938,8 @@ $(function() {
});
$('#logAnalyseDialog').find('dateStart,dateEnd').datepicker('destroy');
-
- $(this).dialog("close");
- };
-
+ }
+
$('#logAnalyseDialog').dialog({
width: 'auto',
height: 'auto',
@@ -1515,10 +962,10 @@ $(function() {
},
tooltip: {
formatter: function() {
- var s = '<b>'+Highcharts.dateFormat('%H:%M:%S', this.x)+'</b>';
+ var s = '<b>' + Highcharts.dateFormat('%H:%M:%S', this.x) + '</b>';
$.each(this.points, function(i, point) {
- s += '<br/><span style="color:'+point.series.color+'">'+ point.series.name +':</span> '+
+ s += '<br/><span style="color:' + point.series.color + '">' + point.series.name + ':</span> ' +
((parseInt(point.y) == point.y) ? point.y : Highcharts.numberFormat(this.y, 2)) + ' ' + (point.series.options.unit || '');
});
@@ -1534,87 +981,97 @@ $(function() {
title: { text: chartObj.title }
};
- if(chartObj.settings)
- $.extend(true,settings,chartObj.settings);
+ if (chartObj.settings) {
+ $.extend(true, settings, chartObj.settings);
+ }
- if($('#'+settings.chart.renderTo).length==0) {
+ if ($('#' + settings.chart.renderTo).length == 0) {
var numCharts = $('table#chartGrid .monitorChart').length;
- if(numCharts == 0 || !( numCharts % monitorSettings.columns))
+ if (numCharts == 0 || !( numCharts % monitorSettings.columns)) {
$('table#chartGrid').append('<tr></tr>');
+ }
- $('table#chartGrid tr:last').append('<td><div class="ui-state-default monitorChart" id="'+settings.chart.renderTo+'"></div></td>');
+ $('table#chartGrid tr:last').append('<td><div class="ui-state-default monitorChart" id="' + settings.chart.renderTo + '"></div></td>');
}
chartObj.chart = PMA_createChart(settings);
chartObj.numPoints = 0;
-
- if(initialize != true) {
- runtime.charts['c'+runtime.chartAI] = chartObj;
+
+ if (initialize != true) {
+ runtime.charts['c' + runtime.chartAI] = chartObj;
buildRequiredDataList();
}
- // Edit,Print icon only in edit mode
+ // Edit, Print icon only in edit mode
$('table#chartGrid div svg').find('*[zIndex=20], *[zIndex=21], *[zIndex=19]').toggle(editMode)
runtime.chartAI++;
}
+ /* Opens a dialog that allows one to edit the title and series labels of the supplied chart */
function editChart(chartObj) {
var htmlnode = chartObj.options.chart.renderTo;
- if(! htmlnode ) return;
-
- var chart=null;
- var chartKey=null;
+ if (! htmlnode ) {
+ return;
+ }
+
+ var chart = null;
+ var chartKey = null;
$.each(runtime.charts, function(key, value) {
- if(value.chart.options.chart.renderTo == htmlnode) {
+ if (value.chart.options.chart.renderTo == htmlnode) {
chart = value;
chartKey = key;
return false;
}
});
-
- if(chart == null) return;
+
+ if (chart == null) {
+ return;
+ }
var htmlStr = '<p><b>Chart title: </b> <br/> <input type="text" size="35" name="chartTitle" value="' + chart.title + '" />';
htmlStr += '</p><p><b>Series:</b> </p><ol>';
- for(var i=0; i<chart.nodes.length; i++) {
- htmlStr += '<li><i>' + chart.nodes[i].dataPoint +': </i><br/><input type="text" name="chartSerie-' + i + '" value=" ' + chart.nodes[i].name + '" /></li>';
+ for (var i = 0; i<chart.nodes.length; i++) {
+ htmlStr += '<li><i>' + chart.nodes[i].dataPoint + ': </i><br/><input type="text" name="chartSerie-' + i + '" value=" ' + chart.nodes[i].name + '" /></li>';
}
-
+
dlgBtns = {};
dlgBtns['Save'] = function() {
runtime.charts[chartKey].title = $('div#emptyDialog input[name="chartTitle"]').attr('value');
runtime.charts[chartKey].chart.setTitle({ text: runtime.charts[chartKey].title });
-
+
$('div#emptyDialog input[name*="chartSerie"]').each(function() {
var idx = $(this).attr('name').split('-')[1];
runtime.charts[chartKey].nodes[idx].name = $(this).attr('value');
runtime.charts[chartKey].chart.series[idx].name = $(this).attr('value');
});
-
+
$(this).dialog('close');
saveMonitor();
};
dlgBtns['Cancel'] = function() {
$(this).dialog('close');
};
-
- $('div#emptyDialog').attr('title','Edit chart');
- $('div#emptyDialog').html(htmlStr+'</ol>');
+
+ $('div#emptyDialog').attr('title', 'Edit chart');
+ $('div#emptyDialog').html(htmlStr + '</ol>');
$('div#emptyDialog').dialog({
width: 'auto',
height: 'auto',
buttons: dlgBtns
});
}
-
+
+ /* Removes a chart from the grid */
function removeChart(chartObj) {
var htmlnode = chartObj.options.chart.renderTo;
- if(! htmlnode ) return;
-
+ if (! htmlnode ) {
+ return;
+ }
+
$.each(runtime.charts, function(key, value) {
- if(value.chart.options.chart.renderTo == htmlnode) {
+ if (value.chart.options.chart.renderTo == htmlnode) {
delete runtime.charts[key];
return false;
}
@@ -1627,71 +1084,90 @@ $(function() {
setTimeout(function() {
chartObj.destroy();
$('div#' + htmlnode).remove();
- },10);
+ }, 10);
saveMonitor(); // Save settings
}
+ /* Called in regular intervalls, this function updates the values of each chart in the grid */
function refreshChartGrid() {
/* Send to server */
- runtime.refreshRequest = $.post('server_status.php?'+url_query, { ajax_request: true, chart_data: 1, type: 'chartgrid', requiredData: $.toJSON(runtime.dataList) },function(data) {
+ runtime.refreshRequest = $.post('server_status.php?' + url_query, {
+ ajax_request: true,
+ chart_data: 1,
+ type: 'chartgrid',
+ requiredData: $.toJSON(runtime.dataList)
+ }, function(data) {
var chartData;
try {
chartData = $.parseJSON(data);
} catch(err) {
return serverResponseError();
}
- var value, i=0;
+ var value, i = 0;
var diff;
-
+
/* Update values in each graph */
$.each(runtime.charts, function(orderKey, elem) {
var key = elem.chartID;
// If newly added chart, we have no data for it yet
- if(! chartData[key]) return;
+ if (! chartData[key]) {
+ return;
+ }
// Draw all points
- for(var j=0; j < elem.nodes.length; j++) {
+ for (var j = 0; j < elem.nodes.length; j++) {
value = chartData[key][j].y;
+
+ // Update x-axis
+ if (i == 0 && j == 0) {
+ if (oldChartData == null) {
+ diff = chartData.x - runtime.xmax;
+ } else {
+ diff = parseInt(chartData.x - oldChartData.x);
+ }
- if(i==0 && j==0) {
- if(oldChartData==null) diff = chartData.x - runtime.xmax;
- else diff = parseInt(chartData.x - oldChartData.x);
-
- runtime.xmin+= diff;
- runtime.xmax+= diff;
+ runtime.xmin += diff;
+ runtime.xmax += diff;
}
elem.chart.xAxis[0].setExtremes(runtime.xmin, runtime.xmax, false);
- if(elem.nodes[j].display == 'differential') {
- if(oldChartData == null || oldChartData[key] == null) continue;
+ // Calculate y value
+ if (elem.nodes[j].display == 'differential') {
+ if (oldChartData == null || oldChartData[key] == null) {
+ continue;
+ }
value -= oldChartData[key][j].y;
}
- if(elem.nodes[j].valueDivisor)
+ if (elem.nodes[j].valueDivisor) {
value = value / elem.nodes[j].valueDivisor;
+ }
- if(elem.nodes[j].transformFn) {
+ if (elem.nodes[j].transformFn) {
value = chartValueTransform(
elem.nodes[j].transformFn,
chartData[key][j],
(oldChartData == null ? null : oldChartData[key][j])
);
}
-
- if(value != undefined)
+
+ // Set y value, if defined
+ if (value != undefined) {
elem.chart.series[j].addPoint(
- { x: chartData.x, y: value },
+ { x: chartData.x, y: value },
false,
elem.numPoints >= runtime.gridMaxPoints
);
+ }
}
i++;
runtime.charts[orderKey].numPoints++;
- if(runtime.redrawCharts)
+ if (runtime.redrawCharts) {
elem.chart.redraw();
+ }
});
oldChartData = chartData;
@@ -1699,11 +1175,15 @@ $(function() {
runtime.refreshTimeout = setTimeout(refreshChartGrid, monitorSettings.gridRefresh);
});
}
-
- function chartValueTransform(name,cur,prev) {
+
+ /* Function that supplies special value transform functions for chart values */
+ function chartValueTransform(name, cur, prev) {
switch(name) {
case 'cpu-linux':
- if(prev == null) return undefined;
+ if (prev == null) {
+ return undefined;
+ }
+
var diff_total = cur.busy + cur.idle - (prev.busy + prev.idle);
var diff_idle = cur.idle - prev.idle;
return 100*(diff_total - diff_idle) / diff_total;
@@ -1711,10 +1191,11 @@ $(function() {
return undefined;
}
- /* Build list of nodes that need to be retrieved */
+ /* Build list of nodes that need to be retrieved from server */
function buildRequiredDataList() {
runtime.dataList = {};
- // Store an own id, because the property name is subject of reordering, thus destroying our mapping with runtime.charts <=> runtime.dataList
+ // Store an own id, because the property name is subject of reordering,
+ // thus destroying our mapping with runtime.charts <=> runtime.dataList
var chartID = 0;
$.each(runtime.charts, function(key, chart) {
runtime.dataList[chartID] = chart.nodes;
@@ -1723,24 +1204,30 @@ $(function() {
});
}
+ /* Loads the log table data, generates the table and handles the filters */
function loadLogStatistics(opts) {
var tableStr = '';
var logRequest = null;
- if(! opts.removeVariables)
+ if (! opts.removeVariables) {
opts.removeVariables = false;
- if(! opts.limitTypes)
+ }
+ if (! opts.limitTypes) {
opts.limitTypes = false;
-
- $('#emptyDialog').html(PMA_messages['strAnalysingLogs'] + ' <img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">');
+ }
+
+ $('#emptyDialog').html(PMA_messages['strAnalysingLogs'] +
+ ' <img class="ajaxIcon" src="' + pmaThemeImage +
+ 'ajax_clock_small.gif" alt="">');
$('#emptyDialog').dialog({
width: 'auto',
height: 'auto',
buttons: {
'Cancel request': function() {
- if(logRequest != null)
+ if (logRequest != null) {
logRequest.abort();
+ }
$(this).dialog("close");
}
@@ -1748,7 +1235,7 @@ $(function() {
});
- logRequest = $.get('server_status.php?'+url_query,
+ logRequest = $.get('server_status.php?' + url_query,
{ ajax_request: true,
log_data: 1,
type: opts.src,
@@ -1757,15 +1244,15 @@ $(function() {
removeVariables: opts.removeVariables,
limitTypes: opts.limitTypes
},
- function(data) {
+ function(data) {
var logData;
try {
logData = $.parseJSON(data);
} catch(err) {
return serverResponseError();
}
-
- if(logData.rows.length != 0) {
+
+ if (logData.rows.length != 0) {
runtime.logDataCols = buildLogTable(logData);
/* Show some stats in the dialog */
@@ -1773,12 +1260,14 @@ $(function() {
$('#emptyDialog').html('<p>' + PMA_messages['strLogDataLoaded'] + '</p>');
$.each(logData.sum, function(key, value) {
key = key.charAt(0).toUpperCase() + key.slice(1).toLowerCase();
- if(key == 'Total') key = '<b>' + key + '</b>';
+ if (key == 'Total') {
+ key = '<b>' + key + '</b>';
+ }
$('#emptyDialog').append(key + ': ' + value + '<br/>');
});
/* Add filter options if more than a bunch of rows there to filter */
- if(logData.numRows > 12) {
+ if (logData.numRows > 12) {
$('div#logTable').prepend(
'<fieldset id="logDataFilter">' +
' <legend>' + PMA_messages['strFilters'] + '</legend>' +
@@ -1798,9 +1287,7 @@ $(function() {
filterQueries(true);
});
- //preg_replace('/\s+([^=]+)=(\d+|((\'|"|)(?U)(.+)(?<!\\\)\4(\s+|$)))/i',' $1={} ',$str);
-
- if(logData.numRows > 250) {
+ if (logData.numRows > 250) {
$('div#logTable button#startFilterQueryText').click(filterQueries);
} else {
$('div#logTable input#filterQueryText').keyup(filterQueries);
@@ -1813,61 +1300,76 @@ $(function() {
$(this).dialog("close");
$(document).scrollTop($('div#logTable').offset().top);
};
-
+
$('#emptyDialog').dialog( "option", "buttons", dlgBtns);
-
+
} else {
$('#emptyDialog').html('<p>' + PMA_messages['strNoDataFound'] + '</p>');
-
+
var dlgBtns = {};
- dlgBtns[PMA_messages['strClose']] = function() {
- $(this).dialog("close");
+ dlgBtns[PMA_messages['strClose']] = function() {
+ $(this).dialog("close");
};
-
+
$('#emptyDialog').dialog( "option", "buttons", dlgBtns );
}
}
);
+ /* Handles the actions performed when the user uses any of the log table filters
+ * which are the filter by name and grouping with ignoring data in WHERE clauses
+ *
+ * @param boolean Should be true when the users enabled or disabled to group queries ignoring data in WHERE clauses
+ */
function filterQueries(varFilterChange) {
- var odd_row=false, cell, textFilter;
+ var odd_row = false, cell, textFilter;
var val = $('div#logTable input#filterQueryText').val();
- if(val.length == 0) textFilter = null;
- else textFilter = new RegExp(val, 'i');
-
- var rowSum = 0, totalSum = 0, i=0, q;
+ if (val.length == 0) {
+ textFilter = null;
+ } else {
+ textFilter = new RegExp(val, 'i');
+ }
+
+ var rowSum = 0, totalSum = 0, i = 0, q;
var noVars = $('div#logTable input#noWHEREData').attr('checked');
var equalsFilter = /([^=]+)=(\d+|((\'|"|).*?[^\\])\4((\s+)|$))/gi;
var functionFilter = /([a-z0-9_]+)\(.+?\)/gi;
- var filteredQueries = {};
- var filteredQueriesLines = {};
+ var filteredQueries = {}, filteredQueriesLines = {};
var hide = false, rowData;
var queryColumnName = runtime.logDataCols[runtime.logDataCols.length - 2];
var sumColumnName = runtime.logDataCols[runtime.logDataCols.length - 1];
-
var isSlowLog = opts.src == 'slow';
var columnSums = {};
-
+
+ // For the slow log we have to count many columns (query_time, lock_time, rows_examined, rows_sent, etc.)
var countRow = function(query, row) {
var cells = row.match(/<td>(.*?)<\/td>/gi);
- if(!columnSums[query]) columnSums[query] = [0,0,0,0];
+ if (!columnSums[query]) {
+ columnSums[query] = [0, 0, 0, 0];
+ }
- columnSums[query][0] += timeToSec(cells[2].replace(/(<td>|<\/td>)/gi,''));
- columnSums[query][1] += timeToSec(cells[3].replace(/(<td>|<\/td>)/gi,''));
- columnSums[query][2] += parseInt(cells[4].replace(/(<td>|<\/td>)/gi,''));
- columnSums[query][3] += parseInt(cells[5].replace(/(<td>|<\/td>)/gi,''));
+ // lock_time and query_time and displayed in timespan format
+ columnSums[query][0] += timeToSec(cells[2].replace(/(<td>|<\/td>)/gi, ''));
+ columnSums[query][1] += timeToSec(cells[3].replace(/(<td>|<\/td>)/gi, ''));
+ // rows_examind and rows_sent are just numbers
+ columnSums[query][2] += parseInt(cells[4].replace(/(<td>|<\/td>)/gi, ''));
+ columnSums[query][3] += parseInt(cells[5].replace(/(<td>|<\/td>)/gi, ''));
};
-
+
// We just assume the sql text is always in the second last column, and that the total count is right of it
$('div#logTable table tbody tr td:nth-child(' + (runtime.logDataCols.length - 1) + ')').each(function() {
- if(varFilterChange && $(this).html().match(/^SELECT/i)) {
- if(noVars) {
+ // If query is a SELECT and user enabled or disabled to group queries ignoring data in where statements, we
+ // need to re-calculate the sums of each row
+ if (varFilterChange && $(this).html().match(/^SELECT/i)) {
+ if (noVars) {
+ // Group on => Sum up identical columns, and hide all but 1
+
q = $(this).text().replace(equalsFilter, '$1=...$6').trim();
q = q.replace(functionFilter, ' $1(...)');
// Js does not specify a limit on property name length, so we can abuse it as index :-)
- if(filteredQueries[q]) {
+ if (filteredQueries[q]) {
filteredQueries[q] += parseInt($(this).next().text());
totalSum += parseInt($(this).next().text());
hide = true;
@@ -1876,18 +1378,20 @@ $(function() {
filteredQueriesLines[q] = i;
$(this).text(q);
}
- if(isSlowLog) countRow(q, $(this).parent().html());
+ if (isSlowLog) {
+ countRow(q, $(this).parent().html());
+ }
- // Restore original columns
} else {
- rowData = $(this).parent().data('query');
+ // Group off: Restore original columns
- // SQL Text
+ rowData = $(this).parent().data('query');
+ // Restore SQL text
$(this).text(rowData[queryColumnName]);
- // #
+ // Restore total count
$(this).next().text(rowData[sumColumnName]);
- // Slow log columns
- if(isSlowLog) {
+ // Restore slow log columns
+ if (isSlowLog) {
$(this).parent().children('td:nth-child(3)').text(rowData['query_time']);
$(this).parent().children('td:nth-child(4)').text(rowData['lock_time']);
$(this).parent().children('td:nth-child(5)').text(rowData['rows_sent']);
@@ -1896,17 +1400,21 @@ $(function() {
}
}
- if(! hide && (textFilter != null && ! textFilter.exec($(this).text()))) hide = true;
+ // If not required to be hidden, do we need to hide because of a not matching text filter?
+ if (! hide && (textFilter != null && ! textFilter.exec($(this).text()))) {
+ hide = true;
+ }
- if(hide) {
- $(this).parent().css('display','none');
+ // Now display or hide this column
+ if (hide) {
+ $(this).parent().css('display', 'none');
} else {
totalSum += parseInt($(this).next().text());
- rowSum ++;
+ rowSum++;
odd_row = ! odd_row;
- $(this).parent().css('display','');
- if(odd_row) {
+ $(this).parent().css('display', '');
+ if (odd_row) {
$(this).parent().addClass('odd');
$(this).parent().removeClass('even');
} else {
@@ -1918,19 +1426,21 @@ $(function() {
hide = false;
i++;
});
-
- // Update count values of grouped entries
- if(varFilterChange) {
- if(noVars) {
+
+ // We finished summarizing counts => Update count values of all grouped entries
+ if (varFilterChange) {
+ if (noVars) {
var numCol, row, $table = $('div#logTable table tbody');
- $.each(filteredQueriesLines, function(key,value) {
- if(filteredQueries[key] <= 1) return;
-
- row = $table.children('tr:nth-child(' + (value+1) + ')');
+ $.each(filteredQueriesLines, function(key, value) {
+ if (filteredQueries[key] <= 1) {
+ return;
+ }
+
+ row = $table.children('tr:nth-child(' + (value + 1) + ')');
numCol = row.children(':nth-child(' + (runtime.logDataCols.length) + ')');
numCol.text(filteredQueries[key]);
-
- if(isSlowLog) {
+
+ if (isSlowLog) {
row.children('td:nth-child(3)').text(secToTime(columnSums[key][0]));
row.children('td:nth-child(4)').text(secToTime(columnSums[key][1]));
row.children('td:nth-child(5)').text(columnSums[key][2]);
@@ -1938,46 +1448,48 @@ $(function() {
}
});
}
-
- $('div#logTable table').trigger("update");
- setTimeout(function() {
- $('div#logTable table').trigger('sorton',[[[runtime.logDataCols.length - 1,1]]]);
+
+ $('div#logTable table').trigger("update");
+ setTimeout(function() {
+ $('div#logTable table').trigger('sorton', [[[runtime.logDataCols.length - 1, 1]]]);
}, 0);
}
+ // Display some stats at the bottom of the table
$('div#logTable table tfoot tr')
.html('<th colspan="' + (runtime.logDataCols.length - 1) + '">' +
- PMA_messages['strSumRows'] + ' '+ rowSum +'<span style="float:right">' +
+ PMA_messages['strSumRows'] + ' ' + rowSum + '<span style="float:right">' +
PMA_messages['strTotal'] + '</span></th><th align="right">' + totalSum + '</th>');
}
}
- /*loadLogStatistics({
- src: 'general',
- start:1311076210*1000,
- end:1311162689*1000,
- removeVariables: true,
- limitTypes: true
- });*/
-
+ /* Turns a timespan (12:12:12) into a number */
function timeToSec(timeStr) {
var time = timeStr.split(':');
return parseInt(time[0]*3600) + parseInt(time[1]*60) + parseInt(time[2]);
}
-
+
+ /* Turns a number into a timespan (100 into 00:01:40) */
function secToTime(timeInt) {
hours = Math.floor(timeInt / 3600);
timeInt -= hours*3600;
minutes = Math.floor(timeInt / 60);
timeInt -= minutes*60;
-
- if(hours < 10) hours = '0' + hours;
- if(minutes < 10) minutes = '0' + minutes;
- if(timeInt < 10) timeInt = '0' + timeInt;
-
+
+ if (hours < 10) {
+ hours = '0' + hours;
+ }
+ if (minutes < 10) {
+ minutes = '0' + minutes;
+ }
+ if (timeInt < 10) {
+ timeInt = '0' + timeInt;
+ }
+
return hours + ':' + minutes + ':' + timeInt;
}
-
+
+ /* Constructs the log table out of the retrieved server data */
function buildLogTable(data) {
var rows = data.rows;
var cols = new Array();
@@ -1989,14 +1501,14 @@ $(function() {
var formatValue = function(name, value) {
switch(name) {
case 'user_host':
- return value.replace(/(\[.*?\])+/g,'');
+ return value.replace(/(\[.*?\])+/g, '');
}
return value;
};
-
- for(var i=0; i < rows.length; i++) {
- if(i == 0) {
- $.each(rows[0],function(key, value) {
+
+ for (var i = 0; i < rows.length; i++) {
+ if (i == 0) {
+ $.each(rows[0], function(key, value) {
cols.push(key);
});
$table.append( '<thead>' +
@@ -2007,179 +1519,33 @@ $(function() {
}
$tBody.append($tRow = $('<tr class="noclick"></tr>'));
- var cl=''
- for(var j=0; j < cols.length; j++) {
+ var cl = '';
+ for (var j = 0; j < cols.length; j++) {
// Assuming the query column is the second last
- if(j == cols.length - 2 && rows[i][cols[j]].match(/^SELECT/i)) {
- $tRow.append($tCell=$('<td class="linkElem">' + formatValue(cols[j], rows[i][cols[j]]) + '</td>'));
- $tCell.click(queryAnalyzer);
+ if (j == cols.length - 2 && rows[i][cols[j]].match(/^SELECT/i)) {
+ $tRow.append($tCell = $('<td class="linkElem">' + formatValue(cols[j], rows[i][cols[j]]) + '</td>'));
+ $tCell.click(openQueryAnalyzer);
} else
$tRow.append('<td>' + formatValue(cols[j], rows[i][cols[j]]) + '</td>');
- $tRow.data('query',rows[i]);
+ $tRow.data('query', rows[i]);
}
}
$table.append('<tfoot>' +
'<tr><th colspan="' + (cols.length - 1) + '">' + PMA_messages['strSumRows'] +
- ' '+ data.numRows +'<span style="float:right">' + PMA_messages['strTotal'] +
+ ' ' + data.numRows + '<span style="float:right">' + PMA_messages['strTotal'] +
'</span></th><th align="right">' + data.sum.TOTAL + '</th></tr></tfoot>');
-
- function queryAnalyzer() {
- var query = $(this).parent().data('query').argument || $(this).parent().data('query').sql_text;
- var db = $(this).parent().data('query').db || '';
-
- /* A very basic SQL Formatter. Totally fails in the cases of
- - Any string appearance containing a MySQL Keyword, surrounded by whitespaces, e.g. WHERE bar = "This where the formatter fails"
- - Subqueries too probably
- */
-
- // Matches the columns to be selected
- // .* selector doesn't include whitespace and we have no PCRE_DOTALL modifier, (.|\s)+ crashes Chrome (reported and confirmed),
- // [^]+ results in JS error in IE8, thus we use [^\0]+ for matching each column since the zero-byte char (hopefully) doesn't appear in column names ;)
- var sLists = query.match(/SELECT\s+[^\0]+\s+FROM\s+/gi);
- if(sLists) {
- for(var i=0; i < sLists.length; i++) {
- query = query.replace(sLists[i],sLists[i].replace(/\s*((`|'|"|).*?\1,)\s*/gi,'$1\n\t'));
- }
- query = query
- .replace(/(\s+|^)(SELECT|FROM|WHERE|GROUP BY|HAVING|ORDER BY|LIMIT)(\s+|$)/gi,'\n$2\n\t')
- .replace(/\s+UNION\s+/gi,'\n\nUNION\n\n')
- .replace(/\s+(AND)\s+/gi,' $1\n\t')
- .trim();
- }
-
- codemirror_editor.setValue(query);
-
- var profilingChart = null;
-
- $('div#queryAnalyzerDialog').dialog({
- width: 'auto',
- height: 'auto',
- resizable: false,
- buttons: {
- 'Analyse Query' : function() {
- $('div#queryAnalyzerDialog div.placeHolder').html('Analyzing... ' + '<img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">');
-
- $.post('server_status.php?'+url_query, {
- ajax_request: true,
- query_analyzer: true,
- query: codemirror_editor.getValue(),
- database: db
- }, function(data) {
- data = $.parseJSON(data);
- var totalTime = 0;
-
- if(data.error) {
- $('div#queryAnalyzerDialog div.placeHolder').html('<div class="error">' + data.error + '</div>');
- return;
- }
-
- // Float sux, I'll use table :(
- $('div#queryAnalyzerDialog div.placeHolder')
- .html('<table width="100%" border="0"><tr><td class="explain"></td><td class="chart"></td></tr></table>');
-
- var explain = '<b>Explain output</b> '+explain_docu;
- if(data.explain.length > 1) {
- explain += ' (';
- for(var i=0; i < data.explain.length; i++) {
- if(i > 0) explain += ', ';
- explain += '<a href="#showExplain-' + i + '">' + i + '</a>';
- }
- explain += ')';
- }
- explain +='<p></p>';
- for(var i=0; i < data.explain.length; i++) {
- explain += '<div class="explain-' + i + '"' + (i>0? 'style="display:none;"' : '' ) + '>';
- $.each(data.explain[i], function(key,value) {
- value = (value==null)?'null':value;
-
- if(key == 'type' && value.toLowerCase() == 'all') value = '<span class="attention">' + value +'</span>';
- if(key == 'Extra') value = value.replace(/(using (temporary|filesort))/gi,'<span class="attention">$1</span>');
- explain += key+': ' + value + '<br />';
- });
- explain += '</div>';
- }
-
- // Since there is such a nice free space below the explain, lets put it here for now
- explain += '<p><b>' + PMA_messages['strAffectedRows'] + '</b> ' + data.affectedRows;
-
- $('div#queryAnalyzerDialog div.placeHolder td.explain').append(explain);
-
- $('div#queryAnalyzerDialog div.placeHolder a[href*="#showExplain"]').click(function() {
- var id = $(this).attr('href').split('-')[1];
- $(this).parent().find('div[class*="explain"]').hide();
- $(this).parent().find('div[class*="explain-' + id + '"]').show();
- });
-
- if(data.profiling) {
- var chartData = [];
- var numberTable = '<table class="queryNums"><thead><tr><th>Status</th><th>Time</th></tr></thead><tbody>';
- var duration;
-
- for(var i=0; i < data.profiling.length; i++) {
- duration = parseFloat(data.profiling[i].duration);
-
- chartData.push([data.profiling[i].state, duration]);
- totalTime+=duration;
-
- numberTable += '<tr><td>' + data.profiling[i].state + ' </td><td> ' + PMA_prettyProfilingNum(duration,2) + '</td></tr>';
- }
- numberTable += '<tr><td><b>Total time:</b></td><td>' + PMA_prettyProfilingNum(totalTime,2) + '</td></tr>';
- numberTable += '</tbody></table>';
-
- $('div#queryAnalyzerDialog div.placeHolder td.chart').append('<b>Profiling results ' + profiling_docu + '</b> (<a href="#showNums">Table</a>, <a href="#showChart">Chart</a>)<br/>' + numberTable + ' <div id="queryProfiling"></div>');
-
- $('div#queryAnalyzerDialog div.placeHolder a[href="#showNums"]').click(function() {
- $('div#queryAnalyzerDialog div#queryProfiling').hide();
- $('div#queryAnalyzerDialog table.queryNums').show();
- return false;
- });
-
- $('div#queryAnalyzerDialog div.placeHolder a[href="#showChart"]').click(function() {
- $('div#queryAnalyzerDialog div#queryProfiling').show();
- $('div#queryAnalyzerDialog table.queryNums').hide();
- return false;
- });
-
- profilingChart = PMA_createProfilingChart(chartData, {
- chart: {
- renderTo: 'queryProfiling'
- },
- plotOptions: {
- pie: {
- size: '50%'
- }
- }
- });
-
-
- $('div#queryProfiling').resizable();
- }
-
- });
- },
- 'Close' : function() {
- if(profilingChart != null) {
- profilingChart.destroy();
- }
- $('div#queryAnalyzerDialog div.placeHolder').html('');
- codemirror_editor.setValue('');
-
- $(this).dialog("close");
- }
- }
- });
- }
-
// Append a tooltip to the count column, if there exist one
- if($('#logTable th:last').html() == '#') {
+ if ($('#logTable th:last').html() == '#') {
$('#logTable th:last').append(' <img class="qroupedQueryInfoIcon icon ic_b_docs" src="themes/dot.gif" alt="" />');
var qtipContent = PMA_messages['strCountColumnExplanation'];
- if(groupInserts) qtipContent += '<p>' + PMA_messages['strMoreCountColumnExplanation'] + '</p>';
+ if (groupInserts) {
+ qtipContent += '<p>' + PMA_messages['strMoreCountColumnExplanation'] + '</p>';
+ }
$('img.qroupedQueryInfoIcon').qtip({
content: qtipContent,
@@ -2195,7 +1561,7 @@ $(function() {
}
$('div#logTable table').tablesorter({
- sortList: [[cols.length - 1,1]],
+ sortList: [[cols.length - 1, 1]],
widgets: ['zebra']
});
@@ -2204,7 +1570,169 @@ $(function() {
return cols;
}
+
+ /* Opens the query analyzer dialog */
+ function openQueryAnalyzer() {
+ var rowData = $(this).parent().data('query');
+ var query = rowData.argument || rowData.sql_text;
+
+ /* A very basic SQL Formatter. Totally fails in the cases of
+ - Any string appearance containing a MySQL Keyword, surrounded by whitespaces, e.g. WHERE bar = "This where the formatter fails"
+ - Subqueries too probably
+ */
+
+ // Matches the columns to be selected
+ // .* selector doesn't include whitespace and we have no PCRE_DOTALL modifier, (.|\s)+ crashes Chrome (reported and confirmed),
+ // [^]+ results in JS error in IE8, thus we use [^\0]+ for matching each column since the zero-byte char (hopefully) doesn't appear in column names ;)
+ var sLists = query.match(/SELECT\s+[^\0]+\s+FROM\s+/gi);
+ if (sLists) {
+ for (var i = 0; i < sLists.length; i++) {
+ query = query.replace(sLists[i], sLists[i].replace(/\s*((`|'|"|).*?\1,)\s*/gi, '$1\n\t'));
+ }
+ query = query
+ .replace(/(\s+|^)(SELECT|FROM|WHERE|GROUP BY|HAVING|ORDER BY|LIMIT)(\s+|$)/gi, '\n$2\n\t')
+ .replace(/\s+UNION\s+/gi, '\n\nUNION\n\n')
+ .replace(/\s+(AND)\s+/gi, ' $1\n\t')
+ .trim();
+ }
+
+ codemirror_editor.setValue(query);
+
+ var profilingChart = null;
+ var dlgBtns = {};
+
+ dlgBtns[PMA_messages['strAnalyzeQuery']] = function() {
+ loadQueryAnalysis(rowData);
+ };
+ dlgBtns[PMA_messages['strClose']] = function() {
+ if (profilingChart != null) {
+ profilingChart.destroy();
+ }
+ $('div#queryAnalyzerDialog div.placeHolder').html('');
+ codemirror_editor.setValue('');
+ $(this).dialog("close");
+ };
+
+ $('div#queryAnalyzerDialog').dialog({
+ width: 'auto',
+ height: 'auto',
+ resizable: false,
+ buttons: dlgBtns
+ });
+ }
+
+ /* Loads and displays the analyzed query data */
+ function loadQueryAnalysis(rowData) {
+ var db = rowData.db || '';
+
+ $('div#queryAnalyzerDialog div.placeHolder').html(
+ 'Analyzing... ' + '<img class="ajaxIcon" src="' +
+ pmaThemeImage + 'ajax_clock_small.gif" alt="">');
+
+ $.post('server_status.php?' + url_query, {
+ ajax_request: true,
+ query_analyzer: true,
+ query: codemirror_editor.getValue(),
+ database: db
+ }, function(data) {
+ data = $.parseJSON(data);
+ var totalTime = 0;
+
+ if (data.error) {
+ $('div#queryAnalyzerDialog div.placeHolder').html('<div class="error">' + data.error + '</div>');
+ return;
+ }
+
+ // Float sux, I'll use table :(
+ $('div#queryAnalyzerDialog div.placeHolder')
+ .html('<table width="100%" border="0"><tr><td class="explain"></td><td class="chart"></td></tr></table>');
+
+ var explain = '<b>Explain output</b> ' + explain_docu;
+ if (data.explain.length > 1) {
+ explain += ' (';
+ for (var i = 0; i < data.explain.length; i++) {
+ if (i > 0) {
+ explain += ', ';
+ }
+ explain += '<a href="#showExplain-' + i + '">' + i + '</a>';
+ }
+ explain += ')';
+ }
+ explain += '<p></p>';
+ for (var i = 0; i < data.explain.length; i++) {
+ explain += '<div class="explain-' + i + '"' + (i>0? 'style="display:none;"' : '' ) + '>';
+ $.each(data.explain[i], function(key, value) {
+ value = (value == null)?'null':value;
+
+ if (key == 'type' && value.toLowerCase() == 'all') {
+ value = '<span class="attention">' + value + '</span>';
+ }
+ if (key == 'Extra') {
+ value = value.replace(/(using (temporary|filesort))/gi, '<span class="attention">$1</span>');
+ }
+ explain += key + ': ' + value + '<br />';
+ });
+ explain += '</div>';
+ }
+
+ explain += '<p><b>' + PMA_messages['strAffectedRows'] + '</b> ' + data.affectedRows;
+
+ $('div#queryAnalyzerDialog div.placeHolder td.explain').append(explain);
+
+ $('div#queryAnalyzerDialog div.placeHolder a[href*="#showExplain"]').click(function() {
+ var id = $(this).attr('href').split('-')[1];
+ $(this).parent().find('div[class*="explain"]').hide();
+ $(this).parent().find('div[class*="explain-' + id + '"]').show();
+ });
+
+ if (data.profiling) {
+ var chartData = [];
+ var numberTable = '<table class="queryNums"><thead><tr><th>Status</th><th>Time</th></tr></thead><tbody>';
+ var duration;
+
+ for (var i = 0; i < data.profiling.length; i++) {
+ duration = parseFloat(data.profiling[i].duration);
+
+ chartData.push([data.profiling[i].state, duration]);
+ totalTime += duration;
+
+ numberTable += '<tr><td>' + data.profiling[i].state + ' </td><td> ' + PMA_prettyProfilingNum(duration, 2) + '</td></tr>';
+ }
+ numberTable += '<tr><td><b>Total time:</b></td><td>' + PMA_prettyProfilingNum(totalTime, 2) + '</td></tr>';
+ numberTable += '</tbody></table>';
+
+ $('div#queryAnalyzerDialog div.placeHolder td.chart').append('<b>Profiling results ' + profiling_docu + '</b> (<a href="#showNums">Table</a>, <a href="#showChart">Chart</a>)<br/>' + numberTable + ' <div id="queryProfiling"></div>');
+
+ $('div#queryAnalyzerDialog div.placeHolder a[href="#showNums"]').click(function() {
+ $('div#queryAnalyzerDialog div#queryProfiling').hide();
+ $('div#queryAnalyzerDialog table.queryNums').show();
+ return false;
+ });
+
+ $('div#queryAnalyzerDialog div.placeHolder a[href="#showChart"]').click(function() {
+ $('div#queryAnalyzerDialog div#queryProfiling').show();
+ $('div#queryAnalyzerDialog table.queryNums').hide();
+ return false;
+ });
+
+ profilingChart = PMA_createProfilingChart(chartData, {
+ chart: {
+ renderTo: 'queryProfiling'
+ },
+ plotOptions: {
+ pie: {
+ size: '50%'
+ }
+ }
+ });
+
+
+ $('div#queryProfiling').resizable();
+ }
+ });
+ }
+ /* Saves the monitor to localstorage */
function saveMonitor() {
var gridCopy = {};
@@ -2215,22 +1743,11 @@ $(function() {
gridCopy[key].title = elem.title;
});
- if(window.localStorage) {
+ if (window.localStorage) {
window.localStorage['monitorCharts'] = $.toJSON(gridCopy);
window.localStorage['monitorSettings'] = $.toJSON(monitorSettings);
}
$('a[href="#clearMonitorConfig"]').show();
}
-
- function serverResponseError() {
- var btns = {};
- btns[PMA_messages['strReloadPage']] = function() {
- window.location.reload();
- };
- $('#emptyDialog').attr('title',PMA_messages['strRefreshFailed']);
- $('#emptyDialog').html('<img class="icon ic_s_attention" src="themes/dot.gif" alt=""> ' + PMA_messages['strInvalidResponseExplanation'])
- $('#emptyDialog').dialog({ buttons: btns });
- }
-
-});
+});
\ No newline at end of file
diff --git a/js/server_variables.js b/js/server_variables.js
index 1aded3b..0ca5304 100644
--- a/js/server_variables.js
+++ b/js/server_variables.js
@@ -1,76 +1,25 @@
-function editVariable(link)
-{
- var varName = $(link).parent().parent().find('th:first').first().text().replace(/ /g,'_');
- var mySaveLink = $(saveLink);
- var myCancelLink = $(cancelLink);
- var $cell = $(link).parent();
-
- $cell.addClass('edit');
- // remove edit link
- $cell.find('a.editLink').remove();
-
- mySaveLink.click(function() {
- $.get('server_variables.php?' + url_query,
- { ajax_request: true, type: 'setval', varName: varName, varValue: $cell.find('input').attr('value') },
- function(data) {
- if(data.success) $cell.html(data.variable);
- else {
- PMA_ajaxShowMessage(data.error);
- $cell.html($cell.find('span.oldContent').html());
- }
- $cell.removeClass('edit');
- },
- 'json'
- );
- return false;
- });
-
- myCancelLink.click(function() {
- $cell.html($cell.find('span.oldContent').html());
- $cell.removeClass('edit');
- return false;
- });
-
-
- $.get('server_variables.php?' + url_query,
- { ajax_request: true, type: 'getval', varName: varName },
- function(data) {
- // hide original content
- $cell.html('<span class="oldContent" style="display:none;">' + $cell.html() + '</span>');
- // put edit field and save/cancel link
- $cell.prepend('<table class="serverVariableEditTable" border="0"><tr><td></td><td style="width:100%;"><input type="text" value="' + data + '"/></td></tr</table>');
- $cell.find('table td:first').append(mySaveLink);
- $cell.find('table td:first').append(myCancelLink);
- }
- );
-
- return false;
-}
-
$(function() {
- var textFilter=null;
- var odd_row=false;
+ var textFilter = null, odd_row = false;
var testString = 'abcdefghijklmnopqrstuvwxyz0123456789,ABCEFGHIJKLMOPQRSTUVWXYZ';
- var $tmpDiv;
- var charWidth;
+ var $tmpDiv, charWidth;
// Global vars
editLink = '<a href="#" class="editLink" onclick="return editVariable(this);"><img class="icon ic_b_edit" src="themes/dot.gif" alt=""> '+PMA_messages['strEdit']+'</a>';
saveLink = '<a href="#" class="saveLink"><img class="icon ic_b_save" src="themes/dot.gif" alt=""> '+PMA_messages['strSave']+'</a> ';
cancelLink = '<a href="#" class="cancelLink"><img class="icon ic_b_close" src="themes/dot.gif" alt=""> '+PMA_messages['strCancel']+'</a> ';
-
$.ajaxSetup({
cache:false
});
/* Variable editing */
- if(isSuperuser) {
+ if (is_superuser) {
$('table.data tbody tr td:nth-child(2)').hover(
function() {
// Only add edit element if it is the global value, not session value and not when the element is being edited
- if($(this).parent().children('th').length > 0 && ! $(this).hasClass('edit'))
+ if ($(this).parent().children('th').length > 0 && ! $(this).hasClass('edit')) {
$(this).prepend(editLink);
+ }
},
function() {
$(this).find('a.editLink').remove();
@@ -78,79 +27,94 @@ $(function() {
);
}
- /*** This code snippet takes care that the table stays readable. It cuts off long strings the table overlaps the window size ***/
+ // Filter options are invisible for disabled js users
+ $('fieldset#tableFilter').css('display','');
+
+ $('#filterText').keyup(function(e) {
+ if ($(this).val().length == 0) {
+ textFilter=null;
+ } else {
+ textFilter = new RegExp("(^| )"+$(this).val().replace(/_/g,' '),'i');
+ }
+ filterVariables();
+ });
+
+ if (location.hash.substr(1).split('=')[0] == 'filter') {
+ var name = location.hash.substr(1).split('=')[1];
+ // Only allow variable names
+ if (! name.match(/[^0-9a-zA-Z_]+/)) {
+ $('#filterText').attr('value',name).trigger('keyup');
+ }
+ }
+
+ /* Table width limiting */
$('table.data').after($tmpDiv=$('<span>'+testString+'</span>'));
charWidth = $tmpDiv.width() / testString.length;
$tmpDiv.remove();
$(window).resize(limitTableWidth);
limitTableWidth();
-
+
+ /* This function chops of long variable values to keep the table from overflowing horizontally
+ * It does so by taking a test string and calculating an average font width and removing 'excess width / average font width'
+ * chars, so it is not very accurate.
+ */
function limitTableWidth() {
var fulltext;
var charDiff;
var maxTableWidth;
var $tmpTable;
- $('table.data').after($tmpTable=$('<table id="testTable" style="width:100%;"><tr><td>'+testString+'</td></tr></table>'));
+ $('table.data').after($tmpTable = $('<table id="testTable" style="width:100%;"><tr><td>' + testString + '</td></tr></table>'));
maxTableWidth = $('#testTable').width();
$tmpTable.remove();
- charDiff = ($('table.data').width()-maxTableWidth) / charWidth;
+ charDiff = ($('table.data').width() - maxTableWidth) / charWidth;
- if($('body').innerWidth() < $('table.data').width()+10 || $('body').innerWidth() > $('table.data').width()+20) {
- var maxChars=0;
+ if ($('body').innerWidth() < $('table.data').width() + 10 || $('body').innerWidth() > $('table.data').width() + 20) {
+ var maxChars = 0;
$('table.data tbody tr td:nth-child(2)').each(function() {
- maxChars=Math.max($(this).text().length,maxChars);
+ maxChars = Math.max($(this).text().length, maxChars);
});
// Do not resize smaller if there's only 50 chars displayed already
- if(charDiff > 0 && maxChars < 50) return;
+ if (charDiff > 0 && maxChars < 50) { return; }
$('table.data tbody tr td:nth-child(2)').each(function() {
- if((charDiff>0 && $(this).text().length > maxChars-charDiff) || (charDiff<0 && $(this).find('abbr.cutoff').length>0)) {
- if($(this).find('abbr.cutoff').length > 0)
+ if ((charDiff > 0 && $(this).text().length > maxChars - charDiff) || (charDiff < 0 && $(this).find('abbr.cutoff').length > 0)) {
+ if ($(this).find('abbr.cutoff').length > 0) {
fulltext = $(this).find('abbr.cutoff').attr('title');
- else {
+ } else {
fulltext = $(this).text();
// Do not cut off elements with html in it and hope they are not too long
- if(fulltext.length != $(this).html().length) return 0;
+ if (fulltext.length != $(this).html().length) { return 0; }
}
- if(fulltext.length < maxChars-charDiff)
+ if (fulltext.length < maxChars - charDiff) {
$(this).html(fulltext);
- else $(this).html('<abbr class="cutoff" title="'+fulltext+'">'+fulltext.substr(0,maxChars-charDiff-3)+'...</abbr>');
+ } else {
+ $(this).html('<abbr class="cutoff" title="' + fulltext + '">' + fulltext.substr(0, maxChars - charDiff - 3) + '...</abbr>');
+ }
}
});
}
}
-
- // Filter options are invisible for disabled js users
- $('fieldset#tableFilter').css('display','');
-
- $('#filterText').keyup(function(e) {
- if($(this).val().length==0) textFilter=null;
- else textFilter = new RegExp("(^| )"+$(this).val().replace(/_/g,' '),'i');
- filterVariables();
- });
-
+
+ /* Filters the rows by the user given regexp */
function filterVariables() {
- odd_row=false;
- var mark_next=false;
- var firstCell;
-
+ var mark_next = false, firstCell;
+ odd_row = false;
+
$('table.filteredData tbody tr').each(function() {
firstCell = $(this).children(':first');
- if(mark_next || textFilter==null || textFilter.exec(firstCell.text())) {
- // If current row is 'marked', also display next row
- if($(this).hasClass('marked') && !mark_next)
- mark_next=true;
- else mark_next=false;
+ if (mark_next || textFilter == null || textFilter.exec(firstCell.text())) {
+ // If current global value is different from session value (=has class diffSession), then display that one too
+ mark_next = $(this).hasClass('diffSession') && ! mark_next;
- odd_row = !odd_row;
+ odd_row = ! odd_row;
$(this).css('display','');
- if(odd_row) {
+ if (odd_row) {
$(this).addClass('odd');
$(this).removeClass('even');
} else {
@@ -163,3 +127,56 @@ $(function() {
});
}
});
+
+/* Called by inline js. Allows the user to edit a server variable */
+function editVariable(link)
+{
+ var varName = $(link).parent().parent().find('th:first').first().text().replace(/ /g,'_');
+ var mySaveLink = $(saveLink);
+ var myCancelLink = $(cancelLink);
+ var $cell = $(link).parent();
+
+ $cell.addClass('edit');
+ // remove edit link
+ $cell.find('a.editLink').remove();
+
+ mySaveLink.click(function() {
+ $.get('server_variables.php?' + url_query, {
+ ajax_request: true,
+ type: 'setval',
+ varName: varName,
+ varValue: $cell.find('input').attr('value')
+ }, function(data) {
+ if (data.success) {
+ $cell.html(data.variable);
+ } else {
+ PMA_ajaxShowMessage(data.error);
+ $cell.html($cell.find('span.oldContent').html());
+ }
+ $cell.removeClass('edit');
+ }, 'json');
+
+ return false;
+ });
+
+ myCancelLink.click(function() {
+ $cell.html($cell.find('span.oldContent').html());
+ $cell.removeClass('edit');
+ return false;
+ });
+
+ $.get('server_variables.php?' + url_query, {
+ ajax_request: true,
+ type: 'getval',
+ varName: varName
+ }, function(data) {
+ // hide original content
+ $cell.html('<span class="oldContent" style="display:none;">' + $cell.html() + '</span>');
+ // put edit field and save/cancel link
+ $cell.prepend('<table class="serverVariableEditTable" border="0"><tr><td></td><td style="width:100%;"><input type="text" value="' + data + '"/></td></tr</table>');
+ $cell.find('table td:first').append(mySaveLink);
+ $cell.find('table td:first').append(myCancelLink);
+ });
+
+ return false;
+}
\ No newline at end of file
diff --git a/libraries/advisor.lib.php b/libraries/advisor.class.php
similarity index 77%
rename from libraries/advisor.lib.php
rename to libraries/advisor.class.php
index f453097..df7178e 100644
--- a/libraries/advisor.lib.php
+++ b/libraries/advisor.class.php
@@ -1,4 +1,11 @@
<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * A simple rules engine, that parses and executes the rules in advisory_rules.txt. Adjusted to phpMyAdmin
+ *
+ *
+ * @package phpMyAdmin
+ */
class Advisor
{
@@ -10,35 +17,31 @@ class Advisor
// HowTo: A simple Advisory system in 3 easy steps.
// Step 1: Get some variables to evaluate on
- $this->variables = array_merge(PMA_DBI_fetch_result('SHOW GLOBAL STATUS', 0, 1), PMA_DBI_fetch_result('SHOW GLOBAL VARIABLES', 0, 1));
+ $this->variables = array_merge(
+ PMA_DBI_fetch_result('SHOW GLOBAL STATUS', 0, 1),
+ PMA_DBI_fetch_result('SHOW GLOBAL VARIABLES', 0, 1)
+ );
+ // Add total memory to variables as well
+ require_once('libraries/sysinfo.lib.php');
+ $sysinfo = getSysInfo();
+ $memory = $sysinfo->memory();
+ $this->variables['system_memory'] = $memory['MemTotal'];
+
// Step 2: Read and parse the list of rules
$this->parseResult = $this->parseRulesFile();
// Step 3: Feed the variables to the rules and let them fire. Sets $runResult
$this->runRules();
- /* echo '<br/><hr>';
- echo 'Total rules: '.count($this->parseResult['rules']).' <br><br>';
- echo '<b>Possible performance issues</b><br/>';
- foreach($this->runResult['fired'] as $rule) {
- echo $rule['issue'].'<br />';
- }
- echo '<br/><b>Rules not checked due to unmet preconditions</b><br/>';
- foreach($this->runResult['unchecked'] as $rule) {
- echo $rule['name'].'<br />';
- }
- echo '<br/><b>Rules that didn\'t fire</b><br/>';
- foreach($this->runResult['notfired'] as $rule) {
- echo $rule['name'].'<br />';
- }
-
- if($this->runResult['errors'])
- echo 'There were errors while testing the rules.';
- */
- return $this->runResult;
+ return array('parse' => array('errors' => $this->parseResult['errors']), 'run' => $this->runResult);
}
function runRules() {
- $this->runResult = array( 'fired' => array(), 'notfired' => array(), 'unchecked'=> array(), 'errors' => array() );
+ $this->runResult = array(
+ 'fired' => array(),
+ 'notfired' => array(),
+ 'unchecked'=> array(),
+ 'errors' => array()
+ );
foreach($this->parseResult['rules'] as $rule) {
$this->variables['value'] = 0;
@@ -78,6 +81,7 @@ class Advisor
return true;
}
+ // Adds a rule to the result list
function addRule($type, $rule) {
switch($type) {
case 'notfired':
@@ -86,7 +90,10 @@ class Advisor
if(count($jst) > 1) {
$jst[0] = preg_replace('/%( |,|\.|$)/','%%\1',$jst[0]);
try {
- $str = $this->ruleExprEvaluate('sprintf("'.$jst[0].'",'.$jst[1].')',strlen('sprintf("'.$jst[0].'"'));
+ $str = $this->ruleExprEvaluate(
+ 'sprintf("'.$jst[0].'",'.$jst[1].')',
+ strlen('sprintf("'.$jst[0].'"')
+ );
} catch (Exception $e) {
$this->runResult['errors'][] = 'Failed formattingstring for rule \''.$rule['name'].'\'. PHP threw following error: '.$e->getMessage();
return;
@@ -94,6 +101,9 @@ class Advisor
$rule['justification'] = $str;
}
+
+ $rule['recommendation'] = preg_replace('/\{([a-z_0-9]+)\}/Ui','<a href="server_variables.php?'.$GLOBALS['url_query'].'#filter=\1">\1</a>',$rule['recommendation']);
+
break;
}
@@ -121,7 +131,8 @@ class Advisor
if($err) throw new Exception(strip_tags($err) . '<br />Executed code: $value = '.$expr.';');
return $value;
}
-
+
+ // Reads the rule file into an array, throwing errors messages on syntax errors
function parseRulesFile() {
$file = file('libraries/advisory_rules.txt');
$errors = array();
@@ -138,9 +149,12 @@ class Advisor
// Reading new rule
if(substr($line, 0, 4) == 'rule') {
- if($ruleLine > 0) { $errors[] = 'Invalid rule declaration on line '.($i+1). ', expected line '.$ruleSyntax[$ruleLine++].' of previous rule' ; continue; }
- $ruleLine = 1;
+ if($ruleLine > 0) {
+ $errors[] = 'Invalid rule declaration on line '.($i+1). ', expected line '.$ruleSyntax[$ruleLine++].' of previous rule' ;
+ continue;
+ }
if(preg_match("/rule\s'(.*)'( \[(.*)\])?$/",$line,$match)) {
+ $ruleLine = 1;
$j++;
$rules[$j] = array( 'name' => $match[1]);
if(isset($match[3])) $rules[$j]['precondition'] = $match[3];
diff --git a/libraries/advisory_rules.txt b/libraries/advisory_rules.txt
index c193f85..dbfa6f0 100644
--- a/libraries/advisory_rules.txt
+++ b/libraries/advisory_rules.txt
@@ -1,6 +1,6 @@
# phpMyAdmin Advisory rules file
# Use only UNIX style newlines
-# This file is being parsed by advisor.lib.php, which should handle syntax errors correctly.
+# This file is being parsed by advisor.class.php, which should handle syntax errors correctly.
# However, PHP Warnings and the like are being consumed by the phpMyAdmin error handler, so those won't show up
# E.g.: Justification line is empty because you used an unescape percent sign, sprintf() returns an empty string and no warning/error is shown
#
@@ -28,7 +28,6 @@
# Comments start with #
#
-
# Queries
rule 'Uptime below one day'
@@ -77,23 +76,30 @@ rule 'Slow query logging'
# versions
rule 'Release Series'
version
- !PMA_DRIZZLE && substr(value,0,3) != "5.1"
- The MySQL server version is less than 5.1.
+ !PMA_DRIZZLE && substr(value,0,1) <= 5 && substr(value,2,1) < 1
+ The MySQL server version less then 5.1.
You should upgrade, as MySQL 5.1 has improved performance, and MySQL 5.5 even more so.
Current version: %s | value
-rule 'Minor Version'
+rule 'Minor Version' [! fired('Release Series')]
version
- !PMA_DRIZZLE && substr(value,4,2) < 30
+ substr(value,0,1) <= 5 && substr(value,2,1) < 1 && substr(value,4,2) < 30
Version less than 5.1.30 (the first GA release of 5.1).
You should upgrade, as recent versions of MySQL 5.1 have improved performance and MySQL 5.5 even more so.
Current version: %s | value
+rule 'Minor Version' [! fired('Release Series')]
+ version
+ substr(value,0,1) == 5 && substr(value,2,1) == 5 && substr(value,4,2) < 8
+ Version less than 5.5.8 (the first GA release of 5.5).
+ You should upgrade, to a stable version of MySQL 5.5
+ Current version: %s | value
+
rule 'Distribution'
version_comment
preg_match('/source/i',value)
- Version is compiled from source, not a MySQL official binary. If you did not compile from source, you may be using a package modified by a distribution.
- The MySQL manual only is accurate for official MySQL binaries, not any package distributions (such as RedHat, Debian/Ubuntu etc).
+ Version is compiled from source, not a MySQL official binary.
+ If you did not compile from source, you may be using a package modified by a distribution. The MySQL manual only is accurate for official MySQL binaries, not any package distributions (such as RedHat, Debian/Ubuntu etc).
'source' found in version_comment
rule 'Distribution'
@@ -105,10 +111,10 @@ rule 'Distribution'
rule 'MySQL Architect ule 'Distribution' ay be using a package modified by a distribution. The MySQL manual only is accurate for official MySQL binaries, not any package distributions (such as RedHat, Debian/Ubuntu etc). queryProfiling"></div>'); ing"></div>'); � � ! � ! @,�Q� �,�Q� x4n�+ �"�Q� �bQ�+ ��Q�+ @,�Q� `bQ�+ ,�Q� �/��+ ujQ�+ ��+ �$��+ �)��+ ��R�+ x4n�+ �"�Q� p!�Q� k�Q�+ �! �! @,�Q� �,�Q� H�M�+ �#�Q� �bQ�+ ��Q�+ @,�Q� `bQ�+ ,�Q� p,�Q� h,�Q� 8�r�+ �p� �,�Q� ujQ�+ ��R�+ �#�Q� P"�Q� k�Q�+ G H I J K M N O P @,�Q� �,�Q� H�$�+ %�Q� �bQ�+ ��Q�+ @,�Q� 0/��+ ujQ�+ @n�+ ���+ ��+ �$��+ �)��+ ��R�+ H�$�+ %�Q� `#�Q� k�Q�+ 8�$�+ %�Q� �#�Q� k�Q�+ (�$�+ %�Q� �#�Q� k�Q�+ �$�+ %�Q� �#�Q� k�Q�+ �.��+ ujQ�+ �)��+ p �Q� �8�+ eiQ�+ �$��+ �$�Q� y8�+ eiQ�+ ��+ �$�Q� Z8�+ eiQ�+ ���+ @n�+ ���+ ��+ �Dn�+ �$��+ �)��+ ��R�+ 8�r�+ ���+ �,�Q� p{�+ p&�Q� @%�Q� k�Q�+ 5 6 7 8 : < = > ? @ B D @,�Q� �,�Q� ���+ �,�Q� ujQ�+ �r�+ �$�Q� ���+ eiQ�+ �r�+ �_@f �S Q��l�� �Ù�+ �,�Q� ���+ �'�Q� P&�Q� k�Q�+ u]�� 4Q��U^Qʉ� �u������*ēv@,�Q� �,�Q� H���+ D��+ �-�Q� �P5�+ �P5�+ ����+ ,�Q� �-�Q� h,�Q� �(�Q� On�+ ujQ�+ �Dn�+ 0/�Q� �P5�+ .�Q� �)�Q� ���������P5�+ �,�Q� ure'
system_memory
- value > 3072 && !preg_match('/64/',version_compile_machine)
- MySQL is not compiled as a 64-bit package, though your memory capacity is above 3 GiB.
- MySQL might not be able to access all of your memory. You might want to consider installing the 64-bit version of MySQL.
- Available memory on this host: %s | implode(' ',PMA_formatByteDown(value*1024*1024, 2, 2))
+ value > 3072*1024 && !preg_match('/64/',version_compile_machine)
+ MySQL is not compiled as a 64-bit package.
+ Your memory capacity is above 3 GiB (assuming the Server is on localhost), so MySQL might not be able to access all of your memory. You might want to consider installing the 64-bit version of MySQL.
+ Available memory on this host: %s | implode(' ',PMA_formatByteDown(value*1024, 2, 2))
#
# Query cache
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index fd21708..c806923 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -558,6 +558,13 @@ $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'update-location.js';
/**
+ * holds an array of javascript code snippets to be included in the HTML header
+ * Can be used with PMA_AddJSCode() to pass on js variables to the browser.
+ * @global array $js_script
+ */
+$GLOBALS['js_script'] = array();
+
+/**
* Add common jQuery functions script here if necessary.
*/
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index e9f3082..dcc5208 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -706,4 +706,15 @@ function PMA_includeJS($url)
return '<script src="./js/' . $url . '" type="text/javascript"></script>' . "\n";
}
}
+
+/**
+ * Adds JS code snippets to be displayed by header.inc.php. Adds a newline to each snippet.
+ *
+ * @param string $str Js code to be added (e.g. "token=1234;")
+ *
+ */
+function PMA_AddJSCode($str) {
+ $GLOBALS['js_script'][] = $str;
+}
+
?>
diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
index 05d1ee3..0563868 100644
--- a/libraries/header_scripts.inc.php
+++ b/libraries/header_scripts.inc.php
@@ -51,16 +51,19 @@ $GLOBALS['js_include'] = array_unique($GLOBALS['js_include']);
foreach ($GLOBALS['js_include'] as $js_script_file) {
echo PMA_includeJS($js_script_file);
}
+// Below javascript Updates the title of the frameset if possible
?>
<script type="text/javascript">
// <![CDATA[
-// Updates the title of the frameset if possible (ns4 does not allow this)
if (typeof(parent.document) != 'undefined' && typeof(parent.document) != 'unknown'
&& typeof(parent.document.title) == 'string') {
parent.document.title = '<?php echo PMA_sanitize(PMA_escapeJsString(htmlspecialchars($title))); ?>';
}
-
<?php
+if(count($GLOBALS['js_script']) > 0) {
+ echo implode("\n",$GLOBALS['js_script'])."\n";
+}
+
foreach ($GLOBALS['js_events'] as $js_event) {
echo "$(window.parent).bind('" . $js_event['event'] . "', "
. $js_event['function'] . ");\n";
diff --git a/server_status.php b/server_status.php
index 58922d1..a03db31 100644
--- a/server_status.php
+++ b/server_status.php
@@ -88,7 +88,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
switch ($node['dataType']) {
case 'statusvar':
// Some white list filtering
- if (!preg_match('/[^a-zA-Z_]+/',$node['dataPoint']))
+ if (!preg_match('/[^a-zA-Z_]+/', $node['dataPoint']))
$statusVars[] = $node['dataPoint'];
break;
@@ -153,8 +153,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
if ($_REQUEST['type'] == 'slow') {
$q = 'SELECT start_time, user_host, Sec_to_Time(Sum(Time_to_Sec(query_time))) as query_time, Sec_to_Time(Sum(Time_to_Sec(lock_time))) as lock_time, '.
'SUM(rows_sent) AS rows_sent, SUM(rows_examined) AS rows_examined, db, sql_text, COUNT(sql_text) AS \'#\' '.
- 'FROM `mysql`.`slow_log` WHERE start_time > FROM_UNIXTIME('.$start.') '.
- 'AND start_time < FROM_UNIXTIME('.$end.') GROUP BY sql_text';
+ 'FROM `mysql`.`slow_log` WHERE start_time > FROM_UNIXTIME(' . $start . ') '.
+ 'AND start_time < FROM_UNIXTIME(' . $end . ') GROUP BY sql_text';
$result = PMA_DBI_try_query($q);
@@ -162,15 +162,15 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$type = '';
while ($row = PMA_DBI_fetch_assoc($result)) {
- $type = strtolower(substr($row['sql_text'],0,strpos($row['sql_text'],' ')));
+ $type = strtolower(substr($row['sql_text'], 0, strpos($row['sql_text'], ' ')));
switch($type) {
case 'insert':
case 'update':
// Cut off big inserts and updates, but append byte count therefor
if(strlen($row['sql_text']) > 220)
- $row['sql_text'] = substr($row['sql_text'],0,200) . '... [' .
- implode(' ',PMA_formatByteDown(strlen($row['sql_text']), 2, 2)).']';
+ $row['sql_text'] = substr($row['sql_text'], 0, 200) . '... [' .
+ implode(' ', PMA_formatByteDown(strlen($row['sql_text']), 2, 2)) . ']';
break;
default:
@@ -196,7 +196,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$q = 'SELECT TIME(event_time) as event_time, user_host, thread_id, server_id, argument, count(argument) as \'#\' '.
'FROM `mysql`.`general_log` WHERE command_type=\'Query\' '.
- 'AND event_time > FROM_UNIXTIME('.$start.') AND event_time < FROM_UNIXTIME('.$end.') '.
+ 'AND event_time > FROM_UNIXTIME(' . $start . ') AND event_time < FROM_UNIXTIME(' . $end . ') '.
$limitTypes . 'GROUP by argument'; // HAVING count > 1';
$result = PMA_DBI_try_query($q);
@@ -209,7 +209,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
$removeVars = isset($_REQUEST['removeVariables']) && $_REQUEST['removeVariables'];
while ($row = PMA_DBI_fetch_assoc($result)) {
- preg_match('/^(\w+)\s/',$row['argument'],$match);
+ preg_match('/^(\w+)\s/', $row['argument'], $match);
$type = strtolower($match[1]);
if(!isset($return['sum'][$type])) $return['sum'][$type] = 0;
@@ -218,7 +218,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
switch($type) {
case 'insert':
// Group inserts if selected
- if($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',$row['argument'],$matches)) {
+ if($removeVars && preg_match('/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i', $row['argument'], $matches)) {
$insertTables[$matches[2]]++;
if ($insertTables[$matches[2]] > 1) {
$return['rows'][$insertTablesFirst]['#'] = $insertTables[$matches[2]];
@@ -239,8 +239,8 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
case 'update':
// Cut off big inserts and updates, but append byte count therefor
if(strlen($row['argument']) > 220)
- $row['argument'] = substr($row['argument'],0,200) . '... [' .
- implode(' ',PMA_formatByteDown(strlen($row['argument'])), 2, 2).']';
+ $row['argument'] = substr($row['argument'], 0, 200) . '... [' .
+ implode(' ', PMA_formatByteDown(strlen($row['argument'])), 2, 2) . ']';
break;
@@ -263,10 +263,10 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
if (isset($_REQUEST['logging_vars'])) {
if(isset($_REQUEST['varName']) && isset($_REQUEST['varValue'])) {
$value = PMA_sqlAddslashes($_REQUEST['varValue']);
- if(!is_numeric($value)) $value="'".$value."'";
+ if(!is_numeric($value)) $value="'" . $value . "'";
- if(! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']))
- PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value);
+ if(! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName']))
+ PMA_DBI_query('SET GLOBAL ' . $_REQUEST['varName'] . ' = ' . $value);
}
@@ -284,7 +284,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
PMA_DBI_query('SET PROFILING=1;');
// Do not cache query
- $query = preg_replace('/^(\s*SELECT)/i','\\1 SQL_NO_CACHE',$_REQUEST['query']);
+ $query = preg_replace('/^(\s*SELECT)/i', '\\1 SQL_NO_CACHE', $_REQUEST['query']);
$result = PMA_DBI_try_query($query);
$return['affectedRows'] = $GLOBALS['cached_affected_rows'];
@@ -312,7 +312,7 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
}
if(isset($_REQUEST['advisor'])) {
- include('libraries/advisor.lib.php');
+ include('libraries/advisor.class.php');
$advisor = new Advisor();
exit(json_encode($advisor->run()));
}
@@ -333,19 +333,15 @@ $GLOBALS['js_include'][] = 'server_status.js';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
$GLOBALS['js_include'][] = 'jquery/jquery.tablesorter.js';
$GLOBALS['js_include'][] = 'jquery/jquery.cookie.js'; // For tab persistence
-$GLOBALS['js_include'][] = 'jquery/jquery.json-2.2.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
-$GLOBALS['js_include'][] = 'jquery/jquery.sortableTable.js';
-$GLOBALS['js_include'][] = 'jquery/timepicker.js';
// Charting
$GLOBALS['js_include'][] = 'highcharts/highcharts.js';
/* Files required for chart exporting */
$GLOBALS['js_include'][] = 'highcharts/exporting.js';
-$GLOBALS['js_include'][] = 'canvg/flashcanvas.js';
+/* < IE 9 doesn't support canvas natively */
+if(PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
+ $GLOBALS['js_include'][] = 'canvg/flashcanvas.js';
+}
$GLOBALS['js_include'][] = 'canvg/canvg.js';
-$GLOBALS['js_include'][] = 'canvg/rgbcolor.js';
-$GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
-$GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
/**
* flush status variables if requested
@@ -598,6 +594,16 @@ if (isset($_REQUEST['show']) && isset($_REQUEST['ajax_request'])) {
}
}
+
+PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" .
+ 'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n" .
+ 'server_time_diff = new Date().getTime() - ' . (microtime(true)*1000) . ";\n" .
+ 'server_os = \'' . PHP_OS . "';\n" .
+ 'is_superuser = ' . (PMA_isSuperuser() ? 'true' : 'false') . ";\n" .
+ 'server_db_isLocal = ' . ($server_db_isLocal ? 'true' : 'false') . ";\n" .
+ 'profiling_docu = \'' . PMA_showMySQLDocu('general-thread-states', 'general-thread-states') . "';\n" .
+ 'explain_docu = \'' . PMA_showMySQLDocu('explain-output', 'explain-output') . ";'\n");
+
/**
* start output
*/
@@ -608,6 +614,7 @@ if (isset($_REQUEST['show']) && isset($_REQUEST['ajax_request'])) {
require './libraries/server_common.inc.php';
+
/**
* Displays the links
*/
@@ -621,16 +628,6 @@ $server_db_isLocal = strtolower($cfg['Servers'][$server]['host']) == 'localhost'
|| $cfg['Servers'][$server]['host'] == '::1';
?>
-<script type="text/javascript">
-pma_token = '<?php echo $_SESSION[' PMA_token ']; ?>';
-url_query = '<?php echo str_replace('&','&',$url_query);?>';
-server_time_diff = new Date().getTime() - <?php echo microtime(true)*1000; ?>;
-server_os = '<?php echo PHP_OS; ?>';
-is_superuser = <?php echo PMA_isSuperuser()?'true':'false'; ?>;
-server_db_isLocal = <?php echo ($server_db_isLocal)?'true':'false'; ?>;
-profiling_docu = '<?php echo PMA_showMySQLDocu('general-thread-states','general-thread-states'); ?>';
-explain_docu = '<?php echo PMA_showMySQLDocu('explain-output', 'explain-output'); ?>';
-</script>
<div id="serverstatus">
<h2><?php
/**
@@ -731,7 +728,7 @@ echo __('Runtime Information');
<p class="notice"><?php echo __('Related links:'); ?>
<?php
foreach ($links as $section_name => $section_links) {
- echo '<span class="status_'.$section_name.'"> ';
+ echo '<span class="status_' . $section_name . '"> ';
$i=0;
foreach ($section_links as $link_name => $link_url) {
if ($i > 0) echo ', ';
@@ -758,17 +755,14 @@ echo __('Runtime Information');
</div>
<div id="statustabs_advisor">
- <p><a href="#startAnalyzer">Start analyzer</a> | <a href="#openAdvisorInstructions">Instructions</a></p>
- <div class="tabInnerContent">
+ <div class="tabLinks">
+ <img src="themes/dot.gif" class="icon ic_play" alt="" /> <a href="#startAnalyzer"><?php echo __('Run analyzer'); ?></a>
+ <img src="themes/dot.gif" class="icon ic_b_help" alt="" /> <a href="#openAdvisorInstructions"><?php echo __('Instructions'); ?></a>
+ </div>
+ <div class="tabInnerContent clearfloat">
</div>
<div id="advisorInstructionsDialog" style="display:none;">
- <?php echo __('The Advisor system can provide recommendations on server variables by analyzing the server status variables.
- Do note however that this system provides recommendations based on fairly simple calculations and by rule of thumb and
- may not necessarily work for your system.
- Prior to changing any of the configuration, be sure to know what you are changing and how to undo the change. Wrong tuning
- can have a very negative effect on performance.
- The best way to tune the system would be to change only one setting at a time, observe or benchmark your database, and
- undo the change if there was no clearly measurable improvement.'); ?>
+ <?php echo __('The Advisor system can provide recommendations on server variables by analyzing the server status variables. <p>Do note however that this system provides recommendations based on simple calculations and by rule of thumb which may not necessarily apply to your system.</p> <p>Prior to changing any of the configuration, be sure to know what you are changing (by reading the documentation) and how to undo the change. Wrong tuning can have a very negative effect on performance.</p> <p>The best way to tune your system would be to change only one setting at a time, observe or benchmark your database, and undo the change if there was no clearly measurable improvement.</p>'); ?>
</div>
</div>
</div>
@@ -788,22 +782,22 @@ function printQueryStatistics()
<h3 id="serverstatusqueries">
<?php
/* l10n: Questions is the name of a MySQL Status variable */
- echo sprintf(__('Questions since startup: %s'),PMA_formatNumber($total_queries, 0)) . ' ';
+ echo sprintf(__('Questions since startup: %s'), PMA_formatNumber($total_queries, 0)) . ' ';
echo PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_Questions');
?>
<br>
<span>
<?php
- echo 'ø '.__('per hour').': ';
+ echo 'ø ' . __('per hour') . ': ';
echo PMA_formatNumber($total_queries * $hour_factor, 0);
echo '<br>';
- echo 'ø '.__('per minute').': ';
+ echo 'ø ' . __('per minute') . ': ';
echo PMA_formatNumber( $total_queries * 60 / $server_status['Uptime'], 0);
echo '<br>';
if ($total_queries / $server_status['Uptime'] >= 1) {
- echo 'ø '.__('per second').': ';
+ echo 'ø ' . __('per second') . ': ';
echo PMA_formatNumber( $total_queries / $server_status['Uptime'], 0);
}
?>
@@ -881,7 +875,7 @@ function printQueryStatistics()
function printServerTraffic()
{
- global $server_status,$PMA_PHP_SELF;
+ global $server_status, $PMA_PHP_SELF;
global $server_master_status, $server_slave_status, $replication_types;
$hour_factor = 3600 / $server_status['Uptime'];
@@ -1325,8 +1319,8 @@ function printVariablesTable()
foreach ($server_status as $name => $value) {
$odd_row = !$odd_row;
?>
- <tr class="<?php echo $odd_row ? 'odd' : 'even'; echo isset($allocationMap[$name])?' s_'.$allocationMap[$name]:''; ?>">
- <th class="name"><?php echo htmlspecialchars(str_replace('_',' ',$name)) . PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_' . $name); ?>
+ <tr class="<?php echo $odd_row ? 'odd' : 'even'; echo isset($allocationMap[$name])?' s_' . $allocationMap[$name]:''; ?>">
+ <th class="name"><?php echo htmlspecialchars(str_replace('_', ' ', $name)) . PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_' . $name); ?>
</th>
<td class="value"><span class="formatted"><?php
if (isset($alerts[$name])) {
@@ -1338,7 +1332,7 @@ function printVariablesTable()
}
if ('%' === substr($name, -1, 1)) {
echo PMA_formatNumber($value, 0, 2) . ' %';
- } elseif (strpos($name,'Uptime')!==FALSE) {
+ } elseif (strpos($name, 'Uptime')!==FALSE) {
echo PMA_timespanFormat($value);
} elseif (is_numeric($value) && $value == (int) $value && $value > 1000) {
echo PMA_formatNumber($value, 3, 1);
@@ -1386,7 +1380,7 @@ function printMonitor()
{
global $server_status, $server_db_isLocal;
?>
- <div class="monitorLinks">
+ <div class="tabLinks" style="display:none;">
<a href="#pauseCharts">
<img src="themes/dot.gif" class="icon ic_play" alt="" />
<?php echo __('Start Monitor'); ?>
@@ -1413,7 +1407,10 @@ function printMonitor()
<a href="#rearrangeCharts"><img class="icon ic_b_tblops" src="themes/dot.gif" width="16" height="16" alt=""> <?php echo __('Rearrange/edit charts'); ?></a>
<div class="clearfloat paddingtop"></div>
<div class="floatleft">
- <?php echo __('Refresh rate').'<br />'; refreshList('gridChartRefresh', 5, Array(2,3,4,5,10,20,40,60,120,300,600,1200)); ?><br>
+ <?php
+ echo __('Refresh rate') . '<br />';
+ refreshList('gridChartRefresh', 5, Array(2, 3, 4, 5, 10, 20, 40, 60, 120, 300, 600, 1200));
+ ?><br>
</div>
<div class="floatleft">
<?php echo __('Chart columns'); ?> <br />
@@ -1572,7 +1569,7 @@ function printMonitor()
foreach ($server_status as $name=>$value) {
if (is_numeric($value)) {
if ($i++ > 0) echo ", ";
- echo "'".$name."'";
+ echo "'" . $name . "'";
}
}
?> ];
@@ -1581,7 +1578,7 @@ function printMonitor()
}
/* Builds a <select> list for refresh rates */
-function refreshList($name,$defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20, 40, 60, 120, 300, 600))
+function refreshList($name, $defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20, 40, 60, 120, 300, 600))
{
?>
<select name="<?php echo $name; ?>">
@@ -1590,9 +1587,9 @@ function refreshList($name,$defaultRate=5, $refreshRates=Array(1, 2, 5, 10, 20,
$selected = ($rate == $defaultRate)?' selected="selected"':'';
if ($rate<60)
- echo '<option value="'.$rate.'"'.$selected.'>'.sprintf(_ngettext('%d second', '%d seconds', $rate), $rate).'</option>';
+ echo '<option value="' . $rate . '"' . $selected . '>' . sprintf(_ngettext('%d second', '%d seconds', $rate), $rate) . '</option>';
else
- echo '<option value="'.$rate.'"'.$selected.'>'.sprintf(_ngettext('%d minute', '%d minutes', $rate/60), $rate/60).'</option>';
+ echo '<option value="' . $rate . '"' . $selected . '>' . sprintf(_ngettext('%d minute', '%d minutes', $rate/60), $rate/60) . '</option>';
}
?>
</select>
diff --git a/server_variables.php b/server_variables.php
index 8d5ea47..ca39a5e 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -16,6 +16,11 @@ require_once './libraries/common.inc.php';
$GLOBALS['js_include'][] = 'server_variables.js';
+PMA_AddJSCode('pma_token = \'' . $_SESSION[' PMA_token '] . "';\n" .
+ 'is_superuser = ' . (PMA_isSuperuser() ? 'true' : 'false') . ";\n" .
+ 'url_query = \'' . str_replace('&', '&', PMA_generate_common_url($db)) . "';\n");
+
+
/**
* Does the common work
*/
@@ -37,22 +42,24 @@ if (isset($_REQUEST['ajax_request']) && $_REQUEST['ajax_request'] == true) {
if (isset($_REQUEST['type'])) {
switch($_REQUEST['type']) {
case 'getval':
- $varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="'.PMA_sqlAddslashes($_REQUEST['varName']).'";','NUM');
+ $varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="' . PMA_sqlAddslashes($_REQUEST['varName']) . '";', 'NUM');
exit($varValue[1]);
break;
case 'setval':
$value = PMA_sqlAddslashes($_REQUEST['varValue']);
- if (!is_numeric($value)) $value="'".$value."'";
+ if (!is_numeric($value)) $value="'" . $value . "'";
- if (! preg_match("/[^a-zA-Z0-9_]+/",$_REQUEST['varName']) && PMA_DBI_query('SET GLOBAL '.$_REQUEST['varName'].' = '.$value))
+ if (! preg_match("/[^a-zA-Z0-9_]+/", $_REQUEST['varName']) && PMA_DBI_query('SET GLOBAL ' . $_REQUEST['varName'] . ' = ' . $value)) {
// Some values are rounded down etc.
- $varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="'.PMA_sqlAddslashes($_REQUEST['varName']).'";','NUM');
+ $varValue = PMA_DBI_fetch_single_row('SHOW GLOBAL VARIABLES WHERE Variable_name="' . PMA_sqlAddslashes($_REQUEST['varName']) . '";', 'NUM');
exit(json_encode(array(
'success' => true,
- 'variable' => formatVariable($_REQUEST['varName'],$varValue[1])
+ 'variable' => formatVariable($_REQUEST['varName'], $varValue[1])
))
);
+ }
+
exit(json_encode(array(
'success' => false,
'error' => __('Setting variable failed')
@@ -89,12 +96,6 @@ $serverVars = PMA_DBI_fetch_result('SHOW GLOBAL VARIABLES;', 0, 1);
* Displays the page
*/
?>
-<script type="text/javascript">
-pma_token = '<?php echo $_SESSION[' PMA_token ']; ?>';
-url_query = '<?php echo str_replace('&','&',$url_query);?>';
-isSuperuser = <?php echo PMA_isSuperuser()?'true':'false'; ?>;
-</script>
-
<fieldset id="tableFilter" style="display:none;">
<legend>Filters</legend>
<div class="formelement">
@@ -117,16 +118,19 @@ echo __('Session value') . ' / ' . __('Global value');
<?php
$odd_row = true;
foreach ($serverVars as $name => $value) {
+ $has_session_value = isset($serverVarsSession[$name]) && $serverVarsSession[$name] != $value;
+ $row_class = ($odd_row ? 'odd' : 'even') . ' ' . ($has_session_value ? 'diffSession' : '');
?>
-<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>">
+<tr class="<?php echo $row_class; ?>">
<th nowrap="nowrap"><?php echo htmlspecialchars(str_replace('_', ' ', $name)); ?></th>
<td class="value"><?php echo formatVariable($name,$value); ?></td>
<td class="value"><?php
- if (isset($VARIABLE_DOC_LINKS[$name])) // To display variable documentation link
+ // To display variable documentation link
+ if (isset($VARIABLE_DOC_LINKS[$name]))
echo PMA_showMySQLDocu($VARIABLE_DOC_LINKS[$name][1], $VARIABLE_DOC_LINKS[$name][1], false, $VARIABLE_DOC_LINKS[$name][2] . '_' . $VARIABLE_DOC_LINKS[$name][0]);
?></td>
<?php
- if (isset($serverVarsSession[$name]) && $serverVarsSession[$name] != $value) {
+ if ($has_session_value) {
?>
</tr>
<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> ">
@@ -136,19 +140,13 @@ foreach ($serverVars as $name => $value) {
<?php } ?>
</tr>
<?php
- $odd_row = !$odd_row;
+ $odd_row = ! $odd_row;
}
?>
</tbody>
</table>
<?php
-
-/**
- * Sends the footer
- */
-require './libraries/footer.inc.php';
-
function formatVariable($name,$value)
{
global $VARIABLE_DOC_LINKS;
@@ -161,4 +159,9 @@ function formatVariable($name,$value)
return htmlspecialchars($value);
}
-?>
+/**
+ * Sends the footer
+ */
+require './libraries/footer.inc.php';
+
+?>
\ No newline at end of file
diff --git a/sql.php b/sql.php
index 9b733cc..e41b602 100644
--- a/sql.php
+++ b/sql.php
@@ -21,8 +21,11 @@ if (isset($_SESSION['profiling'])) {
$GLOBALS['js_include'][] = 'highcharts/highcharts.js';
/* Files required for chart exporting */
$GLOBALS['js_include'][] = 'highcharts/exporting.js';
+ /* < IE 9 doesn't support canvas natively */
+ if(PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
+ $GLOBALS['js_include'][] = 'canvg/flashcanvas.js';
+ }
$GLOBALS['js_include'][] = 'canvg/canvg.js';
- $GLOBALS['js_include'][] = 'canvg/rgbcolor.js';
}
/**
diff --git a/tbl_chart.php b/tbl_chart.php
index 06b1e71..6131ff2 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -23,8 +23,11 @@ $GLOBALS['js_include'][] = 'tbl_chart.js';
$GLOBALS['js_include'][] = 'highcharts/highcharts.js';
/* Files required for chart exporting */
$GLOBALS['js_include'][] = 'highcharts/exporting.js';
+/* < IE 9 doesn't support canvas natively */
+if(PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
+ $GLOBALS['js_include'][] = 'canvg/flashcanvas.js';
+}
$GLOBALS['js_include'][] = 'canvg/canvg.js';
-$GLOBALS['js_include'][] = 'canvg/rgbcolor.js';
/**
* Runs common work
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 257378b..81d01de 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1106,6 +1106,12 @@ div#tablestatistics table {
/* serverstatus */
+.linkElem:hover {
+ text-decoration: underline;
+ color: #235a81;
+ cursor: pointer;
+}
+
h3#serverstatusqueries span {
font-size:60%;
display:inline;
@@ -1198,8 +1204,9 @@ table#chartGrid div.monitorChart {
background: #EBEBEB;
}
-div#statustabs_charting div.monitorLinks {
+div#serverstatus div.tabLinks {
float:<?php echo $left; ?>;
+ padding-bottom: 10px;
}
.popupContent {
@@ -2338,20 +2345,25 @@ span.cm-number {
width: 10px;
}
-.dHint {
- background: #333;
- border:1px solid #000;
- color: #FFF;
- font-size: 0.8em;
- font-weight: bold;
- margin-top: -1em;
- opacity: 0.8;
- padding: 0.5em 1em;
- position: fixed;
- text-shadow: -1px -1px #000;
- -moz-border-radius: 0.3em;
- -webkit-border-radius: 0.3em;
- border-radius: 0.3em;
+.normalqTip {
+ background: #333 !important;
+ opacity: 0.8 !important;
+ border:1px solid #000 !important;
+ -moz-border-radius: 0.3em !important;
+ -webkit-border-radius: 0.3em !important;
+ border-radius: 0.3em !important;
+ text-shadow: -1px -1px #000 !important;
+ font-size: 0.8em !important;
+ font-weight: bold !important;
+}
+
+.normalqTip * {
+ background: none !important;
+ color: #FFF !important;
+}
+
+.normalqTipContent {
+ padding: 1px 3px !important;
}
.data {
diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php
index 3974445..3cd5dc2 100644
--- a/themes/pmahomme/css/theme_right.css.php
+++ b/themes/pmahomme/css/theme_right.css.php
@@ -18,6 +18,11 @@ function PMA_ieFilter($start_color, $end_color)
? 'filter: progid:DXImageTransform.Microsoft.gradient(startColorstr="' . $start_color . '", endColorstr="' . $end_color . '");'
: '';
}
+function PMA_ieClearFilter() {
+ return PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 6 && PMA_USR_BROWSER_VER <= 8
+ ? 'filter: none'
+ : '';
+}
?>
/******************************************************************************/
@@ -528,12 +533,14 @@ button.mult_submit {
table tr.odd th,
.odd {
background: #fff;
+ <?php echo PMA_ieClearFilter(); ?>
}
/* even items 2,4,6,8,... */
table tr.even th,
.even {
background: #f3f3f3;
+ <?php echo PMA_ieClearFilter(); ?>
}
/* odd table rows 1,3,5,7,... */
@@ -1415,8 +1422,9 @@ table#chartGrid div.monitorChart {
background: #EBEBEB;
}
-div#statustabs_charting div.monitorLinks {
+div#serverstatus div.tabLinks {
float:<?php echo $left; ?>;
+ padding-bottom: 10px;
}
.popupContent {
@@ -2759,20 +2767,25 @@ span.cm-number {
width: 10px;
}
-.dHint {
- background: #333;
- border:1px solid #000;
- color: #FFF;
- font-size: 0.8em;
- font-weight: bold;
- margin-top: -1em;
- opacity: 0.8;
- padding: 0.5em 1em;
- position: fixed;
- text-shadow: -1px -1px #000;
- -moz-border-radius: 0.3em;
- -webkit-border-radius: 0.3em;
- border-radius: 0.3em;
+.normalqTip {
+ background: #333 !important;
+ opacity: 0.8 !important;
+ border:1px solid #000 !important;
+ -moz-border-radius: 0.3em !important;
+ -webkit-border-radius: 0.3em !important;
+ border-radius: 0.3em !important;
+ text-shadow: -1px -1px #000 !important;
+ font-size: 0.8em !important;
+ font-weight: bold !important;
+}
+
+.normalqTip * {
+ background: none !important;
+ color: #FFF !important;
+}
+
+.normalqTipContent {
+ padding: 1px 3px !important;
}
.cHide {
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14372-g3e0c94c
by Michal Čihař 11 Aug '11
by Michal Čihař 11 Aug '11
11 Aug '11
The branch, master has been updated
via 3e0c94c928a977e9a66f481d326501d4712cd848 (commit)
via 440f1bd4ba1909a12aebb28a1e14f76c7a1f318e (commit)
from e4db24599c883f8b7eca94ada0a0cdd1ad96da9d (commit)
- Log -----------------------------------------------------------------
commit 3e0c94c928a977e9a66f481d326501d4712cd848
Merge: e4db245 440f1bd
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Thu Aug 11 09:39:42 2011 +0200
Merge remote-tracking branch 'origin/QA_3_4'
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-70-g440f1bd
by Michal Čihař 11 Aug '11
by Michal Čihař 11 Aug '11
11 Aug '11
The branch, QA_3_4 has been updated
via 440f1bd4ba1909a12aebb28a1e14f76c7a1f318e (commit)
from 556636457a75226332d3d4b4a210141bc258690e (commit)
- Log -----------------------------------------------------------------
commit 440f1bd4ba1909a12aebb28a1e14f76c7a1f318e
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Thu Aug 11 09:38:23 2011 +0200
Update translations from master
-----------------------------------------------------------------------
Summary of changes:
po/br.po | 8 +++---
po/ko.po | 88 +++++++++++++++++++++++++++++++-------------------------------
po/lt.po | 32 +++++++++++-----------
3 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/po/br.po b/po/br.po
index 2de459d..bb6a3a3 100644
--- a/po/br.po
+++ b/po/br.po
@@ -4540,7 +4540,7 @@ msgstr ""
#: libraries/export/sql.php:945 libraries/tbl_properties.inc.php:578
#: pmd_general.php:510 server_privileges.php:1955 server_processlist.php:96
msgid "None"
-msgstr ""
+msgstr "Hini"
#: libraries/display_export.lib.php:315
msgid "zipped"
@@ -6170,7 +6170,7 @@ msgstr ""
#: libraries/server_links.inc.php:99
msgid "Settings"
-msgstr ""
+msgstr "Arventennoù"
#: libraries/server_synchronize.lib.php:1337 server_synchronize.php:1115
msgid "Source database"
@@ -8283,7 +8283,7 @@ msgstr ""
#: server_status.php:514
msgid "Traffic"
-msgstr ""
+msgstr "Tremenerezh"
#: server_status.php:514
msgid ""
@@ -8306,7 +8306,7 @@ msgstr ""
#: server_status.php:559
msgid "Connections"
-msgstr ""
+msgstr "Kevreadennoù"
#: server_status.php:566
msgid "max. concurrent connections"
diff --git a/po/ko.po b/po/ko.po
index 780a0b8..8cc0c9a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8622,11 +8622,11 @@ msgstr ""
#: server_synchronize.php:92
msgid "Could not connect to the source"
-msgstr ""
+msgstr "소스에 접속할 수 없음"
#: server_synchronize.php:95
msgid "Could not connect to the target"
-msgstr ""
+msgstr "타겟에 접속할 수 없음"
#: server_synchronize.php:120 server_synchronize.php:123 tbl_create.php:76
#: tbl_get_field.php:19
@@ -8652,47 +8652,47 @@ msgstr ""
#: server_synchronize.php:424 server_synchronize.php:867
msgid "Data Difference"
-msgstr ""
+msgstr "차이나는 데이터"
#: server_synchronize.php:429 server_synchronize.php:872
msgid "Add column(s)"
-msgstr ""
+msgstr "컬럼 추가"
#: server_synchronize.php:430 server_synchronize.php:873
msgid "Remove column(s)"
-msgstr ""
+msgstr "컬럼 제거"
#: server_synchronize.php:431 server_synchronize.php:874
msgid "Alter column(s)"
-msgstr ""
+msgstr "컬럼 뒤에"
#: server_synchronize.php:432 server_synchronize.php:875
msgid "Remove index(s)"
-msgstr ""
+msgstr "인덱스 제거"
#: server_synchronize.php:433 server_synchronize.php:876
msgid "Apply index(s)"
-msgstr ""
+msgstr "인덱스 적용"
#: server_synchronize.php:434 server_synchronize.php:877
msgid "Update row(s)"
-msgstr ""
+msgstr "행 업데이트"
#: server_synchronize.php:435 server_synchronize.php:878
msgid "Insert row(s)"
-msgstr ""
+msgstr "행 삽입"
#: server_synchronize.php:445 server_synchronize.php:889
msgid "Would you like to delete all the previous rows from target tables?"
-msgstr ""
+msgstr "대상 테이블에서 이전 행들을 모두 삭제하시겠습니까?"
#: server_synchronize.php:448 server_synchronize.php:893
msgid "Apply Selected Changes"
-msgstr ""
+msgstr "선택한 변경내용 적용"
#: server_synchronize.php:450 server_synchronize.php:895
msgid "Synchronize Databases"
-msgstr ""
+msgstr "데이터베이스 동기화"
#: server_synchronize.php:463
msgid "Selected target tables have been synchronized with source tables."
@@ -8745,7 +8745,7 @@ msgstr ""
#: setup/frames/config.inc.php:38 setup/frames/index.inc.php:213
msgid "Download"
-msgstr ""
+msgstr "다운로드"
#: setup/frames/index.inc.php:49
msgid "Cannot load or save configuration"
@@ -8789,31 +8789,31 @@ msgstr ""
#: setup/frames/index.inc.php:144
msgid "New server"
-msgstr ""
+msgstr "새 서버"
#: setup/frames/index.inc.php:173
msgid "Default language"
-msgstr ""
+msgstr "기본 언어"
#: setup/frames/index.inc.php:183
msgid "let the user choose"
-msgstr ""
+msgstr "사용자 선택"
#: setup/frames/index.inc.php:194
msgid "- none -"
-msgstr ""
+msgstr "-없음-"
#: setup/frames/index.inc.php:197
msgid "Default server"
-msgstr ""
+msgstr "기본 서버"
#: setup/frames/index.inc.php:207
msgid "End of line"
-msgstr ""
+msgstr "줄 끝"
#: setup/frames/index.inc.php:212
msgid "Display"
-msgstr ""
+msgstr "보기"
#: setup/frames/index.inc.php:216
#, fuzzy
@@ -8827,11 +8827,11 @@ msgstr "phpMyAdmin 설명서"
#: setup/frames/index.inc.php:228
msgid "Donate"
-msgstr ""
+msgstr "기부"
#: setup/frames/servers.inc.php:28
msgid "Edit server"
-msgstr ""
+msgstr "서버 수정"
#: setup/frames/servers.inc.php:37
#, fuzzy
@@ -8840,7 +8840,7 @@ msgstr "새 사용자 추가"
#: setup/lib/form_processing.lib.php:42
msgid "Warning"
-msgstr ""
+msgstr "경고"
#: setup/lib/form_processing.lib.php:43
msgid "Submitted form contains errors"
@@ -8921,7 +8921,7 @@ msgstr ""
#: setup/lib/index.lib.php:256
#, php-format
msgid "This %soption%s should be enabled if your web server supports it."
-msgstr ""
+msgstr "웹 서버가 지원한다면 이 %s 옵션 %s 허용"
#: setup/lib/index.lib.php:258
#, php-format
@@ -8987,23 +8987,23 @@ msgstr ""
#: setup/lib/index.lib.php:296
msgid "You should use SSL connections if your web server supports it."
-msgstr ""
+msgstr "웹 서버가 지원한다면 SSL 연결 사용"
#: setup/lib/index.lib.php:306
msgid "You should use mysqli for performance reasons."
-msgstr ""
+msgstr "효율적 이유로 mysqli 사용"
#: setup/lib/index.lib.php:331
msgid "You allow for connecting to the server without a password."
-msgstr ""
+msgstr "암호 없이 서버 접속 허용"
#: setup/lib/index.lib.php:351
msgid "Key is too short, it should have at least 8 characters."
-msgstr ""
+msgstr "키가 너무 짧다. 8글자 이상 사용"
#: setup/lib/index.lib.php:358
msgid "Key should contain letters, numbers [em]and[/em] special characters."
-msgstr ""
+msgstr "키는 문자, 숫자 [em]그리고[/em] 특수문자 포함"
#: sql.php:87 tbl_change.php:253 tbl_select.php:26 tbl_select.php:27
#: tbl_select.php:30 tbl_select.php:33
@@ -9022,11 +9022,11 @@ msgstr ""
#: sql.php:617
msgid "Showing as PHP code"
-msgstr ""
+msgstr "PHP 코드 보기"
#: sql.php:620 tbl_replace.php:361
msgid "Showing SQL query"
-msgstr ""
+msgstr "SQL 쿼리 보기"
#: sql.php:622
#, fuzzy
@@ -9080,7 +9080,7 @@ msgstr ""
#: tbl_change.php:1060
msgid "Show insert query"
-msgstr ""
+msgstr "삽입 쿼리 보기"
#: tbl_change.php:1071
msgid "and then"
@@ -9101,12 +9101,12 @@ msgstr "되돌아가기"
#: tbl_change.php:1088
msgid "Edit next row"
-msgstr ""
+msgstr "다음 행 수정"
#: tbl_change.php:1099
msgid ""
"Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
-msgstr ""
+msgstr "탭 키를 이용해 이동하거나 CTRL+화살표로 이동할 수 있다"
#: tbl_change.php:1137
#, php-format
@@ -9133,11 +9133,11 @@ msgstr ""
#: tbl_chart.php:90
msgid "Width"
-msgstr ""
+msgstr "너비"
#: tbl_chart.php:94
msgid "Height"
-msgstr ""
+msgstr "높이"
#: tbl_chart.php:98
msgid "Title"
@@ -9167,7 +9167,7 @@ msgstr "3월"
#: tbl_chart.php:135
msgid "Line"
-msgstr ""
+msgstr "줄"
#: tbl_chart.php:136
msgid "Radar"
@@ -9276,11 +9276,11 @@ msgstr ""
#: tbl_move_copy.php:44
msgid "Can't move table to same one!"
-msgstr ""
+msgstr "같은 테이블이 있어 옮길 수 없음!"
#: tbl_move_copy.php:46
msgid "Can't copy table to same one!"
-msgstr ""
+msgstr "같은 테이블이 있어 복사할 수 없음!"
#: tbl_move_copy.php:54
#, php-format
@@ -9310,7 +9310,7 @@ msgstr "테이블 이동 (데이터베이스명<b>.</b>테이블명):"
#: tbl_operations.php:347
msgid "Table options"
-msgstr ""
+msgstr "테이블 옵션"
#: tbl_operations.php:351
msgid "Rename table to"
@@ -9330,7 +9330,7 @@ msgstr "테이블 유지보수"
#: tbl_operations.php:610
msgid "Defragment table"
-msgstr ""
+msgstr "테이블 단편화 제거"
#: tbl_operations.php:658
#, php-format
@@ -9351,7 +9351,7 @@ msgstr "테이블의 덤프 데이터"
#: tbl_operations.php:688
msgid "Empty the table (TRUNCATE)"
-msgstr ""
+msgstr "테이블 내용 비우기(TRUNCATE)"
#: tbl_operations.php:708
#, fuzzy
@@ -9370,7 +9370,7 @@ msgstr ""
#: tbl_operations.php:740
msgid "Analyze"
-msgstr ""
+msgstr "분석"
#: tbl_operations.php:741
msgid "Check"
diff --git a/po/lt.po b/po/lt.po
index 3a0b6da..0778620 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -801,7 +801,7 @@ msgstr "Įveskite kiekvieną reikšmę atskirame laukelyje."
#: enum_editor.php:57
msgid "+ Restart insertion and add a new value"
-msgstr ""
+msgstr "+ Paleisti iš naujo įterpimą ir pridėti naują reikšmę"
#: enum_editor.php:67
msgid "Output"
@@ -3617,7 +3617,7 @@ msgstr ""
#: libraries/config/messages.inc.php:369
msgid "Column information table"
-msgstr ""
+msgstr "Stulpelio informacinė lentelė"
#: libraries/config/messages.inc.php:370
msgid "Compress connection to MySQL server"
@@ -3670,7 +3670,7 @@ msgstr ""
#: libraries/config/messages.inc.php:380
msgid "Designer table"
-msgstr ""
+msgstr "Suprojektuoti lentelę"
#: libraries/config/messages.inc.php:381
msgid ""
@@ -4146,7 +4146,7 @@ msgstr ""
#: libraries/config/messages.inc.php:480
msgid "Textarea rows"
-msgstr ""
+msgstr "Textarea eilutės"
#: libraries/config/messages.inc.php:481
msgid "Title of browser window when a database is selected"
@@ -4178,7 +4178,7 @@ msgstr ""
#: libraries/config/messages.inc.php:490
msgid "List of trusted proxies for IP allow/deny"
-msgstr ""
+msgstr "Sąrašas patikimų proxy serverių IP leidimui/atmetimui"
#: libraries/config/messages.inc.php:491
msgid "Directory on server where you can upload files for import"
@@ -4262,7 +4262,7 @@ msgstr "HTTP autentifikacija"
#: libraries/config/setup.forms.php:51
msgid "Signon authentication"
-msgstr ""
+msgstr "Prisijungimo tapatybės nustatymas"
#: libraries/config/setup.forms.php:240
#: libraries/config/user_preferences.forms.php:144 libraries/import/ldi.php:34
@@ -4950,7 +4950,7 @@ msgstr "Įrašymo užklausos"
#: libraries/engines/innodb.lib.php:240
msgid "Read misses"
-msgstr ""
+msgstr "Skaitymo nepataikymai"
#: libraries/engines/innodb.lib.php:246
msgid "Write waits"
@@ -4958,7 +4958,7 @@ msgstr "Rašymas laukia"
#: libraries/engines/innodb.lib.php:252
msgid "Read misses in %"
-msgstr ""
+msgstr "Skaitymo nepataikymai %"
#: libraries/engines/innodb.lib.php:260
msgid "Write waits in %"
@@ -6466,7 +6466,7 @@ msgstr "Lentelė atrodo tuščia!"
#: libraries/tbl_links.inc.php:115
#, php-format
msgid "Tracking of %s.%s is activated."
-msgstr ""
+msgstr "Stebėjimas %s.%s yra aktyvuotas."
#: libraries/tbl_properties.inc.php:104
msgid "Length/Values"
@@ -7191,7 +7191,7 @@ msgstr "Nepavyko užkrauti numatytų nustatymų failo iš: %1$s"
#: prefs_manage.php:112
msgid "Configuration contains incorrect data for some fields."
-msgstr ""
+msgstr "Konfigūracijoje yra neteisingų duomenų tam tikruose laukeliuose."
#: prefs_manage.php:128
msgid "Do you want to import remaining settings?"
@@ -8100,11 +8100,11 @@ msgstr "Vidinių ROLLBACK užklausų skaičius."
#: server_status.php:65
msgid "The number of requests to update a row in a table."
-msgstr ""
+msgstr "Skaičius užklausų, kad atnaujinti eilutę lentelėje."
#: server_status.php:66
msgid "The number of requests to insert a row in a table."
-msgstr ""
+msgstr "Skaičius užklausų, kad įtraukti eilutę lentelėje."
#: server_status.php:67
msgid "The number of pages containing data (dirty or clean)."
@@ -8495,7 +8495,7 @@ msgstr "Įkeltų eilučių skaičius"
#: server_status.php:146
msgid "The number of sorts that were done by scanning the table."
-msgstr ""
+msgstr "Rikiavimų kurie buvo atlikti skenuojant lentelę skaičius."
#: server_status.php:147
msgid "The number of times that a table lock was acquired immediately."
@@ -8910,7 +8910,7 @@ msgstr "leisti vartotojui pasirinkti"
#: setup/frames/index.inc.php:194
msgid "- none -"
-msgstr ""
+msgstr "- tuščia -"
#: setup/frames/index.inc.php:197
msgid "Default server"
@@ -9657,11 +9657,11 @@ msgstr "Keisti žurnalą(us) (indeksą)"
#: tbl_structure.php:170 tbl_structure.php:171
msgid "Add unique index"
-msgstr ""
+msgstr "Pridėti unikalų indeksą"
#: tbl_structure.php:172 tbl_structure.php:173
msgid "Add FULLTEXT index"
-msgstr ""
+msgstr "Pridėti FULLTEXT indeksą"
#: tbl_structure.php:385
#, fuzzy
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14370-ge4db245
by Michal Čihař 11 Aug '11
by Michal Čihař 11 Aug '11
11 Aug '11
The branch, master has been updated
via e4db24599c883f8b7eca94ada0a0cdd1ad96da9d (commit)
from 3f75240d7c7905602af8a9f0ad8343b5c886adf0 (commit)
- Log -----------------------------------------------------------------
commit e4db24599c883f8b7eca94ada0a0cdd1ad96da9d
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Thu Aug 11 09:36:04 2011 +0200
Update po files
-----------------------------------------------------------------------
Summary of changes:
po/af.po | 123 +++++++++++++++--------------------
po/ar.po | 135 ++++++++++++++++----------------------
po/az.po | 123 +++++++++++++++--------------------
po/be.po | 131 ++++++++++++++++---------------------
po/be(a)latin.po | 143 ++++++++++++++++++-----------------------
po/bg.po | 133 ++++++++++++++++---------------------
po/bn.po | 135 ++++++++++++++++----------------------
po/br.po | 137 +++++++++++++++++----------------------
po/bs.po | 123 +++++++++++++++--------------------
po/ca.po | 151 ++++++++++++++++++++-----------------------
po/cs.po | 151 ++++++++++++++++++++-----------------------
po/cy.po | 127 +++++++++++++++---------------------
po/da.po | 155 ++++++++++++++++++++-----------------------
po/de.po | 147 +++++++++++++++++++----------------------
po/el.po | 159 +++++++++++++++++++++------------------------
po/en_GB.po | 155 ++++++++++++++++++++-----------------------
po/es.po | 187 ++++++++++++++++++----------------------------------
po/et.po | 123 +++++++++++++++--------------------
po/eu.po | 123 +++++++++++++++--------------------
po/fa.po | 139 +++++++++++++++++----------------------
po/fi.po | 143 ++++++++++++++++++----------------------
po/fr.po | 158 +++++++++++++++++++++------------------------
po/gl.po | 147 +++++++++++++++++++-----------------------
po/he.po | 123 +++++++++++++++--------------------
po/hi.po | 134 +++++++++++++++++---------------------
po/hr.po | 135 ++++++++++++++++----------------------
po/hu.po | 159 +++++++++++++++++++++------------------------
po/id.po | 131 ++++++++++++++++---------------------
po/it.po | 147 +++++++++++++++++++----------------------
po/ja.po | 144 +++++++++++++++++++----------------------
po/ka.po | 149 ++++++++++++++++++------------------------
po/ko.po | 131 ++++++++++++++++---------------------
po/lt.po | 147 +++++++++++++++++++-----------------------
po/lv.po | 127 +++++++++++++++---------------------
po/mk.po | 123 +++++++++++++++--------------------
po/ml.po | 115 +++++++++++++--------------------
po/mn.po | 135 ++++++++++++++++----------------------
po/ms.po | 123 +++++++++++++++--------------------
po/nb.po | 143 ++++++++++++++++++----------------------
po/nl.po | 143 +++++++++++++++++++----------------------
po/phpmyadmin.pot | 115 +++++++++++++-------------------
po/pl.po | 155 ++++++++++++++++++++------------------------
po/pt.po | 131 ++++++++++++++++---------------------
po/pt_BR.po | 127 +++++++++++++++---------------------
po/ro.po | 131 ++++++++++++++++---------------------
po/ru.po | 139 ++++++++++++++++++---------------------
po/si.po | 135 ++++++++++++++++----------------------
po/sk.po | 147 +++++++++++++++++++----------------------
po/sl.po | 131 +++++++++++++++++--------------------
po/sq.po | 127 +++++++++++++++---------------------
po/sr.po | 131 ++++++++++++++++---------------------
po/sr(a)latin.po | 131 ++++++++++++++++---------------------
po/sv.po | 147 +++++++++++++++++++----------------------
po/ta.po | 115 +++++++++++++--------------------
po/te.po | 129 ++++++++++++++++---------------------
po/th.po | 127 +++++++++++++++---------------------
po/tr.po | 162 ++++++++++++++++++++--------------------------
po/tt.po | 127 +++++++++++++++---------------------
po/ug.po | 135 ++++++++++++++++----------------------
po/uk.po | 135 ++++++++++++++++----------------------
po/ur.po | 135 +++++++++++++++++---------------------
po/uz.po | 159 +++++++++++++++++++++------------------------
po/uz(a)latin.po | 167 ++++++++++++++++++++++-------------------------
po/zh_CN.po | 164 ++++++++++++++++++++---------------------------
po/zh_TW.po | 135 ++++++++++++++++++---------------------
65 files changed, 3940 insertions(+), 5054 deletions(-)
diff --git a/po/af.po b/po/af.po
index d724d91..b78df6b 100644
--- a/po/af.po
+++ b/po/af.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-03-30 23:04+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: afrikaans <af(a)li.org>\n"
+"Language: af\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: af\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.1\n"
@@ -24,6 +24,7 @@ msgstr "Wys alles"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Bladsy nommer:"
@@ -637,8 +638,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -881,8 +882,8 @@ msgstr ""
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1422,7 +1423,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2300,8 +2301,8 @@ msgstr "Welkom by %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2440,13 +2441,13 @@ msgstr ""
msgid "Tables"
msgstr "Tabel"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2722,11 +2723,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3219,7 +3220,6 @@ msgstr ""
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr ""
@@ -3441,9 +3441,9 @@ msgid "Customize default options"
msgstr ""
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV data"
@@ -4962,57 +4962,43 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
#, fuzzy
msgid "Database export options"
msgstr "Databasis statistieke"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV vir M$ Excel data"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5284,8 +5270,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5489,13 +5475,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -5997,8 +5981,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6036,7 +6020,6 @@ msgstr "Lyne beeindig deur"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr ""
@@ -6371,7 +6354,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7477,13 +7459,6 @@ msgstr ""
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Usage"
-msgctxt "PDF"
-msgid "page"
-msgstr "Gebruik"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8085,7 +8060,7 @@ msgstr "Geen databasisse"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Verander tabel sorteer volgens"
#: navigation.php:303 navigation.php:304
@@ -8797,8 +8772,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
@@ -11210,6 +11185,12 @@ msgstr ""
msgid "Rename view to"
msgstr "Hernoem tabel na"
+#, fuzzy
+#~| msgid "Usage"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "Gebruik"
+
#~ msgid "Begin"
#~ msgstr "Begin"
diff --git a/po/ar.po b/po/ar.po
index edb84bf..5c4589c 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-08-07 03:51+0200\n"
"Last-Translator: Abdullah Al-Saedi <abdullah.10(a)windowslive.com>\n"
"Language-Team: arabic <ar(a)li.org>\n"
+"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -25,6 +25,7 @@ msgstr "عرض الكل"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "صفحة رقم:"
@@ -346,8 +347,8 @@ msgid ""
"The phpMyAdmin configuration storage has been deactivated. To find out why "
"click %shere%s."
msgstr ""
-"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا%"
-"s."
+"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا"
+"%s."
#: db_operations.php:584
msgid "Edit or export relational schema"
@@ -623,8 +624,8 @@ msgstr "التتبع غير نشط."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr "هذا العرض له ما لا يقل عدد هذه الصفوف يرجى الرجوع إلى %s الوثيقة %s"
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -858,8 +859,8 @@ msgstr "تم حفظ الـDump إلى الملف %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"يبدو أنك تحاول رفع ملف كبير الحجم , فضلاً راجع المستند %sdocumentation%s لحل "
"المشكلة."
@@ -1389,7 +1390,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2216,8 +2217,8 @@ msgstr "أهلا بك في %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr "يبدو انك لم تنشئ ملف الإعدادات.إستخدم %1$ssetup script%2$s لإنشائه."
#: libraries/auth/config.auth.lib.php:109
@@ -2361,13 +2362,13 @@ msgstr "مشترك"
msgid "Tables"
msgstr "جداول"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2645,11 +2646,11 @@ msgid "Click to toggle"
msgstr "إضغط للإختيار"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3134,7 +3135,6 @@ msgstr "الضغط"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "ضع أسماء الحقول في السطر الأول"
@@ -3338,9 +3338,9 @@ msgid "Customize default options"
msgstr "تخصيص الخيارات الإفتراضية"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "سي إس في"
@@ -4844,58 +4844,44 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
#, fuzzy
#| msgid "Database export options"
msgid "Database export options"
msgstr "خيارات تصدير قاعدة بيانات"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "بيانات CSV لبرنامج ميكروسوفت إكسل"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5171,8 +5157,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5384,13 +5370,11 @@ msgstr "رتب حسب المفتاح"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5889,8 +5873,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -5928,7 +5912,6 @@ msgstr "خطوط مفصولة بـ"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6274,7 +6257,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7421,13 +7403,6 @@ msgstr "toggle scratchboard"
msgid "ltr"
msgstr "rtl"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "صفحات"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8042,8 +8017,8 @@ msgid ""
"The phpMyAdmin configuration storage is not completely configured, some "
"extended features have been deactivated. To find out why click %shere%s."
msgstr ""
-"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا%"
-"s."
+"تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا"
+"%s."
#: main.php:314
msgid ""
@@ -8073,7 +8048,7 @@ msgstr "لايوجد قواعد بيانات"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "اسم الجدول"
#: navigation.php:303 navigation.php:304
@@ -8784,8 +8759,8 @@ msgstr "احذف قواعد البيانات التي لها نفس أسماء
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"ملاحظة: يقرأ phpMyAdmin صلاحيات المستخدمين من جداول الصلاحيات من خادم MySQL "
"مباشرة. محتويات هذه الجداول قد تختلف عن الصلاحيات التي يستخدمها الخادم إذا "
@@ -11194,6 +11169,12 @@ msgstr "اسم VIEW"
msgid "Rename view to"
msgstr "أعد تسمية العرض الـ"
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "صفحات"
+
#~ msgid "Inline Edit"
#~ msgstr "تعديل سريع"
@@ -11326,8 +11307,8 @@ msgstr "أعد تسمية العرض الـ"
#~ "The additional features for working with linked tables have been "
#~ "deactivated. To find out why click %shere%s."
#~ msgstr ""
-#~ "تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %"
-#~ "sهنا%s."
+#~ "تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط "
+#~ "%sهنا%s."
#~ msgid "Execute bookmarked query"
#~ msgstr "نفذ استعلام محفوظ بعلامة مرجعية"
diff --git a/po/az.po b/po/az.po
index baebba6..c412a6e 100644
--- a/po/az.po
+++ b/po/az.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-03-12 09:11+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: azerbaijani <az(a)li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: Translate Toolkit 1.5.3\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -23,6 +23,7 @@ msgstr "Hamısını göster"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Sehife Nömresi:"
@@ -638,8 +639,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -885,8 +886,8 @@ msgstr "Sxem %s faylına qeyd edildi."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1443,7 +1444,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2329,8 +2330,8 @@ msgstr "%s - e Xoş Gelmişsiniz!"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2469,13 +2470,13 @@ msgstr ""
msgid "Tables"
msgstr "Cedveller"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2755,11 +2756,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3258,7 +3259,6 @@ msgstr "Sıxışdırma"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3488,9 +3488,9 @@ msgid "Customize default options"
msgstr "Me'lumat bazası eksport variantları"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV verilenleri"
@@ -5027,56 +5027,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Me'lumat bazası eksport variantları"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "MS Excel verilenleri üçün CSV"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5352,8 +5338,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5563,13 +5549,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6074,8 +6058,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6113,7 +6097,6 @@ msgstr "Setir leğvedicisi (Lines terminated by)"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6461,7 +6444,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7591,13 +7573,6 @@ msgstr ""
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Usage"
-msgctxt "PDF"
-msgid "page"
-msgstr "Miqdar"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8257,7 +8232,7 @@ msgstr "Baza seçilmemişdir ve ya mövcud deyildir."
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Cedvel sırasına buna göre yeniden qur"
#: navigation.php:303 navigation.php:304
@@ -8981,8 +8956,8 @@ msgstr "İstifadeçilerle eyni adlı me'lumat bazalarını leğv et."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Qeyd: phpMyAdmin istifadeçi selahiyyetlerini birbaşa MySQL-in selahiyyetler "
"cedvellerinden almaqdadır. Eger elle nizamlamalar edilmişse, bu cedvellerin "
@@ -11419,6 +11394,12 @@ msgid "Rename view to"
msgstr "Cedveli yeniden adlandır"
#, fuzzy
+#~| msgid "Usage"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "Miqdar"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "Motorlar"
diff --git a/po/be.po b/po/be.po
index c697e7e..8f18069 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-03-12 09:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: belarusian_cyrillic <be(a)li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: Translate Toolkit 1.5.3\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -23,6 +23,7 @@ msgstr "Паказаць усе"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Старонка:"
@@ -637,11 +638,11 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Гэты прагляд мае толькі такую колькасьць радкоў. Калі ласка, зьвярніцеся да %"
-"sдакумэнтацыі%s."
+"Гэты прагляд мае толькі такую колькасьць радкоў. Калі ласка, зьвярніцеся да "
+"%sдакумэнтацыі%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -891,8 +892,8 @@ msgstr "Дамп захаваны ў файл %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Вы, мусіць, паспрабавалі загрузіць вельмі вялікі файл. Калі ласка, "
"зьвярніцеся да %sдакумэнтацыі%s для высьвятленьня спосабаў абыйсьці гэтае "
@@ -911,8 +912,8 @@ msgid ""
"You attempted to load file with unsupported compression (%s). Either support "
"for it is not implemented or disabled by your configuration."
msgstr ""
-"Вы паспрабавалі загрузіць файл з мэтадам сьціску, які непадтрымліваецца (%"
-"s). Ягоная падтрымка або не рэалізаваная, або адключаная ў вашай "
+"Вы паспрабавалі загрузіць файл з мэтадам сьціску, які непадтрымліваецца "
+"(%s). Ягоная падтрымка або не рэалізаваная, або адключаная ў вашай "
"канфігурацыі."
#: import.php:335
@@ -1471,7 +1472,7 @@ msgid "Filters"
msgstr "Файлы"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
#, fuzzy
msgid "Filter"
msgstr "Файлы"
@@ -2379,8 +2380,8 @@ msgstr "Запрашаем у %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Імаверна, прычына гэтага ў тым, што ня створаны канфігурацыйны файл. Каб яго "
"стварыць, можна выкарыстаць %1$sналадачны скрыпт%2$s."
@@ -2529,13 +2530,13 @@ msgstr ""
msgid "Tables"
msgstr "Табліц"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2822,11 +2823,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3327,7 +3328,6 @@ msgstr "Сьціск"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3554,9 +3554,9 @@ msgid "Customize default options"
msgstr "Налады экспарту базы дадзеных"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5127,58 +5127,44 @@ msgstr "Апаратная аўтэнтыфікацыя скончылася н
msgid "CSV using LOAD DATA"
msgstr "CSV з выкарыстаньнем LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Спэцыфікацыя Open Document"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
#, fuzzy
#| msgid "Custom color"
msgid "Custom"
msgstr "Іншы колер"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Налады экспарту базы дадзеных"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV для дадзеных MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Тэкст Open Document"
@@ -5465,8 +5451,8 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Гэтае значэньне інтэрпрэтуецца з выкарыстаньнем %1$sstrftime%2$s, таму можна "
"выкарыстоўваць радкі фарматаваньня часу. Апроч гэтага, будуць праведзеныя "
@@ -5695,13 +5681,11 @@ msgstr "Сартаваць па ключы"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6259,8 +6243,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6298,7 +6282,6 @@ msgstr "Радкі падзеленыя"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6651,7 +6634,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7806,13 +7788,6 @@ msgstr "Паказаць папярэдні прагляд"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "старонак"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8523,7 +8498,7 @@ msgstr "Базы дадзеных адсутнічаюць"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "імя табліцы"
#: navigation.php:303 navigation.php:304
@@ -9257,8 +9232,8 @@ msgstr "Выдаліць базы дадзеных, якія маюць такі
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Заўвага: phpMyAdmin атрымлівае прывілеі карыстальнікаў наўпростава з табліц "
"прывілеяў MySQL. Зьмесьціва гэтых табліц можа адрозьнівацца ад прывілеяў, "
@@ -11846,6 +11821,12 @@ msgid "Rename view to"
msgstr "Перайменаваць табліцу ў"
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "старонак"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "Машыны"
diff --git a/po/be(a)latin.po b/po/be(a)latin.po
index 6fcc4eb..de988e2 100644
--- a/po/be(a)latin.po
+++ b/po/be(a)latin.po
@@ -3,16 +3,16 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-03-30 23:09+0200\n"
"Last-Translator: Michal <michal(a)cihar.com>\n"
"Language-Team: belarusian_latin <be@latin@li.org>\n"
+"Language: be@latin\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: be@latin\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Pootle 2.0.1\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -25,6 +25,7 @@ msgstr "Pakazać usie"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Staronka:"
@@ -643,11 +644,11 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Hety prahlad maje tolki takuju kolkaść radkoŭ. Kali łaska, źviarniciesia da %"
-"sdakumentacyi%s."
+"Hety prahlad maje tolki takuju kolkaść radkoŭ. Kali łaska, źviarniciesia da "
+"%sdakumentacyi%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -888,8 +889,8 @@ msgstr "Damp zachavany ŭ fajł %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Vy, musić, pasprabavali zahruzić vielmi vialiki fajł. Kali łaska, "
"źviarniciesia da %sdakumentacyi%s dla vyśviatleńnia sposabaŭ abyjści hetaje "
@@ -908,8 +909,8 @@ msgid ""
"You attempted to load file with unsupported compression (%s). Either support "
"for it is not implemented or disabled by your configuration."
msgstr ""
-"Vy pasprabavali zahruzić fajł z metadam ścisku, jaki niepadtrymlivajecca (%"
-"s). Jahonaja padtrymka abo nie realizavanaja, abo adklučanaja ŭ vašaj "
+"Vy pasprabavali zahruzić fajł z metadam ścisku, jaki niepadtrymlivajecca "
+"(%s). Jahonaja padtrymka abo nie realizavanaja, abo adklučanaja ŭ vašaj "
"kanfihuracyi."
#: import.php:335
@@ -1471,7 +1472,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2387,8 +2388,8 @@ msgstr "Zaprašajem u %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Imavierna, pryčyna hetaha ŭ tym, što nia stvorany kanfihuracyjny fajł. Kab "
"jaho stvaryć, možna vykarystać %1$snaładačny skrypt%2$s."
@@ -2538,13 +2539,13 @@ msgstr ""
msgid "Tables"
msgstr "Tablic"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2834,11 +2835,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3336,7 +3337,6 @@ msgstr "Ścisk"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3560,9 +3560,9 @@ msgid "Customize default options"
msgstr "Dziejańni z vynikami zapytaŭ"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5103,60 +5103,46 @@ msgstr "Aŭtentyfikacyja..."
msgid "CSV using LOAD DATA"
msgstr "CSV z vykarystańniem LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Specyfikacyja Open Document"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
#, fuzzy
#| msgid "Custom color"
msgid "Custom"
msgstr "Inšy koler"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
#, fuzzy
#| msgid "Database export options"
msgid "Database export options"
msgstr "Nałady ekspartu bazy dadzienych"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV dla dadzienych MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Tekst Open Document"
@@ -5442,8 +5428,8 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Hetaje značeńnie interpretujecca z vykarystańniem %1$sstrftime%2$s, tamu "
"možna vykarystoŭvać radki farmatavańnia času. Aproč hetaha, buduć "
@@ -5670,13 +5656,11 @@ msgstr "Sartavać pa klučy"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6238,8 +6222,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6277,7 +6261,6 @@ msgstr "Radki padzielenyja"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6628,7 +6611,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7783,13 +7765,6 @@ msgstr "Pakazać papiaredni prahlad"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "staronak"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7976,8 +7951,8 @@ msgid ""
"installed the necessary PHP extensions as described in the %sdocumentation%s."
msgstr ""
"Niemahčyma prainicyjalizavać pravierku SQL. Kali łaska, praviercie, ci "
-"ŭstalavanyja ŭ vas nieabchodnyja pašyreńni PHP, jak heta apisana ŭ %"
-"sdakumentacyi%s."
+"ŭstalavanyja ŭ vas nieabchodnyja pašyreńni PHP, jak heta apisana ŭ "
+"%sdakumentacyi%s."
#: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
msgid "Table seems to be empty!"
@@ -8177,8 +8152,8 @@ msgstr ""
"dadadzienyja da mietki času (pa zmoŭčańni — 0). Druhi parametar "
"vykarystoŭvajcie, kab paznačyć inšy farmat daty/času. Treci parametar "
"vyznačaje typ daty, jakaja budzie pakazanaja: vašaja lakalnaja data albo "
-"data UTC (vykarystoŭvajcie dla hetaha parametry «local» i «utc» adpaviedna). U "
-"zaležnaści ad hetaha farmat daty maje roznyja značeńni: dla atrymańnia "
+"data UTC (vykarystoŭvajcie dla hetaha parametry «local» i «utc» adpaviedna). "
+"U zaležnaści ad hetaha farmat daty maje roznyja značeńni: dla atrymańnia "
"parametraŭ lakalnaj daty hladzicie dakum roznyja značeńni: dla atrymańnia " " �зьнівацца ад прывілеяў, " � "
B� ujnq+ ��oq+ ��q+ �x�r+ ��
B� ���r+ ��
B� ��
B� k�nq+ 6 � � ! � ! p�
B� ��
B� x4�r+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� �/�r+ ujnq+ �r+ �$�r+ �)�r+ ��oq+ x4�r+ ��
B� ��
B� k�nq+ �! �! p�
B� ��
B� H�jr+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� ��
B� ��
B� 8��q+ �p� ��
B� ujnq+ ��oq+ ��
B� ��
B� k�nq+ G H I J K M N O P p�
B� ��
B� H�Ar+ P�
B� �bnq+ ��nq+ p�
B� 0/�r+ ujnq+ @�r+ �� r+ �r+ �$�r+ �)�r+ ��oq+ H�Ar+ P�
B� ��
B� k�nq+ 8�Ar+ P�
B� ��
B� k�nq+ (�Ar+ P�
B� ��
B� k�nq+ �Ar+ P�
B� �
B� k�nq+ �.�r+ ujnq+ �)�r+ ��
B� �8 r+ einq+ �$�r+ ��
B� y8 r+ einq+ �r+ ��
B� Z8 r+ einq+ �� r+ @�r+ �� r+ �r+ �D�r+ �$�r+ �)�r+ ��oq+ 8��q+ ��q+ ��
B� p{ r+ ��
B� p�
B� k�nq+ 5 6 7 8 : < = > ? @ B D p�
B� ��
B� ��q+ ��
B� ujnq+ ��q+ �
B� ��q+ einq+ ��q+ �_@f �S Q��l�� �öq+ ��
B� ��q+ ��
B� ��
B� k�nq+ u]�� 4Q��U^Qʉ� �u������*ēvp�
B� ��
B� H��q+ D�q+ �
B� �PRs+ �PRs+ ���q+ ��
B� ��
B� ��
B� �
B� O�r+ ujnq+ �D�r+ `�
B� �PRs+ 0�
B� ��
B� ���������PRs+ ��
B� entacyju dla funkcyi PHP strftime(), "
"a dla hrynvickaha času (parametar «utc») — dakumentacyju funkcyi gmdate()."
@@ -8501,7 +8476,7 @@ msgstr "Bazy dadzienych adsutničajuć"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "imia tablicy"
#: navigation.php:303 navigation.php:304
@@ -9236,8 +9211,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Zaŭvaha: phpMyAdmin atrymlivaje pryvilei karystalnikaŭ naŭprostava z tablic "
"pryvilejaŭ MySQL. Źmieściva hetych tablic moža adroźnivacca ad pryvilejaŭ, "
@@ -11811,6 +11786,12 @@ msgid "Rename view to"
msgstr ""
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "staronak"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "Mašyny"
diff --git a/po/bg.po b/po/bg.po
index 91e54b8..9e14cf8 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-07-19 14:58+0200\n"
"Last-Translator: <stoyanster(a)gmail.com>\n"
"Language-Team: bulgarian <bg(a)li.org>\n"
+"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Показване всички"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Страница номер:"
@@ -612,8 +613,8 @@ msgstr "Проследяването е неактивно."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr "Този изглед има поне толкова реда. Погледнете %sдокументацията%s"
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -850,8 +851,8 @@ msgstr "Схемата беше запазена във файл %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Вероятно сте направили опит да качите твърде голям файл. Моля, обърнете се "
"към %sдокументацията%s за да намерите начин да избегнете това ограничение."
@@ -1410,7 +1411,7 @@ msgid "Filters"
msgstr "Филтър"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Филтър"
@@ -2224,8 +2225,8 @@ msgstr "Добре дошли в %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Изглежда не се създали конфигурационен файл. Вероятно ще искате да "
"използвате %1$sскрипта за настройки%2$s, за да го създадете."
@@ -2371,13 +2372,13 @@ msgstr "споделен"
msgid "Tables"
msgstr "Таблици"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2655,11 +2656,11 @@ msgid "Click to toggle"
msgstr "Щракване за превключване"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3144,7 +3145,6 @@ msgstr "Компресия"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Поставяне имената на полетата в първи ред"
@@ -3348,9 +3348,9 @@ msgid "Customize default options"
msgstr ""
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4825,56 +4825,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr "CSV с LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document Spreadsheet"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Бърз"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Опции за експорт на БД"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV за MS Excel данни"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document Text"
@@ -5131,8 +5117,8 @@ msgstr ", @TABLE@ ще стане името на таблицата"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5318,13 +5304,11 @@ msgstr "Сортиране по ключ"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5811,8 +5795,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -5842,7 +5826,6 @@ msgstr "Редовете завършват с:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Замяна NULL с:"
@@ -6167,7 +6150,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7231,13 +7213,6 @@ msgstr ""
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "страници"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7418,8 +7393,8 @@ msgid ""
"installed the necessary PHP extensions as described in the %sdocumentation%s."
msgstr ""
"SQL валидаторът не може да бъде инициализиран. Моля проверете дали са "
-"инсталирани необходимите PHP разширения, както е описано в %sдокументацията%"
-"s."
+"инсталирани необходимите PHP разширения, както е описано в %sдокументацията"
+"%s."
#: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
msgid "Table seems to be empty!"
@@ -7853,7 +7828,9 @@ msgid "No databases"
msgstr "Няма БД"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "филтър по таблица"
#: navigation.php:303 navigation.php:304
@@ -8098,8 +8075,8 @@ msgid ""
"You can set more settings by modifying config.inc.php, eg. by using %sSetup "
"script%s."
msgstr ""
-"Имате достъп до още настройки, модифицирайки config.inc.php, примерно чрез %"
-"sскрипта за настройки%s."
+"Имате достъп до още настройки, модифицирайки config.inc.php, примерно чрез "
+"%sскрипта за настройки%s."
#: prefs_manage.php:300
msgid "Save to browser's storage"
@@ -8543,8 +8520,8 @@ msgstr "Изтриване на БД, които имат имена като т
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Забележка: phpMyAdmin взема потребителските права директно от таблицата с "
"правата на MySQL. Съдържанието на тази таблица може да се различава от "
@@ -10914,6 +10891,12 @@ msgstr "Име на ИЗГЛЕД"
msgid "Rename view to"
msgstr "Преименуване на изгледа на"
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "страници"
+
#~ msgid "Inline Edit"
#~ msgstr "Бърза редакция"
diff --git a/po/bn.po b/po/bn.po
index b28c51e..c5d9e6d 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-10-21 01:36+0200\n"
"Last-Translator: Nobin নবীন <nobin(a)cyberbogra.com>\n"
"Language-Team: bangla <bn(a)li.org>\n"
+"Language: bn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: bn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "সবগুলো দেখাও"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "পাতার সংখ্যাঃ"
@@ -634,8 +635,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -883,11 +884,11 @@ msgstr "ডাম্প %s ফাইল এ সেভ করা হয়েছে
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1457,7 +1458,7 @@ msgid "Filters"
msgstr "ক্ষেত্রসমূহ"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
#, fuzzy
msgid "Filter"
msgstr "ক্ষেত্রসমূহ"
@@ -2355,8 +2356,8 @@ msgstr "Welcome to %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"সম্ভবত আপনি কনফিগারেশন ফাইল তৈরী করেননি। আপনি %1$ssetup script%2$s ব্যাবহার "
"করে একটি তৈরী করতে পারেন "
@@ -2502,13 +2503,13 @@ msgstr ""
msgid "Tables"
msgstr "টেবিলসমূহ"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2791,11 +2792,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3297,7 +3298,6 @@ msgstr "সংকোচন"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3524,9 +3524,9 @@ msgid "Customize default options"
msgstr "ডাটাবেজ এক্সপোটঁ করার সুবিধাসমূহ"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5090,56 +5090,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr "CSV using LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document Spreadsheet"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "ডাটাবেজ এক্সপোটঁ করার সুবিধাসমূহ"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV for MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document Text"
@@ -5423,12 +5409,12 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is."
#: libraries/display_export.lib.php:270
msgid "use this for future exports"
@@ -5652,13 +5638,11 @@ msgstr "Sort by key"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6179,8 +6163,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6218,7 +6202,6 @@ msgstr "Lines terminated by"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6573,7 +6556,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7713,13 +7695,6 @@ msgstr "Toggle scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "পাতাসমুহ"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8418,7 +8393,7 @@ msgstr "কোন ডাটাবেজ নাই"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "টেবিল অর্ডার পরিবর্তন কর"
#: navigation.php:303 navigation.php:304
@@ -9144,13 +9119,13 @@ msgstr "ব্যাবহারকারীর নামে নাম এমন
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
#: server_privileges.php:1851
msgid "The selected user was not found in the privilege table."
@@ -11702,6 +11677,12 @@ msgid "Rename view to"
msgstr "টেবিল রিনেম করুন"
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "পাতাসমুহ"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "ইঞ্জিনসমূহ"
diff --git a/po/br.po b/po/br.po
index 0707945..62bb345 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,7 +7,7 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-08-10 22:33+0200\n"
"Last-Translator: Fulup <fulup.jakez(a)ofis-bzh.org>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -28,6 +28,7 @@ msgstr "Diskouez pep tra"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Pajenn niv. : "
@@ -616,11 +617,11 @@ msgstr "N'eo ket oberiant an heuliañ."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Da nebeutañ emañ an niver a linennoù-mañ er Gweled-mañ. Sellit ouzh an %"
-"steulioù titouriñ%s."
+"Da nebeutañ emañ an niver a linennoù-mañ er Gweled-mañ. Sellit ouzh an "
+"%steulioù titouriñ%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -855,11 +856,11 @@ msgstr "Enrollet eo bet ar restr ezporzhiañ e%s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Evit doare hoc'h eus klasket enrollañ ur restr re vras. Sellit ouzh an %"
-"steulioù titouriñ%s evit gwelet penaos c'hoari an dro d'ar vevenn-se."
+"Evit doare hoc'h eus klasket enrollañ ur restr re vras. Sellit ouzh an "
+"%steulioù titouriñ%s evit gwelet penaos c'hoari an dro d'ar vevenn-se."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1398,7 +1399,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2214,11 +2215,11 @@ msgstr "Degemer mat e %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
-"Evit doare n'hoc'h eus krouet a restr kefluniañ. Gallout a rit implijout ar %"
-"1$sskript kefluniañ%2$s da sevel unan."
+"Evit doare n'hoc'h eus krouet a restr kefluniañ. Gallout a rit implijout ar "
+"%1$sskript kefluniañ%2$s da sevel unan."
#: libraries/auth/config.auth.lib.php:109
msgid ""
@@ -2365,13 +2366,13 @@ msgstr "kenrannet"
msgid "Tables"
msgstr "Taolennoù"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2647,11 +2648,11 @@ msgid "Click to toggle"
msgstr "Klikañ evit gwintañ"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3152,7 +3153,6 @@ msgstr "Gwaskadur"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Diskouez anvioù ar bannoù diouzhtu el linenn gentañ"
@@ -3359,9 +3359,9 @@ msgid "Customize default options"
msgstr "Personelaat an dibarzhioù dre ziouer"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4857,56 +4857,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr ""
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr ""
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5159,8 +5145,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5346,13 +5332,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5839,8 +5823,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -5870,7 +5854,6 @@ msgstr ""
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr ""
@@ -6191,7 +6174,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7275,13 +7257,6 @@ msgstr ""
msgid "ltr"
msgstr ""
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Change"
-msgctxt "PDF"
-msgid "page"
-msgstr "Kemmañ"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7824,8 +7799,10 @@ msgid "No databases"
msgstr ""
#: navigation.php:270
-msgid "filter tables by name"
-msgstr ""
+#, fuzzy
+#| msgid "Invalid table name"
+msgid "Filter tables by name"
+msgstr "Anv taolenn direizh"
#: navigation.php:303 navigation.php:304
msgctxt "short form"
@@ -8495,8 +8472,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
@@ -10827,6 +10804,12 @@ msgstr ""
msgid "Rename view to"
msgstr ""
+#, fuzzy
+#~| msgid "Change"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "Kemmañ"
+
#~ msgid "Inline Edit"
#~ msgstr "Kemmañ enlinenn"
diff --git a/po/bs.po b/po/bs.po
index 3bd8d18..8a32eff 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-03-12 09:12+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: bosnian <bs(a)li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: Translate Toolkit 1.5.3\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -23,6 +23,7 @@ msgstr "Prikaži sve"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Broj strane:"
@@ -638,8 +639,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -885,8 +886,8 @@ msgstr "Sadržaj baze je sačuvan u fajl %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1437,7 +1438,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2323,8 +2324,8 @@ msgstr "Dobrodošli na %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2467,13 +2468,13 @@ msgstr ""
msgid "Tables"
msgstr "Tabele"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2751,11 +2752,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3252,7 +3253,6 @@ msgstr "Kompresija"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3481,9 +3481,9 @@ msgid "Customize default options"
msgstr "Opcije za izvoz baze"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV format"
@@ -5017,56 +5017,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Opcije za izvoz baze"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV za MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5342,8 +5328,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5553,13 +5539,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6063,8 +6047,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6102,7 +6086,6 @@ msgstr "Linije se završavaju sa"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6445,7 +6428,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7579,13 +7561,6 @@ msgstr "Uključuje/isključuje scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Usage"
-msgctxt "PDF"
-msgid "page"
-msgstr "Zauzeće"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8243,7 +8218,7 @@ msgstr "Baza ne postoji"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Promijeni redoslijed u tabeli"
#: navigation.php:303 navigation.php:304
@@ -8968,8 +8943,8 @@ msgstr "Odbaci baze koje se zovu isto kao korisnici."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Napomena: phpMyAdmin uzima privilegije korisnika direktno iz MySQL tabela "
"privilegija. Sadržaj ove tabele može se razlikovati od privilegija koje "
@@ -11402,6 +11377,12 @@ msgstr ""
msgid "Rename view to"
msgstr "Promjeni ime tabele u "
+#, fuzzy
+#~| msgid "Usage"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "Zauzeće"
+
#~ msgid "Begin"
#~ msgstr "Početak"
diff --git a/po/ca.po b/po/ca.po
index e179c2d..8caa08f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-02-23 09:57+0200\n"
"Last-Translator: Xavier Navarro <xvnavarro(a)gmail.com>\n"
"Language-Team: catalan <ca(a)li.org>\n"
+"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Mostra tot"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Número de pàgina:"
@@ -616,8 +617,8 @@ msgstr "El seguiment no està actiu."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Aquesta vista té al menys aques nombre de files. Consulta %sdocumentation%s."
@@ -860,11 +861,11 @@ msgstr "El bolcat s'ha desat amb el nom d'arxiu %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Probablement has triat d'enviar un arxiu massa gran. Consulta la %"
-"sdocumentació%s per trobar formes de modificar aquest límit."
+"Probablement has triat d'enviar un arxiu massa gran. Consulta la "
+"%sdocumentació%s per trobar formes de modificar aquest límit."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1438,7 +1439,7 @@ msgid "Filters"
msgstr "Filtre"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filtre"
@@ -2280,8 +2281,8 @@ msgstr "Benvingut a %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"La raó més probable d'aixó és que no heu creat l'arxiu de configuració. "
"Podreu voler utilitzar %1$ssetup script%2$s per crear-ne un."
@@ -2432,13 +2433,13 @@ msgstr "compartit"
msgid "Tables"
msgstr "Taules"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2719,11 +2720,11 @@ msgid "Click to toggle"
msgstr "Clica per seleccionar"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3224,7 +3225,6 @@ msgstr "Compresió"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Posa els noms de columnes a la primera fila"
@@ -3431,9 +3431,9 @@ msgid "Customize default options"
msgstr "Configura les opcions predeterminades"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV "
@@ -5098,56 +5098,42 @@ msgstr "autenticació Signon"
msgid "CSV using LOAD DATA"
msgstr "CSV usant LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Llibre d'Excel 97-2003 XLS"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Llibre d'Excel 2007 XLSX"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Full de càlcul Open Document"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Ràpid"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Usuari"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Opcions d'exportació de bases de dades"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV per dades de MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Text format Open Document"
@@ -5407,12 +5393,12 @@ msgstr ", @TABLE@ serà el nom de la taula"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Aquest valor s'interpreta usant %1$sstrftime%2$s, pel que podeu usar les "
-"cadenes de formateig de temps. A més, es faran aquestes transformacions: %3"
-"$s. Altre text es deixarà sense variació. Consulteu les %4$sPFC -FAQ- %5$s "
+"cadenes de formateig de temps. A més, es faran aquestes transformacions: "
+"%3$s. Altre text es deixarà sense variació. Consulteu les %4$sPFC -FAQ- %5$s "
"per a més detalls."
#: libraries/display_export.lib.php:270
@@ -5620,13 +5606,11 @@ msgstr "Classifica per la clau"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6182,8 +6166,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
"Pots trobar la documentació i més informació sobre PBXT a la pàgina "
"principal de %sPrimeBase XT%s."
@@ -6215,7 +6199,6 @@ msgstr "Línies acabades amb:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Canvía NULL amb:"
@@ -6570,7 +6553,6 @@ msgid "Go to view"
msgstr "Vés a la vista"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7733,13 +7715,6 @@ msgstr "Canvia l' scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "pàgines"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7920,8 +7895,8 @@ msgid ""
"installed the necessary PHP extensions as described in the %sdocumentation%s."
msgstr ""
"No s'ha pogut iniciar el validador SQL. Si us plau, comproveu que teniu "
-"instal·lats els mòduls de PHP necessaris tal i com s'indica a la %"
-"sdocumentació%s."
+"instal·lats els mòduls de PHP necessaris tal i com s'indica a la "
+"%sdocumentació%s."
#: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
msgid "Table seems to be empty!"
@@ -8392,7 +8367,9 @@ msgid "No databases"
msgstr "No hi ha bases de dades"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "filtra les taules pel nom"
#: navigation.php:303 navigation.php:304
@@ -9083,8 +9060,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Nota: phpMyAdmin obté els permisos de l'usuari directament de les taules de "
"permisos de MySQL. El contingut d'aquestes taules pot ser diferent dels "
@@ -10871,8 +10848,8 @@ msgid ""
"If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin "
"cookie validity%s must be set to a value less or equal to it."
msgstr ""
-"Si s'utilitza la autenticació per cookies i el valor de %sLogin cookie store%"
-"s no és 0, %sLogin cookie validity%s ha d'establir-se a un valor menor o "
+"Si s'utilitza la autenticació per cookies i el valor de %sLogin cookie store"
+"%s no és 0, %sLogin cookie validity%s ha d'establir-se a un valor menor o "
"igual a ell."
#: setup/lib/index.lib.php:290
@@ -10900,8 +10877,8 @@ msgstr ""
"Has triat el tipus d'autenticació [kbd]config[/kbd] i has inclós el nom "
"d'usuari i la contrasenya per connexions automàtiques, que es una opció no "
"recomanable per a servidors actius. Qualsevol que conegui la teva URL de "
-"phpMyAdmin pot accedir al teu panel directament. Estableix el %"
-"sauthentication type%s a [kbd]cookie[/kbd] o [kbd]http[/kbd]."
+"phpMyAdmin pot accedir al teu panel directament. Estableix el "
+"%sauthentication type%s a [kbd]cookie[/kbd] o [kbd]http[/kbd]."
#: setup/lib/index.lib.php:294
#, php-format
@@ -11713,6 +11690,18 @@ msgstr "Nom de VISTA"
msgid "Rename view to"
msgstr "Reanomena la vista a"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Llibre d'Excel 97-2003 XLS"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Llibre d'Excel 2007 XLSX"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "pàgines"
+
#~ msgid "Inline Edit"
#~ msgstr "Edició en linia"
diff --git a/po/cs.po b/po/cs.po
index 34a1ed1..22286b1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,14 +6,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-08-10 13:53+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -27,6 +27,7 @@ msgstr "Zobrazit vše "
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Strana číslo:"
@@ -616,8 +617,8 @@ msgstr "Sledování není zapnuté."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s."
@@ -854,8 +855,8 @@ msgstr "Výpis byl uložen do souboru %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si "
"prosím %sdokumentaci%s, jak toto omezení obejít."
@@ -1389,7 +1390,7 @@ msgid "Filters"
msgstr "Filtry"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filtr"
@@ -2188,8 +2189,8 @@ msgstr "Vítejte v %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho "
"vytvoření by se vám mohl hodit %1$snastavovací skript%2$s."
@@ -2335,13 +2336,13 @@ msgstr "sdílený"
msgid "Tables"
msgstr "Tabulky"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2609,11 +2610,11 @@ msgid "Click to toggle"
msgstr "Klikněte pro přepnutí"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3111,7 +3112,6 @@ msgstr "Komprese"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Přidat jména polí na první řádek"
@@ -3318,9 +3318,9 @@ msgid "Customize default options"
msgstr "Přizpůsobí výchozí nastavení"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4939,56 +4939,42 @@ msgstr "Přihlašování signon"
msgid "CSV using LOAD DATA"
msgstr "CSV pomocí LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Sešit OpenDocument"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Rychlý"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Vlastní"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Nastavení exportu databází"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV pro MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Text OpenDocument"
@@ -5246,8 +5232,8 @@ msgstr ", @TABLE@ bude nahrazen jménem tabulky"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít "
"libovolné řetězce pro formátování data a času. Dále budou provedena "
@@ -5451,13 +5437,11 @@ msgstr "Seřadit podle klíče"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6002,8 +5986,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
"Dokumentace a další informace o PBXT můžete nalézt na %sstránkách PrimeBase "
"XT%s."
@@ -6035,7 +6019,6 @@ msgstr "Řádky ukončené:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Nahradit NULL hodnoty:"
@@ -6374,7 +6357,6 @@ msgid "Go to view"
msgstr "Přejít na podhled"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7455,13 +7437,6 @@ msgstr "Zobrazit grafický návrh"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "stránek"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7684,8 +7659,8 @@ msgid ""
"For a list of available transformation options and their MIME type "
"transformations, click on %stransformation descriptions%s"
msgstr ""
-"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %"
-"spopisy transformací%s"
+"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na "
+"%spopisy transformací%s"
#: libraries/tbl_properties.inc.php:147
msgid "Transformation options"
@@ -7736,8 +7711,8 @@ msgid ""
"No description is available for this transformation.<br />Please ask the "
"author what %s does."
msgstr ""
-"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co %"
-"s dělá."
+"Pro tuto transformaci není dostupný žádný popis.<br />Zeptejte se autora co "
+"%s dělá."
#: libraries/tbl_properties.inc.php:591 tbl_structure.php:647
#, php-format
@@ -8101,7 +8076,9 @@ msgid "No databases"
msgstr "Žádné databáze"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "filtrovat tabulky podle jména"
#: navigation.php:303 navigation.php:304
@@ -8348,8 +8325,8 @@ msgid ""
"You can set more settings by modifying config.inc.php, eg. by using %sSetup "
"script%s."
msgstr ""
-"Více věcí můžete nastavit úpravou config.inc.php, např. použitím %"
-"sNastavovacího skriptu%s."
+"Více věcí můžete nastavit úpravou config.inc.php, např. použitím "
+"%sNastavovacího skriptu%s."
#: prefs_manage.php:300
msgid "Save to browser's storage"
@@ -8788,8 +8765,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto "
"tabulek se může lišit od oprávnění, která server právě používá, pokud byly "
@@ -10496,8 +10473,8 @@ msgid ""
"If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin "
"cookie validity%s must be set to a value less or equal to it."
msgstr ""
-"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie%"
-"s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší "
+"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie"
+"%s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší "
"hodnotu než je tato."
#: setup/lib/index.lib.php:290
@@ -10508,8 +10485,8 @@ msgid ""
"protection may not be reliable if tnost přihlašovací cookie%s nastavena na vyšší " " �মন ি। আপনি %1$ssetup script%2$s ব্যাবহার " �x�r+ ��
B� ���r+ ��
B� ��
B� k�nq+ 6 � � ! � ! p�
B� ��
B� x4�r+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� �/�r+ ujnq+ �r+ �$�r+ �)�r+ ��oq+ x4�r+ ��
B� ��
B� k�nq+ �! �! p�
B� ��
B� H�jr+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� ��
B� ��
B� 8��q+ �p� ��
B� ujnq+ ��oq+ ��
B� ��
B� k�nq+ G H I J K M N O P p�
B� ��
B� H�Ar+ P�
B� �bnq+ ��nq+ p�
B� 0/�r+ ujnq+ @�r+ �� r+ �r+ �$�r+ �)�r+ ��oq+ H�Ar+ P�
B� ��
B� k�nq+ 8�Ar+ P�
B� ��
B� k�nq+ (�Ar+ P�
B� ��
B� k�nq+ �Ar+ P�
B� �
B� k�nq+ �.�r+ ujnq+ �)�r+ ��
B� �8 r+ einq+ �$�r+ ��
B� y8 r+ einq+ �r+ ��
B� Z8 r+ einq+ �� r+ @�r+ �� r+ �r+ �D�r+ �$�r+ �)�r+ ��oq+ 8��q+ ��q+ ��
B� p{ r+ ��
B� p�
B� k�nq+ 5 6 7 8 : < = > ? @ B D p�
B� ��
B� ��q+ ��
B� ujnq+ ��q+ �
B� ��q+ einq+ ��q+ �_@f �S Q��l�� �öq+ ��
B� ��q+ ��
B� ��
B� k�nq+ u]�� 4Q��U^Qʉ� �u������*ēvp�
B� ��
B� H��q+ D�q+ �
B� �PRs+ �PRs+ ���q+ ��
B� ��
B� ��
B� �
B� O�r+ ujnq+ �D�r+ `�
B� �PRs+ 0�
B� ��
B� ���������PRs+ ��
B� your IP belongs to an ISP where thousands "
"of users, including you, are connected to."
msgstr ""
-"Pokud to považujete za nutné, použijte další možnosti zabezpečení - %"
-"somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení "
+"Pokud to považujete za nutné, použijte další možnosti zabezpečení - "
+"%somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení "
"založené na IP adresách nemusí být spolehlivé, pokud je vaše IP adresa "
"dynamicky přidělována poskytovatelem spolu s mnoha dalšími uživateli."
@@ -11292,6 +11269,18 @@ msgstr "Jméno pohledu"
msgid "Rename view to"
msgstr "Přejmenovat pohled na"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "stránek"
+
#~ msgid "Inline Edit"
#~ msgstr "Upravit zde"
diff --git a/po/cy.po b/po/cy.po
index f70b6a6..c19ecba 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,14 +6,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-05-19 21:21+0200\n"
"Last-Translator: <ardavies(a)tiscali.co.uk>\n"
"Language-Team: Welsh <cy(a)li.org>\n"
+"Language: cy\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: cy\n"
"Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -27,6 +27,7 @@ msgstr "Dangos pob"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Rhif tudalen:"
@@ -620,8 +621,8 @@ msgstr "Nid yw tracio'n weithredol"
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Mae gan yr olwg hon o leiaf y nifer hwn o resi. Gweler y %sdogfennaeth%s."
@@ -860,8 +861,8 @@ msgstr "Dadlwythiad wedi'i gadw i'r ffeil %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Yn ôl pob tebyg, mae'r ffeil i rhy fawr i'w lanlwytho. Gweler y %sdogfennaeth"
"%s am ffyrdd i weithio o gwmpas y cyfyngiad hwn."
@@ -1437,7 +1438,7 @@ msgid "Filters"
msgstr "Hidlydd"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Hidlydd"
@@ -2299,11 +2300,11 @@ msgstr "Croeso i %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
-"Rydych chi heb greu ffeil ffurfwedd yn ôl pob tebyg. Gallwch ddefnyddio'r %1"
-"$sgript gosod%2$s er mwyn ei chreu."
+"Rydych chi heb greu ffeil ffurfwedd yn ôl pob tebyg. Gallwch ddefnyddio'r "
+"%1$sgript gosod%2$s er mwyn ei chreu."
#: libraries/auth/config.auth.lib.php:109
msgid ""
@@ -2452,13 +2453,13 @@ msgstr ""
msgid "Tables"
msgstr "Tablau"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2741,11 +2742,11 @@ msgid "Click to toggle"
msgstr "Pwyso i ddewis"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3245,7 +3246,6 @@ msgstr "Cywasgiad"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Rhoi enwau colofnau yn y rhes gyntaf"
@@ -3464,9 +3464,9 @@ msgid "Customize default options"
msgstr "Gweithrediadau canlyniadau ymholiad"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4996,60 +4996,46 @@ msgstr "Yn dilysu..."
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Taenlen Open Document"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
#, fuzzy
#| msgid "Custom color"
msgid "Custom"
msgstr "Lliw cwstwm"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
#, fuzzy
#| msgid "Databases statistics"
msgid "Database export options"
msgstr "Ystadegau cronfeydd data"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV ar gyfer MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Testun Open Document"
@@ -5325,8 +5311,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5540,13 +5526,11 @@ msgstr "Trefnu gan allwedd"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6047,8 +6031,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6086,7 +6070,6 @@ msgstr "Terfynwyd llinellau gan"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6427,7 +6410,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7559,13 +7541,6 @@ msgstr ""
msgid "ltr"
msgstr ""
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "tudalennau"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8129,7 +8104,7 @@ msgstr "Dim cronfeydd data"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "enw tabl"
#: navigation.php:303 navigation.php:304
@@ -8826,8 +8801,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
@@ -11227,6 +11202,12 @@ msgid "Rename view to"
msgstr "Ailenwch golwg i"
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "tudalennau"
+
+#, fuzzy
#~| msgid "Inline"
#~ msgid "Inline Edit"
#~ msgstr "Mewnol"
diff --git a/po/da.po b/po/da.po
index 7c91f3a..7b8adfb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-07-23 21:27+0200\n"
"Last-Translator: Jørgen Thomsen <opensource(a)jth.net>\n"
"Language-Team: danish <da(a)li.org>\n"
+"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Vis alle"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Side nummer:"
@@ -610,8 +611,8 @@ msgstr "Sporing er ikke aktiv."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Viewet har som minimum dette antal rækker. Se venligst %sdokumentationen%s."
@@ -849,11 +850,11 @@ msgstr "Dump er blevet gemt i filen %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Du har sandsynligvis forsøgt at uploade en for stor fil. Se venligst %"
-"sdokumentationen%s for måder hvorpå du kan arbejde dig uden om denne "
+"Du har sandsynligvis forsøgt at uploade en for stor fil. Se venligst "
+"%sdokumentationen%s for måder hvorpå du kan arbejde dig uden om denne "
"begrænsning."
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1425,7 +1426,7 @@ msgid "Filters"
msgstr "Filter"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filter"
@@ -2243,8 +2244,8 @@ msgstr "Velkommen til %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Sandsynlig årsag til dette er at du ikke har oprettet en konfigurationsfil. "
"Du kan bruge %1$sopsætningsscriptet%2$s til at oprette en."
@@ -2395,13 +2396,13 @@ msgstr "delt"
msgid "Tables"
msgstr "Tabeller"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2678,11 +2679,11 @@ msgid "Click to toggle"
msgstr "Klik for at skifte"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3185,7 +3186,6 @@ msgstr "Komprimering"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Indsæt feltnavne i første række"
@@ -3391,9 +3391,9 @@ msgid "Customize default options"
msgstr "Tilpas standardindstillinger"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV (kommasepareret)"
@@ -5015,56 +5015,42 @@ msgstr "Login autentifikation"
msgid "CSV using LOAD DATA"
msgstr "CSV vha. LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS Workbook"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX Workbook"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document regneark"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Hurtig"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Brugerdefineret"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Database eksportindstillinger"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV til MS Excel-data"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document tekst"
@@ -5320,8 +5306,8 @@ msgstr ", @TABLE@ vil blive tabelnavnet"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Denne værdi fortolkes via %1$sstrftime%2$s, så du kan bruge tidsformatterede "
"strenge. Ydermere vil følgende transformationer foregå: %3$s. Anden tekst "
@@ -5523,13 +5509,11 @@ msgstr "Sorteringsnøgle"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6077,8 +6061,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
"Dokumentation og yderliger information om PBXT kan findes på %sPrimeBase XT "
"hjemmeside%s"
@@ -6110,7 +6094,6 @@ msgstr "Linjer afsluttet med:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Erstat NULL med:"
@@ -6462,7 +6445,6 @@ msgid "Go to view"
msgstr "Gå til view"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7543,13 +7525,6 @@ msgstr "Tegnebræt til/fra"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "sider"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8160,8 +8135,8 @@ msgid ""
"extended features have been deactivated. To find out why click %shere%s."
msgstr ""
"phpMyAdmin configuration storage er ikke fuldstændigt konfigureret; nogle "
-"udvidede funktioner er blevet deaktiverede. For at finde ud af hvorfor klik %"
-"sher%s."
+"udvidede funktioner er blevet deaktiverede. For at finde ud af hvorfor klik "
+"%sher%s."
#: main.php:314
msgid ""
@@ -8194,7 +8169,9 @@ msgid "No databases"
msgstr "Ingen databaser"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "filtrer tabeller efter navn"
#: navigation.php:303 navigation.php:304
@@ -8883,14 +8860,14 @@ msgstr "Drop databaser der har samme navne som brugernes."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Bemærk: phpMyAdmin henter brugernes privilegier direkte fra MySQLs "
"privilegietabeller. Indholdet af disse tabeller kan være forskelligt fra "
"privilegierne serveren i øjeblikket bruger hvis der er lavet manuelle "
-"ændringer i den. Hvis dette er tilfældet, bør du %sgenindlæse privilegierne%"
-"s før du fortsætter."
+"ændringer i den. Hvis dette er tilfældet, bør du %sgenindlæse privilegierne"
+"%s før du fortsætter."
#: server_privileges.php:1851
msgid "The selected user was not found in the privilege table."
@@ -10695,10 +10672,10 @@ msgid ""
"protection may not be reliable if your IP belongs to an ISP where thousands "
"of users, including you, are connected to."
msgstr ""
-" Hvis du føler, at dette er nødvendigt, brug yderligere sikring - %"
-"sværtsautentifikation%s indstillinger og %sbetroet proxy liste%s. IP-baseret "
-"beskyttelse er næppe pålidelig, hvis din IP-adresse hører til en udbyder med "
-"mange tusinde brugere."
+" Hvis du føler, at dette er nødvendigt, brug yderligere sikring - "
+"%sværtsautentifikation%s indstillinger og %sbetroet proxy liste%s. IP-"
+"baseret beskyttelse er næppe pålidelig, hvis din IP-adresse hører til en "
+"udbyder med mange tusinde brugere."
#: setup/lib/index.lib.php:292
#, php-format
@@ -10712,8 +10689,8 @@ msgstr ""
"Du har sat [kbd]config[/kbd] autentifikation og inkluderet brugernavn og "
"adgangskode for auto-login, hvilket er ikke en ønskværdig konfiguration for "
"produktionssystemer. Enhver som kender eller gætter din phpMyAdmin URL kan "
-"direkte få adgang til dit phpMyAdmin panel for denne server. Sæt %"
-"sautentifikationstype%s til [kbd]cookie[/kbd] eller [kbd]http[/kbd]."
+"direkte få adgang til dit phpMyAdmin panel for denne server. Sæt "
+"%sautentifikationstype%s til [kbd]cookie[/kbd] eller [kbd]http[/kbd]."
#: setup/lib/index.lib.php:294
#, php-format
@@ -11483,6 +11460,18 @@ msgstr "VIEW navn"
msgid "Rename view to"
msgstr "Omdøb view til"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS Workbook"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX Workbook"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "sider"
+
#~ msgid "Inline Edit"
#~ msgstr "Ret linje"
diff --git a/po/de.po b/po/de.po
index 47be5ab..ea1a799 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-08-07 22:28+0200\n"
"Last-Translator: Sven Strickroth <email(a)cs-ware.de>\n"
"Language-Team: german <de(a)li.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Alles anzeigen"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Seite:"
@@ -346,8 +347,8 @@ msgid ""
"The phpMyAdmin configuration storage has been deactivated. To find out why "
"click %shere%s."
msgstr ""
-"Der phpMyAdmin Konfigurations-Speicher wurde deaktiviert. Klicken Sie %shier%"
-"s um herauszufinden warum."
+"Der phpMyAdmin Konfigurations-Speicher wurde deaktiviert. Klicken Sie %shier"
+"%s um herauszufinden warum."
#: db_operations.php:584
msgid "Edit or export relational schema"
@@ -612,8 +613,8 @@ msgstr "Tracking ist nicht aktiviert."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Dieser Ansicht hat mindestens diese Anzahl von Datensätzen. Bitte lesen Sie "
"die %sDokumentation%s."
@@ -854,11 +855,11 @@ msgstr "Dump wurde in Datei %s gespeichert."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Möglicherweise wurde eine zu große Datei hochgeladen. Bitte lesen Sie die %"
-"sDokumentation%s zur Lösung diese Problems."
+"Möglicherweise wurde eine zu große Datei hochgeladen. Bitte lesen Sie die "
+"%sDokumentation%s zur Lösung diese Problems."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1414,7 +1415,7 @@ msgid "Filters"
msgstr "Filter"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filter"
@@ -2229,8 +2230,8 @@ msgstr "Willkommen bei %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Eine mögliche Ursache wäre, dass Sie noch keine Konfigurationsdatei angelegt "
"haben. Verwenden Sie in diesem Fall doch das %1$sSetup-Skript%2$s, um eine "
@@ -2381,13 +2382,13 @@ msgstr "freigegeben"
msgid "Tables"
msgstr "Tabellen"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2666,11 +2667,11 @@ msgid "Click to toggle"
msgstr "Zum Umschalten anklicken"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3169,7 +3170,6 @@ msgstr "Kompression"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Spaltennamen in die erste Zeile setzen"
@@ -3376,9 +3376,9 @@ msgid "Customize default options"
msgstr "Standard-Einstellungen anpassen"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5022,56 +5022,42 @@ msgstr "Signon-Authentifizierung"
msgid "CSV using LOAD DATA"
msgstr "CSV mit LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "XLS Mappe für Excel 97-2003"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "XLSX Mappe für Excel 2007 und neuer"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document Kalkulationstabelle"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Schnell"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Benutzerdefiniert"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Export-Optionen der Datenbank"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV-Daten für MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document Text"
@@ -5333,8 +5319,8 @@ msgstr ", @TABLE@ wird durch den Tabellennamen ersetzt"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Dieser Wert wird mit %1$sstrftime%2$s geparst. Sie können also Platzhalter "
"für Datum und Uhrzeit verwenden. Darüber hinaus werden folgende Umformungen "
@@ -5540,13 +5526,11 @@ msgstr "Nach Schlüssel sortieren"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6101,8 +6085,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
"Dokumentation und weitere Informationen über PBXT sind auf der %sPrimeBase "
"XT-Website%s verfügbar."
@@ -6134,7 +6118,6 @@ msgstr "Zeilen enden auf:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Ersetze NULL durch:"
@@ -6483,7 +6466,6 @@ msgid "Go to view"
msgstr "Gehe zum View"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7583,13 +7565,6 @@ msgstr "Klemmbrett anzeigen"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "Seiten"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8250,7 +8225,9 @@ msgid "No databases"
msgstr "Keine Datenbanken"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Tabellen nach Namen filtern"
#: navigation.php:303 navigation.php:304
@@ -8950,8 +8927,8 @@ msgstr "Die gleichnamigen Datenbanken löschen."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"phpMyAdmin liest die Benutzerprofile direkt aus den entsprechenden MySQL-"
"Tabellen aus. Der Inhalt dieser Tabellen kann sich von den Benutzerprofilen, "
@@ -10812,8 +10789,8 @@ msgstr ""
"Sie haben die [kbd]config[/kbd] Authentifizierung gewählt und einen "
"Benutzernamen und Passwort für Auto-Login eingegeben, was für Server im "
"Internet nicht wünschenswert ist. Jeder, der Ihre phpMyAdmin-URL kennt oder "
-"errät, kann direkt auf Ihre phpMyAdmin-Oberfläche zugreifen. Setzen Sie den %"
-"sAuthentifizierungstyp%s auf [kbd]cookie[/kbd] oder [kbd]http[/kbd]."
+"errät, kann direkt auf Ihre phpMyAdmin-Oberfläche zugreifen. Setzen Sie den "
+"%sAuthentifizierungstyp%s auf [kbd]cookie[/kbd] oder [kbd]http[/kbd]."
#: setup/lib/index.lib.php:294
#, php-format
@@ -11592,6 +11569,18 @@ msgstr "VIEW Name"
msgid "Rename view to"
msgstr "View umbenennen in"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "XLS Mappe für Excel 97-2003"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "XLSX Mappe für Excel 2007 und neuer"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "Seiten"
+
#~ msgid "Inline Edit"
#~ msgstr "Direkt bearbeiten"
@@ -11618,8 +11607,8 @@ msgstr "View umbenennen in"
#~ "directory %s."
#~ msgstr ""
#~ "Die Unterstützung für Oberflächendesigns ist deaktiviert. Bitte "
-#~ "überprüfen Sie Ihre Konfiguration und / oder Ihre Designs im Verzeichnis %"
-#~ "s."
+#~ "überprüfen Sie Ihre Konfiguration und / oder Ihre Designs im Verzeichnis "
+#~ "%s."
#~ msgid "The following queries have been executed:"
#~ msgstr "Die folgenden Abfragen wurden ausgeführt:"
diff --git a/po/el.po b/po/el.po
index 0da223e..f4de6c8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-07-29 14:17+0200\n"
"Last-Translator: Panagiotis Papazoglou <papaz_p(a)yahoo.com>\n"
"Language-Team: greek <el(a)li.org>\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Εμφάνιση όλων"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Σελίδα:"
@@ -612,11 +613,11 @@ msgstr "Η παρακολούθηση δεν είναι ενεργοποιημέ
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Αυτή η προβολή έχει τουλάχιστον αυτό τον αριθμό γραμμών. Λεπτομέρειες στην %"
-"sτεκμηρίωση%s."
+"Αυτή η προβολή έχει τουλάχιστον αυτό τον αριθμό γραμμών. Λεπτομέρειες στην "
+"%sτεκμηρίωση%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -852,11 +853,11 @@ msgstr "Το αρχείο εξόδου αποθηκεύτηκε ως %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Πιθανόν προσπαθείτε να αποστείλετε πολύ μεγάλο αρχείο. Λεπτομέρειες στην %"
-"sτεκμηρίωση%s για τρόπους αντιμετώπισης αυτού του περιορισμού."
+"Πιθανόν προσπαθείτε να αποστείλετε πολύ μεγάλο αρχείο. Λεπτομέρειες στην "
+"%sτεκμηρίωση%s για τρόπους αντιμετώπισης αυτού του περιορισμού."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1427,7 +1428,7 @@ msgid "Filters"
msgstr "Φίλτρα"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Φίλτρο"
@@ -2240,8 +2241,8 @@ msgstr "Καλωσήρθατε στο %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Πιθανή αιτία για αυτό είναι η μη δημιουργία αρχείου προσαρμογής. Ίσως θέλετε "
"να χρησιμοποιήσετε τον %1$sκώδικα εγκατάστασηςt%2$s για να δημιουργήσετε ένα."
@@ -2394,13 +2395,13 @@ msgstr "κοινόχρηστο"
msgid "Tables"
msgstr "Πίνακες"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2679,11 +2680,11 @@ msgid "Click to toggle"
msgstr "Πατήστε για εναλλαγή"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3186,7 +3187,6 @@ msgstr "Συμπίεση"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Εμφάνιση ονομάτων στηλών στην πρώτη γραμμή"
@@ -3392,9 +3392,9 @@ msgid "Customize default options"
msgstr "Προσαρμογή προεπιλεγμένων επιλογών"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5061,56 +5061,42 @@ msgstr "Σειρά επικύρωσης"
msgid "CSV using LOAD DATA"
msgstr "CSV με χρήση LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Βιβλίο εργασίας Excel 97-2003 XLS"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Βιβλίο εργασίας Excel 2007 XLSX"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Έγγραφο Λογιστικού Φύλλου Ανοιχτού Κώδικα - ODS"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Γρήγορο"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Προσαρμοσμένο"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Επιλογές εξαγωγής βάσης δεδομένων"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "Μορφή CSV για δεδομένα MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Έγγραφο Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Έγγραφο Κειμένου Ανοιχτού Κώδικα - ODΤ"
@@ -5371,8 +5357,8 @@ msgstr ", το @TABLE@ θα γίνει το όνομα του πίνακα"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Αυτή η τιμή μετατρέπεται με χρήση της συνάρτησης %1$sstrftime%2$s, έτσι "
"μπορείτε να χρησιμοποιήσετε φράσεις μορφής χρόνου. Επιπρόσθετα, θα γίνουν "
@@ -5577,13 +5563,11 @@ msgstr "Ταξινόμηση ανά κλειδί"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5972,8 +5956,8 @@ msgid ""
"Documentation and further information about PBMS can be found on %sThe "
"PrimeBase Media Streaming home page%s."
msgstr ""
-"Τεκμηρίωση και περισσότερες πληροφορίες για το PBMS μπορεί να βρεθεί στην %"
-"sΙστοσελίδα του PrimeBase Media Streaming%s."
+"Τεκμηρίωση και περισσότερες πληροφορίες για το PBMS μπορεί να βρεθεί στην "
+"%sΙστοσελίδα του PrimeBase Media Streaming%s."
#: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127
msgid "Related Links"
@@ -6142,11 +6126,11 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
-"Τεκμηρίωση και περισσότερες πληροφορίες για το PBXT μπορούν να βρεθούν στην %"
-"sΙστοσελίδα του PrimeBase XT%s."
+"Τεκμηρίωση και περισσότερες πληροφορίες για το PBXT μπορούν να βρεθούν στην "
+"%sΙστοσελίδα του PrimeBase XT%s."
#: libraries/engines/pbxt.lib.php:129
msgid "The PrimeBase XT Blog by Paul McCullagh"
@@ -6175,7 +6159,6 @@ msgstr "Γραμμές που τελειώνουν με:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Αντικατάσταση τιμής NULL με:"
@@ -6524,7 +6507,6 @@ msgid "Go to view"
msgstr "Μετάβαση στην προβολή"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7615,13 +7597,6 @@ msgstr "Εναλλαγή πίνακα σχεδιασμού"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "σελίδες"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7974,8 +7949,8 @@ msgstr ""
"επιλογή για να ορίσετε μια μορφή ημερομηνίας-ώρας. Η τρίτη επιλογή ορίζει αν "
"θέλετε να δείτε την τοπική ή την παγκόσμια ώρα (χρήση «local» ή «utc» "
"αντίστοιχα). Σύμφωνα με αυτό, η μορφή της ημερομηνίας έχει διαφορετική τιμή "
-"- για το «local» δείτε την τεκμηρίωση για τη συνάρτηση strftime() της PHP και "
-"για το «utc» γίνεται χρησιμοποιώντας τη συνάρτηση gmdate()."
+"- για το «local» δείτε την τεκμηρίωση για τη συνάρτηση strftime() της PHP "
+"και για το «utc» γίνεται χρησιμοποιώντας τη συνάρτηση gmdate()."
#: libraries/transformations/text_plain__external.inc.php:10
msgid ""
@@ -8239,8 +8214,8 @@ msgid ""
"extended features have been deactivated. To find out why click %shere%s."
msgstr ""
"Η αποθήκευση ρυθμίσεων του phpMyAdmin δεν έχει ρυθμιστεί πλήρως. Μερικά "
-"εκτεταμένα χαρακτηριστικά έχουν απενεργοποιηθεί. Για να δείτε γιατί πατήστε %"
-"sεδώ%s."
+"εκτεταμένα χαρακτηριστικά έχουν απενεργοποιηθεί. Για να δείτε γιατί πατήστε "
+"%sεδώ%s."
#: main.php:314
msgid ""
@@ -8275,7 +8250,9 @@ msgid "No databases"
msgstr "Δεν υπάρχουν βάσεις δεδομένων"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "φιλτράρισμα πινάκων κατά όνομα"
#: navigation.php:303 navigation.php:304
@@ -8975,8 +8952,8 @@ msgstr "Διαγραφή βάσεων δεδομένων που έχουν ίδ
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Σημείωση: Το phpMyAdmin διαβάζει τα δικαιώματα των χρηστών κατευθείαν από "
"τους πίνακες δικαιωμάτων της MySQL. Το περιεχόμενο αυτών των πινάκων μπορεί "
@@ -10816,8 +10793,8 @@ msgid ""
"(currently %d)."
msgstr ""
"Αν η %sεγκυρότητα Σύνδεσης cookie%s είναι μεγαλύτερη από 1440 δευτερόλεπτα "
-"μπορεί να προκαλέσει τυχαία ακύρωση συνεδρίας αν το %ssession.gc_maxlifetime%"
-"s είναι μικρότερο από την τιμή της (τρέχουσα: %d)."
+"μπορεί να προκαλέσει τυχαία ακύρωση συνεδρίας αν το %ssession.gc_maxlifetime"
+"%s είναι μικρότερο από την τιμή της (τρέχουσα: %d)."
#: setup/lib/index.lib.php:286
#, php-format
@@ -11647,6 +11624,18 @@ msgstr "Όνομα VIEW"
msgid "Rename view to"
msgstr "Μετονομασία πίνακα σε"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Βιβλίο εργασίας Excel 97-2003 XLS"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Βιβλίο εργασίας Excel 2007 XLSX"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "σελίδες"
+
#~ msgid "Inline Edit"
#~ msgstr "Εσωτερική Επεξεργασία"
diff --git a/po/en_GB.po b/po/en_GB.po
index 2b81f5d..dd05979 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-08-04 21:47+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: english-gb <en_GB(a)li.org>\n"
+"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Show all"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Page number:"
@@ -612,11 +613,11 @@ msgstr "Tracking is not active."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -850,11 +851,11 @@ msgstr "Dump has been saved to file %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1389,7 +1390,7 @@ msgid "Filters"
msgstr "Filters"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filter"
@@ -2198,11 +2199,11 @@ msgstr "Welcome to %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
#: libraries/auth/config.auth.lib.php:109
msgid ""
@@ -2346,13 +2347,13 @@ msgstr "shared"
msgid "Tables"
msgstr "Tables"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2628,11 +2629,11 @@ msgid "Click to toggle"
msgstr "Click to toggle"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3128,7 +3129,6 @@ msgstr "Compression"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Put columns names in the first row"
@@ -3334,9 +3334,9 @@ msgid "Customize default options"
msgstr "Customise default options"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4957,56 +4957,42 @@ msgstr "Signon authentication"
msgid "CSV using LOAD DATA"
msgstr "CSV using LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS Workbook"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX Workbook"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document Spreadsheet"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Quick"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Custom"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Database export options"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV for MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document Text"
@@ -5261,12 +5247,12 @@ msgstr ", @TABLE@ will become the table name"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
#: libraries/display_export.lib.php:270
msgid "use this for future exports"
@@ -5464,13 +5450,11 @@ msgstr "Sort by key"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6017,11 +6001,11 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
#: libraries/engines/pbxt.lib.php:129
msgid "The PrimeBase XT Blog by Paul McCullagh"
@@ -6050,7 +6034,6 @@ msgstr "Lines terminated with:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Replace NULL with:"
@@ -6398,7 +6381,6 @@ msgid "Go to view"
msgstr "Go to view"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7478,13 +7460,6 @@ msgstr "Toggle scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "pages"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8128,7 +8103,9 @@ msgid "No databases"
msgstr "No databases"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "filter tables by name"
#: navigation.php:303 navigation.php:304
@@ -8813,13 +8790,13 @@ msgstr "Drop the databases that have the same names as the users."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been change y differ from the privileges the " e " e users." το %ssession.gc_maxlifetime" � " �εί " �ε " ব্যাবহার " �x�r+ ��
B� ���r+ ��
B� ��
B� k�nq+ 6 � � ! � ! p�
B� ��
B� x4�r+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� �/�r+ ujnq+ �r+ �$�r+ �)�r+ ��oq+ x4�r+ ��
B� ��
B� k�nq+ �! �! p�
B� ��
B� H�jr+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� ��
B� ��
B� 8��q+ �p� ��
B� ujnq+ ��oq+ ��
B� ��
B� k�nq+ G H I J K M N O P p�
B� ��
B� H�Ar+ P�
B� �bnq+ ��nq+ p�
B� 0/�r+ ujnq+ @�r+ �� r+ �r+ �$�r+ �)�r+ ��oq+ H�Ar+ P�
B� ��
B� k�nq+ 8�Ar+ P�
B� ��
B� k�nq+ (�Ar+ P�
B� ��
B� k�nq+ �Ar+ P�
B� �
B� k�nq+ �.�r+ ujnq+ �)�r+ ��
B� �8 r+ einq+ �$�r+ ��
B� y8 r+ einq+ �r+ ��
B� Z8 r+ einq+ �� r+ @�r+ �� r+ �r+ �D�r+ �$�r+ �)�r+ ��oq+ 8��q+ ��q+ ��
B� p{ r+ ��
B� p�
B� k�nq+ 5 6 7 8 : < = > ? @ B D p�
B� ��
B� ��q+ ��
B� ujnq+ ��q+ �
B� ��q+ einq+ ��q+ �_@f �S Q��l�� �öq+ ��
B� ��q+ ��
B� ��
B� k�nq+ u]�� 4Q��U^Qʉ� �u������*ēvp�
B� ��
B� H��q+ D�q+ �
B� �PRs+ �PRs+ ���q+ ��
B� ��
B� ��
B� �
B� O�r+ ujnq+ �D�r+ `�
B� �PRs+ 0�
B� ��
B� ���������PRs+ ��
B� d manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
#: server_privileges.php:1851
msgid "The selected user was not found in the privilege table."
@@ -11373,6 +11350,18 @@ msgstr "VIEW name"
msgid "Rename view to"
msgstr "Rename view to"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS Workbook"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX Workbook"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "pages"
+
#~ msgid "Inline Edit"
#~ msgstr "Inline Edit"
diff --git a/po/es.po b/po/es.po
index 812117b..2c80abe 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,7 +3,7 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-08-10 16:45+0200\n"
"Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n"
"Language-Team: spanish <es(a)li.org>\n"
@@ -24,6 +24,7 @@ msgstr "Mostrar todo"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Número de página:"
@@ -416,7 +417,6 @@ msgstr "Debe elegir al menos una columna para mostrar"
#: db_qbe.php:186
#, php-format
-#| msgid "visual builder"
msgid "Switch to %svisual builder%s"
msgstr "Cambiar al %sconstructor visual%s"
@@ -616,11 +616,11 @@ msgstr "El seguimiento no está activo."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Esta vista tiene al menos este número de filas. Por favor refiérase a la %"
-"sdocumentation%s."
+"Esta vista tiene al menos este número de filas. Por favor refiérase a la "
+"%sdocumentation%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -856,8 +856,8 @@ msgstr "El volcado ha sido guardado al archivo %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Usted probablemente intentó cargar un archivo demasiado grande. Por favor, "
"refiérase a %sla documentation%s para hallar modos de superar esta "
@@ -1158,32 +1158,26 @@ msgid "Average load"
msgstr "Carga promedio"
#: js/messages.php:101
-#| msgid "System memory"
msgid "Total memory"
msgstr "Memoria total"
#: js/messages.php:102
-#| msgid "System memory"
msgid "Cached memory"
msgstr "Memoria caché"
#: js/messages.php:103
-#| msgid "Buffer Pool"
msgid "Buffered memory"
msgstr "Memoria de búfers"
#: js/messages.php:104
-#| msgid "System memory"
msgid "Free memory"
msgstr "Memoria libre"
#: js/messages.php:105
-#| msgid "System memory"
msgid "Used memory"
msgstr "Memoria utilizada"
#: js/messages.php:107
-#| msgid "Total"
msgid "Total Swap"
msgstr "Intercambio total"
@@ -1196,7 +1190,6 @@ msgid "Used Swap"
msgstr "Intercambio utilizado"
#: js/messages.php:110
-#| msgid "Free pages"
msgid "Free Swap"
msgstr "Intercambio libre"
@@ -1205,7 +1198,6 @@ msgid "Bytes sent"
msgstr "Bytes enviados"
#: js/messages.php:113
-#| msgid "Received"
msgid "Bytes received"
msgstr "Bytes recibidos"
@@ -1233,7 +1225,6 @@ msgid "Remove chart"
msgstr "Eliminar gráfico"
#: js/messages.php:122
-#| msgid "Edit labels and series"
msgid "Edit title and labels"
msgstr "Editar título y etiquetas"
@@ -1415,7 +1406,7 @@ msgid "Filters"
msgstr "Filtros"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filtrar"
@@ -1454,7 +1445,6 @@ msgstr ""
"volver a ingresar sus credenciales debería ayudar."
#: js/messages.php:178
-#| msgid "Reload"
msgid "Reload page"
msgstr "Cargar página nuevamente"
@@ -1738,13 +1728,11 @@ msgid "Done"
msgstr "Terminado"
#: js/messages.php:302
-#| msgid "Prev"
msgctxt "Previous month"
msgid "Prev"
msgstr "Anterior"
#: js/messages.php:307
-#| msgid "Next"
msgctxt "Next month"
msgid "Next"
msgstr "Siguiente"
@@ -1893,8 +1881,6 @@ msgstr "Sábado"
#. l10n: Short week day name
#: js/messages.php:363
-#| msgctxt "Short week day name"
-#| msgid "Sun"
msgid "Sun"
msgstr "Dom"
@@ -2124,7 +2110,6 @@ msgstr[0] "%1$d fila insertada."
msgstr[1] "%1$d filas insertadas."
#: libraries/PDF.class.php:81
-#| msgid "Allows reading data."
msgid "Error while creating PDF:"
msgstr "Error al crear PDF:"
@@ -2164,7 +2149,6 @@ msgstr ""
"Este servidor MySQL no es compatible con el motor de almacenamiento %s."
#: libraries/Table.class.php:303
-#| msgid "Show slave status"
msgid "unknown table status: "
msgstr "estado de tabla desconocido:"
@@ -2235,8 +2219,8 @@ msgstr "Bienvenido a %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"La razón más probable es que usted no haya creado un archivo de "
"configuración. Utilice el %1$sscript de configuración%2$s para crear uno."
@@ -2353,7 +2337,6 @@ msgid "PBMS get BLOB info failed:"
msgstr "Fallo al obtener la información del BLOB PBMS:"
#: libraries/blobstreaming.lib.php:332
-#| msgid "get BLOB Content-Type failed"
msgid "PBMS get BLOB Content-Type failed"
msgstr "Fallo al obtener Content-Type del BLOB PBMS"
@@ -2388,13 +2371,13 @@ msgstr "compartido"
msgid "Tables"
msgstr "Tablas"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2625,7 +2608,6 @@ msgstr "Parámetro faltante:"
#: libraries/common.lib.php:2267 libraries/common.lib.php:2270
#: libraries/display_tbl.lib.php:306
-#| msgid "Begin"
msgctxt "First page"
msgid "Begin"
msgstr "Comenzar"
@@ -2633,7 +2615,6 @@ msgstr "Comenzar"
#: libraries/common.lib.php:2268 libraries/common.lib.php:2271
#: libraries/display_tbl.lib.php:307 server_binlog.php:135
#: server_binlog.php:137
-#| msgid "Previous"
msgctxt "Previous page"
msgid "Previous"
msgstr "Anterior"
@@ -2641,14 +2622,12 @@ msgstr "Anterior"
#: libraries/common.lib.php:2297 libraries/common.lib.php:2300
#: libraries/display_tbl.lib.php:370 server_binlog.php:170
#: server_binlog.php:172
-#| msgid "Next"
msgctxt "Next page"
msgid "Next"
msgstr "Siguiente"
#: libraries/common.lib.php:2298 libraries/common.lib.php:2301
#: libraries/display_tbl.lib.php:385
-#| msgid "End"
msgctxt "Last page"
msgid "End"
msgstr "Fin"
@@ -2668,11 +2647,11 @@ msgid "Click to toggle"
msgstr "Pulse para conmutar"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3182,7 +3161,6 @@ msgstr "Compresión"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Poner los nombres de campo en la primera fila"
@@ -3393,9 +3371,9 @@ msgid "Customize default options"
msgstr "Personalizar las opciones predeteminadas"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4048,7 +4026,6 @@ msgid "Memory limit"
msgstr "Límite de la memoria"
#: libraries/config/messages.inc.php:319
-#| msgid "These are Edit, Inline edit, Copy and Delete links"
msgid "These are Edit, Copy and Delete links"
msgstr "Estos son los enlaces para Editar, Copiar y Borrar"
@@ -4752,12 +4729,10 @@ msgid "Show function fields"
msgstr "Mostrar los campos de función"
#: libraries/config/messages.inc.php:460
-#| msgid "Where to show the table row links"
msgid "Whether to show hint or not"
msgstr "Si mostrar ayudas o no"
#: libraries/config/messages.inc.php:461
-#| msgid "Show indexes"
msgid "Show hint"
msgstr "Mostrar ayudas"
@@ -5056,56 +5031,42 @@ msgstr "Autenticación por sesión"
msgid "CSV using LOAD DATA"
msgstr "CSV usando LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Cuaderno XLS Excel 97-2003"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Cuaderno XLSX Excel 2007"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Hoja de cálculo Open Document"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Rápido"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Personalizado"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Opciones de exportación de la base de datos"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV para datos de MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Texto Open Document"
@@ -5371,8 +5332,8 @@ msgstr ", @TABLE@ se convertirá en el nombre de la tabla"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Este valor es interpretado usando %1$sstrftime%2$s por lo que se pueden usar "
"cadenas para formatear el tiempo. Además sucederán las siguientes "
@@ -5524,7 +5485,6 @@ msgid "Language"
msgstr "Idioma"
#: libraries/display_tbl.lib.php:401
-#| msgid "Save directory"
msgid "Save edited data"
msgstr "Guardar datos editados"
@@ -5577,13 +5537,11 @@ msgstr "Ordenar según la clave"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6151,8 +6109,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
"Se puede encontrar documentación y más información sobre PBXT en la %spágina "
"inicial de PrimeBase XT%s."
@@ -6184,7 +6142,6 @@ msgstr "Líneas terminadas en:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Reemplazar NULL con:"
@@ -6447,7 +6404,6 @@ msgid "Stand-in structure for view"
msgstr "Estructura Stand-in para la vista"
#: libraries/export/sql.php:1071
-#| msgid "Allows reading data."
msgid "Error reading data:"
msgstr "Error leyendo datos:"
@@ -6516,7 +6472,6 @@ msgstr "Ir a la base de datos"
#: libraries/import.lib.php:1085 libraries/import.lib.php:1109
#, php-format
-#| msgid "Missing data for %s"
msgid "Edit settings for %s"
msgstr "Editar configuración de %s"
@@ -6526,7 +6481,6 @@ msgstr "Ir a la tabla"
#: libraries/import.lib.php:1107
#, php-format
-#| msgid "Structure only"
msgid "Structure of %s"
msgstr "Estructura de %s"
@@ -6535,7 +6489,6 @@ msgid "Go to view"
msgstr "Ir a la vista"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7135,13 +7088,11 @@ msgid "Execute every"
msgstr "Ejecutar cada"
#: libraries/rte/rte_events.lib.php:449
-#| msgid "Start"
msgctxt "Start of recurring event"
msgid "Start"
msgstr "Inicio"
#: libraries/rte/rte_events.lib.php:457
-#| msgid "End"
msgctxt "End of recurring event"
msgid "End"
msgstr "Fin"
@@ -7624,12 +7575,6 @@ msgstr "cambiar el estado del scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "página"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8254,8 +8199,8 @@ msgid ""
"extended features have been deactivated. To find out why click %shere%s."
msgstr ""
"El almacenamiento de configuración phpMyAdmin no está completamente "
-"configurado, algunas funcionalidades extendidas fueron deshabilitadas. %"
-"sPulsa aquí para averiguar por qué%s."
+"configurado, algunas funcionalidades extendidas fueron deshabilitadas. "
+"%sPulsa aquí para averiguar por qué%s."
#: main.php:314
msgid ""
@@ -8290,7 +8235,9 @@ msgid "No databases"
msgstr "No hay bases de datos"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "filtar tablas por nombre"
#: navigation.php:303 navigation.php:304
@@ -8997,8 +8944,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Nota: phpMyAdmin obtiene los privilegios de los usuarios 'directamente de "
"las tablas de privilegios MySQL'. El contenido de estas tablas puede diferir "
@@ -9368,7 +9315,6 @@ msgid "Monitor"
msgstr "Monitorizar"
#: server_status.php:652
-#| msgid "Apply a divisor"
msgid "Advisor"
msgstr "Consejero"
@@ -9389,7 +9335,6 @@ msgid "Filter by category..."
msgstr "Filtrar por categoría..."
#: server_status.php:727
-#| msgid "Show only alert values"
msgid "Show unformatted values"
msgstr "Mostrar valores sin formato"
@@ -10250,12 +10195,10 @@ msgid "Refresh rate"
msgstr "Velocidad de actualización"
#: server_status.php:1419
-#| msgid "Chart columns:"
msgid "Chart columns"
msgstr "Columnas del gráfico"
#: server_status.php:1435
-#| msgid "Error management:"
msgid "Chart arrangement"
msgstr "Ordenación de los gráficos"
@@ -10269,7 +10212,6 @@ msgstr ""
"complicada."
#: server_status.php:1436
-#| msgid "Restore default value"
msgid "Reset to default"
msgstr "Restaurar valor predeterminado"
@@ -10288,8 +10230,9 @@ msgstr ""
"El Monitorizador de phpMyAdmin puede asistir en la optimización de la "
"configuración del servidor y rastrear consultas que toman mucho tiempo. Para "
"esto último necesitará que «log_output» esté definido como 'TABLE' y tener "
-"activado «slow_query_log» o «general_log». Note, sin embargo, que «general_log» "
-"produce mucha información y aumenta la carga en el servidor hasta en un 15%"
+"activado «slow_query_log» o «general_log». Note, sin embargo, que "
+"«general_log» produce mucha información y aumenta la carga en el servidor "
+"hasta en un 15%"
#: server_status.php:1446
msgid ""
@@ -10305,15 +10248,6 @@ msgstr ""
"utilizar las funcionalidades para graficación del servidor."
#: server_status.php:1458
-#| msgid ""
-#| "<b>Using the monitor:</b><br/> Ok, you are good to go! Once you click "
-#| "'Start monitor' your browser will refresh all displayed charts in a "
-#| "regular interval. You may add charts and change the refresh rate under "
-#| "'Settings', or remove any chart using the cog icon on each respective "
-#| "chart.<p>When you get to see a sudden spike in activity, select the "
-#| "relevant time span on any chart by holding down the left mouse button and "
-#| "panning over the chart. This will load statistics from the logs helping "
-#| "you find what caused the activity spike.</p>"
msgid ""
"<b>Using the monitor:</b><br/> Ok, you are good to go! Once you click 'Start "
"monitor' your browser will refresh all displayed charts in a regular "
@@ -10528,7 +10462,6 @@ msgid "Target database has been synchronized with source database"
msgstr "La base de datos objetivo fue sincronizada con la base de datos fuente"
#: server_synchronize.php:951
-#| msgid "Issued queries"
msgid "Executed queries"
msgstr "Consultas ejecutadas"
@@ -11405,7 +11338,6 @@ msgid "Show more actions"
msgstr "Mostrar más acciones"
#: tbl_structure.php:603
-#| msgid "Print view"
msgid "Edit view"
msgstr "Editar vista"
@@ -11633,6 +11565,17 @@ msgstr "VER nombre"
msgid "Rename view to"
msgstr "Cambiar el nombre de la vista a"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Cuaderno XLS Excel 97-2003"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Cuaderno XLSX Excel 2007"
+
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "página"
+
#~ msgid "Inline Edit"
#~ msgstr "Editar en línea"
diff --git a/po/et.po b/po/et.po
index 157c6f8..4b5ae7d 100644
--- a/po/et.po
+++ b/po/et.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-03-12 09:14+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: estonian <et(a)li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: Translate Toolkit 1.5.3\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -23,6 +23,7 @@ msgstr "Näita kõiki"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Lehenumber:"
@@ -635,8 +636,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -885,8 +886,8 @@ msgstr "Väljavõte salvestati faili %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Te kindlasti proovisite laadida liiga suurt faili. Palun uuri "
"dokumentatsiooni %sdocumentation%s selle limiidi seadmiseks."
@@ -1460,7 +1461,7 @@ msgid "Filters"
msgstr "Väljade arv"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
#, fuzzy
msgid "Filter"
msgstr "Väljade arv"
@@ -2358,8 +2359,8 @@ msgstr "Tere tulemast %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Arvatav põhjus on te pole veel loonud seadete faili. Soovitavalt võid "
"kasutada %1$ssetup script%2$s et seadistada."
@@ -2505,13 +2506,13 @@ msgstr ""
msgid "Tables"
msgstr "Tabelid"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2796,11 +2797,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3301,7 +3302,6 @@ msgstr "Pakkimine"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3528,9 +3528,9 @@ msgid "Customize default options"
msgstr "Andmebaasi eksportimise seaded"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5094,56 +5094,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr "CSV kasutades LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Ava dokumendi arvutustabel"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Andmebaasi eksportimise seaded"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV MS Exceli jaoks"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Ava dokumendi tekst"
@@ -5427,8 +5413,8 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Seda väärtust on tõlgendatud kasutades %1$sstrftime%2$s, sa võid kasutada "
"sama aja(time) formaati. Lisaks tulevad ka järgnevad muudatused: %3$s. "
@@ -5655,13 +5641,11 @@ msgstr "Sorteeri võtme järgi"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6182,8 +6166,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6221,7 +6205,6 @@ msgstr "Read lõpetatud"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6574,7 +6557,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7716,13 +7698,6 @@ msgstr "vaheta märkmetahvlit"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "lehti"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8422,7 +8397,7 @@ msgstr "Pole andmebaase"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "tabeli nimi"
#: navigation.php:303 navigation.php:304
@@ -9143,8 +9118,8 @@ msgstr "Kustuta andmebaasid millel on samad nimed nagu kasutajatel."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Märkus: phpMyAdmin võtab kasutajate privileegid otse MySQL privileges "
"tabelist. Tabeli sisu võib erineda sellest, mida server hetkel kasutab, seda "
@@ -11700,6 +11675,12 @@ msgid "Rename view to"
msgstr "Nimeta tabel ümber"
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "lehti"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "Mootor"
diff --git a/po/eu.po b/po/eu.po
index bd25245..608599c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-07-21 14:53+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: basque <eu(a)li.org>\n"
+"Language: eu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.1\n"
@@ -24,6 +24,7 @@ msgstr "Dena erakutsi"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Orri zenbakia:"
@@ -639,8 +640,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -886,8 +887,8 @@ msgstr "Iraulketa %s fitxategian gorde da."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1441,7 +1442,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2328,8 +2329,8 @@ msgstr "Ongietorriak %s(e)ra"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2471,13 +2472,13 @@ msgstr ""
msgid "Tables"
msgstr "Taulak"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2753,11 +2754,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3256,7 +3257,6 @@ msgstr "Trinkotzea"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3485,9 +3485,9 @@ msgid "Customize default options"
msgstr "Datu-basea esportatzeko aukerak"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV datuak"
@@ -5021,56 +5021,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Datu-basea esportatzeko aukerak"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "MS Excel datuentzako CSV"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5346,8 +5332,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5557,13 +5543,11 @@ msgstr "Gakoaren arabera ordenatu"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6067,8 +6051,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6106,7 +6090,6 @@ msgstr "Honetan bukatutako lerroak: "
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6450,7 +6433,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7581,13 +7563,6 @@ msgstr "Aldatu \"scratchboard\"-a"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Usage"
-msgctxt "PDF"
-msgid "page"
-msgstr "Erabilpena"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8256,7 +8231,7 @@ msgstr "Datu-baserik ez"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Taularen \"Order By\" aldatu"
#: navigation.php:303 navigation.php:304
@@ -8989,8 +8964,8 @@ msgstr "Erabiltzaileen izen berdina duten datu-baseak ezabatu."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Oharra: phpMyAdmin-ek erabiltzaileen pribilegioak' zuzenean MySQL-ren "
"pribilegioen taulatik' eskuratzen ditu. Taula hauen edukiak, tartean eskuz "
@@ -11426,6 +11401,12 @@ msgstr ""
msgid "Rename view to"
msgstr "Taula berrizendatu izen honetara: "
+#, fuzzy
+#~| msgid "Usage"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "Erabilpena"
+
#~ msgid "Begin"
#~ msgstr "Hasi"
diff --git a/po/fa.po b/po/fa.po
index 02771f6..aa4d8c3 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-05-19 03:54+0200\n"
"Last-Translator: <ahmad_usa2007(a)yahoo.com>\n"
"Language-Team: persian <fa(a)li.org>\n"
+"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.1\n"
@@ -24,6 +24,7 @@ msgstr "نمايش همه"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "شماره صفحه:"
@@ -615,8 +616,8 @@ msgstr "پیگردی فعال نمی باشد."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"در این نما حداقل این تعداد از سطرها موجود می باشد. لطفاً به %sنوشتار%s مراجعه "
"نمایید."
@@ -860,8 +861,8 @@ msgstr ""
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1405,7 +1406,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2285,8 +2286,8 @@ msgstr "به %s خوشآمديد"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2425,13 +2426,13 @@ msgstr ""
msgid "Tables"
msgstr "جدولها"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2711,11 +2712,11 @@ msgid "Click to toggle"
msgstr "برای انتخاب کلیک کنبد"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3210,7 +3211,6 @@ msgstr "فشردهسازي"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3434,9 +3434,9 @@ msgid "Customize default options"
msgstr ""
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "دادههاي CSV"
@@ -4951,57 +4951,43 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
#, fuzzy
msgid "Database export options"
msgstr "آمار پايگاههاي داده"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV براي دادههاي MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5275,8 +5261,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5480,13 +5466,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -5984,8 +5968,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6023,7 +6007,6 @@ msgstr "خطوط منتهي به"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr ""
@@ -6360,7 +6343,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7465,13 +7447,6 @@ msgstr ""
msgid "ltr"
msgstr "rtl"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Usage"
-msgctxt "PDF"
-msgid "page"
-msgstr "استفاده"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7673,9 +7648,9 @@ msgid ""
msgstr ""
"اگر نوع ستون \"enum\" يا \"set\" ميباشد ، لطفا براي ورود مقادير از اين قالب "
"استفاده نماييد : 'a','b','c'...<br /> اگر احتياج داشتيد كه از علامت مميز "
-"برعكس(بكاسلش) (\" \\ \") يا نقلقول تكي (\" ' \") در آن مقادير استفاده نماييد "
-"، قبل از آنها علامت (\" \\ \") را بگذاريد<br /> (براي مثال'\\\\xyz' يا 'a"
-"\\'b')"
+"برعكس(بكاسلش) (\" \\ \") يا نقلقول تكي (\" ' \") در آن مقادير استفاده "
+"نماييد ، قبل از آنها علامت (\" \\ \") را بگذاريد<br /> (براي مثال'\\\\xyz' "
+"يا 'a\\'b')"
#: libraries/tbl_properties.inc.php:109
msgid ""
@@ -7710,9 +7685,9 @@ msgid ""
msgstr ""
"اگر نوع ستون \"enum\" يا \"set\" ميباشد ، لطفا براي ورود مقادير از اين قالب "
"استفاده نماييد : 'a','b','c'...<br /> اگر احتياج داشتيد كه از علامت مميز "
-"برعكس(بكاسلش) (\" \\ \") يا نقلقول تكي (\" ' \") در آن مقادير استفاده نماييد "
-"، قبل از آنها علامت (\" \\ \") را بگذاريد<br /> (براي مثال'\\\\xyz' يا 'a"
-"\\'b')"
+"برعكس(بكاسلش) (\" \\ \") يا نقلقول تكي (\" ' \") در آن مقادير استفاده "
+"نماييد ، قبل از آنها علامت (\" \\ \") را بگذاريد<br /> (براي مثال'\\\\xyz' "
+"يا 'a\\'b')"
#: libraries/tbl_properties.inc.php:342
msgid "ENUM or SET data too long?"
@@ -7978,8 +7953,8 @@ msgid ""
"this security hole by setting a password for user 'root'."
msgstr ""
"پرونده پيكربندي شما حاوي تنظيماتي است (كاربر root بدون اسم رمز) كه مرتبط با "
-"حساب پيشفرض MySQL ميباشد. اجراي MySQL با اين پيشفرض باعث ورود غيرمجاز ميشود "
-"، و شما بايد اين حفره امنيتي را ذرست كنيد."
+"حساب پيشفرض MySQL ميباشد. اجراي MySQL با اين پيشفرض باعث ورود غيرمجاز "
+"ميشود ، و شما بايد اين حفره امنيتي را ذرست كنيد."
#: main.php:251
msgid ""
@@ -8060,7 +8035,7 @@ msgstr "No databases"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "تغيير جدول مرتب شده با"
#: navigation.php:303 navigation.php:304
@@ -8766,8 +8741,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
@@ -11176,6 +11151,12 @@ msgid "Rename view to"
msgstr "بازناميدن جدول به"
#, fuzzy
+#~| msgid "Usage"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "استفاده"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "موتور"
diff --git a/po/fi.po b/po/fi.po
index abe03a4..5d7d503 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-11-26 21:29+0200\n"
"Last-Translator: <asdfsdf(a)asdfasdfasdf.com>\n"
"Language-Team: finnish <fi(a)li.org>\n"
+"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Näytä kaikki"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Sivunumero:"
@@ -616,11 +617,11 @@ msgstr "Seuranta ei ole käytössä."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Tässä näkymässä on vähintään tämän luvun verran rivejä. Katso lisätietoja %"
-"sohjeista%s."
+"Tässä näkymässä on vähintään tämän luvun verran rivejä. Katso lisätietoja "
+"%sohjeista%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -861,8 +862,8 @@ msgstr "Vedos tallennettiin tiedostoon %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Yritit todennäköisesti lähettää palvelimelle liian suurta tiedostoa. Katso "
"tämän rajoituksen muuttamisesta lisätietoja %sohjeista%s."
@@ -1432,7 +1433,7 @@ msgid "Filters"
msgstr "Suodatin"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Suodatin"
@@ -2272,11 +2273,11 @@ msgstr "Tervetuloa, toivottaa %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
-"Et liene luonut asetustiedostoa. Voit luoda asetustiedoston %1"
-"$sasetusskriptillä%2$s."
+"Et liene luonut asetustiedostoa. Voit luoda asetustiedoston "
+"%1$sasetusskriptillä%2$s."
#: libraries/auth/config.auth.lib.php:109
msgid ""
@@ -2426,13 +2427,13 @@ msgstr "jaettu"
msgid "Tables"
msgstr "Taulut"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2710,11 +2711,11 @@ msgid "Click to toggle"
msgstr "Valitse painamalla"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3225,7 +3226,6 @@ msgstr "Pakkaus"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3451,9 +3451,9 @@ msgid "Customize default options"
msgstr "Mukauta viennin oletusasetuksia"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5162,58 +5162,44 @@ msgstr "Palvelintodennuksen järjestys"
msgid "CSV using LOAD DATA"
msgstr "CSV käyttäen LOAD DATA -kyselyä"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS -työkirja"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX -työkirja"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document Spreadsheet"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
#, fuzzy
#| msgid "Custom color"
msgid "Custom"
msgstr "Muu väri"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Tietokannan tulostusvalinnat"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "MS Excelin CSV-muoto"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document Text"
@@ -5503,8 +5489,8 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Tämä arvo on %1$sstrftime%2$s-funktion mukainen, joten "
"ajanmuodostostusmerkkijonoja voi käyttää. Lisäksi tapahtuu seuraavat "
@@ -5736,13 +5722,11 @@ msgstr "Lajittele avaimen mukaan"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6290,8 +6274,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6329,7 +6313,6 @@ msgstr "Rivien erotinmerkki"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6686,7 +6669,6 @@ msgid "Go to view"
msgstr "Siirry näkymään"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7862,13 +7844,6 @@ msgstr "Näytä/kätke luonnospöytä"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "sivua"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8583,7 +8558,7 @@ msgstr "Ei tietokantoja"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Lajittele taulu"
#: navigation.php:303 navigation.php:304
@@ -9316,8 +9291,8 @@ msgstr "Poista tietokannat, joilla on sama nimi kuin käyttäjillä."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Huom: PhpMyAdmin hakee käyttäjien käyttöoikeudet suoraan MySQL-palvelimen "
"käyttöoikeustauluista. Näiden taulujen sisältö saattaa poiketa palvelimen "
@@ -11181,9 +11156,9 @@ msgstr ""
#| "You set the [kbd]config[/kbd] authentication type and included username "
#| "and password for auto-login, which is not a desirable option for live "
#| "hosts. Anyone who knows or guesses your phpMyAdmin URL can directly "
-#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1"
-#| "$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/"
-#| "kbd]."
+#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id="
+#| "%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http"
+#| "[/kbd]."
msgid ""
"You set the [kbd]config[/kbd] on type[/a] to [kbd]cookie[/kbd] or [kbd]http" illä." � باعث ورود غيرمجاز " �شود " ব্যাবহার " �x�r+ ��
B� ���r+ ��
B� ��
B� k�nq+ 6 � � ! � ! p�
B� ��
B� x4�r+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� �/�r+ ujnq+ �r+ �$�r+ �)�r+ ��oq+ x4�r+ ��
B� ��
B� k�nq+ �! �! p�
B� ��
B� H�jr+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� ��
B� ��
B� 8��q+ �p� ��
B� ujnq+ ��oq+ ��
B� ��
B� k�nq+ G H I J K M N O P p�
B� ��
B� H�Ar+ P�
B� �bnq+ ��nq+ p�
B� 0/�r+ ujnq+ @�r+ �� r+ �r+ �$�r+ �)�r+ ��oq+ H�Ar+ P�
B� ��
B� k�nq+ 8�Ar+ P�
B� ��
B� k�nq+ (�Ar+ P�
B� ��
B� k�nq+ �Ar+ P�
B� �
B� k�nq+ �.�r+ ujnq+ �)�r+ ��
B� �8 r+ einq+ �$�r+ ��
B� y8 r+ einq+ �r+ ��
B� Z8 r+ einq+ �� r+ @�r+ �� r+ �r+ �D�r+ �$�r+ �)�r+ ��oq+ 8��q+ ��q+ ��
B� p{ r+ ��
B� p�
B� k�nq+ 5 6 7 8 : < = > ? @ B D p�
B� ��
B� ��q+ ��
B� ujnq+ ��q+ �
B� ��q+ einq+ ��q+ �_@f �S Q��l�� �öq+ ��
B� ��q+ ��
B� ��
B� k�nq+ u]�� 4Q��U^Qʉ� �u������*ēvp�
B� ��
B� H��q+ D�q+ �
B� �PRs+ �PRs+ ���q+ ��
B� ��
B� ��
B� �
B� O�r+ ujnq+ �D�r+ `�
B� �PRs+ 0�
B� ��
B� ���������PRs+ ��
B� authentication type and included username and "
"password for auto-login, which is not a desirable option for live hosts. "
@@ -12058,6 +12033,18 @@ msgstr "VIEW-arvon nimi"
msgid "Rename view to"
msgstr "Nimeä taulu uudelleen"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS -työkirja"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX -työkirja"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "sivua"
+
#~ msgid "Inline Edit"
#~ msgstr "Rivin muokkaus"
diff --git a/po/fr.po b/po/fr.po
index 849f254..0fd5154 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-08-04 21:49+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: french <fr(a)li.org>\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Tout afficher"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Page n° : "
@@ -613,11 +614,11 @@ msgstr "Le suivi n'est pas activé."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Cette vue contient au moins ce nombre de lignes. Veuillez référer à %"
-"sdocumentation%s."
+"Cette vue contient au moins ce nombre de lignes. Veuillez référer à "
+"%sdocumentation%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -854,8 +855,8 @@ msgstr "Le fichier d'exportation a été sauvegardé sous %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Vous avez probablement tenté de télécharger un fichier trop volumineux. "
"Veuillez vous référer à la %sdocumentation%s pour des façons de contourner "
@@ -1404,7 +1405,7 @@ msgid "Filters"
msgstr "Filtres"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filtre"
@@ -2213,8 +2214,8 @@ msgstr "Bienvenue dans %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"La raison probable est que vous n'avez pas créé de fichier de configuration. "
"Vous pouvez utiliser le %1$sscript de configuration%2$s dans ce but."
@@ -2364,13 +2365,13 @@ msgstr "partagé"
msgid "Tables"
msgstr "Tables"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2650,11 +2651,11 @@ msgid "Click to toggle"
msgstr "Cliquer pour basculer"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3155,7 +3156,6 @@ msgstr "Compression"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Afficher les noms de colonnes en première ligne"
@@ -3363,9 +3363,9 @@ msgid "Customize default options"
msgstr "Personnaliser les options par défaut"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5008,56 +5008,42 @@ msgstr "Mode d'authentification « signon »"
msgid "CSV using LOAD DATA"
msgstr "CSV via LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS Workbook"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX Workbook"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document Spreadsheet"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Rapide"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Personnalisé"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Options d'exportation des bases de données"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV pour MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Texte Open Document"
@@ -5316,8 +5302,8 @@ msgstr ", @TABLE@ sera remplacé par le nom de la table"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Cette valeur est interprétée avec %1$sstrftime%2$s, vous pouvez donc "
"utiliser des chaînes de format d'heure. Ces transformations additionnelles "
@@ -5522,13 +5508,11 @@ msgstr "Trier sur l'index"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6088,8 +6072,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
"La documentation de PBXT et des informations additionnelles sont disponibles "
"sur %sle site de PrimeBase XT%s."
@@ -6121,7 +6105,6 @@ msgstr "Lignes terminées par :"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Remplacer NULL par :"
@@ -6240,7 +6223,8 @@ msgstr ""
#: libraries/export/sql.php:45
msgid "Additional custom header comment (\\n splits lines):"
-msgstr "Commentaires mis en en-tête (séparer les lignes par «\\» suivi de «n») :"
+msgstr ""
+"Commentaires mis en en-tête (séparer les lignes par «\\» suivi de «n») :"
#: libraries/export/sql.php:50
msgid ""
@@ -6471,7 +6455,6 @@ msgid "Go to view"
msgstr "Aller à la vue"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7562,13 +7545,6 @@ msgstr "Éditeur visuel"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "pages"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7748,8 +7724,8 @@ msgid ""
"installed the necessary PHP extensions as described in the %sdocumentation%s."
msgstr ""
"Le validateur SQL n'a pas pu être initialisé. Vérifiez que les extensions "
-"PHP nécessaires ont bien été installées tel que décrit dans la %"
-"sdocumentation%s."
+"PHP nécessaires ont bien été installées tel que décrit dans la "
+"%sdocumentation%s."
#: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
msgid "Table seems to be empty!"
@@ -8221,7 +8197,9 @@ msgid "No databases"
msgstr "Aucune base de données"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "filtrer par nom de table"
#: navigation.php:303 navigation.php:304
@@ -8929,8 +8907,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Note: phpMyAdmin obtient la liste des privilèges directement à partir des "
"tables MySQL. Le contenu de ces tables peut être différent des privilèges "
@@ -10642,8 +10620,8 @@ msgid ""
msgstr ""
"Cette %soption%s ne devrait pas être activée car elle permet à un attaquant "
"de tenter de forcer l'entrée sur tout serveur MySQL. Si vous en avez "
-"réellement besoin, utilisez la %sliste des serveurs mandataires de confiance%"
-"s."
+"réellement besoin, utilisez la %sliste des serveurs mandataires de confiance"
+"%s."
#: setup/lib/index.lib.php:276
msgid ""
@@ -10695,8 +10673,8 @@ msgid ""
msgstr ""
"Le paramètre %sLogin cookie validity%s avec une valeur de plus de 1440 "
"secondes peut causer des interruptions de la session de travail si le "
-"paramètre %ssession.gc_maxlifetime%s a une plus petite valeur (actuellement %"
-"d)."
+"paramètre %ssession.gc_maxlifetime%s a une plus petite valeur (actuellement "
+"%d)."
#: setup/lib/index.lib.php:286
#, php-format
@@ -10715,8 +10693,8 @@ msgid ""
"cookie validity%s must be set to a value less or equal to it."
msgstr ""
"Si vous utilisez l'authentification cookie et que le paramètre %sLogin "
-"cookie store%s n'a pas une valeur de 0, le paramètre %sLogin cookie validity%"
-"s doit avoir une valeur plus petite ou égale à celui-ci."
+"cookie store%s n'a pas une valeur de 0, le paramètre %sLogin cookie validity"
+"%s doit avoir une valeur plus petite ou égale à celui-ci."
#: setup/lib/index.lib.php:290
#, php-format
@@ -10726,8 +10704,8 @@ msgid ""
"protection may not be reliable if your IP belongs to an ISP where thousands "
"of users, including you, are connected to."
msgstr ""
-"Si vous l'estimez nécessaire, utilisez des paramètres de protection - %"
-"sauthentification du serveur%s et %sserveurs mandataires de confiance%s. "
+"Si vous l'estimez nécessaire, utilisez des paramètres de protection - "
+"%sauthentification du serveur%s et %sserveurs mandataires de confiance%s. "
"Cependant, la protection par adresse IP peut ne pas être fiable si votre IP "
"appartient à un fournisseur via lequel des milliers d'utilisateurs, vous y "
"compris, sont connectés."
@@ -11522,6 +11500,18 @@ msgstr "Nom de la vue"
msgid "Rename view to"
msgstr "Changer le nom de la vue pour"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS Workbook"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX Workbook"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "pages"
+
#~ msgid "Inline Edit"
#~ msgstr "Éditer en place"
diff --git a/po/gl.po b/po/gl.po
index fb1be2e..1e92d86 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-07-21 14:50+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: galician <gl(a)li.org>\n"
+"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.1\n"
@@ -24,6 +24,7 @@ msgstr "Ver todos os rexistros"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Número de páxina:"
@@ -640,11 +641,11 @@ msgstr "O seguemento non está activado."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Esta vista ten, cando menos, este número de fileiras. Vexa a %sdocumentation%"
-"s."
+"Esta vista ten, cando menos, este número de fileiras. Vexa a %sdocumentation"
+"%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -885,11 +886,11 @@ msgstr "Gardouse o volcado no ficheiro %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Posibelmente tentou enviar un ficheiro demasiado grande. Consulte a %"
-"sdocumentación%s para averiguar como evitar este límite."
+"Posibelmente tentou enviar un ficheiro demasiado grande. Consulte a "
+"%sdocumentación%s para averiguar como evitar este límite."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1471,7 +1472,7 @@ msgid "Filters"
msgstr "Filtro"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filtro"
@@ -2397,8 +2398,8 @@ msgstr "Reciba a benvida a %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Isto débese, posibelmente, a que non se creou un ficheiro de configuración. "
"Tal vez queira utilizar %1$ssetup script%2$s para crear un."
@@ -2553,13 +2554,13 @@ msgstr ""
msgid "Tables"
msgstr "Táboas"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2850,11 +2851,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3387,7 +3388,6 @@ msgstr "Compresión"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3619,9 +3619,9 @@ msgid "Customize default options"
msgstr "Personalizar as opcións de exportación por omisión"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5354,58 +5354,44 @@ msgstr "Orde de autenticación do servidor"
msgid "CSV using LOAD DATA"
msgstr "CSV utilizando LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Libro de traballo XLS do Excel 97-2003"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Libro de traballo XLSX do Excel 2007"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Folla de cálculo Open Document"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
#, fuzzy
#| msgid "Custom color"
msgid "Custom"
msgstr "Cor personalizada"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Opcións de exportación da base de datos"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV (para datos de MS Excel)"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Texto Open Document"
@@ -5701,8 +5687,8 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Este valor interprétase utilizando %1$sstrftime%2$s, de maneira que pode "
"utilizar cadeas de formato de hora. Produciranse transformacións en "
@@ -5940,13 +5926,11 @@ msgstr "Ordenar pola chave"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6506,8 +6490,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6545,7 +6529,6 @@ msgstr "As liñas rematan por"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6900,7 +6883,6 @@ msgid "Go to view"
msgstr "Ir á vista"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -8082,13 +8064,6 @@ msgstr "conmutar o borrador"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "páxinas"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8804,8 +8779,8 @@ msgid ""
"Server running with Suhosin. Please refer to %sdocumentation%s for possible "
"issues."
msgstr ""
-"Servidor a executarse con Suhosin. Consulte os posíbeis problemas na %"
-"sdocumentation%s."
+"Servidor a executarse con Suhosin. Consulte os posíbeis problemas na "
+"%sdocumentation%s."
#: navigation.php:180 server_databases.php:280 server_synchronize.php:1152
msgid "No databases"
@@ -8814,7 +8789,7 @@ msgstr "Non hai ningunha base de datos"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "nome da táboa"
#: navigation.php:303 navigation.php:304
@@ -9547,8 +9522,8 @@ msgstr "Eliminar as bases de datos que teñan os mesmos nomes que os usuarios."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Nota: phpMyAdmin recolle os privilexios dos usuarios directamente das táboas "
"de privilexios do MySQL. O contido destas táboas pode diferir dos "
@@ -11425,9 +11400,9 @@ msgstr ""
#| "You set the [kbd]config[/kbd] authentication type and included username "
#| "and password for auto-login, which is not a desirable option for live "
#| "hosts. Anyone who knows or guesses your phpMyAdmin URL can directly "
-#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1"
-#| "$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/"
-#| "kbd]."
+#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id="
+#| "%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http"
+#| "[/kbd]."
msgid ""
"You set the [kbd]config[/kbd] authentication type and included username and "
"password for auto-login, which is not a desirable option for live hosts. "
@@ -12296,6 +12271,18 @@ msgstr "Nome da VISTA"
msgid "Rename view to"
msgstr "Mudar o nome da táboa para"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Libro de traballo XLS do Excel 97-2003"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Libro de traballo XLSX do Excel 2007"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "páxinas"
+
#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
diff --git a/po/he.po b/po/he.po
index 210b3e4..5c5cd8e 100644
--- a/po/he.po
+++ b/po/he.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-03-02 20:17+0200\n"
"Last-Translator: <zippoxer(a)gmail.com>\n"
"Language-Team: hebrew <he(a)li.org>\n"
+"Language: he\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "הצג הכל"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "מספר דף:"
@@ -631,8 +632,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -876,8 +877,8 @@ msgstr "הוצאה נשמרה אל קובץ %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1433,7 +1434,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2325,8 +2326,8 @@ msgstr "ברוך הבא אל %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2469,13 +2470,13 @@ msgstr ""
msgid "Tables"
msgstr "טבלאות"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2754,11 +2755,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3255,7 +3256,6 @@ msgstr "דחיסה"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr ""
@@ -3480,9 +3480,9 @@ msgid "Customize default options"
msgstr "אפשרויות ייצוא מאגר נתונים"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5023,56 +5023,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "אפשרויות ייצוא מאגר נתונים"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV עבור MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5350,8 +5336,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5561,13 +5547,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6069,8 +6053,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6108,7 +6092,6 @@ msgstr "שורות מסתיימות ע\"י"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6456,7 +6439,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7587,13 +7569,6 @@ msgstr ""
msgid "ltr"
msgstr "rtl"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "דפים"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8193,7 +8168,7 @@ msgstr "אין מאגרי נתונים"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "שינוי סדר הטבלה לפי"
#: navigation.php:303 navigation.php:304
@@ -8914,8 +8889,8 @@ msgstr "הסרת מאגרי נתונים שיש להם שמות דומים כמ
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"הערה: phpMyAdmin מקבל הרשאות משתמש ישירות מטבלאות הרשאות של MySQL. התוכן של "
"הטבלאות האלו יכול להיות שונה מההרשאות שהשרת משתמש בהן, אם הן שונו באופן "
@@ -11346,6 +11321,12 @@ msgid "Rename view to"
msgstr "שינוי שם טבלה אל"
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "דפים"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "מנועים"
diff --git a/po/hi.po b/po/hi.po
index 21f30e0..d7790a8 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-07-24 19:04+0200\n"
"Last-Translator: <deadefy(a)nepalimail.com>\n"
"Language-Team: hindi <hi(a)li.org>\n"
+"Language: hi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "सभी दिखाएँ"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "पृष्ठ संख्या:"
@@ -345,8 +346,8 @@ msgid ""
"The phpMyAdmin configuration storage has been deactivated. To find out why "
"click %shere%s."
msgstr ""
-"phpMyAdmin विन्यास भंडारण को निष्क्रिय किया गया हैक्यों ये किया गया है, जानने के लिए %"
-"sयहाँ%s पर क्लिक करें."
+"phpMyAdmin विन्यास भंडारण को निष्क्रिय किया गया हैक्यों ये किया गया है, जानने के लिए "
+"%sयहाँ%s पर क्लिक करें."
#: db_operations.php:584
msgid "Edit or export relational schema"
@@ -611,8 +612,8 @@ msgstr "ट्रैकिंग सक्रिय नहीं है."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr "इस द्रश्य में कम से कम इतनी रो हैं. और जानने के लिए %s दस्तावेज़%s पढ़ें."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -847,8 +848,8 @@ msgstr "डंप को %s फाइल में सेव किया गय
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"आप शायद बहुत बड़ी फाइल अपलोड करने की कोशिश कर रहे हैं. इस दुविधा के लिए कृपया करके %s "
"दोकुमेंताशन%s पढ़ें."
@@ -1413,7 +1414,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2247,11 +2248,11 @@ msgstr "%s मे स्वागत है"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
-"आपने शायद एक विन्यास फाइल नहीं बने थी. विन्यास फाइल बनाने के लिए %1$ssetup script%2"
-"$s का उपयोग करें."
+"आपने शायद एक विन्यास फाइल नहीं बने थी. विन्यास फाइल बनाने के लिए %1$ssetup script"
+"%2$s का उपयोग करें."
#: libraries/auth/config.auth.lib.php:109
msgid ""
@@ -2395,13 +2396,13 @@ msgstr "साझा"
msgid "Tables"
msgstr "टेबल"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2680,11 +2681,11 @@ msgid "Click to toggle"
msgstr "चयन करने के लिए क्लिक करें."
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3174,7 +3175,6 @@ msgstr "संक्षिप्तीकरण"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "काँलम नाम प्रथम रो में"
@@ -3380,9 +3380,9 @@ msgid "Customize default options"
msgstr "डिफ़ॉल्ट विकल्प अनुकूलित"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4915,56 +4915,42 @@ msgstr "signon प्रमाणीकरण"
msgid "CSV using LOAD DATA"
msgstr "CSV using LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS Workbook"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "तुरंत"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "कस्टम"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "डेटाबेस निर्यात विकल्प"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV for MX Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5220,8 +5206,8 @@ msgstr ", @टेबल@ टेबल का नाम बन जायेगा
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5417,13 +5403,11 @@ msgstr "कुंजी सॉर्ट"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5914,8 +5898,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -5953,7 +5937,6 @@ msgstr "लाईन समाप्त होता है"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr ""
@@ -6296,7 +6279,6 @@ msgid "Go to view"
msgstr "दृश्य पर जायें"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7451,13 +7433,6 @@ msgstr ""
msgid "ltr"
msgstr "आईटीआर"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "पृष्ठों"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8028,7 +8003,7 @@ msgstr "कोइ डाटाबेस नहिं"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "टेबल क्रमांक को बदलिये "
#: navigation.php:303 navigation.php:304
@@ -8733,8 +8708,8 @@ msgstr "Drop the databases that have the same names as the users."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
@@ -11142,6 +11117,15 @@ msgstr "दृश्य का नाम"
msgid "Rename view to"
msgstr "दृश्य का नाम बदलो"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS Workbook"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "पृष्ठों"
+
#~ msgid "Inline Edit"
#~ msgstr "इनलाइन संपादन"
diff --git a/po/hr.po b/po/hr.po
index a39f70b..b1c3ff9 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -3,16 +3,16 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-07-21 14:54+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: croatian <hr(a)li.org>\n"
+"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.0.1\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -25,6 +25,7 @@ msgstr "Prikaži sve"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Broj stranice:"
@@ -639,8 +640,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Ovaj prikaz sadrži najmanje ovoliko redaka. Proučite %sdokumentaciju%s."
@@ -890,11 +891,11 @@ msgstr "Izbacivanje je spremljeno u datoteku %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Vjerojatno ste pokušali s učitavanjem prevelike datoteke. Pogledajte %"
-"sdokumentaciju%s radi uputa o načinima rješavanja ovog ograničenja."
+"Vjerojatno ste pokušali s učitavanjem prevelike datoteke. Pogledajte "
+"%sdokumentaciju%s radi uputa o načinima rješavanja ovog ograničenja."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1470,7 +1471,7 @@ msgid "Filters"
msgstr "Datoteke"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
#, fuzzy
msgid "Filter"
msgstr "Datoteke"
@@ -2376,8 +2377,8 @@ msgstr "Dobro došli u %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Vjerojatan razlog je nepostojeća konfiguracijska datoteka. Za izradu možete "
"upotrijebiti naredbu %1$ssetup script%2$s"
@@ -2523,13 +2524,13 @@ msgstr ""
msgid "Tables"
msgstr "Tablice"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2816,11 +2817,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3321,7 +3322,6 @@ msgstr "Kompresija"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3548,9 +3548,9 @@ msgid "Customize default options"
msgstr "Opcije izvoza baze podataka"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5112,58 +5112,44 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr "CSV upotrebom LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Otvori izračunsku tablicu dokumenta"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
#, fuzzy
#| msgid "Custom color"
msgid "Custom"
msgstr "Prilagođena boja"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Opcije izvoza baze podataka"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV za MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Otvori tekst dokumenta"
@@ -5449,8 +5435,8 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Vrijednost se interpretira pomoću %1$sstrftime%2$s, pa možete upotrijebiti "
"naredbe oblikovanja vremena. Dodatno se mogu dogoditi sljedeća "
@@ -5679,13 +5665,11 @@ msgstr "Presloži po ključu"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6242,8 +6226,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6281,7 +6265,6 @@ msgstr "Redovi završeni s"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6630,7 +6613,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7779,13 +7761,6 @@ msgstr "Uključi bilješke"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "stranice"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8492,7 +8467,7 @@ msgstr "Nema baza podataka"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "naziv tablice"
#: navigation.php:303 navigation.php:304
@@ -9224,8 +9199,8 @@ msgstr "Ispusti baze podataka koje imaju iste nazive i korisnike."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Napomena: phpMyAdmin preuzima korisničke privilegije izravno iz MySQL "
"tablica privilegija. U slučaju da su ručno mijenjane, sadržaj ovih tablica "
@@ -11800,6 +11775,12 @@ msgid "Rename view to"
msgstr "Preimenuj prikaz u"
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "stranice"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "Pogoni"
@@ -12061,8 +12042,8 @@ msgstr "Preimenuj prikaz u"
#~ "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
#~ "extensio ad [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] " lica " ike." येगा िन्यास फाइल बनाने के लिए %1$ssetup script" पया करके %s " + ��
B� ��
B� k�nq+ 6 � � ! � ! p�
B� ��
B� x4�r+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� �/�r+ ujnq+ �r+ �$�r+ �)�r+ ��oq+ x4�r+ ��
B� ��
B� k�nq+ �! �! p�
B� ��
B� H�jr+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� ��
B� ��
B� 8��q+ �p� ��
B� ujnq+ ��oq+ ��
B� ��
B� k�nq+ G H I J K M N O P p�
B� ��
B� H�Ar+ P�
B� �bnq+ ��nq+ p�
B� 0/�r+ ujnq+ @�r+ �� r+ �r+ �$�r+ �)�r+ ��oq+ H�Ar+ P�
B� ��
B� k�nq+ 8�Ar+ P�
B� ��
B� k�nq+ (�Ar+ P�
B� ��
B� k�nq+ �Ar+ P�
B� �
B� k�nq+ �.�r+ ujnq+ �)�r+ ��
B� �8 r+ einq+ �$�r+ ��
B� y8 r+ einq+ �r+ ��
B� Z8 r+ einq+ �� r+ @�r+ �� r+ �r+ �D�r+ �$�r+ �)�r+ ��oq+ 8��q+ ��q+ ��
B� p{ r+ ��
B� p�
B� k�nq+ 5 6 7 8 : < = > ? @ B D p�
B� ��
B� ��q+ ��
B� ujnq+ ��q+ �
B� ��q+ einq+ ��q+ �_@f �S Q��l�� �öq+ ��
B� ��q+ ��
B� ��
B� k�nq+ u]�� 4Q��U^Qʉ� �u������*ēvp�
B� ��
B� H��q+ D�q+ �
B� �PRs+ �PRs+ ���q+ ��
B� ��
B� ��
B� �
B� O�r+ ujnq+ �D�r+ `�
B� �PRs+ 0�
B� ��
B� ���������PRs+ ��
B� n. Please check your PHP configuration."
#~ msgstr ""
-#~ "Nije moguće učitati proširenje [a@http://php.net/%1$s@Documentation][em]%1"
-#~ "$s[/em][/a] . Provjerite svoju PHP konfiguraciju."
+#~ "Nije moguće učitati proširenje [a@http://php.net/%1$s@Documentation]"
+#~ "[em]%1$s[/em][/a] . Provjerite svoju PHP konfiguraciju."
#~ msgid ""
#~ "Couldn't load the iconv or recode extension needed for charset "
diff --git a/po/hu.po b/po/hu.po
index 8078540..4e91b66 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-05-27 18:52+0200\n"
"Last-Translator: <slygyor(a)gmail.com>\n"
"Language-Team: hungarian <hu(a)li.org>\n"
+"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Összes mutatása"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Oldalszám:"
@@ -616,11 +617,11 @@ msgstr "Nyomkövetés inaktív."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Ebben a nézetben legalább ennyi számú sor van. Kérjük, hogy nézzen utána a %"
-"sdokumentációban%s."
+"Ebben a nézetben legalább ennyi számú sor van. Kérjük, hogy nézzen utána a "
+"%sdokumentációban%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -856,11 +857,11 @@ msgstr "A kiíratás mentése a(z) %s fájlba megtörtént."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Ön bizonyára túl nagy fájlt próbált meg feltölteni. Kérjük, nézzen utána a %"
-"sdokumentációban%s a korlátozás feloldása végett."
+"Ön bizonyára túl nagy fájlt próbált meg feltölteni. Kérjük, nézzen utána a "
+"%sdokumentációban%s a korlátozás feloldása végett."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1429,7 +1430,7 @@ msgid "Filters"
msgstr "Szűrő"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Szűrő"
@@ -2270,11 +2271,11 @@ msgstr "Üdvözli a %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
-"Ön valószínűleg nem hozta létre a konfigurációs fájlt. A %1"
-"$stelepítőszkripttel%2$s el tudja készíteni."
+"Ön valószínűleg nem hozta létre a konfigurációs fájlt. A "
+"%1$stelepítőszkripttel%2$s el tudja készíteni."
#: libraries/auth/config.auth.lib.php:109
msgid ""
@@ -2421,13 +2422,13 @@ msgstr "megosztott"
msgid "Tables"
msgstr "Táblák"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2708,11 +2709,11 @@ msgid "Click to toggle"
msgstr "Kattintson a kijelöléshez."
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3217,7 +3218,6 @@ msgstr "Tömörítés"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "A mezőneveket az első sorba teszi"
@@ -3423,9 +3423,9 @@ msgid "Customize default options"
msgstr "Alapértelmezett beállítások testreszabása"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5079,56 +5079,42 @@ msgstr "Signon hitelesítés"
msgid "CSV using LOAD DATA"
msgstr "CSV a LOAD DATA használatával"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS Workbook"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX Workbook"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document munkafüzet"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Quick"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Egyedi"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Adatbázis exportálási beállításai"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "MS Excel CSV adat"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document szöveges dokumentum"
@@ -5398,8 +5384,8 @@ msgstr ", @TABLE@ lesz a tábla neve"
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Ennek az értéknek az értelmezése az %1$sstrftime%2$s használatával történik, "
"vagyis időformázó karakterláncokat használhat. A következő átalakításokra "
@@ -5616,13 +5602,11 @@ msgstr "Kulcs szerinti rendezés"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6178,8 +6162,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6217,7 +6201,6 @@ msgstr "Sorok vége"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6571,7 +6554,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7737,13 +7719,6 @@ msgstr "Scratchboard kapcsolása"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "lapok"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7932,8 +7907,8 @@ msgid ""
"The SQL validator could not be initialized. Please check if you have "
"installed the necessary PHP extensions as described in the %sdocumentation%s."
msgstr ""
-"Nem lehetett inicializálni az SQL ellenőrzőt. Ellenőrizze, hogy a %"
-"sdokumentációban%s leírtak szerint telepítette-e a szükséges PHP-"
+"Nem lehetett inicializálni az SQL ellenőrzőt. Ellenőrizze, hogy a "
+"%sdokumentációban%s leírtak szerint telepítette-e a szükséges PHP-"
"kiterjesztést."
#: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
@@ -8478,7 +8453,7 @@ msgstr "Nincs adatbázis"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Tábla rendezésének módosítása e szerint:"
#: navigation.php:303 navigation.php:304
@@ -9217,13 +9192,13 @@ msgstr "A felhasználókéval azonos nevű adatbázisok eldobása."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Megjegyzés: a phpMyAdmin a felhasználók jogait közvetlenül a MySQL "
"privilégium táblákból veszi. Ezen táblák tartalma eltérhet a szerver által "
-"használt jogoktól, ha a módosításuk kézzel történt. Ebben az esetben %"
-"stöltse be újra a jogokat%s a folytatás előtt."
+"használt jogoktól, ha a módosításuk kézzel történt. Ebben az esetben "
+"%stöltse be újra a jogokat%s a folytatás előtt."
#: server_privileges.php:1851
msgid "The selected user was not found in the privilege table."
@@ -11047,9 +11022,9 @@ msgstr ""
#| "You set the [kbd]config[/kbd] authentication type and included username "
#| "and password for auto-login, which is not a desirable option for live "
#| "hosts. Anyone who knows or guesses your phpMyAdmin URL can directly "
-#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1"
-#| "$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/"
-#| "kbd]."
+#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id="
+#| "%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http"
+#| "[/kbd]."
msgid ""
"You set the [kbd]config[/kbd] authentication type and included username and "
"password for auto-login, which is not a desirable option for live hosts. "
@@ -11882,6 +11857,18 @@ msgstr "NÉZET neve"
msgid "Rename view to"
msgstr "Nézet átnevezése"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS Workbook"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX Workbook"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "lapok"
+
#~ msgid "Inline Edit"
#~ msgstr "Inline szerkesztés"
@@ -11910,8 +11897,8 @@ msgstr "Nézet átnevezése"
#~ "No themes support; please check your configuration and/or your themes in "
#~ "directory %s."
#~ msgstr ""
-#~ "Nincs téma támogatás, ellenőrizze a beállításokat és/vagy a témákat a(z) %"
-#~ "s könyvtárban."
+#~ "Nincs téma támogatás, ellenőrizze a beállításokat és/vagy a témákat a(z) "
+#~ "%s könyvtárban."
#~ msgid "Switch to"
#~ msgstr "Váltás"
diff --git a/po/id.po b/po/id.po
index 4d8fffd..a2bbb95 100644
--- a/po/id.po
+++ b/po/id.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-06-18 11:34+0200\n"
"Last-Translator: <udin.mx(a)gmail.com>\n"
"Language-Team: indonesian <id(a)li.org>\n"
+"Language: id\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Tampilkan semua"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Halaman no.:"
@@ -613,11 +614,11 @@ msgstr "Pelacakan tidak aktif."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Sebuah view setidaknya mempunyai jumlah kolom berikut. Silahkan lihat %"
-"sdokumentasi%s"
+"Sebuah view setidaknya mempunyai jumlah kolom berikut. Silahkan lihat "
+"%sdokumentasi%s"
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -856,11 +857,11 @@ msgstr "Dump (Skema) disimpan pada file %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Anda mungkin meng-upload file yang terlalu besar. Silahkan lihat %"
-"sdokumentasi%s untuk mendapatkan solusi tentang batasan ini."
+"Anda mungkin meng-upload file yang terlalu besar. Silahkan lihat "
+"%sdokumentasi%s untuk mendapatkan solusi tentang batasan ini."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1421,7 +1422,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2249,8 +2250,8 @@ msgstr "Selamat Datang di %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Anda mungkin belum membuat file konfigurasi. Anda bisa menggunakan %1$ssetup "
"script%2$s untuk membuatnya."
@@ -2400,13 +2401,13 @@ msgstr "dibagi"
msgid "Tables"
msgstr "Tabel"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2684,11 +2685,11 @@ msgid "Click to toggle"
msgstr "Klik untuk memilih"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3179,7 +3180,6 @@ msgstr "Kompresi"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3408,9 +3408,9 @@ msgid "Customize default options"
msgstr "Pilihan cara untuk mengekspor Database"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "Data CSV"
@@ -4953,58 +4953,44 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
#, fuzzy
#| msgid "Custom color"
msgid "Custom"
msgstr "Warna kustom"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Pilihan cara untuk mengekspor Database"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV untuk data MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5287,8 +5273,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5498,13 +5484,11 @@ msgstr "Urut berdasarkan kunci"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6026,8 +6010,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6065,7 +6049,6 @@ msgstr "Garis diputuskan oleh"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6422,7 +6405,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7569,13 +7551,6 @@ msgstr "pindah buku catatan (Scratchboard)"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "halaman"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8266,7 +8241,7 @@ msgstr "Database tidak ditemukan"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Urutkan tabel berdasarkan"
#: navigation.php:303 navigation.php:304
@@ -9002,8 +8977,8 @@ msgstr "Hapus database yang memiliki nama yang sama dengan pengguna."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Perhatian: phpMyAdmin membaca data tentang pengguna secara langsung dari "
"tabel profil pengguna MySQL. Isi dari tabel bisa saja berbeda dengan profil "
@@ -11453,6 +11428,12 @@ msgstr "Nama VIEW"
msgid "Rename view to"
msgstr "Ubah nama tabel menjadi "
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "halaman"
+
#~ msgid "Inline Edit"
#~ msgstr "Inline Edit"
diff --git a/po/it.po b/po/it.po
index 4e9df10..63d595d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-07-22 19:13+0200\n"
"Last-Translator: Rouslan Placella <rouslan(a)placella.com>\n"
"Language-Team: italian <it(a)li.org>\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Mostra tutti"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Numero pagina:"
@@ -613,8 +614,8 @@ msgstr "Il tracking non è attivo."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Questa vista ha, come minimo, questo numero di righe. Per informazioni "
"controlla la %sdocumentazione%s."
@@ -853,8 +854,8 @@ msgstr "Il dump è stato salvato nel file %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Stai probabilmente cercando di caricare sul server un file troppo grande. "
"Fai riferimento alla documentazione %sdocumentation%s se desideri aggirare "
@@ -1434,7 +1435,7 @@ msgid "Filters"
msgstr "Filtra"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filtra"
@@ -2255,8 +2256,8 @@ msgstr "Benvenuto in %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"La ragione di questo è che probabilmente non hai creato alcun file di "
"configurazione. Potresti voler usare %1$ssetup script%2$s per crearne uno."
@@ -2405,13 +2406,13 @@ msgstr "condiviso"
msgid "Tables"
msgstr "Tabelle"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2688,11 +2689,11 @@ msgid "Click to toggle"
msgstr "Clicca per alternare"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3195,7 +3196,6 @@ msgstr "Compressione"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Metti i nomi delle colonne nel primo rigo"
@@ -3402,9 +3402,9 @@ msgid "Customize default options"
msgstr "Personalizza le opzioni predefinite"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5073,56 +5073,42 @@ msgstr "Autenticazione via signon"
msgid "CSV using LOAD DATA"
msgstr "CSV usando LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS Workbook"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX Workbook"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Foglio di calcolo nel formato Open Document"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Veloce"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Personalizzazato"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Opzioni di esportazione per database"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV per dati MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Testo nel formato Open Document"
@@ -5388,8 +5374,8 @@ msgstr ", il nome della tabella diventerá @TABLE@"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Questo valore è interpretato usando %1$sstrftime%2$s: in questo modo puoi "
"usare stringhe di formattazione per le date/tempi. Verranno anche aggiunte "
@@ -5594,13 +5580,11 @@ msgstr "Ordina per chiave"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6160,8 +6144,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
"La documentazione ed ulteriori informazioni a riguardo di PBXT é disponibile "
"su %sPrimeBase XT Home Page%s."
@@ -6193,7 +6177,6 @@ msgstr "Linee terminate con:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Sostituisci NULL con:"
@@ -6548,7 +6531,6 @@ msgid "Go to view"
msgstr "Vai alla visualizzazione"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7646,13 +7628,6 @@ msgstr "(dis)attiva scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "pagine"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8302,15 +8277,17 @@ msgid ""
"Server running with Suhosin. Please refer to %sdocumentation%s for possible "
"issues."
msgstr ""
-"Sul server è in esecuzione Suhosin. Controlla la documentazione: %"
-"sdocumentation%s per possibili problemi."
+"Sul server è in esecuzione Suhosin. Controlla la documentazione: "
+"%sdocumentation%s per possibili problemi."
#: navigation.php:180 server_databases.php:280 server_synchronize.php:1152
msgid "No databases"
msgstr "Nessun database"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "filtra tabbelle in base al nome"
#: navigation.php:303 navigation.php:304
@@ -9003,8 +8980,8 @@ msgstr "Elimina i databases gli stessi nomi degli utenti."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"N.B.: phpMyAdmin legge i privilegi degli utenti direttamente nella tabella "
"dei privilegi di MySQL. Il contenuto di questa tabella può differire dai "
@@ -10796,10 +10773,10 @@ msgid ""
"protection may not be reliable if your IP belongs to an ISP where thousands "
"of users, including you, are connected to."
msgstr ""
-"Se credi che é necessario, usa delle ulteriori impostazioni di protezione - %"
-"saimpostazioni di autenticazione dei host%s e %slista di proxy di fiducia%s. "
-"Comunque, la protezione a base di IP potrebbe non essere affidabile se il "
-"tuo IP appartiene ad un ISP dove migliaia di utenti, incluso te, sono "
+"Se credi che é necessario, usa delle ulteriori impostazioni di protezione - "
+"%saimpostazioni di autenticazione dei host%s e %slista di proxy di fiducia"
+"%s. Comunque, la protezione a base di IP potrebbe non essere affidabile se "
+"il tuo IP appartiene ad un ISP dove migliaia di utenti, incluso te, sono "
"connessi."
#: setup/lib/index.lib.php:292
@@ -10814,8 +10791,8 @@ msgstr ""
"Hai impostato il tipo di autenticazione [kbd]config[/kbd] e hai inclusi il "
"nome utente e la parola chiave per l'auto-login, questo non è desiderato per "
"gli host in uso live. Chiunque che conosce o indovina il tuo URL di "
-"phpMyAdmin potrá direttamente accedere al pannello di phpMyAdmin. Imposta %"
-"sil tipo di autenticazione%s a [kbd]cookie[/kbd] o [kbd]http[/kbd]."
+"phpMyAdmin potrá direttamente accedere al pannello di phpMyAdmin. Imposta "
+"%sil tipo di autenticazione%s a [kbd]cookie[/kbd] o [kbd]http[/kbd]."
#: setup/lib/index.lib.php:294
#, php-format
@@ -11596,6 +11573,18 @@ msgstr "Nome VISTA"
msgid "Rename view to"
msgstr "Rinomina la vista in"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS Workbook"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX Workbook"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "pagine"
+
#~ msgid "Inline Edit"
#~ msgstr "Modifica in linea"
diff --git a/po/ja.po b/po/ja.po
index c1f626a..56d469c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-08-06 12:16+0200\n"
"Last-Translator: Yuichiro <yuichiro(a)pop07.odn.ne.jp>\n"
"Language-Team: japanese <jp(a)li.org>\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "すべて表示"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "ページ番号:"
@@ -608,8 +609,8 @@ msgstr "SQL コマンドの追跡は非アクティブです。"
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr "このビューの最低行数。詳しくは%sドキュメント%sをご覧ください。"
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -847,8 +848,8 @@ msgstr "ダンプをファイル %s に保存しました"
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"アップロードしようとしたファイルが大きすぎるようです。対策については %sドキュ"
"メント%s をご覧ください"
@@ -1392,7 +1393,7 @@ msgid "Filters"
msgstr "フィルタ"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "フィルタ"
@@ -2201,11 +2202,11 @@ msgstr "%s へようこそ"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
-"設定ファイルが作成されていないものと思われます。%1$sセットアップスクリプト%2"
-"$s を利用して設定ファイルを作成してください"
+"設定ファイルが作成されていないものと思われます。%1$sセットアップスクリプ"
+"ト%2$s を利用して設定ファイルを作成してください"
#: libraries/auth/config.auth.lib.php:109
msgid ""
@@ -2348,13 +2349,13 @@ msgstr "共有"
msgid "Tables"
msgstr "テーブル"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2630,11 +2631,11 @@ msgid "Click to toggle"
msgstr "クリックでオン／オフ切り替え"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3130,7 +3131,6 @@ msgstr "圧縮"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "1 行目にカラム名を追加する"
@@ -3337,9 +3337,9 @@ msgid "Customize default options"
msgstr "デフォルトオプションの詳細設定"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4964,56 +4964,42 @@ msgstr "サインオン認証"
msgid "CSV using LOAD DATA"
msgstr "LOAD DATA 文を使用した CSV の読み込み"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS ワークブック"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX ワークブック"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document スプレッドシート"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "簡易"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "詳細"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "データベースエクスポートオプション"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "MS Excel 用の CSV"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document テキスト"
@@ -5269,8 +5255,8 @@ msgstr "、@TABLE@ はテーブル名に"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"この値は %1$sstrftime%2$s を使用して解釈されますので、時刻の書式文字列を使用"
"することができます。また、埋め込み変数変換も行われます（%3$s変換されま"
@@ -5473,13 +5459,11 @@ msgstr "キーでソート"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6024,8 +6008,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
"PBXT に関するドキュメントおよび詳細な情報は、%sPrimeBase XT オフィシャルサイ"
"ト%sにあります。"
@@ -6057,7 +6041,6 @@ msgstr "行の終端記号"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "NULL の代替文字列"
@@ -6399,7 +6382,6 @@ msgid "Go to view"
msgstr "ビューに移動"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7488,13 +7470,6 @@ msgstr "スクラッチボードを切り替える"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "ページ"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8134,7 +8109,9 @@ msgid "No databases"
msgstr "データベースが存在しません"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "名前でテーブルをフィルタする"
#: navigation.php:303 navigation.php:304
@@ -8822,8 +8799,8 @@ msgstr "ユーザと同名のデータベースを削除する"
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"注意: phpMyAdmin は MySQL の特権テーブルから直接ユーザ特権を取得しますが、手"
"作業で特権を更新した場合は phpMyAdmin が利用しているテーブルの内容とサーバの"
@@ -10578,10 +10555,11 @@ msgid ""
"protection may not be reliable if your IP belongs to an ISP where thousands "
"of users, including you, are connected to."
msgstr ""
-"それでも、[kbd]config[/kbd] 認証が必要であると思われる場合、追加の保護設定（%"
-"sホスト認証%s設定および%s信頼されたプロキシのリスト%s）を使用してください。し"
-"かしながら、ユーザが数千人もいるような ISP に所属している、含まれている、接続"
-"されている場合には、IP アドレスを基にした保護は信頼性が高いとはいえません。"
+"それでも、[kbd]config[/kbd] 認証が必要であると思われる場合、追加の保護設定"
+"（%sホスト認証%s設定および%s信頼されたプロキシのリスト%s）を使用してくださ"
+"い。しかしながら、ユーザが数千人もいるような ISP に所属している、含まれてい"
+"る、接続されている場合には、IP アドレスを基にした保護は信頼性が高いとはいえま"
+"せん。"
#: setup/lib/index.lib.php:292
#, php-format
@@ -11372,6 +11350,18 @@ msgstr "ビューの名前"
msgid "Rename view to"
msgstr "リネーム後のビューの名前"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS ワークブック"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX ワークブック"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "ページ"
+
#~ msgid "Inline Edit"
#~ msgstr "インライン編集"
diff --git a/po/ka.po b/po/ka.po
index 4df1e04..8e38b6f 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-03-12 09:14+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: georgian <ka(a)li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: Translate Toolkit 1.5.3\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -23,6 +23,7 @@ msgstr "ყველას ჩვენება"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "გვერდის ნომერი:"
@@ -637,11 +638,11 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -888,11 +889,11 @@ msgstr "Dump has been saved to file %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1466,7 +1467,7 @@ msgid "Filters"
msgstr "ფაილები"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
#, fuzzy
msgid "Filter"
msgstr "ფაილები"
@@ -2392,11 +2393,11 @@ msgstr "მოგესალმებათ %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
#: libraries/auth/config.auth.lib.php:109
msgid ""
@@ -2541,13 +2542,13 @@ msgstr ""
msgid "Tables"
msgstr "ცხრილები"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2835,11 +2836,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3366,7 +3367,6 @@ msgstr "შეკუმშვა"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3592,9 +3592,9 @@ msgid "Customize default options"
msgstr "Customize default export options"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5299,58 +5299,44 @@ msgstr "Host authentication order"
msgid "CSV using LOAD DATA"
msgstr "CSV using LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document Spreadsheet"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
#, fuzzy
#| msgid "Custom color"
msgid "Custom"
msgstr "Custom color"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "მონაცემთა ბაზის ექსპორტის პარამეტრები"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV MS Excel-თვის"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document Text"
@@ -5636,12 +5622,12 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is."
#: libraries/display_export.lib.php:270
msgid "use this for future exports"
@@ -5867,13 +5853,11 @@ msgstr "Sort by key"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6426,8 +6410,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6465,7 +6449,6 @@ msgstr "Lines terminated by"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6820,7 +6803,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7988,13 +7970,6 @@ msgstr "Toggle scratchboard"
msgid "ltr"
msgstr "ltr"
-# gstr "ltr" 70,6 @@ msgstr "Toggle scratchboard" ata)</i>" (if this is " ��არამეტრები" स फाइल बनाने के लिए %1$ssetup script" पया करके %s " + ��
B� ��
B� k�nq+ 6 � � ! � ! p�
B� ��
B� x4�r+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� �/�r+ ujnq+ �r+ �$�r+ �)�r+ ��oq+ x4�r+ ��
B� ��
B� k�nq+ �! �! p�
B� ��
B� H�jr+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� ��
B� ��
B� 8��q+ �p� ��
B� ujnq+ ��oq+ ��
B� ��
B� k�nq+ G H I J K M N O P p�
B� ��
B� H�Ar+ P�
B� �bnq+ ��nq+ p�
B� 0/�r+ ujnq+ @�r+ �� r+ �r+ �$�r+ �)�r+ ��oq+ H�Ar+ P�
B� ��
B� k�nq+ 8�Ar+ P�
B� ��
B� k�nq+ (�Ar+ P�
B� ��
B� k�nq+ �Ar+ P�
B� �
B� k�nq+ �.�r+ ujnq+ �)�r+ ��
B� �8 r+ einq+ �$�r+ ��
B� y8 r+ einq+ �r+ ��
B� Z8 r+ einq+ �� r+ @�r+ �� r+ �r+ �D�r+ �$�r+ �)�r+ ��oq+ 8��q+ ��q+ ��
B� p{ r+ ��
B� p�
B� k�nq+ 5 6 7 8 : < = > ? @ B D p�
B� ��
B� ��q+ ��
B� ujnq+ ��q+ �
B� ��q+ einq+ ��q+ �_@f �S Q��l�� �öq+ ��
B� ��q+ ��
B� ��
B� k�nq+ u]�� 4Q��U^Qʉ� �u������*ēvp�
B� ��
B� H��q+ D�q+ �
B� �PRs+ �PRs+ ���q+ ��
B� ��
B� ��
B� �
B� O�r+ ujnq+ �D�r+ `�
B� �PRs+ 0�
B� ��
B� ���������PRs+ ��
B� : libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "pages"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8719,7 +8694,7 @@ msgstr "მონაცემთა ბაზები არაა"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "ცხრილის სახელი"
#: navigation.php:303 navigation.php:304
@@ -9453,13 +9428,13 @@ msgstr "Drop the databases that have the same names as the users."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
#: server_privileges.php:1851
msgid "The selected user was not found in the privilege table."
@@ -11264,9 +11239,9 @@ msgstr ""
#| "You set the [kbd]config[/kbd] authentication type and included username "
#| "and password for auto-login, which is not a desirable option for live "
#| "hosts. Anyone who knows or guesses your phpMyAdmin URL can directly "
-#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1"
-#| "$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/"
-#| "kbd]."
+#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id="
+#| "%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http"
+#| "[/kbd]."
msgid ""
"You set the [kbd]config[/kbd] authentication type and included username and "
"password for auto-login, which is not a desirable option for live hosts. "
@@ -12131,6 +12106,12 @@ msgid "Rename view to"
msgstr "Rename table to"
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "pages"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "ძრავები"
diff --git a/po/ko.po b/po/ko.po
index 12559c3..665fea3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-08-05 14:17+0200\n"
"Last-Translator: Chung-Ook Lee <hantip(a)gmail.com>\n"
"Language-Team: korean <ko(a)li.org>\n"
+"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "모두 보기"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "페이지 번호:"
@@ -350,8 +351,8 @@ msgid ""
"The phpMyAdmin configuration storage has been deactivated. To find out why "
"click %shere%s."
msgstr ""
-"링크 테이블을 처리하는 추가 기능이 비활성화되어 있습니다. 원인을 확인하려면 %"
-"s여기를 클릭%s하십시오."
+"링크 테이블을 처리하는 추가 기능이 비활성화되어 있습니다. 원인을 확인하려면 "
+"%s여기를 클릭%s하십시오."
#: db_operations.php:584
msgid "Edit or export relational schema"
@@ -622,8 +623,8 @@ msgstr "트래킹이 활성화되어 있지 않습니다."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -868,8 +869,8 @@ msgstr ""
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1428,7 +1429,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2275,8 +2276,8 @@ msgstr "%s에 오셨습니다"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"설정 파일을 생성하지 않은 것 같습니다. %1$ssetup script%2$s 를 사용해 설정 파"
"일을 생성할 수 있습니다."
@@ -2419,13 +2420,13 @@ msgstr ""
msgid "Tables"
msgstr "테이블 수"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2700,11 +2701,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3200,7 +3201,6 @@ msgstr "압축"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3428,9 +3428,9 @@ msgid "Customize default options"
msgstr ""
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV 데이터"
@@ -4969,59 +4969,45 @@ msgstr "인증중입니다..."
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
#, fuzzy
#| msgid "Custom color"
msgid "Custom"
msgstr "사용자 지정 색상"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
#, fuzzy
msgid "Database export options"
msgstr "데이터베이스 사용량 통계"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "MS엑셀 CSV 데이터"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5296,8 +5282,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5507,13 +5493,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6012,8 +5996,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6051,7 +6035,6 @@ msgstr "줄(열) 구분자"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr ""
@@ -6388,7 +6371,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7503,13 +7485,6 @@ msgstr ""
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Usage"
-msgctxt "PDF"
-msgid "page"
-msgstr "사용법(량)"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8067,8 +8042,8 @@ msgid ""
"The phpMyAdmin configuration storage is not completely configured, some "
"extended features have been deactivated. To find out why click %shere%s."
msgstr ""
-"링크 테이블을 처리하는 추가 기능이 비활성화되어 있습니다. 원인을 확인하려면 %"
-"s여기를 클릭%s하십시오."
+"링크 테이블을 처리하는 추가 기능이 비활성화되어 있습니다. 원인을 확인하려면 "
+"%s여기를 클릭%s하십시오."
#: main.php:314
msgid ""
@@ -8098,7 +8073,7 @@ msgstr "데이터베이스가 없습니다"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "테이블명"
#: navigation.php:303 navigation.php:304
@@ -8815,8 +8790,8 @@ msgstr "사용자명과 같은 이름의 데이터베이스를 삭제"
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
@@ -11223,6 +11198,12 @@ msgstr "뷰 이름"
msgid "Rename view to"
msgstr "테이블 이름 바꾸기"
+#, fuzzy
+#~| msgid "Usage"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "사용법(량)"
+
#~ msgid "Begin"
#~ msgstr "처음"
diff --git a/po/lt.po b/po/lt.po
index c7e17a9..a2967f3 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,16 +3,16 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-08-08 18:05+0200\n"
"Last-Translator: Kęstutis <forkik(a)gmail.com>\n"
"Language-Team: lithuanian <lt(a)li.org>\n"
+"Language: lt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.0.5\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -25,6 +25,7 @@ msgstr "Rodyti viską"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Puslapis:"
@@ -615,11 +616,11 @@ msgstr "Sekimas yra neaktyvus."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Šis rodinys turi mažiausiai tiek eilučių. Daugiau informacijos %"
-"sdokumentacijoje%s."
+"Šis rodinys turi mažiausiai tiek eilučių. Daugiau informacijos "
+"%sdokumentacijoje%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -854,11 +855,11 @@ msgstr "Atvaizdis įrašytas faile %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Jūs tikriausiai bandėte įkelti per didelį failą. Prašome perskaityti %"
-"sdokumentaciją%s būdams kaip apeiti šį apribojimą."
+"Jūs tikriausiai bandėte įkelti per didelį failą. Prašome perskaityti "
+"%sdokumentaciją%s būdams kaip apeiti šį apribojimą."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1390,7 +1391,7 @@ msgid "Filters"
msgstr "Filtrai"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filtras"
@@ -2202,8 +2203,8 @@ msgstr "Jūs naudojate %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Jūs dar turbūt nesukūrėte nustatymų failo. Galite pasinaudoti %1$snustatymų "
"skriptu%2$s, kad sukurtumėte failą."
@@ -2351,13 +2352,13 @@ msgstr "padalintas"
msgid "Tables"
msgstr "Lentelės"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2632,11 +2633,11 @@ msgid "Click to toggle"
msgstr "Spustelėkite suskleidimui/atskleidimui"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3134,7 +3135,6 @@ msgstr "Glaudinimas"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Stulpelių pavadinimus įrašyti pirmoje eilutėje"
@@ -3338,9 +3338,9 @@ msgid "Customize default options"
msgstr "Pasirinkti numatytuosius nustatymus"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4918,56 +4918,42 @@ msgstr "Prisijungimo tapatybės nustatymas"
msgid "CSV using LOAD DATA"
msgstr "CSV naudojant LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS darbaknygė"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX darbaknygė"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document skaičiuoklė"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Greitas"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Pritaikytas"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Duomenų bazės eksportavimo nustatymai"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV formatas MS Excel programai"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document rašyklė"
@@ -5222,8 +5208,8 @@ msgstr ", @TABLE@ taps lentelės pavadinimu"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Ši reikšmė interpretuojama naudojant %1$sstrftime%2$s, taigi Jūs galite "
"keisti laiko formatavimą. Taip pat pakeičiamos šios eilutės: %3$s. Kitas "
@@ -5422,13 +5408,11 @@ msgstr "Rūšiuoti pagal raktą"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5929,8 +5913,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -5960,7 +5944,6 @@ msgstr "Eilutės baigiasi simboliu:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Pakeisti NULL į:"
@@ -6304,7 +6287,6 @@ msgid "Go to view"
msgstr "Eiti į rodinį (view)"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7391,13 +7373,6 @@ msgstr "įjungti scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "puslapiai"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8044,7 +8019,7 @@ msgstr "Nėra duomenų bazių"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Pakeisti lentelės rikiavimą pagal:"
#: navigation.php:303 navigation.php:304
@@ -8740,8 +8715,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Pastaba: phpMyAdmin gauna vartotojų teises tiesiai iš MySQL privilegijų "
"lentelės. Šiose lentelėse nurodytos teisės gali skirtis nuo nustatymų "
@@ -10370,9 +10345,9 @@ msgstr ""
#| "You set the [kbd]config[/kbd] authentication type and included username "
#| "and password for auto-login, which is not a desirable option for live "
#| "hosts. Anyone who knows or guesses your phpMyAdmin URL can directly "
-#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1"
-#| "$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/"
-#| "kbd]."
+#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id="
+#| "%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http"
+#| "[/kbd]."
msgid ""
"You set the [kbd]config[/kbd] authentication type and included username and "
"password for auto-login, which is not a desirable option for live hosts. "
@@ -11160,6 +11135,18 @@ msgstr "VIEW pavadinimas"
msgid "Rename view to"
msgstr "Pervadinti rodinį į"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS darbaknygė"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX darbaknygė"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "puslapiai"
+
#~ msgid "Inline Edit"
#~ msgstr "Redaguoti čia"
diff --git a/po/lv.po b/po/lv.po
index 2a320e8..0085203 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-03-12 09:16+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: latvian <lv(a)li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: Translate Toolkit 1.5.3\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -23,6 +23,7 @@ msgstr "Rādīt visu"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Lapas numurs:"
@@ -635,8 +636,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -882,8 +883,8 @@ msgstr "Damps tika saglabāts failā %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1440,7 +1441,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2334,8 +2335,8 @@ msgstr "Laipni lūgti %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2480,13 +2481,13 @@ msgstr ""
msgid "Tables"
msgstr "Tabulas"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2764,11 +2765,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3266,7 +3267,6 @@ msgstr "Kompresija"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3493,9 +3493,9 @@ msgid "Customize default options"
msgstr "Datubāzu eksporta opcijas"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV dati"
@@ -5032,56 +5032,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Datubāzu eksporta opcijas"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV dati MS Excel formātā"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5359,8 +5345,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5570,13 +5556,11 @@ msgstr "Kārtot pēc atslēgas"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6080,8 +6064,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6119,7 +6103,6 @@ msgstr "Rindas atdalītas ar"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6471,7 +6454,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7604,13 +7586,6 @@ msgstr "parādīt/noslēpt piezīmju tafeli"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Usage"
-msgctxt "PDF"
-msgid "page"
-msgstr "Aizņem"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8279,7 +8254,7 @@ msgstr "Nav datubāzu"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Mainīt datu kārtošanas laukus"
#: navigation.php:303 navigation.php:304
@@ -9007,13 +8982,13 @@ msgstr "Dzēst datubāzes, kurām ir tādi paši vārdi, kā lietotājiem."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Piezīme: phpMyAdmin saņem lietotāju privilēģijas pa taisno no MySQL "
"privilēģiju tabilām. Šo tabulu saturs var atšķirties no privilēģijām, ko "
-"lieto serveris, ja tur tika veikti labojumi. Šajā gadījumā ir nepieciešams %"
-"spārlādēt privilēģijas%s pirms Jūs turpināt."
+"lieto serveris, ja tur tika veikti labojumi. Šajā gadījumā ir nepieciešams "
+"%spārlādēt privilēģijas%s pirms Jūs turpināt."
#: server_privileges.php:1851
msgid "The selected user was not found in the privilege table."
@@ -11454,6 +11429,12 @@ msgstr ""
msgid "Rename view to"
msgstr "Pārsaukt tabulu uz"
+#, fuzzy
+#~| msgid "Usage"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "Aizņem"
+
#~ msgid "Begin"
#~ msgstr "Sākums"
diff --git a/po/mk.po b/po/mk.po
index 708132a..e7be413 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-05-19 17:04+0200\n"
"Last-Translator: <sjanevski(a)gmail.com>\n"
"Language-Team: macedonian_cyrillic <mk(a)li.org>\n"
+"Language: mk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: mk\n"
"Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "прикажи ги сите"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Број на страници:"
@@ -634,8 +635,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -876,8 +877,8 @@ msgstr "Содржината на базата на податоци е сочу
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1438,7 +1439,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2332,8 +2333,8 @@ msgstr "%s Добредојдовте"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2479,13 +2480,13 @@ msgstr ""
msgid "Tables"
msgstr "Табели"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2766,11 +2767,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3270,7 +3271,6 @@ msgstr "Компресија"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3497,9 +3497,9 @@ msgid "Customize default options"
msgstr "Опции за извоз на бази на податоци"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV формат"
@@ -5043,56 +5043,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Опции за извоз на бази на податоци"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV за MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5372,8 +5358,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5584,13 +5570,11 @@ msgstr "Подредување по клуч"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6114,8 +6098,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6153,7 +6137,6 @@ msgstr "Линиите се завршуваат со"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6506,7 +6489,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7644,13 +7626,6 @@ msgstr "Вклучи/исклучи работна табела"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "страница"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8341,7 +8316,7 @@ msgstr "Базата на податоци не постои"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Промени го редоследот во табелата"
#: navigation.php:303 navigation.php:304
@@ -9074,8 +9049,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Напомена: phpMyAdmin ги зема привилегиите на корисникот директно од MySQL "
"табелата на привилегии. Содржината на оваа табела табела може да се "
@@ -11523,6 +11498,12 @@ msgid "Rename view to"
msgstr "Промени го името на табелата во "
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "страница"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "Складишта"
diff --git a/po/ml.po b/po/ml.po
index 35b0f04..e73e759 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -5,14 +5,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-02-10 14:03+0100\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: Malayalam <ml(a)li.org>\n"
+"Language: ml\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ml\n"
"X-Generator: Translate Toolkit 1.7.0\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -25,6 +25,7 @@ msgstr ""
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr ""
@@ -605,8 +606,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -840,8 +841,8 @@ msgstr ""
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1355,7 +1356,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2137,8 +2138,8 @@ msgstr ""
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2276,13 +2277,13 @@ msgstr ""
msgid "Tables"
msgstr ""
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2546,11 +2547,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3025,7 +3026,6 @@ msgstr ""
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr ""
@@ -3229,9 +3229,9 @@ msgid "Customize default options"
msgstr ""
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr ""
@@ -4700,56 +4700,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr ""
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr ""
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5002,8 +4988,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5187,13 +5173,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5680,8 +5664,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -5711,7 +5695,6 @@ msgstr ""
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr ""
@@ -6030,7 +6013,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7080,11 +7062,6 @@ msgstr ""
msgid "ltr"
msgstr ""
-#: libraries/select_lang.lib.php:482
-msgctxt "PDF"
-msgid "page"
-msgstr ""
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7627,7 +7604,7 @@ msgid "No databases"
msgstr ""
#: navigation.php:270
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr ""
#: navigation.php:303 navigation.php:304
@@ -8298,8 +8275,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
diff --git a/po/mn.po b/po/mn.po
index 03f36aa..b53c159 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-03-12 09:17+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: mongolian <mn(a)li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: Translate Toolkit 1.5.3\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -23,6 +23,7 @@ msgstr "Бүгдийг харах"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Хуудасны дугаар:"
@@ -635,8 +636,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -875,8 +876,8 @@ msgstr "Асгалт %s файлд хадгалагдсан."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1441,7 +1442,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2344,11 +2345,11 @@ msgstr "%s-д тавтай морилно уу"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
-"Үүний шалтгаан нь магадгүй та тохиргооны файл үүсгээгүй байж болох юм. Та %1"
-"$ssetup script%2$s -ийг ашиглаж нэгийг үүсгэж болно."
+"Үүний шалтгаан нь магадгүй та тохиргооны файл үүсгээгүй байж болох юм. Та "
+"%1$ssetup script%2$s -ийг ашиглаж нэгийг үүсгэж болно."
#: libraries/auth/config.auth.lib.php:109
msgid ""
@@ -2489,13 +2490,13 @@ msgstr ""
msgid "Tables"
msgstr "Хүснэгт"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2780,11 +2781,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3282,7 +3283,6 @@ msgstr "Шахалт"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3506,9 +3506,9 @@ msgid "Customize default options"
msgstr "Асуудлын үр дүнгийн үйлдэл"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5035,58 +5035,44 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr "CSV хэрэглэх нь LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
#, fuzzy
#| msgid "Database export options"
msgid "Database export options"
msgstr "ӨС гаргах сонголтууд"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV өгөгдлийг MS Excel-ээр"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5368,12 +5354,12 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Энэ утга нь %1$sstrftime%2$s -ийг хэрэглэж үүссэн, тиймээс та хугацааны "
-"тогтнолын тэмдэгтийг хэрэглэж болно. Нэмэлтээр дараах хувиргалт байх болно: %"
-"3$s. Бусад бичвэрүүд үүн шиг хадгалагдана."
+"тогтнолын тэмдэгтийг хэрэглэж болно. Нэмэлтээр дараах хувиргалт байх болно: "
+"%3$s. Бусад бичвэрүүд үүн шиг хадгалагдана."
#: libraries/display_export.lib.php:270
msgid "use this for future exports"
@@ -5592,13 +5578,11 @@ msgstr "Түлхүүрээр эрэмбэлэх"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6114,8 +6098,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6153,7 +6137,6 @@ msgstr "Шугамыг төгсгөгч"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6504,7 +6487,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7649,13 +7631,6 @@ msgstr "toggle scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "хуудсууд"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8329,7 +8304,7 @@ msgstr "ӨС байхгүй"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "хүснэгтийн нэр"
#: navigation.php:303 navigation.php:304
@@ -9047,8 +9022,8 @@ msgstr "Хэрэглэгчтэй адил нэртэй өгөгдлийн сан
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Тэмдэглэл: phpMyAdmin нь MySQL-ийн онцгой э u should " өгдлийн сан �увиргалт байх болно: " �े के लिए %1$ssetup script" पया करके %s " + ��
B� ��
B� k�nq+ 6 � � ! � ! p�
B� ��
B� x4�r+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� �/�r+ ujnq+ �r+ �$�r+ �)�r+ ��oq+ x4�r+ ��
B� ��
B� k�nq+ �! �! p�
B� ��
B� H�jr+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� ��
B� ��
B� 8��q+ �p� ��
B� ujnq+ ��oq+ ��
B� ��
B� k�nq+ G H I J K M N O P p�
B� ��
B� H�Ar+ P�
B� �bnq+ ��nq+ p�
B� 0/�r+ ujnq+ @�r+ �� r+ �r+ �$�r+ �)�r+ ��oq+ H�Ar+ P�
B� ��
B� k�nq+ 8�Ar+ P�
B� ��
B� k�nq+ (�Ar+ P�
B� ��
B� k�nq+ �Ar+ P�
B� �
B� k�nq+ �.�r+ ujnq+ �)�r+ ��
B� �8 r+ einq+ �$�r+ ��
B� y8 r+ einq+ �r+ ��
B� Z8 r+ einq+ �� r+ @�r+ �� r+ �r+ �D�r+ �$�r+ �)�r+ ��oq+ 8��q+ ��q+ ��
B� p{ r+ ��
B� p�
B� k�nq+ 5 6 7 8 : < = > ? @ B D p�
B� ��
B� ��q+ ��
B� ujnq+ ��q+ �
B� ��q+ einq+ ��q+ �_@f �S Q��l�� �öq+ ��
B� ��q+ ��
B� ��
B� k�nq+ u]�� 4Q��U^Qʉ� �u������*ēvp�
B� ��
B� H��q+ D�q+ �
B� �PRs+ �PRs+ ���q+ ��
B� ��
B� ��
B� �
B� O�r+ ujnq+ �D�r+ `�
B� �PRs+ 0�
B� ��
B� ���������PRs+ ��
B� рхийн хүснэгтээс хэрэглэгчдийн "
"онцгой эрхийг авна. Хэрэв тэд гараар өөрчлөгдсөн бол эдгээр хүснэгтийн "
@@ -11527,6 +11502,12 @@ msgid "Rename view to"
msgstr ""
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "хуудсууд"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "Хөдөлгүүрүүд"
@@ -11690,8 +11671,8 @@ msgstr ""
#~ "The additional features for working with linked tables have been "
#~ "deactivated. To find out why click %shere%s."
#~ msgstr ""
-#~ "Холбогдсон хүснэгтүүдтэй ажиллах нэмэлт онцлогууд идэвхгүй болжээ. %sЭнд%"
-#~ "s дарж шалгах."
+#~ "Холбогдсон хүснэгтүүдтэй ажиллах нэмэлт онцлогууд идэвхгүй болжээ. %sЭнд"
+#~ "%s дарж шалгах."
#~ msgid "Ignore duplicate rows"
#~ msgstr "Давхардсан мөрүүдийг алгасах"
diff --git a/po/ms.po b/po/ms.po
index 2aa763c..dfcbd5b 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-03-12 09:17+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: malay <ms(a)li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
"X-Generator: Translate Toolkit 1.5.3\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -23,6 +23,7 @@ msgstr "Papar semua"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Muka Surat:"
@@ -637,8 +638,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -881,8 +882,8 @@ msgstr ""
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1430,7 +1431,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2312,8 +2313,8 @@ msgstr "Selamat Datang ke %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2452,13 +2453,13 @@ msgstr ""
msgid "Tables"
msgstr "Jadual-jadual"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2733,11 +2734,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3234,7 +3235,6 @@ msgstr "Mampatan"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3458,9 +3458,9 @@ msgid "Customize default options"
msgstr ""
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "data CSV"
@@ -4981,57 +4981,43 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
#, fuzzy
msgid "Database export options"
msgstr "Statistik pangkalan data"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV untuk sata MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5306,8 +5292,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5515,13 +5501,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6024,8 +6008,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6063,7 +6047,6 @@ msgstr "Baris ditamatkan oleh"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr ""
@@ -6400,7 +6383,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7513,13 +7495,6 @@ msgstr ""
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Usage"
-msgctxt "PDF"
-msgid "page"
-msgstr "Penggunaan"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8127,7 +8102,7 @@ msgstr "Tiada pangkalan data"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Alter table order by"
#: navigation.php:303 navigation.php:304
@@ -8840,8 +8815,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
@@ -11256,6 +11231,12 @@ msgstr ""
msgid "Rename view to"
msgstr "Tukarnama jadual ke"
+#, fuzzy
+#~| msgid "Usage"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "Penggunaan"
+
#~ msgid "Begin"
#~ msgstr "Mula"
diff --git a/po/nb.po b/po/nb.po
index 8bda938..38edc42 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-03-07 11:21+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: norwegian <no(a)li.org>\n"
+"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Vis alle"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Sidenummer:"
@@ -614,8 +615,8 @@ msgstr "Overvåkning er ikke aktiv."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr "Denne visningen har minst dette antall rader. Sjekk %sdocumentation%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -858,8 +859,8 @@ msgstr "Dump har blitt lagret til fila %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Du forsøkte sansynligvis å laste opp en for stor fil. Sjekk %sdokumentasjonen"
"%s for måter å omgå denne begrensningen."
@@ -1434,7 +1435,7 @@ msgid "Filters"
msgstr "Filter"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filter"
@@ -2275,8 +2276,8 @@ msgstr "Velkommen til %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"En mulig årsak for dette er at du ikke opprettet konfigurasjonsfila. Du bør "
"kanskje bruke %1$ssetup script%2$s for å opprette en."
@@ -2425,13 +2426,13 @@ msgstr "delt"
msgid "Tables"
msgstr "Tabeller"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2711,11 +2712,11 @@ msgid "Click to toggle"
msgstr "Klikk for å velge"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3213,7 +3214,6 @@ msgstr "Kompresjon"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Sett inn kolonnenavn i første rad"
@@ -3419,9 +3419,9 @@ msgid "Customize default options"
msgstr "Tilpass standardinstillinger"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV-data"
@@ -5067,56 +5067,42 @@ msgstr "Rekkefølge for vertsautentisering"
msgid "CSV using LOAD DATA"
msgstr "CSV med LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS Workbook"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX Workbook"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document regneark"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Egendefinert"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Databaseeksportinnstillinger"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV for MS Excel data"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document tekst"
@@ -5376,8 +5362,8 @@ msgstr ", @TABLE@ vil bli tabellnavnet"
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Denne verdien blir tolket slik som %1$sstrftime%2$s, så du kan bruke "
"tidformateringsstrenger. I tillegg vil følgende transformasjoner skje: %3$s. "
@@ -5600,13 +5586,11 @@ msgstr "Sorter etter nøkkel"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6157,8 +6141,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6192,7 +6176,6 @@ msgstr "Linker avsluttet med"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Erstatt NULL med:"
@@ -6543,7 +6526,6 @@ msgid "Go to view"
msgstr "Gå til visning"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7710,13 +7692,6 @@ msgstr "slå av/på kladdevindu"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "sider"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7941,8 +7916,8 @@ msgid ""
"For a list of available transformation options and their MIME type "
"transformations, click on %stransformation descriptions%s"
msgstr ""
-"For en liste over tilgjengelige transformasjonsvalg, klikk på %"
-"stransformasjonsbeskrivelser%s"
+"For en liste over tilgjengelige transformasjonsvalg, klikk på "
+"%stransformasjonsbeskrivelser%s"
#: libraries/tbl_properties.inc.php:147
msgid "Transformation options"
@@ -8381,7 +8356,7 @@ msgstr "Ingen databaser"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Endre tabellrekkefølge ved"
#: navigation.php:303 navigation.php:304
@@ -9105,8 +9080,8 @@ msgstr "Slett databasene som har det samme navnet som brukerne."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Merk: phpMyAdmin får brukerprivilegiene direkte fra MySQL "
"privilegietabeller. Innholdet i disse tabellene kan være forskjellig fra de "
@@ -10931,8 +10906,8 @@ msgid ""
"of users, including you, are connected to."
msgstr ""
"Hvis du føler at dette er nødvending, så bruk ekstra "
-"beskyttelsesinnstillinger - [a@?page=servers&mode=edit&id=%1"
-"$d#tab_Server_config]vertsautentisering[/a] innstillinger og [a@?"
+"beskyttelsesinnstillinger - [a@?page=servers&mode=edit&id="
+"%1$d#tab_Server_config]vertsautentisering[/a] innstillinger og [a@?"
"page=form&formset=features#tab_Security]godkjente mellomlagerliste[/a]. "
"Merk at IP-basert beskyttelse ikke er så god hvis din IP tilhører en "
"Internettilbyder som har tusenvis av brukere, inkludert deg, tilknyttet."
@@ -10943,9 +10918,9 @@ msgstr ""
#| "You set the [kbd]config[/kbd] authentication type and included username "
#| "and password for auto-login, which is not a desirable option for live "
#| "hosts. Anyone who knows or guesses your phpMyAdmin URL can directly "
-#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1"
-#| "$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/"
-#| "kbd]."
+#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id="
+#| "%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http"
+#| "[/kbd]."
msgid ""
"You set the [kbd]config[/kbd] authentication type and included username and "
"password for auto-login, which is not a desirable option for live hosts. "
@@ -11798,6 +11773,18 @@ msgstr "VIEW navn"
msgid "Rename view to"
msgstr "Endre tabellens navn"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS Workbook"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX Workbook"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "sider"
+
#~ msgid "Inline Edit"
#~ msgstr "Inline Edit"
diff --git a/po/nl.po b/po/nl.po
index e728db6..4a2af10 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-06-04 15:19+0200\n"
"Last-Translator: Dieter Adriaenssens <ruleant(a)users.sourceforge.net>\n"
"Language-Team: dutch <nl(a)li.org>\n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Toon alles"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Paginanummer:"
@@ -615,8 +616,8 @@ msgstr "Tracking is niet actief."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Deze view heeft minimaal deze hoeveelheid aan rijen. Zie de %sdocumentatie%s."
@@ -855,11 +856,11 @@ msgstr "Dump is bewaard als %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"U probeerde waarschijnlijk een bestand dat te groot is te uploaden. Zie de %"
-"sdocumentatie%s voor mogelijkheden om dit te omzeilen."
+"U probeerde waarschijnlijk een bestand dat te groot is te uploaden. Zie de "
+"%sdocumentatie%s voor mogelijkheden om dit te omzeilen."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1429,7 +1430,7 @@ msgid "Filters"
msgstr "Filter"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filter"
@@ -2256,8 +2257,8 @@ msgstr "Welkom op %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"U heeft waarschijnlijk geen configuratiebestand aangemaakt. Het beste kunt u "
"%1$ssetup script%2$s gebruiken om een te maken."
@@ -2409,13 +2410,13 @@ msgstr "gedeeld"
msgid "Tables"
msgstr "Tabellen"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2698,11 +2699,11 @@ msgid "Click to toggle"
msgstr "Klik om te selecteren"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3205,7 +3206,6 @@ msgstr "Compressie"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Plaats veldnamen in de eerste rij"
@@ -3412,9 +3412,9 @@ msgid "Customize default options"
msgstr "Aanpassen standaard opties"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV gegevens"
@@ -5064,56 +5064,42 @@ msgstr "Signon authenticatie"
msgid "CSV using LOAD DATA"
msgstr "CSV met behulp van LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS Werkboek"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX Werkboek"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document rekenblad"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Snel"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Aangepast"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Database export opties"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV voor MS Excel data"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document Tekst"
@@ -5378,13 +5364,13 @@ msgstr ", @TABLE@ wordt vervangen door de tabel naam"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Deze waarde wordt geïnterpreteerd met behulp van %1$sstrftime%2$s, het "
"gebruik van opmaakcodes is dan ook toegestaan. Daarnaast worden de volgende "
-"vertalingen toegepast: %3$s. Overige tekst zal gelijk blijven. Zie %4$sFAQ%5"
-"$s voor meer details."
+"vertalingen toegepast: %3$s. Overige tekst zal gelijk blijven. Zie %4$sFAQ"
+"%5$s voor meer details."
#: libraries/display_export.lib.php:270
msgid "use this for future exports"
@@ -5590,13 +5576,11 @@ msgstr "Sorteren op sleutel"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6155,11 +6139,11 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
-"Documentatie en meer informatie over PBXT kan gevonden worden op de %"
-"sPrimeBase XT home pagina%s."
+"Documentatie en meer informatie over PBXT kan gevonden worden op de "
+"%sPrimeBase XT home pagina%s."
#: libraries/engines/pbxt.lib.php:129
msgid "The PrimeBase XT Blog by Paul McCullagh"
@@ -6188,7 +6172,6 @@ msgstr "Regels beëindigd door:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Vervang NULL door:"
@@ -6540,7 +6523,6 @@ msgid "Go to view"
msgstr "Ga naar view"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7700,13 +7682,6 @@ msgstr "Aan/uit voorbeeldkader"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "pagina's"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8359,7 +8334,9 @@ msgid "No databases"
msgstr "Geen databases"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Filter tabellen op naam"
#: navigation.php:303 navigation.php:304
@@ -9067,8 +9044,8 @@ msgstr "Verwijder de databases die dezelfde naam hebben als de gebruikers."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Opmerking: phpMyAdmin krijgt de rechten voor de gebruikers uit de MySQL "
"privileges tabel. De content van deze tabel kan verschillen met de rechten "
@@ -11709,6 +11686,18 @@ msgstr "VIEW-naam"
msgid "Rename view to"
msgstr "Hernoem view naar"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS Werkboek"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX Werkboek"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "pagina's"
+
# "Inline" vertaalt naar "rechtstreeks in het document", als het ware binnen
# iets anders.
#~ msgid "Inline Edit"
diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot
index 2ed450f..d8292bb 100644
--- a/po/phpmyadmin.pot
+++ b/po/phpmyadmin.pot
@@ -8,10 +8,11 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -27,6 +28,7 @@ msgstr ""
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr ""
@@ -607,8 +609,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, possible-php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -842,8 +844,8 @@ msgstr ""
#: import.php:57
#, possible-php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1357,7 +1359,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2139,8 +2141,8 @@ msgstr ""
#: libraries/auth/config.auth.lib.php:100
#, possible-php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2278,13 +2280,13 @@ msgstr ""
msgid "Tables"
msgstr ""
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2453,6 +2455,7 @@ msgid "Inline edit of this query"
msgstr ""
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr ""
@@ -2547,11 +2550,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3026,7 +3029,6 @@ msgstr ""
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr ""
@@ -3230,9 +3232,9 @@ msgid "Customize default options"
msgstr ""
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr ""
@@ -4701,56 +4703,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr ""
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr ""
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5003,8 +4991,8 @@ msgstr ""
#, possible-php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5188,13 +5176,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5681,8 +5667,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, possible-php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -5712,7 +5698,6 @@ msgstr ""
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr ""
@@ -6031,7 +6016,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7081,11 +7065,6 @@ msgstr ""
msgid "ltr"
msgstr ""
-#: libraries/select_lang.lib.php:482
-msgctxt "PDF"
-msgid "page"
-msgstr ""
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, possible-php-format
@@ -7628,7 +7607,7 @@ msgid "No databases"
msgstr ""
#: navigation.php:270
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr ""
#: navigation.php:303 navigation.php:304
@@ -8299,8 +8278,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
diff --git a/po/pl.po b/po/pl.po
index 3d70be9..1f7f298 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-02-24 16:21+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: polish <pl(a)li.org>\n"
+"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -25,6 +25,7 @@ msgstr "Pokaż wszystko"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Numer strony:"
@@ -625,11 +626,11 @@ msgstr "Monitorowanie nie jest aktywne."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Ta perspektywa ma przynajmniej tyle wierszy. Więcej informacji w %"
-"sdocumentation%s."
+"Ta perspektywa ma przynajmniej tyle wierszy. Więcej informacji w "
+"%sdocumentation%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -866,8 +867,8 @@ msgstr "Zrzut został zapisany do pliku %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Prawdopodobnie próbowano wrzucić duży plik. Aby poznać sposoby obejścia tego "
"limitu, proszę zapoznać się z %sdokumenacją%s."
@@ -1446,7 +1447,7 @@ msgid "Filters"
msgstr "Filtr"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filtr"
@@ -2315,8 +2316,8 @@ msgstr "Witamy w %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Prawdopodobnie powodem jest brak utworzonego pliku konfiguracyjnego. Do jego "
"stworzenia można użyć %1$sskryptu instalacyjnego%2$s."
@@ -2465,13 +2466,13 @@ msgstr "współdzielone"
msgid "Tables"
msgstr "Tabele"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2760,11 +2761,11 @@ msgid "Click to toggle"
msgstr "Kliknij, aby zaznaczyć"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3273,7 +3274,6 @@ msgstr "Typ kompresji"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3496,9 +3496,9 @@ msgid "Customize default options"
msgstr "Indywidualizacja opcji eksportu"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5166,58 +5166,44 @@ msgstr "Typ uwierzytelniania"
msgid "CSV using LOAD DATA"
msgstr "CSV przy użyciu LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Skoroszyt Excel 97-2003 XLS"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Skoroszyt Excel 2007 XLSX"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Arkusz kalkulacyjny OpenDocument"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Szybko"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
#, fuzzy
#| msgid "Custom color"
msgid "Custom"
msgstr "Własny kolor"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Opcje eksportu bazy danych"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV dla MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Tekst w formacie Open Document"
@@ -5513,8 +5499,8 @@ msgstr ", @TABLE@ zostanie zastąpione nazwą wybranej tabeli"
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Interpretacja tej wartości należy do funkcji %1$sstrftime%2$s i można użyć "
"jej napisów formatujących. Dodatkowo zostaną zastosowane następujące "
@@ -5752,13 +5738,11 @@ msgstr "Sortuj wg klucza"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6313,8 +6297,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6352,7 +6336,6 @@ msgstr "Linie zakończone przez"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6712,7 +6695,6 @@ msgid "Go to view"
msgstr "Przejdź do widoku"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7892,13 +7874,6 @@ msgstr "włącz / wyłącz scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "stron"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8084,8 +8059,8 @@ msgid ""
"installed the necessary PHP extensions as described in the %sdocumentation%s."
msgstr ""
"Analizator składni SQL nie mógł zostać zainicjowany. Sprawdź, czy "
-"zainstalowane są niezbędne rozszerzenia PHP, tak jak zostało to opisane w %"
-"sdokumentacji%s."
+"zainstalowane są niezbędne rozszerzenia PHP, tak jak zostało to opisane w "
+"%sdokumentacji%s."
#: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
msgid "Table seems to be empty!"
@@ -8135,8 +8110,8 @@ msgid ""
"For a list of available transformation options and their MIME type "
"transformations, click on %stransformation descriptions%s"
msgstr ""
-"Aby uzyskać listę dostępnych opcji transformacji i ich typów MIME, kliknij %"
-"sopisy transformacji%s"
+"Aby uzyskać listę dostępnych opcji transformacji i ich typów MIME, kliknij "
+"%sopisy transformacji%s"
#: libraries/tbl_properties.inc.php:147
msgid "Transformation options"
@@ -8616,8 +8591,8 @@ msgid ""
"Server running with Suhosin. Please refer to %sdocumentation%s for possible "
"issues."
msgstr ""
-"Serwer działa pod ochroną Suhosina. Możliwe problemy opisuje %sdokumentacja%"
-"s."
+"Serwer działa pod ochroną Suhosina. Możliwe problemy opisuje %sdokumentacja"
+"%s."
#: navigation.php:180 server_databases.php:280 server_synchronize.php:1152
msgid "No databases"
@@ -8626,7 +8601,7 @@ msgstr "Brak baz danych"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Sortowanie tabeli wg"
#: navigation.php:303 navigation.php:304
@@ -9356,8 +9331,8 @@ msgstr "Usuń bazy danych o takich samych nazwach jak użytkownicy."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Uwaga: phpMyAdmin pobiera uprawnienia użytkowników wprost z tabeli uprawnień "
"MySQL-a. Zawartość tej tabeli, jeśli zostały w niej dokonane ręczne zmiany, "
@@ -11198,8 +11173,8 @@ msgid ""
"of users, including you, are connected to."
msgstr ""
"Jeżeli wydaje się to konieczne, można użyć dodatkowych ustawień "
-"bezpieczeństwa — [a@?page=servers&mode=edit&id=%1"
-"$d#tab_Server_config]uwierzytelniania na podstawie hosta[/a] i [a@?"
+"bezpieczeństwa — [a@?page=servers&mode=edit&id="
+"%1$d#tab_Server_config]uwierzytelniania na podstawie hosta[/a] i [a@?"
"page=form&formset=features#tab_Security]listy zaufanych serwerów proxy[/"
"a]. Jednakże ochrona oparta na adresy IP może nie być wiarygodna, jeżeli "
"używany IP należy do ISP, do którego podłączonych jest tysiące użytkowników."
@@ -11210,9 +11185,9 @@ msgstr ""
#| "You set the [kbd]config[/kbd] authentication type and included username "
#| "and password for auto-login, which is not a desirable option for live "
#| "hosts. Anyone who knows or guesses your phpMyAdmin URL can directly "
-#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1"
-#| "$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/"
-#| "kbd]."
+#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id="
+#| "%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http"
+#| "[/kbd]."
msgid ""
"You set the [kbd]config[/kbd] authentication type and included username and "
"password for auto-login, which is not a desirable option for live hosts. "
@@ -12080,6 +12055,18 @@ msgstr "Nazwa widoku"
msgid "Rename view to"
msgstr "Zmień nazwę perspektywy na"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Skoroszyt Excel 97-2003 XLS"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Skoroszyt Excel 2007 XLSX"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "stron"
+
#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
diff --git a/po/pt.po b/po/pt.po
index bd0e0a5..c14dc25 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-03-26 03:23+0200\n"
"Last-Translator: <efgpinto(a)gmail.com>\n"
"Language-Team: portuguese <pt(a)li.org>\n"
+"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Mostrar tudo"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Número de página:"
@@ -617,11 +618,11 @@ msgstr "Detecção de Alterações está desactivada."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Esta vista tem número de linhas aproximado. Por favor, consulte a %"
-"sdocumentação%s."
+"Esta vista tem número de linhas aproximado. Por favor, consulte a "
+"%sdocumentação%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -862,8 +863,8 @@ msgstr "O Dump foi gravado para o ficheiro %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Provavelmente tentou efectuar o importar um ficheiro demasiado grande. Por "
"favor reveja a %sdocumentação%s para encontrar formas de contornar este "
@@ -1433,7 +1434,7 @@ msgid "Filters"
msgstr "Qtd Campos"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
#, fuzzy
msgid "Filter"
msgstr "Qtd Campos"
@@ -2309,11 +2310,11 @@ msgstr "Bemvindo ao %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
-"Provavelmente um ficheiro de configuração não foi criado. O %1$ssetup script%"
-"2$s pode ser utilizado para criar um."
+"Provavelmente um ficheiro de configuração não foi criado. O %1$ssetup script"
+"%2$s pode ser utilizado para criar um."
#: libraries/auth/config.auth.lib.php:109
msgid ""
@@ -2454,13 +2455,13 @@ msgstr ""
msgid "Tables"
msgstr "Tabelas"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2738,11 +2739,11 @@ msgid "Click to toggle"
msgstr "Clique para seleccionar"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3240,7 +3241,6 @@ msgstr "Compressão"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3469,9 +3469,9 @@ msgid "Customize default options"
msgstr "Opções de exportação da Base de Dados"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "Dados CSV"
@@ -5015,56 +5015,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Opções de exportação da Base de Dados"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "dados CSV para MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5342,8 +5328,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5552,13 +5538,11 @@ msgstr "Ordenar por chave"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6062,8 +6046,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6101,7 +6085,6 @@ msgstr "Linhas terminadas por"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/ /excel.php:23 on the " n: " ." " ers." идэвхгүй болжээ. %sЭнд" " �े के लिए %1$ssetup script" पया करके %s " + ��
B� ��
B� k�nq+ 6 � � ! � ! p�
B� ��
B� x4�r+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� �/�r+ ujnq+ �r+ �$�r+ �)�r+ ��oq+ x4�r+ ��
B� ��
B� k�nq+ �! �! p�
B� ��
B� H�jr+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� ��
B� ��
B� 8��q+ �p� ��
B� ujnq+ ��oq+ ��
B� ��
B� k�nq+ G H I J K M N O P p�
B� ��
B� H�Ar+ P�
B� �bnq+ ��nq+ p�
B� 0/�r+ ujnq+ @�r+ �� r+ �r+ �$�r+ �)�r+ ��oq+ H�Ar+ P�
B� ��
B� k�nq+ 8�Ar+ P�
B� ��
B� k�nq+ (�Ar+ P�
B� ��
B� k�nq+ �Ar+ P�
B� �
B� k�nq+ �.�r+ ujnq+ �)�r+ ��
B� �8 r+ einq+ �$�r+ ��
B� y8 r+ einq+ �r+ ��
B� Z8 r+ einq+ �� r+ @�r+ �� r+ �r+ �D�r+ �$�r+ �)�r+ ��oq+ 8��q+ ��q+ ��
B� p{ r+ ��
B� p�
B� k�nq+ 5 6 7 8 : < = > ? @ B D p�
B� ��
B� ��q+ ��
B� ujnq+ ��q+ �
B� ��q+ einq+ ��q+ �_@f �S Q��l�� �öq+ ��
B� ��q+ ��
B� ��
B� k�nq+ u]�� 4Q��U^Qʉ� �u������*ēvp�
B� ��
B� H��q+ D�q+ �
B� �PRs+ �PRs+ ���q+ ��
B� ��
B� ��
B� �
B� O�r+ ujnq+ �D�r+ `�
B� �PRs+ 0�
B� ��
B� ���������PRs+ ��
B� export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6448,7 +6431,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7579,13 +7561,6 @@ msgstr ""
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Usage"
-msgctxt "PDF"
-msgid "page"
-msgstr "Utilização"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8203,7 +8178,7 @@ msgstr "Sem bases de dados"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Alterar a ordem da tabela por"
#: navigation.php:303 navigation.php:304
@@ -8926,8 +8901,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Nota: O phpMyAdmin recebe os privilégios dos utilizadores directamente da "
"tabela de privilégios do MySQL. O conteúdo destas tabelas pode diferir dos "
@@ -11363,6 +11338,12 @@ msgstr ""
msgid "Rename view to"
msgstr "Renomeia a vista para "
+#, fuzzy
+#~| msgid "Usage"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "Utilização"
+
#~ msgid "Inline Edit"
#~ msgstr "Editar em linha"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 92979b3..fc5be66 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-07-30 02:20+0200\n"
"Last-Translator: Julio Cesar Zuppa <juliozuppa(a)gmail.com>\n"
"Language-Team: brazilian_portuguese <pt_BR(a)li.org>\n"
+"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Mostrar todos"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Numero da página:"
@@ -612,11 +613,11 @@ msgstr "Rastreamento não está ativo."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
-"Esta visão tem pelo menos esse número de linhas. Por favor, consulte a %"
-"sdocumentação%s."
+"Esta visão tem pelo menos esse número de linhas. Por favor, consulte a "
+"%sdocumentação%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
#: libraries/tbl_info.inc.php:60 tbl_structure.php:210
@@ -851,8 +852,8 @@ msgstr "Dump foi salvo no arquivo %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Você provavelmente tentou carregar um arquivo muito grande. Veja referências "
"na %sdocumentation%s para burlar esses limites."
@@ -1420,7 +1421,7 @@ msgid "Filters"
msgstr "Filtro"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filtro"
@@ -2256,8 +2257,8 @@ msgstr "Bem vindo ao %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"A provável razão para isso é que você não criou o arquivo de configuração. "
"Você deve usar o %1$ssetup script%2$s para criar um."
@@ -2405,13 +2406,13 @@ msgstr "compartilhado"
msgid "Tables"
msgstr "Tabelas"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2690,11 +2691,11 @@ msgid "Click to toggle"
msgstr "Clique para alternar"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3198,7 +3199,6 @@ msgstr "Compressão"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3413,9 +3413,9 @@ msgid "Customize default options"
msgstr "Personalizar opções padrão"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4942,56 +4942,42 @@ msgstr "Falha na autenticação de hardware"
msgid "CSV using LOAD DATA"
msgstr "CSV usando LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Planilha Open Document"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Opções de exportação do Banco de Dados"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV para dados MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Abrir Documento de Texto"
@@ -5264,8 +5250,8 @@ msgstr ", @TABLE@ se tornará o nome da tabela"
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Esse valor é interpretado usando %1$sstrftime%2$s, então você pode usar as "
"strings de formatação de tempo. Adicionalmente a seguinte transformação "
@@ -5479,13 +5465,11 @@ msgstr "Ordenar pela chave"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6006,8 +5990,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6039,7 +6023,6 @@ msgstr "Linhas terminadas com:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Substituir NULL com:"
@@ -6389,7 +6372,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7542,13 +7524,6 @@ msgstr "mudar o estado do Scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "páginas"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8248,7 +8223,7 @@ msgstr "Sem bases"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Alterar tabela ordenada por"
#: navigation.php:303 navigation.php:304
@@ -8976,8 +8951,8 @@ msgstr "Eliminar o Banco de Dados que possui o mesmo nome dos usuários."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Nota: O phpMyAdmin recebe os privilégios dos usuário diretamente da tabela "
"de privilégios do MySQL. O conteúdo destas tabelas pode divergir dos "
@@ -11577,6 +11552,12 @@ msgstr "Nome da VISÃO"
msgid "Rename view to"
msgstr "Renomear a visão para "
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "páginas"
+
#~ msgid "Inline Edit"
#~ msgstr "Editar linha"
diff --git a/po/ro.po b/po/ro.po
index a9b72dd..877b467 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-07-22 02:28+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: romanian <ro(a)li.org>\n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
"20)) ? 1 : 2);;\n"
"X-Generator: Pootle 2.0.1\n"
@@ -25,6 +25,7 @@ msgstr "Arată toate"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Numărul paginii:"
@@ -639,8 +640,8 @@ msgstr "Monitorizarea nu este activată"
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Această vedere are minim acest număr de rânduri. Vedeți %sdocumentation%s."
@@ -890,11 +891,11 @@ msgstr "Copia a fost salvată în fișierul %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Probabil ați încercat să încărcați un fișier prea mare. Faceți referire la %"
-"sdocumentație%s pentru căi de ocolire a acestei limite."
+"Probabil ați încercat să încărcați un fișier prea mare. Faceți referire la "
+"%sdocumentație%s pentru căi de ocolire a acestei limite."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1471,7 +1472,7 @@ msgid "Filters"
msgstr "Fișiere"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
#, fuzzy
msgid "Filter"
msgstr "Fișiere"
@@ -2371,8 +2372,8 @@ msgstr "Bine ați venit la %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Motivul probabil pentru aceasta este că nu ați creat un fișier de "
"configurare. Puteți folosi %1$s vrăjitorul de setări %2$s pentru a crea un "
@@ -2522,13 +2523,13 @@ msgstr ""
msgid "Tables"
msgstr "Tabele"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2818,11 +2819,11 @@ msgid "Click to toggle"
msgstr "Click pentru a selecta"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3325,7 +3326,6 @@ msgstr "Compresie"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3553,9 +3553,9 @@ msgid "Customize default options"
msgstr "Opțiuni de exportare a bazei de date"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5120,58 +5120,44 @@ msgstr "Tipul autentificării"
msgid "CSV using LOAD DATA"
msgstr "CSV folosind LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Foaie de calcul Open Document"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
#, fuzzy
#| msgid "Custom color"
msgid "Custom"
msgstr "Culoare personalizată"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Opțiuni de exportare a bazei de date"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "Date CSV pentru MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Text Open Document"
@@ -5457,12 +5443,12 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is."
#: libraries/display_export.lib.php:270
msgid "use this for future exports"
@@ -5686,13 +5672,11 @@ msgstr "Sortare după cheie"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6247,8 +6231,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6286,7 +6270,6 @@ msgstr "Linii terminate de"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6636,7 +6619,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7793,13 +7775,6 @@ msgstr "dezactivare scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "pagini"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8506,7 +8481,7 @@ msgstr "Nu sînt baze de date"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "nume tabel"
#: navigation.php:303 navigation.php:304
@@ -9244,8 +9219,8 @@ msgstr "Aruncă baza de date care are același nume ca utilizatorul."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Notă: phpMyAdmin folosește privilegiile utilizatorilor direct din tabelul de "
"privilegii din MySQL. Conținutul acestui tabel poate diferi de cel original. "
@@ -11812,6 +11787,12 @@ msgid "Rename view to"
msgstr "Redenumire tabel la"
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "pagini"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "Motoare"
diff --git a/po/ru.po b/po/ru.po
index 00185ab..fdab0d0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,16 +3,16 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-07-03 19:50+0200\n"
"Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n"
"Language-Team: russian <ru(a)li.org>\n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.0.5\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -25,6 +25,7 @@ msgstr "Показать все"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Номер страницы:"
@@ -617,8 +618,8 @@ msgstr "Слежение выключено."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Данное представление имеет, по меньшей мере, указанное количество строк. "
"Пожалуйста, обратитесь к %sдокументации%s."
@@ -856,8 +857,8 @@ msgstr "Дамп был сохранен в файл %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Вероятно, размер загружаемого файла слишком велик. Способы обхода данного "
"ограничения описаны в %sдокументации%s."
@@ -1420,7 +1421,7 @@ msgid "Filters"
msgstr "Фильтр"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Фильтр"
@@ -2248,8 +2249,8 @@ msgstr "Добро пожаловать в %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Возможная причина - отсутствие файла конфигурации. Для его создания вы "
"можете воспользоваться %1$sсценарием установки%2$s."
@@ -2396,13 +2397,13 @@ msgstr "общий"
msgid "Tables"
msgstr "Таблицы"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2686,11 +2687,11 @@ msgid "Click to toggle"
msgstr "Выделение"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3193,7 +3194,6 @@ msgstr "Упаковать"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Поместить названия полей в первой строке"
@@ -3403,9 +3403,9 @@ msgid "Customize default options"
msgstr "Настройте параметры экспорта используемые по умолчанию"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5059,56 +5059,42 @@ msgstr "Авторизация с помощью Signon"
msgid "CSV using LOAD DATA"
msgstr "CSV, используя LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS Workbook"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX Workbook"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document Spreadsheet"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Быстро"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Обычно"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Параметры экспорта базы данных"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV для MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "OpenDocument текст"
@@ -5373,8 +5359,8 @@ msgstr ", @TABLE@ будет замещено именем таблицы"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Значение обрабатывается функцией %1$sstrftime%2$s, благодаря чему возможна "
"вставка текущей даты и времени. Дополнительно могут быть использованы "
@@ -5582,13 +5568,11 @@ msgstr "Сортировать по индексу"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6144,8 +6128,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
"Документацию и дальнейшую информацию по PBXT смотрите на %sдомашней странице "
"PrimeBase XT%s."
@@ -6177,7 +6161,6 @@ msgstr "Разделитель строк:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Заменить NULL на:"
@@ -6530,7 +6513,6 @@ msgid "Go to view"
msgstr "Перейти к представлению (VIEW)"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7683,13 +7665,6 @@ msgstr "Отображение"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "страниц"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8337,7 +8312,9 @@ msgid "No databases"
msgstr "Базы данных отсутствуют"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "фильтровать таблицы по имени"
#: navigation.php:303 navigation.php:304
@@ -9032,8 +9009,8 @@ msgstr "Удалить базы данных, имена которых совп
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Примечание: phpMyAdmin получает информацию о пользовательских привилегиях "
"непосредственно из таблиц привилегий MySQL. Содержимое этих таблиц может "
@@ -10845,8 +10822,8 @@ msgid ""
"protection may not be reliable if your IP belongs to an ISP where thousands "
"of users, including you, are connected to."
msgstr ""
-"При необходимости используйте дополнительные настройки безопасности - %"
-"sидентификация по хосту%s и %sсписок доверенных прокси серверов%s. Однако, "
+"При необходимости используйте дополнительные настройки безопасности - "
+"%sидентификация по хосту%s и %sсписок доверенных прокси серверов%s. Однако, "
"защита по IP может быть ненадежной, если ваш IP не является выделенным и "
"кроме вас принадлежит тысячам пользователей того же Интернет Провайдера."
@@ -11637,6 +11614,18 @@ msgstr "VIEW название"
msgid "Rename view to"
msgstr "Переименовать представление в"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS Workbook"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX Workbook"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "страниц"
+
#~ msgid "Inline Edit"
#~ msgstr "Быстрая правка"
diff --git a/po/si.po b/po/si.po
index c3eadb1..5d687ac 100644
--- a/po/si.po
+++ b/po/si.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-06-04 15:35+0200\n"
"Last-Translator: Madhura Jayaratne <madhura.cj(a)gmail.com>\n"
"Language-Team: sinhala <si(a)li.org>\n"
+"Language: si\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: si\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "සියල්ල පෙන්වන්න"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "පිටු අංකය:"
@@ -613,8 +614,8 @@ msgstr "අවධානය අක්රීයයි."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"මෙම දසුනේ අවම වශයෙන් පේළි මෙතරම් සංඛයාවක් ඇත. කරුණාකර %s ලේඛනය %s අධ්යනය කරන්න."
@@ -851,11 +852,11 @@ msgstr "%s ගොනුවට නික්ෂේප දත්ත සුරකි
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1416,7 +1417,7 @@ msgid "Filters"
msgstr "ක්ෂේත්ර"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
#, fuzzy
msgid "Filter"
msgstr "ක්ෂේත්ර"
@@ -2246,8 +2247,8 @@ msgstr "%s වෙත ආයුබෝවන්"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Probably reason of this is that you did not create configuration file. You "
"might want to use %1$ssetup script%2$s to create one."
@@ -2393,13 +2394,13 @@ msgstr "හවුල්"
msgid "Tables"
msgstr "වගු"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2679,11 +2680,11 @@ msgid "Click to toggle"
msgstr "තේරීමට ක්ලික් කරන්න"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3165,7 +3166,6 @@ msgstr "Compression"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "තීර නම් පළමු පේළියේ යොදන්න"
@@ -3371,9 +3371,9 @@ msgid "Customize default options"
msgstr "පෙරනිමි විකල්ප රිසි සේ සකසන්න"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4882,56 +4882,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr "CSV using LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document Spreadsheet"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "දත්තගබඩා අපනයන විකල්ප"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "MS එක්සෙල් සඳහා CSV"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "මෛක්රොසොෆ්ට් වර්ඩ් 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document Text"
@@ -5196,12 +5182,12 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
#: libraries/display_export.lib.php:270
msgid "use this for future exports"
@@ -5407,13 +5393,11 @@ msgstr "යතුර අනුව තෝරන්න"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5930,8 +5914,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -5961,7 +5945,6 @@ msgstr "පේළි අවසන් කිරීමේ සළකුණ:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6306,7 +6289,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7458,13 +7440,6 @@ msgstr "Toggle scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "පිටු"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7946,8 +7921,8 @@ msgid ""
"Your preferences will be saved for current session only. Storing them "
"permanently requires %sphpMyAdmin configuration storage%s."
msgstr ""
-"මෙම සැසිය සඳහා පමණක් ඔබගේ තෝරාගැනීම් සුරැකේ. තෝරාගැනීම් ස්ථාවරව සුරැකීම සඳහා %"
-"sphpMyAdmin වින්යාස ගබඩාව%s අවශ්යය."
+"මෙම සැසිය සඳහා පමණක් ඔබගේ තෝරාගැනීම් සුරැකේ. තෝරාගැනීම් ස්ථාවරව සුරැකීම සඳහා "
+"%sphpMyAdmin වින්යාස ගබඩාව%s අවශ්යය."
#: libraries/user_preferences.lib.php:112
msgid "Could not save configuration"
@@ -8133,7 +8108,7 @@ msgstr "දත්තගබඩා නොමැත"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "වගුවේ නම"
#: navigation.php:303 navigation.php:304
@@ -8826,8 +8801,8 @@ msgstr "භාවිතා කරන්නන් හා සමාන නම්
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"සටහන: phpMyAdmin භාවිත කරන්නන්ගේ වරප්රසාද ලබාගනුයේ MySQL හි වරප්රසාද වගුවෙනි. "
"සේවාදායකයේ වරප්රසාද වෙනම ම වෙනස් කර ඇත්නම් ඉහත වගුවේ දත්ත සේවාදායකයේ වරප්රසාද වලට "
@@ -11371,6 +11346,12 @@ msgstr "දසුනේ නම"
msgid "Rename view to"
msgstr "දසුනේ නම වෙනස් කරන්න"
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "පිටු"
+
#~ msgid "Inline Edit"
#~ msgstr "පේළිගත සංස්කරණය"
diff --git a/po/sk.po b/po/sk.po
index 3bee046..9ac0d1f 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-07-27 15:32+0200\n"
"Last-Translator: Martin Lacina <martin(a)whistler.sk>\n"
"Language-Team: slovak <sk(a)li.org>\n"
+"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Zobraziť všetko"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Číslo stránky:"
@@ -615,8 +616,8 @@ msgstr "Sledovanie nie je aktívne."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Tento pohľad má aspoň toľko riadok. Podrobnosti nájdete v %sdokumentaci%s."
@@ -853,8 +854,8 @@ msgstr "Výpis bol uložený do súboru %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Pravdepodobne ste sa pokúsili uploadnuť príliš veľký súbor. Prečítajte si "
"prosím %sdokumentáciu%s, ako sa dá toto obmedzenie obísť."
@@ -1416,7 +1417,7 @@ msgid "Filters"
msgstr "Filter"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filter"
@@ -2240,8 +2241,8 @@ msgstr "Vitajte v %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Pravdepodobná príčina je, že neexistuje konfiguračný súbor. Na jeho "
"vytvorenie môžete použiť %1$skonfiguračný skript%2$s."
@@ -2387,13 +2388,13 @@ msgstr "zdieľaný"
msgid "Tables"
msgstr "Tabuľky"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2670,11 +2671,11 @@ msgid "Click to toggle"
msgstr "Kliknite pre prepnutie"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3170,7 +3171,6 @@ msgstr "Kompresia"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Pridať názvy polí na prvý riadok"
@@ -3376,9 +3376,9 @@ msgid "Customize default options"
msgstr "Prispôsobenie východzích nastavení"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV dáta"
@@ -5002,56 +5002,42 @@ msgstr "Signon authentication"
msgid "CSV using LOAD DATA"
msgstr "CSV pomocou LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS pracovný zošit"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX pracovný zošit"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Tabuľkový procesor Open Document"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Vlastné"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Nastavenia exportu databáz"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV pre MS Excel dáta"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document Text"
@@ -5308,8 +5294,8 @@ msgstr ", meno tabuľky bude zmenené na @TABLE@"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Táto hodnota je interpretovaná pomocou %1$sstrftime%2$s, takže môžete použiť "
"reťazec pre formátovanie dátumu a času. Naviac budú vykonané tieto "
@@ -5513,13 +5499,11 @@ msgstr "Zoradiť podľa kľúča"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6031,8 +6015,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6062,7 +6046,6 @@ msgstr "Riadky ukončené:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Nahradiť NULL hodnoty:"
@@ -6395,7 +6378,6 @@ msgid "Go to view"
msgstr "Prejsť na Prejsť na pohľad"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7522,13 +7504,6 @@ msgstr "zobraziť grafický návrh"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "stránok"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7708,8 +7683,8 @@ msgid ""
"installed the necessary PHP extensions as described in the %sdocumentation%s."
msgstr ""
"SQL validator nemohol byť inicializovaný. Prosím skontrolujte, či sú "
-"nainštalované všetky potrebné rozšírenia php, tak ako sú popísané v %"
-"sdocumentation%s."
+"nainštalované všetky potrebné rozšírenia php, tak ako sú popísané v "
+"%sdocumentation%s."
#: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
msgid "Table seems to be empty!"
@@ -8149,7 +8124,9 @@ msgid "No databases"
msgstr "Žiadne databázy"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "filtrovať tabuľky podľa mena"
#: navigation.php:303 navigation.php:304
@@ -8400,8 +8377,8 @@ msgid ""
"You can set more settings by modifying config.inc.php, eg. by using %sSetup "
"script%s."
msgstr ""
-"Ďalšie nastavenia môžete urobiť úpravou config.inc.php, napr. použitím %"
-"sNastavovacieho skriptu%s."
+"Ďalšie nastavenia môžete urobiť úpravou config.inc.php, napr. použitím "
+"%sNastavovacieho skriptu%s."
#: prefs_manage.php:300
msgid "S manage.php:300 %s." robiť úpravou config.inc.php, napr. použitím " " �් කර ඇත්නම් ඉහත වගුවේ දත්ත සේවාදායකයේ වරප්රසාද වලට " ��
B� ��
B� k�nq+ 6 � � ! � ! p�
B� ��
B� x4�r+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� �/�r+ ujnq+ �r+ �$�r+ �)�r+ ��oq+ x4�r+ ��
B� ��
B� k�nq+ �! �! p�
B� ��
B� H�jr+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� ��
B� ��
B� 8��q+ �p� ��
B� ujnq+ ��oq+ ��
B� ��
B� k�nq+ G H I J K M N O P p�
B� ��
B� H�Ar+ P�
B� �bnq+ ��nq+ p�
B� 0/�r+ ujnq+ @�r+ �� r+ �r+ �$�r+ �)�r+ ��oq+ H�Ar+ P�
B� ��
B� k�nq+ 8�Ar+ P�
B� ��
B� k�nq+ (�Ar+ P�
B� ��
B� k�nq+ �Ar+ P�
B� �
B� k�nq+ �.�r+ ujnq+ �)�r+ ��
B� �8 r+ einq+ �$�r+ ��
B� y8 r+ einq+ �r+ ��
B� Z8 r+ einq+ �� r+ @�r+ �� r+ �r+ �D�r+ �$�r+ �)�r+ ��oq+ 8��q+ ��q+ ��
B� p{ r+ ��
B� p�
B� k�nq+ 5 6 7 8 : < = > ? @ B D p�
B� ��
B� ��q+ ��
B� ujnq+ ��q+ �
B� ��q+ einq+ ��q+ �_@f �S Q��l�� �öq+ ��
B� ��q+ ��
B� ��
B� k�nq+ u]�� 4Q��U^Qʉ� �u������*ēvp�
B� ��
B� H��q+ D�q+ �
B� �PRs+ �PRs+ ���q+ ��
B� ��
B� ��
B� �
B� O�r+ ujnq+ �D�r+ `�
B� �PRs+ 0�
B� ��
B� ���������PRs+ ��
B� ave to browser's storage"
@@ -8841,13 +8818,13 @@ msgstr "Odstrániť databázy s rovnakým menom ako majú používatelia."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Poznámka: phpMyAdmin získava práva používateľov priamo z tabuliek MySQL. "
"Obsah týchto tabuliek sa môže líšiť od práv, ktoré používa server, ak boli "
-"tieto tabuľky ručne upravené. V tomto prípade sa odporúča vykonať %"
-"sznovunačítanie práv%s predtým ako budete pokračovať."
+"tieto tabuľky ručne upravené. V tomto prípade sa odporúča vykonať "
+"%sznovunačítanie práv%s predtým ako budete pokračovať."
#: server_privileges.php:1851
msgid "The selected user was not found in the privilege table."
@@ -11366,6 +11343,18 @@ msgstr "Meno pohľadu"
msgid "Rename view to"
msgstr "Premenovať pohľad na"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS pracovný zošit"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX pracovný zošit"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "stránok"
+
#~ msgid "Inline Edit"
#~ msgstr "Tu upraviť"
@@ -11611,8 +11600,8 @@ msgstr "Premenovať pohľad na"
#~ msgid "Imported file compression will be automatically detected from: %s"
#~ msgstr ""
-#~ "Kompresia importovaného súboru bude rozpoznaná automaticky. Podporované: %"
-#~ "s"
+#~ "Kompresia importovaného súboru bude rozpoznaná automaticky. Podporované: "
+#~ "%s"
#~ msgid "Add into comments"
#~ msgstr "Pridať do komentárov"
diff --git a/po/sl.po b/po/sl.po
index cb8969a..ce95620 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-07-22 11:14+0200\n"
"Last-Translator: Domen <dbc334(a)gmail.com>\n"
"Language-Team: slovenian <sl(a)li.org>\n"
+"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
"%100==4 ? 2 : 3);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -25,6 +25,7 @@ msgstr "Pokaži vse"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Številka strani:"
@@ -618,8 +619,8 @@ msgstr "Sledenje ni aktivno."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr "Pogled ima vsaj toliko vrstic. Prosimo, oglejte si %sdokumentacijo%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -855,8 +856,8 @@ msgstr "Dump je shranjen v datoteko %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Najverjetneje ste poskušali naložiti preveliko datoteko. Prosimo, oglejte si "
"%sdokumentacijo%s za načine, kako obiti to omejitev."
@@ -1430,7 +1431,7 @@ msgid "Filters"
msgstr "Filtriranje"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filtriranje"
@@ -2250,8 +2251,8 @@ msgstr "Dobrodošli v %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Najverjetneje niste ustvarili konfiguracijske datoteke. Morda želite "
"uporabiti %1$snastavitveni skript%2$s, da jo ustvarite."
@@ -2397,13 +2398,13 @@ msgstr "deljeno"
msgid "Tables"
msgstr "Tabele"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2681,11 +2682,11 @@ msgid "Click to toggle"
msgstr "Kliknite za preklop"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3185,7 +3186,6 @@ msgstr "Stiskanje"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Postavi imena stolpcev v prvo vrstico"
@@ -3391,9 +3391,9 @@ msgid "Customize default options"
msgstr "Prilagodite privzete možnosti"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV-podatki"
@@ -5021,56 +5021,42 @@ msgstr "Overitev preko signon"
msgid "CSV using LOAD DATA"
msgstr "CSV z uporabo LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excelov delovni zvezek 97-2003 XLS"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excelov delovni zvezek 2007 XLSX"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Preglednica Open Document"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Hitro"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Po meri"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Možnosti za izvoz zbirke podatkov"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV-podatki za MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Besedilo Open Document"
@@ -5328,8 +5314,8 @@ msgstr ", @TABLE@ bo postalo ime tabele"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Vrednost je prevedena z uporabo %1$sstrftime%2$s, tako da lahko uporabljate "
"nize za zapis časa. Dodatno bo prišlo še do naslednjih pretvorb: %3$s. "
@@ -5533,13 +5519,11 @@ msgstr "Uredi po ključu"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6089,8 +6073,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
"Dokumentacijo in nadaljnje informacije o PBXT lahko najdete na %sDomači "
"strani PrimeBase XT%s."
@@ -6122,7 +6106,6 @@ msgstr "Vrstice so zaključene z:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Zamenjaj NULL z:"
@@ -6478,7 +6461,6 @@ msgid "Go to view"
msgstr "Pojdi na pogled"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7563,13 +7545,6 @@ msgstr "Preklopi odložišče (scratchboard)"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "strani"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8212,7 +8187,9 @@ msgid "No databases"
msgstr "Brez zbirk podatkov"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "filtriraj tabele po imenu"
#: navigation.php:303 navigation.php:304
@@ -8904,8 +8881,8 @@ msgstr "Izbriši zbirke podatkov, ki imajo enako ime kot uporabniki."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Obvestilo: phpMyAdmin dobi podatke o uporabnikovih privilegijih iz tabel "
"privilegijev MySQL. Vsebina teh tabel se lahko razlikuje od privilegijev, ki "
@@ -11505,6 +11482,18 @@ msgstr "Ime VIEW"
msgid "Rename view to"
msgstr "Preimenuj pogled v"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excelov delovni zvezek 97-2003 XLS"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excelov delovni zvezek 2007 XLSX"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "strani"
+
#~ msgid "Inline Edit"
#~ msgstr "Urejanje v vrstici"
diff --git a/po/sq.po b/po/sq.po
index 08650fe..d4043dc 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-07-21 14:51+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: albanian <sq(a)li.org>\n"
+"Language: sq\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.1\n"
@@ -24,6 +24,7 @@ msgstr "Shfaqi të gjithë"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Numri i faqes:"
@@ -636,8 +637,8 @@ msgstr "Gjurmimi nuk është aktiv."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -884,8 +885,8 @@ msgstr "Dump u ruajt tek file %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1442,7 +1443,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2334,8 +2335,8 @@ msgstr "Mirësevini tek %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2479,13 +2480,13 @@ msgstr ""
msgid "Tables"
msgstr "Tabela"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2762,11 +2763,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3265,7 +3266,6 @@ msgstr "Kompresim"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3492,9 +3492,9 @@ msgid "Customize default options"
msgstr "Opcione të eksportimit të databazës"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "të dhëna CSV"
@@ -5031,56 +5031,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Opcione të eksportimit të databazës"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV për të dhëna MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5356,8 +5342,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5567,13 +5553,11 @@ msgstr "Rendit sipas kyçit"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6077,8 +6061,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6116,7 +6100,6 @@ msgstr "Rreshta që mbarojnë me"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6466,7 +6449,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7593,13 +7575,6 @@ msgstr "(ç')aktivo scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Usage"
-msgctxt "PDF"
-msgid "page"
-msgstr "Përdorimi"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8276,7 +8251,7 @@ msgstr "Asnjë databazë"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Transformo tabelën e renditur sipas"
#: navigation.php:303 navigation.php:304
@@ -9009,8 +8984,8 @@ msgstr "Elemino databazat që kanë emër të njëjtë me përdoruesit."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Shënim: phpMyAdmin lexon të drejtat e përdoruesve direkt nga tabela e "
"privilegjeve të MySQL. Përmbajtja e kësaj tabele mund të ndryshojë prej të "
@@ -11445,6 +11420,12 @@ msgstr ""
msgid "Rename view to"
msgstr "Riemërto tabelën në"
+#, fuzzy
+#~| msgid "Usage"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "Përdorimi"
+
#~ msgid "Begin"
#~ msgstr "Fillim"
@@ -11548,8 +11529,8 @@ msgstr "Riemërto tabelën në"
#~ "<b>Query statistics</b>: Since its startup, %s queries have been sent to "
#~ "the server."
#~ msgstr ""
-#~ "<b>Statistikat e Query</b>: Që nga nisja e tij, serverit i janë dërguar %"
-#~ "s queries."
+#~ "<b>Statistikat e Query</b>: Që nga nisja e tij, serverit i janë dërguar "
+#~ "%s queries."
#, fuzzy
#~ msgid "Chart generated successfully."
diff --git a/po/sr.po b/po/sr.po
index 55023ad..e5558c7 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,16 +3,16 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-04-06 18:43+0200\n"
"Last-Translator: <theranchcowboy(a)googlemail.com>\n"
"Language-Team: serbian_cyrillic <sr(a)li.org>\n"
+"Language: sr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.0.5\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -25,6 +25,7 @@ msgstr "Прикажи све"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Број странице:"
@@ -633,8 +634,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -883,11 +884,11 @@ msgstr "Садржај базе је сачуван у датотеку %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Вероватно сте покушали да увезете превелику датотеку. Молимо погледајте %"
-"sдокументацију%s за начине превазилажења овог ограничења."
+"Вероватно сте покушали да увезете превелику датотеку. Молимо погледајте "
+"%sдокументацију%s за начине превазилажења овог ограничења."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1460,7 +1461,7 @@ msgid "Filters"
msgstr "Датотеке"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
#, fuzzy
msgid "Filter"
msgstr "Датотеке"
@@ -2363,8 +2364,8 @@ msgstr "Добродошли на %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Вероватан разлог за ово је да нисте направили конфигурациону датотеку. "
"Можете користити %1$sскрипт за инсталацију%2$s да бисте је направили."
@@ -2510,13 +2511,13 @@ msgstr ""
msgid "Tables"
msgstr "Табеле"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2801,11 +2802,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3306,7 +3307,6 @@ msgstr "Компресија"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3533,9 +3533,9 @@ msgid "Customize default options"
msgstr "Опције за извоз базе"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5099,56 +5099,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr "CSV користећи LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document Spreadsheet"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Опције за извоз базе"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV за MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document Text"
@@ -5435,8 +5421,8 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Ова вредност се тумачи коришћењем %1$sstrftime%2$s, тако да можете да "
"користите стрингове за форматирање времена. Такође ће се десити и следеће "
@@ -5664,13 +5650,11 @@ msgstr "Сортирај по кључу"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6191,8 +6175,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6230,7 +6214,6 @@ msgstr "Линије се завршавају са"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6583,7 +6566,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7730,13 +7712,6 @@ msgstr "Укључи/искључи радну таблу"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "страна"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8433,7 +8408,7 @@ msgstr "База не постоји"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "назив табеле"
#: navigation.php:303 navigation.php:304
@@ -9161,8 +9136,8 @@ msgstr "Одбаци базе које се зову исто као корис
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Напомена: phpMyAdmin узима привилегије корисника директно из MySQL табела "
"привилегија. Садржај ове табеле може се разликовати од привилегија које "
@@ -11721,6 +11696,12 @@ msgid "Rename view to"
msgstr "Промени име табеле у "
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "страна"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "Складиштења"
diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po
index 1076d93..7123a56 100644
--- a/po/sr(a)latin.po
+++ b/po/sr(a)latin.po
@@ -3,16 +3,16 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-12-02 14:49+0200\n"
"Last-Translator: Sasa Kostic <sasha.kostic(a)gmail.com>\n"
"Language-Team: serbian_latin <sr@latin@li.org>\n"
+"Language: sr@latin\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.0.5\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -25,6 +25,7 @@ msgstr "Prikaži sve"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Broj strane:"
@@ -627,8 +628,8 @@ msgstr "Praćenje nije aktivno."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -877,11 +878,11 @@ msgstr "Sadržaj baze je sačuvan u datoteku %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Verovatno ste pokušali da uvezete preveliku datoteku. Molimo pogledajte %"
-"sdokumentaciju%s za načine prevazilaženja ovog ograničenja."
+"Verovatno ste pokušali da uvezete preveliku datoteku. Molimo pogledajte "
+"%sdokumentaciju%s za načine prevazilaženja ovog ograničenja."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1454,7 +1455,7 @@ msgid "Filters"
msgstr "Datoteke"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
#, fuzzy
msgid "Filter"
msgstr "Datoteke"
@@ -2357,8 +2358,8 @@ msgstr "Dobrodošli na %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Verovatan razlog za ovo je da niste napravili konfiguracionu datoteku. "
"Možete koristiti %1$sskript za instalaciju%2$s da biste je napravili."
@@ -2504,13 +2505,13 @@ msgstr ""
msgid "Tables"
msgstr "Tabele"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2795,11 +2796,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3301,7 +3302,6 @@ msgstr "Kompresija"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3528,9 +3528,9 @@ msgid "Customize default options"
msgstr "Opcije za izvoz baze"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5092,56 +5092,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr "CSV koristeći LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document Spreadsheet"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Opcije za izvoz baze"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV za MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Open Document Text"
@@ -5428,8 +5414,8 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Ova vrednost se tumači korišćenjem %1$sstrftime%2$s, tako da možete da "
"koristite stringove za formatiranje vremena. Takođe će se desiti i sledeće "
@@ -5658,13 +5644,11 @@ msgstr "Sortiraj po ključu"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6185,8 +6169,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6224,7 +6208,6 @@ msgstr "Linije se završavaju sa"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6573,7 +6556,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7718,13 +7700,6 @@ msgstr "Uključi/isključi radnu tablu"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "strana"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8423,7 +8398,7 @@ msgstr "Baza ne postoji"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "naziv tabele"
#: navigation.php:303 navigation.php:304
@@ -9151,8 +9126,8 @@ msgstr "Odbaci baze koje se zovu isto kao korisnici."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Napomena: phpMyAdmin uzima privilegije korisnika direktno iz MySQL tabela "
"privilegija. Sadržaj ove tabele može se razlikovati od privilegija koje "
@@ -11709,6 +11684,12 @@ msgid "Rename view to"
msgstr "Promeni ime tabele u "
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "strana"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "Skladištenja"
diff --git a/po/sv.po b/po/sv.po
index 3027cfb..4e4a859 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-07-31 21:19+0200\n"
"Last-Translator: <stefan(a)inkopsforum.se>\n"
"Language-Team: swedish <sv(a)li.org>\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "Visa alla"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Sida:"
@@ -611,8 +612,8 @@ msgstr "Spårning är inte aktiv."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr "Denna vy har åtminstone detta antal rader. Se %sdokumentationen%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -848,8 +849,8 @@ msgstr "SQL-satserna har sparats till filen %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Du försökte förmodligen ladda upp en för stor fil. Se %sdokumentationen%s "
"för att gå runt denna begränsning."
@@ -1405,7 +1406,7 @@ msgid "Filters"
msgstr "Filter"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filter"
@@ -2213,11 +2214,11 @@ msgstr "Välkommen till %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
-"Du har troligen inte skapat en konfigurationsfil. Du vill kanske använda %1"
-"$suppsättningsskript%2$s för att skapa denna."
+"Du har troligen inte skapat en konfigurationsfil. Du vill kanske använda "
+"%1$suppsättningsskript%2$s för att skapa denna."
#: libraries/auth/config.auth.lib.php:109
msgid ""
@@ -2362,13 +2363,13 @@ msgstr "delad"
msgid "Tables"
msgstr "Tabeller"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2644,11 +2645,11 @@ msgid "Click to toggle"
msgstr "Klicka för att växla"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3147,7 +3148,6 @@ msgstr "Komprimering"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Sätt kolumnnamn på första raden"
@@ -3353,9 +3353,9 @@ msgid "Customize default options"
msgstr "Anpassa förvalda alternativ"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4978,56 +4978,42 @@ msgstr "Signon autentisering"
msgid "CSV using LOAD DATA"
msgstr "CSV med LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS arbetsbok"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX arbetsbok"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "OpenDocument kalkylblad"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Snabb"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Anpassad"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Databas exportalternativ"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV för MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "OpenDocument text"
@@ -5282,8 +5268,8 @@ msgstr ", @TABLE@ blir tabellnamnet"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Detta värde tolkas med %1$sstrftime%2$s, så du kan använda strängar med "
"tidsformatering. Dessutom kommer följande omvandlingar att ske: %3$s. Övrig "
@@ -5486,13 +5472,11 @@ msgstr "Sortera efter nyckel"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6037,11 +6021,11 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
-"Dokumentation och ytterligare information finns på %sPrimeBase XT Home Page%"
-"s."
+"Dokumentation och ytterligare information finns på %sPrimeBase XT Home Page"
+"%s."
#: libraries/engines/pbxt.lib.php:129
msgid "The PrimeBase XT Blog by Paul McCullagh"
@@ -6070,7 +6054,6 @@ msgstr "Rader avslutas med:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "Ersätt NULL med:"
@@ -6417,7 +6400,6 @@ msgid "Go to view"
msgstr "Gå till vy"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7503,13 +7485,6 @@ msgstr "Visa/dölj skisstavla"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "sidor"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8138,8 +8113,8 @@ msgid ""
"Your PHP MySQL library version %s differs from your MySQL server version %s. "
"This may cause unpredictable behavior."
msgstr ""
-"Din PHP MySQL bibliotekversion %s skiljer sig från din MySQL server version %"
-"s. Detta kan orsaka oförutsägbara beteenden."
+"Din PHP MySQL bibliotekversion %s skiljer sig från din MySQL server version "
+"%s. Detta kan orsaka oförutsägbara beteenden."
#: main.php:341
#, php-format
@@ -8153,7 +8128,9 @@ msgid "No databases"
msgstr "Inga databaser"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "filtrera tabeller efter namn"
#: navigation.php:303 navigation.php:304
@@ -8842,8 +8819,8 @@ msgstr "Ta bort databaserna med samma namn som användarna."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Anm: phpMyAdmin hämtar användarnas privilegier direkt från MySQL:s "
"privilegiumtabeller. Innehållet i dessa tabeller kan skilja sig från "
@@ -10628,8 +10605,8 @@ msgid ""
"protection may not be reliable if your IP belongs to an ISP where thousands "
"of users, including you, are connected to."
msgstr ""
-"Om du känner att detta är nödvändigt, använd extra skyddsinställningar - %"
-"shost autentisering%s inställningarna och %strusted proxies listan%s. Dock "
+"Om du känner att detta är nödvändigt, använd extra skyddsinställningar - "
+"%shost autentisering%s inställningarna och %strusted proxies listan%s. Dock "
"kan IP-baserat skydd inte vara tillförlitligt om din IP tillhör en ISP där "
"tusentals användare, inklusive dig, är anslutna till"
@@ -11416,6 +11393,18 @@ msgstr "VIEW namn"
msgid "Rename view to"
msgstr "Ändra namn till"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS arbetsbok"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX arbetsbok"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "sidor"
+
#~ msgid "Inline Edit"
#~ msgstr "Redigera"
diff --git a/po/ta.po b/po/ta.po
index 786ff02..48c6f85 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,14 +6,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-04-16 10:43+0200\n"
"Last-Translator: Sutharshan <sutharshan02(a)gmail.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"
-"Language: ta\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.1\n"
@@ -27,6 +27,7 @@ msgstr ""
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "ஓலை என்"
@@ -611,8 +612,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -848,8 +849,8 @@ msgstr ""
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1365,7 +1366,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2198,8 +2199,8 @@ msgstr ""
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"நீங்கள் அமைப்பு கோப்பை உருவாக்கவில்லை. அதை உருவாக்க நீங்கள் %1$s உருவாக்க கோவையை %2$s "
"பயன்படுத்தலாம்"
@@ -2342,13 +2343,13 @@ msgstr ""
msgid "Tables"
msgstr ""
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2612,11 +2613,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3093,7 +3094,6 @@ msgstr ""
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr ""
@@ -3297,9 +3297,9 @@ msgid "Customize default options"
msgstr ""
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr ""
@@ -4778,56 +4778,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr ""
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr ""
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5080,8 +5066,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5269,13 +5255,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5764,8 +5748,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -5795,7 +5779,6 @@ msgstr ""
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr ""
@@ -6118,7 +6101,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7192,11 +7174,6 @@ msgstr ""
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-msgctxt "PDF"
-msgid "page"
-msgstr ""
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:5 8 libraries/select_lang.lib.php:494 is " �்கவில்லை. அதை உருவாக்க நீங்கள் %1$s உருவாக்க கோவையை %2$s " �ට " ��
B� ��
B� k�nq+ 6 � � ! � ! p�
B� ��
B� x4�r+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� �/�r+ ujnq+ �r+ �$�r+ �)�r+ ��oq+ x4�r+ ��
B� ��
B� k�nq+ �! �! p�
B� ��
B� H�jr+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� ��
B� ��
B� 8��q+ �p� ��
B� ujnq+ ��oq+ ��
B� ��
B� k�nq+ G H I J K M N O P p�
B� ��
B� H�Ar+ P�
B� �bnq+ ��nq+ p�
B� 0/�r+ ujnq+ @�r+ �� r+ �r+ �$�r+ �)�r+ ��oq+ H�Ar+ P�
B� ��
B� k�nq+ 8�Ar+ P�
B� ��
B� k�nq+ (�Ar+ P�
B� ��
B� k�nq+ �Ar+ P�
B� �
B� k�nq+ �.�r+ ujnq+ �)�r+ ��
B� �8 r+ einq+ �$�r+ ��
B� y8 r+ einq+ �r+ ��
B� Z8 r+ einq+ �� r+ @�r+ �� r+ �r+ �D�r+ �$�r+ �)�r+ ��oq+ 8��q+ ��q+ ��
B� p{ r+ ��
B� p�
B� k�nq+ 5 6 7 8 : < = > ? @ B D p�
B� ��
B� ��q+ ��
B� ujnq+ ��q+ �
B� ��q+ einq+ ��q+ �_@f �S Q��l�� �öq+ ��
B� ��q+ ��
B� ��
B� k�nq+ u]�� 4Q��U^Qʉ� �u������*ēvp�
B� ��
B� H��q+ D�q+ �
B� �PRs+ �PRs+ ���q+ ��
B� ��
B� ��
B� �
B� O�r+ ujnq+ �D�r+ `�
B� �PRs+ 0�
B� ��
B� ���������PRs+ ��
B� 00
#, php-format
@@ -7744,7 +7721,7 @@ msgid "No databases"
msgstr ""
#: navigation.php:270
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr ""
#: navigation.php:303 navigation.php:304
@@ -8417,8 +8394,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
diff --git a/po/te.po b/po/te.po
index 54a99bb..42aba95 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,14 +6,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-04-07 17:06+0200\n"
"Last-Translator: <veeven(a)gmail.com>\n"
"Language-Team: Telugu <te(a)li.org>\n"
+"Language: te\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -27,6 +27,7 @@ msgstr "అన్నీ చూపించు"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "పుట సంఖ్య:"
@@ -621,8 +622,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
# మొదటి అనువాదము
@@ -862,8 +863,8 @@ msgstr ""
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1406,7 +1407,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2239,8 +2240,8 @@ msgstr "%sకి స్వాగతం"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2386,13 +2387,13 @@ msgstr ""
msgid "Tables"
msgstr "పట్టికలు"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2670,11 +2671,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3155,7 +3156,6 @@ msgstr ""
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr ""
@@ -3359,9 +3359,9 @@ msgid "Customize default options"
msgstr ""
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr ""
@@ -4854,56 +4854,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr ""
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr ""
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "మైక్రోసాఫ్ట్ వర్డ్ 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5163,8 +5149,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5354,13 +5340,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5857,8 +5841,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -5888,7 +5872,6 @@ msgstr ""
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr ""
@@ -6214,7 +6197,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7339,14 +7321,6 @@ msgstr ""
msgid "ltr"
msgstr ""
-# మొదటి అనువాదము
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "పుటలు"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7905,8 +7879,10 @@ msgid "No databases"
msgstr ""
#: navigation.php:270
-msgid "filter tables by name"
-msgstr ""
+#, fuzzy
+#| msgid "Table name"
+msgid "Filter tables by name"
+msgstr "పట్టిక పేరు"
# మొదటి అనువాదము
#: navigation.php:303 navigation.php:304
@@ -8598,8 +8574,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
@@ -10980,6 +10956,13 @@ msgid "Rename view to"
msgstr ""
# మొదటి అనువాదము
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "పుటలు"
+
+# మొదటి అనువాదము
#~ msgid "Begin"
#~ msgstr "మొదలు"
diff --git a/po/th.po b/po/th.po
index 9097847..24d2b98 100644
--- a/po/th.po
+++ b/po/th.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-07-24 11:50+0200\n"
"Last-Translator: Waitaya Krongapiradee <wyte_sk133(a)hotmail.com>\n"
"Language-Team: thai <th(a)li.org>\n"
+"Language: th\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: th\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "แสดงทั้งหมด"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "หมายเลขหน้า:"
@@ -613,8 +614,8 @@ msgstr "หยุดการติดตามแล้ว"
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -853,8 +854,8 @@ msgstr ""
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1407,7 +1408,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2300,8 +2301,8 @@ msgstr "%s ยินดีต้อนรับ"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2439,13 +2440,13 @@ msgstr ""
msgid "Tables"
msgstr "ตาราง"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2721,11 +2722,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3223,7 +3224,6 @@ msgstr "บีบอัดข้อมูล"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3451,9 +3451,9 @@ msgid "Customize default options"
msgstr ""
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "ข้อมูล CSV (คั่นด้วยเครื่องหมายลูกน้ำ \",\")"
@@ -4990,57 +4990,43 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
#, fuzzy
msgid "Database export options"
msgstr "สถิติฐานข้อมูล"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "ข้อมูล CSV สำหรับไมโครซอฟต์เอ็กเซล"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5315,8 +5301,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5526,13 +5512,11 @@ msgstr "เรียงโดยคีย์"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6037,8 +6021,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6076,7 +6060,6 @@ msgstr "จบแถวด้วย"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6420,7 +6403,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7556,13 +7538,6 @@ msgstr ""
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Usage"
-msgctxt "PDF"
-msgid "page"
-msgstr "ใช้งาน"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8171,7 +8146,7 @@ msgstr "ไม่มีฐานข้อมูล"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "เรียงค่าในตารางตาม"
#: navigation.php:303 navigation.php:304
@@ -8892,8 +8867,8 @@ msgstr "โยนฐานข้อมูลที่มีชื่อเดี
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
@@ -11321,6 +11296,12 @@ msgstr ""
msgid "Rename view to"
msgstr "เปลี่ยนชื่อตารางเป็น"
+#, fuzzy
+#~| msgid "Usage"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "ใช้งาน"
+
#~ msgid "Begin"
#~ msgstr "จุดเริ่มต้น"
@@ -11453,8 +11434,8 @@ msgstr "เปลี่ยนชื่อตารางเป็น"
#~ "The additional features for working with linked tables have been "
#~ "deactivated. To find out why click %shere%s."
#~ msgstr ""
-#~ "ความสามารถเพิ่มเติมสำหรับ linked Tables ได้ถูกระงับเอาไว้ ตามเหตุผลที่แจ้งไว้ใน %shere%"
-#~ "s"
+#~ "ความสามารถเพิ่มเติมสำหรับ linked Tables ได้ถูกระงับเอาไว้ ตามเหตุผลที่แจ้งไว้ใน %shere"
+#~ "%s"
#~ msgid "No tables"
#~ msgstr "ไม่มีตาราง"
diff --git a/po/tr.po b/po/tr.po
index f5645eb..43f62af 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,7 +3,7 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-08-10 21:18+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
@@ -24,6 +24,7 @@ msgstr "Tümünü göster"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Sayfa numarası:"
@@ -608,8 +609,8 @@ msgstr "İzleme aktif değil."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Bu görünüm en az bu satır sayısı kadar olur. Lütfen %sbelgeden%s yararlanın."
@@ -846,8 +847,8 @@ msgstr "Döküm, %s dosyasına kaydedildi."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Muhtemelen çok büyük dosya göndermeyi denediniz. Lütfen bu sınıra çözüm yolu "
"bulmak için %sbelgeden%s yararlanın."
@@ -1269,8 +1270,8 @@ msgid ""
"depending on your system."
msgstr ""
"slow_query_log etkinleştirildi ama sunucu sadece %d saniyeden daha uzun "
-"süren sorguları günlükler. Bu long_query_time'ın, sisteminize bağlı olarak 0-"
-"2 saniyeye ayarlanması tavsiye edilir."
+"süren sorguları günlükler. Bu long_query_time'ın, sisteminize bağlı olarak "
+"0-2 saniyeye ayarlanması tavsiye edilir."
#: js/messages.php:137
#, php-format
@@ -1389,7 +1390,7 @@ msgid "Filters"
msgstr "Süzgeçler"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Süzgeç"
@@ -1692,8 +1693,8 @@ msgid ""
"A newer version of phpMyAdmin is available and you should consider "
"upgrading. The newest version is %s, released on %s."
msgstr ""
-"phpMyAdmin'in yeni sürümü mevcut ve yükseltmeyi düşünmelisiniz. Yeni sürüm %"
-"s, %s tarihinde yayınlandı."
+"phpMyAdmin'in yeni sürümü mevcut ve yükseltmeyi düşünmelisiniz. Yeni sürüm "
+"%s, %s tarihinde yayınlandı."
#. l10n: Latest available phpMyAdmin version
#: js/messages.php:278
@@ -1709,14 +1710,12 @@ msgstr "güncel"
msgid "Done"
msgstr "Bitti"
-#. l10n: Display text for previous month link in calendar
-#: js/messages.php:296
+#: js/messages.php:302
msgctxt "Previous month"
msgid "Prev"
msgstr "Önceki"
-#. l10n: Display text for next month link in calendar
-#: js/messages.php:298
+#: js/messages.php:307
msgctxt "Next month"
msgid "Next"
msgstr "Sonraki"
@@ -2090,7 +2089,6 @@ msgid_plural "%1$d rows inserted."
msgstr[0] "%1$d satır eklendi."
#: libraries/PDF.class.php:81
-#| msgid "Error reading data:"
msgid "Error while creating PDF:"
msgstr "PDF oluşturulurken hata:"
@@ -2197,8 +2195,8 @@ msgstr "%s'e Hoş Geldiniz"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Muhtemelen bunun sebebi yapılandırma dosyasını oluşturmadığınız içindir. Bir "
"tane oluşturmak için %1$skur programcığı%2$s kullanmak isteyebilirsiniz."
@@ -2346,13 +2344,13 @@ msgstr "paylaşılmış"
msgid "Tables"
msgstr "Tablolar"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2583,7 +2581,6 @@ msgstr "Eksik parametreler:"
#: libraries/common.lib.php:2267 libraries/common.lib.php:2270
#: libraries/display_tbl.lib.php:306
-#| msgid "Begin"
msgctxt "First page"
msgid "Begin"
msgstr "Başlangıç"
@@ -2591,7 +2588,6 @@ msgstr "Başlangıç"
#: libraries/common.lib.php:2268 libraries/common.lib.php:2271
#: libraries/display_tbl.lib.php:307 server_binlog.php:135
#: server_binlog.php:137
-#| msgid "Previous"
msgctxt "Previous page"
msgid "Previous"
msgstr "Önceki"
@@ -2599,14 +2595,12 @@ msgstr "Önceki"
#: libraries/common.lib.php:2297 libraries/common.lib.php:2300
#: libraries/display_tbl.lib.php:370 server_binlog.php:170
#: server_binlog.php:172
-#| msgid "Next"
msgctxt "Next page"
msgid "Next"
msgstr "Sonraki"
#: libraries/common.lib.php:2298 libraries/common.lib.php:2301
#: libraries/display_tbl.lib.php:385
-#| msgid "End"
msgctxt "Last page"
msgid "End"
msgstr "Son"
@@ -2626,11 +2620,11 @@ msgid "Click to toggle"
msgstr "Değiştirmek için tıklayın"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3129,7 +3123,6 @@ msgstr "Sıkıştırma"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "İlk satır içine sütun adlarını koy"
@@ -3335,9 +3328,9 @@ msgid "Customize default options"
msgstr "Varsayılan seçenekleri özelleştirir"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -3986,7 +3979,6 @@ msgid "Memory limit"
msgstr "Bellek sınırı"
#: libraries/config/messages.inc.php:319
-#| msgid "These are Edit, Inline edit, Copy and Delete links"
msgid "These are Edit, Copy and Delete links"
msgstr "Bunlar Düzenle, Kopyala ve Sil bağlantılarıdır"
@@ -4683,12 +4675,10 @@ msgid "Show function fields"
msgstr "İşlev alanlarını göster"
#: libraries/config/messages.inc.php:460
-#| msgid "Where to show the table row links"
msgid "Whether to show hint or not"
msgstr "İpucu gösterilip gösterilmeyeceği"
#: libraries/config/messages.inc.php:461
-#| msgid "Show indexes"
msgid "Show hint"
msgstr "İpucu göster"
@@ -4980,56 +4970,42 @@ msgstr "Oturumu açma kimlik doğrulaması"
msgid "CSV using LOAD DATA"
msgstr "VERİ YÜKLE kullanarak CSV"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS Kitabı"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX Kitabı"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Açık Kaynaklı Tablolama Belgesi"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "Hızlı"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "Özel"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Veritabanı dışa aktarma seçenekleri"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "MS Excel için CSV"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "Açık Belge Metni"
@@ -5290,8 +5266,8 @@ msgstr ", @TABLE@ tablo adı olacaktır"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Bu değer %1$sstrftime%2$s kullanılarak yorumlanır, bu yüzden zaman "
"biçimlendirme dizgisi kullanabilirsiniz. İlave olarak aşağıdaki dönüşümler "
@@ -5441,7 +5417,6 @@ msgid "Language"
msgstr "Dil"
#: libraries/display_tbl.lib.php:401
-#| msgid "Save directory"
msgid "Save edited data"
msgstr "Düzenlenen veriyi kaydet"
@@ -5494,13 +5469,11 @@ msgstr "Anahtara göre sırala"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6052,8 +6025,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
"%sPrimeBase XT Ana Sayfasında%s PBXT hakkında belge ve daha fazla bilgi "
"bulunabilir."
@@ -6085,7 +6058,6 @@ msgstr "Satırlar şununla sonlandırılmış:"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "NULL'u şununla değiştir:"
@@ -6431,7 +6403,6 @@ msgid "Go to view"
msgstr "Görünüme git"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7025,13 +6996,11 @@ msgid "Execute every"
msgstr "Çalıştır; her"
#: libraries/rte/rte_events.lib.php:449
-#| msgid "Start"
msgctxt "Start of recurring event"
msgid "Start"
msgstr "Başlama"
#: libraries/rte/rte_events.lib.php:457
-#| msgid "End"
msgctxt "End of recurring event"
msgid "End"
msgstr "Bitiş"
@@ -7512,12 +7481,6 @@ msgstr "Karalama panosunu değiştir"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "sayfa"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8165,7 +8128,9 @@ msgid "No databases"
msgstr "Veritabanı yok"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "tabloları adına göre süz"
#: navigation.php:303 navigation.php:304
@@ -8858,8 +8823,8 @@ msgstr "Kullanıcılarla aynı isimlerde olan veritabanlarını kaldır."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Not: phpMyAdmin kullanıcıların yetkilerini doğrudan MySQL'in yetki "
"tablolarından alır. Bu tabloların içerikleri, eğer elle değiştirildiyse "
@@ -10624,9 +10589,9 @@ msgid ""
"protection may not be reliable if your IP belongs to an ISP where thousands "
"of users, including you, are connected to."
msgstr ""
-"Eğer bunun gerekli olduğunu düşünüyorsanız, ilave koruma ayarları kullanın- %"
-"sanamakine kimlik doğrulaması%s ayarları ve %sgüvenilir proksiler listesi%s. "
-"Ancak, IP-tabanlı koruma eğer IP'niz, sizinde dahil olduğunuz binlerce "
+"Eğer bunun gerekli olduğunu düşünüyorsanız, ilave koruma ayarları kullanın- "
+"%sanamakine kimlik doğrulaması%s ayarları ve %sgüvenilir proksiler listesi"
+"%s. Ancak, IP-tabanlı koruma eğer IP'niz, sizinde dahil olduğunuz binlerce "
"kullanıcıya sahip ve bağlı olduğunuz bir ISS'e aitse güvenilir olmayabilir."
#: setup/lib/index.lib.php:292
@@ -10641,8 +10606,8 @@ msgstr ""
"[kbd]Yapılandırma[/kbd] kimlik doğrulaması türünü ayarladınız ve buna "
"otomatik oturum açma için kullanıcı adı ve parola dahildir, canlı "
"anamakineler için istenmeyen bir seçenektir. phpMyAdmin URL'nizi bilen veya "
-"tahmin eden herhangi biri doğrudan phpMyAdmin panelinize erişebilir. %"
-"sKimlik doğrulama türünü%s [kbd]tanımlama bilgisi[/kbd] ya da [kbd]http[/"
+"tahmin eden herhangi biri doğrudan phpMyAdmin panelinize erişebilir. "
+"%sKimlik doğrulama türünü%s [kbd]tanımlama bilgisi[/kbd] ya da [kbd]http[/"
"kbd] olarak ayarlayın."
#: setup/lib/index.lib.php:294
@@ -11413,6 +11378,17 @@ msgstr "GÖRÜNÜM adı"
msgid "Rename view to"
msgstr "Görünümü yeniden şuna adlandır"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS Kitabı"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX Kitabı"
+
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "sayfa"
+
#~ msgid "Inline Edit"
#~ msgstr "Sıralı Düzenleme"
diff --git a/po/tt.po b/po/tt.po
index 05e1fec..b97246a 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-07-22 02:25+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: tatarish <tt(a)li.org>\n"
+"Language: tt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: tt\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.1\n"
@@ -24,6 +24,7 @@ msgstr "Barısın kürsät"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Bitneñ sanı:"
@@ -633,8 +634,8 @@ msgstr ""
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -884,8 +885,8 @@ msgstr "Eçtälege \"%s\" biremenä saqlandı."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1447,7 +1448,7 @@ msgid "Filters"
msgstr "Alan"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
#, fuzzy
msgid "Filter"
msgstr "Alan"
@@ -2342,8 +2343,8 @@ msgstr "%s siña İsäñme di"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2487,13 +2488,13 @@ msgstr ""
msgid "Tables"
msgstr "Tüşämä"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2775,11 +2776,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3280,7 +3281,6 @@ msgstr "Qısu"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3507,9 +3507,9 @@ msgid "Customize default options"
msgstr "Biremlek saqlaw köyläneşe"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -5067,56 +5067,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr "LOAD DATA qullanıp CSV"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Biremlek saqlaw köyläneşe"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV bireme, MS Excel öçen"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5397,8 +5383,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5614,13 +5600,11 @@ msgstr "Qullanası tezeş"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
#, fuzzy
@@ -6138,8 +6122,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6177,7 +6161,6 @@ msgstr "Yul ara bilgese"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6530,7 +6513,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7665,13 +7647,6 @@ msgstr "Toggle scratchboard"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "bit"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7857,8 +7832,8 @@ msgid ""
"The SQL validator could not be initialized. Please check if you have "
"installed the necessary PHP extensions as described in the %sdocumentation%s."
msgstr ""
-"SQL-tikşerüçe köylänmägän. Bu kiräk bulğan php-yöklämäne köyläw turında %"
-"squllanmada%s uqıp bula."
+"SQL-tikşerüçe köylänmägän. Bu kiräk bulğan php-yöklämäne köyläw turında "
+"%squllanmada%s uqıp bula."
#: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
msgid "Table seems to be empty!"
@@ -8348,7 +8323,7 @@ msgstr "Biremleklär yuq"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "tüşämä adı"
#: navigation.php:303 navigation.php:304
@@ -9072,8 +9047,8 @@ msgstr "Bu qullanuçılar kebek atalğan biremleklärne beteräse."
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Beläse: MySQL-serverneñ eçke tüşämä eçennän alınğan xoquqlar bu. Server "
"qullana torğan xoquqlar qul aşa üzgärtelgän bulsa, bu tüşämä eçtälege "
@@ -11528,6 +11503,12 @@ msgid "Rename view to"
msgstr "Tüşämä adın üzgärtü"
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "bit"
+
+#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
#~ msgstr "Engine"
diff --git a/po/ug.po b/po/ug.po
index 8d92815..3bcac71 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -6,14 +6,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-08-26 11:59+0200\n"
"Last-Translator: <gheni(a)yahoo.cn>\n"
"Language-Team: Uyghur <ug(a)li.org>\n"
+"Language: ug\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ug\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -27,6 +27,7 @@ msgstr "ھەممىسىنى كۆرسىتىش"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "بەت نومۇرى:"
@@ -346,8 +347,8 @@ msgid ""
"The phpMyAdmin configuration storage has been deactivated. To find out why "
"click %shere%s."
msgstr ""
-"ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن %"
-"sبۇ يەرنى كۆرۈڭ%s."
+"ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن "
+"%sبۇ يەرنى كۆرۈڭ%s."
#: db_operations.php:584
#, fuzzy
@@ -617,8 +618,8 @@ msgstr "ئىزلاش ئاكتىپ ئەمەس"
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr "بۇ كۆرسەتمە كامىدا ئىگە بولغان سەپ، %sھۆججەت%s."
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -856,8 +857,8 @@ msgstr "%s ھۆججىتىدە ساقلاندى."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"سىز يوللىماقچى بولغان ھۆججەت بەك چوڭكەن، %sياردەم%s ھۆججىتىدىن ھەل قىلىش "
"چارىسىنى كۆرۈڭ."
@@ -1423,7 +1424,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2271,11 +2272,11 @@ msgstr "%s خۇش كەلدىڭىز"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
#: libraries/auth/config.auth.lib.php:109
msgid ""
@@ -2418,13 +2419,13 @@ msgstr ""
msgid "Tables"
msgstr ""
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2702,11 +2703,11 @@ msgid "Click to toggle"
msgstr "بىر چىكىپ تاللاڭ"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3188,7 +3189,6 @@ msgstr "پىرىسلاش"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr ""
@@ -3401,9 +3401,9 @@ msgid "Customize default options"
msgstr ""
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4908,56 +4908,42 @@ msgstr "تەكشۈرۈشتىن ئۆزكۈزىۋاتىدۇ..."
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "OpenOffice جەدىۋېلى"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr ""
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "MS Excel دىكى CSVشەكلى"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "OpenOffice ھۆججىتى"
@@ -5233,8 +5219,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5446,13 +5432,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5947,8 +5931,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -5986,7 +5970,6 @@ msgstr "قۇر ئالماشۇرۇش بەلگىسى"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6324,7 +6307,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7446,13 +7428,6 @@ msgstr ""
msgid "ltr"
msgstr ""
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "بەت سانى"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7983,8 +7958,8 @@ msgid ""
"The phpMyAdmin configuration storage is not completely configured, some "
"extended features have been deactivated. To find out why click %shere%s."
msgstr ""
-"ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن %"
-"sبۇ يەرنى كۆرۈڭ%s."
+"ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن "
+"%sبۇ يەرنى كۆرۈڭ%s."
#: main.php:314
msgid ""
@@ -8014,7 +7989,7 @@ msgstr ""
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "سانلىق مەلۇمات جەدىۋېلى ئىسمى"
#: navigation.php:303 navigation.php:304
@@ -8707,8 +8682,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
@@ -11078,6 +11053,12 @@ msgid "Rename view to"
msgstr ""
#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "بەت سانى"
+
+#, fuzzy
#~| msgid "Inline"
#~ msgid "Inline Edit"
#~ msgstr "ئىچكى بىرلىشىش"
diff --git a/po/uk.po b/po/uk.po
index eab2163..a1f71b1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,16 +3,16 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-07-03 18:10+0200\n"
"Last-Translator: <vovka2008(a)gmail.com>\n"
"Language-Team: ukrainian <uk(a)li.org>\n"
+"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.0.5\n"
#: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:264
@@ -25,6 +25,7 @@ msgstr "Показати все"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Номер сторінки:"
@@ -620,8 +621,8 @@ msgstr "Трекінг не активний."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -859,8 +860,8 @@ msgstr "Dump збережено у файл %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1405,7 +1406,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -2222,8 +2223,8 @@ msgstr "Ласкаво просимо до %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
#: libraries/auth/config.auth.lib.php:109
@@ -2365,13 +2366,13 @@ msgstr ""
msgid "Tables"
msgstr "Таблиць"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2645,11 +2646,11 @@ msgid "Click to toggle"
msgstr ""
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3126,7 +3127,6 @@ msgstr "Стискання"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "Помістити імена колонок в перший рядок"
@@ -3330,9 +3330,9 @@ msgid "Customize default options"
msgstr ""
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV дані"
@@ -4811,56 +4811,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Налаштування експорту бази даних"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "CSV для даних MS Excel"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5115,8 +5101,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5314,13 +5300,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5819,8 +5803,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -5858,7 +5842,6 @@ msgstr "Рядки розділено"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6197,7 +6180,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7332,13 +7314,6 @@ msgstr "ввімкнути чорновик (scratchboard)"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Usage"
-msgctxt "PDF"
-msgid "page"
-msgstr "Використання"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7567,8 +7542,8 @@ msgid ""
"For a list of available transformation options and their MIME type "
"transformations, click on %stransformation descriptions%s"
msgstr ""
-"Щоб отримати список можливих опцій і їх MIME-type перетворень, натисніть %"
-"sописи перетворень%s"
+"Щоб отримати список можливих опцій і їх MIME-type перетворень, натисніть "
+"%sописи перетворень%s"
#: libraries/tbl_properties.inc.php:147
msgid "Transformation options"
@@ -7980,7 +7955,7 @@ msgstr "БД відсутні"
#: navigation.php:270
#, fuzzy
#| msgid "Alter table order by"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "Змінити порядок таблиці"
#: navigation.php:303 navigation.php:304
@@ -8697,8 +8672,8 @@ msgstr "Усунути бази даних, які мають такі ж наз
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"Примітка: phpMyAdmin отримує права користувачів безпосередньо з таблиці прав "
"MySQL. Зміст цієї таблиці може відрізнятися від прав, які використовуються "
@@ -11116,6 +11091,12 @@ msgstr ""
msgid "Rename view to"
msgstr ""
+#, fuzzy
+#~| msgid "Usage"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "Використання"
+
#~ msgid "Inline Edit"
#~ msgstr "Редагування рядків"
@@ -11202,8 +11183,8 @@ msgstr ""
#~ "<b>Query statistics</b>: Since its startup, %s queries have been sent to "
#~ "the server."
#~ msgstr ""
-#~ "<b>Статистика запитів</b>: З моменту запуску, до сервера було надіслано %"
-#~ "s запитів."
+#~ "<b>Статистика запитів</b>: З моменту запуску, до сервера було надіслано "
+#~ "%s запиті� ика запитів</b>: З моменту запуску, до сервера було надіслано " " �ن " ตามเหตุผลที่แจ้งไว้ใน %shere" �ට " ��
B� ��
B� k�nq+ 6 � � ! � ! p�
B� ��
B� x4�r+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� �/�r+ ujnq+ �r+ �$�r+ �)�r+ ��oq+ x4�r+ ��
B� ��
B� k�nq+ �! �! p�
B� ��
B� H�jr+ ��
B� �bnq+ ��nq+ p�
B� `bnq+ ��
B� ��
B� ��
B� 8��q+ �p� ��
B� ujnq+ ��oq+ ��
B� ��
B� k�nq+ G H I J K M N O P p�
B� ��
B� H�Ar+ P�
B� �bnq+ ��nq+ p�
B� 0/�r+ ujnq+ @�r+ �� r+ �r+ �$�r+ �)�r+ ��oq+ H�Ar+ P�
B� ��
B� k�nq+ 8�Ar+ P�
B� ��
B� k�nq+ (�Ar+ P�
B� ��
B� k�nq+ �Ar+ P�
B� �
B� k�nq+ �.�r+ ujnq+ �)�r+ ��
B� �8 r+ einq+ �$�r+ ��
B� y8 r+ einq+ �r+ ��
B� Z8 r+ einq+ �� r+ @�r+ �� r+ �r+ �D�r+ �$�r+ �)�r+ ��oq+ 8��q+ ��q+ ��
B� p{ r+ ��
B� p�
B� k�nq+ 5 6 7 8 : < = > ? @ B D p�
B� ��
B� ��q+ ��
B� ujnq+ ��q+ �
B� ��q+ einq+ ��q+ �_@f �S Q��l�� �öq+ ��
B� ��q+ ��
B� ��
B� k�nq+ u]�� 4Q��U^Qʉ� �u������*ēvp�
B� ��
B� H��q+ D�q+ �
B� �PRs+ �PRs+ ���q+ ��
B� ��
B� ��
B� �
B� O�r+ ujnq+ �D�r+ `�
B� �PRs+ 0�
B� ��
B� ���������PRs+ ��
B� �."
#~ msgid "Chart generated successfully."
#~ msgstr "Права успішно перезавантажено."
diff --git a/po/ur.po b/po/ur.po
index e06d7fb..d390513 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,14 +6,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-04-23 08:37+0200\n"
"Last-Translator: Mehbooob Khan <mehboobbugti(a)gmail.com>\n"
"Language-Team: Urdu <ur(a)li.org>\n"
+"Language: ur\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ur\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -27,6 +27,7 @@ msgstr "تمام دکھائیں"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "صفحہ نمبر:"
@@ -622,8 +623,8 @@ msgstr "کھوج غیر فعال ہے۔"
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"اس جدول نقل میں اتنے کم از کم صفیں ہیں۔ حوالہ کے لیے %sdocumentation%s."
@@ -864,11 +865,11 @@ msgstr "ڈمپ اس مسل %s میں محفوظ ہوچکی ہے۔"
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"آپ نے بڑی مسل اپ لوڈ کرنے کی کوشش کی ہے۔ اس حد کے بارے جاننے کے لیے %"
-"sdocumentation%s دیکھیں۔"
+"آپ نے بڑی مسل اپ لوڈ کرنے کی کوشش کی ہے۔ اس حد کے بارے جاننے کے لیے "
+"%sdocumentation%s دیکھیں۔"
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1427,7 +1428,7 @@ msgid "Filters"
msgstr ""
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr ""
@@ -1741,8 +1742,8 @@ msgid ""
"A newer version of phpMyAdmin is available and you should consider "
"upgrading. The newest version is %s, released on %s."
msgstr ""
-"phpMyAdmin کا ایک نیا نسخہ دستیاب ہے اور آپ ضرور تازہ کاری کریں۔ نیا نسخہ %"
-"s, جاری کیا گیا %s."
+"phpMyAdmin کا ایک نیا نسخہ دستیاب ہے اور آپ ضرور تازہ کاری کریں۔ نیا نسخہ "
+"%s, جاری کیا گیا %s."
#. l10n: Latest available phpMyAdmin version
#: js/messages.php:278
@@ -2261,8 +2262,8 @@ msgstr "%s میں خوش آمدید"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"آپ نے شاید تشکیل مسل نہیں بنایا۔ آپ ہوسکتا ہے کہ %1$ssetup script%2$s کو "
"استعمال کرتے ہوئے بنانا چاہتے ہیں۔"
@@ -2407,13 +2408,13 @@ msgstr "حصہ دارانہ"
msgid "Tables"
msgstr "جداول"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2690,11 +2691,11 @@ msgid "Click to toggle"
msgstr "انتخاب کے لیے کلک کریں"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3187,7 +3188,6 @@ msgstr "سکڑاؤ"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "کالم نام پہلے صف میں ڈالیں"
@@ -3393,9 +3393,9 @@ msgid "Customize default options"
msgstr "طے شدہ اختیارات کی تخصیص کریں"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4959,56 +4959,42 @@ msgstr ""
msgid "CSV using LOAD DATA"
msgstr ""
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr ""
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr ""
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr ""
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr ""
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr ""
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr ""
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr ""
@@ -5273,8 +5259,8 @@ msgstr ""
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
#: libraries/display_export.lib.php:270
@@ -5470,13 +5456,11 @@ msgstr ""
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5969,8 +5953,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6000,7 +5984,6 @@ msgstr ""
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr ""
@@ -6331,7 +6314,6 @@ msgid "Go to view"
msgstr ""
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7457,13 +7439,6 @@ msgstr ""
msgid "ltr"
msgstr "rtl"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "Page number:"
-msgctxt "PDF"
-msgid "page"
-msgstr "صفحہ نمبر"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8023,8 +7998,10 @@ msgid "No databases"
msgstr ""
#: navigation.php:270
-msgid "filter tables by name"
-msgstr ""
+#, fuzzy
+#| msgid "Invalid table name"
+msgid "Filter tables by name"
+msgstr "غلط جدول نام"
#: navigation.php:303 navigation.php:304
msgctxt "short form"
@@ -8714,8 +8691,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
#: server_privileges.php:1851
@@ -11101,6 +11078,12 @@ msgstr ""
msgid "Rename view to"
msgstr ""
+#, fuzzy
+#~| msgid "Page number:"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "صفحہ نمبر"
+
#~ msgid "Inline Edit"
#~ msgstr "ان لائن تدوین"
diff --git a/po/uz.po b/po/uz.po
index 192317a..169060f 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-07-22 02:31+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: uzbek_cyrillic <uz(a)li.org>\n"
+"Language: uz\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.1\n"
@@ -24,6 +24,7 @@ msgstr "Барчасини кўрсатиш"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Саҳифа рақами: "
@@ -638,8 +639,8 @@ msgstr "Кузатиш фаол эмас."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Ушбу намойиш камида кўрсатилган миқдорда қаторларга эга. Батафсил маълумот "
"учун %sдокументацияга%s қаранг."
@@ -883,11 +884,11 @@ msgstr "Дамп \"%s\" файлида сақланди."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
-"Эҳтимол, юкланаётган файл ҳажми жуда катта. Бу муаммони ечишнинг усуллари %"
-"sдокументацияда%s келтирилган."
+"Эҳтимол, юкланаётган файл ҳажми жуда катта. Бу муаммони ечишнинг усуллари "
+"%sдокументацияда%s келтирилган."
#: import.php:277 import.php:330 libraries/File.class.php:456
#: libraries/File.class.php:539
@@ -1475,7 +1476,7 @@ msgid "Filters"
msgstr "Фильтр"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Фильтр"
@@ -2402,8 +2403,8 @@ msgstr "\"%s\" дастурига хуш келибсиз"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Эҳтимол, конфигурация файли тузилмаган. Уни тузиш учун %1$ssўрнатиш "
"сценарийсидан%2$s фойдаланишингиз мумкин."
@@ -2554,13 +2555,13 @@ msgstr ""
msgid "Tables"
msgstr "Жадваллар"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2857,11 +2858,11 @@ msgid "Click to toggle"
msgstr "Танлаш учун сичқонча тугмасини босинг"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3394,7 +3395,6 @@ msgstr "Сиқиш"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3622,9 +3622,9 @@ msgid "Customize default options"
msgstr "Экспорт афзалликларини созлаш"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4724,8 +4724,8 @@ msgstr "\"config\" аутентификация усули пароли"
msgid ""
"Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]"
msgstr ""
-"Агар PDF-схема ишлатмасангиз, бўш қолдиринг, асл қиймати: [kbd]"
-"\"pma_pdf_pages\"[/kbd]"
+"Агар PDF-схема ишлатмасангиз, бўш қолдиринг, асл қиймати: "
+"[kbd]\"pma_pdf_pages\"[/kbd]"
#: libraries/config/messages.inc.php:405
msgid "PDF schema: pages table"
@@ -4833,8 +4833,8 @@ msgstr "SSL уланишдан фойдаланиш"
msgid ""
"Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]"
msgstr ""
-"PDF-схемадан фойдаланмаслик учун бўш қолдиринг, асл қиймати: [kbd]"
-"\"pma_table_coords\"[/kbd]"
+"PDF-схемадан фойдаланмаслик учун бўш қолдиринг, асл қиймати: "
+"[kbd]\"pma_table_coords\"[/kbd]"
#: libraries/config/messages.inc.php:424
msgid "PDF schema: table coordinates"
@@ -5352,58 +5352,44 @@ msgstr "Аутентификация тартиби"
msgid "CSV using LOAD DATA"
msgstr "\"LOAD DATA\" ишлатилган CSV"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS иш китоби"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX иш китоби"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document жадвали"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
#, fuzzy
#| msgid "Custom color"
msgid "Custom"
msgstr "Рангни танлаш"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Маълумотлар базаси экспорт параметрлари"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "MS Excel учун CSV"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "OpenDocument матн"
@@ -5705,12 +5691,12 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Қиймат %1$sstrftime%2$s функцияси билан қайта ишланган, шунинг учун ҳозирги "
-"вақт ва санани қўйиш мумкин. Қўшимча равишда қуйидагилар ишлатилиши мумкин: %"
-"3$s. Матннинг бошқа қисмлари ўзгаришсиз қолади."
+"вақт ва санани қўйиш мумкин. Қўшимча равишда қуйидагилар ишлатилиши мумкин: "
+"%3$s. Матннинг бошқа қисмлари ўзгаришсиз қолади."
#: libraries/display_export.lib.php:270
msgid "use this for future exports"
@@ -5944,13 +5930,11 @@ msgstr "Индекс бўйича сортировка қилиш"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6506,8 +6490,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6545,7 +6529,6 @@ msgstr "Қаторлар бўлувчиси"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6901,7 +6884,6 @@ msgid "Go to view"
msgstr "Ушбу кўринишга ўтиш"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -8090,13 +8072,6 @@ msgstr "Кўрсатиш"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "саҳифалар сони "
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8828,7 +8803,7 @@ msgstr "Маълумотлар базаси мавжуд эмас"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "жадвал номи"
#: navigation.php:303 navigation.php:304
@@ -9572,8 +9547,8 @@ msgstr "Фойдаланувчилар номлари билан аталган
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"ИЗОҲ: phpMyAdmin фойдаланувчилар привилегиялари ҳақидаги маълумотларни "
"тўғридан-тўғри MySQL привилегиялари жадвалидан олади. Ушбу жадвалдаги "
@@ -10596,8 +10571,8 @@ msgstr "Очиқ файллар сони."
#: server_status.php:1222
msgid "The number of streams that are open (used mainly for logging)."
msgstr ""
-"Очиқ оқимлар сони (журнал файлларида кўлланилади). <b>Оқим</b> деб \"fopen()"
-"\" функцияси ёрдамида очилган файлга айтилади."
+"Очиқ оқимлар сони (журнал файлларида кўлланилади). <b>Оқим</b> деб \"fopen"
+"()\" функцияси ёрдамида очилган файлга айтилади."
#: server_status.php:1223
msgid "The number of tables that are open."
@@ -11442,9 +11417,9 @@ msgstr ""
#| "You set the [kbd]config[/kbd] authentication type and included username "
#| "and password for auto-login, which is not a desirable option for live "
#| "hosts. Anyone who knows or guesses your phpMyAdmin URL can directly "
-#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1"
-#| "$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/"
-#| "kbd]."
+#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id="
+#| "%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http"
+#| "[/kbd]."
msgid ""
"You set the [kbd]config[/kbd] authentication type and included username and "
"password for auto-login, which is not a desirable option for live hosts. "
@@ -12314,6 +12289,18 @@ msgstr "Ном кўриниши"
msgid "Rename view to"
msgstr "Кўриниш номини ўзгартириш"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS иш китоби"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX иш китоби"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "саҳифалар сони "
+
#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
@@ -12456,8 +12443,8 @@ msgstr "Кўриниш номини ўзгартириш"
#~ "The result of this query can't be used for a chart. See [a@./"
#~ "Documentation.html#faq6_29@Documentation]FAQ 6.29[/a]"
#~ msgstr ""
-#~ "Тахминий бўлиши мумкин. [a@./Documentation.html#faq3_11@Documentation]"
-#~ "\"FAQ 3.11\"[/a]га қаранг"
+#~ "Тахминий бўлиши мумкин. [a@./Documentation."
+#~ "html#faq3_11@Documentation]\"FAQ 3.11\"[/a]га қаранг"
#~ msgid "Bar type"
#~ msgstr "Сўров тури"
diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po
index 90ce961..a3243f7 100644
--- a/po/uz(a)latin.po
+++ b/po/uz(a)latin.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2010-07-22 02:30+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: uzbek_latin <uz@latin@li.org>\n"
+"Language: uz@latin\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: uz@latin\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.1\n"
@@ -24,6 +24,7 @@ msgstr "Barchasini ko‘rsatish"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "Sahifa raqami: "
@@ -640,8 +641,8 @@ msgstr "Kuzatish faol emas."
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr ""
"Ushbu namoyish kamida ko‘rsatilgan miqdorda qatorlarga ega. Batafsil "
"ma`lumot uchun %sdokumentatsiyaga%s qarang."
@@ -885,8 +886,8 @@ msgstr "Damp \"%s\" faylida saqlandi."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr ""
"Ehtimol, yuklanayotgan fayl hajmi juda katta. Bu muammoni yechishning "
"usullari %sdokumentatsiyada%s keltirilgan."
@@ -1480,7 +1481,7 @@ msgid "Filters"
msgstr "Filtr"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "Filtr"
@@ -2409,8 +2410,8 @@ msgstr "\"%s\" dasturiga xush kelibsiz"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"Ehtimol, konfiguratsiya fayli tuzilmagan. Uni tuzish uchun %1$sso‘rnatish "
"ssenariysidan%2$s foydalanishingiz mumkin."
@@ -2561,13 +2562,13 @@ msgstr ""
msgid "Tables"
msgstr "Jadvallar"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2865,11 +2866,11 @@ msgid "Click to toggle"
msgstr "Tanlash uchun sichqoncha tugmasini bosing"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3403,7 +3404,6 @@ msgstr "Siqish"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
#, fuzzy
#| msgid "Put fields names in the first row"
msgid "Put columns names in the first row"
@@ -3631,9 +3631,9 @@ msgid "Customize default options"
msgstr "Eksport afzalliklarini sozlash"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4647,9 +4647,9 @@ msgid ""
"More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug "
"tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]"
msgstr ""
-"Ko‘proq ma`lumot uchun [a@http://sf.net/support/tracker.php?aid=1849494]"
-"\"PMA bug tracker\"[/a] va [a@http://bugs.mysql.com/19588]\"MySQL Bugs\"[/a]"
-"larga qarang"
+"Ko‘proq ma`lumot uchun [a@http://sf.net/support/tracker.php?"
+"aid=1849494]\"PMA bug tracker\"[/a] va [a@http://bugs.mysql."
+"com/19588]\"MySQL Bugs\"[/a]larga qarang"
#: libraries/config/messages.inc.php:388
msgid "Disable use of INFORMATION_SCHEMA"
@@ -4739,8 +4739,8 @@ msgstr "\"config\" autentifikatsiya usuli paroli"
msgid ""
"Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]"
msgstr ""
-"Agar PDF-sxema ishlatmasangiz, bo‘sh qoldiring, asl qiymati: [kbd]"
-"\"pma_pdf_pages\"[/kbd]"
+"Agar PDF-sxema ishlatmasangiz, bo‘sh qoldiring, asl qiymati: "
+"[kbd]\"pma_pdf_pages\"[/kbd]"
#: libraries/config/messages.inc.php:405
msgid "PDF schema: pages table"
@@ -4754,8 +4754,8 @@ msgid ""
msgstr ""
"Aloqalar, xatcho‘plar va PDF imkoniyatlari uchun ishlatiladigan baza. "
"Batafsil ma`lumot uchun [a@http://wiki.phpmyadmin.net/pma/pmadb]\"pmadb\"[/a]"
-"ga qarang. Agar foydalanmasangiz, bo‘sh qoldiring. Asl qiymati: [kbd]"
-"\"phpmyadmin\"[/kbd]"
+"ga qarang. Agar foydalanmasangiz, bo‘sh qoldiring. Asl qiymati: "
+"[kbd]\"phpmyadmin\"[/kbd]"
#: libraries/config/messages.inc.php:407
#, fuzzy
@@ -4848,8 +4848,8 @@ msgstr "SSL ulanishdan foydalanish"
msgid ""
"Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]"
msgstr ""
-"PDF-sxemadan foydalanmaslik uchun bo‘sh qoldiring, asl qiymati: [kbd]"
-"\"pma_table_coords\"[/kbd]"
+"PDF-sxemadan foydalanmaslik uchun bo‘sh qoldiring, asl qiymati: "
+"[kbd]\"pma_table_coords\"[/kbd]"
#: libraries/config/messages.inc.php:424
msgid "PDF schema: table coordinates"
@@ -5373,58 +5373,44 @@ msgstr "Autentifikatsiya tartibi"
msgid "CSV using LOAD DATA"
msgstr "\"LOAD DATA\" ishlatilgan CSV"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS ish kitobi"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX ish kitobi"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "Open Document jadvali"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr ""
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
#, fuzzy
#| msgid "Custom color"
msgid "Custom"
msgstr "Rangni tanlash"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "Ma`lumotlar bazasi eksport parametrlari"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "MS Excel uchun CSV"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "OpenDocument matn"
@@ -5522,8 +5508,8 @@ msgid ""
"May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ "
"3.11[/a]"
msgstr ""
-"Taxminiy bo‘lishi mumkin. [a@./Documentation.html#faq3_11@Documentation]"
-"\"FAQ 3.11\"[/a]ga qarang"
+"Taxminiy bo‘lishi mumkin. [a@./Documentation."
+"html#faq3_11@Documentation]\"FAQ 3.11\"[/a]ga qarang"
#: libraries/dbi/mysql.dbi.lib.php:117 libraries/dbi/mysqli.dbi.lib.php:137
msgid "Connection for controluser as defined in your configuration failed."
@@ -5726,8 +5712,8 @@ msgstr ""
#| "happen: %3$s. Other text will be kept as is."
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"Qiymat %1$sstrftime%2$s funksiyasi bilan qayta ishlangan, shuning uchun "
"hozirgi vaqt va sanani qo‘yish mumkin. Qo‘shimcha ravishda quyidagilar "
@@ -5966,13 +5952,11 @@ msgstr "Indeks bo‘yicha sortirovka qilish"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -6531,8 +6515,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr ""
#: libraries/engines/pbxt.lib.php:129
@@ -6570,7 +6554,6 @@ msgstr "Qatorlar bo‘luvchisi"
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
#, fuzzy
#| msgid "Replace NULL by"
msgid "Replace NULL with:"
@@ -6927,7 +6910,6 @@ msgid "Go to view"
msgstr "Ushbu ko‘rinishga o‘tish"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -8119,13 +8101,6 @@ msgstr "Ko‘rsatish"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "sahifalar soni "
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8863,7 +8838,7 @@ msgstr "Ma`lumotlar bazasi mavjud emas"
#: navigation.php:270
#, fuzzy
#| msgid "table name"
-msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "jadval nomi"
#: navigation.php:303 navigation.php:304
@@ -9615,8 +9590,8 @@ msgstr ""
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"IZOH: phpMyAdmin foydalanuvchilar privilegiyalari haqidagi ma`lumotlarni "
"to‘g‘ridan-to‘g‘ri MySQL privilegiyalari jadvalidan oladi. Ushbu jadvaldagi "
@@ -11503,9 +11478,9 @@ msgstr ""
#| "You set the [kbd]config[/kbd] authentication type and included username "
#| "and password for auto-login, which is not a desirable option for live "
#| "hosts. Anyone who knows or guesses your phpMyAdmin URL can directly "
-#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1"
-#| "$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/"
-#| "kbd]."
+#| "access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id="
+#| "%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http"
+#| "[/kbd]."
msgid ""
"You set the [kbd]config[/kbd] authentication type and included username and "
"password for auto-login, which is not a desirable option for live hosts. "
@@ -11519,9 +11494,9 @@ msgstr ""
"real xostlar uchun tavsiya etilmaydi. Serverdagi phpMyAdmin turgan katalog "
"adresini bilgan yoki taxmin qilgan har kim ushbu dasturga bemalol kirib, "
"serverdagi ma`lumotlar bazalari bilan istalgan operatsiyalarni amalga "
-"oshirishi mumkin. Server [a@?page=servers&mode=edit&id=%1"
-"$d#tab_Server]autentifikatsiya usuli[/a]ni [kbd]cookie[/kbd] yoki [kbd]http[/"
-"kbd] deb belgilash tavsiya etiladi."
+"oshirishi mumkin. Server [a@?page=servers&mode=edit&id="
+"%1$d#tab_Server]autentifikatsiya usuli[/a]ni [kbd]cookie[/kbd] yoki [kbd]http"
+"[/kbd] deb belgilash tavsiya etiladi."
#: setup/lib/index.lib.php:294
#, fuzzy, php-format
@@ -12378,6 +12353,18 @@ msgstr "Nom ko‘rinishi"
msgid "Rename view to"
msgstr "Ko‘rinish nomini o‘zgartirish"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS ish kitobi"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX ish kitobi"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "sahifalar soni "
+
#, fuzzy
#~| msgid "Engines"
#~ msgid "Inline Edit"
@@ -12520,8 +12507,8 @@ msgstr "Ko‘rinish nomini o‘zgartirish"
#~ "The result of this query can't be used for a chart. See [a@./"
#~ "Documentation.html#faq6_29@Documentation]FAQ 6.29[/a]"
#~ msgstr ""
-#~ "Taxminiy bo‘lishi mumkin. [a@./Documentation.html#faq3_11@Documentation]"
-#~ "\"FAQ 3.11\"[/a]ga qarang"
+#~ "Taxminiy bo‘lishi mumkin. [a@./Documentation."
+#~ "html#faq3_11@Documentation]\"FAQ 3.11\"[/a]ga qarang"
#~ msgid "Bar type"
#~ msgstr "So‘rov turi"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 57e07b2..c628639 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,7 +3,7 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-08-11 04:40+0200\n"
"Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n"
"Language-Team: chinese_simplified <zh_CN(a)li.org>\n"
@@ -24,6 +24,7 @@ msgstr "全部显示"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "页码："
@@ -603,8 +604,8 @@ msgstr "追踪已禁用。"
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr "该视图最少包含的行数，参见%s文档%s。"
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -838,8 +839,8 @@ msgstr "转存已经保存到文件 %s 中。"
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr "您可能正在上传很大的文件，请参考%s文档%s来寻找解决方法。"
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1362,7 +1363,7 @@ msgid "Filters"
msgstr "过滤器"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "快速搜索"
@@ -1668,13 +1669,11 @@ msgid "Done"
msgstr "完成"
#: js/messages.php:302
-#| msgid "Prev"
msgctxt "Previous month"
msgid "Prev"
msgstr "上个月"
#: js/messages.php:307
-#| msgid "Next"
msgctxt "Next month"
msgid "Next"
msgstr "下个月"
@@ -2043,7 +2042,6 @@ msgid_plural "%1$d rows inserted."
msgstr[0] "插入了 %1$d 行。"
#: libraries/PDF.class.php:81
-#| msgid "Error reading data:"
msgid "Error while creating PDF:"
msgstr "创建 PDF 时发生错误:"
@@ -2150,8 +2148,8 @@ msgstr "欢迎使用 %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"你可能还没有创建配置文件。你可以使用 %1$s设置脚本%2$s 来创建一个配置文件。"
@@ -2292,13 +2290,13 @@ msgstr "已共享"
msgid "Tables"
msgstr "数据表"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2523,7 +2521,6 @@ msgstr "缺少参数:"
#: libraries/common.lib.php:2267 libraries/common.lib.php:2270
#: libraries/display_tbl.lib.php:306
-#| msgid "Begin"
msgctxt "First page"
msgid "Begin"
msgstr "首页"
@@ -2531,7 +2528,6 @@ msgstr "首页"
#: libraries/common.lib.php:2268 libraries/common.lib.php:2271
#: libraries/display_tbl.lib.php:307 server_binlog.php:135
#: server_binlog.php:137
-#| msgid "Previous"
msgctxt "Previous page"
msgid "Previous"
msgstr "上一页"
@@ -2539,14 +2535,12 @@ msgstr "上一页"
#: libraries/common.lib.php:2297 libraries/common.lib.php:2300
#: libraries/display_tbl.lib.php:370 server_binlog.php:170
#: server_binlog.php:172
-#| msgid "Next"
msgctxt "Next page"
msgid "Next"
msgstr "下一页"
#: libraries/common.lib.php:2298 libraries/common.lib.php:2301
#: libraries/display_tbl.lib.php:385
-#| msgid "End"
msgctxt "Last page"
msgid "End"
msgstr "尾页"
@@ -2566,11 +2560,11 @@ msgid "Click to toggle"
msgstr "点击切换"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3055,7 +3049,6 @@ msgstr "压缩"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "首行保存字段名"
@@ -3261,9 +3254,9 @@ msgid "Customize default options"
msgstr "自定义默认选项"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -3880,7 +3873,6 @@ msgid "Memory limit"
msgstr "内存限制"
#: libraries/config/messages.inc.php:319
-#| msgid "These are Edit, Inline edit, Copy and Delete links"
msgid "These are Edit, Copy and Delete links"
msgstr "它们是编辑、复制和删除链接"
@@ -4102,8 +4094,8 @@ msgid ""
"Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] "
"support, suggested: [kbd]pma_bookmark[/kbd]"
msgstr ""
-"不使用[a@http://wiki.phpmyadmin.net/pma/bookmark]书签 (外链，英文)[/a]功能请留空，推荐: "
-"[kbd]pma_bookmark[/kbd]"
+"不使用[a@http://wiki.phpmyadmin.net/pma/bookmark]书签 (外链，英文)[/a]功能请"
+"留空，推荐: [kbd]pma_bookmark[/kbd]"
#: libraries/config/messages.inc.php:373
msgid "Bookmark table"
@@ -4267,8 +4259,8 @@ msgid ""
"phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for "
"no support. Suggested: [kbd]phpmyadmin[/kbd]"
msgstr ""
-"关系、书签、PDF 功能所用的数据库。参见 [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb "
-"(外链，英文)[/a]。不使用请留空。推荐: [kbd]phpmyadmin[/kbd]"
+"关系、书签、PDF 功能所用的数据库。参见 [a@http://wiki.phpmyadmin.net/pma/"
+"pmadb]pmadb (外链，英文)[/a]。不使用请留空。推荐: [kbd]phpmyadmin[/kbd]"
#: libraries/config/messages.inc.php:407
msgid "Database name"
@@ -4283,9 +4275,6 @@ msgid "Server port"
msgstr "服务器端口"
#: libraries/config/messages.inc.php:410
-#| msgid ""
-#| "Leave blank for no user preferences storage in database, suggested: [kbd]"
-#| "pma_config[/kbd]"
msgid ""
"Leave blank for no \"persistent\" recently used tables across sessions, "
"suggested: [kbd]pma_recent[/kbd]"
@@ -4300,8 +4289,8 @@ msgid ""
"Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links"
"[/a] support, suggested: [kbd]pma_relation[/kbd]"
msgstr ""
-"不使用[a@http://wiki.phpmyadmin.net/pma/relation]关系链接 (外链，英文)[/a]功能请留空，推荐: "
-"[kbd]pma_relation[/kbd]"
+"不使用[a@http://wiki.phpmyadmin.net/pma/relation]关系链接 (外链，英文)[/a]功"
+"能请留空，推荐: [kbd]pma_relation[/kbd]"
#: libraries/config/messages.inc.php:413
msgid "Relation table"
@@ -4367,16 +4356,12 @@ msgid "Display columns table"
msgstr "显示字段表"
#: libraries/config/messages.inc.php:427
-#| msgid ""
-#| "Leave blank for no user preferences storage in database, suggested: [kbd]"
-#| "pma_config[/kbd]"
msgid ""
"Leave blank for no \"persistent\" tables'UI preferences across sessions, "
"suggested: [kbd]pma_table_uiprefs[/kbd]"
msgstr "不需要 \"持久\" 表界面设置请留空，推荐: [kbd]pma_table_uiprefs[/kbd]"
#: libraries/config/messages.inc.php:428
-#| msgid "User preferences storage table"
msgid "UI preferences table"
msgstr "界面设置表"
@@ -4810,56 +4795,42 @@ msgstr "Signon 认证"
msgid "CSV using LOAD DATA"
msgstr "CSV 使用 LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS 工作簿"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX 工作簿"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "OpenOffice 表格"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "快速"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "自定义"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "数据库导出选项"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "MS Excel 的 CSV 格式"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "OpenOffice 文档"
@@ -5113,8 +5084,8 @@ msgstr "，@TABLE@ 将变成数据表名"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"这个值是使用 %1$sstrftime%2$s 来解析的，所以你能用时间格式的字符串。另外，下"
"列内容也将被转换：%3$s。其他文本将保持原样。参见%4$s常见问题 (FAQ)%5$s。"
@@ -5312,13 +5283,11 @@ msgstr "主键排序"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5833,8 +5802,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr "关于 PBXT 的文档和更多信息请参见 %sPrimeBase XT 主页%s。"
#: libraries/engines/pbxt.lib.php:129
@@ -5864,7 +5833,6 @@ msgstr "换行符："
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "将 NULL 替换为："
@@ -6194,7 +6162,6 @@ msgid "Go to view"
msgstr "转到视图"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7262,13 +7229,6 @@ msgstr "切换草稿板"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "页数"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -7867,7 +7827,9 @@ msgid "No databases"
msgstr "无数据库"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "请输入部分或完整的表名"
#: navigation.php:303 navigation.php:304
@@ -8544,12 +8506,12 @@ msgstr "删除与用户同名的数据库。"
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"注意：phpMyAdmin 直接由 MySQL 权限表取得用户权限。如果用户手动更改表，表内容"
-"将可能与服务器使用的用户权限有异。在这种情况下，您应在继续前%s重新载入权限%"
-"s。"
+"将可能与服务器使用的用户权限有异。在这种情况下，您应在继续前%s重新载入权"
+"限%s。"
#: server_privileges.php:1851
msgid "The selected user was not found in the privilege table."
@@ -10971,6 +10933,18 @@ msgstr "视图名"
msgid "Rename view to"
msgstr "将视图改名为"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS 工作簿"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX 工作簿"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "页数"
+
#~ msgid "Inline Edit"
#~ msgstr "快速编辑"
@@ -11152,8 +11126,8 @@ msgstr "将视图改名为"
#~ "Note that not every result table can be put to the chart. See <a href=\"./"
#~ "Documentation.html#faq6_29\" target=\"Documentation\">FAQ 6.29</a>"
#~ msgstr ""
-#~ "请注意不是所有的结果表都能绘图。参见<a href=\"./Documentation.html#faq6_29"
-#~ "\" target=\"Documentation\">常见问题 (FAQ) 6.29</a>"
+#~ "请注意不是所有的结果表都能绘图。参见<a href=\"./Documentation."
+#~ "html#faq6_29\" target=\"Documentation\">常见问题 (FAQ) 6.29</a>"
#~ msgid "Add a New User"
#~ msgstr "添加新用户"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9f69c93..46c0af2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,14 +3,14 @@ msgid ""
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-10 10:14-0400\n"
+"POT-Creation-Date: 2011-08-11 09:35+0200\n"
"PO-Revision-Date: 2011-06-19 09:59+0200\n"
"Last-Translator: <star(a)origin.club.tw>\n"
"Language-Team: chinese_traditional <zh_TW(a)li.org>\n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -24,6 +24,7 @@ msgstr "全部顯示"
#: libraries/schema/Pdf_Relation_Schema.class.php:918
#: libraries/schema/Pdf_Relation_Schema.class.php:934
#: libraries/schema/User_Schema.class.php:355
+#: libraries/select_lang.lib.php:482
msgid "Page number:"
msgstr "頁碼："
@@ -608,8 +609,8 @@ msgstr "追蹤已停用"
#: db_structure.php:373 libraries/display_tbl.lib.php:2226
#, php-format
msgid ""
-"This view has at least this number of rows. Please refer to %sdocumentation%"
-"s."
+"This view has at least this number of rows. Please refer to %sdocumentation"
+"%s."
msgstr "這個檢視至少需包含這個數目的資料，請參考%sdocumentation%s。"
#: db_structure.php:387 db_structure.php:401 libraries/header.inc.php:158
@@ -843,8 +844,8 @@ msgstr "備份資料已儲存至檔案 %s."
#: import.php:57
#, php-format
msgid ""
-"You probably tried to upload too large file. Please refer to %sdocumentation%"
-"s for ways to workaround this limit."
+"You probably tried to upload too large file. Please refer to %sdocumentation"
+"%s for ways to workaround this limit."
msgstr "您上傳的檔案過大, 請查看此 %s 文件 %s 了解如何解決此限制."
#: import.php:277 import.php:330 libraries/File.class.php:456
@@ -1399,7 +1400,7 @@ msgid "Filters"
msgstr "過濾"
#. l10n: Filter as in "Start Filtering"
-#: js/messages.php:169 navigation.php:270
+#: js/messages.php:169
msgid "Filter"
msgstr "過濾"
@@ -2213,8 +2214,8 @@ msgstr "歡迎使用 %s"
#: libraries/auth/config.auth.lib.php:100
#, php-format
msgid ""
-"You probably did not create a configuration file. You might want to use the %"
-"1$ssetup script%2$s to create one."
+"You probably did not create a configuration file. You might want to use the "
+"%1$ssetup script%2$s to create one."
msgstr ""
"您可能還沒有建立設定檔案。您可以使用 %1$s設定指令%2$s 來建立一個設定檔案"
@@ -2357,13 +2358,13 @@ msgstr "已共享"
msgid "Tables"
msgstr "資料表"
-#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:307
-#: libraries/config/setup.forms.php:343 libraries/config/setup.forms.php:374
-#: libraries/config/setup.forms.php:379
-#: libraries/config/user_preferences.forms.php:207
-#: libraries/config/user_preferences.forms.php:243
-#: libraries/config/user_preferences.forms.php:274
-#: libraries/config/user_preferences.forms.php:279
+#: libraries/build_html_for_db.lib.php:36 libraries/config/setup.forms.php:301
+#: libraries/config/setup.forms.php:337 libraries/config/setup.forms.php:360
+#: libraries/config/setup.forms.php:365
+#: libraries/config/user_preferences.forms.php:201
+#: libraries/config/user_preferences.forms.php:237
+#: libraries/config/user_preferences.forms.php:260
+#: libraries/config/user_preferences.forms.php:265
#: libraries/export/latex.php:201 libraries/export/sql.php:1052
#: server_privileges.php:600 server_replication.php:314 tbl_printview.php:281
#: tbl_structure.php:767
@@ -2642,11 +2643,11 @@ msgid "Click to toggle"
msgstr "點擊選取"
#: libraries/common.lib.php:2867 libraries/common.lib.php:2874
-#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:298
-#: libraries/config/setup.forms.php:335 libraries/config/setup.forms.php:369
-#: libraries/config/user_preferences.forms.php:198
-#: libraries/config/user_preferences.forms.php:235
-#: libraries/config/user_preferences.forms.php:269
+#: libraries/common.lib.php:3066 libraries/config/setup.forms.php:292
+#: libraries/config/setup.forms.php:329 libraries/config/setup.forms.php:355
+#: libraries/config/user_preferences.forms.php:192
+#: libraries/config/user_preferences.forms.php:229
+#: libraries/config/user_preferences.forms.php:255
#: libraries/db_links.inc.php:48 libraries/export/latex.php:338
#: libraries/import.lib.php:1102 libraries/tbl_links.inc.php:61
#: libraries/tbl_properties.inc.php:608 pmd_general.php:151
@@ -3133,7 +3134,6 @@ msgstr "壓縮"
#: libraries/export/excel.php:25 libraries/export/htmlword.php:30
#: libraries/export/latex.php:72 libraries/export/ods.php:25
#: libraries/export/odt.php:58 libraries/export/texytext.php:28
-#: libraries/export/xls.php:25 libraries/export/xlsx.php:25
msgid "Put columns names in the first row"
msgstr "首行儲存欄位名稱"
@@ -3339,9 +3339,9 @@ msgid "Customize default options"
msgstr "自定預設選項"
#: libraries/config/messages.inc.php:158 libraries/config/setup.forms.php:239
-#: libraries/config/setup.forms.php:318
+#: libraries/config/setup.forms.php:312
#: libraries/config/user_preferences.forms.php:141
-#: libraries/config/user_preferences.forms.php:218 libraries/export/csv.php:19
+#: libraries/config/user_preferences.forms.php:212 libraries/export/csv.php:19
#: libraries/import/csv.php:22
msgid "CSV"
msgstr "CSV"
@@ -4882,56 +4882,42 @@ msgstr "Signon 認證"
msgid "CSV using LOAD DATA"
msgstr "CSV 使用 LOAD DATA"
-#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:350
+#: libraries/config/setup.forms.php:256 libraries/config/setup.forms.php:349
#: libraries/config/user_preferences.forms.php:157
-#: libraries/config/user_preferences.forms.php:250 libraries/export/xls.php:18
-#: libraries/import/xls.php:21
-msgid "Excel 97-2003 XLS Workbook"
-msgstr "Excel 97-2003 XLS 工作簿"
-
-#: libraries/config/setup.forms.php:259 libraries/config/setup.forms.php:354
-#: libraries/config/user_preferences.forms.php:160
-#: libraries/config/user_preferences.forms.php:254
-#: libraries/export/xlsx.php:18 libraries/import/xlsx.php:21
-msgid "Excel 2007 XLSX Workbook"
-msgstr "Excel 2007 XLSX 工作簿"
-
-#: libraries/config/setup.forms.php:262 libraries/config/setup.forms.php:363
-#: libraries/config/user_preferences.forms.php:163
-#: libraries/config/user_preferences.forms.php:263 libraries/export/ods.php:18
+#: libraries/config/user_preferences.forms.php:249 libraries/export/ods.php:18
#: libraries/import/ods.php:22
msgid "Open Document Spreadsheet"
msgstr "OpenOffice 表格"
-#: libraries/config/setup.forms.php:269
-#: libraries/config/user_preferences.forms.php:170
+#: libraries/config/setup.forms.php:263
+#: libraries/config/user_preferences.forms.php:164
msgid "Quick"
msgstr "快速"
-#: libraries/config/setup.forms.php:273
-#: libraries/config/user_preferences.forms.php:174
+#: libraries/config/setup.forms.php:267
+#: libraries/config/user_preferences.forms.php:168
msgid "Custom"
msgstr "自訂"
-#: libraries/config/setup.forms.php:294
-#: libraries/config/user_preferences.forms.php:194
+#: libraries/config/setup.forms.php:288
+#: libraries/config/user_preferences.forms.php:188
msgid "Database export options"
msgstr "資料庫匯出選項"
-#: libraries/config/setup.forms.php:327
-#: libraries/config/user_preferences.forms.php:227
+#: libraries/config/setup.forms.php:321
+#: libraries/config/user_preferences.forms.php:221
#: libraries/export/excel.php:18
msgid "CSV for MS Excel"
msgstr "MS Excel 的 CSV 格式"
-#: libraries/config/setup.forms.php:358
-#: libraries/config/user_preferences.forms.php:258
+#: libraries/config/setup.forms.php:344
+#: libraries/config/user_preferences.forms.php:244
#: libraries/export/htmlword.php:18
msgid "Microsoft Word 2000"
msgstr "Microsoft Word 2000"
-#: libraries/config/setup.forms.php:367
-#: libraries/config/user_preferences.forms.php:267 libraries/export/odt.php:22
+#: libraries/config/setup.forms.php:353
+#: libraries/config/user_preferences.forms.php:253 libraries/export/odt.php:22
msgid "Open Document Text"
msgstr "OpenOffice 檔案"
@@ -5187,8 +5173,8 @@ msgstr "，@TABLE@ 將變成資料資料表名稱"
#, php-format
msgid ""
"This value is interpreted using %1$sstrftime%2$s, so you can use time "
-"formatting strings. Additionally the following transformations will happen: %"
-"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
+"formatting strings. Additionally the following transformations will happen: "
+"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details."
msgstr ""
"這個值是使用 %1$sstrftime%2$s 來解析的，所以您能用時間格式的字元串。另外，下"
"列內容也將被轉換：%3$s。其他文字將保持原樣。參見%4$s常見問題 (FAQ)%5$s"
@@ -5388,13 +5374,11 @@ msgstr "主鍵排序"
#: libraries/export/ods.php:29 libraries/export/odt.php:27
#: libraries/export/pdf.php:29 libraries/export/php_array.php:29
#: libraries/export/sql.php:88 libraries/export/texytext.php:31
-#: libraries/export/xls.php:29 libraries/export/xlsx.php:29
#: libraries/export/xml.php:27 libraries/export/yaml.php:30
#: libraries/import.lib.php:1080 libraries/import.lib.php:1102
#: libraries/import/csv.php:33 libraries/import/docsql.php:35
#: libraries/import/ldi.php:49 libraries/import/ods.php:32
-#: libraries/import/sql.php:20 libraries/import/xls.php:28
-#: libraries/import/xlsx.php:28 libraries/import/xml.php:25
+#: libraries/import/sql.php:20 libraries/import/xml.php:25
#: libraries/rte/rte_routines.lib.php:852 tbl_select.php:258
#: tbl_structure.php:852
msgid "Options"
@@ -5907,8 +5891,8 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:125
#, php-format
msgid ""
-"Documentation and further information about PBXT can be found on the %"
-"sPrimeBase XT Home Page%s."
+"Documentation and further information about PBXT can be found on the "
+"%sPrimeBase XT Home Page%s."
msgstr "關於 PBXT 的檔案和更多資訊請參見 %sPrimeBase XT 首頁%s"
#: libraries/engines/pbxt.lib.php:129
@@ -5938,7 +5922,6 @@ msgstr "換行符號："
#: libraries/export/csv.php:28 libraries/export/excel.php:23
#: libraries/export/htmlword.php:29 libraries/export/latex.php:80
#: libraries/export/ods.php:24 libraries/export/odt.php:60
-#: libraries/export/xls.php:24 libraries/export/xlsx.php:24
msgid "Replace NULL with:"
msgstr "將 NULL 替換爲："
@@ -6280,7 +6263,6 @@ msgid "Go to view"
msgstr "轉到 view"
#: libraries/import/csv.php:38 libraries/import/ods.php:26
-#: libraries/import/xls.php:25 libraries/import/xlsx.php:25
msgid ""
"The first line of the file contains the table column names <i>(if this is "
"unchecked, the first line will become part of the data)</i>"
@@ -7419,13 +7401,6 @@ msgstr "切換草稿板"
msgid "ltr"
msgstr "ltr"
-#: libraries/select_lang.lib.php:482
-#, fuzzy
-#| msgid "pages"
-msgctxt "PDF"
-msgid "page"
-msgstr "頁數"
-
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
#, php-format
@@ -8027,7 +8002,9 @@ msgid "No databases"
msgstr "無資料庫"
#: navigation.php:270
-msgid "filter tables by name"
+#, fuzzy
+#| msgid "filter tables by name"
+msgid "Filter tables by name"
msgstr "請輸入部分或完整的表名"
#: navigation.php:303 navigation.php:304
@@ -8703,8 +8680,8 @@ msgstr "刪除與使用者同名的資料庫"
msgid ""
"Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
"tables. The content of these tables may differ from the privileges the "
-"server uses, if they have been changed manually. In this case, you should %"
-"sreload the privileges%s before you continue."
+"server uses, if they have been changed manually. In this case, you should "
+"%sreload the privileges%s before you continue."
msgstr ""
"注意：phpMyAdmin 直接由 MySQL 權限表取得使用者權限。如果使用者手動更改表，表"
"內容將可能與伺服器使用的使用者權限有異。在這種情況下，您應在繼續前%s重新載入"
@@ -11200,6 +11177,18 @@ msgstr "view名"
msgid "Rename view to"
msgstr "將 view改名爲"
+#~ msgid "Excel 97-2003 XLS Workbook"
+#~ msgstr "Excel 97-2003 XLS 工作簿"
+
+#~ msgid "Excel 2007 XLSX Workbook"
+#~ msgstr "Excel 2007 XLSX 工作簿"
+
+#, fuzzy
+#~| msgid "pages"
+#~ msgctxt "PDF"
+#~ msgid "page"
+#~ msgstr "頁數"
+
#~ msgid "Inline Edit"
#~ msgstr "快速編輯"
@@ -11382,8 +11371,8 @@ msgstr "將 view改名爲"
#~ "Note that not every result table can be put to the chart. See <a href=\"./"
#~ "Documentation.html#faq6_29\" target=\"Documentation\">FAQ 6.29</a>"
#~ msgstr ""
-#~ "請注意不是所有的結果表都能繪圖。參見<a href=\"./Documentation.html#faq6_29"
-#~ "\" target=\"Documentation\">常見問題 (FAQ) 6.29</a>"
+#~ "請注意不是所有的結果表都能繪圖。參見<a href=\"./Documentation."
+#~ "html#faq6_29\" target=\"Documentation\">常見問題 (FAQ) 6.29</a>"
#~ msgid "Add a New User"
#~ msgstr "新增新使用者"
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14369-g3f75240
by Michal Čihař 11 Aug '11
by Michal Čihař 11 Aug '11
11 Aug '11
The branch, master has been updated
via 3f75240d7c7905602af8a9f0ad8343b5c886adf0 (commit)
via 63eab10bf9d7eb168d84c40e8570927bd3bfc1b4 (commit)
via 12eeae5509d1217c52a38f117c6e25f10d82193d (commit)
via 1ae5905417b239c428f2b835558c463be1e72ab6 (commit)
via 606c17abb17deb6d908ff1b9be97561c4dcbfcfc (commit)
via f17c2be8453b8dfdb49da35e3cc79aedba46b400 (commit)
via 451a87150f8bbd7ee1befb35ed544fedb971ec34 (commit)
via 91e14d8fb5037f4873714f5355d895b4a10f271a (commit)
via bc21c402b9d18716d5925033e38f796dfbab66d5 (commit)
via a700463e25fc05afbb4bdc07115b823cec05c6c2 (commit)
via 870db23de5d540d41f0748ff02bde91785ef9869 (commit)
via 65227f5868dc9074c03f4f2ae113844cc9d5c664 (commit)
via 9d63f2ae479f6c3722ac8e14c6c8b67fdf68a422 (commit)
via 7707b05dadf5b003318dbf62371ebaaf7f4b9cfb (commit)
via d5f8b1e887e74d3ae2d3ac714872f5fca81aba46 (commit)
via d5d0a9822cb2415cfc424622bfe2266b3d7ee843 (commit)
via 60bd210bf41e1f09357b5396adff52f017e0b82c (commit)
via 2ab35ed3cffbf05cdb313f79709f9111457e9c3c (commit)
via 9f62e2294a2c5eb80bae76429d5104a5ecd8ab59 (commit)
via 949c114efc50ffe9adebcd8d3731f33669f80b2a (commit)
via 5a1ae562ce63d1835dbb7bdd58b17705b99d6353 (commit)
via 7b3547a4a0c4e32965d78d306f95844727aaa397 (commit)
via 14e0a16ed60219a3d908034bbc8a03d71a5a0b30 (commit)
via 897065890836c5ecce956b83dab896125ca3eaf6 (commit)
via 0c79cfff3d91a3da9115192b8d631ab442809ee8 (commit)
via 5ee062aea1479f740bc996368477c41ed167d1a0 (commit)
via 6cfc39a56bce62f42cea0c947c10c29d8dd7a062 (commit)
via e601f9a56f2775e1c029786899bfacf0c1e0e849 (commit)
via 0abb9e2f1c104bb28f1e6ff48a9f712b0b131702 (commit)
via fc594f09628ac76cbc834134533745867802ee48 (commit)
via ba7a367651b188098e0b4169435c2472b791226f (commit)
via 1b07aa89cd0e084cc460242745b2cb71a1e30979 (commit)
via 11ece615503bd81bd9f92d8e6c4b850d5c0ae33b (commit)
via 15220c14a9e0f5dc1d74f3edb5d620dd73be3446 (commit)
via db340824639c83fc7b2cc611524ff1de117235f6 (commit)
via e0d4d0f66668f08bde2d73f48b2d3bae77630c76 (commit)
via 374bfbfc474e3eac66831c158d3a160b3ea051b8 (commit)
via 6a43dd6a2848dea8f80344845b01f0b8db224f97 (commit)
via d5580026cc47d9253f9fe85ef203eeb9952d341e (commit)
via bdeb7bc0912c500dea31ed18e7f53e44d178d97e (commit)
via 6c6228976a205f383f665e0501f740319ca905d9 (commit)
via bb8e52280f0a63f2454546f2f11baed044b42018 (commit)
via 2aa6884ddd5f3ee8be70f354ae6b14e17b487e41 (commit)
via 00e75fef2bc20fdb6907696bf11824cfdf17f498 (commit)
via ec47a2328da27ea02d45805b851619071dfe5fb8 (commit)
via b46ae1db38ac5d8712260b5af953da79c1704980 (commit)
via f85ce7e774efc2594e8add389b614c994f178f3f (commit)
via 5bd7ca9e544554e4b18946589ec010a8dc8e7349 (commit)
via 34efbdf088a13199761c048647d0308e83cb765e (commit)
via a294d64735423f52bc543baaf25bbe871572da9c (commit)
via 331287ae15b886cb75641fed7414a2ce10669526 (commit)
via 0acf748b3d8b638c7650212e549411edc414d102 (commit)
via bb94a12e69e525dee1ec9433fe65352090f66752 (commit)
via c4de465fc55089b4b55bd87afec3b0cd6860d2ee (commit)
via e0a82d136e06abdba9e08f530a898f1a8f16e46e (commit)
via 8820aba3dd43ac39406aeaa5f904e72c120bc9bf (commit)
via 1c3d94ac00e1e10f2727c469f4c011a159c2bc81 (commit)
via 25151711d3db97094269071fb59db6f37d7cd1e6 (commit)
via aab7364146c48a50601cf2bd066036775d42b716 (commit)
via 3f3971a4ca1dae47d8e8e797a9364313ac1c0155 (commit)
via 0e26a397281877b7628ccaf0e050a092981056d3 (commit)
via af07ff2bd8661a3f350ffdd772298ed31f97846f (commit)
via f1c25a3dd2b5febc365651ad0652e4dee05f5d80 (commit)
via 42e4bd108fa86dcc565537f9a1413f5e81115727 (commit)
via 74325f3cd97e61a8e05cd5ce9e2a9de404a4a962 (commit)
via c2198470a76b5ad014b03457af2575b19023f24c (commit)
via 8822f712be7798fef38cb32028ef896abb1f1d8a (commit)
via 4cbaf6c66ccd9af5b5dc800258a25e7f929839fd (commit)
via 3c3f7af900cd4e5bc08bd15dc35dbec055ef05b2 (commit)
via d3a57dde00e7e328ff1826695da0448589461f21 (commit)
via cb593d155c312277519f8cede71d7326e724f187 (commit)
via fdb0678616d1281b8bcdc855ba4611f30375e040 (commit)
via 825412641e80e3d78b512dde4f0ae5f34a127828 (commit)
via 30d07ab331b9bc5cc63064b9f656c5dbf653dc10 (commit)
via 0180db012833c089af57e38426ab983162bd2cd6 (commit)
via ce5c8d1b06f1ca85c4c27ab8e47ef6c1b0064268 (commit)
via 7836fdd05984d9fb354908b0206070fe3c068033 (commit)
via 150c27791b2fc9d4d9ffc917e5fdf4753376a578 (commit)
via 099aaff10a7cab15234266c1a97cd6ea6e15d12e (commit)
via 965dc99a21a58560cf8bbbcfffe9be6346e48bb0 (commit)
via b675924addc0e1236c5afe11990eec4aeee67c6c (commit)
via 39c87fd56c955312d89d0874646468e112a19cb9 (commit)
via 1399a3b5cad0b5375a7fb098b1a59bbbfadc0c00 (commit)
via f7ddbdc1dffa89f86a9a91f6dd4d913b5b98ee75 (commit)
via ef44229382b99d8a5f83d94de4f39f82f6dcca75 (commit)
via 4e9fdb297a5fdf24e050362b5466a22adec02362 (commit)
via bf984817f52f8527b9eee186bb85e805ad9872c0 (commit)
via 19c1ea10e67b871541e1bdcf773b001473f78d0b (commit)
via f688cf02b675731eea9d47aa1c80b52ac311b233 (commit)
via 3bda5750e1921ee726af6570d59db593cdbc3eac (commit)
via 84ce558c01bcd7e07acd56a7bcf6b6038efc406c (commit)
via 8324b197728bd81a61c5e8278f5d32ef88ea5c52 (commit)
via 7bcc2f55ae514586406365051b074c92cebb351f (commit)
via 7adf1c382d3631c4dc39ef6a35e21afb5d19d9ae (commit)
via 0128d099612030d4bda3d36d2636cf8d342d692c (commit)
via 4e5686c532069577d610d5cc6dfb82c5130b36bc (commit)
via 39a7041eab8b74cefa027098db78432639f0b1af (commit)
via c9c519c7e3109ddd6cbebf32b80b555cad5fc54c (commit)
via 02e91d9240644122415f9a1701faf988dd0d870d (commit)
from b36f2e3ca1f54c15d7b6b0236eb89cb3bbb8cdd2 (commit)
- Log -----------------------------------------------------------------
commit 3f75240d7c7905602af8a9f0ad8343b5c886adf0
Merge: b36f2e3 63eab10
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Thu Aug 11 09:34:25 2011 +0200
Merge remote-tracking branch 'pootle/master'
commit 63eab10bf9d7eb168d84c40e8570927bd3bfc1b4
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:40:52 2011 +0200
Translation update done using Pootle.
commit 12eeae5509d1217c52a38f117c6e25f10d82193d
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:40:15 2011 +0200
Translation update done using Pootle.
commit 1ae5905417b239c428f2b835558c463be1e72ab6
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:40:03 2011 +0200
Translation update done using Pootle.
commit 606c17abb17deb6d908ff1b9be97561c4dcbfcfc
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:39:16 2011 +0200
Translation update done using Pootle.
commit f17c2be8453b8dfdb49da35e3cc79aedba46b400
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:38:50 2011 +0200
Translation update done using Pootle.
commit 451a87150f8bbd7ee1befb35ed544fedb971ec34
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:38:34 2011 +0200
Translation update done using Pootle.
commit 91e14d8fb5037f4873714f5355d895b4a10f271a
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:36:30 2011 +0200
Translation update done using Pootle.
commit bc21c402b9d18716d5925033e38f796dfbab66d5
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:36:09 2011 +0200
Translation update done using Pootle.
commit a700463e25fc05afbb4bdc07115b823cec05c6c2
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:35:07 2011 +0200
Translation update done using Pootle.
commit 870db23de5d540d41f0748ff02bde91785ef9869
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:34:34 2011 +0200
Translation update done using Pootle.
commit 65227f5868dc9074c03f4f2ae113844cc9d5c664
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:32:48 2011 +0200
Translation update done using Pootle.
commit 9d63f2ae479f6c3722ac8e14c6c8b67fdf68a422
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:32:21 2011 +0200
Translation update done using Pootle.
commit 7707b05dadf5b003318dbf62371ebaaf7f4b9cfb
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:31:47 2011 +0200
Translation update done using Pootle.
commit d5f8b1e887e74d3ae2d3ac714872f5fca81aba46
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:31:26 2011 +0200
Translation update done using Pootle.
commit d5d0a9822cb2415cfc424622bfe2266b3d7ee843
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:23:26 2011 +0200
Translation update done using Pootle.
commit 60bd210bf41e1f09357b5396adff52f017e0b82c
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:17:04 2011 +0200
Translation update done using Pootle.
commit 2ab35ed3cffbf05cdb313f79709f9111457e9c3c
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:12:53 2011 +0200
Translation update done using Pootle.
commit 9f62e2294a2c5eb80bae76429d5104a5ecd8ab59
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:03:34 2011 +0200
Translation update done using Pootle.
commit 949c114efc50ffe9adebcd8d3731f33669f80b2a
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 04:01:20 2011 +0200
Translation update done using Pootle.
commit 5a1ae562ce63d1835dbb7bdd58b17705b99d6353
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 03:57:39 2011 +0200
Translation update done using Pootle.
commit 7b3547a4a0c4e32965d78d306f95844727aaa397
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 03:35:34 2011 +0200
Translation update done using Pootle.
commit 14e0a16ed60219a3d908034bbc8a03d71a5a0b30
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 03:33:41 2011 +0200
Translation update done using Pootle.
commit 897065890836c5ecce956b83dab896125ca3eaf6
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 03:33:08 2011 +0200
Translation update done using Pootle.
commit 0c79cfff3d91a3da9115192b8d631ab442809ee8
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 03:32:42 2011 +0200
Translation update done using Pootle.
commit 5ee062aea1479f740bc996368477c41ed167d1a0
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 03:32:16 2011 +0200
Translation update done using Pootle.
commit 6cfc39a56bce62f42cea0c947c10c29d8dd7a062
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 03:30:28 2011 +0200
Translation update done using Pootle.
commit e601f9a56f2775e1c029786899bfacf0c1e0e849
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 03:30:02 2011 +0200
Translation update done using Pootle.
commit 0abb9e2f1c104bb28f1e6ff48a9f712b0b131702
Author: shanyan baishui <Siramizu(a)gmail.com>
Date: Thu Aug 11 03:29:56 2011 +0200
Translation update done using Pootle.
commit fc594f09628ac76cbc834134533745867802ee48
Merge: ba7a367 e4bb7fd
Author: Pootle server <pootle(a)cihar.com>
Date: Wed Aug 10 22:40:09 2011 +0200
Merge remote-tracking branch 'origin/master'
commit ba7a367651b188098e0b4169435c2472b791226f
Author: Fulup <fulup.jakez(a)ofis-bzh.org>
Date: Wed Aug 10 22:33:21 2011 +0200
Translation update done using Pootle.
commit 1b07aa89cd0e084cc460242745b2cb71a1e30979
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 21:18:39 2011 +0200
Translation update done using Pootle.
commit 11ece615503bd81bd9f92d8e6c4b850d5c0ae33b
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 21:18:09 2011 +0200
Translation update done using Pootle.
commit 15220c14a9e0f5dc1d74f3edb5d620dd73be3446
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 21:17:56 2011 +0200
Translation update done using Pootle.
commit db340824639c83fc7b2cc611524ff1de117235f6
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 21:17:17 2011 +0200
Translation update done using Pootle.
commit e0d4d0f66668f08bde2d73f48b2d3bae77630c76
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 21:17:01 2011 +0200
Translation update done using Pootle.
commit 374bfbfc474e3eac66831c158d3a160b3ea051b8
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 21:16:38 2011 +0200
Translation update done using Pootle.
commit 6a43dd6a2848dea8f80344845b01f0b8db224f97
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 21:16:26 2011 +0200
Translation update done using Pootle.
commit d5580026cc47d9253f9fe85ef203eeb9952d341e
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 21:15:18 2011 +0200
Translation update done using Pootle.
commit bdeb7bc0912c500dea31ed18e7f53e44d178d97e
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 21:14:52 2011 +0200
Translation update done using Pootle.
commit 6c6228976a205f383f665e0501f740319ca905d9
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 21:13:57 2011 +0200
Translation update done using Pootle.
commit bb8e52280f0a63f2454546f2f11baed044b42018
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 21:09:57 2011 +0200
Translation update done using Pootle.
commit 2aa6884ddd5f3ee8be70f354ae6b14e17b487e41
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 21:06:37 2011 +0200
Translation update done using Pootle.
commit 00e75fef2bc20fdb6907696bf11824cfdf17f498
Author: Burak Yavuz <hitowerdigit(a)hotmail.com>
Date: Wed Aug 10 17:10:30 2011 +0200
Translation update done using Pootle.
commit ec47a2328da27ea02d45805b851619071dfe5fb8
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:45:02 2011 +0200
Translation update done using Pootle.
commit b46ae1db38ac5d8712260b5af953da79c1704980
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:44:55 2011 +0200
Translation update done using Pootle.
commit f85ce7e774efc2594e8add389b614c994f178f3f
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:44:39 2011 +0200
Translation update done using Pootle.
commit 5bd7ca9e544554e4b18946589ec010a8dc8e7349
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:44:33 2011 +0200
Translation update done using Pootle.
commit 34efbdf088a13199761c048647d0308e83cb765e
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:42:37 2011 +0200
Translation update done using Pootle.
commit a294d64735423f52bc543baaf25bbe871572da9c
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:40:52 2011 +0200
Translation update done using Pootle.
commit 331287ae15b886cb75641fed7414a2ce10669526
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:40:44 2011 +0200
Translation update done using Pootle.
commit 0acf748b3d8b638c7650212e549411edc414d102
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:39:56 2011 +0200
Translation update done using Pootle.
commit bb94a12e69e525dee1ec9433fe65352090f66752
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:39:36 2011 +0200
Translation update done using Pootle.
commit c4de465fc55089b4b55bd87afec3b0cd6860d2ee
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:39:26 2011 +0200
Translation update done using Pootle.
commit e0a82d136e06abdba9e08f530a898f1a8f16e46e
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:36:26 2011 +0200
Translation update done using Pootle.
commit 8820aba3dd43ac39406aeaa5f904e72c120bc9bf
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:36:11 2011 +0200
Translation update done using Pootle.
commit 1c3d94ac00e1e10f2727c469f4c011a159c2bc81
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:36:01 2011 +0200
Translation update done using Pootle.
commit 25151711d3db97094269071fb59db6f37d7cd1e6
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:35:54 2011 +0200
Translation update done using Pootle.
commit aab7364146c48a50601cf2bd066036775d42b716
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:35:50 2011 +0200
Translation update done using Pootle.
commit 3f3971a4ca1dae47d8e8e797a9364313ac1c0155
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:35:42 2011 +0200
Translation update done using Pootle.
commit 0e26a397281877b7628ccaf0e050a092981056d3
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:35:35 2011 +0200
Translation update done using Pootle.
commit af07ff2bd8661a3f350ffdd772298ed31f97846f
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:35:24 2011 +0200
Translation update done using Pootle.
commit f1c25a3dd2b5febc365651ad0652e4dee05f5d80
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:34:51 2011 +0200
Translation update done using Pootle.
commit 42e4bd108fa86dcc565537f9a1413f5e81115727
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:34:01 2011 +0200
Translation update done using Pootle.
commit 74325f3cd97e61a8e05cd5ce9e2a9de404a4a962
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:33:53 2011 +0200
Translation update done using Pootle.
commit c2198470a76b5ad014b03457af2575b19023f24c
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:32:55 2011 +0200
Translation update done using Pootle.
commit 8822f712be7798fef38cb32028ef896abb1f1d8a
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:32:41 2011 +0200
Translation update done using Pootle.
commit 4cbaf6c66ccd9af5b5dc800258a25e7f929839fd
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:32:21 2011 +0200
Translation update done using Pootle.
commit 3c3f7af900cd4e5bc08bd15dc35dbec055ef05b2
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:32:17 2011 +0200
Translation update done using Pootle.
commit d3a57dde00e7e328ff1826695da0448589461f21
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:32:12 2011 +0200
Translation update done using Pootle.
commit cb593d155c312277519f8cede71d7326e724f187
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:32:04 2011 +0200
Translation update done using Pootle.
commit fdb0678616d1281b8bcdc855ba4611f30375e040
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:31:58 2011 +0200
Translation update done using Pootle.
commit 825412641e80e3d78b512dde4f0ae5f34a127828
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:31:23 2011 +0200
Translation update done using Pootle.
commit 30d07ab331b9bc5cc63064b9f656c5dbf653dc10
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:31:10 2011 +0200
Translation update done using Pootle.
commit 0180db012833c089af57e38426ab983162bd2cd6
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:30:58 2011 +0200
Translation update done using Pootle.
commit ce5c8d1b06f1ca85c4c27ab8e47ef6c1b0064268
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:30:52 2011 +0200
Translation update done using Pootle.
commit 7836fdd05984d9fb354908b0206070fe3c068033
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:30:47 2011 +0200
Translation update done using Pootle.
commit 150c27791b2fc9d4d9ffc917e5fdf4753376a578
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:30:37 2011 +0200
Translation update done using Pootle.
commit 099aaff10a7cab15234266c1a97cd6ea6e15d12e
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:29:07 2011 +0200
Translation update done using Pootle.
commit 965dc99a21a58560cf8bbbcfffe9be6346e48bb0
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:28:38 2011 +0200
Translation update done using Pootle.
commit b675924addc0e1236c5afe11990eec4aeee67c6c
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:28:13 2011 +0200
Translation update done using Pootle.
commit 39c87fd56c955312d89d0874646468e112a19cb9
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:27:32 2011 +0200
Translation update done using Pootle.
commit 1399a3b5cad0b5375a7fb098b1a59bbbfadc0c00
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:26:34 2011 +0200
Translation update done using Pootle.
commit f7ddbdc1dffa89f86a9a91f6dd4d913b5b98ee75
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:26:28 2011 +0200
Translation update done using Pootle.
commit ef44229382b99d8a5f83d94de4f39f82f6dcca75
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:26:20 2011 +0200
Translation update done using Pootle.
commit 4e9fdb297a5fdf24e050362b5466a22adec02362
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:25:23 2011 +0200
Translation update done using Pootle.
commit bf984817f52f8527b9eee186bb85e805ad9872c0
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:25:07 2011 +0200
Translation update done using Pootle.
commit 19c1ea10e67b871541e1bdcf773b001473f78d0b
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:24:55 2011 +0200
Translation update done using Pootle.
commit f688cf02b675731eea9d47aa1c80b52ac311b233
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:24:46 2011 +0200
Translation update done using Pootle.
commit 3bda5750e1921ee726af6570d59db593cdbc3eac
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:24:39 2011 +0200
Translation update done using Pootle.
commit 84ce558c01bcd7e07acd56a7bcf6b6038efc406c
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:24:31 2011 +0200
Translation update done using Pootle.
commit 8324b197728bd81a61c5e8278f5d32ef88ea5c52
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:24:19 2011 +0200
Translation update done using Pootle.
commit 7bcc2f55ae514586406365051b074c92cebb351f
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:24:09 2011 +0200
Translation update done using Pootle.
commit 7adf1c382d3631c4dc39ef6a35e21afb5d19d9ae
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:24:02 2011 +0200
Translation update done using Pootle.
commit 0128d099612030d4bda3d36d2636cf8d342d692c
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:23:56 2011 +0200
Translation update done using Pootle.
commit 4e5686c532069577d610d5cc6dfb82c5130b36bc
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:23:47 2011 +0200
Translation update done using Pootle.
commit 39a7041eab8b74cefa027098db78432639f0b1af
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:23:37 2011 +0200
Translation update done using Pootle.
commit c9c519c7e3109ddd6cbebf32b80b555cad5fc54c
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:23:29 2011 +0200
Translation update done using Pootle.
commit 02e91d9240644122415f9a1701faf988dd0d870d
Author: Matías Bellone <matiasbellone(a)gmail.com>
Date: Wed Aug 10 16:23:23 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/br.po | 7 ++-
po/es.po | 166 +++++++++++++++++++++++++++++------------------------------
po/tr.po | 33 ++++++------
po/zh_CN.po | 73 +++++++++++---------------
4 files changed, 133 insertions(+), 146 deletions(-)
diff --git a/po/br.po b/po/br.po
index 43d4f69..0707945 100644
--- a/po/br.po
+++ b/po/br.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-10 10:14-0400\n"
-"PO-Revision-Date: 2011-08-09 19:26+0200\n"
+"PO-Revision-Date: 2011-08-10 22:33+0200\n"
"Last-Translator: Fulup <fulup.jakez(a)ofis-bzh.org>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
+"Language: br\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: br\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -1279,6 +1279,9 @@ msgid ""
"than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
"depending on your system."
msgstr ""
+"Gweredekaet eo slow_query_log met ne enroll ar servijer nemet ar rekedoù a "
+"bad pelloc'h eget %d eilenn. Erbedet eo reizhañ long_query_time war 0-2 "
+"eilenn, hervez ho reizhiad."
#: js/messages.php:137
#, php-format
diff --git a/po/es.po b/po/es.po
index 2ffd4f4..812117b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-10 10:14-0400\n"
-"PO-Revision-Date: 2011-08-01 18:53+0200\n"
+"PO-Revision-Date: 2011-08-10 16:45+0200\n"
"Last-Translator: Matías Bellone <matiasbellone(a)gmail.com>\n"
"Language-Team: spanish <es(a)li.org>\n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.5\n"
@@ -415,10 +415,10 @@ msgid "You have to choose at least one column to display"
msgstr "Debe elegir al menos una columna para mostrar"
#: db_qbe.php:186
-#, fuzzy, php-format
+#, php-format
#| msgid "visual builder"
msgid "Switch to %svisual builder%s"
-msgstr "editor visual"
+msgstr "Cambiar al %sconstructor visual%s"
#: db_qbe.php:222 libraries/db_structure.lib.php:90
#: libraries/display_tbl.lib.php:955
@@ -1158,64 +1158,56 @@ msgid "Average load"
msgstr "Carga promedio"
#: js/messages.php:101
-#, fuzzy
#| msgid "System memory"
msgid "Total memory"
-msgstr "Memoria de sistema"
+msgstr "Memoria total"
#: js/messages.php:102
-#, fuzzy
#| msgid "System memory"
msgid "Cached memory"
-msgstr "Memoria de sistema"
+msgstr "Memoria caché"
#: js/messages.php:103
-#, fuzzy
#| msgid "Buffer Pool"
msgid "Buffered memory"
-msgstr "Reserva de búfers"
+msgstr "Memoria de búfers"
#: js/messages.php:104
-#, fuzzy
#| msgid "System memory"
msgid "Free memory"
-msgstr "Memoria de sistema"
+msgstr "Memoria libre"
#: js/messages.php:105
-#, fuzzy
#| msgid "System memory"
msgid "Used memory"
-msgstr "Memoria de sistema"
+msgstr "Memoria utilizada"
#: js/messages.php:107
-#, fuzzy
#| msgid "Total"
msgid "Total Swap"
-msgstr "Total"
+msgstr "Intercambio total"
#: js/messages.php:108
msgid "Cached Swap"
-msgstr ""
+msgstr "Intercambio en caché"
#: js/messages.php:109
msgid "Used Swap"
-msgstr ""
+msgstr "Intercambio utilizado"
#: js/messages.php:110
-#, fuzzy
#| msgid "Free pages"
msgid "Free Swap"
-msgstr "Páginas libres"
+msgstr "Intercambio libre"
#: js/messages.php:112
msgid "Bytes sent"
-msgstr ""
+msgstr "Bytes enviados"
#: js/messages.php:113
-#, fuzzy
#| msgid "Received"
msgid "Bytes received"
-msgstr "Recibido"
+msgstr "Bytes recibidos"
#: js/messages.php:114 server_status.php:994
msgid "Connections"
@@ -1241,10 +1233,9 @@ msgid "Remove chart"
msgstr "Eliminar gráfico"
#: js/messages.php:122
-#, fuzzy
#| msgid "Edit labels and series"
msgid "Edit title and labels"
-msgstr "Editar etiquetas y series"
+msgstr "Editar título y etiquetas"
#: js/messages.php:123
msgid "Add chart to grid"
@@ -1450,7 +1441,7 @@ msgstr "Cargando registros"
#: js/messages.php:176
msgid "Monitor refresh failed"
-msgstr ""
+msgstr "Falló la actualización del monitorizador"
#: js/messages.php:177
msgid ""
@@ -1458,26 +1449,32 @@ msgid ""
"This is most likely because your session expired. Reloading the page and "
"reentering your credentials should help."
msgstr ""
+"Al pedir un nuevo gráfico el servidor devolvió una respuesta inválida. Esto "
+"es probablemente porque expiró la sesión. Cargar la página nuevamente y "
+"volver a ingresar sus credenciales debería ayudar."
#: js/messages.php:178
-#, fuzzy
#| msgid "Reload"
msgid "Reload page"
-msgstr "Cargar nuevamente"
+msgstr "Cargar página nuevamente"
#: js/messages.php:180
msgid "Affected rows:"
-msgstr ""
+msgstr "Filas afectadas:"
#: js/messages.php:182
msgid "Failed parsing config file. It doesn't seem to be valid JSON code"
msgstr ""
+"No se pudo analizar el archivo de configuración. No parece ser código JSON "
+"válido"
#: js/messages.php:183
msgid ""
"Failed building chart grid with imported config. Resetting to default "
"config..."
msgstr ""
+"No se pudo crear la grilla de gráficos con la configuración importada. "
+"Reiniciando a configuración predeterminada..."
#: js/messages.php:184 libraries/config/messages.inc.php:170
#: libraries/db_links.inc.php:83 libraries/server_links.inc.php:69
@@ -1664,13 +1661,15 @@ msgstr "Añadir una opción para la columna"
#: js/messages.php:258
msgid "Press escape to cancel editing"
-msgstr ""
+msgstr "Presion la tecla de escape para cancelar la edición"
#: js/messages.php:259
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 ""
+"Editó datos que no fueron guardados. ¿Está seguro que desea abandonar esta "
+"página sin guardar los datos?"
#: js/messages.php:260
msgid "Drag to reorder"
@@ -1695,6 +1694,9 @@ msgid ""
"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."
msgstr ""
+"Esta tabla no contiene una columna única. Funcionalidades relacionadas con "
+"la edición de la grilla y los enlaces de copiado, eliminación y edición "
+"pueden no funcionar luego de guardar."
#: js/messages.php:268
msgid "Generate password"
@@ -1736,14 +1738,12 @@ msgid "Done"
msgstr "Terminado"
#: js/messages.php:302
-#, fuzzy
#| msgid "Prev"
msgctxt "Previous month"
msgid "Prev"
-msgstr "Previo"
+msgstr "Anterior"
#: js/messages.php:307
-#, fuzzy
#| msgid "Next"
msgctxt "Next month"
msgid "Next"
@@ -1893,7 +1893,6 @@ msgstr "Sábado"
#. l10n: Short week day name
#: js/messages.php:363
-#, fuzzy
#| msgctxt "Short week day name"
#| msgid "Sun"
msgid "Sun"
@@ -2125,10 +2124,9 @@ msgstr[0] "%1$d fila insertada."
msgstr[1] "%1$d filas insertadas."
#: libraries/PDF.class.php:81
-#, fuzzy
#| msgid "Allows reading data."
msgid "Error while creating PDF:"
-msgstr "Permite leer los datos."
+msgstr "Error al crear PDF:"
#: libraries/RecentTable.class.php:107
msgid "Could not save recent table"
@@ -2166,10 +2164,9 @@ msgstr ""
"Este servidor MySQL no es compatible con el motor de almacenamiento %s."
#: libraries/Table.class.php:303
-#, fuzzy
#| msgid "Show slave status"
msgid "unknown table status: "
-msgstr "Mostrar el estado del esclavo"
+msgstr "estado de tabla desconocido:"
#: libraries/Table.class.php:1034
msgid "Invalid database"
@@ -2356,10 +2353,9 @@ msgid "PBMS get BLOB info failed:"
msgstr "Fallo al obtener la información del BLOB PBMS:"
#: libraries/blobstreaming.lib.php:332
-#, fuzzy
#| msgid "get BLOB Content-Type failed"
msgid "PBMS get BLOB Content-Type failed"
-msgstr "Fallo en get BLOB Content-Type"
+msgstr "Fallo al obtener Content-Type del BLOB PBMS"
#: libraries/blobstreaming.lib.php:358
msgid "View image"
@@ -2629,25 +2625,22 @@ msgstr "Parámetro faltante:"
#: libraries/common.lib.php:2267 libraries/common.lib.php:2270
#: libraries/display_tbl.lib.php:306
-#, fuzzy
#| msgid "Begin"
msgctxt "First page"
msgid "Begin"
-msgstr "Empezar"
+msgstr "Comenzar"
#: libraries/common.lib.php:2268 libraries/common.lib.php:2271
#: libraries/display_tbl.lib.php:307 server_binlog.php:135
#: server_binlog.php:137
-#, fuzzy
#| msgid "Previous"
msgctxt "Previous page"
msgid "Previous"
-msgstr "Previo"
+msgstr "Anterior"
#: libraries/common.lib.php:2297 libraries/common.lib.php:2300
#: libraries/display_tbl.lib.php:370 server_binlog.php:170
#: server_binlog.php:172
-#, fuzzy
#| msgid "Next"
msgctxt "Next page"
msgid "Next"
@@ -2655,7 +2648,6 @@ msgstr "Siguiente"
#: libraries/common.lib.php:2298 libraries/common.lib.php:2301
#: libraries/display_tbl.lib.php:385
-#, fuzzy
#| msgid "End"
msgctxt "Last page"
msgid "End"
@@ -4056,10 +4048,9 @@ msgid "Memory limit"
msgstr "Límite de la memoria"
#: 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 "Estos son los enlaces para Editar, Editar en el lugar, Copiar y Borrar"
+msgstr "Estos son los enlaces para Editar, Copiar y Borrar"
#: libraries/config/messages.inc.php:320
msgid "Where to show the table row links"
@@ -4220,7 +4211,7 @@ msgstr "Mostrar el botón de ayuda"
#: libraries/config/messages.inc.php:357
msgid "Save all edited cells at once"
-msgstr ""
+msgstr "Guardar todas las celdas editadas simultáneamente"
#: libraries/config/messages.inc.php:358
msgid "Directory where exports can be saved on server"
@@ -4761,16 +4752,14 @@ msgid "Show function fields"
msgstr "Mostrar los campos de función"
#: libraries/config/messages.inc.php:460
-#, fuzzy
#| msgid "Where to show the table row links"
msgid "Whether to show hint or not"
-msgstr "Donde mostrar los enlaces de filas de tabla"
+msgstr "Si mostrar ayudas o no"
#: libraries/config/messages.inc.php:461
-#, fuzzy
#| msgid "Show indexes"
msgid "Show hint"
-msgstr "Mostrar índices"
+msgstr "Mostrar ayudas"
#: libraries/config/messages.inc.php:462
msgid ""
@@ -5535,10 +5524,9 @@ msgid "Language"
msgstr "Idioma"
#: libraries/display_tbl.lib.php:401
-#, fuzzy
#| msgid "Save directory"
msgid "Save edited data"
-msgstr "Directorio de almacenamiento"
+msgstr "Guardar datos editados"
#: libraries/display_tbl.lib.php:407
msgid "Restore column order"
@@ -6459,10 +6447,9 @@ msgid "Stand-in structure for view"
msgstr "Estructura Stand-in para la vista"
#: libraries/export/sql.php:1071
-#, fuzzy
#| msgid "Allows reading data."
msgid "Error reading data:"
-msgstr "Permite leer los datos."
+msgstr "Error leyendo datos:"
#: libraries/export/xml.php:19 libraries/import/xml.php:21
msgid "XML"
@@ -6528,20 +6515,20 @@ msgid "Go to database"
msgstr "Ir a la base de datos"
#: libraries/import.lib.php:1085 libraries/import.lib.php:1109
-#, fuzzy, php-format
+#, php-format
#| msgid "Missing data for %s"
msgid "Edit settings for %s"
-msgstr "Faltan datos para %s"
+msgstr "Editar configuración de %s"
#: libraries/import.lib.php:1104
msgid "Go to table"
msgstr "Ir a la tabla"
#: libraries/import.lib.php:1107
-#, fuzzy, php-format
+#, php-format
#| msgid "Structure only"
msgid "Structure of %s"
-msgstr "Únicamente la estructura"
+msgstr "Estructura de %s"
#: libraries/import.lib.php:1113
msgid "Go to view"
@@ -7148,14 +7135,12 @@ msgid "Execute every"
msgstr "Ejecutar cada"
#: libraries/rte/rte_events.lib.php:449
-#, fuzzy
#| msgid "Start"
msgctxt "Start of recurring event"
msgid "Start"
-msgstr "Iniciar"
+msgstr "Inicio"
#: libraries/rte/rte_events.lib.php:457
-#, fuzzy
#| msgid "End"
msgctxt "End of recurring event"
msgid "End"
@@ -7640,11 +7625,10 @@ msgid "ltr"
msgstr "ltr"
#: libraries/select_lang.lib.php:482
-#, fuzzy
#| msgid "pages"
msgctxt "PDF"
msgid "page"
-msgstr "páginas"
+msgstr "página"
#: libraries/select_lang.lib.php:488 libraries/select_lang.lib.php:494
#: libraries/select_lang.lib.php:500
@@ -9384,10 +9368,9 @@ msgid "Monitor"
msgstr "Monitorizar"
#: server_status.php:652
-#, fuzzy
#| msgid "Apply a divisor"
msgid "Advisor"
-msgstr "Aplicar una división"
+msgstr "Consejero"
#: server_status.php:662 server_status.php:684
msgid "Refresh rate: "
@@ -9406,10 +9389,9 @@ msgid "Filter by category..."
msgstr "Filtrar por categoría..."
#: server_status.php:727
-#, fuzzy
#| msgid "Show only alert values"
msgid "Show unformatted values"
-msgstr "Mostrar sólo valores de alerta"
+msgstr "Mostrar valores sin formato"
#: server_status.php:731
msgid "Related links:"
@@ -9429,6 +9411,17 @@ msgid ""
"at a time, observe or benchmark your database, and\n"
" undo the change if there was no clearly measurable improvement."
msgstr ""
+"El sistema Consejero puede proveer recomendaciones para los valores de las "
+"variables del servidor analizando las variables de estado del servidor.\n"
+"Note, sin embargo, que este sistema provee recomendaciones basándose en "
+"cálculos relativamente simples y por regla general por lo que podrían no "
+"funcioanr para su sistema.\n"
+"Antes de cambiar cualquier configuración asegúrese de saber qué es lo que "
+"está cambiando y cómo deshacer el cambio. Ajustes incorrectos pueden tener "
+"un efecto negativo en la performance.\n"
+"La mejor forma de ajustar el sistema sería sólo cambiar una configuración "
+"por vez, observar o medir la base de datos y deshacer el cambio si no hubo "
+"una mejora conmensurable."
#. l10n: Questions is the name of a MySQL Status variable
#: server_status.php:791
@@ -10257,25 +10250,25 @@ msgid "Refresh rate"
msgstr "Velocidad de actualización"
#: server_status.php:1419
-#, fuzzy
#| msgid "Chart columns:"
msgid "Chart columns"
-msgstr "Columnas del gráfico:"
+msgstr "Columnas del gráfico"
#: server_status.php:1435
-#, fuzzy
#| msgid "Error management:"
msgid "Chart arrangement"
-msgstr "Manejo de errores:"
+msgstr "Ordenación de los gráficos"
#: server_status.php:1435
msgid ""
"The arrangement of the charts is stored to the browsers local storage. You "
"may want to export it if you have a complicated set up."
msgstr ""
+"La ordenación de los gráficos es almacenada en el almacenamiento local del "
+"navegador. Sería recomendable exportarla si tiene una configuración "
+"complicada."
#: server_status.php:1436
-#, fuzzy
#| msgid "Restore default value"
msgid "Reset to default"
msgstr "Restaurar valor predeterminado"
@@ -10305,9 +10298,13 @@ msgid ""
"table is supported by MySQL 5.1.6 and onwards. You may still use the server "
"charting features however."
msgstr ""
+"Desafortunadamente, su servidor de base de datos no soporta almacenar "
+"registros a una base de datos, lo que es un requisito para analizar "
+"registros de la base de datos con phpMyAdmin. Almacenar registros a una "
+"tabla está disponible desde MySQL versión 5.1.6 y posterior. Si puede "
+"utilizar las funcionalidades para graficación del servidor."
#: server_status.php:1458
-#, fuzzy
#| msgid ""
#| "<b>Using the monitor:</b><br/> Ok, you are good to go! Once you click "
#| "'Start monitor' your browser will refresh all displayed charts in a "
@@ -10331,11 +10328,12 @@ msgstr ""
"en 'Iniciar monitorización' el navegador actualizará a intervalos regulares "
"todos los gráficos mostrados. Puede agregar gráficos y cambiar la velocidad "
"de actualización en la sección 'Configuración' o eliminar cualquier gráfico "
-"utilizando el icono de rueda dentada en cada gráfico. <p>Cuando vea un pico "
-"repentino de actividad, seleccione el intervalo de tiempo relevante en el "
-"gráfico manteniendo pulsado el botón izquierdo y arrastrando sobre el "
-"gráfico. Esto cargará las estadísticas de los registros, lo que lo ayudará a "
-"encontrar la causa del pico de actividad.</p>"
+"utilizando el icono de rueda dentada en cada gráfico. <p>Para mostrar las "
+"consultas de los registros, seleccione el intervalo de tiempo "
+"correspondiente en cualquier gráfico manteniendo pulsado el botón izquierdo "
+"y arrastrando sobre el gráfico. Una vez confirmado, esto cargará una tabla "
+"de consultas agrupadas donde podrá pulsar en cualquier sentencia SELECT para "
+"analizarla.</p>"
#: server_status.php:1463
msgid ""
@@ -10530,7 +10528,6 @@ msgid "Target database has been synchronized with source database"
msgstr "La base de datos objetivo fue sincronizada con la base de datos fuente"
#: server_synchronize.php:951
-#, fuzzy
#| msgid "Issued queries"
msgid "Executed queries"
msgstr "Consultas ejecutadas"
@@ -11308,7 +11305,7 @@ msgstr "Tamaño de la fila "
#: tbl_printview.php:388 tbl_structure.php:900
msgid "Next autoindex"
-msgstr ""
+msgstr "Índice automático siguiente"
#: tbl_relation.php:276
#, php-format
@@ -11408,10 +11405,9 @@ msgid "Show more actions"
msgstr "Mostrar más acciones"
#: tbl_structure.php:603
-#, fuzzy
#| msgid "Print view"
msgid "Edit view"
-msgstr "Vista de impresión"
+msgstr "Editar vista"
#: tbl_structure.php:620
msgid "Relation view"
diff --git a/po/tr.po b/po/tr.po
index 14eec56..f5645eb 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-10 10:14-0400\n"
-"PO-Revision-Date: 2011-08-10 15:54+0200\n"
+"PO-Revision-Date: 2011-08-10 21:18+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit(a)hotmail.com>\n"
"Language-Team: turkish <tr(a)li.org>\n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -1634,13 +1634,15 @@ msgstr "Sütun için bir seçenek ekle "
#: js/messages.php:258
msgid "Press escape to cancel editing"
-msgstr ""
+msgstr "Düzenlemeyi iptal etmek için Esc tuşuna basın"
#: js/messages.php:259
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 ""
+"Bazı verileri düzenlediniz ve kaydedilmediler. Veriyi kaydetmeden önce bu "
+"sayfadan ayrılmak istediğinize emin misiniz?"
#: js/messages.php:260
msgid "Drag to reorder"
@@ -1664,6 +1666,9 @@ msgid ""
"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."
msgstr ""
+"Bu tablo benzersiz bir sütun içermiyor. Izgara düzenlemeyle ilgili "
+"özellikler, Düzenle, Kopyala ve Sil bağlantıları kaydedildikten sonra "
+"çalışmayabilir."
#: js/messages.php:268
msgid "Generate password"
@@ -2085,10 +2090,9 @@ msgid_plural "%1$d rows inserted."
msgstr[0] "%1$d satır eklendi."
#: libraries/PDF.class.php:81
-#, fuzzy
#| msgid "Error reading data:"
msgid "Error while creating PDF:"
-msgstr "Veri okunması hatası:"
+msgstr "PDF oluşturulurken hata:"
#: libraries/RecentTable.class.php:107
msgid "Could not save recent table"
@@ -3982,10 +3986,9 @@ msgid "Memory limit"
msgstr "Bellek sınırı"
#: 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 "Bunlar Düzenle, Sıralı düzenle, Kopyala ve Sil bağlantılarıdır"
+msgstr "Bunlar Düzenle, Kopyala ve Sil bağlantılarıdır"
#: libraries/config/messages.inc.php:320
msgid "Where to show the table row links"
@@ -4143,7 +4146,7 @@ msgstr "Yardım düğmesi göster"
#: libraries/config/messages.inc.php:357
msgid "Save all edited cells at once"
-msgstr ""
+msgstr "Bir defada tüm düzenlenen hücreleri kaydet"
#: libraries/config/messages.inc.php:358
msgid "Directory where exports can be saved on server"
@@ -4680,24 +4683,22 @@ msgid "Show function fields"
msgstr "İşlev alanlarını göster"
#: libraries/config/messages.inc.php:460
-#, fuzzy
#| msgid "Where to show the table row links"
msgid "Whether to show hint or not"
-msgstr "Tablo satır bağlantılarının nerede gösterileceği"
+msgstr "İpucu gösterilip gösterilmeyeceği"
#: libraries/config/messages.inc.php:461
-#, fuzzy
#| msgid "Show indexes"
msgid "Show hint"
-msgstr "İndeksleri göster"
+msgstr "İpucu göster"
#: libraries/config/messages.inc.php:462
msgid ""
"Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
"output"
msgstr ""
-"[a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] çıktısına "
-"bağlantıyı gösterir"
+"[a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] çıktısı için "
+"bağlantı gösterir"
#: libraries/config/messages.inc.php:463
msgid "Show phpinfo() link"
@@ -5440,10 +5441,9 @@ msgid "Language"
msgstr "Dil"
#: libraries/display_tbl.lib.php:401
-#, fuzzy
#| msgid "Save directory"
msgid "Save edited data"
-msgstr "Kayıt dizini"
+msgstr "Düzenlenen veriyi kaydet"
#: libraries/display_tbl.lib.php:407
msgid "Restore column order"
@@ -7513,7 +7513,6 @@ msgid "ltr"
msgstr "ltr"
#: libraries/select_lang.lib.php:482
-#, fuzzy
#| msgid "pages"
msgctxt "PDF"
msgid "page"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 57dc90e..57e07b2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,13 +4,13 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2011-08-10 10:14-0400\n"
-"PO-Revision-Date: 2011-08-10 12:19+0200\n"
+"PO-Revision-Date: 2011-08-11 04:40+0200\n"
"Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n"
"Language-Team: chinese_simplified <zh_CN(a)li.org>\n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.0.5\n"
@@ -1600,13 +1600,13 @@ msgstr "给字段添加选项 "
#: js/messages.php:258
msgid "Press escape to cancel editing"
-msgstr ""
+msgstr "按 Esc 键取消编辑"
#: js/messages.php:259
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 ""
+msgstr "已有数据被修改但尚未保存。你真的要不保存修改就离开本页吗？"
#: js/messages.php:260
msgid "Drag to reorder"
@@ -1668,14 +1668,12 @@ msgid "Done"
msgstr "完成"
#: js/messages.php:302
-#, fuzzy
#| msgid "Prev"
msgctxt "Previous month"
msgid "Prev"
msgstr "上个月"
#: js/messages.php:307
-#, fuzzy
#| msgid "Next"
msgctxt "Next month"
msgid "Next"
@@ -2045,10 +2043,9 @@ msgid_plural "%1$d rows inserted."
msgstr[0] "插入了 %1$d 行。"
#: libraries/PDF.class.php:81
-#, fuzzy
#| msgid "Error reading data:"
msgid "Error while creating PDF:"
-msgstr "读取数据时发生错误:"
+msgstr "创建 PDF 时发生错误:"
#: libraries/RecentTable.class.php:107
msgid "Could not save recent table"
@@ -2472,7 +2469,7 @@ msgstr "在本页面编辑此查询"
#: libraries/common.lib.php:1216
msgctxt "Inline edit query"
msgid "Inline"
-msgstr "内联"
+msgstr "快速编辑"
#: libraries/common.lib.php:1278 sql.php:938
msgid "Profiling"
@@ -2526,37 +2523,33 @@ msgstr "缺少参数:"
#: libraries/common.lib.php:2267 libraries/common.lib.php:2270
#: libraries/display_tbl.lib.php:306
-#, fuzzy
#| msgid "Begin"
msgctxt "First page"
msgid "Begin"
-msgstr "开始"
+msgstr "首页"
#: libraries/common.lib.php:2268 libraries/common.lib.php:2271
#: libraries/display_tbl.lib.php:307 server_binlog.php:135
#: server_binlog.php:137
-#, fuzzy
#| msgid "Previous"
msgctxt "Previous page"
msgid "Previous"
-msgstr "上一个"
+msgstr "上一页"
#: libraries/common.lib.php:2297 libraries/common.lib.php:2300
#: libraries/display_tbl.lib.php:370 server_binlog.php:170
#: server_binlog.php:172
-#, fuzzy
#| msgid "Next"
msgctxt "Next page"
msgid "Next"
-msgstr "下个月"
+msgstr "下一页"
#: libraries/common.lib.php:2298 libraries/common.lib.php:2301
#: libraries/display_tbl.lib.php:385
-#, fuzzy
#| msgid "End"
msgctxt "Last page"
msgid "End"
-msgstr "结束"
+msgstr "尾页"
#: libraries/common.lib.php:2366
#, php-format
@@ -3887,10 +3880,9 @@ msgid "Memory limit"
msgstr "内存限制"
#: 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 "它们是编辑、快速编辑、复制和删除链接"
+msgstr "它们是编辑、复制和删除链接"
#: libraries/config/messages.inc.php:320
msgid "Where to show the table row links"
@@ -4110,8 +4102,8 @@ msgid ""
"Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] "
"support, suggested: [kbd]pma_bookmark[/kbd]"
msgstr ""
-"不使用[a@http://wiki.phpmyadmin.net/pma/bookmark]书签 (外链，英文)[/a]功能请"
-"留空，默认：[kbd]pma_bookmark[/kbd]"
+"不使用[a@http://wiki.phpmyadmin.net/pma/bookmark]书签 (外链，英文)[/a]功能请留空，推荐: "
+"[kbd]pma_bookmark[/kbd]"
#: libraries/config/messages.inc.php:373
msgid "Bookmark table"
@@ -4121,7 +4113,7 @@ msgstr "书签表"
msgid ""
"Leave blank for no column comments/mime types, suggested: [kbd]"
"pma_column_info[/kbd]"
-msgstr "留空则不使用列信息和MIME类型。默认值：[kbd]pma_column_info[/kbd]"
+msgstr "留空则不使用列信息和MIME类型。推荐: [kbd]pma_column_info[/kbd]"
#: libraries/config/messages.inc.php:375
msgid "Column information table"
@@ -4171,7 +4163,7 @@ msgstr "统计数据表"
msgid ""
"Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/"
"kbd]"
-msgstr "不使用设计功能请留空，默认：[kbd]pma_designer_coords[/kbd]"
+msgstr "不使用设计功能请留空，推荐: [kbd]pma_designer_coords[/kbd]"
#: libraries/config/messages.inc.php:386
msgid "Designer table"
@@ -4210,7 +4202,7 @@ msgstr "隐藏数据库"
msgid ""
"Leave blank for no SQL query history support, suggested: [kbd]pma_history[/"
"kbd]"
-msgstr "不使用 SQL 查询历史功能请留空，默认：[kbd]pma_history[/kbd]"
+msgstr "不使用 SQL 查询历史功能请留空，推荐: [kbd]pma_history[/kbd]"
#: libraries/config/messages.inc.php:394
msgid "SQL query history table"
@@ -4263,7 +4255,7 @@ msgstr "config 认证方式的密码"
#: libraries/config/messages.inc.php:404
msgid ""
"Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]"
-msgstr "不使用 PDF 大纲功能请留空，默认：[kbd]pma_pdf_pages[/kbd]"
+msgstr "不使用 PDF 大纲功能请留空，推荐: [kbd]pma_pdf_pages[/kbd]"
#: libraries/config/messages.inc.php:405
msgid "PDF schema: pages table"
@@ -4275,8 +4267,8 @@ msgid ""
"phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for "
"no support. Suggested: [kbd]phpmyadmin[/kbd]"
msgstr ""
-"关系、书签、PDF 功能所用的数据库。参见 [a@http://wiki.phpmyadmin.net/pma/"
-"pmadb]pmadb (外链，英文)[/a]。不使用请留空。默认： [kbd]phpmyadmin[/kbd]"
+"关系、书签、PDF 功能所用的数据库。参见 [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb "
+"(外链，英文)[/a]。不使用请留空。推荐: [kbd]phpmyadmin[/kbd]"
#: libraries/config/messages.inc.php:407
msgid "Database name"
@@ -4291,14 +4283,13 @@ msgid "Server port"
msgstr "服务器端口"
#: libraries/config/messages.inc.php:410
-#, fuzzy
#| msgid ""
#| "Leave blank for no user preferences storage in database, suggested: [kbd]"
#| "pma_config[/kbd]"
msgid ""
"Leave blank for no \"persistent\" recently used tables across sessions, "
"suggested: [kbd]pma_recent[/kbd]"
-msgstr "不在数据库中保存用户偏好请留空，默认：[kbd]pma_config[/kbd]"
+msgstr "不需要 \"持久\" 最近使用的表请留空，推荐: [kbd]pma_recent[/kbd]"
#: libraries/config/messages.inc.php:411
msgid "Recently used table"
@@ -4309,8 +4300,8 @@ msgid ""
"Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links"
"[/a] support, suggested: [kbd]pma_relation[/kbd]"
msgstr ""
-"不使用[a@http://wiki.phpmyadmin.net/pma/relation]关系链接 (外链，英文)[/a]功"
-"能请留空，默认：[kbd]pma_relation[/kbd]"
+"不使用[a@http://wiki.phpmyadmin.net/pma/relation]关系链接 (外链，英文)[/a]功能请留空，推荐: "
+"[kbd]pma_relation[/kbd]"
#: libraries/config/messages.inc.php:413
msgid "Relation table"
@@ -4359,7 +4350,7 @@ msgstr "使用 SSL"
#: libraries/config/messages.inc.php:423
msgid ""
"Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]"
-msgstr "不使用 PDF 大纲功能请留空，默认：[kbd]pma_table_coords[/kbd]"
+msgstr "不使用 PDF 大纲功能请留空，推荐: [kbd]pma_table_coords[/kbd]"
#: libraries/config/messages.inc.php:424
msgid "PDF schema: table coordinates"
@@ -4369,27 +4360,25 @@ msgstr "PDF 大纲: 数据表并发"
msgid ""
"Table to describe the display columns, leave blank for no support; "
"suggested: [kbd]pma_table_info[/kbd]"
-msgstr "描述显示字段的表，不使用请留空，默认：[kbd]pma_table_info[/kbd]"
+msgstr "描述显示字段的表，不使用请留空，推荐: [kbd]pma_table_info[/kbd]"
#: libraries/config/messages.inc.php:426
msgid "Display columns table"
msgstr "显示字段表"
#: libraries/config/messages.inc.php:427
-#, fuzzy
#| msgid ""
#| "Leave blank for no user preferences storage in database, suggested: [kbd]"
#| "pma_config[/kbd]"
msgid ""
"Leave blank for no \"persistent\" tables'UI preferences across sessions, "
"suggested: [kbd]pma_table_uiprefs[/kbd]"
-msgstr "不在数据库中保存用户偏好请留空，默认：[kbd]pma_config[/kbd]"
+msgstr "不需要 \"持久\" 表界面设置请留空，推荐: [kbd]pma_table_uiprefs[/kbd]"
#: libraries/config/messages.inc.php:428
-#, fuzzy
#| msgid "User preferences storage table"
msgid "UI preferences table"
-msgstr "用户偏好表"
+msgstr "界面设置表"
#: libraries/config/messages.inc.php:429
msgid ""
@@ -4433,7 +4422,7 @@ msgstr "要追踪的命令"
msgid ""
"Leave blank for no SQL query tracking support, suggested: [kbd]pma_tracking[/"
"kbd]"
-msgstr "不使用 SQL 查询追踪功能请留空，默认：[kbd]pma_tracking[/kbd]"
+msgstr "不使用 SQL 查询追踪功能请留空，推荐: [kbd]pma_tracking[/kbd]"
#: libraries/config/messages.inc.php:438
msgid "SQL query tracking table"
@@ -4453,7 +4442,7 @@ msgstr "自动创建版本"
msgid ""
"Leave blank for no user preferences storage in database, suggested: [kbd]"
"pma_config[/kbd]"
-msgstr "不在数据库中保存用户偏好请留空，默认：[kbd]pma_config[/kbd]"
+msgstr "不在数据库中保存用户偏好请留空，推荐: [kbd]pma_config[/kbd]"
#: libraries/config/messages.inc.php:442
msgid "User preferences storage table"
@@ -5301,7 +5290,7 @@ msgstr "水平"
#: libraries/display_tbl.lib.php:433
msgid "horizontal (rotated headers)"
-msgstr "水平 (旋转标题)"
+msgstr "水平 (旋转表头)"
#: libraries/display_tbl.lib.php:434
msgid "vertical"
@@ -5310,7 +5299,7 @@ msgstr "垂直"
#: libraries/display_tbl.lib.php:439
#, php-format
msgid "Headers every %s rows"
-msgstr ""
+msgstr "每 %s 行重复表头"
#: libraries/display_tbl.lib.php:536
msgid "Sort by key"
@@ -10663,7 +10652,7 @@ msgstr "行大小 "
#: tbl_printview.php:388 tbl_structure.php:900
msgid "Next autoindex"
-msgstr ""
+msgstr "下一个自增值"
#: tbl_relation.php:276
#, php-format
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-14270-gb36f2e3
by Michal Čihař 11 Aug '11
by Michal Čihař 11 Aug '11
11 Aug '11
The branch, master has been updated
via b36f2e3ca1f54c15d7b6b0236eb89cb3bbb8cdd2 (commit)
via b0a8c5a20d70b271bfac3875fcc7ed5c6ac80f1f (commit)
via d374feb9675ba835f0dce776872f3d4318b1acb8 (commit)
from e4bb7fdcdd3a2f214c47444ef621c10403c16c72 (commit)
- Log -----------------------------------------------------------------
commit b36f2e3ca1f54c15d7b6b0236eb89cb3bbb8cdd2
Merge: b0a8c5a e4bb7fd
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Thu Aug 11 09:33:38 2011 +0200
Merge remote-tracking branch 'origin/master'
commit b0a8c5a20d70b271bfac3875fcc7ed5c6ac80f1f
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Thu Aug 11 09:33:05 2011 +0200
Use longer text for title
commit d374feb9675ba835f0dce776872f3d4318b1acb8
Author: Michal Čihař <mcihar(a)suse.cz>
Date: Thu Aug 11 09:32:42 2011 +0200
Add context to another potentionally unclear message
-----------------------------------------------------------------------
Summary of changes:
libraries/common.lib.php | 4 ++--
navigation.php | 2 +-
po/af.po | 1 +
po/ar.po | 1 +
po/az.po | 1 +
po/be.po | 1 +
po/be(a)latin.po | 1 +
po/bg.po | 1 +
po/bn.po | 1 +
po/br.po | 1 +
po/bs.po | 1 +
po/ca.po | 1 +
po/cs.po | 1 +
po/cy.po | 1 +
po/da.po | 1 +
po/de.po | 1 +
po/el.po | 1 +
po/en_GB.po | 1 +
po/es.po | 1 +
po/et.po | 1 +
po/eu.po | 1 +
po/fa.po | 1 +
po/fi.po | 1 +
po/fr.po | 1 +
po/gl.po | 1 +
po/he.po | 1 +
po/hi.po | 1 +
po/hr.po | 1 +
po/hu.po | 1 +
po/id.po | 1 +
po/it.po | 1 +
po/ja.po | 1 +
po/ka.po | 1 +
po/ko.po | 1 +
po/lt.po | 1 +
po/lv.po | 1 +
po/mk.po | 1 +
po/ml.po | 1 +
po/mn.po | 1 +
po/ms.po | 1 +
po/nb.po | 1 +
po/nl.po | 1 +
po/pl.po | 1 +
po/pt.po | 1 +
po/pt_BR.po | 1 +
po/ro.po | 1 +
po/ru.po | 1 +
po/si.po | 1 +
po/sk.po | 1 +
po/sl.po | 1 +
po/sq.po | 1 +
po/sr.po | 1 +
po/sr(a)latin.po | 1 +
po/sv.po | 1 +
po/ta.po | 1 +
po/te.po | 1 +
po/th.po | 1 +
po/tr.po | 1 +
po/tt.po | 1 +
po/ug.po | 1 +
po/uk.po | 1 +
po/ur.po | 1 +
po/uz.po | 1 +
po/uz(a)latin.po | 1 +
po/zh_CN.po | 1 +
po/zh_TW.po | 1 +
66 files changed, 67 insertions(+), 3 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index e5c90de..4850e41 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1213,7 +1213,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
"$('.tools form').last().after('[<a href=\"#\" title=\"" .
PMA_escapeJsString(__('Inline edit of this query')) .
"\" class=\"inline_edit_sql\">" .
- PMA_escapeJsString(__('Inline')) .
+ PMA_escapeJsString(_pgettext('Inline edit query', 'Inline')) .
"</a>]');\n" .
"//]]>\n" .
"</script>";
@@ -1811,7 +1811,7 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
/**
- * Splits a URL string by parameter
+ * Splits a URL string by parameter
*
* @param string $url the URL
* @return array the parameter/value pairs, for example [0] db=sakila
diff --git a/navigation.php b/navigation.php
index 22e4cda..dc60e22 100644
--- a/navigation.php
+++ b/navigation.php
@@ -267,7 +267,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
?>
<span id="NavFilter">
<span id="clear_fast_filter" title="<?php echo __('Clear'); ?>">X</span>
- <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" value="<?php echo __('filter tables by name'); ?>" />
+ <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter tables by name'); ?>" value="<?php echo __('Filter tables by name'); ?>" />
</span>
<?php
}
diff --git a/po/af.po b/po/af.po
index 400faca..d724d91 100644
--- a/po/af.po
+++ b/po/af.po
@@ -2619,6 +2619,7 @@ msgid "Inline edit of this query"
msgstr ""
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr ""
diff --git a/po/ar.po b/po/ar.po
index a2eb6ae..edb84bf 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -2538,6 +2538,7 @@ msgid "Inline edit of this query"
msgstr "تعديل سريع لهذا الإستعلام"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "مضمن"
diff --git a/po/az.po b/po/az.po
index 1466586..baebba6 100644
--- a/po/az.po
+++ b/po/az.po
@@ -2650,6 +2650,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Motorlar"
diff --git a/po/be.po b/po/be.po
index 37b2159..c697e7e 100644
--- a/po/be.po
+++ b/po/be.po
@@ -2716,6 +2716,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Машыны"
diff --git a/po/be(a)latin.po b/po/be(a)latin.po
index 286e26b..6fcc4eb 100644
--- a/po/be(a)latin.po
+++ b/po/be(a)latin.po
@@ -2727,6 +2727,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Mašyny"
diff --git a/po/bg.po b/po/bg.po
index 4767fe7..91e54b8 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -2550,6 +2550,7 @@ msgid "Inline edit of this query"
msgstr "Редакция на заявката на място"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "На място"
diff --git a/po/bn.po b/po/bn.po
index 1265984..b28c51e 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -2688,6 +2688,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "ইঞ্জিনসমূহ"
diff --git a/po/br.po b/po/br.po
index 596218d..43d4f69 100644
--- a/po/br.po
+++ b/po/br.po
@@ -2541,6 +2541,7 @@ msgid "Inline edit of this query"
msgstr "Kemmañ ar reked-mañ enlinenn"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Enlinenn"
diff --git a/po/bs.po b/po/bs.po
index cdafb64..3bd8d18 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -2646,6 +2646,7 @@ msgid "Inline edit of this query"
msgstr ""
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 72c47de..e179c2d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -2612,6 +2612,7 @@ msgid "Inline edit of this query"
msgstr "Editar aquesta consulta en línia"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "En línia"
diff --git a/po/cs.po b/po/cs.po
index 9fd305e..34a1ed1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2514,6 +2514,7 @@ msgid "Inline edit of this query"
msgstr "Upravit tento dotaz na této stránce"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Upravit zde"
diff --git a/po/cy.po b/po/cy.po
index cc42899..f70b6a6 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -2634,6 +2634,7 @@ msgid "Inline edit of this query"
msgstr "Golygu mewnol yr ymholiad hwn"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Mewnol"
diff --git a/po/da.po b/po/da.po
index 684dd86..7c91f3a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2575,6 +2575,7 @@ msgid "Inline edit of this query"
msgstr "Åben linje til redigering af forespørgslen"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "I linje"
diff --git a/po/de.po b/po/de.po
index 3f5806a..47be5ab 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2562,6 +2562,7 @@ msgid "Inline edit of this query"
msgstr "Inline-Bearbeiten dieses SQL-Befehls"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Inline"
diff --git a/po/el.po b/po/el.po
index 9993028..0da223e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -2575,6 +2575,7 @@ msgid "Inline edit of this query"
msgstr "Εσωτερική Inline edit of this query" сто" " title="<?php echo __('Filter tables by name'); ?>" value="<?php echo __('Filter tables by name'); ?>" /> ���d+ 0��� � ղd+ ��� ���� k��d+ 6 � � ! � ! ���� 0��� xIJ�d+ ��� ��d+ ���d+ ���� `�d+ ���� ���d+ u���d+ ��d+ ش�d+ ���d+ ���d+ xIJ�d+ ��� ���� k��d+ �! �! ���� 0��� H���d+ ��� ��d+ ���d+ ���� `�d+ ���� ���� ���� 8��d+ �p� 0��� u���d+ ���d+ ��� ���� k��d+ G H I J K M N O P ���� 0��� HEi�d+ ���� ��d+ ���d+ ���� 0��d+ u���d+ в�d+ �yF�d+ ��d+ ش�d+ ���d+ ���d+ HEi�d+ ���� ���� k��d+ 8Ei�d+ ���� ��� k��d+ (Ei�d+ ���� @��� k��d+ Ei�d+ ���� p��� k��d+ ���d+ u���d+ ���d+ ���� ��F�d+ e���d+ ش�d+ ��� y�F�d+ e���d+ ��d+ @��� Z�F�d+ e���d+ �tF�d+ в�d+ �yF�d+ ��d+ �Բ�d+ ش�d+ ���d+ ���d+ 8��d+ =�d+ 0��� p F�d+ ���� ���� k��d+ 5 6 7 8 : < = > ? @ B D ���� 0��� �=�d+ 0��� u���d+ ��d+ p��� =�d+ e���d+ ��d+ �_@f �S Q��l�� �Sޱd+ 0��� �=�d+ ��� ���� k��d+ u]�� 4Q��U^Qʉ� �u������*ēv���� 0��� H�۱d+ ��d+ p��� ��y�d+ ��y�d+ �&�d+ ���� 0��� ���� P��� ߲�d+ u���d+ �Բ�d+ ���� ��y�d+ ���� ��� ����������y�d+ 8��� επεξεργασία αυτού του ερωτήματος"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Εσωτερικό"
diff --git a/po/en_GB.po b/po/en_GB.po
index 35e779c..2b81f5d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2525,6 +2525,7 @@ msgid "Inline edit of this query"
msgstr "Inline edit of this query"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Inline"
diff --git a/po/es.po b/po/es.po
index bfaed2f..2ffd4f4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2573,6 +2573,7 @@ msgid "Inline edit of this query"
msgstr "Edición en linea de esta consulta"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "En línea"
diff --git a/po/et.po b/po/et.po
index b1aa721..157c6f8 100644
--- a/po/et.po
+++ b/po/et.po
@@ -2691,6 +2691,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Mootor"
diff --git a/po/eu.po b/po/eu.po
index 8098ca3..bd25245 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -2650,6 +2650,7 @@ msgid "Inline edit of this query"
msgstr ""
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 9cb7551..02771f6 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -2606,6 +2606,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "موتور"
diff --git a/po/fi.po b/po/fi.po
index 75b4c0a..abe03a4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2603,6 +2603,7 @@ msgid "Inline edit of this query"
msgstr "Tämän kyselyn muokkaus"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Muokkaus"
diff --git a/po/fr.po b/po/fr.po
index 4b6eac1..849f254 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2547,6 +2547,7 @@ msgid "Inline edit of this query"
msgstr "Éditer cette requête en place"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "En ligne"
diff --git a/po/gl.po b/po/gl.po
index 4dd85d7..fb1be2e 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2745,6 +2745,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Motores"
diff --git a/po/he.po b/po/he.po
index 286642f..210b3e4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -2649,6 +2649,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "מנועים"
diff --git a/po/hi.po b/po/hi.po
index 7890556..21f30e0 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -2573,6 +2573,7 @@ msgid "Inline edit of this query"
msgstr "इस कुएरी की इनलाइन एडिट"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "इनलाइन"
diff --git a/po/hr.po b/po/hr.po
index a20cf3e..a39f70b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -2711,6 +2711,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Pogoni"
diff --git a/po/hu.po b/po/hu.po
index 7186b94..8078540 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2601,6 +2601,7 @@ msgid "Inline edit of this query"
msgstr "lekérdezés inline szerkesztése"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Belső"
diff --git a/po/id.po b/po/id.po
index 5ac6eba..4d8fffd 100644
--- a/po/id.po
+++ b/po/id.po
@@ -2579,6 +2579,7 @@ msgid "Inline edit of this query"
msgstr "Inline edit untuk query ini"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Inline"
diff --git a/po/it.po b/po/it.po
index 3b24fe3..4e9df10 100644
--- a/po/it.po
+++ b/po/it.po
@@ -2585,6 +2585,7 @@ msgid "Inline edit of this query"
msgstr "Modifica inline di questa query"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Inline"
diff --git a/po/ja.po b/po/ja.po
index 28b162d..c1f626a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2527,6 +2527,7 @@ msgid "Inline edit of this query"
msgstr "このクエリをインライン編集する"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "インライン"
diff --git a/po/ka.po b/po/ka.po
index 0668f77..4df1e04 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -2730,6 +2730,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "ძრავები"
diff --git a/po/ko.po b/po/ko.po
index 6a4b04c..12559c3 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2597,6 +2597,7 @@ msgid "Inline edit of this query"
msgstr ""
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 9cd68b0..c7e17a9 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -2529,6 +2529,7 @@ msgid "Inline edit of this query"
msgstr "Greitas užklausos redagavimas"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Redaguoti čia"
diff --git a/po/lv.po b/po/lv.po
index e4a1336..2a320e8 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -2659,6 +2659,7 @@ msgid "Inline edit of this query"
msgstr ""
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr ""
diff --git a/po/mk.po b/po/mk.po
index e66b531..708132a 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -2661,6 +2661,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Складишта"
diff --git a/po/ml.po b/po/ml.po
index e0ffecb..35b0f04 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -2451,6 +2451,7 @@ msgid "Inline edit of this query"
msgstr ""
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr ""
diff --git a/po/mn.po b/po/mn.po
index 3ddf731..03f36aa 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -2675,6 +2675,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Хөдөлгүүрүүд"
diff --git a/po/ms.po b/po/ms.po
index ab419b4..2aa763c 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -2630,6 +2630,7 @@ msgid "Inline edit of this query"
msgstr ""
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index b1fe532..8bda938 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -2604,6 +2604,7 @@ msgid "Inline edit of this query"
msgstr "Inline redigering av denne spørringa"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Inline"
diff --git a/po/nl.po b/po/nl.po
index dbdcd07..e728db6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2591,6 +2591,7 @@ msgstr "Rechtstreekse bewerking van deze query"
# "Inline" vertaalt naar "rechtstreeks in het document", als het ware binnen
# iets anders.
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Rechtstreeks"
diff --git a/po/pl.po b/po/pl.po
index d8ce281..3d70be9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2653,6 +2653,7 @@ msgstr "Szybka edycja tego zapytania"
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Mechanizmy"
diff --git a/po/pt.po b/po/pt.po
index 92a53c6..bd0e0a5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2633,6 +2633,7 @@ msgid "Inline edit of this query"
msgstr ""
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fbcaf3c..92979b3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2585,6 +2585,7 @@ msgid "Inline edit of this query"
msgstr "Na linha de edição da presente consulta"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "na linha"
diff --git a/po/ro.po b/po/ro.po
index c0987a1..a9b72dd 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2711,6 +2711,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Motoare"
diff --git a/po/ru.po b/po/ru.po
index 71d9d8d..00185ab 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2578,6 +2578,7 @@ msgid "Inline edit of this query"
msgstr "Быстрое редактирование запроса"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Быстрая правка"
diff --git a/po/si.po b/po/si.po
index dd0f1ed..c3eadb1 100644
--- a/po/si.po
+++ b/po/si.po
@@ -2572,6 +2572,7 @@ msgid "Inline edit of this query"
msgstr "මෙම විමසුමේ පේළිගත සංස්කරණය"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "පේළිගත"
diff --git a/po/sk.po b/po/sk.po
index 3065dbd..3bee046 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2566,6 +2566,7 @@ msgid "Inline edit of this query"
msgstr "Upraviť dopyt na tejto stránke"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Upraviť tu"
diff --git a/po/sl.po b/po/sl.po
index fa21860..cb8969a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2578,6 +2578,7 @@ msgid "Inline edit of this query"
msgstr "Urejanje te poizvedbe v vrstici"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "V vrstici"
diff --git a/po/sq.po b/po/sq.po
index ff7a94e..08650fe 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -2659,6 +2659,7 @@ msgid "Inline edit of this query"
msgstr ""
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr ""
diff --git a/po/sr.po b/po/sr.po
index b3e53ef..55023ad 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2696,6 +2696,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Складиштења"
diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po
index 73993bd..1076d93 100644
--- a/po/sr(a)latin.po
+++ b/po/sr(a)latin.po
@@ -2690,6 +2690,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Skladištenja"
diff --git a/po/sv.po b/po/sv.po
index 4f60104..3027cfb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2541,6 +2541,7 @@ msgid "Inline edit of this query"
msgstr "Redigera denna fråga"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Infogad"
diff --git a/po/ta.po b/po/ta.po
index dd34385..786ff02 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -2517,6 +2517,7 @@ msgid "Inline edit of this query"
msgstr "வினாவிற்கான உன்வரிசை மாற்றப்பகுதி "
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "உள்வரிசை"
diff --git a/po/te.po b/po/te.po
index 0028247..54a99bb 100644
--- a/po/te.po
+++ b/po/te.po
@@ -2564,6 +2564,7 @@ msgid "Inline edit of this query"
msgstr ""
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr ""
diff --git a/po/th.po b/po/th.po
index d76fa16..9097847 100644
--- a/po/th.po
+++ b/po/th.po
@@ -2616,6 +2616,7 @@ msgid "Inline edit of this query"
msgstr ""
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 77b66f2..14eec56 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2523,6 +2523,7 @@ msgid "Inline edit of this query"
msgstr "Bu sorguyu sıralı düzenle"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Sıralı"
diff --git a/po/tt.po b/po/tt.po
index c2dfd93..05e1fec 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -2672,6 +2672,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Engine"
diff --git a/po/ug.po b/po/ug.po
index 3d7e0bc..8d92815 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -2595,6 +2595,7 @@ msgid "Inline edit of this query"
msgstr "Inline edit of this query"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "ئىچكى بىرلىشىش"
diff --git a/po/uk.po b/po/uk.po
index 4cda61c..eab2163 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -2542,6 +2542,7 @@ msgid "Inline edit of this query"
msgstr ""
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr ""
diff --git a/po/ur.po b/po/ur.po
index cd8c00a..e06d7fb 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -2585,6 +2585,7 @@ msgid "Inline edit of this query"
msgstr "اس طلب کی ان لائن تدوین"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "ان لائن"
diff --git a/po/uz.po b/po/uz.po
index 1ef3907..192317a 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -2748,6 +2748,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Жадвал турлари"
diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po
index ab91c50..90ce961 100644
--- a/po/uz(a)latin.po
+++ b/po/uz(a)latin.po
@@ -2756,6 +2756,7 @@ msgstr ""
#: libraries/common.lib.php:1216
#, fuzzy
#| msgid "Engines"
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "Jadval turlari"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 86df04a..57dc90e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2470,6 +2470,7 @@ msgid "Inline edit of this query"
msgstr "在本页面编辑此查询"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "内联"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9749ae4..9f69c93 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2534,6 +2534,7 @@ msgid "Inline edit of this query"
msgstr "在本頁面編輯此查詢"
#: libraries/common.lib.php:1216
+msgctxt "Inline edit query"
msgid "Inline"
msgstr "行間"
hooks/post-receive
--
phpMyAdmin
1
0