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

Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc

Browse Source
This commit is contained in:
lorilee
2010-06-22 21:12:41 -04:00
parent 40b9e360ad 4792d21a8a
commit d5175bc7df
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -85,6 +85,8 @@ $Id$
- patch #2999595, rfe #2998130 [interface] Cleanup navigation frame. - patch #2999595, rfe #2998130 [interface] Cleanup navigation frame.
- [core] Update library PHPExcel to version 1.7.3c - [core] Update library PHPExcel to version 1.7.3c
3.3.5.0 (not yet released)
3.3.4.0 (not yet released) 3.3.4.0 (not yet released)
- bug #2996161 [import] properly escape import value - bug #2996161 [import] properly escape import value
- bug #2998889 [import] Import button does not work in Catalan - bug #2998889 [import] Import button does not work in Catalan

2
po/pt_BR.po
View File

@@ -5317,7 +5317,7 @@ msgid ""
"method is mainly used to optimize ORDER BY ... DESC." "method is mainly used to optimize ORDER BY ... DESC."
msgstr "" msgstr ""
"O número de requisições para ler a linha precedente na ordem da chave. Este " "O número de requisições para ler a linha precedente na ordem da chave. Este "
"método de leitura é usado principalmente para otimizar ORDER B" "método de leitura é usado principalmente para otimizar ORDER BY ... DESC."
#: server_status.php:56 #: server_status.php:56
msgid "" msgid ""

12
po/tr.po
View File

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