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

ChangeLog

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

Documentation.html

@@ -4343,7 +4343,7 @@ chmod o+rwx tmp
 <h4 id="faq6_25">
 	<a href="#faq6_25">6.25 How does BLOB streaming work in phpMyAdmin?</a></h4>
 
-<p> First, for general information about BLOB streaming on MySQL, visit <a href="http://blobstreaming.org">blobstreaming.org</a>. We currently support streaming if you are running MySQL 5.1 with the PBXT and PBMS storage engines.</p>
+<p> First, for general information about BLOB streaming on MySQL, visit <a href="http://blobstreaming.org">blobstreaming.org</a>. We currently support streaming if you are running MySQL 5.1 with the PBXT and PBMS storage engines. Moreover, only PBMS 0.5.04 is supported.</p>
 
 <ol>
 	<li>In <tt>config.inc.php</tt> your host should be defined with a FQDN (fully qualified domain name) instead of something like &quot;localhost&quot;.</li>

po/pt_BR.po

@@ -5317,7 +5317,7 @@ msgid ""
 "method is mainly used to optimize ORDER BY ... DESC."
 msgstr ""
 "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
 msgid ""

po/sl.po

@@ -4,15 +4,15 @@ 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-08 13:43+0200\n"
+"PO-Revision-Date: 2010-06-17 01:10+0200\n"
 "Last-Translator: Domen <dbc334@gmail.com>\n"
 "Language-Team: slovenian <sl@li.org>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"n%100==4 ? 2 : 3);\n"
-"%100==4 ? 2 : 3);\n"
 "X-Generator: Pootle 2.0.1\n"
 
 #: browse_foreigners.php:38 browse_foreigners.php:59
@@ -5267,6 +5267,9 @@ msgid ""
 "being read or written or that can't be flushed or removed for some other "
 "reason."
 msgstr ""
+"Število zapahnjenih strani v zalogi medpomnilnika InnoDB. Te strani so "
+"trenutno v postopku branja ali pisanja ali pa zaradi nekega drugega razloga "
+"ne morejo biti izplaknjene ali odstranjene."
 
 #: server_status.php:66
 msgid ""
@@ -5275,6 +5278,10 @@ msgid ""
 "be calculated as Innodb_buffer_pool_pages_total - "
 "Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_data."
 msgstr ""
+"Število zasedenih strani, ker so bile dodeljene upravljalni skupni uporabi, "
+"kot je zaklepanje vrstic ali prilagodljiv zgoščevalni indeks. Vrednost se "
+"lahko izračuna tudi kot Innodb_buffer_pool_pages_total - "
+"Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_data."
 
 #: server_status.php:67
 msgid "Total size of buffer pool, in pages."
@@ -5285,22 +5292,28 @@ msgid ""
 "The number of \"random\" read-aheads InnoDB initiated. This happens when a "
 "query is to scan a large portion of a table but in random order."
 msgstr ""
+"Število začetih \"naključnih\" vnaprejšnjih branj InnoDB. To se zgodi, ko "
+"poizvedba zahteva pregled večjega dela tabele, vendar v naključnem redu."
 
 #: server_status.php:69
 msgid ""
 "The number of sequential read-aheads InnoDB initiated. This happens when "
 "InnoDB does a sequential full table scan."
 msgstr ""
+"Število začetih zaporednih vnaprejšnjih branj InnoDB. To se zgodi, ko InnoDB "
+"izvaja zaporedno pregledovanje celotne tabele."
 
 #: server_status.php:70
 msgid "The number of logical read requests InnoDB has done."
-msgstr ""
+msgstr "Število logičnih bralnih zahtev, ki jih je izvedel InnoDB."
 
 #: server_status.php:71
 msgid ""
 "The number of logical reads that InnoDB could not satisfy from buffer pool "
 "and had to do a single-page read."
 msgstr ""
+"Število logičnih bralnih zahtev, katerih InnoDB ni mogel izpolniti iz zaloge "
+"medpomnilnika in je moral izvesti enostransko branje."
 
 #: server_status.php:72
 msgid ""
@@ -5310,6 +5323,11 @@ msgid ""
 "counter counts instances of these waits. If the buffer pool size was set "
 "properly, this value should be small."
 msgstr ""
+"Po navadi pisanje v zalogo medpomnilnika InnoDB poteka v ozadju. Če pa je "
+"potrebno brati ali ustvariti stran in na voljo ni nobene čiste strani, je "
+"potrebno počakati, da se strani najprej izplaknejo. Ta števec šteje primere "
+"teh čakanj. Če je bila velikost zaloge medpomnilnika primerno nastavljena, "
+"bi morala biti ta vrednost majhna."
 
 #: server_status.php:73
 msgid "The number writes done to the InnoDB buffer pool."
@@ -5449,12 +5467,17 @@ msgid ""
 "The number of key blocks in the key cache that have changed but haven't yet "
 "been flushed to disk. It used to be known as Not_flushed_key_blocks."
 msgstr ""
+"Število blokov ključev v predpommnilniku ključev, ki so se spremenili, "
+"vendar niso bili izplaknjeni na disk. Včasih je bilo znano kot "
+"Not_flushed_key_blocks."
 
 #: server_status.php:105
 msgid ""
 "The number of unused blocks in the key cache. You can use this value to "
 "determine how much of the key cache is in use."
 msgstr ""
+"Število neuporabljenih blokov v predpomnilniku ključev. To vrednost lahko "
+"uporabite, da ugotovite, koliko predpomnilnika ključev je v uporabi."
 
 #: server_status.php:106
 msgid ""
@@ -5462,10 +5485,13 @@ msgid ""
 "that indicates the maximum number of blocks that have ever been in use at "
 "one time."
 msgstr ""
+"Število uporabljenih blokov v predpomnilniku ključev. To je najvišja "
+"dosežena vrednost, ki kaže največje število blokov, ki so bili kadar koli "
+"naenkrat v uporabi."
 
 #: server_status.php:107
 msgid "The number of requests to read a key block from the cache."
-msgstr ""
+msgstr "Število zahtev za branje bloka ključev iz predpomnilnika."
 
 #: server_status.php:108
 msgid ""
@@ -5473,14 +5499,17 @@ msgid ""
 "then your key_buffer_size value is probably too small. The cache miss rate "
 "can be calculated as Key_reads/Key_read_requests."
 msgstr ""
+"Število fizičnih branj bloka ključev z diska. Če je Key_reads velik, potem "
+"je vaša vrednost key_buffer_size najverjetneje premajhna. Razmerje "
+"pogrešitev predpomnilnika se lahko izračuna kot Key_reads/Key_read_requests."
 
 #: server_status.php:109
 msgid "The number of requests to write a key block to the cache."
-msgstr ""
+msgstr "Število zahtev za pisanje bloka ključev v predpomnilnik."
 
 #: server_status.php:110
 msgid "The number of physical writes of a key block to disk."
-msgstr ""
+msgstr "Število fizičnih pisanj bloka ključev na disk."
 
 #: server_status.php:111
 msgid ""
@@ -5488,6 +5517,10 @@ msgid ""
 "optimizer. Useful for comparing the cost of different query plans for the "
 "same query. The default value of 0 means that no query has been compiled yet."
 msgstr ""
+"Skupni izdatek zadnje prevedene poizvedbe, kot ga je izračunal optimizator "
+"poizvedb. Uporabno za primerjanje izdatkov različnih načrtov poizvedb za "
+"enake poizvedbe. Privzeta vrednost 0 pomeni, da še ni bila prevedena nobena "
+"poizvedba."
 
 #: server_status.php:112
 msgid "The number of rows waiting to be written in INSERT DELAYED queues."
@@ -5565,47 +5598,56 @@ msgstr "Ponastavi"
 
 #: server_status.php:126
 msgid "The status of failsafe replication (not yet implemented)."
-msgstr ""
+msgstr "Stanje podvajanja odpovedne varnosti (ni še vključeno)."
 
 #: server_status.php:127
 msgid ""
 "The number of joins that do not use indexes. If this value is not 0, you "
 "should carefully check the indexes of your tables."
 msgstr ""
+"Število stikov, ki ne uporabljajo indeksov. Če ta vrednost ni 0, skrbno "
+"preverite indekse vaših tabel."
 
 #: server_status.php:128
 msgid "The number of joins that used a range search on a reference table."
-msgstr ""
+msgstr "Število stikov, ki so uporabili iskanje območja na referenčni tabeli."
 
 #: server_status.php:129
 msgid ""
 "The number of joins without keys that check for key usage after each row. "
 "(If this is not 0, you should carefully check the indexes of your tables.)"
 msgstr ""
+"Število stikov brez ključev, ki preverjajo uporabo ključev po vsaki vrstici. "
+"(Če to ni 0, previdno preverite indekse vaših tabel.)"
 
 #: server_status.php:130
 msgid ""
 "The number of joins that used ranges on the first table. (It's normally not "
 "critical even if this is big.)"
 msgstr ""
+"Število stikov, ki so uporabili območja na prvi tabeli. (Po navadi ni "
+"kritično, četudi je veliko.)"
 
 #: server_status.php:131
 msgid "The number of joins that did a full scan of the first table."
-msgstr ""
+msgstr "Število stikov, ki so izvedli celotni pregled na prvi tabeli."
 
 #: server_status.php:132
 msgid "The number of temporary tables currently open by the slave SQL thread."
 msgstr ""
+"Število začasnih tabel, ki so trenutno odprte s strani niti SQL podrejencev."
 
 #: server_status.php:133
 msgid ""
 "Total (since startup) number of times the replication slave SQL thread has "
 "retried transactions."
 msgstr ""
+"Skupno (od zagona) število ponovnih poskusov transakcij podvojevalne niti "
+"SQL podrejenca."
 
 #: server_status.php:134
 msgid "This is ON if this server is a slave that is connected to a master."
-msgstr ""
+msgstr "To je ON, če je strežnik podrejenec, povezan z glavnim strežnikom."
 
 #: server_status.php:135
 msgid ""
@@ -5626,6 +5668,9 @@ msgid ""
 "is large, you should consider increasing the value of the sort_buffer_size "
 "system variable."
 msgstr ""
+"Število prehodov spajanja, ki jih je moral opraviti algoritem razvrščanja. "
+"Če je ta vrednost velika, razmislite o povečanju sistemske spremenljivke "
+"sort_buffer_size."
 
 #: server_status.php:138
 msgid "The number of sorts that were done with ranges."
@@ -5650,6 +5695,10 @@ msgid ""
 "should first optimize your queries, and then either split your table or "
 "tables or use replication."
 msgstr ""
+"Koliko krat zaklepa tabele ni bilo mogoče pridobiti takoj in je bilo "
+"potrebno počakati. Če je to visoko in imate težave z zmogljivostjo, najprej "
+"optimizirajte vaše poizvedbe, nato pa ali razdelite vašo tabelo oz. tabele "
+"ali uporabite podvojevanje."
 
 #: server_status.php:143
 msgid ""
@@ -5657,6 +5706,9 @@ msgid ""
 "calculated as Threads_created/Connections. If this value is red you should "
 "raise your thread_cache_size."
 msgstr ""
+"Število niti v predpomnilniku niti. Delež zadetkov predpomnilnika se lahko "
+"izračuna kot Threads_created/Connections. Če je ta vrednost rdeča, povečajte "
+"vaš thread_cache_size."
 
 #: server_status.php:144
 msgid "The number of currently open connections."
@@ -5669,6 +5721,9 @@ msgid ""
 "doesn't give a notable performance improvement if you have a good thread "
 "implementation.)"
 msgstr ""
+"Število niti ustvarjenih za ravnanje s povezavami. Če je Threads_created "
+"velik, boste morda želeli povečati vrednost thread_cache_size. (Po navadi to "
+"ne izboljša zmogljivosti v veliki meri, če imate dobro izvedbo niti.)"
 
 #: server_status.php:146
 msgid "The number of threads that are not sleeping."

po/tr.po

@@ -4,7 +4,7 @@ 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-15 13:31+0200\n"
+"PO-Revision-Date: 2010-06-17 21:32+0200\n"
 "Last-Translator:  <hitowerdigit@hotmail.com>\n"
 "Language-Team: turkish <tr@li.org>\n"
 "Language: tr\n"
@@ -1510,8 +1510,8 @@ msgid ""
 "the administrator of the MySQL server."
 msgstr ""
 "phpMyAdmin MySQL sunucusuna bağlanmayı denedi ama sunucu bağlantıyı "
-"reddetti. config.inc içindeki anamakine (host) adresini, kullanıcı adını ve "
+"reddetti. Yapılandırmanızdaki anamakine (host) adresini, kullanıcı adını ve "
-"parolayı kontrol edin ve MySQL sunucusunun yöneticisi tarafından verilen "
+"parolayı kontrol edin ve MySQL sunucusu yöneticisi tarafından verilen "
 "bilgiyle uyuştuğundan emin olun."
 
 #: libraries/auth/cookie.auth.lib.php:244