Git
Threads by month
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 9 participants
- 38701 discussions
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5909-ge02935a
by Michal Čihař 23 Jul '10
by Michal Čihař 23 Jul '10
23 Jul '10
The branch, master has been updated
via e02935a1d5ad5090434ff6a258d367814832a1df (commit)
via 2b7d0f2ed7d8fca6b29783dfa1aa264318b29ea3 (commit)
via bffcffc3fde04da000229f399288c68da15de27a (commit)
via 22f3952b5717e6cc6cd54bf9ef58236052adf308 (commit)
via 9cdc5b804ca2f64d85a32fc3301796c7a2357740 (commit)
via 7741f1c0a88a43aebaf684b8027958690c6226d5 (commit)
via 6f7556f8b30c7a0bb5946986e462d9ca5989569f (commit)
via 9e5215ec07d4fda7f4d445f4878eac958dfeb3b8 (commit)
via b7d3df431de015fede89790575bfa68dbeb93e61 (commit)
via 575242f812f9f0b10298ecd522a787dc18cb5c5f (commit)
via 7b7fbc8c2940d1ee90700b81059751e3a9a0b472 (commit)
via 9272636d4bc5bf69a10f21b358061ac1e6cd26a5 (commit)
via 97d85e9068c9c2d4f3474c91150a760e6d5c1d6e (commit)
via c6609cb6af4a04466783a097be2499db0713fefd (commit)
via 47f2564ca498304a68e4c4fc1bcb18424f7afe17 (commit)
via f5eacc549ab98c49735e03e792fd14b87f54084d (commit)
via 0c6c2bf4cb4d41fda71950272bb6ea09b000f3dc (commit)
via 74e7c4342a8691b16278145addb7e5216bd4a5e3 (commit)
from ab2e4e925ed3a5245d3c9d89462831bd735bd3c9 (commit)
- Log -----------------------------------------------------------------
commit e02935a1d5ad5090434ff6a258d367814832a1df
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 08:08:12 2010 +0200
Translation update done using Pootle.
commit 2b7d0f2ed7d8fca6b29783dfa1aa264318b29ea3
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 08:00:13 2010 +0200
Translation update done using Pootle.
commit bffcffc3fde04da000229f399288c68da15de27a
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:59:18 2010 +0200
Translation update done using Pootle.
commit 22f3952b5717e6cc6cd54bf9ef58236052adf308
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:56:38 2010 +0200
Translation update done using Pootle.
commit 9cdc5b804ca2f64d85a32fc3301796c7a2357740
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:43:23 2010 +0200
Translation update done using Pootle.
commit 7741f1c0a88a43aebaf684b8027958690c6226d5
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:41:09 2010 +0200
Translation update done using Pootle.
commit 6f7556f8b30c7a0bb5946986e462d9ca5989569f
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:35:38 2010 +0200
Translation update done using Pootle.
commit 9e5215ec07d4fda7f4d445f4878eac958dfeb3b8
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:34:26 2010 +0200
Translation update done using Pootle.
commit b7d3df431de015fede89790575bfa68dbeb93e61
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:31:27 2010 +0200
Translation update done using Pootle.
commit 575242f812f9f0b10298ecd522a787dc18cb5c5f
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:30:19 2010 +0200
Translation update done using Pootle.
commit 7b7fbc8c2940d1ee90700b81059751e3a9a0b472
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:27:33 2010 +0200
Translation update done using Pootle.
commit 9272636d4bc5bf69a10f21b358061ac1e6cd26a5
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:26:14 2010 +0200
Translation update done using Pootle.
commit 97d85e9068c9c2d4f3474c91150a760e6d5c1d6e
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:25:25 2010 +0200
Translation update done using Pootle.
commit c6609cb6af4a04466783a097be2499db0713fefd
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:23:55 2010 +0200
Translation update done using Pootle.
commit 47f2564ca498304a68e4c4fc1bcb18424f7afe17
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:20:37 2010 +0200
Translation update done using Pootle.
commit f5eacc549ab98c49735e03e792fd14b87f54084d
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:20:14 2010 +0200
Translation update done using Pootle.
commit 0c6c2bf4cb4d41fda71950272bb6ea09b000f3dc
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:19:13 2010 +0200
Translation update done using Pootle.
commit 74e7c4342a8691b16278145addb7e5216bd4a5e3
Author: gheni <gheni(a)yahoo.cn>
Date: Fri Jul 23 07:18:04 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/ug.po | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/po/ug.po b/po/ug.po
index 1e12f2b..db747c5 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-07-22 12:44+0200\n"
+"PO-Revision-Date: 2010-07-23 08:08+0200\n"
"Last-Translator: <gheni(a)yahoo.cn>\n"
"Language-Team: Uyghur <ug(a)li.org>\n"
"Language: ug\n"
@@ -823,6 +823,8 @@ msgid ""
"You attempted to load file with unsupported compression (%s). Either support "
"for it is not implemented or disabled by your configuration."
msgstr ""
+"You attempted to load file with unsupported compression (%s). Either support "
+"for it is not implemented or disabled by your configuration."
#: import.php:336
msgid ""
@@ -830,6 +832,9 @@ msgid ""
"file size exceeded the maximum size permitted by your PHP configuration. See "
"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
msgstr ""
+"No data was received to import. Either no file name was submitted, or the "
+"file size exceeded the maximum size permitted by your PHP configuration. See "
+"[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]."
#: import.php:371 libraries/display_import.lib.php:23
msgid "Could not load import plugins, please check your installation!"
@@ -858,12 +863,16 @@ msgid ""
"Script timeout passed, if you want to finish import, please resubmit same "
"file and import will resume."
msgstr ""
+"Script timeout passed, if you want to finish import, please resubmit same "
+"file and import will resume."
#: import.php:425
msgid ""
"However on last run no data has been parsed, this usually means phpMyAdmin "
"won't be able to finish this import unless you increase php time limits."
msgstr ""
+"However on last run no data has been parsed, this usually means phpMyAdmin "
+"won't be able to finish this import unless you increase php time limits."
#: import_status.php:30 libraries/common.lib.php:660 pdf_schema.php:240
#: user_password.php:110
@@ -872,7 +881,7 @@ msgstr "قايتىش"
#: index.php:188
msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
-msgstr ""
+msgstr "phpMyAdmin <b>دەستەك</b> توركۆرگۈچلەردە ياخشى ئىشلەيدۇ."
#: js/messages.php:25 server_synchronize.php:344 server_synchronize.php:356
#: server_synchronize.php:372 server_synchronize.php:379
@@ -904,7 +913,7 @@ msgstr "سىز BLOB ئامبىرنى توقتاتماقچى!"
#: js/messages.php:35
#, php-format
msgid "Are you sure you want to disable all BLOB references for database %s?"
-msgstr ""
+msgstr "سىز ھەقىقەتەن %s ئۈستىدىكى BLOB ئىقتىدارىنى تاقىماقچىمۇ؟"
#: js/messages.php:38
msgid "Missing value in the form!"
@@ -960,7 +969,7 @@ msgstr "!خاتالىق:بۇناسىۋەت ئاللىقاچان مەۋجۈت"
#: js/messages.php:58
msgid "Error saving coordinates for Designer."
-msgstr ""
+msgstr "ساقلاشتا خاتالىق كۆرۈلدى."
#: js/messages.php:59 libraries/relation.lib.php:94
#: libraries/relation.lib.php:106
@@ -1256,16 +1265,18 @@ msgstr "ھۆججەت يۈكلەشتە ئېنىقسىز خاتالىق كۆرۈل
#: libraries/File.class.php:406
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
msgstr ""
+"سىز يۈكلىگەن ھۆججەت php.ini نىڭ ئىچىدىكى upload_max_filesize چەكلىمىسىدىن "
+"ئېشىپ كەتتى."
#: libraries/File.class.php:409
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form."
-msgstr ""
+msgstr "سز يۈكلىگەن ھۆججەت HTML نىڭ MAX_FILE_SIZE چېكىدىن ئېشىپ كەتتى."
#: libraries/File.class.php:412
msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "سىز يۈكلىگەن ھۆججەتنىڭ پەقەت بىر قىسىمىلا يۈكلەندى."
#: libraries/File.class.php:415
msgid "Missing a temporary folder."
@@ -1277,13 +1288,15 @@ msgstr "ھۆججەتنى دېسكىغا يىزىشتا خاتالىق كۆرۈل
#: libraries/File.class.php:421
msgid "File upload stopped by extension."
-msgstr ""
+msgstr "كېڭەيتىلمە ئىسمى بۇنداق ھۆججەتلەرنى يوللاشقا بولمايدۇ."
#: libraries/File.class.php:898
msgid ""
"Error moving the uploaded file, see [a@./Documentation."
"html#faq1_11@Documentation]FAQ 1.11[/a]"
msgstr ""
+"Error moving the uploaded file, see "
+"[a@./Documentation.html#faq1_11@Documentation]FAQ 1.11[/a]"
#: libraries/Index.class.php:427 tbl_relation.php:528
msgid "No index defined!"
@@ -1373,22 +1386,22 @@ msgstr[1] ""
#: libraries/StorageEngine.class.php:196
msgid ""
"There is no detailed status information available for this storage engine."
-msgstr ""
+msgstr "بۇ ساقلىغۇچقا مۇناسىۋەتلىك باشقا ئۇچۇرلار مەۋجۇت ئەمەس."
#: libraries/StorageEngine.class.php:352
#, php-format
msgid "%s is available on this MySQL server."
-msgstr ""
+msgstr "%s نى بۇ MySQL مۇلازىمىتېرىدا ئىشلىتىشكە بولىدۇ."
#: libraries/StorageEngine.class.php:355
#, php-format
msgid "%s has been disabled for this MySQL server."
-msgstr ""
+msgstr "%s نى بۇ MySQL مۇلازىمىتېرىدا ئىشلىتىشكە بولمايدۇ."
#: libraries/StorageEngine.class.php:359
#, php-format
msgid "This MySQL server does not support the %s storage engine."
-msgstr ""
+msgstr "بۇ MySQL مۇلازىمىتېرى %s نى قوللىمايدۇ."
#: libraries/Table.class.php:1018
msgid "Invalid database"
@@ -1401,12 +1414,12 @@ msgstr "ئۈنۈمسىز جەدۋەل ئىسمى"
#: libraries/Table.class.php:1047
#, php-format
msgid "Error renaming table %1$s to %2$s"
-msgstr ""
+msgstr "%1$s بۇ جەدۋەل ئىسمىنى %2$s غا ئۆزگەرتىشتە خاتالىق كۆرۈلدى."
#: libraries/Table.class.php:1131
#, php-format
msgid "Table %s has been renamed to %s"
-msgstr ""
+msgstr "%1$s بۇ جەدۋەل ئىسمىنى %2$s غا ئۆزگەرتىش غەلبىلىك بولدى."
#: libraries/Theme.class.php:160
#, php-format
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5891-gab2e4e9
by Marc Delisle 22 Jul '10
by Marc Delisle 22 Jul '10
22 Jul '10
The branch, master has been updated
via ab2e4e925ed3a5245d3c9d89462831bd735bd3c9 (commit)
from 362aa516ac7b4b384e9cfb5d7aa7683b6b38515d (commit)
- Log -----------------------------------------------------------------
commit ab2e4e925ed3a5245d3c9d89462831bd735bd3c9
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 14:37:42 2010 -0400
correct insertion of BLOB field reference
-----------------------------------------------------------------------
Summary of changes:
tbl_replace.php | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tbl_replace.php b/tbl_replace.php
index d3271ac..bcf64af 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -231,21 +231,21 @@ foreach ($loop_array as $rowcount => $where_clause) {
$upload_blob_repo = isset($_REQUEST['upload_blob_repo_' . $key]) ? $_REQUEST['upload_blob_repo_' . $key] : NULL;
// checks if an existing blob repository reference should be removed
- if (isset($remove_blob_repo) && !isset($upload_blob_repo)) {
+ if (isset($remove_blob_repo) && ! isset($upload_blob_repo)) {
$remove_blob_reference = $_REQUEST['remove_blob_ref_' . $key];
if (isset($remove_blob_reference)) {
$val = "''";
}
+ }
- // checks if this field requires a bs reference attached to it
- if (isset($upload_blob_repo)) {
- // get the most recent BLOB reference
- $bs_reference = PMA_File::getRecentBLOBReference();
+ // checks if this field requires a bs reference attached to it
+ if (isset($upload_blob_repo)) {
+ // get the most recent BLOB reference
+ $bs_reference = PMA_File::getRecentBLOBReference();
- // if the most recent BLOB reference exists, set it as a field value
- if (!is_null($bs_reference)) {
- $val = "'" . PMA_sqlAddslashes($bs_reference) . "'";
- }
+ // if the most recent BLOB reference exists, set it as a field value
+ if (!is_null($bs_reference)) {
+ $val = "'" . PMA_sqlAddslashes($bs_reference) . "'";
}
}
}
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5890-g362aa51
by Marc Delisle 22 Jul '10
by Marc Delisle 22 Jul '10
22 Jul '10
The branch, master has been updated
via 362aa516ac7b4b384e9cfb5d7aa7683b6b38515d (commit)
from ec9a60f8e09463ea34cdd11849b4c2357c4351e5 (commit)
- Log -----------------------------------------------------------------
commit 362aa516ac7b4b384e9cfb5d7aa7683b6b38515d
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 14:10:58 2010 -0400
undefined $primary_field
-----------------------------------------------------------------------
Summary of changes:
libraries/blobstreaming.lib.php | 31 +++++++++++++++++++++++++++++++
tbl_replace.php | 4 ++++
2 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php
index abbe047..5403e76 100644
--- a/libraries/blobstreaming.lib.php
+++ b/libraries/blobstreaming.lib.php
@@ -473,4 +473,35 @@ function PMA_BS_getURL($reference)
$bs_url = 'http://' . $bs_server . '/' . rtrim($reference);
return $bs_url;
}
+
+/**
+ * returns the field name for a primary key of a given table in a given database
+ *
+ * @access public
+ * @param string - database name
+ * @param string - table name
+ * @uses PMA_DBI_select_db()
+ * @uses PMA_backquote()
+ * @uses PMA_DBI_query()
+ * @uses PMA_DBI_fetch_assoc()
+ * @return string - field name for primary key
+*/
+function PMA_BS_GetPrimaryField($db_name, $tbl_name)
+{
+ // select specified database
+ PMA_DBI_select_db($db_name);
+
+ // retrieve table fields
+ $query = "SHOW FULL FIELDS FROM " . PMA_backquote($tbl_name);
+ $result = PMA_DBI_query($query);
+
+ // while there are records to parse
+ while ($data = PMA_DBI_fetch_assoc($result)) {
+ if ("PRI" == $data['Key']) {
+ return $data['Field'];
+ }
+ }
+ // return NULL on no primary key
+ return NULL;
+}
?>
diff --git a/tbl_replace.php b/tbl_replace.php
index 48b98c1..d3271ac 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -210,6 +210,10 @@ foreach ($loop_array as $rowcount => $where_clause) {
? $_REQUEST['auto_increment']['multi_edit'][$rowcount]
: null;
+ if ($blob_streaming_active) {
+ $primary_field = PMA_BS_GetPrimaryField($GLOBALS['db'], $GLOBALS['table']);
+ }
+
// Fetch the current values of a row to use in case we have a protected field
// @todo possibly move to ./libraries/tbl_replace_fields.inc.php
if ($is_insert && $using_key && isset($me_fields_type) && is_array($me_fields_type) && isset($where_clause)) {
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5889-gec9a60f
by Marc Delisle 22 Jul '10
by Marc Delisle 22 Jul '10
22 Jul '10
The branch, master has been updated
via ec9a60f8e09463ea34cdd11849b4c2357c4351e5 (commit)
from 56ebe05af73115e9c6928beb49db846fbbda460a (commit)
- Log -----------------------------------------------------------------
commit ec9a60f8e09463ea34cdd11849b4c2357c4351e5
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 13:22:30 2010 -0400
undefined variables; unneeded config variables
-----------------------------------------------------------------------
Summary of changes:
config.sample.inc.php | 6 ------
libraries/config.default.php | 6 ------
tbl_change.php | 2 +-
3 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/config.sample.inc.php b/config.sample.inc.php
index 575e965..679555b 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -35,12 +35,6 @@ $cfg['Servers'][$i]['compress'] = false;
$cfg['Servers'][$i]['extension'] = 'mysql';
$cfg['Servers'][$i]['AllowNoPassword'] = false;
-/* for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = 50;
-$cfg['Servers'][$i]['bs_repository_threshold'] = '32M';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = 600;
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '32M';
-
/* User for advanced features */
// $cfg['Servers'][$i]['controluser'] = 'pma';
// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 7ec7c5d..28aa85e 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -137,12 +137,6 @@ $cfg['Servers'][$i]['connect_type'] = 'tcp';
*/
$cfg['Servers'][$i]['extension'] = 'mysql';
-/* added for blobstreaming */
-$cfg['Servers'][$i]['bs_garbage_threshold'] = '';
-$cfg['Servers'][$i]['bs_repository_threshold'] = '';
-$cfg['Servers'][$i]['bs_temp_blob_timeout'] = '';
-$cfg['Servers'][$i]['bs_temp_log_threshold'] = '';
-
/**
* Use compressed protocol for the MySQL connection (requires PHP >= 4.3.0)
*
diff --git a/tbl_change.php b/tbl_change.php
index d8486ba..704cdc1 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -889,7 +889,7 @@ foreach ($rows as $row_id => $vrow) {
if ($is_upload && $field['is_blob']) {
// check if field type is of longblob and if the table is PBMS enabled.
- if (($field['pma_type'] == "longblob") && PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type)) {
+ if (($field['pma_type'] == "longblob") && PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type)) {
echo '<br />';
echo '<input type="checkbox" name="upload_blob_repo_' . $field['Field_md5'] . $vkey . '" /> ' . __('Upload to BLOB repository');
}
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5888-g56ebe05
by Marc Delisle 22 Jul '10
by Marc Delisle 22 Jul '10
22 Jul '10
The branch, master has been updated
via 56ebe05af73115e9c6928beb49db846fbbda460a (commit)
via b6349cd626d6b443e50f0d8506f30ca5f339bd9a (commit)
via a8e5b0f275b566a5eb1c9e0966f6d272c73bde2d (commit)
via f8653e58038e578569a49083e5470b6c278ac70a (commit)
via e65625ce1ed593e6f15545e61b97c1d1c88ad92a (commit)
from 049886139c62c3ed8b6573a0637ec5516857661f (commit)
- Log -----------------------------------------------------------------
commit 56ebe05af73115e9c6928beb49db846fbbda460a
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 13:15:27 2010 -0400
blob streaming code cleanup (work in progress)
commit b6349cd626d6b443e50f0d8506f30ca5f339bd9a
Author: Leslie <leslie(a)Leslies-Computer.local>
Date: Fri Jul 16 10:33:53 2010 -0700
Removed unused code from db_operations.php. Changed blobstreaming.lib.php so that it check to see if blob streaming is enabled before doing anything and also uses an indirect method to create the 'pbms' database if it doesn't exist.
commit a8e5b0f275b566a5eb1c9e0966f6d272c73bde2d
Author: Barry Leslie <barry_leslie(a)users.sourceforge.net>
Date: Thu Jul 15 12:35:52 2010 -0700
Fix problem where PBMS daemon is not loaded or the 'pbms' database doesn't exist.
commit f8653e58038e578569a49083e5470b6c278ac70a
Author: Barry Leslie <barry_leslie(a)users.sourceforge.net>
Date: Mon Jul 12 15:39:06 2010 -0700
Update blob streaming to match the current API and use the PBMS PHP extension.
commit e65625ce1ed593e6f15545e61b97c1d1c88ad92a
Author: Barry Leslie <barry_leslie(a)users.sourceforge.net>
Date: Mon Jul 12 15:31:11 2010 -0700
Update blob streaming to match the current API and use the PBMS PHP extension.
-----------------------------------------------------------------------
Summary of changes:
bs_change_mime_type.php | 75 +----
bs_disp_as_mime_type.php | 24 +-
bs_play_media.php | 31 +-
db_operations.php | 148 --------
db_structure.php | 21 +-
libraries/File.class.php | 434 ++++------------------
libraries/StorageEngine.class.php | 16 +-
libraries/blobstreaming.lib.php | 723 +++++++++++++------------------------
libraries/common.inc.php | 10 +-
libraries/common.lib.php | 27 +-
libraries/core.lib.php | 33 +--
libraries/display_tbl.lib.php | 48 +---
libraries/engines/pbms.lib.php | 113 ++++++
libraries/engines/pbxt.lib.php | 40 ++
server_engines.php | 20 +-
tbl_change.php | 131 +------
tbl_replace.php | 4 -
17 files changed, 584 insertions(+), 1314 deletions(-)
create mode 100644 libraries/engines/pbms.lib.php
diff --git a/bs_change_mime_type.php b/bs_change_mime_type.php
index 8ad8d1a..edefae1 100644
--- a/bs_change_mime_type.php
+++ b/bs_change_mime_type.php
@@ -30,70 +30,19 @@
$bsNewMIMEType = isset($_REQUEST['bs_new_mime_type']) ? urldecode($_REQUEST['bs_new_mime_type']) : NULL;
// necessary variables exist
- if ($bsDB && $bsTable && $bsReference && $bsNewMIMEType)
+ if ($bsDB && $bsTable && $bsReference && $bsNewMIMEType)
{
- // load PMA configuration
- $PMA_Config = $GLOBALS['PMA_Config'];
-
- // if PMA configuration exists
- if (!empty($PMA_Config))
- {
- // if BS plugins exist
- if ($PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST'))
- {
- $pbms_ref_tbl = $PMA_Config->get('PBMS_NAME') . '_reference';
- $pbms_cust_content_type_tbl = $PMA_Config->get('PBMS_NAME') . '_custom_content_type';
-
- // if specified DB is selected
- if (PMA_DBI_select_db($bsDB))
- {
- $query = "SELECT * FROM " . PMA_backquote($pbms_ref_tbl);
- $query .= " WHERE Blob_url='" . PMA_sqlAddslashes($bsReference) . "'";
-
- $result = PMA_DBI_query($query);
-
- // if record exists
- if ($data = PMA_DBI_fetch_assoc($result))
- {
- $query = "SELECT count(*) FROM " . PMA_backquote($pbms_cust_content_type_tbl);
- $query .= " WHERE Blob_url='" . PMA_sqlAddslashes($bsReference) . "'";
-
- $result = PMA_DBI_query($query);
-
- // if record exists
- if ($data = PMA_DBI_fetch_assoc($result))
- {
- if (1 == $data['count(*)'])
- {
- $query = "UPDATE " . PMA_backquote($pbms_cust_content_type_tbl) . " SET Content_type='";
- $query .= PMA_sqlAddslashes($bsNewMIMEType) . "' WHERE Blob_url='" . PMA_sqlAddslashes($bsReference) . "'";
- }
- else
- {
- $query = "INSERT INTO " . PMA_backquote($pbms_cust_content_type_tbl) . " (Blob_url, Content_type)";
- $query .= " VALUES('" . PMA_sqlAddslashes($bsReference) . "', '" . PMA_sqlAddslashes($bsNewMIMEType) . "')";
- }
-
- $result = PMA_DBI_query($query);
-
- // if query execution succeeded
- if ($result)
- {
- // determine redirector page
- $newLoc = $cfg['PmaAbsoluteUri'] . 'sql.php?' . PMA_generate_common_url ('','', '&') . (isset($bsDB) ? '&db=' . urlencode($bsDB) : '') . (isset($bsTable) ? '&table=' . urlencode($bsTable) : '') . (isset($token) ? '&token=' . urlencode($token) : '') . (isset($goto) ? '&goto=' . urlencode($goto) : '') . '&reload=1&purge=1';
-
- // redirect to specified page
- ?>
- <script>
- window.location = "<?php echo $newLoc ?>";
- </script>
- <?php
- } // end if ($result)
- } // end if ($data = PMA_DBI_fetch_assoc($result))
- } // end if ($data = PMA_DBI_fetch_assoc($result))
- } // end if (PMA_DBI_select_db($bsDB))
- } // end if ($PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST'))
- } // end if (!empty($PMA_Config))
+ if (PMA_BS_SetContentType($bsDB, $bsTable, $bsReference, $bsNewMIMEType)) {
+ // determine redirector page
+ $newLoc = $cfg['PmaAbsoluteUri'] . 'sql.php?' . PMA_generate_common_url ('','', '&') . (isset($bsDB) ? '&db=' . urlencode($bsDB) : '') . (isset($bsTable) ? '&table=' . urlencode($bsTable) : '') . (isset($token) ? '&token=' . urlencode($token) : '') . (isset($goto) ? '&goto=' . urlencode($goto) : '') . '&reload=1&purge=1';
+
+ // redirect to specified page
+ ?>
+<script>
+window.location = "<?php echo $newLoc ?>";
+</script>
+ <?php
+ } // end if ($result)
} // end if ($bsDB && $bsTable && $bsReference && $bsNewMIMEType)
?>
diff --git a/bs_disp_as_mime_type.php b/bs_disp_as_mime_type.php
index 9b26a59..085d888 100644
--- a/bs_disp_as_mime_type.php
+++ b/bs_disp_as_mime_type.php
@@ -9,13 +9,6 @@
*/
require_once './libraries/common.inc.php';
-// load PMA configuration
-$PMA_Config = $GLOBALS['PMA_Config'];
-
-// retrieve BS server variables from PMA configuration
-$bs_server = $PMA_Config->get('BLOBSTREAMING_SERVER');
-if (empty($bs_server)) die('No blob streaming server configured!');
-
// Check URL parameters
PMA_checkParameters(array('reference', 'c_type'));
@@ -30,15 +23,23 @@ $reference = $_REQUEST['reference'];
*/
$c_type = preg_replace('/[^A-Za-z0-9/_-]/', '_', $_REQUEST['c_type']);
-$filename = 'http://' . $bs_server . '/' . $reference;
+// Get the blob streaming URL
+$filename = PMA_BS_getURL($reference);
+if (empty($filename)) {
+ die(__('No blob streaming server configured!'));
+}
$hdrs = get_headers($filename, 1);
-if ($hdrs === FALSE) die('Failed to fetch headers');
+if ($hdrs === FALSE) {
+ die(__('Failed to fetch headers'));
+}
$fHnd = fopen($filename, "rb");
-if ($fHnd === FALSE) die('Failed to open remote URL');
+if ($fHnd === FALSE) {
+ die(__('Failed to open remote URL'));
+}
$f_size = $hdrs['Content-Length'];
@@ -58,8 +59,9 @@ while (!feof($fHnd)) {
$content .= fread($fHnd, $f_size);
$pos = strlen($content);
- if ($pos >= $f_size)
+ if ($pos >= $f_size) {
break;
+ }
}
echo $content;
diff --git a/bs_play_media.php b/bs_play_media.php
index ad3c9af..fe6f574 100644
--- a/bs_play_media.php
+++ b/bs_play_media.php
@@ -15,7 +15,7 @@
$mediaType = isset($_REQUEST['media_type']) ? $_REQUEST['media_type'] : NULL;
/*
- * @var string indicates whether media type is of custom type
+ * @var string indicates whether media type is of custom type
*/
$customType = isset($_REQUEST['custom_type']) ? $_REQUEST['custom_type'] : false;
@@ -25,24 +25,16 @@
$bsReference = isset($_REQUEST['bs_reference']) ? $_REQUEST['bs_reference'] : NULL;
// if media type and BS reference are specified
- if (isset($mediaType) && isset($bsReference))
- {
- // load PMA configuration
- $PMA_Config = $GLOBALS['PMA_Config'];
-
- // if PMA configuration exists
- if (!empty($PMA_Config))
- {
- // retrieve BS server variables from PMA configuration
- $bs_server = $PMA_Config->get('BLOBSTREAMING_SERVER');
- if (empty($bs_server)) die('No blob streaming server configured!');
-
- $bs_file_path = "http://" . $bs_server . '/' . $bsReference;
-
- if (isset($customType) && $customType)
-
- $bs_file_path = 'bs_disp_as_mime_type.php' . PMA_generate_common_url(array('reference' => $bsReference, 'c_type' => $mediaType));
-
+ if (isset($mediaType) && isset($bsReference)) {
+ if (isset($customType) && $customType) {
+ $bs_file_path = 'bs_disp_as_mime_type.php' . PMA_generate_common_url(array('reference' => $bsReference, 'c_type' => $mediaType));
+ } else {
+ // Get the BLOB streaming URL
+ $bs_file_path = PMA_BS_getURL($bsReference);
+ if (empty($bs_file_path)) {
+ die(__('No blob streaming server configured!'));
+ }
+ }
?>
<html>
<head>
@@ -69,7 +61,6 @@
</body>
</html>
<?php
- } // end if (!empty($PMA_Config))
} // end if (isset($mediaType) && isset($bsReference))
?>
diff --git a/db_operations.php b/db_operations.php
index e4e6992..7732131 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -19,9 +19,6 @@ require_once './libraries/common.inc.php';
require_once './libraries/Table.class.php';
require_once './libraries/mysql_charsets.lib.php';
-// add blobstreaming library functions
-require_once "./libraries/blobstreaming.lib.php";
-
/**
* Rename/move or copy database
*/
@@ -260,65 +257,6 @@ if (strlen($db) && (! empty($db_rename) || ! empty($db_copy))) {
}
}
-/*
- * Enable/Disable/Repair BLOB Repository Monitoring for current database
-*/
-if (strlen($db) > 0 && !empty($db_blob_streaming_op))
-{
- // load PMA_Config
- $PMA_Config = $GLOBALS['PMA_Config'];
-
- if (!empty($PMA_Config))
- {
- if ($PMA_Config->get('PBXT_NAME') !== strtolower($db))
- {
- // if Blobstreaming plugins exist, begin checking for Blobstreaming tables
- if ($PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST'))
- {
- $bs_tables = $PMA_Config->get('BLOBSTREAMABLE_DATABASES');
- $bs_tables = $bs_tables[$db];
-
- $oneBSTableExists = FALSE;
-
- // check if at least one blobstreaming table exists
- foreach ($bs_tables as $table_key=>$tbl)
- if ($bs_tables[$table_key]['Exists'])
- {
- $oneBSTableExists = TRUE;
- break;
- }
-
- switch ($db_blob_streaming_op)
- {
- // enable BLOB repository monitoring
- case "enable":
- // if blobstreaming tables do not exist, create them
- if (!$oneBSTableExists)
- PMA_BS_CreateTables($db);
- break;
- // disable BLOB repository monitoring
- case "disable":
- // if at least one blobstreaming table exists, execute drop
- if ($oneBSTableExists)
- PMA_BS_DropTables($db);
- break;
- // repair BLOB repository
- case "repair":
- // check if a blobstreaming table is missing
- foreach ($bs_tables as $table_key=>$tbl)
- if (!$bs_tables[$table_key]['Exists'])
- {
- PMA_DBI_select_db($db);
- PMA_DBI_query(PMA_BS_GetTableStruct($table_key));
- }
- }
-
- // refresh side menu
- PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'db_operations.php?' . PMA_generate_common_url ('','', '&') . (isset($db) ? '&db=' . urlencode($db) : '') . (isset($token) ? '&token=' . urlencode($token) : '') . (isset($goto) ? '&goto=' . urlencode($goto) : '') . 'reload=1&purge=1');
- } // end if ($PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST'))
- } // end if ($PMA_Config->get('PBXT_NAME') !== strtolower($db))
- }
-}
/**
* Settings for relations stuff
@@ -500,92 +438,6 @@ if (!$is_information_schema) {
</form>
<?php
- /*
- * BLOB streaming support
- */
-
- // load PMA_Config
- $PMA_Config = $GLOBALS['PMA_Config'];
-
- // if all blobstreaming plugins exist, begin checking for blobstreaming tables
- if (!empty($PMA_Config))
- {
- if ($PMA_Config->get('PBXT_NAME') !== strtolower($db))
- {
- if ($PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST'))
- {
- $bs_tables = $PMA_Config->get('BLOBSTREAMABLE_DATABASES');
- $bs_tables = $bs_tables[$db];
-
- $oneBSTableExists = FALSE;
- $allBSTablesExist = TRUE;
-
- // first check that all blobstreaming tables do not exist
- foreach ($bs_tables as $table_key=>$tbl)
- if ($bs_tables[$table_key]['Exists'])
- $oneBSTableExists = TRUE;
- else
- $allBSTablesExist = FALSE;
-
- ?>
-
- <form method="post" action="./db_operations.php">
- <?php echo PMA_generate_common_hidden_inputs($db); ?>
- <fieldset>
- <legend>
- <?php echo PMA_getIcon('b_edit.png', __('BLOB Repository'), false, true); ?>
- </legend>
-
- <?php echo __('Status'); ?>:
-
- <?php
-
- // if the blobstreaming tables exist, provide option to disable the BLOB repository
- if ($allBSTablesExist)
- {
- ?>
- <?php echo _pgettext('BLOB repository', 'Enabled'); ?>
- </fieldset>
- <fieldset class="tblFooters">
- <input type="hidden" name="db_blob_streaming_op" value="disable" />
- <input type="submit" onclick="return confirmDisableRepository('<?php echo $db; ?>');" value="<?php echo __('Disable'); ?>" />
- </fieldset>
- <?php
- }
- else
- {
- // if any of the blobstreaming tables are missing, provide option to repair the BLOB repository
- if ($oneBSTableExists && !$allBSTablesExist)
- {
- ?>
- <?php echo __('Damaged'); ?>
- </fieldset>
- <fieldset class="tblFooters">
- <input type="hidden" name="db_blob_streaming_op" value="repair" />
- <input type="submit" value="<?php echo _pgettext('BLOB repository', 'Repair'); ?>" />
- </fieldset>
- <?php
- }
- // if none of the blobstreaming tables exist, provide option to enable BLOB repository
- else
- {
- ?>
- <?php echo _pgettext('BLOB repository', 'Disabled'); ?>
- </fieldset>
- <fieldset class="tblFooters">
- <input type="hidden" name="db_blob_streaming_op" value="enable" />
- <input type="submit" value="<?php echo __('Enable'); ?>" />
- </fieldset>
- <?php
- }
- } // end if ($allBSTablesExist)
-
- ?>
- </form>
- <?php
- } // end if ($PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST'))
- } // end if ($PMA_Config->get('PBXT_NAME') !== strtolower($db))
- }
/**
* Change database charset
diff --git a/db_structure.php b/db_structure.php
index 9a6ee24..077dcab 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -150,27 +150,14 @@ $hidden_fields = array();
$odd_row = true;
$sum_row_count_pre = '';
-// for blobstreaming
-$PMA_Config = $GLOBALS['PMA_Config'];
-
-if (!empty($PMA_Config))
- $session_bs_tables = $PMA_Config->get('BLOBSTREAMING_TABLES'); // list of blobstreaming tables
-
$tableReductionCount = 0; // the amount to reduce the table count by
foreach ($tables as $keyname => $each_table) {
- if (isset($session_bs_tables))
- {
- // compare table name against blobstreaming tables
- foreach ($session_bs_tables as $table_key=>$table_val)
- // if the table is a blobstreaming table, reduce table count and skip outer foreach loop
- if ($table_key == $keyname)
- {
- $tableReductionCount++;
- continue 2;
- }
+ if (PMA_BS_IsHiddenTable($keyname)) {
+ $tableReductionCount++;
+ continue;
}
-
+
// Get valid statistics whatever is the table type
$table_is_view = false;
diff --git a/libraries/File.class.php b/libraries/File.class.php
index a6a515f..83f5d14 100644
--- a/libraries/File.class.php
+++ b/libraries/File.class.php
@@ -279,118 +279,27 @@ class PMA_File
$is_bs_upload = FALSE;
// check if this field requires a repository upload
- if (isset($_REQUEST['upload_blob_repo_' . $key]))
+ if (isset($_REQUEST['upload_blob_repo_' . $key])) {
$is_bs_upload = ($_REQUEST['upload_blob_repo_' . $key]['multi_edit'][0] == "on") ? TRUE : FALSE;
-
+ }
// if request is an upload to the BLOB repository
- if ($is_bs_upload)
- {
- // load PMA configuration
- $PMA_Config = $GLOBALS['PMA_Config'];
-
- // if PMA configuration is loaded
- if (!empty($PMA_Config))
- {
- // load BS variables from PMA configuration
- $pluginsExist = $PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST');
- $curlExists = $PMA_Config->get('CURL_EXISTS');
- $bs_database = $PMA_Config->get('BLOBSTREAMABLE_DATABASES');
- $bs_database = $bs_database[$_REQUEST['db']];
-
- $allBSTablesExist = TRUE;
-
- // determine if plugins and curl exist
- if ($pluginsExist && $curlExists)
- {
- foreach ($bs_database as $table_key=>$table)
- {
- if (!$bs_database[$table_key]['Exists'])
- {
- $allBSTablesExist = FALSE;
- break;
- }
- }
- }
- else
- $allBSTablesExist = FALSE;
-
- // if necessary BS tables exist
- if ($allBSTablesExist)
- {
- // setup bs variables for uploading
- $bs_server = $PMA_Config->get('BLOBSTREAMING_SERVER');
- $bs_db = $_REQUEST['db'];
- $bs_table = $_REQUEST['table'];
-
- // setup file handle and related variables
- $tmp_file = fopen($file['tmp_name'], 'r');
- $tmp_file_type = $file['type'];
- $tmp_file_size = $file['size'];
-
- if (!$tmp_file_type)
- $tmp_file_type = NULL;
+ if ($is_bs_upload) {
+ $bs_db = $_REQUEST['db'];
+ $bs_table = $_REQUEST['table'];
+ $tmp_filename = $file['tmp_name'];
+ $tmp_file_type = $file['type'];
+
+ if (! $tmp_file_type) {
+ $tmp_file_type = NULL;
+ }
- // if none of the required variables contain data, return with an unknown error message
- if (!$bs_server || !$bs_db || !$bs_table || !$tmp_file || !$tmp_file_size)
- {
- $this->_error_message = __('Unknown error in file upload.');
- return FALSE;
- }
- else
- $bs_server_path = 'http://' . $bs_server . '/' . $bs_db . '/' . $bs_table;
-
- // init curl handle
- $curlHnd = curl_init ($bs_server_path);
-
- // if curl handle init successful
- if ($curlHnd)
- {
- // specify custom header
- $customHeader = array(
- "Accept-Language: en-us;en;q=0;5",
- "Accept-Charset: ISO-8859-1;utf-8;q=0.7,*;q=0.7",
- "Content-type: $tmp_file_type"
- );
-
- // specify CURL options in array
- $curlOptArr = array(
- CURLOPT_PUT => TRUE,
- CURLOPT_HEADER => TRUE,
- CURLOPT_HTTPHEADER => $customHeader,
- CURLOPT_INFILESIZE => $tmp_file_size,
- CURLOPT_INFILE => $tmp_file,
- CURLOPT_RETURNTRANSFER => TRUE
- );
-
- // pass array of options to curl handle setup function
- curl_setopt_array($curlHnd, $curlOptArr);
-
- // execute curl request and retrieve error message(s) (if any)
- $ret = curl_exec($curlHnd);
- $errRet = curl_error($curlHnd);
-
- // close curl handle
- curl_close($curlHnd);
-
- // split entire string into array of lines
- $retArr = explode("\r\n", $ret);
-
- // check each line as a valid string of a BLOB reference
- foreach ($retArr as $value)
- if (strlen($value) > strlen("~*$bs_db/~") && "~*$bs_db/~" == substr($value, 0, strlen($bs_db) + 4))
- {
- // is a valid reference, so set as current and break
- PMA_File::setRecentBLOBReference($value);
- break;
- }
-
- // close file handle
- if ($tmp_file)
- fclose($tmp_file);
- } // end if ($curlHnd)
- } // end if ($allBSTablesExist)
- } // end if ($PMA_Config)
- } // end if ($is_bs_upload)
+ if (! $bs_db || ! $bs_table) {
+ $this->_error_message = $GLOBALS['strUploadErrorUnknown'];
+ return FALSE;
+ }
+ $blob_url = PMA_BS_UpLoadFile($bs_db, $bs_table, $tmp_file_type, $tmp_filename);
+ PMA_File::setRecentBLOBReference($blob_url);
+ } // end if ($is_bs_upload)
// check for file upload errors
switch ($file['error']) {
@@ -487,135 +396,43 @@ class PMA_File
$is_bs_upload = FALSE;
// check if this field requires a repository upload
- if (isset($_REQUEST['upload_blob_repo_' . $key]))
+ if (isset($_REQUEST['upload_blob_repo_' . $key])) {
$is_bs_upload = ($_REQUEST['upload_blob_repo_' . $key]['multi_edit'][0] == "on") ? TRUE : FALSE;
+ }
// is a request to upload file to BLOB repository using uploadDir mechanism
- if ($is_bs_upload)
- {
- // load PMA configuration
- $PMA_Config = $GLOBALS['PMA_Config'];
-
- // if the PMA configuration was loaded
- if (!empty($PMA_Config))
- {
- // load BS variables from PMA configuration
- $pluginsExist = $PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST');
- $curlExists = $PMA_Config->get('CURL_EXISTS');
- $bs_database = $PMA_Config->get('BLOBSTREAMABLE_DATABASES');
- $bs_database = $bs_database[$_REQUEST['db']];
-
- $allBSTablesExist = TRUE;
-
- // if plugins and curl exist
- if ($pluginsExist && $curlExists)
- {
- foreach ($bs_database as $table_key=>$table)
- {
- if (!$bs_database[$table_key]['Exists'])
- {
- $allBSTablesExist = FALSE;
- break;
- }
- }
+ if ($is_bs_upload) {
+ $bs_db = $_REQUEST['db'];
+ $bs_table = $_REQUEST['table'];
+ $tmp_filename = $GLOBALS['cfg']['UploadDir'] . '/' . $_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary];
+
+ // check if fileinfo library exists
+ if ($PMA_Config->get('FILEINFO_EXISTS')) {
+ // attempt to init fileinfo
+ $finfo = finfo_open(FILEINFO_MIME);
+
+ // fileinfo exists
+ if ($finfo) {
+ // pass in filename to fileinfo and close fileinfo handle after
+ $tmp_file_type = finfo_file($finfo, $tmp_filename);
+ finfo_close($finfo);
}
- else
- $allBSTablesExist = FALSE;
-
- // if necessary BS tables exist
- if ($allBSTablesExist)
- {
- // load BS variables
- $bs_server = $PMA_Config->get('BLOBSTREAMING_SERVER');
- $bs_db = $_REQUEST['db'];
- $bs_table = $_REQUEST['table'];
-
- // setup uploadDir mechanism and file variables
- $tmp_filename = $GLOBALS['cfg']['UploadDir'] . '/' . $_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary];
- $tmp_file = fopen($tmp_filename, 'r');
- $tmp_file_size = filesize($tmp_filename);
-
- // check if fileinfo library exists
- if ($PMA_Config->get('FILEINFO_EXISTS'))
- {
- // attempt to init fileinfo
- $finfo = finfo_open(FILEINFO_MIME);
-
- // fileinfo exists
- if ($finfo)
- {
- // pass in filename to fileinfo and close fileinfo handle after
- $tmp_file_type = finfo_file($finfo, $tmp_filename);
- finfo_close($finfo);
- }
- }
- else // no fileinfo library exists, use file command
- $tmp_file_type = exec("file -bi " . escapeshellarg($tmp_filename));
-
- if (!$tmp_file_type)
- $tmp_file_type = NULL;
-
- // necessary variables aren't loaded, return error message (unknown error)
- if (!$bs_server || !$bs_db || !$bs_table || !$tmp_file || !$tmp_file_size)
- {
- $this->_error_message = __('Unknown error in file upload.');
- return FALSE;
- }
- else
- $bs_server_path = 'http://' . $bs_server . '/' . $bs_db . '/' . $bs_table;
-
- // init curl handle
- $curlHnd = curl_init ($bs_server_path);
-
- // curl handle exists
- if ($curlHnd)
- {
- // specify custom header
- $customHeader = array(
- "Accept-Language: en-us;en;q=0;5",
- "Accept-Charset: ISO-8859-1;utf-8;q=0.7,*;q=0.7",
- "Content-type: $tmp_file_type"
- );
-
- // specify custom curl options
- $curlOptArr = array(
- CURLOPT_PUT => TRUE,
- CURLOPT_HEADER => TRUE,
- CURLOPT_HTTPHEADER => $customHeader,
- CURLOPT_INFILESIZE => $tmp_file_size,
- CURLOPT_INFILE => $tmp_file,
- CURLOPT_RETURNTRANSFER => TRUE
- );
-
- // setup custom curl options (as specified in above array)
- curl_setopt_array($curlHnd, $curlOptArr);
-
- // execute curl request and retrieve error message(s) (if any)
- $ret = curl_exec($curlHnd);
- $errRet = curl_error($curlHnd);
-
- // close curl handle
- curl_close($curlHnd);
-
- // split return string into lines
- $retArr = explode("\r\n", $ret);
-
- // check subsequent lines for valid BLOB reference string
- foreach ($retArr as $value)
- if (strlen($value) > strlen("~*$bs_db/~") && "~*$bs_db/~" == substr($value, 0, strlen($bs_db) + 4))
- {
- // is a valid reference, so set as current and break
- PMA_File::setRecentBLOBReference($value);
- break;
- }
-
- // close file handle
- if ($tmp_file)
- fclose($tmp_file);
- } // end if ($curlHnd)
- } // end if ($allBSTablesExist)
- } // end if ($PMA_Config)
- } // end if ($is_bs_upload)
+ } else {
+ // no fileinfo library exists, use file command
+ $tmp_file_type = exec("file -bi " . escapeshellarg($tmp_filename));
+ }
+
+ if (! $tmp_file_type) {
+ $tmp_file_type = NULL;
+ }
+
+ if (! $bs_db || !$bs_table) {
+ $this->_error_message = $GLOBALS['strUploadErrorUnknown'];
+ return FALSE;
+ }
+ $blob_url = PMA_BS_UpLoadFile($bs_db, $bs_table, $tmp_file_type, $tmp_filename);
+ PMA_File::setRecentBLOBReference($blob_url);
+ } // end if ($is_bs_upload)
return $this->setLocalSelectedFile($_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary]);
} else {
@@ -633,127 +450,36 @@ class PMA_File
// is a request to upload file to BLOB repository using uploadDir mechanism
if ($is_bs_upload)
{
- // load PMA configuration
- $PMA_Config = $GLOBALS['PMA_Config'];
-
- // if the PMA configuration was loaded
- if (!empty($PMA_Config))
- {
- // load BS variables from PMA configuration
- $pluginsExist = $PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST');
- $curlExists = $PMA_Config->get('CURL_EXISTS');
- $bs_database = $PMA_Config->get('BLOBSTREAMABLE_DATABASES');
- $bs_database = $bs_database[$_REQUEST['db']];
-
- $allBSTablesExist = TRUE;
-
- // if plugins and curl exist
- if ($pluginsExist && $curlExists)
- {
- foreach ($bs_database as $table_key=>$table)
- {
- if (!$bs_database[$table_key]['Exists'])
- {
- $allBSTablesExist = FALSE;
- break;
- }
- }
- }
- else
- $allBSTablesExist = FALSE;
-
- if ($allBSTablesExist)
- {
- // load BS variables
- $bs_server = $PMA_Config->get('BLOBSTREAMING_SERVER');
- $bs_db = $_REQUEST['db'];
- $bs_table = $_REQUEST['table'];
-
- // setup uploadDir mechanism and file variables
- $tmp_filename = $GLOBALS['cfg']['UploadDir'] . '/' . $_REQUEST['fields_uploadlocal_' . $key]['multi_edit'][$primary];
- $tmp_file = fopen($tmp_filename, 'r');
- $tmp_file_size = filesize($tmp_filename);
-
- // check if fileinfo library exists
- if ($PMA_Config->get('FILEINFO_EXISTS'))
- {
- // attempt to init fileinfo
- $finfo = finfo_open(FILEINFO_MIME);
-
- // if fileinfo exists
- if ($finfo)
- {
- // pass in filename to fileinfo and close fileinfo handle after
- $tmp_file_type = finfo_file($finfo, $tmp_filename);
- finfo_close($finfo);
- }
- }
- else // no fileinfo library exists, use file command
- $tmp_file_type = exec("file -bi " . escapeshellarg($tmp_filename));
+ // check if fileinfo library exists
+ if ($PMA_Config->get('FILEINFO_EXISTS'))
+ {
+ // attempt to init fileinfo
+ $finfo = finfo_open(FILEINFO_MIME);
+
+ // if fileinfo exists
+ if ($finfo)
+ {
+ // pass in filename to fileinfo and close fileinfo handle after
+ $tmp_file_type = finfo_file($finfo, $tmp_filename);
+ finfo_close($finfo);
+ }
+ }
+ else // no fileinfo library exists, use file command
+ $tmp_file_type = exec("file -bi " . escapeshellarg($tmp_filename));
+
+ if (!$tmp_file_type)
+ $tmp_file_type = NULL;
+
+ $bs_db = $_REQUEST['db'];
+ $bs_table = $_REQUEST['table'];
+ if (!$bs_db || !$bs_table)
+ {
+ $this->_error_message = $GLOBALS['strUploadErrorUnknown'];
+ return FALSE;
+ }
+ $blob_url = PMA_BS_UpLoadFile($bs_db, $bs_table, $tmp_file_type, $tmp_filename);
+ PMA_File::setRecentBLOBReference($blob_url);
- if (!$tmp_file_type)
- $tmp_file_type = NULL;
-
- // necessary variables aren't loaded, return error message (unknown error)
- if (!$bs_server || !$bs_db || !$bs_table || !$tmp_file || !$tmp_file_size)
- {
- $this->_error_message = __('Unknown error in file upload.');
- return FALSE;
- }
- else
- $bs_server_path = 'http://' . $bs_server . '/' . $bs_db . '/' . $bs_table;
-
- // init curl handle
- $curlHnd = curl_init ($bs_server_path);
-
- // if curl handle exists
- if ($curlHnd)
- {
- // specify custom header
- $customHeader = array(
- "Accept-Language: en-us;en;q=0;5",
- "Accept-Charset: ISO-8859-1;utf-8;q=0.7,*;q=0.7",
- "Content-type: $tmp_file_type"
- );
-
- // specify custom curl options
- $curlOptArr = array(
- CURLOPT_PUT => TRUE,
- CURLOPT_HEADER => TRUE,
- CURLOPT_HTTPHEADER => $customHeader,
- CURLOPT_INFILESIZE => $tmp_file_size,
- CURLOPT_INFILE => $tmp_file,
- CURLOPT_RETURNTRANSFER => TRUE
- );
-
- // setup custom curl options (as specified in above array)
- curl_setopt_array($curlHnd, $curlOptArr);
-
- // execute curl request and retrieve error message(s) (if any)
- $ret = curl_exec($curlHnd);
- $errRet = curl_error($curlHnd);
-
- // close curl handle
- curl_close($curlHnd);
-
- // split return string into lines
- $retArr = explode("\r\n", $ret);
-
- // check subsequent lines for valid BLOB reference string
- foreach ($retArr as $value)
- if (strlen($value) > strlen("~*$bs_db/~") && "~*$bs_db/~" == substr($value, 0, strlen($bs_db) + 4))
- {
- // is a valid reference, so set as current and break
- PMA_File::setRecentBLOBReference($value);
- break;
- }
-
- // close file handle
- if ($tmp_file)
- fclose($tmp_file);
- } // end if ($curlHnd)
- } // end if ($allBSTablesExist)
- } // end if ($PMA_Config)
} // end if ($is_bs_upload)
return $this->setLocalSelectedFile($_REQUEST['fields_uploadlocal_' . $key]);
diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php
index 2ae125a..71b3636 100644
--- a/libraries/StorageEngine.class.php
+++ b/libraries/StorageEngine.class.php
@@ -91,12 +91,7 @@ class PMA_StorageEngine
&& ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED')) {
continue;
}
- // currently (MySQL 5.1.26) there is no way we can be informed
- // that PBMS does not support normal table creation so
- // we use an exception here
- if ('PBMS' == $details['Engine']) {
- continue;
- }
+
$output .= ' <option value="' . htmlspecialchars($key). '"'
. (empty($details['Comment'])
? '' : ' title="' . htmlspecialchars($details['Comment']) . '"')
@@ -144,6 +139,9 @@ class PMA_StorageEngine
*/
static public function isValid($engine)
{
+ if ($engine == "PBMS") {
+ return TRUE;
+ }
$storage_engines = PMA_StorageEngine::getStorageEngines();
return isset($storage_engines[$engine]);
}
@@ -265,6 +263,8 @@ class PMA_StorageEngine
return $mysql_vars;
}
+ function engine_init() {}
+
/**
* Constructor
*
@@ -303,7 +303,9 @@ class PMA_StorageEngine
default:
$this->support = PMA_ENGINE_SUPPORT_NO;
}
- }
+ } else {
+ $this->engine_init();
+ }
}
/**
diff --git a/libraries/blobstreaming.lib.php b/libraries/blobstreaming.lib.php
index 82c3194..abbe047 100644
--- a/libraries/blobstreaming.lib.php
+++ b/libraries/blobstreaming.lib.php
@@ -4,6 +4,41 @@
* @package BLOBStreaming
*/
+function initPBMSDatabase()
+{
+ $query = "create database IF NOT EXISTS pbms;"; // If no other choice then try this.
+ /*
+ * The user may not have privileges to create the 'pbms' database
+ * so if it doesn't exist then we perform a select on a pbms system
+ * table in an already existing database which will cause the PBMS
+ * daemon to create the 'pbms' database.
+ */
+ $db_array = PMA_DBI_fetch_result('SHOW DATABASES;');
+ if (! empty($db_array)) {
+ $target = "";
+ foreach ($db_array as $current_db) {
+ if ($current_db == 'pbms') {
+ return TRUE;
+ }
+ if ($target == "") {
+ if (($current_db != 'pbxt') && ($current_db != 'mysql') && ($current_db != 'information_schema')) {
+ $target = $current_db;
+ }
+ }
+ }
+
+ if ($target != "") {
+ $query = "select * from $target.pbms_metadata_header"; // If it exists this table will not contain much
+ }
+ }
+
+ $result = PMA_DBI_query($query );
+ if (! $result) {
+ return FALSE;
+ }
+ return TRUE;
+}
+
/**
* checks whether the necessary plugins for BLOBStreaming exist
*
@@ -13,7 +48,6 @@
* @uses PMA_Config::set()
* @uses PMA_BS_SetVariables()
* @uses PMA_BS_GetVariables()
- * @uses PMA_BS_SetFieldReferences()
* @uses PMA_cacheSet()
* @uses PMA_cacheGet()
* @return boolean
@@ -28,12 +62,6 @@ function checkBLOBStreamingPlugins()
return FALSE;
}
- // At this point we might already know that plugins do not exist
- // because this was recorded in the session (cache).
- if (PMA_cacheGet('skip_blobstreaming', true)) {
- return false;
- }
-
// If we don't know that we can skip blobstreaming, we continue
// verifications; anyway, in case we won't skip blobstreaming,
// we still need to set some variables in non-persistent settings,
@@ -63,72 +91,41 @@ function checkBLOBStreamingPlugins()
$serverCfg['socket'] = "";
}
- $allPluginsExist = false;
+ $has_blobstreaming = false;
if (PMA_MYSQL_INT_VERSION >= 50109) {
- $PMA_Config->set('PBXT_NAME', 'pbxt');
- $PMA_Config->set('PBMS_NAME', 'pbms');
-
- $required_plugins[$PMA_Config->get('PBXT_NAME')]['Library'] = 'libpbxt.so';
- $required_plugins[$PMA_Config->get('PBMS_NAME')]['Library'] = 'libpbms.so';
- $number_of_required_plugins_found = 0;
// Retrieve MySQL plugins
$existing_plugins = PMA_DBI_fetch_result('SHOW PLUGINS');
- foreach ($existing_plugins as $one_existing_plugin) {
+ foreach ($existing_plugins as $one_existing_plugin) {
// check if required plugins exist
- foreach ($required_plugins as $one_required_plugin) {
- if ( strtolower($one_existing_plugin['Library']) == strtolower($one_required_plugin['Library'])
- && $one_existing_plugin['Status'] == "ACTIVE") {
- $number_of_required_plugins_found++;
- }
- }
- if (2 == $number_of_required_plugins_found) {
- $allPluginsExist = true;
+ if ( strtolower($one_existing_plugin['Library']) == 'libpbms.so'
+ && $one_existing_plugin['Status'] == "ACTIVE") {
+ $has_blobstreaming = true;
break;
}
}
- unset($required_plugins, $existing_plugins, $one_required_plugin, $one_existing_plugin, $number_of_required_plugins_found);
+ unset($existing_plugins, $one_existing_plugin);
}
// set variable indicating BS plugin existence
- $PMA_Config->set('BLOBSTREAMING_PLUGINS_EXIST', $allPluginsExist);
+ $PMA_Config->set('BLOBSTREAMING_PLUGINS_EXIST', $has_blobstreaming);
- if ($allPluginsExist) {
- // retrieve BS variables from PMA configuration
- $bs_set_variables = array();
-
- $bs_set_variables[$PMA_Config->get('PBMS_NAME') . '_garbage_threshold'] = (isset($serverCfg['bs_garbage_threshold'])) ? $serverCfg['bs_garbage_threshold'] : NULL;
- $bs_set_variables[$PMA_Config->get('PBMS_NAME') . '_repository_threshold'] = (isset($serverCfg['bs_repository_threshold'])) ? $serverCfg['bs_repository_threshold'] : NULL;
- $bs_set_variables[$PMA_Config->get('PBMS_NAME') . '_temp_blob_timeout'] = (isset($serverCfg['bs_temp_blob_timeout'])) ? $serverCfg['bs_temp_blob_timeout'] : NULL;
- $bs_set_variables[$PMA_Config->get('PBMS_NAME') . '_temp_log_threshold'] = (isset($serverCfg['bs_temp_log_threshold'])) ? $serverCfg['bs_temp_log_threshold'] : NULL;
-
- // set BS variables to PMA configuration defaults
- PMA_BS_SetVariables($bs_set_variables);
-
- // retrieve updated BS variables (configurable and unconfigurable)
+ if ($has_blobstreaming) {
$bs_variables = PMA_BS_GetVariables();
- // if no BS variables exist, set plugin existence to false and return
+ // if no BS variables exist, set plugin existence to false and return
if (count($bs_variables) <= 0) {
$PMA_Config->set('BLOBSTREAMING_PLUGINS_EXIST', FALSE);
PMA_cacheSet('skip_blobstreaming', true, true);
return FALSE;
} // end if (count($bs_variables) <= 0)
- // switch on BS field references
- if (strtolower($bs_variables[$PMA_Config->get('PBMS_NAME') . '_field_references']) == "off") {
- if (! PMA_BS_SetFieldReferences('ON')) {
- PMA_cacheSet('skip_blobstreaming', true, true);
- return FALSE;
- }
- }
-
- // get BS server port
- $BS_PORT = $bs_variables[$PMA_Config->get('PBMS_NAME') . '_port'];
+ // get BS server port
+ $BS_PORT = $bs_variables['pbms_port'];
- // if no BS server port exists, set plugin existance to false and return
- if (! $BS_PORT) {
+ // if no BS server port or 'pbms' database exists, set plugin existance to false and return
+ if ((! $BS_PORT) || (! initPBMSDatabase())) {
$PMA_Config->set('BLOBSTREAMING_PLUGINS_EXIST', FALSE);
PMA_cacheSet('skip_blobstreaming', true, true);
return FALSE;
@@ -138,21 +135,9 @@ function checkBLOBStreamingPlugins()
$PMA_Config->set('BLOBSTREAMING_PORT', $BS_PORT);
$PMA_Config->set('BLOBSTREAMING_HOST', $serverCfg['host']);
$PMA_Config->set('BLOBSTREAMING_SERVER', $serverCfg['host'] . ':' . $BS_PORT);
- $PMA_Config->set('CURL_EXISTS', FALSE);
+ $PMA_Config->set('PHP_PBMS_EXISTS', FALSE);
$PMA_Config->set('FILEINFO_EXISTS', FALSE);
- // check if CURL exists
- if (function_exists("curl_init")) {
- // initialize curl handler
- $curlHnd = curl_init();
-
- // CURL exists, set necessary variable and close resource
- if (! empty($curlHnd)) {
- $PMA_Config->set('CURL_EXISTS', TRUE);
- curl_close($curlHnd);
- } // end if (!empty($curlHnd))
- } // end if (function_exists("curl_init"))
-
// check if PECL's fileinfo library exist
$finfo = NULL;
@@ -165,181 +150,16 @@ function checkBLOBStreamingPlugins()
$PMA_Config->set('FILEINFO_EXISTS', TRUE);
finfo_close($finfo);
} // end if (!empty($finfo))
+
} else {
PMA_cacheSet('skip_blobstreaming', true, true);
return FALSE;
- } // end if ($allPluginsExist)
-
- $bs_tables = array();
-
- // specify table structure for BS reference table
- $bs_tables[$PMA_Config->get('PBMS_NAME') . '_reference'] = array();
- $bs_tables[$PMA_Config->get('PBMS_NAME') . '_reference']['struct'] = <<<EOD
- CREATE TABLE {$PMA_Config->get('PBMS_NAME')}_reference
- (
- Table_name CHAR(64) COMMENT 'The name of the referencing table',
- Blob_id BIGINT COMMENT 'The BLOB reference number - part of the BLOB URL',
- Column_name CHAR(64) COMMENT 'The column name of the referencing field',
- Row_condition VARCHAR(255) COMMENT 'This condition identifies the row in the table',
- Blob_url VARCHAR(200) COMMENT 'The BLOB URL for HTTP GET access',
- Repository_id INT COMMENT 'The repository file number of the BLOB',
- Repo_blob_offset BIGINT COMMENT 'The offset in the repository file',
- Blob_size BIGINT COMMENT 'The size of the BLOB in bytes',
- Deletion_time TIMESTAMP COMMENT 'The time the BLOB was deleted',
- Remove_in INT COMMENT 'The number of seconds before the reference/BLOB is removed perminently',
- Temp_log_id INT COMMENT 'Temporary log number of the referencing deletion entry',
- Temp_log_offset BIGINT COMMENT 'Temporary log offset of the referencing deletion entry'
- ) ENGINE=PBMS;
-EOD;
-
- // specify table structure for BS repository table
- $bs_tables[$PMA_Config->get('PBMS_NAME') . '_repository'] = array();
- $bs_tables[$PMA_Config->get('PBMS_NAME') . '_repository']['struct'] = <<<EOD
- CREATE TABLE {$PMA_Config->get('PBMS_NAME')}_repository
- (
- Repository_id INT COMMENT 'The repository file number',
- Repo_blob_offset BIGINT COMMENT 'The offset of the BLOB in the repository file',
- Blob_size BIGINT COMMENT 'The size of the BLOB in bytes',
- Head_size SMALLINT UNSIGNED COMMENT 'The size of the BLOB header - proceeds the BLOB data',
- Access_code INT COMMENT 'The 4-byte authorisation code required to access the BLOB - part of the BLOB URL',
- Creation_time TIMESTAMP COMMENT 'The time the BLOB was created',
- Last_ref_time TIMESTAMP COMMENT 'The last time the BLOB was referenced',
- Last_access_time TIMESTAMP COMMENT 'The last time the BLOB was accessed (read)',
- Content_type CHAR(128) COMMENT 'The content type of the BLOB - returned by HTTP GET calls',
- Blob_data LONGBLOB COMMENT 'The data of this BLOB'
- ) ENGINE=PBMS;
-EOD;
-
- // specify table structure for BS custom content type table
- $bs_tables[$PMA_Config->get('PBMS_NAME') . '_custom_content_type'] = array();
- $bs_tables[$PMA_Config->get('PBMS_NAME') . '_custom_content_type']['struct'] = <<<EOD
- CREATE TABLE {$PMA_Config->get('PBMS_NAME')}_custom_content_type
- (
- Blob_url VARCHAR(200) COMMENT 'The BLOB URL for HTTP GET access',
- Content_type VARCHAR(255) COMMENT 'The custom MIME type for a given BLOB reference as specified by the user',
-
- PRIMARY KEY(Blob_url)
- );
-EOD;
-
- // add BS tables to PMA configuration
- $PMA_Config->set('BLOBSTREAMING_TABLES', $bs_tables);
+ } // end if ($has_blobstreaming)
return TRUE;
}
/**
- * checks for databases that support BLOBStreaming
- *
- * @access public
- * @uses PMA_GetDatabases()
- * @uses PMA_TablesExist()
- * @uses PMA_Config::set()
-*/
-function checkBLOBStreamableDatabases()
-{
- // load PMA configuration
- $PMA_Config = $GLOBALS['PMA_Config'];
-
- $serverCfg = $GLOBALS['cfg']['Server'];
-
- // retrieve BS tables from PMA configuration
- $session_bs_tables = $PMA_Config->get('BLOBSTREAMING_TABLES');
-
- $bs_databases = array();
- $bs_tables = array();
-
- // return if BS tables do not exist
- if (!$session_bs_tables)
- return;
-
- foreach ($session_bs_tables as $table_key=>$table)
- {
- $bs_tables[$table_key] = array();
- $bs_tables[$table_key]['Exists'] = FALSE;
- }
-
- // retrieve MySQL databases
- $databases = PMA_GetDatabases();
-
- // check if BS tables exist for each database
- foreach ($databases as $db_key=>$db_name)
- {
- $bs_databases[$db_name] = $bs_tables;
-
- PMA_TablesExist($bs_databases[$db_name], $db_name);
- }
-
- // set BS databases in PMA configuration
- $PMA_Config->set('BLOBSTREAMABLE_DATABASES', $bs_databases);
-}
-
-
-
-/**
- * checks whether a given set of tables exist in a given database
- *
- * @access public
- * @param array - list of tables to look for
- * @param string - name of database
- * @uses PMA_DBI_select_db()
- * @uses PMA_DBI_query()
- * @uses PMA_DBI_fetch_assoc()
- */
-function PMA_TablesExist(&$tables, $db_name)
-{
- // select specified database
- PMA_DBI_select_db($db_name);
-
- // run query to retrieve tables in specified database
- $query = "SHOW TABLES";
- $result = PMA_DBI_query($query);
-
- // while there are records to parse
- while ($data = @PMA_DBI_fetch_assoc($result))
- {
- $state = TRUE;
-
- // check if necessary tables exist
- foreach ($tables as $table_key=>$table)
- if (!$table['Exists'])
- if ($data['Tables_in_' . $db_name] == $table_key)
- $tables[$table_key]['Exists'] = TRUE;
- else
- if ($state)
- $state = FALSE;
-
- // break if necessary tables are found before all records are parsed
- if ($state)
- break;
- } // end while ($data = @PMA_DBI_fetch_assoc($result))
-}
-
-/**
- * returns a list of databases
- *
- * @access public
- * @uses PMA_DBI_query()
- * @uses PMA_DBI_fetch_assoc()
- * @return array - list of databases acquired via MySQL
-*/
-function PMA_GetDatabases()
-{
- // run query to retrieve databases
- $query = "SHOW DATABASES";
- $result = PMA_DBI_query($query);
-
- $databases = array();
-
- // while there are records to parse
- while ($data = @PMA_DBI_fetch_assoc($result))
- $databases[] = $data['Database'];
-
- // return list of databases
- return $databases;
-}
-
-/**
* sets BLOBStreaming variables to a list of specified arguments
* @access public
* @uses PMA_DBI_query()
@@ -388,7 +208,7 @@ function PMA_BS_GetVariables()
return NULL;
// run query to retrieve BS variables
- $query = "SHOW VARIABLES LIKE '%" . $PMA_Config->get('PBMS_NAME') . "%'";
+ $query = "SHOW VARIABLES LIKE '%pbms%'";
$result = PMA_DBI_query($query);
$BS_Variables = array();
@@ -401,313 +221,256 @@ function PMA_BS_GetVariables()
return $BS_Variables;
}
-/**
- * sets the BLOBStreaming global field references to ON/OFF
- *
- * @access public
- * @param string - ON or OFF
- * @uses PMA_Config::get()
- * @uses PMA_sqlAddslashes()
- * @uses PMA_DBI_query()
- * @return boolean - success/failure of query execution
-*/
-function PMA_BS_SetFieldReferences($val)
+//========================
+//========================
+function PMA_BS_ReportPBMSError($msg)
+{
+ $tmp_err = pbms_error();
+ PMA_showMessage("PBMS error, $msg $tmp_err");
+}
+
+//------------
+function PMA_do_connect($db_name, $quiet)
{
- // load PMA configuration
$PMA_Config = $GLOBALS['PMA_Config'];
// return if unable to load PMA configuration
if (empty($PMA_Config))
return FALSE;
- // set field references to value specified
- $query = "SET GLOBAL " . $PMA_Config->get('PBMS_NAME') . "_field_references=" . PMA_sqlAddslashes($val);
- $result = PMA_DBI_try_query($query, null, 0);
-
- // get last known error (if applicable)
- PMA_DBI_getError();
+ // generate bs reference link
+ $pbms_host = $PMA_Config->get('BLOBSTREAMING_HOST');
+ $pbms_port = $PMA_Config->get('BLOBSTREAMING_PORT');
- // return success of query execution
- if ($result && 0 == $GLOBALS['errno'])
- return TRUE;
- else
+ if (pbms_connect($pbms_host, $pbms_port, $db_name) == FALSE) {
+ if ($quiet == FALSE) {
+ PMA_BS_ReportPBMSError("PBMS Connectiuon failed: pbms_connect($pbms_host, $pbms_port, $db_name)");
+ }
return FALSE;
+ }
+ return TRUE;
}
-/**
- * gets the SQL table definition for a given BLOBStreaming table
- *
- * @access public
- * @param string - table name
- * @uses PMA_Config::get()
- * @return string - SQL table definition
-*/
-function PMA_BS_GetTableStruct($tbl_name)
+//------------
+function PMA_do_disconnect()
{
- // retrieve table structures for BS tables
- $bs_tables = $GLOBALS['PMA_Config']->get('BLOBSTREAMING_TABLES');
-
- // return if tables don't exist
- if (!$bs_tables)
- return;
-
- // return if specified table doesn't exist in collection of BS tables
- if (!isset($bs_tables[$tbl_name]))
- return;
-
- // return specified table's structure
- return $bs_tables[$tbl_name]['struct'];
+ pbms_close();
}
+//------------
/**
- * creates the BLOBStreaming tables for a given database
+ * checks whether the BLOB reference looks valid
*
- * @access public
- * @param string - database name
- * @uses PMA_Config::get()
- * @uses PMA_DBI_select_db()
- * @uses PMA_DBI_query()
- * @uses PMA_BS_GetTableStruct()
- * @return boolean - success/failure of transactional query execution
*/
-function PMA_BS_CreateTables($db_name)
+function PMA_BS_IsPBMSReference($bs_reference, $db_name)
{
- // retrieve BS tables
- $bs_tables = $GLOBALS['PMA_Config']->get('BLOBSTREAMING_TABLES');
-
- // select specified database
- PMA_DBI_select_db($db_name);
-
- // create necessary BS tables for specified database
- foreach ($bs_tables as $table_key=>$table)
- {
- $result = PMA_DBI_query(PMA_BS_GetTableStruct($table_key));
-
- // return false if query execution fails
- if (!$result)
- return FALSE;
+ if (PMA_cacheGet('skip_blobstreaming', true)) {
+ return FALSE;
}
- // return true on success
- return TRUE;
+ if (PMA_do_connect($db_name, TRUE) == FALSE) {
+ return FALSE;
+ }
+ $ok = pbms_is_blob_reference($bs_reference);
+ PMA_do_disconnect();
+ return $ok ;
}
-/**
- * drops BLOBStreaming tables for a given database
- *
- * @access public
- * @param string - database name
- * @uses PMA_Config::get()
- * @uses PMA_DBI_select_db()
- * @uses PMA_backquote()
- * @uses PMA_DBI_query()
- * @return boolean - success/failure of transactional query execution
-*/
-function PMA_BS_DropTables($db_name)
+//------------
+function PMA_BS_CreateReferenceLink($bs_reference, $db_name)
{
- // load PMA configuration
- $PMA_Config = $GLOBALS['PMA_Config'];
-
- // return if unable to load PMA configuration
- if (empty($PMA_Config))
- return FALSE;
-
- // retrieve BS tables
- $bs_tables = $PMA_Config->get('BLOBSTREAMING_TABLES');
-
- // select specified database
- PMA_DBI_select_db($db_name);
-
- // drop BS tables
- foreach ($bs_tables as $table_key=>$table)
- {
- $query = "DROP TABLE IF EXISTS " . PMA_backquote($table_key);
- $result = PMA_DBI_query($query);
+ if (PMA_do_connect($db_name, FALSE) == FALSE) {
+ return 'Error';
+ }
- // return false if query execution fails
- if (!$result)
- return FALSE;
+ if (pbms_get_info($bs_reference) == FALSE) {
+ PMA_BS_ReportPBMSError("PBMS get BLOB info failed: pbms_get_info($bs_reference)");
+ PMA_do_disconnect();
+ return 'Error';
}
- // return true on success
- return TRUE;
-}
+ $content_type = pbms_get_metadata_value("Content-type");
+ if ($content_type == FALSE) {
+ PMA_BS_ReportPBMSError("PMA_BS_CreateReferenceLink($bs_reference, $db_name): get BLOB Content-type failed: ");
+ }
-/**
- * returns the field name for a primary key of a given table in a given database
- *
- * @access public
- * @param string - database name
- * @param string - table name
- * @uses PMA_DBI_select_db()
- * @uses PMA_backquote()
- * @uses PMA_DBI_query()
- * @uses PMA_DBI_fetch_assoc()
- * @return string - field name for primary key
-*/
-function PMA_BS_GetPrimaryField($db_name, $tbl_name)
-{
- // load PMA configuration
- $PMA_Config = $GLOBALS['PMA_Config'];
+ PMA_do_disconnect();
- // return if unable to load PMA configuration
- if (empty($PMA_Config))
- return FALSE;
+ if (! $content_type) {
+ $content_type = "image/jpeg";
+ }
- // select specified database
- PMA_DBI_select_db($db_name);
+ $bs_url = PMA_BS_getURL($bs_reference);
+ if (empty($bs_url)) {
+ PMA_BS_ReportPBMSError("No blob streaming server configured!");
+ return 'Error';
+ }
- // retrieve table fields
- $query = "SHOW FULL FIELDS FROM " . PMA_backquote($tbl_name);
- $result = PMA_DBI_query($query);
+ $output = "<a href=\"#\" onclick=\"requestMIMETypeChange('" . urlencode($db_name) . "', '" . urlencode($GLOBALS['table']) . "', '" . urlencode($bs_reference) . "', '" . urlencode($content_type) . "')\">$content_type</a>";
- // while there are records to parse
- while ($data = PMA_DBI_fetch_assoc($result))
- if ("PRI" == $data['Key'])
- return $data['Field'];
+ // specify custom HTML for various content types
+ switch ($content_type) {
+ // no content specified
+ case NULL:
+ $output = "NULL";
+ break;
+ // image content
+ case 'image/jpeg':
+ case 'image/png':
+ $output .= ' (<a href="' . $bs_url . '" target="new">' . __('View image') . '</a>)';
+ break;
+ // audio content
+ case 'audio/mpeg':
+ $output .= ' (<a href="#" onclick="popupBSMedia(\'' . PMA_generate_common_url() . '\',\'' . urlencode($bs_reference) . '\', \'' . urlencode($content_type) . '\',' . ($is_custom_type ? 1 : 0) . ', 640, 120)">' . __('Play audio'). '</a>)';
+ break;
+ // video content
+ case 'application/x-flash-video':
+ case 'video/mpeg':
+ $output .= ' (<a href="#" onclick="popupBSMedia(\'' . PMA_generate_common_url() . '\',\'' . urlencode($bs_reference) . '\', \'' . urlencode($content_type) . '\',' . ($is_custom_type ? 1 : 0) . ', 640, 480)">' . __('View video') . '</a>)';
+ break;
+ // unsupported content. specify download
+ default:
+ $output .= ' (<a href="' . $bs_url . '" target="new">' . __('Download file'). '</a>)';
+ }
- // return NULL on no primary key
- return NULL;
+ return $output;
}
-/**
- * checks whether a BLOB reference exists in the BLOB repository
- *
- * @access public
- * @param string - BLOB reference
- * @param string - database name
- * @uses PMA_DBI_select_db()
- * @uses PMA_backquote()
- * @uses PMA_Config::get()
- * @uses PMA_sqlAddslashes()
- * @uses PMA_DBI_query()
- * @return boolean - existence of BLOB reference
-*/
-function PMA_BS_ReferenceExists($bs_reference, $db_name)
+//------------
+// In the future there may be server variables to turn on/off PBMS
+// BLOB streaming on a per table or database basis. So in anticipation of this
+// PMA_BS_IsTablePBMSEnabled() passes in the table and database name even though
+// they are not currently needed.
+function PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type)
{
- $referenceExists = FALSE;
+ if (PMA_cacheGet('skip_blobstreaming', true)) {
+ return FALSE;
+ }
- // return false on invalid BS reference
- if (strlen ($bs_reference) < strlen ("~*$db_name/~") || "~*$db_name/~" != substr ($bs_reference, 0, strlen ($db_name) + 4))
- return $referenceExists;
+ if ((isset($tbl_type) == FALSE) || (strlen($tbl_type) == 0)) {
+ return FALSE;
+ }
// load PMA configuration
$PMA_Config = $GLOBALS['PMA_Config'];
// return if unable to load PMA configuration
- if (empty($PMA_Config))
- return $referenceExists;
+ if (empty($PMA_Config)) {
+ return FALSE;
+ }
- // select specified database
- PMA_DBI_select_db($db_name);
+ if (! $PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST')) {
+ return FALSE;
+ }
- // run query on BS reference retrieval
- $query = "SELECT * FROM " . PMA_backquote($PMA_Config->get('PBMS_NAME') . "_reference") . " WHERE Blob_url='" . PMA_sqlAddslashes($bs_reference) . "'";
+ // This information should be cached rather than selecting it each time.
+ //$query = "SELECT count(*) FROM information_schema.TABLES T, pbms.pbms_enabled E where T.table_schema = ". PMA_backquote($db_name) . " and T.table_name = ". PMA_backquote($tbl_name) . " and T.engine = E.name";
+ $query = "SELECT count(*) FROM pbms.pbms_enabled E where E.name = '" . PMA_sqlAddslashes($tbl_type) . "'";
$result = PMA_DBI_query($query);
- // if record exists
- if ($data = @PMA_DBI_fetch_assoc($result))
- $referenceExists = TRUE;
+ $data = PMA_DBI_fetch_row($result);
+ if ($data[0] == 1) {
+ return TRUE;
+ }
- // return reference existance
- return $referenceExists;
+ return FALSE;
}
-/**
- * creates a HTTP link to a given blob reference for a given database
- *
- * @access public
- * @param string - BLOB reference
- * @param string - database name
- * @uses PMA_Config::get()
- * @uses PMA_DBI_select_db()
- * @uses PMA_backquote()
- * @uses PMA_sqlAddslashes()
- * @uses PMA_DBI_query()
- * @uses PMA_DBI_fetch_assoc()
- * @return string - HTTP link or Error
-*/
-function PMA_BS_CreateReferenceLink($bs_reference, $db_name)
+//------------
+function PMA_BS_UpLoadFile($db_name, $tbl_name, $file_type, $file_name)
{
- // load PMA configuration
- $PMA_Config = $GLOBALS['PMA_Config'];
- // return if unable to load PMA configuration
- if (empty($PMA_Config))
- return '';
+ if (PMA_cacheGet('skip_blobstreaming', true)) {
+ return FALSE;
+ }
+
+ if (PMA_do_connect($db_name, FALSE) == FALSE) {
+ return FALSE;
+ }
- // generate bs reference link
- $bs_ref_link = 'http://' . $PMA_Config->get('BLOBSTREAMING_SERVER') . '/' . $bs_reference;
+ $fh = fopen($file_name, 'r');
+ if (! $fh) {
+ PMA_do_disconnect();
+ PMA_showMessage("Could not open file: $file_name");
+ return FALSE;
+ }
- // select specified database
- PMA_DBI_select_db($db_name);
+ pbms_add_metadata("Content-type", $file_type);
- $pbms_repo_bq = PMA_backquote($PMA_Config->get('PBMS_NAME') . "_repository");
- $pbms_ref_bq = PMA_backquote($PMA_Config->get('PBMS_NAME') . "_reference");
- $pbms_cust_content_bq = PMA_backquote($PMA_Config->get('PBMS_NAME') . "_custom_content_type");
+ $pbms_blob_url = pbms_read_stream($fh, filesize($file_name), $tbl_name);
+ if (! $pbms_blob_url) {
+ PMA_BS_ReportPBMSError("pbms_read_stream() Failed");
+ }
- // run query on determining specified BS reference
- $query = "SELECT $pbms_repo_bq.Content_type, $pbms_cust_content_bq.Content_type AS Custom_type";
- $query .= " FROM $pbms_repo_bq LEFT JOIN $pbms_ref_bq ON";
- $query .= "$pbms_repo_bq.Repository_id=$pbms_ref_bq.Repository_id";
- $query .= " AND $pbms_repo_bq.Blob_size=$pbms_ref_bq.Blob_size";
- $query .= " AND $pbms_repo_bq.Repo_blob_offset=$pbms_ref_bq.Repo_blob_offset";
- $query .= " LEFT JOIN $pbms_cust_content_bq ON $pbms_cust_content_bq.Blob_url=$pbms_ref_bq.Blob_url";
- $query .= " WHERE $pbms_ref_bq.Blob_url='" . PMA_sqlAddslashes($bs_reference) . "'";
+ fclose($fh);
+ PMA_do_disconnect();
+ return $pbms_blob_url;
+}
+//------------
+function PMA_BS_SetContentType($db_name, $bsTable, $blobReference, $contentType)
+{
+ if (PMA_cacheGet('skip_blobstreaming', true)) {
+ return FALSE;
+ }
+
+ // This is a really ugly way to do this but currently there is nothing better.
+ // In a future version of PBMS the system tables will be redesigned to make this
+ // more eficient.
+ $query = "SELECT Repository_id, Repo_blob_offset FROM pbms_reference WHERE Blob_url='" . PMA_sqlAddslashes($blobReference) . "'";
+ //error_log(" PMA_BS_SetContentType: $query\n", 3, "/tmp/mylog");
$result = PMA_DBI_query($query);
+ //error_log(" $query\n", 3, "/tmp/mylog");
- // if record exists
- if ($data = @PMA_DBI_fetch_assoc($result))
- {
- // determine content-type for BS repository file (original or custom)
- $is_custom_type = false;
-
- if (isset($data['Custom_type']))
- {
- $content_type = $data['Custom_type'];
- $is_custom_type = true;
- }
- else
- $content_type = $data['Content_type'];
-
- if (!$content_type)
- $content_type = NULL;
-
- $output = "<a href=\"#\" onclick=\"requestMIMETypeChange('" . urlencode($db_name) . "', '" . urlencode($GLOBALS['table']) . "', '" . urlencode($bs_reference) . "', '" . urlencode($content_type) . "')\">$content_type</a>";
-
- // specify custom HTML for various content types
- switch ($content_type)
- {
- // no content specified
- case NULL:
- $output = "NULL";
- break;
- // image content
- case 'image/jpeg':
- case 'image/png':
- $output .= ' (<a href="' . $bs_ref_link . '" target="new">' . __('View image') . '</a>)';
- break;
- // audio content
- case 'audio/mpeg':
- $output .= ' (<a href="#" onclick="popupBSMedia(\'' . PMA_generate_common_url() . '\',\'' . urlencode($bs_reference) . '\', \'' . urlencode($content_type) . '\',' . ($is_custom_type ? 1 : 0) . ', 640, 120)">' . __('Play audio'). '</a>)';
- break;
- // video content
- case 'application/x-flash-video':
- case 'video/mpeg':
- $output .= ' (<a href="#" onclick="popupBSMedia(\'' . PMA_generate_common_url() . '\',\'' . urlencode($bs_reference) . '\', \'' . urlencode($content_type) . '\',' . ($is_custom_type ? 1 : 0) . ', 640, 480)">' . __('View video') . '</a>)';
- break;
- // unsupported content. specify download
- default:
- $output .= ' (<a href="' . $bs_ref_link . '" target="new">' . __('Download file'). '</a>)';
+// if record exists
+ if ($data = PMA_DBI_fetch_assoc($result)) {
+ $where = "WHERE Repository_id=" . $data['Repository_id'] . " AND Repo_blob_offset=" . $data['Repo_blob_offset'] ;
+ $query = "SELECT name from pbms_metadata $where";
+ $result = PMA_DBI_query($query);
+
+ if (PMA_DBI_num_rows($result) == 0) {
+ $query = "INSERT into pbms_metadata Values( ". $data['Repository_id'] . ", " . $data['Repo_blob_offset'] . ", 'Content_type', '" . PMA_sqlAddslashes($contentType) . "')";
+ } else {
+ $query = "UPDATE pbms_metadata SET name = 'Content_type', Value = '" . PMA_sqlAddslashes($contentType) . "' $where";
}
+//error_log("$query\n", 3, "/tmp/mylog");
+ PMA_DBI_query($query);
+ } else {
+ return FALSE;
+ }
+ return TRUE;
+}
- // return HTML
- return $output;
- } // end if ($data = @PMA_DBI_fetch_assoc($result))
-
- // return on error
- return 'Error';
+//------------
+function PMA_BS_IsHiddenTable($table)
+{
+ switch ($table) {
+ case 'pbms_repository' :
+ case 'pbms_reference' :
+ case 'pbms_metadata' :
+ case 'pbms_metadata_header' :
+ case 'pbms_dump' :
+ return TRUE;
+ }
+ return FALSE;
}
+//------------
+function PMA_BS_getURL($reference)
+{
+ // load PMA configuration
+ $PMA_Config = $GLOBALS['PMA_Config'];
+ if (empty($PMA_Config)) {
+ return FALSE;
+ }
+
+ // retrieve BS server variables from PMA configuration
+ $bs_server = $PMA_Config->get('BLOBSTREAMING_SERVER');
+ if (empty($bs_server)) {
+ return FALSE;
+ }
+
+ $bs_url = 'http://' . $bs_server . '/' . rtrim($reference);
+ return $bs_url;
+}
?>
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index abbd663..d1a6d94 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -797,7 +797,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
require_once './libraries/logging.lib.php';
- // Gets the authentication library that fits the $cfg['Server'] settings
+ // Gets the authentication library that fits the $cfg['Server'] settings
// and run authentication
// to allow HTTP or http
@@ -809,14 +809,13 @@ if (! defined('PMA_MINIMUM_COMMON')) {
* the required auth type plugin
*/
require_once './libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php';
-
if (!PMA_auth_check()) {
PMA_auth();
} else {
PMA_auth_set_user();
}
- // Check IP-based Allow/Deny rules as soon as possible to reject the
+ // Check IP-based Allow/Deny rules as soon as possible to reject the
// user
// Based on mod_access in Apache:
// http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.…
@@ -953,9 +952,8 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// checks for blobstreaming plugins and databases that support
// blobstreaming (by having the necessary tables for blobstreaming)
- if (checkBLOBStreamingPlugins()) {
- checkBLOBStreamableDatabases();
- }
+ checkBLOBStreamingPlugins();
+
} // end if !defined('PMA_MINIMUM_COMMON')
// remove sensitive values from session
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 9e22f45..1010b2c 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -654,19 +654,19 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
$back_url .= '?no_history=true';
}
- $_SESSION['Import_message']['go_back_url'] = $back_url;
+ $_SESSION['Import_message']['go_back_url'] = $back_url;
$error_msg_output .= '<fieldset class="tblFooters">';
$error_msg_output .= '[ <a href="' . $back_url . '">' . __('Back') . '</a> ]';
$error_msg_output .= '</fieldset>' . "\n\n";
- }
+ }
- echo $error_msg_output;
- /**
- * display footer and exit
- */
+ echo $error_msg_output;
+ /**
+ * display footer and exit
+ */
- require_once './libraries/footer.inc.php';
+ require_once './libraries/footer.inc.php';
} else {
echo $error_msg_output;
}
@@ -791,18 +791,11 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count =
// load PMA configuration
$PMA_Config = $GLOBALS['PMA_Config'];
- // if PMA configuration exists
- if (!empty($PMA_Config))
- $session_bs_tables = $GLOBALS['PMA_Config']->get('BLOBSTREAMING_TABLES');
-
foreach ($tables as $table_name => $table) {
// if BS tables exist
- if (isset($session_bs_tables))
- // compare table name to tables in list of blobstreaming tables
- foreach ($session_bs_tables as $table_key=>$table_val)
- // if table is in list, skip outer foreach loop
- if ($table_name == $table_key)
- continue 2;
+ if (PMA_BS_IsHiddenTable($table_name)) {
+ continue;
+ }
// check for correct row count
if (null === $table['Rows']) {
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index 5e85d69..dcbf177 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -310,32 +310,13 @@ function PMA_getTableCount($db)
if ($tables) {
$num_tables = PMA_DBI_num_rows($tables);
- // for blobstreaming - get blobstreaming tables
- // for use in determining if a table here is a blobstreaming table
-
- // load PMA configuration
- $PMA_Config = $GLOBALS['PMA_Config'];
-
- // if PMA configuration exists
- if (!empty($PMA_Config))
- {
- // load BS tables
- $session_bs_tables = $GLOBALS['PMA_Config']->get('BLOBSTREAMING_TABLES');
-
- // if BS tables exist
- if (isset ($session_bs_tables))
- while ($data = PMA_DBI_fetch_assoc($tables))
- foreach ($session_bs_tables as $table_key=>$table_val)
- // if the table is a blobstr
eaming table, reduce the table count
- if ($data['Tables_in_' . $db] == $table_key)
- {
- if ($num_tables > 0)
- $num_tables--;
-
- break;
- }
- } // end if PMA configuration exists
-
+ // do not count hidden blobstreaming tables
+ while ((($num_tables > 0)) && $data = PMA_DBI_fetch_assoc($tables)) {
+ if (PMA_BS_IsHiddenTable($data['Tables_in_' . $db])) {
+ $num_tables--;
+ }
+ }
+
PMA_DBI_free_result($tables);
} else {
$num_tables = 0;
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 5bd2870..a435e3b 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1285,47 +1285,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$vertical_display['data'][$row_no][$i] = ' <td align="right"' . $mouse_events . ' class="' . $class . ($condition_field ? ' condition' : '') . '"><i>NULL</i></td>' . "\n";
} else {
// for blobstreaming
-
- $bs_reference_exists = $allBSTablesExist = FALSE;
-
- // load PMA configuration
- $PMA_Config = $GLOBALS['PMA_Config'];
-
- // if PMA configuration exists
- if ($PMA_Config) {
- // load BS variables
- $pluginsExist = $PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST');
-
- // if BS plugins exist
- if ($pluginsExist) {
- // load BS databases
- $bs_tables = $PMA_Config->get('BLOBSTREAMABLE_DATABASES');
-
- // if BS db array and specified db string not empty and valid
- if (!empty($bs_tables) && strlen($db) > 0) {
- $bs_tables = $bs_tables[$db];
-
- if (isset($bs_tables)) {
- $allBSTablesExist = TRUE;
-
- // check if BS tables exist for given database
- foreach ($bs_tables as $table_key=>$bs_tbl)
- if (!$bs_tables[$table_key]['Exists']) {
- $allBSTablesExist = FALSE;
- break;
- }
- }
- }
- }
- }
-
- // if necessary BS tables exist
- if ($allBSTablesExist) {
- $bs_reference_exists = PMA_BS_ReferenceExists($row[$i], $db);
- }
-
// if valid BS reference exists
- if ($bs_reference_exists) {
+ if (PMA_BS_IsPBMSReference($row[$i], $db)) {
$blobtext = PMA_BS_CreateReferenceLink($row[$i], $db);
} else {
$blobtext = PMA_handle_non_printable_contents('BLOB', (isset($row[$i]) ? $row[$i] : ''), $transform_function, $transform_options, $default_function, $meta, $_url_params);
@@ -1378,9 +1339,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
// user asked to see the real contents of BINARY
// fields
if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && PMA_contains_nonprintable_ascii($row[$i])) {
- $row[$i] = bin2hex($row[$i]);
- }
- else {
+ $row[$i] = bin2hex($row[$i]);
+ } else {
$row[$i] = htmlspecialchars(PMA_replace_binary_contents($row[$i]));
}
} else {
@@ -1734,7 +1694,7 @@ function PMA_displayTable_checkConfigParams()
} else {
// display_binary_as_hex config option
if (isset($GLOBALS['cfg']['DisplayBinaryAsHex']) && true === $GLOBALS['cfg']['DisplayBinaryAsHex']) {
- $_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary_as_hex'] = true;
+ $_SESSION['tmp_user_values']['query'][$sql_md5]['display_binary_as_hex'] = true;
}
}
diff --git a/libraries/engines/pbms.lib.php b/libraries/engines/pbms.lib.php
new file mode 100644
index 0000000..2a51c92
--- /dev/null
+++ b/libraries/engines/pbms.lib.php
@@ -0,0 +1,113 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @version $Id$
+ * @package phpMyAdmin-Engines
+ */
+
+/**
+ * the PBMS daemon
+ * @package phpMyAdmin-Engines
+ */
+class PMA_StorageEngine_pbms extends PMA_StorageEngine
+{
+ /**
+ * returns array with variable names dedicated to PBMS daemon
+ *
+ * @return array variable names
+ */
+ function engine_init()
+ {
+ $this->engine = "PBMS";
+ $this->title = "PrimeBase Media Streaming Daemon";
+ $this->comment = "Provides BLOB streaming service for storage engines,";
+ $this->support = PMA_ENGINE_SUPPORT_YES;
+ }
+
+ function getVariables()
+ {
+ return array(
+ 'pbms_garbage_threshold' => array(
+ 'title' => __('Garbage Threshold'),
+ 'desc' => __('The percentage of garbage in a repository file before it is compacted.'),
+ 'type' => PMA_ENGINE_DETAILS_TYPE_PLAINTEXT
+ ),
+ 'pbms_port' => array(
+ 'title' => __('Port'),
+ 'desc' => __('The port for the PBMS stream-based communications. Setting this value to 0 will disable HTTP communication with the daemon.'),
+ 'type' => PMA_ENGINE_DETAILS_TYPE_PLAINTEXT
+ ),
+ 'pbms_repository_threshold' => array(
+ 'title' => __('Repository Threshold'),
+ 'desc' => __('The maximum size of a BLOB repository file. You may use Kb, MB or GB to indicate the unit of the value. A value in bytes is assumed when no unit is specified.'),
+ 'type' => PMA_ENGINE_DETAILS_TYPE_PLAINTEXT
+ ),
+ 'pbms_temp_blob_timeout' => array(
+ 'title' => __('Temp Blob Timeout'),
+ 'desc' => __('The timeout, in seconds, for temporary BLOBs. Uploaded BLOB data is removed after this time, unless they are referenced by a record in the database.'),
+ 'type' => PMA_ENGINE_DETAILS_TYPE_PLAINTEXT
+ ),
+ 'pbms_temp_log_threshold' => array(
+ 'title' => __('Temp Log Threshold'),
+ 'desc' => __('The maximum size of a temporary BLOB log file. You may use Kb, MB or GB to indicate the unit of the value. A value in bytes is assumed when no unit is specified.'),
+ 'type' => PMA_ENGINE_DETAILS_TYPE_PLAINTEXT
+ ),
+ 'pbms_max_keep_alive' => array(
+ 'title' => __('Max Keep Alive'),
+ 'desc' => __('The timeout for inactive connection with the keep-alive flag set. After this time the connection will be closed. The time-out is in milliseconds (1/1000).'),
+ 'type' => PMA_ENGINE_DETAILS_TYPE_PLAINTEXT
+ ),
+ 'pbms_http_metadata_headers' => array(
+ 'title' => __('Metadata Headers'),
+ 'desc' => __('A ":" delimited list of metadata headers to be used to initialize the pbms_metadata_header table when a database is created.'),
+ 'type' => PMA_ENGINE_DETAILS_TYPE_PLAINTEXT
+ ),
+ );
+ }
+
+ //--------------------
+ function getInfoPages()
+ {
+ $pages = array();
+ $pages['Documentation'] = __('Documentation');
+ return $pages;
+ }
+
+ //--------------------
+ function getPage($id)
+ {
+ if (! array_key_exists($id, $this->getInfoPages())) {
+ return false;
+ }
+
+ $id = 'getPage' . $id;
+
+ return $this->$id();
+ }
+
+ function getPageConfigure()
+ {
+ }
+
+ function getPageDocumentation()
+ {
+ $output = '<p> Documentation and further information about PBMS can be found on ' . "\n"
+ . '<a href="http://www.blobstreaming.org/" target="_blank">The PrimeBase Media Streaming home page</a>.<br><br>' . "\n"
+ . '<table id="PBMS_Related_Links" >' . "\n"
+ . '<tr>' . "\n"
+ . '<td>' . "\n"
+ . '<p>' . "\n"
+ . '<strong><font size="2"><b>Related Links</b></font></strong>' . "\n"
+ . '<br>' . "\n"
+ . '<a href="http://bpbdev.blogspot.com/" target="_blank">The PrimeBase Media Streaming Blog by Barry Leslie</a><br><br>' . "\n"
+ . '<a href="http://www.primebase.com/xt" target="_blank">PrimeBase XT Home Page</a><br><br>' . "\n"
+ . '</font>' . "\n"
+ . '</td>' . "\n"
+ . '</tr>' . "\n"
+ . '</table>' . "\n";
+
+ return $output;
+ }
+}
+
+?>
diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php
index 842f8ff..fbc6ce6 100644
--- a/libraries/engines/pbxt.lib.php
+++ b/libraries/engines/pbxt.lib.php
@@ -98,6 +98,46 @@ class PMA_StorageEngine_pbxt extends PMA_StorageEngine
}
return PMA_formatByteDown($value);
}
+
+ //--------------------
+ function getInfoPages()
+ {
+ $pages = array();
+ $pages['Documentation'] = __('Documentation');
+ return $pages;
+ }
+
+ //--------------------
+ function getPage($id)
+ {
+ if (! array_key_exists($id, $this->getInfoPages())) {
+ return false;
+ }
+
+ $id = 'getPage' . $id;
+
+ return $this->$id();
+ }
+
+ function getPageDocumentation()
+ {
+ $output = '<p> Documentation and further information about PBXT can be found on the ' . "\n"
+ . '<a href="http://www.primebase.com/xt/" target="_blank">PrimeBase XT Home Page</a>.<br><br>' . "\n"
+ . '<table id="PBMS_Related_Links" >' . "\n"
+ . '<tr>' . "\n"
+ . '<td>' . "\n"
+ . '<p>' . "\n"
+ . '<strong><font size="2"><b>Related Links</b></font></strong>' . "\n"
+ . '<br>' . "\n"
+ . '<a href="http://pbxt.blogspot.com/" target="_blank">The PrimeBase XT Blog by Paul McCullagh</a><br><br>' . "\n"
+ . '<a href="http://www.blobstreaming.org/" target="_blank">The PrimeBase Media Streaming (PBMS) home page</a>.<br><br>' . "\n"
+ . '</font>' . "\n"
+ . '</td>' . "\n"
+ . '</tr>' . "\n"
+ . '</table>' . "\n";
+
+ return $output;
+ }
}
?>
diff --git a/server_engines.php b/server_engines.php
index f9664ca..5ef4e6f 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -1,9 +1,8 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
- * display list of server enignes and additonal information about them
+ * display list of server engines and additonal information about them
*
- * @todo falcon storage enginge is not listed under dev.mysql.com/doc/refman but dev.mysql.com/doc/falcon/
* @package phpMyAdmin
*/
@@ -80,7 +79,22 @@ if (empty($_REQUEST['engine'])
. '</tr>' . "\n";
$odd_row = !$odd_row;
}
- unset($odd_row, $engine, $details);
+
+ $PMA_Config = $GLOBALS['PMA_Config'];
+ if ($PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST')) {
+ // Special case for PBMS daemon which is not listed as an engine
+ echo '<tr class="'
+ . ($odd_row ? 'odd' : 'even')
+ . '">' . "\n"
+ . ' <td><a href="./server_engines.php'
+ . PMA_generate_common_url(array('engine' => "PBMS")) . '">' . "\n"
+ . ' ' . "PBMS\n"
+ . ' </a></td>' . "\n"
+ . ' <td>' . htmlspecialchars("PrimeBase MediaStream (PBMS) daemon") . '</td>' . "\n"
+ . '</tr>' . "\n";
+ }
+
+ unset($odd_row, $engine, $details);
echo '</tbody>' . "\n"
. '</table>' . "\n";
diff --git a/tbl_change.php b/tbl_change.php
index f873490..d8486ba 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -456,17 +456,17 @@ foreach ($rows as $row_id => $vrow) {
} else {
// special binary "characters"
if ($field['is_binary'] || ($field['is_blob'] && ! $cfg['ProtectBinary'])) {
- if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) {
- $vrow[$field['Field']] = bin2hex($vrow[$field['Field']]);
- $field['display_binary_as_hex'] = true;
- } else {
- $vrow[$field['Field']] = PMA_replace_binary_contents($vrow[$field['Field']]);
- }
+ if ($_SESSION['tmp_user_values']['display_binary_as_hex'] && $cfg['ShowFunctionFields']) {
+ $vrow[$field['Field']] = bin2hex($vrow[$field['Field']]);
+ $field['display_binary_as_hex'] = true;
+ } else {
+ $vrow[$field['Field']] = PMA_replace_binary_contents($vrow[$field['Field']]);
+ }
} // end if
$special_chars = htmlspecialchars($vrow[$field['Field']]);
- //We need to duplicate the first \n or otherwise we will lose the first newline entered in a VARCHAR or TEXT column
- $special_chars_encoded = PMA_duplicateFirstNewline($special_chars);
+ //We need to duplicate the first \n or otherwise we will lose the first newline entered in a VARCHAR or TEXT column
+ $special_chars_encoded = PMA_duplicateFirstNewline($special_chars);
$data = $vrow[$field['Field']];
} // end if... else...
@@ -562,9 +562,9 @@ foreach ($rows as $row_id => $vrow) {
}
// this is set only when appropriate and is always true
- if (isset($field['display_binary_as_hex'])) {
- $default_function = 'UNHEX';
- }
+ if (isset($field['display_binary_as_hex'])) {
+ $default_function = 'UNHEX';
+ }
// loop on the dropdown array and print all available options for that field.
foreach ($dropdown as $each_dropdown){
@@ -834,51 +834,7 @@ foreach ($rows as $row_id => $vrow) {
|| ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) {
echo "\n";
// for blobstreaming
- $bs_reference_exists = FALSE;
-
- if (isset ($tbl_type) && strlen ($tbl_type) > 0)
- {
- // load PMA_Config
- $PMA_Config = $GLOBALS['PMA_Config'];
-
- if (!empty($PMA_Config))
- {
- $requiredTblType = $PMA_Config->get('PBXT_NAME');
-
- if ($requiredTblType == strtolower ($tbl_type))
- {
- $pluginsExist = $PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST');
-
- // check if blobstreaming plugins exist
- if ($pluginsExist)
- {
- $bs_tables = $PMA_Config->get('BLOBSTREAMABLE_DATABASES');
-
- if (!empty($bs_tables) && strlen($db) > 0)
- {
- $bs_tables = $bs_tables[$db];
-
- if (isset($bs_tables))
- {
- $allBSTablesExist = TRUE;
-
- foreach ($bs_tables as $table_key=>$bs_tbl)
- if (!$bs_tables[$table_key]['Exists'])
- {
- $allBSTablesExist = FALSE;
- break;
- }
-
- if ($allBSTablesExist)
- $bs_reference_exists = PMA_BS_ReferenceExists($data, $db);
- } // end if (isset($bs_tables))
- } // end if (!empty($bs_tables) && strlen($db) > 0)
- } // end if ($pluginsExist)
- } // end if ($requiredTblType == strtolower ($tbl_type))
- } // end if (!empty($PMA_Config))
- } // end if (isset ($tbl_type) && strlen ($tbl_type) > 0)
-
- if ($bs_reference_exists)
+ if (PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type) && PMA_BS_IsPBMSReference($data, $db))
{
echo '<input type="hidden" name="remove_blob_ref_' . $field['Field_md5'] . $vkey . '" value="' . $data . '" />';
echo '<input type="checkbox" name="remove_blob_repo_' . $field['Field_md5'] . $vkey . '" /> ' . __('Remove BLOB Repository Reference') . "<br />";
@@ -894,7 +850,7 @@ foreach ($rows as $row_id => $vrow) {
unset($data_size);
}
echo "\n";
- } // end if ($bs_reference_exists)
+ } // end if (PMA_BS_IsTablePBMSEnabled($db, $table, $tbl_type) && PMA_BS_IsPBMSReference($data, $db))
?>
<input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="protected" />
<input type="hidden" name="fields<?php echo $field_name_appendix; ?>" value="" />
@@ -932,63 +888,10 @@ foreach ($rows as $row_id => $vrow) {
// (displayed whatever value the ProtectBinary has)
if ($is_upload && $field['is_blob']) {
- // check if field type is of longblob
- if ($field['pma_type'] == "longblob")
- {
- if (isset ($tbl_type) && strlen ($tbl_type) > 0)
- {
- // load PMA Config
- $PMA_Config = $GLOBALS['PMA_Config'];
-
- // is PMA_Config's data loaded? continue only if it is
- if (!empty($PMA_Config))
- {
- $requiredTblType = $PMA_Config->get('PBXT_NAME');
-
- if ($requiredTblType == strtolower ($tbl_type))
- {
- $pluginsExist = $PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST');
-
- // check if blobstreaming plugins exist
- if ($pluginsExist)
- {
- $curlExists = $PMA_Config->get('CURL_EXISTS');
-
- // check if CURL exists
- if ($curlExists)
- {
- $bs_tables = $PMA_Config->get('BLOBSTREAMABLE_DATABASES');
-
- // check for BLOBStreamable databases and if current database name is provided
- if (!empty($bs_tables) && strlen($db) > 0)
- {
- $bs_tables = $bs_tables[$db];
-
- // check if reference to BLOBStreaming tables exists
- if (isset($bs_tables))
- {
- $allBSTablesExist = TRUE;
-
- foreach ($bs_tables as $table_key=>$bs_tbl)
- if (!$bs_tables[$table_key]['Exists'])
- {
- $allBSTablesExist = FALSE;
- break;
- }
-
- // check if necessary BLOBStreaming tables exist
- if ($allBSTablesExist)
- {
- echo '<br />';
- echo '<input type="checkbox" name="upload_blob_repo_' . $field['Field_md5'] . $vkey . '" /> ' . __('Upload to BLOB repository');
- } // end if ($allBSTablesExist)
- } // end if (isset($bs_tables)
- } // end if (!empty($bs_tables) && strlen ($db) > 0)
- } // end if ($curlExists)
- } // end if ($pluginsExist)
- } // end if ($requiredTblType == strtolower ($tbl_type))
- } // end if (!empty($PMA_Config))
- } // end if (isset ($tbl_type) && strlen ($tbl_type) > 0)
+ // check if field type is of longblob and if the table is PBMS enabled.
+ if (($field['pma_type'] == "longblob") && PMA_BS_IsTablePBMSEnabled($db_name, $tbl_name, $tbl_type)) {
+ echo '<br />';
+ echo '<input type="checkbox" name="upload_blob_repo_' . $field['Field_md5'] . $vkey . '" /> ' . __('Upload to BLOB repository');
}
echo '<br />';
diff --git a/tbl_replace.php b/tbl_replace.php
index d3271ac..48b98c1 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -210,10 +210,6 @@ foreach ($loop_array as $rowcount => $where_clause) {
? $_REQUEST['auto_increment']['multi_edit'][$rowcount]
: null;
- if ($blob_streaming_active) {
- $primary_field = PMA_BS_GetPrimaryField($GLOBALS['db'], $GLOBALS['table']);
- }
-
// Fetch the current values of a row to use in case we have a protected field
// @todo possibly move to ./libraries/tbl_replace_fields.inc.php
if ($is_insert && $using_key && isset($me_fields_type) && is_array($me_fields_type) && isset($where_clause)) {
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5883-g0498861
by Marc Delisle 22 Jul '10
by Marc Delisle 22 Jul '10
22 Jul '10
The branch, master has been updated
via 049886139c62c3ed8b6573a0637ec5516857661f (commit)
via 8e98c5dd038eef2b6a56ab13b0cd7d30d9c76498 (commit)
from 6d459c02225a3b23914130c2752e870f31f53dc7 (commit)
- Log -----------------------------------------------------------------
commit 049886139c62c3ed8b6573a0637ec5516857661f
Merge: 8e98c5dd038eef2b6a56ab13b0cd7d30d9c76498 6d459c02225a3b23914130c2752e870f31f53dc7
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 08:48:21 2010 -0400
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
commit 8e98c5dd038eef2b6a56ab13b0cd7d30d9c76498
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 08:47:47 2010 -0400
bug #3030862 (master only) inline sql edit got undefined
-----------------------------------------------------------------------
Summary of changes:
libraries/common.lib.php | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 7e79faf..9e22f45 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1277,6 +1277,17 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
if (! empty($refresh_link)) {
PMA_profilingCheckbox($sql_query);
}
+ // if needed, generate an invisible form that contains controls for the
+ // Inline link; this way, the behavior of the Inline link does not
+ // depend on the profiling support or on the refresh link
+ if (empty($refresh_link) || ! PMA_profilingSupported()) {
+ echo '<form action="sql.php" method="post">';
+ echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']);
+ echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />';
+ echo '</form>';
+ }
+
+ // see in js/functions.js the jQuery code attached to id inline_edit
$inline_edit = "<script type=\"text/javascript\">\n" .
"//<![CDATA[\n" .
"document.write('[<a href=\"#\" title=\"" .
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5881-g6d459c0
by Michal Čihař 22 Jul '10
by Michal Čihař 22 Jul '10
22 Jul '10
The branch, master has been updated
via 6d459c02225a3b23914130c2752e870f31f53dc7 (commit)
from 5eeea5daede7c907dac48f59bd09819c64f88a4b (commit)
- Log -----------------------------------------------------------------
commit 6d459c02225a3b23914130c2752e870f31f53dc7
Author: gheni <gheni(a)yahoo.cn>
Date: Thu Jul 22 12:44:03 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/ug.po | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/po/ug.po b/po/ug.po
index 71a84e2..1e12f2b 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,8 +7,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-07-21 06:37+0200\n"
-"Last-Translator: <ablat7ihlim(a)yahoo.com.cn>\n"
+"PO-Revision-Date: 2010-07-22 12:44+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"
@@ -1415,7 +1415,7 @@ msgstr ""
#: libraries/Theme.class.php:380
msgid "No preview available."
-msgstr ""
+msgstr "ئالدىن كۆرگىنى بولمايدۇ."
#: libraries/Theme.class.php:383
msgid "take it"
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. 3439abf8eb19c89107c98a72ee28878393012fc9
by Michal Čihař 22 Jul '10
by Michal Čihař 22 Jul '10
22 Jul '10
The branch, master has been updated
via 3439abf8eb19c89107c98a72ee28878393012fc9 (commit)
via ab29c8a34c3b0160f788d772d03de61895b45af4 (commit)
via 0e794f100c828a9eae6920e1cb873010ec72cd91 (commit)
via a842615d62fc9ec3780744532e24af9140c23e76 (commit)
via c00d0f748aac05fd0ac3e814d48e0fafc53fd3c5 (commit)
via e2a1f67e3e6ee3a7222d4735f4a1c5fe520ef1b4 (commit)
via 5184188042ad10c2ec929dd936be816dc0730599 (commit)
via 90cc1d827adfe07cb6c7b2013c2c66ca3820154c (commit)
via a79c5fa74c2fb54913b6bf92e00676671f0eea1b (commit)
via 32e353a44ce3978bd9589a5765e8b14f5d67dd5c (commit)
via b67e04a581ec942db3ec97b7b20058f5713ee68a (commit)
from 7185d34aaa2b56be7308de2366eea3203c111cf5 (commit)
- Log -----------------------------------------------------------------
commit 3439abf8eb19c89107c98a72ee28878393012fc9
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Wed Jul 21 19:48:07 2010 +0200
Translation update done using Pootle.
commit ab29c8a34c3b0160f788d772d03de61895b45af4
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Wed Jul 21 19:47:53 2010 +0200
Translation update done using Pootle.
commit 0e794f100c828a9eae6920e1cb873010ec72cd91
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Wed Jul 21 19:47:42 2010 +0200
Translation update done using Pootle.
commit a842615d62fc9ec3780744532e24af9140c23e76
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Wed Jul 21 19:47:28 2010 +0200
Translation update done using Pootle.
commit c00d0f748aac05fd0ac3e814d48e0fafc53fd3c5
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Wed Jul 21 19:47:14 2010 +0200
Translation update done using Pootle.
commit e2a1f67e3e6ee3a7222d4735f4a1c5fe520ef1b4
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Wed Jul 21 19:47:06 2010 +0200
Translation update done using Pootle.
commit 5184188042ad10c2ec929dd936be816dc0730599
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Wed Jul 21 19:46:39 2010 +0200
Translation update done using Pootle.
commit 90cc1d827adfe07cb6c7b2013c2c66ca3820154c
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Wed Jul 21 19:46:24 2010 +0200
Translation update done using Pootle.
commit a79c5fa74c2fb54913b6bf92e00676671f0eea1b
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Wed Jul 21 19:46:16 2010 +0200
Translation update done using Pootle.
commit 32e353a44ce3978bd9589a5765e8b14f5d67dd5c
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Wed Jul 21 19:42:46 2010 +0200
Translation update done using Pootle.
commit b67e04a581ec942db3ec97b7b20058f5713ee68a
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Wed Jul 21 19:41:55 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/en_GB.po | 68 ++++++++++++++++++++++++++++------------------------------
1 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po
index ddb4e1a..50389d4 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,13 +8,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin-docs VERSION\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:51+0300\n"
-"PO-Revision-Date: 2010-01-25 13:26+0100\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2010-07-21 19:48+0200\n"
+"Last-Translator: Robert Readman <robert_readman(a)hotmail.com>\n"
"Language-Team: none\n"
-"Language: \n"
+"Language: en_GB\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
#. type: Content of: <html><head><title>
#: ../phpmyadmin/Documentation.html:13
@@ -884,14 +886,14 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:342
-#, fuzzy
msgid ""
"If you already had this infrastructure and upgraded to MySQL 4.1.2 or newer, "
"please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> and then create "
"new tables by importing <i>./scripts/create_tables.sql</i>."
msgstr ""
"If you already had this infrastructure and upgraded to MySQL 4.1.2 or newer, "
-"please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i>."
+"please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i> and then create "
+"new tables by importing <i>./scripts/create_tables.sql</i>."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:346
@@ -4672,9 +4674,8 @@ msgstr "recode - use recode_string function"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:1694
-#, fuzzy
msgid "none - disable encoding conversion"
-msgstr "Encoding conversion"
+msgstr "none - disable encoding conversion"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1696 ../phpmyadmin/Documentation.html:1742
@@ -4683,16 +4684,15 @@ msgstr "Default is auto."
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1698
-#, fuzzy
msgid ""
"Enabled charset conversion activates a pull-down menu in the Export and "
"Import pages, to choose the character set when exporting a file. The default "
"value in this menu comes from <tt>$cfg['Export']['charset']</tt> and <tt>$cfg"
"['Import']['charset']</tt>."
msgstr ""
-"Setting this to <tt>TRUE</tt> also activates a pull-down menu in the Export "
-"and Import pages, to choose the character set when exporting a file. The "
-"default value in this menu comes from <tt>$cfg['Export']['charset']</tt> and "
+"Enabled charset conversion activates a pull-down menu in the Export and "
+"Import pages, to choose the character set when exporting a file. The default "
+"value in this menu comes from <tt>$cfg['Export']['charset']</tt> and "
"<tt>$cfg['Import']['charset']</tt>."
#. type: Content of: <html><body><div><dl><dt>
@@ -5210,13 +5210,12 @@ msgstr "$cfg['LimitChars'] integer"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1857
-#, fuzzy
msgid ""
"Maximum number of characters shown in any non-numeric field on browse view. "
"Can be turned off by a toggle button on the browse page."
msgstr ""
-"Maximum number of characters showen in any non-numeric column on browse "
-"view. Can be turned off by a toggle button on the browse page."
+"Maximum number of characters shown in any non-numeric field on browse view. "
+"Can be turned off by a toggle button on the browse page."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1860
@@ -5960,13 +5959,12 @@ msgstr "$cfg['TitleDefault'] string"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:2153
-#, fuzzy
msgid ""
"Allows you to specify window's title bar. You can use <a href="
"\"#faq6_27\">format string expansion</a>."
msgstr ""
-"Allows you to specify window's title bar. Following magic string can be used "
-"to get special values:"
+"Allows you to specify window's title bar. You can use <a "
+"href=\"#faq6_27\">format string expansion</a>."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:2157
@@ -11155,7 +11153,6 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4112
-#, fuzzy
msgid ""
"To use SQL Validator, you need PHP with <abbr title=\"Extensible Markup "
"Language\">XML</abbr>, <abbr title=\"Perl Compatible Regular Expressions"
@@ -11164,17 +11161,15 @@ msgid ""
"Access Protocol\">SOAP</abbr> support, either as a PHP extension or as a "
"PEAR SOAP module."
msgstr ""
-"To use it, you need a very recent version of PHP, 4.3.0 recommended, with "
-"<abbr title=\"Extensible Markup Language\">XML</abbr>, <abbr title=\"Perl "
-"Compatible Regular Expressions\">PCRE</abbr> and <abbr title=\"PHP Extension "
-"and Application Repository\">PEAR</abbr> support. On your system command "
-"line, run <tt>\"pear install Net_Socket Net_URL HTTP_Request Mail_Mime "
-"Net_DIME SOAP\"</tt> to get the necessary <abbr title=\"PHP Extension and "
-"Application Repository\">PEAR</abbr> modules for usage."
+"To use SQL Validator, you need PHP with <abbr title=\"Extensible Markup "
+"Language\">XML</abbr>, <abbr title=\"Perl Compatible Regular "
+"Expressions\">PCRE</abbr> and <abbr title=\"PHP Extension and Application "
+"Repository\">PEAR</abbr> support. In addition you need a <abbr title=\"Simple "
+"Object Access Protocol\">SOAP</abbr> support, either as a PHP extension or "
+"as a PEAR SOAP module."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4122
-#, fuzzy
msgid ""
"To install <abbr title=\"PHP Extension and Application Repository\">PEAR</"
"abbr> <abbr title=\"Simple Object Access Protocol\">SOAP</abbr> module, run "
@@ -11182,13 +11177,12 @@ msgid ""
"\"</tt> to get the necessary <abbr title=\"PHP Extension and Application "
"Repository\">PEAR</abbr> modules for usage."
msgstr ""
-"To use it, you need a very recent version of PHP, 4.3.0 recommended, with "
-"<abbr title=\"Extensible Markup Language\">XML</abbr>, <abbr title=\"Perl "
-"Compatible Regular Expressions\">PCRE</abbr> and <abbr title=\"PHP Extension "
-"and Application Repository\">PEAR</abbr> support. On your system command "
-"line, run <tt>\"pear install Net_Socket Net_URL HTTP_Request Mail_Mime "
-"Net_DIME SOAP\"</tt> to get the necessary <abbr title=\"PHP Extension and "
-"Application Repository\">PEAR</abbr> modules for usage."
+"To install <abbr title=\"PHP Extension and Application "
+"Repository\">PEAR</abbr> <abbr title=\"Simple Object Access "
+"Protocol\">SOAP</abbr> module, run <tt>\"pear install Net_Socket Net_URL "
+"HTTP_Request Mail_Mime Net_DIME SOAP\"</tt> to get the necessary <abbr "
+"title=\"PHP Extension and Application Repository\">PEAR</abbr> modules for "
+"usage."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4131
@@ -11730,9 +11724,8 @@ msgstr ""
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:4327
-#, fuzzy
msgid "<a href=\"#faq6_27\">6.27 What format strings can I use?</a>"
-msgstr "<a href=\"#faq6_26\">6.26 How can I select a range of rows?</a>"
+msgstr "<a href=\"#faq6_27\">6.27 What format strings can I use?</a>"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4330
@@ -11743,6 +11736,11 @@ msgid ""
"(eg. if you don't have chosen table, you can not get table name), but "
"following variables can be used:"
msgstr ""
+"In all places where phpMyAdmin accepts format strings, you can use "
+"<code>@VARIABLE@</code> expansion and <a "
+"href=\"http://php.net/strftime\">strftime</a> format strings. The expanded "
+"variables depend on a context (e.g. if you don't have chosen table, you can "
+"not get table name), but following variables can be used:"
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:4337
hooks/post-receive
--
phpMyAdmin localized documentation
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5880-g5eeea5d
by Michal Čihař 22 Jul '10
by Michal Čihař 22 Jul '10
22 Jul '10
The branch, master has been updated
via 5eeea5daede7c907dac48f59bd09819c64f88a4b (commit)
via 8bfb41379cfd41b4ce51317da59c78c61aac03a1 (commit)
via 1a547e748f808439c56b15890ee73a17b0ae5eee (commit)
via 2a0180fa176cf070c460ce6e18e6b588890ea72d (commit)
via 9d017863d450e601330ec04b9a418c60cf85ad96 (commit)
via e0bb4e75d87bb4431257aaccd0a75346ee0cce38 (commit)
via d6a008eb031a3c77626d599a72a621539f93281b (commit)
via a55cf0ca0ece7ffb54650fad2bfb5927d0b4cd8d (commit)
via 952770514c94477ba22712c6a331e2ce8ea03e12 (commit)
via 9ed898bd8918fb0118fc501b4b4b1ca9ba14fd8f (commit)
via 26b3d52a6b2a04c638f0f25c67d0dc50a0cf4e6a (commit)
via 231976a487231eb9c27cc89932f2594cbe1fb0b6 (commit)
via c5b82468e1b2997cdea07090e1114f1b54310ef4 (commit)
via 31b8d7e434b632471154c98ee17bcb75edd14719 (commit)
via b3d7e9032ed9f8129037a256ac0bfd210e7db3c5 (commit)
via 98e12e0990c74e158c2935503beb17276c60cabc (commit)
via db185d965e99b03b243a97872cc17c9c8e5ca4ea (commit)
via 964d6f609f8ecafe64158487fb728135ccdb5687 (commit)
via de2d226b3acb0a7169377f5ee32b5729ba831b5d (commit)
via 04eb42815f28f38e148d17ef9375ac2b66403fbf (commit)
via ff7a72880c6257c20b2ece943834a9d7267b73e4 (commit)
via a3fc7b435c01d5931f258e20ede2ef03029d3875 (commit)
via b29639a016203b84c484ee4352ae093bee851fa4 (commit)
via 2c4798307f0e35c5cdfdfae3ffb85bbb63d65f14 (commit)
via 84c437feddf966d04ff38e25e46749f1ac147012 (commit)
via 738d3d886ddb385c6fdc682cfe65424ee887cb7e (commit)
via 4bf95ddf89ccec7a58544493f456fc070df19407 (commit)
via 77b1ba5831c16c683b8129d9d52a1d8d897fa10d (commit)
via 84c68510ae93c0514fde2fa1cf81a29569e995d0 (commit)
via 0a5ba9137f64e8a1fec7304606dd65d85af676fe (commit)
from 873ad99ed2fa8e5a46f1a92faccb8e163c0f0bc3 (commit)
- Log -----------------------------------------------------------------
commit 5eeea5daede7c907dac48f59bd09819c64f88a4b
Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com>
Date: Thu Jul 22 08:43:01 2010 +0200
Translation update done using Pootle.
commit 8bfb41379cfd41b4ce51317da59c78c61aac03a1
Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com>
Date: Thu Jul 22 08:42:50 2010 +0200
Translation update done using Pootle.
commit 1a547e748f808439c56b15890ee73a17b0ae5eee
Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com>
Date: Thu Jul 22 08:42:42 2010 +0200
Translation update done using Pootle.
commit 2a0180fa176cf070c460ce6e18e6b588890ea72d
Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com>
Date: Thu Jul 22 08:42:21 2010 +0200
Translation update done using Pootle.
commit 9d017863d450e601330ec04b9a418c60cf85ad96
Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com>
Date: Thu Jul 22 08:41:45 2010 +0200
Translation update done using Pootle.
commit e0bb4e75d87bb4431257aaccd0a75346ee0cce38
Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com>
Date: Thu Jul 22 08:41:17 2010 +0200
Translation update done using Pootle.
commit d6a008eb031a3c77626d599a72a621539f93281b
Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com>
Date: Thu Jul 22 08:40:43 2010 +0200
Translation update done using Pootle.
commit a55cf0ca0ece7ffb54650fad2bfb5927d0b4cd8d
Author: sven.erik.andersen <sven.erik.andersen(a)gmail.com>
Date: Thu Jul 22 08:40:28 2010 +0200
Translation update done using Pootle.
commit 952770514c94477ba22712c6a331e2ce8ea03e12
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:31:15 2010 +0200
Translation update done using Pootle.
commit 9ed898bd8918fb0118fc501b4b4b1ca9ba14fd8f
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:31:03 2010 +0200
Translation update done using Pootle.
commit 26b3d52a6b2a04c638f0f25c67d0dc50a0cf4e6a
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:30:30 2010 +0200
Translation update done using Pootle.
commit 231976a487231eb9c27cc89932f2594cbe1fb0b6
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:30:21 2010 +0200
Translation update done using Pootle.
commit c5b82468e1b2997cdea07090e1114f1b54310ef4
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:29:28 2010 +0200
Translation update done using Pootle.
commit 31b8d7e434b632471154c98ee17bcb75edd14719
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:29:20 2010 +0200
Translation update done using Pootle.
commit b3d7e9032ed9f8129037a256ac0bfd210e7db3c5
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:28:39 2010 +0200
Translation update done using Pootle.
commit 98e12e0990c74e158c2935503beb17276c60cabc
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:28:30 2010 +0200
Translation update done using Pootle.
commit db185d965e99b03b243a97872cc17c9c8e5ca4ea
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:28:00 2010 +0200
Translation update done using Pootle.
commit 964d6f609f8ecafe64158487fb728135ccdb5687
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:27:51 2010 +0200
Translation update done using Pootle.
commit de2d226b3acb0a7169377f5ee32b5729ba831b5d
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:27:20 2010 +0200
Translation update done using Pootle.
commit 04eb42815f28f38e148d17ef9375ac2b66403fbf
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:27:12 2010 +0200
Translation update done using Pootle.
commit ff7a72880c6257c20b2ece943834a9d7267b73e4
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:26:44 2010 +0200
Translation update done using Pootle.
commit a3fc7b435c01d5931f258e20ede2ef03029d3875
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:26:34 2010 +0200
Translation update done using Pootle.
commit b29639a016203b84c484ee4352ae093bee851fa4
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:26:03 2010 +0200
Translation update done using Pootle.
commit 2c4798307f0e35c5cdfdfae3ffb85bbb63d65f14
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:25:53 2010 +0200
Translation update done using Pootle.
commit 84c437feddf966d04ff38e25e46749f1ac147012
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:25:00 2010 +0200
Translation update done using Pootle.
commit 738d3d886ddb385c6fdc682cfe65424ee887cb7e
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:24:51 2010 +0200
Translation update done using Pootle.
commit 4bf95ddf89ccec7a58544493f456fc070df19407
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:23:55 2010 +0200
Translation update done using Pootle.
commit 77b1ba5831c16c683b8129d9d52a1d8d897fa10d
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:23:43 2010 +0200
Translation update done using Pootle.
commit 84c68510ae93c0514fde2fa1cf81a29569e995d0
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:22:50 2010 +0200
Translation update done using Pootle.
commit 0a5ba9137f64e8a1fec7304606dd65d85af676fe
Author: Marc Delisle <marc(a)infomarc.info>
Date: Thu Jul 22 02:22:36 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/hu.po | 345 +-----------------------------------------------
po/nb.po | 21 +--
po/pl.po | 339 +----------------------------------------------
po/pt.po | 265 +------------------------------------
po/ro.po | 132 +------------------
po/ru.po | 390 +------------------------------------------------------
po/si.po | 313 +-------------------------------------------
po/sk.po | 360 +--------------------------------------------------
po/sr(a)latin.po | 329 +---------------------------------------------
po/tt.po | 291 +----------------------------------------
po/uz.po | 392 +------------------------------------------------------
po/uz(a)latin.po | 396 +-------------------------------------------------------
12 files changed, 73 insertions(+), 3500 deletions(-)
diff --git a/po/hu.po b/po/hu.po
index 305a5fa..83f5449 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -4,14 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-12 09:15+0100\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2010-07-22 02:22+0200\n"
+"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: hungarian <hu(a)li.org>\n"
-"Language: \n"
+"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
#: browse_foreigners.php:37 browse_foreigners.php:58
#: libraries/display_tbl.lib.php:416 server_privileges.php:1506
@@ -2853,20 +2854,18 @@ msgid "Table structure for table"
msgstr "Tábla szerkezet:"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "__TABLE__ tábla tartalma"
+msgstr "@TABLE@ tábla tartalma"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(folytatás)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "__TABLE__ tábla szerkezete"
+msgstr "@TABLE@ tábla szerkezete"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8692,333 +8691,3 @@ msgstr "Tábla átnevezése"
#~ msgid "Default character set"
#~ msgstr "Alapértelmezett karakterkészlet"
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Új mező hozzáadása"
-
-#~ msgid "Field"
-#~ msgstr "Mező"
-
-#~ msgid "Records"
-#~ msgstr "Rekordok"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Mező vége"
-
-#~ msgid "Fields"
-#~ msgstr "Mezők száma"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "A(z) %s mező eldobása megtörtént"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Lásd image/jpeg megtekintése: bent"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "\"zip tömörítés\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "\"gzip tömörítés\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "\"bzip tömörítés\""
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "Egyéni megjegyzés hozzáadása a fejléchez (a \\n töri a sorokat)"
-
-#~ msgid "and"
-#~ msgstr "és"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Letiltott"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Engedélyezett"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Javítás"
-
-#~ msgid "Calendar"
-#~ msgstr "Naptár"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "MySQL 4.0 kompatibilis"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr ""
-#~ "Nem lehetett betölteni az alapértelmezett konfigurációt innen: \"%1$s\""
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Index készítése a(z) %s. oszlopon"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Tábla létrehozása"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Nincs"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Tábla kiírása (\"FLUSH\")"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "Érvénytelen szerverindex: \"%s\""
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Leírás"
-
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Nincs"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "A(z) \"%s\" adatbázis sémája - %s. oldal"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "Nem létezik a(z) \"%s\" tábla!"
-
-#~ msgid ""
-#~ "This MySQL server works as %s in <b>replication</b> process. For further "
-#~ "information about replication status on the server, please visit the <a "
-#~ "href=\"#replication\">replication section</a>."
-#~ msgstr ""
-#~ "Ez a MySQL-szerver mint %s működik a <b>többszörözéses</b> folyamatban. A "
-#~ "szerveren lévő többszörözéses állapotról a <a href=\"#replication"
-#~ "\">többszörözés részben</a> kaphat bővebb információt."
-
-#~ msgid "running on %s"
-#~ msgstr ": %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr "A mérettényező túl kicsi, hogy a séma ráférjen egy oldalra"
-
-#~ msgid ""
-#~ "Cannot start session without errors, please check errors given in your "
-#~ "PHP and/or webserver log file and configure your PHP installation "
-#~ "properly."
-#~ msgstr ""
-#~ "A munkamenet nem indítható hibák nélkül. Ellenőrizze a PHP és/vagy a "
-#~ "webszerver naplófájljába bejegyzett hibákat, és konfigurálja megfelelően "
-#~ "a PHP telepítését."
-
-#, fuzzy
-#~| msgid ""
-#~| "However on last run no data has been parsed, this usually means "
-#~| "phpMyAdmin won't be able to finish this import unless you increase php "
-#~| "time limits."
-#~ msgid ""
-#~ "However on last run no data has been parsed, this usually means "
-#~ "phpMyAdmin won"
-#~ msgstr ""
-#~ "Az utolsó futáskor azonban nem került adat elemzésre, ami általában azt "
-#~ "jelenti, hogy a phpMyAdmin nem tudja befejezni ezt az importálást, ha Ön "
-#~ "nem növeli meg a PHP időkorlátozását."
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Nincs"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Nincs"
-
-#, fuzzy
-#~| msgid "Grant all privileges on wildcard name (username\\_%)"
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr ""
-#~ "Az összes jog engedélyezése karakterhelyettesítős néven (username\\_%)"
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "Nem létezik a(z) \"%s\" tábla!"
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr ""
-#~ "Nem lehetett betölteni az alapértelmezett konfigurációt innen: \"%1$s\""
-
-#, fuzzy
-#~| msgid "Invalid hostname for server %1$s. Please review your configuration."
-#~ msgid "Invalid hostname for server %1. Please review your configuration."
-#~ msgstr ""
-#~ "A(z) %1$s szerver hosztneve érvénytelen. Ellenőrizze a beállításokat."
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "Hiba történt a(z) %1$s tábla %2$s névre történő átnevezésekor"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "Nem tölthető be a [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~ "kiterjesztés. Ellenőrizze a PHP beállításait."
-
-#, fuzzy
-#~| msgid "Could not connect to MySQL server"
-#~ msgid "(or the local MySQL server"
-#~ msgstr "Nem lehetett kapcsolódni a MySQL-szerverhez"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "Esély van rá, hogy hibát találhatott az SQL szintaktikai elemzőben "
-#~ "(parser). Kérjük, hogy vizsgálja meg gondosan a lekérdezésedet, "
-#~ "ellenőrizze, hogy az idézőjelek jók-e és jól illeszkednek-e. Más "
-#~ "lehetséges hiba oka lehet, hogy binárisan töltött fel egy fájlt az "
-#~ "idézett szövegmezőn kívül. Kipróbálhatja a lekérdezésedet a MySQL "
-#~ "parancssoros kezelőfelületén. A MySQL szerver hibakimenete alul látható, "
-#~ "ha van ott valami, az segíthet a hiba okának kiderítésében. Ha még mindig "
-#~ "gondjai vannak, vagy a szintaktikai elemző (parser) hibát jelez, ahol a "
-#~ "parancssoros kezelőfelületen végrehajtódik, redukálja a problémát okozó "
-#~ "SQL lekérdezést egy egyszerű lekérdezéssé, és küldjön be hibabejelentést "
-#~ "az alsó Kivágás részben levő adatokkal együtt:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV"
-
-#~ msgid "Copy"
-#~ msgstr "Másolás"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Törölje a felhasználót, azután töltse be újra a jogokat."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Ez a legtisztább út, viszont a jogok újratöltése eltarthat egy ideig."
-
-#~ msgid "has been altered."
-#~ msgstr "megváltozott."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "Microsoft Excel 2000"
-
-#~ msgid "Internet Explorer does not support this function."
-#~ msgstr "Az Internet Explorer nem támogatja ezt a funkciót."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ "A "törölt" felhasználók a jogok újratöltéséig még "
-#~ "hozzáférhetnek a szerverhez."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Egyszerűen törölje a felhasználókat a jogtáblákból."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Engedélyezi a tárolt eljárások futtatását; még nem valósult meg ebben a "
-#~ "MySQL verzióban."
-
-#~ msgid "Process list"
-#~ msgstr "Folyamatlista"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Jogok újratöltése"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr "A felhasználóknak még van USAGE joguk a jogok újratöltéséig."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "Natív MS Excel formátum"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Mind kijelölése"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Mind kijelölése"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Beszúrás"
-
-#, fuzzy
-#~| msgid "Update Query"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Lekérdezés frissítése"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Törlés"
-
-#~ msgid "%1$d row(s) affected."
-#~ msgstr "%1$d sor érintett."
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "jan.0"
-
-#~ msgid "Jan1"
-#~ msgstr "jan.1"
-
-#~ msgid "Jan2"
-#~ msgstr "jan.2"
diff --git a/po/nb.po b/po/nb.po
index 912da04..ed94794 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-06-09 14:17+0200\n"
+"PO-Revision-Date: 2010-07-22 08:43+0200\n"
"Last-Translator: <sven.erik.andersen(a)gmail.com>\n"
"Language-Team: norwegian <no(a)li.org>\n"
"Language: nb\n"
@@ -498,7 +498,7 @@ msgid "Search results for \"<i>%s</i>\" %s:"
msgstr "Søkeresultat for \"<i>%s</i>\" %s:"
#: db_search.php:242
-#, fuzzy, php-format
+#, php-format
#| msgid "%s match(es) inside table <i>%s</i>"
msgid "%s match inside table <i>%s</i>"
msgid_plural "%s matches inside table <i>%s</i>"
@@ -522,7 +522,7 @@ msgid "Delete"
msgstr "Slett"
#: db_search.php:267
-#, fuzzy, php-format
+#, php-format
#| msgid "<b>Total:</b> <i>%s</i> match(es)"
msgid "<b>Total:</b> <i>%s</i> match"
msgid_plural "<b>Total:</b> <i>%s</i> matches"
@@ -1003,7 +1003,6 @@ msgid "Choose column to display"
msgstr "Velg kolonne for visning"
#: js/messages.php:66
-#, fuzzy
#| msgid "Generate Password"
msgid "Generate password"
msgstr "Generer passord"
@@ -1678,10 +1677,9 @@ msgid "MySQL said: "
msgstr "MySQL sa: "
#: libraries/common.lib.php:1136
-#, fuzzy
#| msgid "Could not connect to MySQL server"
msgid "Failed to connect to SQL validator!"
-msgstr "Kunne ikke koble til MySQL tjener"
+msgstr "Kunne ikke koble til SQL validerer!"
#: libraries/common.lib.php:1174 setup/lib/messages.inc.php:350
msgid "Explain SQL"
@@ -1821,7 +1819,7 @@ msgstr "Operasjoner"
#: libraries/core.lib.php:282 libraries/dbg/setup.php:21
#, php-format
msgid "The %s extension is missing. Please check your PHP configuration."
-msgstr ""
+msgstr "%s tillegget mangler. Kontroller din PHP konfigurasjon."
#: libraries/db_events.inc.php:19 libraries/db_events.inc.php:21
#: libraries/export/sql.php:412
@@ -2736,20 +2734,18 @@ msgid "Table structure for table"
msgstr "Tabellstruktur for tabell"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Innhold i tabell __TABLE__"
+msgstr "Innhold i tabell @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(fortsettet)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Struktur i tabell __TABLE__"
+msgstr "Struktur i tabell @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -7756,10 +7752,9 @@ msgid "Showing SQL query"
msgstr "Viser SQL spørring"
#: sql.php:517
-#, fuzzy
#| msgid "Validate SQL"
msgid "Validated SQL"
-msgstr "Test SQL"
+msgstr "Validert SQL"
#: sql.php:638
#, php-format
diff --git a/po/pl.po b/po/pl.po
index 6f57869..6afb5a8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,14 +4,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-12 09:17+0100\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2010-07-22 02:29+0200\n"
+"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: polish <pl(a)li.org>\n"
-"Language: \n"
+"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\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.1\n"
#: browse_foreigners.php:37 browse_foreigners.php:58
#: libraries/display_tbl.lib.php:416 server_privileges.php:1506
@@ -2837,20 +2839,18 @@ msgid "Table structure for table"
msgstr "Struktura tabeli dla "
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Zawartość tabeli __TABLE__"
+msgstr "Zawartość tabeli @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(kontynuacja)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Struktura tabeli __TABLE__"
+msgstr "Struktura tabeli @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8533,326 +8533,3 @@ msgstr "Zmień nazwę tabeli na"
#~ msgid "Default character set"
#~ msgstr "Domyślne kodowanie napisów"
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Dodaj nowego pole"
-
-#~ msgid "Field"
-#~ msgstr "Pole"
-
-#~ msgid "Records"
-#~ msgstr "Rekordy"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Pola oddzielane przez"
-
-#~ msgid "Fields"
-#~ msgstr "Pola"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "Pole %s zostało usunięte"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Zobacz image/jpeg: inline"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "\".zip\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "\".gz\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "\".bz2\""
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "Dodaj do nagłówka własny komentarz (\\n oddziela linie)"
-
-#, fuzzy
-#~ msgid "and"
-#~ msgstr "oraz"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Wyłączone"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Włączone"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Napraw"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalendarz"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "Kompatybilny z MySQL-em 4.0"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr "Nie udało się załadować domyślnej konfiguracji z pliku: \"%1$s\""
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Utwórz indeks dla %s kolumn"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Utwórz tabelę"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Brak"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Przeładuj tabelę (\"FLUSH\")"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "Niewłaściwy numer serwera: \"%s\""
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Opis"
-
-#, fuzzy
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Brak"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "Schemat bazy danych \"%s\" - strona %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "Tabela \"%s\" nie istnieje!"
-
-#~ msgid "running on %s"
-#~ msgstr "uruchomiony na %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr ""
-#~ "Współczynnik skali jest za mały, by schemat zmieścił się na jednej stronie"
-
-#~ msgid ""
-#~ "Cannot start session without errors, please check errors given in your "
-#~ "PHP and/or webserver log file and configure your PHP installation "
-#~ "properly."
-#~ msgstr ""
-#~ "Nie udało się bezbłędnie utworzyć sesji. Należy sprawdzić błędy w logach "
-#~ "PHP i serwera WWW, a następnie właściwie skonfigurować instalację PHP."
-
-#, fuzzy
-#~| msgid ""
-#~| "However on last run no data has been parsed, this usually means "
-#~| "phpMyAdmin won't be able to finish this import unless you increase php "
-#~| "time limits."
-#~ msgid ""
-#~ "However on last run no data has been parsed, this usually means "
-#~ "phpMyAdmin won"
-#~ msgstr ""
-#~ "Jednakże, podczas ostatniego uruchomienia nie zostały przetworzone żadne "
-#~ "dane, co zwykle oznacza, że phpMyAdmin nie będzie w stanie ukończyć tego "
-#~ "importu bez zwiększenia limitów czasowych PHP."
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Brak"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Brak"
-
-#, fuzzy
-#~| msgid "Grant all privileges on wildcard name (username\\_%)"
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr ""
-#~ "Przyznaj wszystkie uprawienia do baz danych o nazwach pasujących do maski "
-#~ "(nazwaużytkownika_%)"
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "Tabela \"%s\" nie istnieje!"
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr "Nie udało się załadować domyślnej konfiguracji z pliku: \"%1$s\""
-
-#, fuzzy
-#~| msgid "Invalid hostname for server %1$s. Please review your configuration."
-#~ msgid "Invalid hostname for server %1. Please review your configuration."
-#~ msgstr ""
-#~ "Niewłaściwa nazwa hosta serwera %1$s. Proszę przyjrzeć się konfiguracji."
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "Błąd podczas zmiany nazwy tabeli z %1$s na %2$s"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "nie udało się załadować modułu %s,<br />proszę sprawdzić konfigurację PHP"
-
-#, fuzzy
-#~| msgid "Could not connect to MySQL server"
-#~ msgid "(or the local MySQL server"
-#~ msgstr "Nie można połączyć się z serwerem MySQL"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "Istnieje szansa, że właśnie znaleziono błąd w analizatorze składni SQL. "
-#~ "Proszę zbadać bliżej swoje zapytanie i sprawdzić, czy cudzysłowy są "
-#~ "poprawne i dobrze sparowane. Inną możliwą przyczyną niepowodzenia może "
-#~ "być wysyłanie pliku ze znakami binarnymi poza obszarem tekstu ujętego w "
-#~ "cudzysłowy. Można również sprawdzić zapytanie SQL poprzez linię poleceń "
-#~ "MySQL-a. W znalezieniu przyczyny problemu może pomóc także - jeśli się "
-#~ "pojawi - poniższy opis błędu serwera MySQL. Jeśli nadal występują z "
-#~ "problemy lub analizator składni zgłasza usterkę a linia poleceń - nie, "
-#~ "ogranicz sekwencję zapytań SQL do pojedynczego, które powoduje problemy i "
-#~ "zgłoś błąd, dołączając fragment danych zawarty w poniższej sekcji TNIJ:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "Dane CSV"
-
-#~ msgid "Copy"
-#~ msgstr "Kopiuj"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Usuń użytkowników, a następnie przeładuj uprawnienia."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Jest to najzgrabniejszy sposób, ale przeładowanie uprawnień może potrwać "
-#~ "jakiś czas."
-
-#~ msgid "has been altered."
-#~ msgstr "zostało zamienione."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "Microsoft Excel 2000"
-
-#~ msgid "Internet Explorer does not support this function."
-#~ msgstr "Internet Explorer nie obsługuje tej funkcji."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ "Do momentu przeładowania uprawnień "usunięci" użytkownicy nadal "
-#~ "będą mieli dostęp do serwera."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Po prostu usuń użytkowników z tabeli uprawnień."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Pozwól uruchamiać zapamiętane procedury; Nie ma żadnych skutków w tej "
-#~ "wersji MySQL."
-
-#~ msgid "Process list"
-#~ msgstr "Lista procesów"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Przeładuj uprawnienia"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "Nim uprawnienia zostaną przeładowane, użytkownicy nadal będą mieli "
-#~ "uprawnienie USAGE."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "Dane w formacie macierzystym MS Excela"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Zaznacz wszystkie"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Zaznacz wszystkie"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Dodaj"
-
-#, fuzzy
-#~| msgid "Update Query"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Zmień zapytanie"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Usuń"
-
-#~ msgid "%1$d row(s) affected."
-#~ msgstr "Zmodyfikowanych rekordów: %1$d."
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "Sty0"
-
-#~ msgid "Jan1"
-#~ msgstr "Sty1"
-
-#~ msgid "Jan2"
-#~ msgstr "Sty2"
diff --git a/po/pt.po b/po/pt.po
index 48c0a28..4aa5eac 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,14 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-12 09:17+0100\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2010-07-22 02:23+0200\n"
+"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: portuguese <pt(a)li.org>\n"
-"Language: \n"
+"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
#: browse_foreigners.php:37 browse_foreigners.php:58
#: libraries/display_tbl.lib.php:416 server_privileges.php:1506
@@ -2764,20 +2765,18 @@ msgid "Table structure for table"
msgstr "Estrutura da tabela"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Conteúdo da tabela __TABLE__"
+msgstr "Conteúdo da tabela @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(continuação)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "estructura da tabela __TABLE__"
+msgstr "estructura da tabela @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8149,253 +8148,3 @@ msgstr "Renomeia a tabela para "
#~ "Não é possível usar <i>iconv</i> nem <i>libiconv</i> nem a função "
#~ "<i>recode_string</i> enquanto a extensão reportar que está ligada. "
#~ "Confira a configuração do seu php."
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Adiciona novo campo"
-
-#~ msgid "Field"
-#~ msgstr "Campo"
-
-#~ msgid "Records"
-#~ msgstr "Registos"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Campos terminados por"
-
-#~ msgid "Fields"
-#~ msgstr "Qtd Campos"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "O campo %s foi eliminado"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Ver imagem/jpeg: inline"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "\"Compressão zip\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "\"Compressão gzip\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "\"Compressão bzip\""
-
-#, fuzzy
-#~ msgid "and"
-#~ msgstr "E"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Desactidado"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Activado"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Reparar tabela"
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Criar um índice com %s coluna(s)"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Criar uma Página nova"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Nenhum"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Fecha a tabela (\"FLUSH\")"
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Descrição"
-
-#, fuzzy
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Nenhum"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "Esquema da base de dados \"%s\" - Página %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "A tabela \"%s\" não existe!"
-
-#~ msgid "running on %s"
-#~ msgstr "a correr em %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr "O factor escala é muito pequeno para encaixar o esquema numa página"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Nenhum"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Nenhum"
-
-#, fuzzy
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr "Verificar Privilégios para a Base de Dados "%s"."
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "A tabela \"%s\" não existe!"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "não é possível carregar a extensão %s ;<br />verifique a configuração do "
-#~ "PHP por favor"
-
-#, fuzzy
-#~ msgid "(or the local MySQL server"
-#~ msgstr "Não é possível fazer login no servidor MySQL"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "Talvez tenha encontrado um bug no analizador (parser) do SQL. Analise o "
-#~ "seu query aprofundadamente, e verifique se as aspas estão correctas e não "
-#~ "estão desencontradas. Outra possibilidade de falha é o facto de estar a "
-#~ "fazer o upload de um ficheiro com outside binário, de de uma área de "
-#~ "texto citada. Pode também experimentar a sua query na interface da linha "
-#~ "de comandos do MySQL. A saída de erro do MySQL abaixo, isto se existir "
-#~ "alguma, também o poderá ajudar a diagnosticar o problema. Se continuar a "
-#~ "ter problemas ou se o analisador (parser) falhar onde a interface da "
-#~ "linha de comandos tiver sucesso, reduza por favor a entrada do query SQL "
-#~ "até aquele que causa o problema, e envie o relatório de bug com os dados "
-#~ "do chunk na secção CUT abaixo:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "Dados CSV"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Apagar os utilizadores e recarreguar os privilégios a seguir."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Este é o processo mais limpo, mas recarregar os privilégios poderá "
-#~ "demorar um pouco."
-
-#~ msgid "has been altered."
-#~ msgstr "foi alterado(a)."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ "Os utilizadores "deleted" continuarão a conseguir aceder ao "
-#~ "servidor até que os privilégios sejam recarregados."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Apagar apenas os utilizadores da tabela de privilégios."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Permite executar procedimentos armazenados; Não tem efeito nesta versão "
-#~ "do MySQL."
-
-#~ msgid "Process list"
-#~ msgstr "Lista de Processos"
-
-#, fuzzy
-#~ msgid "Reload privileges"
-#~ msgstr "Privilégios Globais"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "O utilizadores manterão o privilégio de USAGE até que os privilégios "
-#~ "sejam recarregados."
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Selecciona Todas"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Selecciona Todas"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Insere"
-
-#, fuzzy
-#~| msgid "Update Query"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Actualiza Comando SQL"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Apagar"
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "Jan0"
-
-#~ msgid "Jan1"
-#~ msgstr "Jan1"
-
-#~ msgid "Jan2"
-#~ msgstr "Jan2"
diff --git a/po/ro.po b/po/ro.po
index 56c3cf3..28650a8 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-05-16 01:40+0200\n"
-"Last-Translator: <ssuceveanu(a)yahoo.com>\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"
@@ -2844,20 +2844,18 @@ msgid "Table structure for table"
msgstr "Structura de tabel pentru tabelul"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Conținutul tabelului __TABLE__"
+msgstr "Conținutul tabelului @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(continuare)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Structura tabelului __TABLE__"
+msgstr "Structura tabelului @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8438,125 +8436,3 @@ msgstr "Redenumire tabel la"
#~ msgstr ""
#~ "Nu pot folosi funcțiile iconv nici libiconv nici recode_string în timp ce "
#~ "extensia este încărcată. Verificați configurația PHP."
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Adaugă cîmp nou"
-
-#~ msgid "Field"
-#~ msgstr "Cîmp"
-
-#~ msgid "Records"
-#~ msgstr "Înregistrări"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Cîmpuri terminate de"
-
-#~ msgid "Fields"
-#~ msgstr "Cîmpuri"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "Cîmpul %s a fost aruncat"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Vezi imagine/jpeg: inline"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "„arhivat”"
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "cu „gzip”"
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "cu „bzip2”"
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "Adăugare comentariu la antet (\\n înseamnă delimitare de rînd)"
-
-#, fuzzy
-#~ msgid "and"
-#~ msgstr "Și"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Dezactivat"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Activat"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Repară"
-
-#~ msgid "Calendar"
-#~ msgstr "Calendar"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "Compatibil MySQL 4.0"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr "Nu s-a putut încărca configurația implicită din: „%1$s”"
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Creează un index pe %s coloană"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Creare tabel"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Nici unul(a)"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Curățarea tabelului (\"FLUSH\")"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "Index de server nevalid: „%s”"
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Descriere"
-
-#, fuzzy
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Nici unul(a)"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "Schema bazei de date \"%s\" - Pagina %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "Tabelul „%s” nu există!"
-
-#~ msgid "running on %s"
-#~ msgstr "rulînd pe %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr "Factorul de scalare este prea mica pentru a inchepe in pagina"
-
-#~ msgid ""
-#~ "Cannot start session without errors, please check errors given in your "
-#~ "PHP and/or webserver log file and configure your PHP installation "
-#~ "properly."
-#~ msgstr ""
-#~ "Cannot start session without errors, please check errors given in your "
-#~ "PHP and/or webserver log file and configure your PHP installation "
-#~ "properly."
diff --git a/po/ru.po b/po/ru.po
index 9496877..8faacd4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-30 23:23+0200\n"
-"Last-Translator: Michal <michal(a)cihar.com>\n"
+"PO-Revision-Date: 2010-07-22 02:27+0200\n"
+"Last-Translator: Marc Delisle <marc(a)infomarc.info>\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"
-"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:37 browse_foreigners.php:58
@@ -2856,20 +2856,18 @@ msgid "Table structure for table"
msgstr "Структура таблицы"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Содержимое таблицы __TABLE__"
+msgstr "Содержимое таблицы @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(продолжение)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Структура таблицы __TABLE__"
+msgstr "Структура таблицы @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8724,379 +8722,3 @@ msgstr "Переименовать таблицу в"
#~ msgid "Default character set"
#~ msgstr "Кодировка по умолчанию"
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Добавить новое поле"
-
-#~ msgid "Field"
-#~ msgstr "Поле"
-
-#~ msgid "Records"
-#~ msgstr "Записи"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Разделитель полей"
-
-#~ msgid "Fields"
-#~ msgstr "Поля"
-
-#~ msgid "Add %s field(s)"
-#~ msgstr "Добавить %s поле(я)"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "Поле "%s" было удалено"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr ""
-#~ "Отображает уменьшенную иконку изображения, на которую можно нажать для "
-#~ "увеличения. Параметрами задается максимальная ширина и высота картинки в "
-#~ "пикселях. Изначальное соотношение сторон, сохраняется."
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "zip"
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "gzip"
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "bzip"
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "Добавить собственный комментарий в заголовок (перевод строки: \\n)"
-
-#~ msgid "and"
-#~ msgstr "и"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Отключено"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Включено"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Восстановить"
-
-#~ msgid "Calendar"
-#~ msgstr "Календарь"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "MySQL 4.0 совместимо"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr "Невозможно загрузить изначальную конфигурацию из: "%1$s""
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Создать индекс для %s столбца/ов"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Создать таблицу"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Нет"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Обновить кеш таблицы ("FLUSH")"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "Неправильный номер сервера: "%s""
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Описание"
-
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Нет"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "Структура базы данных \"%s\" - Страница %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "Таблица \"%s\" не существует!"
-
-#~ msgid ""
-#~ "This MySQL server works as %s in <b>replication</b> process. For further "
-#~ "information about replication status on the server, please visit the <a "
-#~ "href=\"#replication\">replication section</a>."
-#~ msgstr ""
-#~ "Данный MySQL сервер работает, как %s в процессе <b>репликации</b>. Для "
-#~ "получения подробной информации о состоянии репликации сервера, "
-#~ "пожалуйста, перейдите в <a href=\"#replication\">раздел репликации</a>."
-
-#~ msgid "running on %s"
-#~ msgstr "на %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr ""
-#~ "Схема не помещается на одной странице. Необходимо уменьшить масштаб."
-
-#~ msgid ""
-#~ "Cannot start session without errors, please check errors given in your "
-#~ "PHP and/or webserver log file and configure your PHP installation "
-#~ "properly."
-#~ msgstr ""
-#~ "Произошла ошибка в работе механизма сессии. Проверьте файлы журналов PHP "
-#~ "и/или Веб-сервера на наличие ошибок, и произведите их корректное "
-#~ "конфигурирование."
-
-#, fuzzy
-#~| msgid "Import currencies ($5.00 to 5.00)"
-#~ msgid "Import currencies (.00 to 5.00)"
-#~ msgstr "Импортировать денежные единицы ($5.00 в 5.00)"
-
-#, fuzzy
-#~| msgid ""
-#~| "However on last run no data has been parsed, this usually means "
-#~| "phpMyAdmin won't be able to finish this import unless you increase php "
-#~| "time limits."
-#~ msgid ""
-#~ "However on last run no data has been parsed, this usually means "
-#~ "phpMyAdmin won"
-#~ msgstr ""
-#~ "Несмотря на последний запуск, данные не были обработаны. Как правило это "
-#~ "означает, что phpMyAdmin не сможет завершить процесс импорта до тех пор, "
-#~ "пока не будет увеличено ограничение времени выполнения php-сценариев."
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Нет"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Нет"
-
-#, fuzzy
-#~| msgid "Grant all privileges on wildcard name (username\\_%)"
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr ""
-#~ "Предоставить полные привилегии на базы данных подпадающие под шаблон (имя "
-#~ "пользователя\\_%)"
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "Таблица \"%s\" не существует!"
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr "Невозможно загрузить изначальную конфигурацию из: "%1$s""
-
-#, fuzzy
-#~| msgid "Invalid hostname for server %1$s. Please review your configuration."
-#~ msgid "Invalid hostname for server %1. Please review your configuration."
-#~ msgstr ""
-#~ "Для сервера %1$s указано неверное имя хоста. Исправьте настройки заданные "
-#~ "в конфигурационном файле phpMyAdmin."
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "Ошибка при переименовании таблицы %1$s в %2$s"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "Невозможно загрузить расширение [a@http://php.net/%1$s@Documentation]"
-#~ "[em]%1$s[/em][/a]! Проверьте настройки PHP."
-
-#, fuzzy
-#~| msgid ""
-#~| "This server is not configured as master in a replication process. Would "
-#~| "you like to <a href=\"%s\">configure</a> it?"
-#~ msgid ""
-#~ "This server is not configured as master in a replication process. Would "
-#~ "you like to <a href=%s>configure</a> it?"
-#~ msgstr ""
-#~ "Данный сервер не настроен в качестве головного для процесса репликации. "
-#~ "Хотите произвести <a href=\"%s\">настройку</a>?"
-
-#, fuzzy
-#~| msgid ""
-#~| "This server is not configured as slave in a replication process. Would "
-#~| "you like to <a href=\"%s\">configure</a> it?"
-#~ msgid ""
-#~ "This server is not configured as slave in a replication process. Would "
-#~ "you like to <a href=%s>configure</a> it?"
-#~ msgstr ""
-#~ "Данный сервер не настроен в качестве подчинённого для процесса "
-#~ "репликации. Хотите произвести <a href=\"%s\">настройку</a>?"
-
-#, fuzzy
-#~| msgid "Could not connect to MySQL server"
-#~ msgid "(or the local MySQL server"
-#~ msgstr "Невозможно соединиться с сервером MySQL"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "В работе SQL-парсера произошла ошибка. Убедитесь в корректности запроса, "
-#~ "отсутствии в нем опечаток и незакрытых кавычек. Возможной причиной ошибки "
-#~ "может быть загрузка файла, содержащего двоичные данные вне кавычек в "
-#~ "тексте запроса. Попробуйте выполнить запрос через командную строку MySQL. "
-#~ "При наличии таковой, ниже будет выведена ошибка MySQL-сервера, "
-#~ "облегчающая диагностику проблемы. Если проблема не решается, хотя через "
-#~ "интерфейс командной строки запрос отрабатывает корректно, выявите ту "
-#~ "часть запроса, которая вызывает ошибку и отправьте разработчикам описание "
-#~ "ошибки, снабдив его данными из секции CUT выведенной ниже:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV"
-
-#~ msgid "Copy"
-#~ msgstr "Использовать"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Удалить всех пользователей и перезагрузить привилегии."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Это лучший способ, хотя перезагрузка привилегий может занять какое-то "
-#~ "время."
-
-#~ msgid "has been altered."
-#~ msgstr "была изменена."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "Microsoft Excel 2000"
-
-#~ msgid "Internet Explorer does not support this function."
-#~ msgstr "Internet Explorer не поддерживает данную функцию."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ ""Удаленные" пользователи будут иметь доступ к серверу, пока "
-#~ "таблицы привилегий не будут перезагружены."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Просто удалить пользователей из таблиц привилегий."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Разрешает выполнение хранимых процедур (не поддерживается данной версией "
-#~ "MySQL)"
-
-#~ msgid "Process list"
-#~ msgstr "Список процессов"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Перезагрузить привилегии"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "Вплоть до перезагрузки привилегий, пользователи все еще будут сохранять "
-#~ "глобальные привилегии типа USAGE."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "Формат MS Excel"
-
-#~ msgid "Alter index(s)"
-#~ msgstr "Изменить индекс(ы)"
-
-#~ msgid "Tracking Mechanism"
-#~ msgstr "Механизм слежения"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Выделить все"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Выделить все"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Вставить"
-
-#, fuzzy
-#~| msgid "Updated"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Обновлён"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Удалить"
-
-#~ msgid "%1$d row(s) affected."
-#~ msgstr "Затронуто строк: %1$d."
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "Янв0"
-
-#~ msgid "Jan1"
-#~ msgstr "Янв1"
-
-#~ msgid "Jan2"
-#~ msgstr "Янв2"
-
-#~ msgid ""
-#~ "Structure Difference' ;\n"
-#~ "$strStructureForView = 'Structure for view"
-#~ msgstr "Различие структуры"
diff --git a/po/si.po b/po/si.po
index d6680ea..93f3110 100644
--- a/po/si.po
+++ b/po/si.po
@@ -4,13 +4,14 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-30 23:09+0200\n"
-"Last-Translator: Michal <michal(a)cihar.com>\n"
+"PO-Revision-Date: 2010-07-22 02:26+0200\n"
+"Last-Translator: Marc Delisle <marc(a)infomarc.info>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.0.1\n"
#: browse_foreigners.php:37 browse_foreigners.php:58
@@ -2800,20 +2801,18 @@ msgid "Table structure for table"
msgstr "වගුවක් සඳහා වගු සැකිල්ල"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Content of table __TABLE__"
+msgstr "Content of table @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(ඉදිරියට)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Structure of table __TABLE__"
+msgstr "Structure of table @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8358,305 +8357,3 @@ msgstr "වගුව බවට නම වෙනස් කරන්න"
#~ "Couldn't use either the iconv, libiconv or recode_string functions, "
#~ "although the necessary extensions appear to be loaded. Check your PHP "
#~ "configuration."
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "නව ක්ෂේත්රයක් එක් කරන්න"
-
-#~ msgid "Field"
-#~ msgstr "ක්ෂේත්රය"
-
-#~ msgid "Records"
-#~ msgstr "වාර්තා"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Fields terminated by"
-
-#~ msgid "Fields"
-#~ msgstr "ක්ෂේත්ර"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "%s ක්ෂේත්රය ඉවත් කරන ලදි"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "See image/jpeg: inline"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "\"සිප්ගත කරන ලද\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "\"gzipp ගත කරන ලදි\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "\"bzipp ගතකරන ලදි\""
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "හෙඩිමට වෙනත් විස්තර එක් කරන්න (\\n පේළි විභේදනය)"
-
-#, fuzzy
-#~ msgid "and"
-#~ msgstr "සහ"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "අක්රිය කරන ලද"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "සක්රිය කරන් ලද"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "වගුව ප්රතිසංස්කරණය කරන්න"
-
-#~ msgid "Calendar"
-#~ msgstr "දින දර්ශනය"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "MySQL 4.0 compatible"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr "Could not load default configuration from: \"%1$s\""
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Create an index on %s columns"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "නව පිටුවක් සාදන්න"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "කිසිවක් නැත"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Flush the table (\"FLUSH\")"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "Invalid server index: \"%s\""
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "විස්තරය"
-
-#, fuzzy
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "කිසිවක් නැත"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "Schema of the \"%s\" database - Page %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "The \"%s\" table doesn't exist!"
-
-#~ msgid "running on %s"
-#~ msgstr "%s මත ධාවනය වේ"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr "The scale factor is too small to fit the schema on one page"
-
-#, fuzzy
-#~| msgid ""
-#~| "However on last run no data has been parsed, this usually means "
-#~| "phpMyAdmin won't be able to finish this import unless you increase php "
-#~| "time limits."
-#~ msgid ""
-#~ "However on last run no data has been parsed, this usually means "
-#~ "phpMyAdmin won"
-#~ msgstr ""
-#~ "However on last run no data has been parsed, this usually means "
-#~ "phpMyAdmin won't be able to finish this import unless you increase php "
-#~ "time limits."
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "කිසිවක් නැත"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "කිසිවක් නැත"
-
-#, fuzzy
-#~| msgid "Grant all privileges on wildcard name (username\\_%)"
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr "අභිමත ආදේශක නාමයන් සඳහා සියලු වරප්රසාද දෙන්න (භාවිත නාමය_%)"
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "The \"%s\" table doesn't exist!"
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr "Could not load default configuration from: \"%1$s\""
-
-#, fuzzy
-#~| msgid "Invalid hostname for server %1$s. Please review your configuration."
-#~ msgid "Invalid hostname for server %1. Please review your configuration."
-#~ msgstr "Invalid hostname for server %1$s. Please review your configuration."
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "%1$s සිට %2$s දක්වා වගුවේ නම් වෙනස් කිරීමේ දෝෂයක් ඇත"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~ "extension. Please check your PHP configuration."
-
-#, fuzzy
-#~ msgid "(or the local MySQL server"
-#~ msgstr "MySQL සර්වරයට ලොග් විය නොහැක"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "below, if there is any, may also help you in diagnosing the problem. If "
-#~ "you still have problems or if the parser fails where the command line "
-#~ "interface succeeds, please reduce your SQL query input to the single "
-#~ "query that causes problems, and submit a bug report with the data chunk "
-#~ "in the CUT section below:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV"
-
-#~ msgid "Copy"
-#~ msgstr "පිටපත් කරන්න"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "භාවිතා කරන්නා ඉවත් කර ඉන්පසු වරප්රසාද නැවත අලුත් කරන්න."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr "වඩාත්ම නිවැරදි ක්රමයයි. නමුත් වරප්රසාද නැවත අලුත් කිරීම සඳහා කාලයක් ගතවේ."
-
-#~ msgid "has been altered."
-#~ msgstr "වෙනස් කරන ලදි."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "මෛක්රොසොෆ්ට් එක්සෙල් 2000"
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "වරප්රසාද වගුවෙන් භාවිතා කරන්නන් ඉවත් කරන්න."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-
-#~ msgid "Process list"
-#~ msgstr "ක්රියාවලි ලයිස්තුව"
-
-#~ msgid "Reload privileges"
-#~ msgstr "වරප්රසාද ප්රතිප්රවේශනය කරන්න"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "Native MS Excel format"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "සියල්ල තෝරන්න"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "සියල්ල තෝරන්න"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "ඇතුල් කරන්න"
-
-#, fuzzy
-#~| msgid "Update Query"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Update Query"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "ඉවත් කරන්න"
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "ජනවාරි0"
-
-#~ msgid "Jan1"
-#~ msgstr "ජනවාරි1"
-
-#~ msgid "Jan2"
-#~ msgstr "ජනවාරි2"
diff --git a/po/sk.po b/po/sk.po
index 1d77e4e..4aa703b 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-30 23:47+0200\n"
-"Last-Translator: Michal <michal(a)cihar.com>\n"
+"PO-Revision-Date: 2010-07-22 02:26+0200\n"
+"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: slovak <sk(a)li.org>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
@@ -2813,20 +2813,18 @@ msgid "Table structure for table"
msgstr "Štruktúra tabuľky pre tabuľku"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Obsah tabuľky __TABLE__"
+msgstr "Obsah tabuľky @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(pokračovanie)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Štruktúra tabuľky __TABLE__"
+msgstr "Štruktúra tabuľky @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8386,353 +8384,3 @@ msgstr "Premenovať tabuľku na"
#~ msgstr ""
#~ "Nie je možné použiť funkcie iconv, libiconv a recode_string aj napriek "
#~ "tomu, že rozšírenia sú nahrané. Skontrolujte prosím nastavenie PHP."
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Pridať nové pole"
-
-#~ msgid "Field"
-#~ msgstr "Pole"
-
-#~ msgid "Records"
-#~ msgstr "Záznamov"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Polia ukončené"
-
-#~ msgid "Fields"
-#~ msgstr "Polia"
-
-#~ msgid "Add %s field(s)"
-#~ msgstr "Pridať %s položiek"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "Pole %s bolo odstránené"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Zobrazí image/jpeg: inline"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "\"zozipované\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "\"gzip-ované\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "\"bzipped\""
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "Pridať vlastný komentár do hlavičky (\\n oddeľuje riadky)"
-
-#~ msgid "and"
-#~ msgstr "a"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Vypnuté"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Zapnuté"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Opraviť"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalendár"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "Kompatibilné s MySQL 4.0"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr ""
-#~ "Nepodarilo sa načítať prednastavenú konfiguráciu zo súboru: \"%1$s\""
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Vytvoriť index na %s stĺpcoch"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Vytvoriť tabuľku"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Žiadny"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Vyprázdniť tabuľku (\"FLUSH\")"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "Chybný index serveru: \"%s\""
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Popis"
-
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Žiadna"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "Schéma databázy \"%s\" - Strana %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "Tabuľka \"%s\" neexistuje!"
-
-#~ msgid ""
-#~ "This MySQL server works as %s in <b>replication</b> process. For further "
-#~ "information about replication status on the server, please visit the <a "
-#~ "href=\"#replication\">replication section</a>."
-#~ msgstr ""
-#~ "Tento MySQL server funguje ako %s v <b>replikačnom</b> procese. Pre viac "
-#~ "informácií o stave replikácie na tomto serveri navštívte prosím <a href="
-#~ "\"#replication\">sekciu replikácie</a>."
-
-#~ msgid "running on %s"
-#~ msgstr "beží na %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr "Mierka je príliš mala na roztiahnutie schémy na stránku"
-
-#~ msgid ""
-#~ "Cannot start session without errors, please check errors given in your "
-#~ "PHP and/or webserver log file and configure your PHP installation "
-#~ "properly."
-#~ msgstr ""
-#~ "Nemôžem spustiť session bez chyby. Prosím skontrolujte chyby vo Vašom PHP "
-#~ "a/alebo v logoch web serveru a nastavte Vaše PHP korektne."
-
-#, fuzzy
-#~| msgid ""
-#~| "However on last run no data has been parsed, this usually means "
-#~| "phpMyAdmin won't be able to finish this import unless you increase php "
-#~| "time limits."
-#~ msgid ""
-#~ "However on last run no data has been parsed, this usually means "
-#~ "phpMyAdmin won"
-#~ msgstr ""
-#~ "Avšak pri poslednom pokuse neboli prijaté žiadne dáta, čo obvykle "
-#~ "znamená, že phpMyAdmin nebude schopný dokončiť tento import, pokiaľ "
-#~ "nebude zvýšený časový limit behu skriptu v php."
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Žiadny"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Žiadny"
-
-#, fuzzy
-#~| msgid "Grant all privileges on wildcard name (username\\_%)"
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr "Prideliť všetky oprávnenia pomocou masky (používateľ_%)"
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "Tabuľka \"%s\" neexistuje!"
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr ""
-#~ "Nepodarilo sa načítať prednastavenú konfiguráciu zo súboru: \"%1$s\""
-
-#, fuzzy
-#~| msgid "Invalid hostname for server %1$s. Please review your configuration."
-#~ msgid "Invalid hostname for server %1. Please review your configuration."
-#~ msgstr ""
-#~ "Chybný názov hostu pre server %1$s. Prosím, skontrolujte konfiguráciu."
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "Chyba pri premenovaní tabuľky %1$s na %2$s"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr "nedá sa nahrať rozšírenie %s, prosím skontrolujte konfiguráciu PHP"
-
-#, fuzzy
-#~ msgid ""
-#~ "This server is not configured as master in a replication process. Would "
-#~ "you like to <a href=%s>configure</a> it?"
-#~ msgstr ""
-#~ "Tento server nie je nakonfigurovaný ako slave v replikačnom procese. "
-#~ "Chceli by ste ho <a href=\"%s\">nakonfigurovať</a>?"
-
-#, fuzzy
-#~| msgid ""
-#~| "This server is not configured as slave in a replication process. Would "
-#~| "you like to <a href=\"%s\">configure</a> it?"
-#~ msgid ""
-#~ "This server is not configured as slave in a replication process. Would "
-#~ "you like to <a href=%s>configure</a> it?"
-#~ msgstr ""
-#~ "Tento server nie je nakonfigurovaný ako slave v replikačnom procese. "
-#~ "Chceli by ste ho <a href=\"%s\">nakonfigurovať</a>?"
-
-#, fuzzy
-#~ msgid "(or the local MySQL server"
-#~ msgstr "Nepodarilo sa pripojiť k zdroju"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that
you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "Je možné, že ste našli chybu v SQL syntaktickom analyzátore. Preskúmajte "
-#~ "podrobne SQL dopyt, predovšetkým správnosť umiestnenia úvodzoviek. Ďalšia "
-#~ "možnosť je, že nahrávate súbor s binárnymi dátami nezapísanými v "
-#~ "úvodzovkách. Môžete tiež vyskúšať použiť príkazový riadok MySQL na "
-#~ "odstránenie problému. Pokial stále máte problémy alebo syntaktický "
-#~ "analyzátor SQL stále hlási chybu v dopyte, ktorý v príkazovom riadku "
-#~ "funguje, prosím pokúste sa zredukovať dopyt na čo najmenší, v ktorom sa "
-#~ "problém ešte vyskytuje a ohláste chybu na stránke phpMyAdmina spolu so "
-#~ "sekciou VÝPIS uvedenú nižšie:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV dáta"
-
-#~ msgid "Copy"
-#~ msgstr "Kopírovať"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Odstrániť používateľov a znovunačítať práva."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Toto je najčistejšie riešenie, ale znovunačítanie práv môže chvíľu trvať."
-
-#~ msgid "has been altered."
-#~ msgstr "bola zmenená."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "Microsoft Excel 2000"
-
-#~ msgid "Internet Explorer does not support this function."
-#~ msgstr "Internet Explorer nepodporuje túto funkciu."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ ""Odstránení" používatelia budú mať k serveru ako predtým až do "
-#~ "znovunačítania práv."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Iba odstrániť používateľlov z tabuliek práv."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Povolí spúšťanie uložených procedúr. Nefunguje v tejto verzii MySQL."
-
-#~ msgid "Process list"
-#~ msgstr "Zoznam procesov"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Znovunačítať prístupové práva"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "Užívatelia budú mať stále právo USAGE (používanie) až do znovunačítania "
-#~ "práv."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "Natívne dáta MS Excel"
-
-#, fuzzy
-#~ msgid "Alter index(s)"
-#~ msgstr "Upraviť stĺpec/stĺpce"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Označiť všetko"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Označiť všetko"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Vložiť"
-
-#, fuzzy
-#~| msgid "Update Query"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Aktualizovať dopyt"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Zmazať"
-
-#~ msgid "%1$d row(s) affected."
-#~ msgstr "%1$d riadok/riadkov ovplyvnených."
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "Jan0"
-
-#~ msgid "Jan1"
-#~ msgstr "Jan1"
-
-#~ msgid "Jan2"
-#~ msgstr "Jan2"
diff --git a/po/sr(a)latin.po b/po/sr(a)latin.po
index 5261109..8f63b5b 100644
--- a/po/sr(a)latin.po
+++ b/po/sr(a)latin.po
@@ -4,15 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-30 23:47+0200\n"
-"Last-Translator: Michal <michal(a)cihar.com>\n"
+"PO-Revision-Date: 2010-07-22 02:27+0200\n"
+"Last-Translator: Marc Delisle <marc(a)infomarc.info>\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"
-"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:37 browse_foreigners.php:58
@@ -2811,20 +2811,18 @@ msgid "Table structure for table"
msgstr "Struktura tabele"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Sadržaj tabele __TABLE__"
+msgstr "Sadržaj tabele @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(nastavljeno)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Struktura tabele __TABLE__"
+msgstr "Struktura tabele @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8384,318 +8382,3 @@ msgstr "Promeni ime tabele u "
#~ msgstr ""
#~ "Ne mogu da koristim iconv ili libiconv ili recode_string funkcije iako "
#~ "ekstenzija prijavljuje da je učitana. Proverite vašu PHP konfiguraciju."
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Dodaj novo polje"
-
-#~ msgid "Field"
-#~ msgstr "Polje"
-
-#~ msgid "Records"
-#~ msgstr "Zapisi"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Polja razdvojena sa"
-
-#~ msgid "Fields"
-#~ msgstr "Polja"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "Polje %s je obrisano"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Prikaži JPEG slike na strani"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "\"zipovano\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "\"gzip-ovano\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "\"bzip-ovano\""
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "Dodaj komentar u zaglavlje (\\n razdvaja linije)"
-
-#, fuzzy
-#~ msgid "and"
-#~ msgstr "i"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Onemogućeno"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Omogućeno"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Popravi tabelu"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalendar"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "MySQL 4.0 kompatibilno"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr "Ne mogu da učitam podrazumevanu konfiguraciju iz: \"%1$s\""
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Napravi ključ na %s kolona"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Napravi tabelu"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "nema"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Osveži tabelu (\"FLUSH\")"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "Neispravan indeks servera: \"%s\""
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Opis"
-
-#, fuzzy
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "nema"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "Shema baze \"%s\" - Strana %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "Tabela \"%s\" ne postoji!"
-
-#~ msgid "running on %s"
-#~ msgstr "na serveru %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr "Faktor umanjenja je premali da bi shema stala na jednu stranu"
-
-#~ msgid ""
-#~ "Cannot start session without errors, please check errors given in your "
-#~ "PHP and/or webserver log file and configure your PHP installation "
-#~ "properly."
-#~ msgstr ""
-#~ "Ne mogu da pokrenem sesiju bez grešaka, molim proverite greške u PHP i/"
-#~ "ili dnevniku veb servera i propisno podesite vašu PHP instalaciju."
-
-#, fuzzy
-#~| msgid ""
-#~| "However on last run no data has been parsed, this usually means "
-#~| "phpMyAdmin won't be able to finish this import unless you increase php "
-#~| "time limits."
-#~ msgid ""
-#~ "However on last run no data has been parsed, this usually means "
-#~ "phpMyAdmin won"
-#~ msgstr ""
-#~ "Međutim, pri poslednjem pokretanju podaci nisu bili obrađeni, što obično "
-#~ "znači da phpMyAdmin neće biti u mogućnosti da završi ovaj uvoz osim ako "
-#~ "ne povećate vremenska ograničenja u PHP-u"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "nema"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "nema"
-
-#, fuzzy
-#~| msgid "Grant all privileges on wildcard name (username\\_%)"
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr "Daj sve privilegije na imenu sa džokerima (korisničko_ime\\_%)"
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "Tabela \"%s\" ne postoji!"
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr "Ne mogu da učitam podrazumevanu konfiguraciju iz: \"%1$s\""
-
-#, fuzzy
-#~| msgid "Invalid hostname for server %1$s. Please review your configuration."
-#~ msgid "Invalid hostname for server %1. Please review your configuration."
-#~ msgstr ""
-#~ "Neispravan naziv servera %1$s. Molimo proverite svoju konfiguraciju."
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "Greška pri preimenovanju tabele %1$s u %2$s"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "ne mogu da učitam ekstenziju %s,<br />molim proverite PHP konfiguraciju"
-
-#, fuzzy
-#~ msgid "(or the local MySQL server"
-#~ msgstr "Ne mogu da se prijavim na MySQL server"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "Postoji mogućnost da ste pronašli bag u SQL parseru. Molimo ispitajte "
-#~ "svoj upit pažljivo, i proverite da su navodnici ispravni i da ne "
-#~ "nedostaju. Ostali mogući razlozi greške mogu biti da ste poslali binarnu "
-#~ "datoteku van oblasti za običan tekst. Možete probati svoj upit u MySQL "
-#~ "sučelju komandne linije. Donja poruka o grešci MySQL servera, ako je ima, "
-#~ "može vam pomoći u otkrivanju problema. Ako i dalje imate probleme ili ako "
-#~ "parser ne uspeva tamo gde uspeva sučelje komandne linije, svedite svoj "
-#~ "SQL upit na jedan jedini upit koji stvara probleme i pošaljite nam "
-#~ "izveštaj o grešci sa delom koda u donjoj REZ sekciji:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV format"
-
-#~ msgid "Copy"
-#~ msgstr "Kopiraj"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Obriši korisnike i ponovo učitaj privilegije."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Ovo je najčistiji način, ali ponovno učitavanje privilegina može da "
-#~ "potraje."
-
-#~ msgid "has been altered."
-#~ msgstr "je promenjen(a)."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "Microsoft Excel 2000"
-
-#~ msgid "Internet Explorer does not support this function."
-#~ msgstr "Internet Explorer ne podržava ovu funkciju."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ ""Obrisani" korisnici će i dalje imati pristup serveru dok "
-#~ "privilegije ne budu ponovo učitane."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Samo obriši korisnike iz tabele privilegija."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Dozvoljava pokretanje sačuvanih procedura. Nema efekta u ovoj verziji "
-#~ "MySQL-a."
-
-#~ msgid "Process list"
-#~ msgstr "Lista procesa"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Ponovo učitaj privilegije"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "Korisnici će i dalje imati USAGE privilegije dok se privilegije ponovo ne "
-#~ "učitaju."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "Izvorni MS Excel podaci"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Izaberi sve"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Izaberi sve"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Novi zapis"
-
-#, fuzzy
-#~| msgid "Update Query"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Ažuriraj upit"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Obriši"
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "jan0"
-
-#~ msgid "Jan1"
-#~ msgstr "jan1"
-
-#~ msgid "Jan2"
-#~ msgstr "jan2"
diff --git a/po/tt.po b/po/tt.po
index 64c6d3b..cbbcae9 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-30 23:14+0200\n"
-"Last-Translator: Michal <michal(a)cihar.com>\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"
@@ -2777,20 +2777,18 @@ msgid "Table structure for table"
msgstr "Tüşämä tözeleşe"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "__TABLE__ atlı tüşämä eçtälege"
+msgstr "@TABLE@ atlı tüşämä eçtälege"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(dawamlı)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "__TABLE__ atlı tüşämä tözeleşe"
+msgstr "@TABLE@ atlı tüşämä tözeleşe"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8222,284 +8220,3 @@ msgstr "Tüşämä adın üzgärtü"
#~ msgstr ""
#~ "Can not use iconv nor libiconv nor recode_string function while extension "
#~ "reports to be loaded. Check your php configuration."
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Yaña alan östäw"
-
-#~ msgid "Field"
-#~ msgstr "Alan"
-
-#~ msgid "Records"
-#~ msgstr "Yazma"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Alan arasında bilge"
-
-#~ msgid "Fields"
-#~ msgstr "Alan"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "%s isemle alan beterelde"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "See image/jpeg: inline"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "\"ziple\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "\"gziple\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "\"bziple\""
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "Başlıqqa östämä açıqlama östäw (yullar \\n belän ayırıla)"
-
-#, fuzzy
-#~ msgid "and"
-#~ msgstr "Wä"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Sünek"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Açıq"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Tüşämä tözätü"
-
-#~ msgid "Calendar"
-#~ msgstr "Täqwim"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "MySQL 4.0 öçen yaraqlı"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr "Töp köyläneşen yökläp bulmadı: \"%1$s\""
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "%s alannan tezeş yaratu"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Yaña Bit yaratu"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Buş"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Tüşäwne awdar (\"FLUSH\")"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "Serverdäge \"%s\" digän tezeleş yaraqsız"
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Açıqlama"
-
-#, fuzzy
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Buş"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "\"%s\" biremlek tözeleşe - %s. bit"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "\"%s\" atlı tüşämä yuq äle!"
-
-#~ msgid "running on %s"
-#~ msgstr "Sanaq: %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr "Bu sxemnı ber bittä urnaştıru öçen, olılıq sanı bik keçe"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Buş"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Buş"
-
-#, fuzzy
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr "\"%s\" biremlege öçen xoquqlar tikşerü."
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "\"%s\" atlı tüşämä yuq äle!"
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr "Töp köyläneşen yökläp bulmadı: \"%1$s\""
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "%1$s atlı tüşämä adın %2$s itep üzgärtep bulmadı"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr "\"%s\" yöklämäsen cibärep bulmadı,<br />PHP Caylawın tikşerçe"
-
-#, fuzzy
-#~ msgid "(or the local MySQL server"
-#~ msgstr "MySQL servergä totaşılıp bulmadı"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "below, if there is any, may also help you in diagnosing the problem. If "
-#~ "you still have problems or if the parser fails where the command line "
-#~ "interface succeeds, please reduce your SQL query input to the single "
-#~ "query that causes problems, and submit a bug report with the data chunk "
-#~ "in the CUT section below:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV bireme"
-
-#~ msgid "Copy"
-#~ msgstr "Kübäyt"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Betergäç, xoquqlarnı yañadan yöklise."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-
-#~ msgid "has been altered."
-#~ msgstr "üzgärtelde."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "Microsoft Excel 2000"
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Xoquqlar tüşämäsennän genä beteräse."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr "Eçke prosedur cibärü xoquqı; MySQL'nıñ bu söremendä yuq äle ul."
-
-#~ msgid "Process list"
-#~ msgstr "Proses isemlege"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Xoquqlarnı qabat yökläw"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "MS Excel tözeleşendä"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Saylap Beter"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Saylap Beter"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Östäw"
-
-#, fuzzy
-#~| msgid "Update Query"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Sorawnı Yañart"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Sal"
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "Ğın0"
-
-#~ msgid "Jan1"
-#~ msgstr "Ğın1"
-
-#~ msgid "Jan2"
-#~ msgstr "Ğın2"
diff --git a/po/uz.po b/po/uz.po
index cb77a12..7d98ba0 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -4,14 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-12 09:20+0100\n"
-"Last-Translator: Automatically generated\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: \n"
+"Language: uz\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.1\n"
#: browse_foreigners.php:37 browse_foreigners.php:58
#: libraries/display_tbl.lib.php:416 server_privileges.php:1506
@@ -2857,20 +2858,18 @@ msgid "Table structure for table"
msgstr "Жадвал тузилиши"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr " __TABLE__ жадвалининг мундарижаси"
+msgstr "@TABLE@ жадвалининг мундарижаси"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(давоми)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr " __TABLE__ жадвалининг тузилиши"
+msgstr " @TABLE@ жадвалининг тузилиши"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8723,380 +8722,3 @@ msgstr "Кўриниш номини ўзгартириш"
#~ msgid "Default character set"
#~ msgstr "Кодировка"
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Янги майдон қўшиш"
-
-#~ msgid "Field"
-#~ msgstr "Майдон"
-
-#~ msgid "Records"
-#~ msgstr "Ёзувлар сони"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Майдонлар қуйидаги белги билан бўлинган "
-
-#~ msgid "Fields"
-#~ msgstr "Майдонлар"
-
-#~ msgid "Add %s field(s)"
-#~ msgstr "\"%s\" майдон қўшиш"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "\"%s\" майдони ўчирилди"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr ""
-#~ "Устига босилганда расмни каталаштириб кўриш мумкин бўлган кичрайтирилган "
-#~ "пиктограммани кўрсатиш. Параметр сифатида расмнинг пикселларда берилган "
-#~ "максимал бўйи ва энини белгилаш мумкин. Томонларнинг асл нисбати "
-#~ "сақланади."
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "zip"
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "gzip"
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "bzip ёрдамида сиқилган"
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr ""
-#~ "Сарлавҳага ўз изоҳингизни қўшиш (\\n белгиси сатрдан сатрга ўтказади)"
-
-#~ msgid "and"
-#~ msgstr "ва"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Фаолсизлаштирилган"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Фаоллаштирилган"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Созлаш"
-
-#~ msgid "Calendar"
-#~ msgstr "Тақвим"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "MySQL 4.0 га мос"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr " \"%1$s\" файлидан андоза конфигурацияни юклаб бўлмади."
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "\"%s\" майдон учун индекс тузиш"
-
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Жадвал тузиш"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Йўқ"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Жадвал кешини янгилаш (\"FLUSH\")"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "Сервер рақами нотўғри: \"%s\""
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Тавсиф"
-
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Йўқ"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "\"%s\" маълумотлар базаси тузилиши - \"%s\" саҳифа"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "\"%s\" жадвали мавжуд эмас!"
-
-#~ msgid ""
-#~ "This MySQL server works as %s in <b>replication</b> process. For further "
-#~ "information about replication status on the server, please visit the <a "
-#~ "href=\"#replication\">replication section</a>."
-#~ msgstr ""
-#~ "Ушбу MySQL сервери <b>репликация</b> жараёнида \\\"%s\\\" "
-#~ "сифатида ишлайди. Сервернинг репликация статуси ҳақида батафсил маълумот "
-#~ "учун, <a href=\"#replication\">репликация бўлими</a>га киринг."
-
-#~ msgid "running on %s"
-#~ msgstr "\"%s\" серверда ишламоқда"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr "Схема битта саҳифага сиғмайди. Масштабни кичрайтириш зарур."
-
-#~ msgid ""
-#~ "Cannot start session without errors, please check errors given in your "
-#~ "PHP and/or webserver log file and configure your PHP installation "
-#~ "properly."
-#~ msgstr ""
-#~ "Сессия механизми ишида хатолик юз берди. PHP ва/ёки Веб-сервер журнали "
-#~ "текшириб кўринг ва керакли тузатишлар киритинг."
-
-#, fuzzy
-#~| msgid "Import currencies ($5.00 to 5.00)"
-#~ msgid "Import currencies (.00 to 5.00)"
-#~ msgstr "Пул бирликларини импорт қилиш (масалан, $5.00 ни 5.00 га)"
-
-#, fuzzy
-#~| msgid ""
-#~| "However on last run no data has been parsed, this usually means "
-#~| "phpMyAdmin won't be able to finish this import unless you increase php "
-#~| "time limits."
-#~ msgid ""
-#~ "However on last run no data has been parsed, this usually means "
-#~ "phpMyAdmin won"
-#~ msgstr ""
-#~ "Охирги ишга тушириш бўлишига қарамасдан, маълумотлар қайта ишланмади. "
-#~ "Одатда, бу ҳол, php-сценарийлар учун ажратилган вақт оширилмагунча "
-#~ "phpMyAdmin дастури импорт жараёнини якунла олмаслигини билдиради."
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Йўқ"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Йўқ"
-
-#, fuzzy
-#~| msgid "Grant all privileges on wildcard name (username\\_%)"
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr ""
-#~ "(фойдаланувчи\\_%) шаблонига тўғри келадиган барча маълумотлар базаларига "
-#~ "тўлиқ привилегияларни бериш."
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "\"%s\" жадвали мавжуд эмас!"
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr " \"%1$s\" файлидан андоза конфигурацияни юклаб бўлмади."
-
-#, fuzzy
-#~| msgid "Invalid hostname for server %1$s. Please review your configuration."
-#~ msgid "Invalid hostname for server %1. Please review your configuration."
-#~ msgstr ""
-#~ " %1$s сервери учун нотўғри хост номи кўрсатилган. phpMyAdmin "
-#~ "конфигурацион файлида белгиланган созлашларни тўғирланг."
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "%1$s жадвалини %2$s деб қайта номлашда хатолик"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "[a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] кенгайтмани юклаб "
-#~ "бўлмади! PHP конфигурациясини созланг."
-
-#, fuzzy
-#~| msgid ""
-#~| "This server is not configured as master in a replication process. Would "
-#~| "you like to <a href=\"%s\">configure</a> it?"
-#~ msgid ""
-#~ "This server is not configured as master in a replication process. Would "
-#~ "you like to <a href=%s>configure</a> it?"
-#~ msgstr ""
-#~ "Ушбу сервер репликация жараёнида \"бош сервер\" деб конфигурация "
-#~ "қилинмаган. Сиз уни <a href=\"%s\">конфигурация</a> қилмоқчимисиз?"
-
-#, fuzzy
-#~| msgid ""
-#~| "This server is not configured as slave in a replication process. Would "
-#~| "you like to <a href=\"%s\">configure</a> it?"
-#~ msgid ""
-#~ "This server is not configured as slave in a replication process. Would "
-#~ "you like to <a href=%s>configure</a> it?"
-#~ msgstr ""
-#~ "Ушбу сервер репликация жараёнида \"тобе сервер\" деб конфигурация "
-#~ "қилинмаган. Сиз уни <a href=\"%s\">конфигурация</a> қилмоқчимисиз?"
-
-#, fuzzy
-#~| msgid "Could not connect to MySQL server"
-#~ msgid "(or the local MySQL server"
-#~ msgstr "MySQL-серверга уланиб бўлмади"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "SQL ишида хатолик юз берди. Сўров тўғри тузилганлигига, унда хато ва "
-#~ "ёпилмаган қавс(лар) ёки қўштирноқ(лар) йўқлигига ишонч ҳосил қилинг. "
-#~ "Шунингдек, агар файл юкланган бўлса, унинг матнида қўштирноқ ичига "
-#~ "олинмаган бинар (иккилик) маълумотлар бўлиши мумкин. Сўровни MySQL "
-#~ "буйруқлар сатридан бажариб кўринг. Агар хато мавжуд бўлса, пастда MySQL "
-#~ "сервер хатоликни кўрсатади ва ўша хабар муаммо ечимини топишга ёрдам "
-#~ "беради. Агар муаммо ҳал бўлмаса, хатоликка олиб келаётган сўров қисмини "
-#~ "аниқланг ва қуйида CUT секциясидаги маълумотлар билан қўшиб, хато "
-#~ "тавсифларини ишлаб чиқарувчиларга юборинг:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV"
-
-#~ msgid "Copy"
-#~ msgstr "Нусха кўчириш"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Барча фойдаланувчиларни ўчириш ва привилегияларни қайта юклаш."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Бу энг яхши усул, лекин привилегияларни қайта юклаш вақт талаб этиши "
-#~ "мумкин."
-
-#~ msgid "has been altered."
-#~ msgstr " ўзгартирилди."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "Microsoft Excel 2000"
-
-#~ msgid "Internet Explorer does not support this function."
-#~ msgstr "Internet Explorer дастурида ушбу функция мавжуд эмас."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ "Привилегиялар қайта юкланмагунча \"ўчирилган\" фойдаланувчилар серверга "
-#~ "кириш ҳуқуқига эга бўладилар."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Фақат привилегиялар жадвалидан фойдаланувчини ўчириш."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Сақланадиган муолажаларни бажаришга рухсат беради (MySQL-сервернинг ушбу "
-#~ "версияда бундай хусусият мавжуд эмас)"
-
-#~ msgid "Process list"
-#~ msgstr "Жараёнлар рўйхати"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Привилегияларни қайта юклаш"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "Привилегиялар қайта юклангунга қадар, фойдаланувчиларда USAGE каби глобал "
-#~ "привилегиялар сақланиб қолинади."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "MS Excel формати"
-
-#~ msgid "Alter index(s)"
-#~ msgstr "Индек(лар)ни ўзгартириш"
-
-#~ msgid "Tracking Mechanism"
-#~ msgstr "Кузатиш механизми"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Барчасини белгилаш"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Барчасини белгилаш"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Қўйиш"
-
-#, fuzzy
-#~| msgid "Updated"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Янгиланди"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Ўчириш"
-
-#~ msgid "%1$d row(s) affected."
-#~ msgstr "%1$d та қаторларга таъсир этди."
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "Янв0"
-
-#~ msgid "Jan1"
-#~ msgstr "Янв1"
-
-#~ msgid "Jan2"
-#~ msgstr "Янв2"
-
-#~ msgid ""
-#~ "Structure Difference' ;\n"
-#~ "$strStructureForView = 'Structure for view"
-#~ msgstr ""
-#~ "Тузилишдаги фарқ' ;\n"
-#~ "$strStructureForView = 'Намойиш этиш учун тузилма"
diff --git a/po/uz(a)latin.po b/po/uz(a)latin.po
index f4319b0..4ca4f10 100644
--- a/po/uz(a)latin.po
+++ b/po/uz(a)latin.po
@@ -4,14 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-12 09:20+0100\n"
-"Last-Translator: Automatically generated\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: \n"
+"Language: uz@latin\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.1\n"
#: browse_foreigners.php:37 browse_foreigners.php:58
#: libraries/display_tbl.lib.php:416 server_privileges.php:1506
@@ -2870,20 +2871,18 @@ msgid "Table structure for table"
msgstr "Jadval tuzilishi"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr " __TABLE__ jadvalining mundarijasi"
+msgstr " @TABLE@ jadvalining mundarijasi"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(davomi)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr " __TABLE__ jadvalining tuzilishi"
+msgstr " @TABLE@ jadvalining tuzilishi"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8788,384 +8787,3 @@ msgstr "Ko‘rinish nomini o‘zgartirish"
#~ msgid "Default character set"
#~ msgstr "Kodirovka"
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Yangi maydon qo‘shish"
-
-#~ msgid "Field"
-#~ msgstr "Maydon"
-
-#~ msgid "Records"
-#~ msgstr "Yozuvlar soni"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Maydonlar quyidagi belgi bilan bo‘lingan "
-
-#~ msgid "Fields"
-#~ msgstr "Maydonlar"
-
-#~ msgid "Add %s field(s)"
-#~ msgstr "\"%s\" maydon qo‘shish"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "\"%s\" maydoni o‘chirildi"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr ""
-#~ "Ustiga bosilganda rasmni katalashtirib ko‘rish mumkin bo‘lgan "
-#~ "kichraytirilgan piktogrammani ko‘rsatish. Parametr sifatida rasmning "
-#~ "piksellarda berilgan maksimal bo‘yi va enini belgilash mumkin. "
-#~ "Tomonlarning asl nisbati saqlanadi."
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "zip"
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "gzip"
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "bzip yordamida siqilgan"
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr ""
-#~ "Sarlavhaga o‘z izohingizni qo‘shish (\\n belgisi satrdan satrga o‘tkazadi)"
-
-#~ msgid "and"
-#~ msgstr "va"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Faolsizlashtirilgan"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Faollashtirilgan"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Sozlash"
-
-#~ msgid "Calendar"
-#~ msgstr "Taqvim"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "MySQL 4.0 ga mos"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr " \"%1$s\" faylidan andoza konfiguratsiyani yuklab bo‘lmadi."
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "\"%s\" maydon uchun indeks tuzish"
-
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Jadval tuzish"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Yo‘q"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Jadval keshini yangilash (\"FLUSH\")"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "Server raqami noto‘g‘ri: \"%s\""
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Tavsif"
-
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Yo‘q"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "\"%s\" ma`lumotlar bazasi tuzilishi - \"%s\" sahifa"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "\"%s\" jadvali mavjud emas!"
-
-#~ msgid ""
-#~ "This MySQL server works as %s in <b>replication</b> process. For further "
-#~ "information about replication status on the server, please visit the <a "
-#~ "href=\"#replication\">replication section</a>."
-#~ msgstr ""
-#~ "Ushbu MySQL serveri <b>replikatsiya</b> jarayonida \"%s\" "
-#~ "sifatida ishlaydi. Serverning replikatsiya statusi haqida batafsil "
-#~ "ma`lumot uchun, <a href=\"#replication\">replikatsiya bo‘limi</"
-#~ "a>ga kiring."
-
-#~ msgid "running on %s"
-#~ msgstr "\"%s\" serverda ishlamoqda"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr "Sxema bitta sahifaga sig‘maydi. Masshtabni kichraytirish zarur."
-
-#~ msgid ""
-#~ "Cannot start session without errors, please check errors given in your "
-#~ "PHP and/or webserver log file and configure your PHP installation "
-#~ "properly."
-#~ msgstr ""
-#~ "Sessiya mexanizmi ishida xatolik yuz berdi. PHP va/yoki Veb-server "
-#~ "jurnali tekshirib ko‘ring va kerakli tuzatishlar kiriting."
-
-#, fuzzy
-#~| msgid "Import currencies ($5.00 to 5.00)"
-#~ msgid "Import currencies (.00 to 5.00)"
-#~ msgstr "Pul birliklarini import qilish (masalan, $5.00 ni 5.00 ga)"
-
-#, fuzzy
-#~| msgid ""
-#~| "However on last run no data has been parsed, this usually means "
-#~| "phpMyAdmin won't be able to finish this import unless you increase php "
-#~| "time limits."
-#~ msgid ""
-#~ "However on last run no data has been parsed, this usually means "
-#~ "phpMyAdmin won"
-#~ msgstr ""
-#~ "Oxirgi ishga tushirish bo‘lishiga qaramasdan, ma`lumotlar qayta "
-#~ "ishlanmadi. Odatda, bu hol, php-ssenariylar uchun ajratilgan vaqt "
-#~ "oshirilmaguncha phpMyAdmin dasturi import jarayonini yakunla olmasligini "
-#~ "bildiradi."
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Yo‘q"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Yo‘q"
-
-#, fuzzy
-#~| msgid "Grant all privileges on wildcard name (username\\_%)"
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr ""
-#~ "(foydalanuvchi\\_%) shabloniga to‘g‘ri keladigan barcha ma`lumotlar "
-#~ "bazalariga to‘liq privilegiyalarni berish."
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "\"%s\" jadvali mavjud emas!"
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr " \"%1$s\" faylidan andoza konfiguratsiyani yuklab bo‘lmadi."
-
-#, fuzzy
-#~| msgid "Invalid hostname for server %1$s. Please review your configuration."
-#~ msgid "Invalid hostname for server %1. Please review your configuration."
-#~ msgstr ""
-#~ " %1$s serveri uchun noto‘g‘ri xost nomi ko‘rsatilgan. phpMyAdmin "
-#~ "konfiguratsion faylida belgilangan sozlashlarni to‘g‘irlang."
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "%1$s jadvalini %2$s deb qayta nomlashda xatolik"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "[a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] kengaytmani yuklab "
-#~ "bo‘lmadi! PHP konfiguratsiyasini sozlang."
-
-#, fuzzy
-#~| msgid ""
-#~| "This server is not configured as master in a replication process. Would "
-#~| "you like to <a href=\"%s\">configure</a> it?"
-#~ msgid ""
-#~ "This server is not configured as master in a replication process. Would "
-#~ "you like to <a href=%s>configure</a> it?"
-#~ msgstr ""
-#~ "Ushbu sеrvеr rеplikatsiya jarayonida \"bosh sеrvеr\" dеb konfiguratsiya "
-#~ "qilinmagan. Siz uni <a href=\"%s\">konfiguratsiya</a> qilmoqchimisiz?"
-
-#, fuzzy
-#~| msgid ""
-#~| "This server is not configured as slave in a replication process. Would "
-#~| "you like to <a href=\"%s\">configure</a> it?"
-#~ msgid ""
-#~ "This server is not configured as slave in a replication process. Would "
-#~ "you like to <a href=%s>configure</a> it?"
-#~ msgstr ""
-#~ "Ushbu sеrvеr rеplikatsiya jarayonida \"tobе sеrvеr\" dеb konfiguratsiya "
-#~ "qilinmagan. Siz uni <a href=\"%s\">konfiguratsiya</a> qilmoqchimisiz?"
-
-#, fuzzy
-#~| msgid "Could not connect to MySQL server"
-#~ msgid "(or the local MySQL server"
-#~ msgstr "MySQL-serverga ulanib bo‘lmadi"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "SQL ishida xatolik yuz berdi. So‘rov to‘g‘ri tuzilganligiga, unda xato va "
-#~ "yopilmagan qavs(lar) yoki qo‘shtirnoq(lar) yo‘qligiga ishonch hosil "
-#~ "qiling. Shuningdek, agar fayl yuklangan bo‘lsa, uning matnida qo‘shtirnoq "
-#~ "ichiga olinmagan binar (ikkilik) ma`lumotlar bo‘lishi mumkin. So‘rovni "
-#~ "MySQL buyruqlar satridan bajarib ko‘ring. Agar xato mavjud bo‘lsa, pastda "
-#~ "MySQL server xatolikni ko‘rsatadi va o‘sha xabar muammo yechimini "
-#~ "topishga yordam beradi. Agar muammo hal bo‘lmasa, xatolikka olib "
-#~ "kelayotgan so‘rov qismini aniqlang va quyida CUT seksiyasidagi "
-#~ "ma`lumotlar bilan qo‘shib, xato tavsiflarini ishlab chiqaruvchilarga "
-#~ "yuboring:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV"
-
-#~ msgid "Copy"
-#~ msgstr "Nusxa ko‘chirish"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr ""
-#~ "Barcha foydalanuvchilarni o‘chirish va privilegiyalarni qayta yuklash."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Bu eng yaxshi usul, lekin privilegiyalarni qayta yuklash vaqt talab "
-#~ "etishi mumkin."
-
-#~ msgid "has been altered."
-#~ msgstr " o‘zgartirildi."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "Microsoft Excel 2000"
-
-#~ msgid "Internet Explorer does not support this function."
-#~ msgstr "Internet Explorer dasturida ushbu funksiya mavjud emas."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ "Privilegiyalar qayta yuklanmaguncha \"o‘chirilgan\" foydalanuvchilar "
-#~ "serverga kirish huquqiga ega bo‘ladilar."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Faqat privilegiyalar jadvalidan foydalanuvchini o‘chirish."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Saqlanadigan muolajalarni bajarishga ruxsat beradi (MySQL-serverning "
-#~ "ushbu versiyada bunday xususiyat mavjud emas)"
-
-#~ msgid "Process list"
-#~ msgstr "Jarayonlar ro‘yxati"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Privilegiyalarni qayta yuklash"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "Privilegiyalar qayta yuklangunga qadar, foydalanuvchilarda USAGE kabi "
-#~ "global privilegiyalar saqlanib qolinadi."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "MS Excel formati"
-
-#~ msgid "Alter index(s)"
-#~ msgstr "Indеk(lar)ni o‘zgartirish"
-
-#~ msgid "Tracking Mechanism"
-#~ msgstr "Kuzatish mеxanizmi"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Barchasini belgilash"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Barchasini belgilash"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Qo‘yish"
-
-#, fuzzy
-#~| msgid "Updated"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Yangilandi"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "O‘chirish"
-
-#~ msgid "%1$d row(s) affected."
-#~ msgstr "%1$d ta qatorlarga ta`sir etdi."
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "Yanv0"
-
-#~ msgid "Jan1"
-#~ msgstr "Yanv1"
-
-#~ msgid "Jan2"
-#~ msgstr "Yanv2"
-
-#~ msgid ""
-#~ "Structure Difference' ;\n"
-#~ "$strStructureForView = 'Structure for view"
-#~ msgstr ""
-#~ "Tuzilishdagi farq' ;\n"
-#~ "$strStructureForView = 'Namoyish etish uchun tuzilma"
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5850-g873ad99
by Michal Čihař 21 Jul '10
by Michal Čihař 21 Jul '10
21 Jul '10
The branch, master has been updated
via 873ad99ed2fa8e5a46f1a92faccb8e163c0f0bc3 (commit)
via c3c70ff3b760adcb109da371410d2de3febbdaa0 (commit)
via 585379dc85320d7aab49c8b06d2a42e08729a4cf (commit)
via 76cfd130423efe5feb650c684229687a9e2257d3 (commit)
via ab960b6b45b26e6c22d084b3a81cb12ae7d7543b (commit)
via c31fc0027e5c93a75f32a2d8509d51c7cfc0bdef (commit)
via 94e0d48733bf1702bff79b572dcfd901ea8fa7a0 (commit)
via 94e8d0df46ebbb64e1bb283259fcfc6b19533a70 (commit)
via bdc0570112e510d8b73042fff9f534553553f8d2 (commit)
via ff134e21a17424b26aa233a04bffdefb1f9ab4a9 (commit)
via b92b495ab3c3748e7259d9246976593e09f8598b (commit)
via d4277740fbb5a0bc78f06f0a235ac9312ce35305 (commit)
via 172597fe851202f925ecac6f8033311841fc9df6 (commit)
via f71647d2534234f7a322f7d3a4a225c14c1f98a8 (commit)
via 611f403da086f2778eb6bceba08e3a83d8d4d0d5 (commit)
via 5e5e97270d780fa65221fb965dfec629c27884f4 (commit)
via b562c0117c6627445bc89ae0cb9911e3442c2ac5 (commit)
via fee627c4327219c2ebe47c375d1ba12cf598cae1 (commit)
via 3b5a6c9e67d80dff92fe450c223539d35c1f466f (commit)
via 7c82181351141382fb2f4cdfe7a82e1aa1293f7d (commit)
via 4d13e4724833d319f3c78461ff830eb34d259199 (commit)
via cbc09581390e1e4e6af120421fc92edaa76a76d6 (commit)
via cc64cda7aa97e528aefc5fe2e9bd3ce6c6ab72a6 (commit)
via 15b222438cf2552980d27f0a9cb03d5e9ae673cd (commit)
from ffacfbed5641c1ea9582030a39e7af0e07891717 (commit)
- Log -----------------------------------------------------------------
commit 873ad99ed2fa8e5a46f1a92faccb8e163c0f0bc3
Merge: ffacfbed5641c1ea9582030a39e7af0e07891717 c3c70ff3b760adcb109da371410d2de3febbdaa0
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 16:40:09 2010 +0200
Merge remote branch 'pootle/master'
Conflicts:
po/da.po
po/de.po
po/en_GB.po
po/eu.po
po/fr.po
po/gl.po
po/hr.po
po/sq.po
po/sv.po
commit c3c70ff3b760adcb109da371410d2de3febbdaa0
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:55:32 2010 +0200
Translation update done using Pootle.
commit 585379dc85320d7aab49c8b06d2a42e08729a4cf
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:55:24 2010 +0200
Translation update done using Pootle.
commit 76cfd130423efe5feb650c684229687a9e2257d3
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:54:40 2010 +0200
Translation update done using Pootle.
commit ab960b6b45b26e6c22d084b3a81cb12ae7d7543b
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:54:31 2010 +0200
Translation update done using Pootle.
commit c31fc0027e5c93a75f32a2d8509d51c7cfc0bdef
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:53:49 2010 +0200
Translation update done using Pootle.
commit 94e0d48733bf1702bff79b572dcfd901ea8fa7a0
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:53:37 2010 +0200
Translation update done using Pootle.
commit 94e8d0df46ebbb64e1bb283259fcfc6b19533a70
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:51:30 2010 +0200
Translation update done using Pootle.
commit bdc0570112e510d8b73042fff9f534553553f8d2
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:51:17 2010 +0200
Translation update done using Pootle.
commit ff134e21a17424b26aa233a04bffdefb1f9ab4a9
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:50:44 2010 +0200
Translation update done using Pootle.
commit b92b495ab3c3748e7259d9246976593e09f8598b
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:50:35 2010 +0200
Translation update done using Pootle.
commit d4277740fbb5a0bc78f06f0a235ac9312ce35305
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:48:19 2010 +0200
Translation update done using Pootle.
commit 172597fe851202f925ecac6f8033311841fc9df6
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:48:09 2010 +0200
Translation update done using Pootle.
commit f71647d2534234f7a322f7d3a4a225c14c1f98a8
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:45:07 2010 +0200
Translation update done using Pootle.
commit 611f403da086f2778eb6bceba08e3a83d8d4d0d5
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:44:55 2010 +0200
Translation update done using Pootle.
commit 5e5e97270d780fa65221fb965dfec629c27884f4
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:43:00 2010 +0200
Translation update done using Pootle.
commit b562c0117c6627445bc89ae0cb9911e3442c2ac5
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:42:42 2010 +0200
Translation update done using Pootle.
commit fee627c4327219c2ebe47c375d1ba12cf598cae1
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:42:24 2010 +0200
Translation update done using Pootle.
commit 3b5a6c9e67d80dff92fe450c223539d35c1f466f
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:41:30 2010 +0200
Translation update done using Pootle.
commit 7c82181351141382fb2f4cdfe7a82e1aa1293f7d
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:41:16 2010 +0200
Translation update done using Pootle.
commit 4d13e4724833d319f3c78461ff830eb34d259199
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:40:55 2010 +0200
Translation update done using Pootle.
commit cbc09581390e1e4e6af120421fc92edaa76a76d6
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:40:06 2010 +0200
Translation update done using Pootle.
commit cc64cda7aa97e528aefc5fe2e9bd3ce6c6ab72a6
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:39:57 2010 +0200
Translation update done using Pootle.
commit 15b222438cf2552980d27f0a9cb03d5e9ae673cd
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jul 21 14:39:37 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/da.po | 292 ++-------------------------------------------
po/de.po | 45 +------
po/en_GB.po | 12 +-
po/eu.po | 259 +--------------------------------------
po/fr.po | 23 ++--
po/gl.po | 391 +---------------------------------------------------------
po/hr.po | 338 ++-------------------------------------------------
po/sq.po | 115 +-----------------
po/sv.po | 343 +--------------------------------------------------
9 files changed, 57 insertions(+), 1761 deletions(-)
diff --git a/po/da.po b/po/da.po
index a9185fb..e7b7d50 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4,14 +4,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-12 09:13+0100\n"
-"Last-Translator: Automatically generated\n"
+"POT-Creation-Date: 2010-07-21 10:29+0200\n"
+"PO-Revision-Date: 2010-07-21 14:55+0200\n"
+"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: danish <da(a)li.org>\n"
-"Language: \n"
+"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
#: browse_foreigners.php:37 browse_foreigners.php:58
#: libraries/display_tbl.lib.php:416 server_privileges.php:1506
@@ -2794,20 +2796,18 @@ msgid "Table structure for table"
msgstr "Struktur-dump for tabellen"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Indhold af tabel __TABLE__"
+msgstr "Indhold af tabel @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(fortsættes)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Struktur for tabel __TABLE__"
+msgstr "Struktur for tabel @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8301,279 +8301,3 @@ msgstr ""
#~ msgstr ""
#~ "Kan ikke bruge iconv ejheller libiconv eller recode_string funktionen "
#~ "omend udvidelsen ser ud til at være indlæst. Check din PHP-konfiguration."
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Tilføj nyt felt"
-
-#~ msgid "Field"
-#~ msgstr "Feltnavn"
-
-#~ msgid "Records"
-#~ msgstr "Poster"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Felter afsluttet med"
-
-#~ msgid "Fields"
-#~ msgstr "Felter"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "Felt %s er slettet"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Se under image/jpeg: inline"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "\"zippet\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "\"gzipped\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "\"bzipped\""
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "Tilføj tilpassede kommentarer i headeren (\\n deler linjer)"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalender"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "MySQL 4.0 kompatibel"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr "Kunne ikke indlæse standardkonfiguration fra: \"%1$s\""
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Dan et indeks på %s kolonner"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Flush tabellen (\"FLUSH\")"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "Ugyldigt server indeks: \"%s\""
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Beskrivelse"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "Skematik for databasen \"%s\" - Side %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "Tabellen \"%s\" findes ikke!"
-
-#~ msgid "running on %s"
-#~ msgstr "kører på %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr ""
-#~ "Skaleringsfaktoren er for lille til at tilpasse skematikken til en side"
-
-#~ msgid ""
-#~ "Cannot start session without errors, please check errors given in your "
-#~ "PHP and/or webserver log file and configure your PHP installation "
-#~ "properly."
-#~ msgstr ""
-#~ "Kan ikke starte session uden fejl, tjek venligst fejl i din PHP og/eller "
-#~ "webserver log fil og konfigurer din PHP installation ordentligt."
-
-#, fuzzy
-#~| msgid ""
-#~| "However on last run no data has been parsed, this usually means "
-#~| "phpMyAdmin won't be able to finish this import unless you increase php "
-#~| "time limits."
-#~ msgid ""
-#~ "However on last run no data has been parsed, this usually means "
-#~ "phpMyAdmin won"
-#~ msgstr ""
-#~ "Desværre blev der ikke parset nogen data ved sidste kørsel, dette betyder "
-#~ "normalt at phpMyAdmin ikke vil være i stand til at gennemføre importen "
-#~ "med mindre du forøger PHP-tidsbegrænsningerne."
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Ingen"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Ingen"
-
-#, fuzzy
-#~| msgid "Grant all privileges on wildcard name (username\\_%)"
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr "Tildel alle privilegier til jokertegn-navn (brugernavn_%)"
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "Tabellen \"%s\" findes ikke!"
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr "Kunne ikke indlæse standardkonfiguration fra: \"%1$s\""
-
-#, fuzzy
-#~| msgid "Invalid hostname for server %1$s. Please review your configuration."
-#~ msgid "Invalid hostname for server %1. Please review your configuration."
-#~ msgstr ""
-#~ "Ugyldigt hostnavn for server %1$s. Gennemgå venligst din konfiguration."
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "Fejl ved omdøbning af tabel %1$s til %2$s"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "Kan ikke indlæse [a@http://php.net/%1$s@Dokumentation][em]%1$s[/em][/a] "
-#~ "udvidelsen. Tjek venligst din PHP-konfiguration."
-
-#, fuzzy
-#~| msgid "Cannot log in to the MySQL server"
-#~ msgid "(or the local MySQL server"
-#~ msgstr "Kan ikke logge ind på MySQL-serveren"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "Det er muligt at du har fundet en fejl i SQL-parseren. Undersøg venligst "
-#~ "din forespørgsel nøje, og check at anførselstegn er rigtige og ikke giver "
-#~ "konflikter. Andre fejlårsager kan være at du uploader en fil med binær "
-#~ "udenfor et lukket tekstområde. Du kan også prøve din forespørgsel i MySQL "
-#~ "kommandolinje-interfacet. MySQL-serverens fejlmelding der følger "
-#~ "herunder, hvis der er nogen, kan også hjælpe dig med at finde problemet. "
-#~ "Hvis du stadig har probemer eller hvis parseren fejler hvor "
-#~ "kommandolinjeinterfacet lykkes, reducer din SQL-forespørgselsinput til "
-#~ "den ene forespørgsel der forårsager problemet, og indsend en fejlrapport "
-#~ "med datablokken i KLIP-sektionen herunder:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV-data"
-
-#~ msgid "Copy"
-#~ msgstr "Kopi"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Slet brugerne og genindlæs privilegier bagefter."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Dette er den sikreste metode, men genindlæsning af privilegierne kan tage "
-#~ "noget tid."
-
-#~ msgid "has been altered."
-#~ msgstr "er ændret."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "Microsoft Excel 2000"
-
-#~ msgid "Internet Explorer does not support this function."
-#~ msgstr "Internet Explorer understøtter ikke denne funktion."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ "De "slettede" brugere kan stadig tilgå serveren som de plejer "
-#~ "indtil privilegierne genindlæses."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Bare slet brugerne fra privilegietabellerne."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Tillader kørsel af gemte procedurer; Har ingen effekt i denne MySQL-"
-#~ "version."
-
-#~ msgid "Process list"
-#~ msgstr "Procesliste"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Genindlæs privilegier"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "Bruger(e) vil fortsat have USAGE-privilegiet indtil privilegierne "
-#~ "genindlæses."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "Fødte MS Excel-data"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Vælg alle"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Vælg alle"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Indsæt"
-
-#, fuzzy
-#~| msgid "Update Query"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Opdater forespørgsel"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Slet"
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
diff --git a/po/de.po b/po/de.po
index 4bad9bc..4070a25 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-06-03 21:04+0200\n"
-"Last-Translator: <canin(a)in.com>\n"
+"PO-Revision-Date: 2010-07-21 14:45+0200\n"
+"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: german <de(a)li.org>\n"
"Language: de\n"
"MIME-Version: 1.0\n"
@@ -2785,20 +2785,18 @@ msgid "Table structure for table"
msgstr "Tabellenstruktur für Tabelle"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Inhalt der Tabelle __TABLE__"
+msgstr "Inhalt der Tabelle @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(Fortsetzung)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Struktur der Tabelle __TABLE__"
+msgstr "Struktur der Tabelle @TABLE@"
#: libraries/export/latex.php:26
msgid "
LaTeX"
@@ -8615,38 +8613,3 @@ msgstr "View umbenennen in"
#~ msgid "Default character set"
#~ msgstr "Standardzeichensatz"
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Neue Felder hinzufügen"
-
-#~ msgid "Field"
-#~ msgstr "Feld"
-
-#~ msgid "Records"
-#~ msgstr "Einträge"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Felder getrennt mit"
-
-#~ msgid "Fields"
-#~ msgstr "Felder"
-
-#~ msgid "Add %s field(s)"
-#~ msgstr "%s Felder hinzufügen"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "Spalte %s wurde entfernt."
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Siehe image/jpeg: inline"
-
-#~ msgid "zipped"
-#~ msgstr "Zip-komprimiert"
-
-#~ msgid "gzipped"
-#~ msgstr "GZip-komprimiert"
-
-#~ msgid "bzipped"
-#~ msgstr "BZip-komprimiert"
diff --git a/po/en_GB.po b/po/en_GB.po
index 7a66cfd..2348e4f 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-06-09 10:42+0200\n"
-"Last-Translator: Michal <michal(a)cihar.com>\n"
+"PO-Revision-Date: 2010-07-21 14:43+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"
@@ -1817,7 +1817,7 @@ msgstr "Operations"
#: libraries/core.lib.php:282 libraries/dbg/setup.php:21
#, php-format
msgid "The %s extension is missing. Please check your PHP configuration."
-msgstr ""
+msgstr "The %s extension is missing. Please check your PHP configuration."
#: libraries/db_events.inc.php:19 libraries/db_events.inc.php:21
#: libraries/export/sql.php:412
@@ -2733,20 +2733,18 @@ msgid "Table structure for table"
msgstr "Table structure for table"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Content of table __TABLE__"
+msgstr "Content of table @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(continued)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Structure of table __TABLE__"
+msgstr "Structure of table @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
diff --git a/po/eu.po b/po/eu.po
index 349f2ed..6148faa 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-31 10:40+0200\n"
-"Last-Translator: <hey_neken(a)mundurat.net>\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"
@@ -2761,20 +2761,18 @@ msgid "Table structure for table"
msgstr "Taularen egitura taula honentzat: "
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "__TABLE__ taularen edukina"
+msgstr "@TABLE@ taularen edukina"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr ""
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "__TABLE__ taularen egitura"
+msgstr "@TABLE@ taularen egitura"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8187,252 +8185,3 @@ msgstr "Taula berrizendatu izen honetara: "
#~ "Ezin dira erabili ez iconv, ez libiconv ezta recode_string funtzioa "
#~ "luzapenen txostena kargatzen den bitartean. Berpasatu php-ren "
#~ "konfigurazioa."
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Eremu berria gehitu"
-
-#~ msgid "Field"
-#~ msgstr "Eremua"
-
-#~ msgid "Records"
-#~ msgstr "Erregistroak"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Eremuak honekin bukatuak:"
-
-#~ msgid "Fields"
-#~ msgstr "Eremuak"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "%s eremua ezabatu da"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Ikusi image/jpeg: inline"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "\"zipatuta\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "\"gzip-ez trinkotuta\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "\"Bzip-ez trinkotua\""
-
-#~ msgid "and"
-#~ msgstr "eta"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Ezgaituta"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Gaituta"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Taula konpondu"
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Indize bat sortu %s zutabetan"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Orri berri bat sortu"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Batez"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Taularen cachea hustu (\"FLUSH\")"
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Deskribapena"
-
-#, fuzzy
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Batez"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "\"%s\" datu-basearen eskema- Orria %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "\"%s\" taula ez da existitzen!"
-
-#~ msgid "running on %s"
-#~ msgstr "hemen ibiltzen: %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr "Eskalaren faktorea txikiegia da eskema orri bakar batean azaltzeko"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Batez"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Batez"
-
-#, fuzzy
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr ""%s" datu-basearen pribilegioak egiaztatu."
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "\"%s\" taula ez da existitzen!"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "ezinezkoa %s luzapena kargatzea ,<br />mesedez, berpasatu zure PHPren "
-#~ "konfigurazioa."
-
-#, fuzzy
-#~ msgid "(or the local MySQL server"
-#~ msgstr "Ezinezkoa MySql zerbitzarian saioa hastea"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "Baliteke zuk SQL analizatzailean errore bat topatu izana. Mesedez arretaz "
-#~ "aztertu zure kontsulta, eta egiaztatu komatxoak zuzen erabiliak eta "
-#~ "bikoitiak direla. Akatsaren bestelako jatorri bat izan liteke zu datu "
-#~ "binariodun fitxategi bat igotzen saiatzea mugatutako testu-eremutik at. "
-#~ "Zure kontsulta MySQL-ren komando-interfazean ere exekutatzen saia "
-#~ "zenezake. MySql zeritzariak itzulitako erroreak, baldin badago, arazoa "
-#~ "diagnostikatzen lagundu zaitzake. Arazoak bere horretan badirau edota "
-#~ "komando-interfazeak arrakasta duen lekuan analizatzaileak huts egiten "
-#~ "badu, mesedez murriztu ezazu zure SQL kontsulta arazoa sortzen duen "
-#~ "zatira, eta bidal ezazu errore-txosten bat behean seinalaturiko MOZKETA "
-#~ "atalean datu-katea paratuz:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV datuak"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Erabiltzaileak ezabatu eta ondoren pribilegioak berkargatu."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Hau da biderik garbiena, baina pribilegioak berkargatzeak denbora behar "
-#~ "du."
-
-#~ msgid "has been altered."
-#~ msgstr "aldatua izan da."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ ""Ezabatutako" erabiltzaileak ohizko eran zerbitzarira sartzeko "
-#~ "aukera izaten jarraituko dute harik eta pribilegioak berkargatu arte."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Pribilegioen taulatik erabiltzaileak ezabatzea besterik ez duzu."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Gordetako prozedurak exekutatzea baimentzen du; Ez du eraginik MySQL "
-#~ "bertsio honetan."
-
-#~ msgid "Process list"
-#~ msgstr "Prozesuen zerrenda"
-
-#, fuzzy
-#~ msgid "Reload privileges"
-#~ msgstr "Pribilegio orokorrak"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "Erabiltzaileak USAGE pribilegioa izaten jarraituko dute harik eta "
-#~ "pribilegioak berkargatu arte."
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Dena hautatu"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Dena hautatu"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Txertatu"
-
-#, fuzzy
-#~| msgid "Update Query"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Kontsulta eguneratu"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Ezabatu"
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "Urt0"
-
-#~ msgid "Jan1"
-#~ msgstr "Urt1"
-
-#~ msgid "Jan2"
-#~ msgstr "Urt2"
diff --git a/po/fr.po b/po/fr.po
index 2bb9f08..070fc18 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-07-19 19:46+0200\n"
+"PO-Revision-Date: 2010-07-21 14:41+0200\n"
"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: french <fr(a)li.org>\n"
"Language: fr\n"
@@ -499,12 +499,12 @@ msgid "Search results for \"<i>%s</i>\" %s:"
msgstr "Résultats de la recherche de «<i>%s</i>» %s :"
#: db_search.php:242
-#, fuzzy, php-format
+#, php-format
#| msgid "%s match(es) inside table <i>%s</i>"
msgid "%s match inside table <i>%s</i>"
msgid_plural "%s matches inside table <i>%s</i>"
-msgstr[0] "%s occurence(s) dans la table <i>%s</i>"
-msgstr[1] "%s occurence(s) dans la table <i>%s</i>"
+msgstr[0] "%s occurence dans la table <i>%s</i>"
+msgstr[1] "%s occurences dans la table <i>%s</i>"
#: db_search.php:249 db_structure.php:76 db_structure.php:77
#: db_structure.php:89 db_structure.php:91 db_structure.php:102
@@ -523,12 +523,12 @@ msgid "Delete"
msgstr "Effacer"
#: db_search.php:267
-#, fuzzy, php-format
+#, php-format
#| msgid "<b>Total:</b> <i>%s</i> match(es)"
msgid "<b>Total:</b> <i>%s</i> match"
msgid_plural "<b>Total:</b> <i>%s</i> matches"
-msgstr[0] "<b>Total :</b> <i>%s</i> occurence(s)"
-msgstr[1] "<b>Total :</b> <i>%s</i> occurence(s)"
+msgstr[0] "<b>Total :</b> <i>%s</i> occurence"
+msgstr[1] "<b>Total :</b> <i>%s</i> occurences"
#: db_search.php:281
msgid "Search in database"
@@ -1014,7 +1014,6 @@ msgid "Choose column to display"
msgstr "Colonne descriptive"
#: js/messages.php:66
-#, fuzzy
#| msgid "Generate Password"
msgid "Generate password"
msgstr "Générer un mot de passe"
@@ -1842,7 +1841,7 @@ msgstr "Opérations"
#: libraries/core.lib.php:282 libraries/dbg/setup.php:21
#, php-format
msgid "The %s extension is missing. Please check your PHP configuration."
-msgstr ""
+msgstr "Il manque l'extension %s. Veuillez vérifier votre configuration PHP."
#: libraries/db_events.inc.php:19 libraries/db_events.inc.php:21
#: libraries/export/sql.php:412
@@ -2770,20 +2769,18 @@ msgid "Table structure for table"
msgstr "Structure de la table"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Contenu de la table __TABLE__"
+msgstr "Contenu de la table @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(suite)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Structure de la table __TABLE__"
+msgstr "Structure de la table @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
diff --git a/po/gl.po b/po/gl.po
index 651475f..11f4bcb 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -4,14 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-12 09:14+0100\n"
-"Last-Translator: Automatically generated\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: \n"
+"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
#: browse_foreigners.php:37 browse_foreigners.php:58
#: libraries/display_tbl.lib.php:416 server_privileges.php:1506
@@ -2854,20 +2855,18 @@ msgid "Table structure for table"
msgstr "Estrutura da táboa"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Contido da táboa __TABLE__"
+msgstr "Contido da táboa @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(continuado)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Estrutura da táboa __TABLE__"
+msgstr "Estrutura da táboa @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8702,379 +8701,3 @@ msgstr "Mudar o nome da táboa para"
#~ msgid "Default character set"
#~ msgstr "Conxunto de caracteres por omisión"
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Engadir un campo novo"
-
-#~ msgid "Field"
-#~ msgstr "Campo"
-
-#~ msgid "Records"
-#~ msgstr "Rexistros"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Os campos rematan por"
-
-#~ msgid "Fields"
-#~ msgstr "Campos"
-
-#~ msgid "Add %s field(s)"
-#~ msgstr "Engadir %s campo(s)"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "Eliminouse o campo %s"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Ver image/jpeg: na liña"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "comprimido no formato \"zip\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "comprimido no formato \"gzip\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "comprimido no formato \"bzip\""
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "Engadir un comentario propio no cabezallo (\\n liñas diferentes)"
-
-#~ msgid "and"
-#~ msgstr "e"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Desactivado"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Activado"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Reparar"
-
-#~ msgid "Calendar"
-#~ msgstr "Calendario"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "Compatíbel co MySQL 4.0"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr "Non se puido cargar a configuración desde: \"%1$s\""
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Crear un índice en %s colunas"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Crear táboas"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Ningunha"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Fechar a táboa (\"FLUSH\")"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "O índice do servidor non é válido: \"%s\""
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Descrición"
-
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Ningún"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "Esquema da base de datos \"%s\" - Páxina %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "Non existe a táboa \"%s\"."
-
-#~ msgid ""
-#~ "This MySQL server works as %s in <b>replication</b> process. For further "
-#~ "information about replication status on the server, please visit the <a "
-#~ "href=\"#replication\">replication section</a>."
-#~ msgstr ""
-#~ "Este servidor de MySQL server funciona como %s en proceso de "
-#~ "<b>replicación</b>. Para máis información acerca do estado de replicación "
-#~ "do servidor visite a <a href=\"#replication\">sección sobre replicación</"
-#~ "a>."
-
-#~ msgid "running on %s"
-#~ msgstr "en execución no servidor %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr ""
-#~ "O factor de redución é demasiado pequeno para que o esquema caiba nunha "
-#~ "única páxina"
-
-#~ msgid ""
-#~ "Cannot start session without errors, please check errors given in your "
-#~ "PHP and/or webserver log file and configure your PHP installation "
-#~ "properly."
-#~ msgstr ""
-#~ "Non se pode iniciar sesión con erros. Comprobe os erros que aparecen no "
-#~ "ficheiro de rexistro do seu servidor de PHP ou web e configure a súa "
-#~ "instalación PHP adecuadamente."
-
-#, fuzzy
-#~| msgid "Import currencies ($5.00 to 5.00)"
-#~ msgid "Import currencies (.00 to 5.00)"
-#~ msgstr "Importar as moedas ($5.00 a 5.00)"
-
-#, fuzzy
-#~| msgid ""
-#~| "However on last run no data has been parsed, this usually means "
-#~| "phpMyAdmin won't be able to finish this import unless you increase php "
-#~| "time limits."
-#~ msgid ""
-#~ "However on last run no data has been parsed, this usually means "
-#~ "phpMyAdmin won"
-#~ msgstr ""
-#~ "Porén, na última executación non se examinou nada de datos, o que "
-#~ "normalmente significa que o phpMyAdmin non poderá rematar esta "
-#~ "importación a non ser que lle incrementen os limites de tempo de php."
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Ningunha"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Ningunha"
-
-#, fuzzy
-#~| msgid "Grant all privileges on wildcard name (username\\_%)"
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr ""
-#~ "Conceder todos os privilexios para o nome con comodíns (username\\_%)"
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "Non existe a táboa \"%s\"."
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr "Non se puido cargar a configuración desde: \"%1$s\""
-
-#, fuzzy
-#~| msgid "Invalid hostname for server %1$s. Please review your configuration."
-#~ msgid "Invalid hostname for server %1. Please review your configuration."
-#~ msgstr ""
-#~ "O nome de servidor non é válido para o servidor %1$s. Revise a "
-#~ "configuración."
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "Houbo un erro ao mudarlle o nome á táboa %1$s para %2$s"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "Non se pode cargar o engadido %s.<br />Verifique a configuración do PHP."
-
-#, fuzzy
-#~| msgid ""
-#~| "This server is not configured as master in a replication process. Would "
-#~| "you like to <a href=\"%s\">configure</a> it?"
-#~ msgid ""
-#~ "This server is not configured as master in a replication process. Would "
-#~ "you like to <a href=%s>configure</a> it?"
-#~ msgstr ""
-#~ "Este servidor non está configurado como principal nun proceso de "
-#~ "replicación. Desexa <a href=\"%s\">configuralo</a>?"
-
-#, fuzzy
-#~| msgid ""
-#~| "This server is not configured as slave in a replication process. Would "
-#~| "you like to <a href=\"%s\">configure</a> it?"
-#~ msgid ""
-#~ "This server is not configured as slave in a replication process. Would "
-#~ "you like to <a href=%s>configure</a> it?"
-#~ msgstr ""
-#~ "Este servidor non está configurado como escravo nun proceso de "
-#~ "replicación. Desexa <a href=\"%s\">configuralo</a>?"
-
-#, fuzzy
-#~| msgid "Could not connect to MySQL server"
-#~ msgid "(or the local MySQL server"
-#~ msgstr "Non se puido conectar co servidor de MySQL"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "Cabe a posibilidade de que atopase un erro no procesador de SQL. Examine "
-#~ "a súa pesquisa con atención e comprobe que as aspas son correctas e que "
-#~ "cada unha ten o seu par. Outras causas posíbeis serían que tentase enviar "
-#~ "un ficheiro cun binario fóra dunha área de texto entre aspas. Tamén pode "
-#~ "tentar facer a súa pesquisa na liña de ordes do MySQL. A mensaxe de erro "
-#~ "que lle envía o servidor de MySQL, e que aparece máis abaixo (de habela), "
-#~ "tamén o pode axudar a diagnosticar o problema. De persistiren os erros ou "
-#~ "se o procesador fallar cando mesmo a liña de ordes vai ben, reduza o "
-#~ "texto da pesquisa à parte concreta que produce o erro e envíe unha "
-#~ "mensaxe de erro co texto da sección RECORTE que aparece a continuación:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "Datos CSV"
-
-#~ msgid "Copy"
-#~ msgstr "Copiar"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Eliminar os usuarios e recargar os privilexios a continuación."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Este é o modo máis limpo, mais pode que recargar os privilexios leve un "
-#~ "pouco de tempo."
-
-#~ msgid "has been altered."
-#~ msgstr "foi alterado."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "Microsoft Excel 2000"
-
-#~ msgid "Internet Explorer does not support this function."
-#~ msgstr "Internet Explorer non permite esta función."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ "Os usuarios "eliminados" poderán aínda acceder ao servidor como "
-#~ "sempre atá que se recarguen os privilexios."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Elimine só os usuarios das táboas de privilexios."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Permite executar procedementos almacenados. Non funciona nesta versión do "
-#~ "MySQL."
-
-#~ msgid "Process list"
-#~ msgstr "Listaxe dos procesos"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Volver a cargar os privilexios"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "Os usuarios terán aínda o privilexio USAGE até que se recarguen os "
-#~ "privilexios."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "Datos nativos de MS Excel"
-
-#~ msgid "Alter index(s)"
-#~ msgstr "Alterar índice(s)"
-
-#~ msgid "Tracking Mechanism"
-#~ msgstr "Mecanismo de seguemento"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Seleccionar todo"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Seleccionar todo"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Inserir"
-
-#, fuzzy
-#~| msgid "Updated"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Actualizada"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Eliminar"
-
-#~ msgid "%1$d row(s) affected."
-#~ msgstr "%1$d fileira(s) afectada(s)."
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "Xan0"
-
-#~ msgid "Jan1"
-#~ msgstr "Xan1"
-
-#~ msgid "Jan2"
-#~ msgstr "Xan2"
-
-#~ msgid ""
-#~ "Structure Difference' ;\n"
-#~ "$strStructureForView = 'Structure for view"
-#~ msgstr ""
-#~ "Diferenza da estrutura' ;\n"
-#~ "$strStructure = 'Estrutura"
diff --git a/po/hr.po b/po/hr.po
index 654f196..65ec3e5 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,14 +4,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-12 09:13+0100\n"
-"Last-Translator: Automatically generated\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: \n"
+"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\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:37 browse_foreigners.php:58
#: libraries/display_tbl.lib.php:416 server_privileges.php:1506
@@ -2843,20 +2845,18 @@ msgid "Table structure for table"
msgstr "Tablična struktura za tablicu"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Sadržaj tablice __TABLE__"
+msgstr "Sadržaj tablice @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(nastavljeno)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Struktura tablice __TABLE__"
+msgstr "Struktura tablice @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8444,325 +8444,3 @@ msgstr "Preimenuj tablicu u"
#~ "Nije moguće upotrijebiti funkcije iconv, libiconv ili recode_string, iako "
#~ "izgleda da su sva potrebna proširenja učitana. Provjerite svoju PHP "
#~ "konfiguraciju."
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Dodaj novo polje"
-
-#~ msgid "Field"
-#~ msgstr "Polje"
-
-#~ msgid "Records"
-#~ msgstr "Zapisi"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Polja završena s"
-
-#~ msgid "Fields"
-#~ msgstr "Polja"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "Polje %s je odbačeno"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Pogledajte slika/jpeg: inline"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "\"zipano\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "\"gzipano\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "\"bzipano\""
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "Dodaj prilagođeni komentar u zaglavlje (\"\\n\" razdvaja retke)"
-
-#, fuzzy
-#~ msgid "and"
-#~ msgstr "I"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Onemogućeno"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Omogućeno"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Popravi"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalendar"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "MySQL 4.0 kompatibilno"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr "Nije moguće učitati zadanu konfiguraciju iz: \"%1$s\""
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Izradi indeks %s stupaca"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Izradi tablicu"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "bez kompresije"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Isprazni tablicu (\"FLUSH\")"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "Neispravan indeks poslužitelja: \"%s\""
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Opis"
-
-#, fuzzy
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "bez kompresije"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "Shema \"%s\" baza podataka - stranica %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "Tablica \"%s\" ne postoji!"
-
-#~ msgid "running on %s"
-#~ msgstr "Izvršava se pri %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr ""
-#~ "Vrijednost omjera suviše je malen kako bi shema stala na jednu stranicu"
-
-#~ msgid ""
-#~ "Cannot start session without errors, please check errors given in your "
-#~ "PHP and/or webserver log file and configure your PHP installation "
-#~ "properly."
-#~ msgstr ""
-#~ "Pokretanje sesije nije moguće uslijed pogrešaka. Provjerite pogreške koje "
-#~ "ispisuje vaš PHP i/ili datoteku zapisnika poslužitelja i pravilno "
-#~ "konfigurirajte vašu instalaciju PHP-a."
-
-#, fuzzy
-#~| msgid ""
-#~| "However on last run no data has been parsed, this usually means "
-#~| "phpMyAdmin won't be able to finish this import unless you increase php "
-#~| "time limits."
-#~ msgid ""
-#~ "However on last run no data has been parsed, this usually means "
-#~ "phpMyAdmin won"
-#~ msgstr ""
-#~ "Ipak, pri posljednjem prijelazu nikakvi podaci nisu bili raščlanjeni. To "
-#~ "znači da phpMyAdmin neće biti u mogućnosti završiti ovaj uvoz sve dok ne "
-#~ "povećate vremenska ograničenja unutar php."
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "bez kompresije"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "bez kompresije"
-
-#, fuzzy
-#~| msgid "Grant all privileges on wildcard name (username\\_%)"
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr "Podari sve privilegije imenima s džokerima (korisničkoime_%)"
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "Tablica \"%s\" ne postoji!"
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr "Nije moguće učitati zadanu konfiguraciju iz: \"%1$s\""
-
-#, fuzzy
-#~| msgid "Invalid hostname for server %1$s. Please review your configuration."
-#~ msgid "Invalid hostname for server %1. Please review your configuration."
-#~ msgstr ""
-#~ "Neispravan naziv za poslužitelj %1$s. Molimo, pregledajte svoju "
-#~ "konfiguraciju."
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "Pogreška tijekom preimenovanja tablice %1$s u %2$s"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "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."
-
-#, fuzzy
-#~ msgid "(or the local MySQL server"
-#~ msgstr "Prijavljivanje na MySQL poslužitelj nije moguće"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "Postoji mogućnost da ste pronašli nedostatak u SQL raščlanjivaču. "
-#~ "Temeljito proučite vaš upit i provjerite ispravan unos navodnika. Jedan "
-#~ "od mogućih razloga je i da ste učitali datoteku s binarnim vrijednosti "
-#~ "izvan prostora s navodnicima. Vaš upit također možete provjeriti u "
-#~ "naredbenom retku MySQL-a. Ispis pogreške MySQL poslužitelja može vam "
-#~ "pomoći u dijagnosticiranju problema. Ako i dalje postoje problemi ili ako "
-#~ "raščlanjivač ne uspijeva u zadacima koji uspijevaju u naredbenom retku, "
-#~ "suzite svoj unos SQL upita na samo onaj upit koji izaziva probleme i "
-#~ "podnesite prijavu o nedostatku zajedno s dijelom podatka u donjem "
-#~ "odjeljku CUT:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV"
-
-#~ msgid "Copy"
-#~ msgstr "Kopiraj"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Izbriši korisnike i potom ponovo učitaj privilegije."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Ovo je najčišći način, ali ponovno učitavanje privilegija može potrajati."
-
-#~ msgid "has been altered."
-#~ msgstr "izmijenjeno je."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "Microsoft Excel 2000"
-
-#~ msgid "Internet Explorer does not support this function."
-#~ msgstr "Internet Explorer ne podržava ovu funkciju."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ "\"Izbrisani\" će korisnici i dalje moći pristupati poslužitelju sve dok "
-#~ "se privilegije ne učitaju ponovo."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Samo izbriši korisnike iz tablice privilegija."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Dopušta izvršavanje pohranjenih postupaka. Nema učinka u ovoj verziji "
-#~ "MySQL-a."
-
-#~ msgid "Process list"
-#~ msgstr "Popis procesa"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Ponovno učitaj privilegije"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "Korisnici će i dalje imati privilegiju USAGE (Upotreba) sve dok se "
-#~ "privilegije ponovno ne učitaju."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "Izvorno MS Excel oblikovanje"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Odaberi sve"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Odaberi sve"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Umetni"
-
-#, fuzzy
-#~| msgid "Update Query"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Ažuriraj upit"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Izbriši"
-
-#~ msgid "%1$d row(s) affected."
-#~ msgstr "Zahvaćeno redaka: %1$d."
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "Sij0"
-
-#~ msgid "Jan1"
-#~ msgstr "Sij1"
-
-#~ msgid "Jan2"
-#~ msgstr "Sij2"
diff --git a/po/sq.po b/po/sq.po
index c2e3c2c..08b00c1 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-05-19 13:02+0200\n"
-"Last-Translator: Laurent <laurenti(a)alblinux.net>\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"
@@ -2750,20 +2750,18 @@ msgid "Table structure for table"
msgstr "Struktura e tabelës"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Përmbajtja e tabelës __TABLE__"
+msgstr "Përmbajtja e tabelës @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(vazhdon)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Struktura e tabelës __TABLE__"
+msgstr "Struktura e tabelës @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8177,108 +8175,3 @@ msgstr "Riemërto tabelën në"
#~ "I pamundur përdorimi i funksioneve iconv apo libiconv apo recode_string "
#~ "për shkak se ekstensioni duhet të ngarkohet. Kontrolloni konfigurimin e "
#~ "php."
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Shto një fushë të re"
-
-#~ msgid "Field"
-#~ msgstr "Fusha"
-
-#~ msgid "Records"
-#~ msgstr "Regjistrime"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Fushë që mbaron me"
-
-#~ msgid "Fields"
-#~ msgstr "Fusha"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "Fusha %s u eleminua"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Shiko figurën/jpeg: në linjë"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "\"kompresuar me zip\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "\"kompresuar me gzip\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "\"kompresuar me bzip2\""
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "Shto një koment të personalizuar në header (\\n ndërpret rreshtin)"
-
-#, fuzzy
-#~ msgid "and"
-#~ msgstr "Dhe"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Jo aktiv"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Aktiv"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Riparo tabelën"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalendari"
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Krijo një tregues tek %s columns"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Krijo një faqe të re"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Asnjë lloj"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Rifillo (\"FLUSH\") tabelën"
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Përshkrimi"
-
-#, fuzzy
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Asnjë lloj"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "Skema e databazës \"%s\" - Faqja %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "Tabela \"%s\" nuk ekziston!"
-
-#~ msgid "running on %s"
-#~ msgstr "në ekzekutim tek %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr ""
-#~ "Faktori i shkallës është shumë i vogël për të plotësuar skemën në faqe"
diff --git a/po/sv.po b/po/sv.po
index 9025da2..99482da 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,14 +4,15 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-07-21 13:53+0200\n"
-"PO-Revision-Date: 2010-03-12 09:19+0100\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2010-07-21 14:48+0200\n"
+"Last-Translator: Marc Delisle <marc(a)infomarc.info>\n"
"Language-Team: swedish <sv(a)li.org>\n"
-"Language: \n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
#: browse_foreigners.php:37 browse_foreigners.php:58
#: libraries/display_tbl.lib.php:416 server_privileges.php:1506
@@ -2841,20 +2842,18 @@ msgid "Table structure for table"
msgstr "Struktur för tabell"
#: libraries/export/latex.php:13
-#, fuzzy
#| msgid "Content of table __TABLE__"
msgid "Content of table @TABLE@"
-msgstr "Innehåll i tabell __TABLE__"
+msgstr "Innehåll i tabell @TABLE@"
#: libraries/export/latex.php:14
msgid "(continued)"
msgstr "(fortsättning)"
#: libraries/export/latex.php:15
-#, fuzzy
#| msgid "Structure of table __TABLE__"
msgid "Structure of table @TABLE@"
-msgstr "Struktur för tabell __TABLE__"
+msgstr "Struktur för tabell @TABLE@"
#: libraries/export/latex.php:26
msgid "LaTeX"
@@ -8614,331 +8613,3 @@ msgstr "Döp om tabellen till"
#~ msgid "Default character set"
#~ msgstr "Standard teckenuppsättning"
-
-#, fuzzy
-#~| msgid "Add new field"
-#~ msgid "Add field"
-#~ msgstr "Lägg till fält"
-
-#~ msgid "Field"
-#~ msgstr "Fält"
-
-#~ msgid "Records"
-#~ msgstr "Rader"
-
-#~ msgid "Fields terminated by"
-#~ msgstr "Fälten avslutas med"
-
-#~ msgid "Fields"
-#~ msgstr "Fält"
-
-#~ msgid "Field %s has been dropped"
-#~ msgstr "Fältet %s har tagits bort"
-
-#~ msgid "See image/jpeg: inline"
-#~ msgstr "Se image/jpeg: inline"
-
-#, fuzzy
-#~| msgid "\"zipped\""
-#~ msgid "zipped"
-#~ msgstr "\"zippad\""
-
-#, fuzzy
-#~| msgid "\"gzipped\""
-#~ msgid "gzipped"
-#~ msgstr "\"gzippad\""
-
-#, fuzzy
-#~| msgid "\"bzipped\""
-#~ msgid "bzipped"
-#~ msgstr "\"bzippad\""
-
-#, fuzzy
-#~| msgid "Add custom comment into header (\\n splits lines)"
-#~ msgid ""
-#~ "Add custom comment into header (\n"
-#~ " splits lines)"
-#~ msgstr "Lägg till egen kommentar i huvud (\\n delar rader)"
-
-#~ msgid "and"
-#~ msgstr "och"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryDisabled"
-#~ msgid "Disabled"
-#~ msgstr "Inaktiverad"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryEnabled"
-#~ msgid "Enabled"
-#~ msgstr "Aktiverad"
-
-#, fuzzy
-#~ msgctxt "$strBLOBRepositoryRepair"
-#~ msgid "Repair"
-#~ msgstr "Reparera"
-
-#~ msgid "Calendar"
-#~ msgstr "Kalender"
-
-#~ msgid "MySQL 4.0 compatible"
-#~ msgstr "Kompatibel med MySQL 4.0"
-
-#~ msgid "Could not load default configuration from: \"%1$s\""
-#~ msgstr "Kunde inte ladda standardkonfiguration från: \"%1$s\""
-
-#~ msgid "Create an index on %s columns"
-#~ msgstr "Skapa ett index för %s kolumn(er)"
-
-#, fuzzy
-#~ msgctxt "$strCreateTableShort"
-#~ msgid "Create table"
-#~ msgstr "Skapa tabell"
-
-#, fuzzy
-#~ msgctxt "$strCreateUserDatabaseNone"
-#~ msgid "None"
-#~ msgstr "Inget"
-
-#~ msgid "Flush the table (\"FLUSH\")"
-#~ msgstr "Rensa tabell"
-
-#~ msgid "Invalid server index: \"%s\""
-#~ msgstr "Ogiltigt serverindex: \"%s\""
-
-#~ msgctxt "$strMIME_description"
-#~ msgid "Description"
-#~ msgstr "Beskrivning"
-
-#~ msgctxt "$strNoneDefault"
-#~ msgid "None"
-#~ msgstr "Inga"
-
-#~ msgid "Schema of the \"%s\" database - Page %s"
-#~ msgstr "Schema för databasen \"%s\" - Sidan %s"
-
-#~ msgid "The \"%s\" table doesn't exist!"
-#~ msgstr "Tabellen \"%s\" finns inte!"
-
-#~ msgid ""
-#~ "This MySQL server works as %s in <b>replication</b> process. For further "
-#~ "information about replication status on the server, please visit the <a "
-#~ "href=\"#replication\">replication section</a>."
-#~ msgstr ""
-#~ "Denna MySQL-server arbetar som %s i <b>replikerings</b>-läge. För mer "
-#~ "information om replikeringsstatus på servern, gå till <a href="
-#~ "\"#replication\">replikeringssektionen</a>."
-
-#~ msgid "running on %s"
-#~ msgstr "körs på %s"
-
-#~ msgid "The scale factor is too small to fit the schema on one page"
-#~ msgstr "Skalfaktorn är för liten för att schemat ska få plats på en sida"
-
-#~ msgid ""
-#~ "Cannot start session without errors, please check errors given in your "
-#~ "PHP and/or webserver log file and configure your PHP installation "
-#~ "properly."
-#~ msgstr ""
-#~ "Kan inte starta session utan fel. Kontrollera felmeddelanden i din PHP:s "
-#~ "och/eller webbservers loggfil och konfigurera din PHP-installation "
-#~ "korrekt."
-
-#, fuzzy
-#~| msgid ""
-#~| "However on last run no data has been parsed, this usually means "
-#~| "phpMyAdmin won't be able to finish this import unless you increase php "
-#~| "time limits."
-#~ msgid ""
-#~ "However on last run no data has been parsed, this usually means "
-#~ "phpMyAdmin won"
-#~ msgstr ""
-#~ "Dock blev inga data bearbetade i senaste körningen. Detta betyder "
-#~ "vanligtvis att phpMyAdmin inte kan slutföra denna import såvida du inte "
-#~ "ökar PHP:s tidsbegränsningar."
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt "None action"
-#~ msgid "None"
-#~ msgstr "Inget"
-
-#, fuzzy
-#~| msgid "None"
-#~ msgctxt ""
-#~ msgid "None"
-#~ msgstr "Inget"
-
-#, fuzzy
-#~| msgid "Grant all privileges on wildcard name (username\\_%)"
-#~ msgid "Grant all privileges on wildcard name (username_%)"
-#~ msgstr "Ge alla privilegier till namn med jokertecken (username\\_%)"
-
-#, fuzzy
-#~| msgid "The \"%s\" table doesn't exist!"
-#~ msgid "The %s table doesn"
-#~ msgstr "Tabellen \"%s\" finns inte!"
-
-#, fuzzy
-#~| msgid "Could not load default configuration from: \"%1$s\""
-#~ msgid "Could not load default configuration from: %1"
-#~ msgstr "Kunde inte ladda standardkonfiguration från: \"%1$s\""
-
-#, fuzzy
-#~| msgid "Invalid hostname for server %1$s. Please review your configuration."
-#~ msgid "Invalid hostname for server %1. Please review your configuration."
-#~ msgstr ""
-#~ "Ogiltigt värdnamn för server %1$s. Var god granska din konfiguration."
-
-#, fuzzy
-#~| msgid "Error renaming table %1$s to %2$s"
-#~ msgid "Error renaming table %1 to %2"
-#~ msgstr "Fel vid namnbyte på tabell %1$s till %2$s"
-
-#, fuzzy
-#~| msgid ""
-#~| "Cannot load [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a] "
-#~| "extension. Please check your PHP configuration."
-#~ msgid ""
-#~ "Cannot load [a@http://php.net/%1@Documentation][em]%1[/em][/a] extension. "
-#~ "Please check your PHP configuration."
-#~ msgstr ""
-#~ "kan inte ladda %s-tillägg,<br />var god kontrollera PHP-konfigurationen."
-
-#, fuzzy
-#~| msgid "Could not connect to MySQL server"
-#~ msgid "(or the local MySQL server"
-#~ msgstr "Kunde inte ansluta till MySQL-server"
-
-#, fuzzy
-#~| msgid ""
-#~| "There is a chance that you may have found a bug in the SQL parser. "
-#~| "Please examine your query closely, and check that the quotes are correct "
-#~| "and not mis-matched. Other possible failure causes may be that you are "
-#~| "uploading a file with binary outside of a quoted text area. You can also "
-#~| "try your query on the MySQL command line interface. The MySQL server "
-#~| "error output below, if there is any, may also help you in diagnosing the "
-#~| "problem. If you still have problems or if the parser fails where the "
-#~| "command line interface succeeds, please reduce your SQL query input to "
-#~| "the single query that causes problems, and submit a bug report with the "
-#~| "data chunk in the CUT section below:"
-#~ msgid ""
-#~ "There is a chance that you may have found a bug in the SQL parser. Please "
-#~ "examine your query closely, and check that the quotes are correct and not "
-#~ "mis-matched. Other possible failure causes may be that you are uploading "
-#~ "a file with binary outside of a quoted text area. You can also try your "
-#~ "query on the MySQL command line interface. The MySQL server error output "
-#~ "be . "
-#~ msgstr ""
-#~ "Det är möjligt att du har hittat en bugg i SQL-analysatorn. Var god "
-#~ "granska din fråga noga och kontrollera att citationstecknen är korrekta "
-#~ "och matchar varandra. En annan möjlig felorsak kan vara att du överför en "
-#~ "fil med binärkod som inte ligger inom citationstecken. Du kan även testa "
-#~ "din fråga i MySQL:s kommandoradsgränssnitt. Felmeddelandet från MySQL-"
-#~ "servern nedan, om det finns något, kan också hjälpa dig att analysera "
-#~ "problemet. Om du fortfarande har problem eller om SQL-analysatorn "
-#~ "misslyckas när kommandoradsgränssnittet lyckas, var vänlig reducera din "
-#~ "inmatning av SQL-frågor till den enda fråga som orsakar problem och "
-#~ "skicka en buggrapport med datastycket i URKLIPP-sektionen nedan:"
-
-#~ msgctxt "$strStrucCSV"
-#~ msgid "CSV"
-#~ msgstr "CSV"
-
-#~ msgid "Copy"
-#~ msgstr "Kopiera"
-
-#~ msgid "Delete the users and reload the privileges afterwards."
-#~ msgstr "Ta bort användarna och ladda om privilegierna efteråt."
-
-#~ msgid ""
-#~ "This is the cleanest way, but reloading the privileges may take a while."
-#~ msgstr ""
-#~ "Detta är det renaste sättet, men omladdning av privilegierna kan ta en "
-#~ "stund."
-
-#~ msgid "has been altered."
-#~ msgstr "har ändrats."
-
-#~ msgid "Microsoft Excel 2000"
-#~ msgstr "Microsoft Excel 2000"
-
-#~ msgid "Internet Explorer does not support this function."
-#~ msgstr "Internet Explorer saknar stöd för denna funktion."
-
-#~ msgid ""
-#~ "The "deleted" users will still be able to access the server as "
-#~ "usual until the privileges are reloaded."
-#~ msgstr ""
-#~ "De "borttagna" användarna kommer fortfarande kunna komma åt "
-#~ "servern som vanligt tills privilegierna laddas om."
-
-#~ msgid "Just delete the users from the privilege tables."
-#~ msgstr "Ta endast bort användarna från privilegiumtabellerna."
-
-#~ msgid ""
-#~ "Allows running stored procedures; has no effect in this MySQL version."
-#~ msgstr ""
-#~ "Tillåter körning av lagrade procedurer; Har ingen verkan i denna MySQL-"
-#~ "version."
-
-#~ msgid "Process list"
-#~ msgstr "Processlista"
-
-#~ msgid "Reload privileges"
-#~ msgstr "Ladda om privilegier"
-
-#~ msgid ""
-#~ "The users will still have the USAGE privilege until the privileges are "
-#~ "reloaded."
-#~ msgstr ""
-#~ "Användarna kommer fortfarande ha kvar privilegiet USAGE tills "
-#~ "privilegierna laddas om."
-
-#~ msgid "Native MS Excel format"
-#~ msgstr "Naturlig MS Excel-data"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT * query"
-#~ msgid "Select all"
-#~ msgstr "Markera alla"
-
-#, fuzzy
-#~| msgid "Select All"
-#~ msgctxt "Create SELECT ... query"
-#~ msgid "Select"
-#~ msgstr "Markera alla"
-
-#, fuzzy
-#~| msgid "Insert"
-#~ msgctxt "Create INSERT query"
-#~ msgid "Insert"
-#~ msgstr "Lägg till"
-
-#, fuzzy
-#~| msgid "Update Query"
-#~ msgctxt "Create UPDATE query"
-#~ msgid "Update"
-#~ msgstr "Uppdatera fråga"
-
-#, fuzzy
-#~| msgid "Delete"
-#~ msgctxt "Create DELETE query"
-#~ msgid "Delete"
-#~ msgstr "Radera"
-
-#~ msgid "%1$d row(s) affected."
-#~ msgstr "%1$d rad(er) påverkade."
-
-#~ msgid "utf-8"
-#~ msgstr "utf-8"
-
-#~ msgid "Jan0"
-#~ msgstr "januari0"
-
-#~ msgid "Jan1"
-#~ msgstr "januari1"
-
-#~ msgid "Jan2"
-#~ msgstr "januari2"
hooks/post-receive
--
phpMyAdmin
1
0