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

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Crack
2010-06-28 16:42:29 +02:00
parent c91c105da8 4986ee0174
commit 83f1397f0f
5 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -86,8 +86,10 @@ $Id$
- [core] Update library PHPExcel to version 1.7.3c
3.3.5.0 (not yet released)
- patch #2932113 [information_schema] Slow export when having lots of
databases, thanks to Stéphane Pontier - shadow_walker
3.3.4.0 (not yet released)
3.3.4.0 (2010-06-28)
- bug #2996161 [import] properly escape import value
- bug #2998889 [import] Import button does not work in Catalan
- [browse] Fix handling of sort order if only column is specified.

7
libraries/common.inc.php
View File

@@ -563,13 +563,6 @@ $GLOBALS['footnotes'] = array();
/******************************************************************************/
/* loading language file LABEL_loading_language_file */
/**
* Added messages while developing:
*/
if (file_exists('./lang/added_messages.php')) {
include './lang/added_messages.php';
}
/**
* lang detection is done here
*/

12
libraries/mysql_charsets.lib.php
View File

@@ -164,7 +164,17 @@ function PMA_getDbCollation($db) {
return 'utf8_general_ci';
}
return PMA_DBI_fetch_value('SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = \'' . PMA_sqlAddSlashes($db) . '\' LIMIT 1;');
if (! $GLOBALS['cfg']['Server']['DisableIS']) {
// this is slow with thousands of databases
return PMA_DBI_fetch_value('SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = \'' . PMA_sqlAddSlashes($db) . '\' LIMIT 1;');
} else {
PMA_DBI_select_db($db);
$return = PMA_DBI_fetch_value('SHOW VARIABLES LIKE \'collation_database\'', 0, 1);
if ($db !== $GLOBALS['db']) {
PMA_DBI_select_db($GLOBALS['db']);
}
return $return;
}
}
/**

44
po/cy.po
View File

@@ -1863,7 +1863,7 @@ msgstr "Rheolweithiau"
#: libraries/db_routines.inc.php:43
msgid "Return type"
msgstr ""
msgstr "Dychwelyd math"
#: libraries/db_structure.lib.php:57 libraries/display_tbl.lib.php:1848
msgid ""
@@ -1970,8 +1970,9 @@ msgstr ""
#: libraries/display_export.lib.php:107
#, php-format
#, possible-php-format
msgid "Dump %s row(s) starting at row # %s"
msgstr ""
msgstr "Dympio %s rhes wrth ddechrau ar res #%s"
#: libraries/display_export.lib.php:115
msgid "Dump all rows"
@@ -1983,8 +1984,9 @@ msgstr "Cadw fel ffeil"
#: libraries/display_export.lib.php:134
#, php-format
#, possible-php-format
msgid "Save on server in %s directory"
msgstr ""
msgstr "Cadw ar weinydd mewn cyfeiriadur %s"
#: libraries/display_export.lib.php:142 setup/lib/messages.inc.php:90
msgid "Overwrite existing file(s)"
@@ -2564,7 +2566,7 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:63
msgid "Log buffer size"
msgstr ""
msgstr "Maint log y byffer"
#: libraries/engines/pbxt.lib.php:64
msgid ""
@@ -2575,7 +2577,7 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:68
msgid "Data file grow size"
msgstr ""
msgstr "Maint tyfu'r ffeil ddata"
#: libraries/engines/pbxt.lib.php:69
msgid "The grow size of the handle data (.xtd) files."
@@ -2583,7 +2585,7 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:73
msgid "Row file grow size"
msgstr ""
msgstr "Maint tyfu'r ffeil rhes"
#: libraries/engines/pbxt.lib.php:74
msgid "The grow size of the row pointer (.xtr) files."
@@ -2591,7 +2593,7 @@ msgstr ""
#: libraries/engines/pbxt.lib.php:78
msgid "Log file count"
msgstr ""
msgstr "Cyfrif ffeiliau log"
#: libraries/engines/pbxt.lib.php:79
msgid ""
@@ -7695,16 +7697,17 @@ msgstr ""
#: tbl_tracking.php:251 tbl_tracking.php:379
msgid "Close"
msgstr ""
msgstr "Cau"
#: tbl_tracking.php:262
#, php-format
#, possible-php-format
msgid "Version %s snapshot (SQL code)"
msgstr ""
msgstr "Ciplun fersiwn %s (cod SQL)"
#: tbl_tracking.php:381
msgid "Tracking statements"
msgstr ""
msgstr "Datganiadau tracio"
#: tbl_tracking.php:397 tbl_tracking.php:504
#, php-format
@@ -7713,44 +7716,45 @@ msgstr ""
#: tbl_tracking.php:410 tbl_tracking.php:461
msgid "Date"
msgstr ""
msgstr "Dyddiad"
#: tbl_tracking.php:411 tbl_tracking.php:462
msgid "Username"
msgstr ""
msgstr "Enw defnyddiwr"
#: tbl_tracking.php:412
msgid "Data definition statement"
msgstr ""
msgstr "Datganiad diffiniad data"
#: tbl_tracking.php:463
msgid "Data manipulation statement"
msgstr ""
msgstr "Datganiad trin data"
#: tbl_tracking.php:507
msgid "SQL dump (file download)"
msgstr ""
msgstr "Dadlwythiad SQL (lawrlwytho ffeil)"
#: tbl_tracking.php:508
msgid "SQL dump"
msgstr ""
msgstr "Dadlwythiad SQL"
#: tbl_tracking.php:509
msgid "This option will replace your table and contained data."
msgstr ""
msgstr "Bydd yr opsiwn hwn yn disodli eich tabl a'r data sydd ynddo."
#: tbl_tracking.php:509
msgid "SQL execution"
msgstr ""
msgstr "Gweithrediad SQL"
#: tbl_tracking.php:521
#, php-format
#, possible-php-format
msgid "Export as %s"
msgstr ""
msgstr "Allforio fel %s"
#: tbl_tracking.php:561
msgid "Show versions"
msgstr ""
msgstr "Dangos fersiynau"
#: tbl_tracking.php:593
msgid "Version"

12
po/tr.po
View File

@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2010-06-13 09:03-0400\n"
"PO-Revision-Date: 2010-06-17 21:32+0200\n"
"Last-Translator: <hitowerdigit@hotmail.com>\n"
"PO-Revision-Date: 2010-06-21 19:58+0200\n"
"Last-Translator: Burak <hitowerdigit@hotmail.com>\n"
"Language-Team: turkish <tr@li.org>\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
@@ -96,7 +96,7 @@ msgstr "Veritabanı %1$s oluşturuldu."
#: db_datadict.php:49 db_operations.php:378
msgid "Database comment: "
msgstr "Veritabanı yorumu: "
msgstr "Veritabanı yorumu:"
#: db_datadict.php:165 libraries/tbl_properties.inc.php:724
#: pdf_schema.php:1236 tbl_operations.php:347 tbl_printview.php:130
@@ -1584,7 +1584,7 @@ msgstr "%s dosyası herhangi bir anahtar kimliği içermiyor"
#: libraries/auth/swekey/swekey.auth.lib.php:157
#: libraries/auth/swekey/swekey.auth.lib.php:180
msgid "Hardware authentication failed"
msgstr "Donanım kimlik denetimi başarısız"
msgstr "Donanım kimlik doğrulama başarısız"
#: libraries/auth/swekey/swekey.auth.lib.php:166
msgid "No valid authentication key plugged"
@@ -1592,7 +1592,7 @@ msgstr "Geçerli kimlik denetimi anahtarı takılı değil"
#: libraries/auth/swekey/swekey.auth.lib.php:202
msgid "Authenticating..."
msgstr "Kimlik denetleniyor..."
msgstr "Kimlik doğrulanıyor..."
#: libraries/blobstreaming.lib.php:689
msgid "View image"
@@ -1604,7 +1604,7 @@ msgstr "Ses çal"
#: libraries/blobstreaming.lib.php:698
msgid "View video"
msgstr "Videoyu göster"
msgstr "Görüntüyü göster"
#: libraries/blobstreaming.lib.php:702
msgid "Download file"