Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

This commit is contained in:
Madhura Jayaratne 2015-05-28 07:24:32 +05:30
commit cbd380948b
5 changed files with 84 additions and 90 deletions

View File

@ -6,14 +6,14 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2015-05-27 08:08-0400\n"
"PO-Revision-Date: 2015-05-25 16:27+0200\n"
"PO-Revision-Date: 2015-05-27 16:00+0200\n"
"Last-Translator: Kristjan Räts <kristjanrats@gmail.com>\n"
"Language-Team: Estonian <https://hosted.weblate.org/projects/phpmyadmin/"
"master/et/>\n"
"Language-Team: Estonian "
"<https://hosted.weblate.org/projects/phpmyadmin/master/et/>\n"
"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: et\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.3-dev\n"
@ -7409,17 +7409,15 @@ msgid "Show create database form"
msgstr "Näita andmebaasi loomise vormi"
#: libraries/config/messages.inc.php:749
#, fuzzy
#| msgid ""
#| "Show or hide a column displaying the Creation timestamp for all tables."
msgid "Show or hide a column displaying the comments for all tables."
msgstr "Näita või peida kõikides tabelites loomise ajatempli veerg."
msgstr "Näita või peida kõigi tabelite kommentaaride veerg."
#: libraries/config/messages.inc.php:750
#, fuzzy
#| msgid "Table comments"
msgid "Show table comments"
msgstr "Tabeli kommentaarid"
msgstr "Kuva tabeli kommentaarid"
#: libraries/config/messages.inc.php:751
msgid "Show or hide a column displaying the Creation timestamp for all tables."
@ -9690,10 +9688,10 @@ msgid "Can't copy table to same one!"
msgstr "Ei saa tabelit iseendasse kopeerida!"
#: libraries/operations.lib.php:1958
#, fuzzy, php-format
#, php-format
#| msgid "Table %s has been moved to %s. Privileges have been realigned."
msgid "Table %s has been moved to %s. Privileges have been adjusted."
msgstr "Tabel %s liigutati andmebaasi %s. Õiguseid on vastavalt kohandatud."
msgstr "Tabel %s liigutati andmebaasi %s. Õiguseid kohandati vastavalt."
#: libraries/operations.lib.php:1962
#, php-format
@ -13799,12 +13797,12 @@ msgid "Effective"
msgstr "Efektiivne"
#: libraries/structure.lib.php:2678
#, fuzzy, php-format
#, php-format
#| msgid ""
#| "Table %1$s has been altered successfully. Privileges have been realigned."
msgid ""
"Table %1$s has been altered successfully. Privileges have been adjusted."
msgstr "Tabeli %1$s muutmine õnnestus. Õiguseid on vastavalt kohandatud."
msgstr "Tabeli %1$s muutmine õnnestus. Õiguseid kohandati vastavalt."
#: libraries/structure.lib.php:2682 libraries/tbl_indexes.lib.php:61
#: tbl_addfield.php:92

View File

@ -4,14 +4,14 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2015-05-27 08:08-0400\n"
"PO-Revision-Date: 2015-05-19 18:01+0200\n"
"PO-Revision-Date: 2015-05-27 23:11+0200\n"
"Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
"Language-Team: Hungarian <https://hosted.weblate.org/projects/phpmyadmin/"
"master/hu/>\n"
"Language-Team: Hungarian "
"<https://hosted.weblate.org/projects/phpmyadmin/master/hu/>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 2.3-dev\n"
@ -1029,6 +1029,8 @@ msgid ""
"Do you really want to DROP the selected partition(s)? This will also DELETE "
"the data related to the selected partition(s)!"
msgstr ""
"Valóban el szeretné DOBNI a kijelölt partíciókat? Ez TÖRÖLNI fogja a "
"kijelölt partíciókkal kapcsolatos adatokat is!"
#: js/messages.php:65
msgid "Do you really want to TRUNCATE the selected partition(s)?"
@ -1042,14 +1044,22 @@ msgid ""
"collation; in this case we suggest you revert to the original collation and "
"refer to the tips at "
msgstr ""
"Ez a művelet kísérletet fog tenni az adatok átalakítására az új "
"egyeztetésre. Ritka esetekben, különösen ahol egy karakter nem létezik az új "
"egyeztetésben, ez a folyamat azt okozhatja, hogy az adatok helytelenül "
"jelennek meg az új egyeztetésben. Ebben az esetben azt javasoljuk, hogy "
"álljon vissza az eredeti egyeztetésre, és nézze meg a tippeket a következő "
"oldalon: "
#: js/messages.php:73
msgid "Garbled Data"
msgstr ""
msgstr "Meghamisított adatok"
#: js/messages.php:75
msgid "Are you sure you wish to change the collation and convert the data?"
msgstr ""
"Biztosan módosítani szeretné az egyeztetést és át szeretné alakítani az "
"adatokat?"
#: js/messages.php:78
msgid "Save & Close"
@ -6368,11 +6378,11 @@ msgstr "Ne legyen megszakítás INSERT hiba esetén"
#: libraries/config/messages.inc.php:346 libraries/config/messages.inc.php:358
msgid "Add ON DUPLICATE KEY UPDATE"
msgstr ""
msgstr "ON DUPLICATE KEY UPDATE hozzáadása"
#: libraries/config/messages.inc.php:347 libraries/config/messages.inc.php:359
msgid "Update data when duplicate keys found on import"
msgstr ""
msgstr "Adatok frissítése, ha kettőzött kulcsok találhatók importáláskor"
#: libraries/config/messages.inc.php:350
msgid ""
@ -6654,7 +6664,6 @@ msgid "Minimum number of databases to display the database filter box"
msgstr "A szűrődoboz megjelenítéséhez szükséges minimális adatbázisok száma"
#: libraries/config/messages.inc.php:467
#, fuzzy
#| msgid ""
#| "Group items in the navigation tree (determined by the separator defined "
#| "below)."
@ -6662,8 +6671,8 @@ msgid ""
"Group items in the navigation tree (determined by the separator defined in "
"the Databases and Tables tabs above)."
msgstr ""
"Elemek csoportosítása a navigációs faszerkezetben (lent megadott elválasztó "
"által meghatározva)."
"Elemek csoportosítása a navigációs faszerkezetben (a fenti Adatbázisok és "
"táblák lapon megadott elválasztó által meghatározva)."
#: libraries/config/messages.inc.php:469
msgid "Group items in the tree"
@ -7486,19 +7495,17 @@ msgid "Show create database form"
msgstr "Az adatbázis létrehozása űrlap megjelenítése"
#: libraries/config/messages.inc.php:749
#, fuzzy
#| msgid ""
#| "Show or hide a column displaying the Creation timestamp for all tables."
msgid "Show or hide a column displaying the comments for all tables."
msgstr ""
"A létrehozás időbélyegét megjelenítő oszlop megjelenítése vagy elrejtése "
"minden táblánál."
"A megjegyzéseket megjelenítő oszlop megjelenítése vagy elrejtése minden "
"táblánál."
#: libraries/config/messages.inc.php:750
#, fuzzy
#| msgid "Table comments"
msgid "Show table comments"
msgstr "Tábla megjegyzése"
msgstr "Tábla megjegyzéseinek megjelenítése"
#: libraries/config/messages.inc.php:751
msgid "Show or hide a column displaying the Creation timestamp for all tables."
@ -9160,10 +9167,9 @@ msgid "phpMyAdmin documentation"
msgstr "phpMyAdmin dokumentáció"
#: libraries/navigation/NavigationHeader.class.php:192
#, fuzzy
#| msgid "Navigation panel"
msgid "Navigation panel settings"
msgstr "Navigációs keret"
msgstr "Navigációs panel beállításai"
#: libraries/navigation/NavigationHeader.class.php:203
msgid "Reload navigation panel"
@ -9624,10 +9630,9 @@ msgstr "Adatbázis átnevezése:"
#: libraries/operations.lib.php:795 libraries/operations.lib.php:1026
#: libraries/operations.lib.php:1187 libraries/rte/rte_routines.lib.php:1101
#: libraries/tbl_columns_definition_form.lib.php:344
#, fuzzy
#| msgid "Edit Privileges"
msgid "Adjust Privileges"
msgstr "Jogok szerkesztése"
msgstr "Jogosultságok módosítása"
#: libraries/operations.lib.php:113
#, php-format
@ -9814,19 +9819,19 @@ msgid "Can't copy table to same one!"
msgstr "Nem másolható ugyanabba a tábla!"
#: libraries/operations.lib.php:1958
#, fuzzy, php-format
#, php-format
#| msgid "Table %s has been moved to %s. Privileges have been realigned."
msgid "Table %s has been moved to %s. Privileges have been adjusted."
msgstr ""
"A(z) %s tábla áthelyezésre került ide: %s. A jogosultságok újraigazítása "
"A(z) %s tábla áthelyezésre került ide: %s. A jogosultságok módosítása "
"megtörtént."
#: libraries/operations.lib.php:1962
#, fuzzy, php-format
#, php-format
#| msgid "Table %s has been copied to %s. Privileges have been realigned."
msgid "Table %s has been copied to %s. Privileges have been adjusted."
msgstr ""
"A(z) %s tábla átmásolásra került ide: %s. A jogosultságok újraigazítása "
"A(z) %s tábla átmásolásra került ide: %s. A jogosultságok módosítása "
"megtörtént."
#: libraries/operations.lib.php:1969
@ -11555,12 +11560,11 @@ msgid "Sorry, we failed to restore the dropped routine."
msgstr "Elnézést, nem sikerült visszaállítani az eldobott eljárást."
#: libraries/rte/rte_routines.lib.php:382
#, fuzzy, php-format
#, php-format
#| msgid "Routine %1$s has been modified. Privileges have been realigned."
msgid "Routine %1$s has been modified. Privileges have been adjusted."
msgstr ""
"A(z) %1$s eljárás módosítása megtörtént. A jogosultságok újra lettek "
"igazítva."
"A(z) %1$s eljárás módosítása megtörtént. A jogosultságok módosítva lettek."
#: libraries/rte/rte_routines.lib.php:387
#, php-format
@ -13988,13 +13992,13 @@ msgid "Effective"
msgstr "Hatásos"
#: libraries/structure.lib.php:2678
#, fuzzy, php-format
#, php-format
#| msgid ""
#| "Table %1$s has been altered successfully. Privileges have been realigned."
msgid ""
"Table %1$s has been altered successfully. Privileges have been adjusted."
msgstr ""
"A(z) %1$s tábla sikeresen módosítva lett. A jogosultságok újraigazítása "
"A(z) %1$s tábla sikeresen módosítva lett. A jogosultságok módosítása "
"megtörtént."
#: libraries/structure.lib.php:2682 libraries/tbl_indexes.lib.php:61

View File

@ -4,16 +4,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2015-05-27 08:08-0400\n"
"PO-Revision-Date: 2015-05-25 22:53+0200\n"
"PO-Revision-Date: 2015-05-27 22:43+0200\n"
"Last-Translator: Domen <mitenem@outlook.com>\n"
"Language-Team: Slovenian <https://hosted.weblate.org/projects/phpmyadmin/"
"master/sl/>\n"
"Language-Team: Slovenian "
"<https://hosted.weblate.org/projects/phpmyadmin/master/sl/>\n"
"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%"
"100==4 ? 2 : 3;\n"
"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
"n%100==4 ? 2 : 3;\n"
"X-Generator: Weblate 2.3-dev\n"
#: changelog.php:37 license.php:28
@ -708,7 +708,7 @@ msgstr ""
#: import_status.php:103
msgid "Could not load the progress of the import."
msgstr ""
msgstr "Ne morem naložiti napredka nalaganja."
#: import_status.php:112 js/messages.php:361 libraries/Util.class.php:735
#: libraries/export.lib.php:460
@ -7470,34 +7470,31 @@ msgid "Show create database form"
msgstr "Pokaži obrazec za ustvarjanje zbirke podatkov"
#: libraries/config/messages.inc.php:749
#, fuzzy
#| msgid ""
#| "Show or hide a column displaying the Creation timestamp for all tables."
msgid "Show or hide a column displaying the comments for all tables."
msgstr ""
"Prikaži ali skrij stolpec, ki prikazuje Časovni žig nastanka za vse tabele."
msgstr "Prikaži ali skrij stolpec, ki prikazuje pripombe vseh tabel."
#: libraries/config/messages.inc.php:750
#, fuzzy
#| msgid "Table comments"
msgid "Show table comments"
msgstr "Pripomba tabele"
msgstr "Prikaži pripombe tabele"
#: libraries/config/messages.inc.php:751
msgid "Show or hide a column displaying the Creation timestamp for all tables."
msgstr ""
"Prikaži ali skrij stolpec, ki prikazuje Časovni žig nastanka za vse tabele."
"Prikaži ali skrij stolpec, ki prikazuje časovni žig nastanka vseh tabel."
#: libraries/config/messages.inc.php:752
msgid "Show Creation timestamp"
msgstr "Prikaži Časovni žig nastanka"
msgstr "Prikaži časovni žig nastanka"
#: libraries/config/messages.inc.php:753
msgid ""
"Show or hide a column displaying the Last update timestamp for all tables."
msgstr ""
"Prikaži ali skrij stolpec, ki prikazuje Časovni žig zadnje spremembe za vse "
"tabele."
"Prikaži ali skrij stolpec, ki prikazuje časovni žig zadnje spremembe vseh "
"tabel."
#: libraries/config/messages.inc.php:754
msgid "Show Last update timestamp"
@ -7507,8 +7504,8 @@ msgstr "Časovni žig zadnje spremembe"
msgid ""
"Show or hide a column displaying the Last check timestamp for all tables."
msgstr ""
"Prikaži ali skrij stolpec, ki prikazuje Časovni žig zadnjega preverjanja za "
"vse tabele."
"Prikaži ali skrij stolpec, ki prikazuje časovni žig zadnjega preverjanja "
"vseh tabel."
#: libraries/config/messages.inc.php:756
msgid "Show Last check timestamp"
@ -13909,12 +13906,12 @@ msgid "Effective"
msgstr "Učinkovito"
#: libraries/structure.lib.php:2678
#, fuzzy, php-format
#, php-format
#| msgid ""
#| "Table %1$s has been altered successfully. Privileges have been realigned."
msgid ""
"Table %1$s has been altered successfully. Privileges have been adjusted."
msgstr "Tabelo %1$s smo uspešno spremenili. Privilegije smo ponovno poravnali."
msgstr "Tabelo %1$s smo uspešno spremenili. Privilegije smo prilagodili."
#: libraries/structure.lib.php:2682 libraries/tbl_indexes.lib.php:61
#: tbl_addfield.php:92

View File

@ -4,16 +4,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2015-05-27 08:08-0400\n"
"PO-Revision-Date: 2015-05-25 14:37+0200\n"
"PO-Revision-Date: 2015-05-27 18:56+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
"Language-Team: Turkish <https://hosted.weblate.org/projects/phpmyadmin/"
"master/tr/>\n"
"Language-Team: Turkish "
"<https://hosted.weblate.org/projects/phpmyadmin/master/tr/>\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 2.3\n"
"X-Generator: Weblate 2.3-dev\n"
#: changelog.php:37 license.php:28
#, php-format
@ -1047,14 +1047,21 @@ msgid ""
"collation; in this case we suggest you revert to the original collation and "
"refer to the tips at "
msgstr ""
"Bu işlem verinizi yeni karşılaştırmaya dönüştürmeye çalışacak. Özellikle bir "
"karakterin yeni karşılaştırmada mevcut olmadığı nadir durumlarda, bu işlem "
"verinin yeni karşıklaştırma altında yanlış görünmesine neden olabilmekte; bu "
"durumda size orijinal karşılaştırmayı geri almanızı öneririz ve şuradaki "
"ipuçlarına bakınız "
#: js/messages.php:73
msgid "Garbled Data"
msgstr ""
msgstr "Karışık Veri"
#: js/messages.php:75
msgid "Are you sure you wish to change the collation and convert the data?"
msgstr ""
"Karşılaştırmayı değiştirmek ve verileri dönüştürmek istediğinizden emin "
"misiniz?"
#: js/messages.php:78
msgid "Save & Close"
@ -4746,7 +4753,7 @@ msgstr "SQL Açıklamasını atla"
#: libraries/Util.class.php:1184
#, php-format
msgid "Analyze Explain at %s"
msgstr ""
msgstr "%s sitesinde Açıklamayı Çözümle"
#: libraries/Util.class.php:1215
msgid "Without PHP Code"
@ -7470,19 +7477,15 @@ msgid "Show create database form"
msgstr "Veritabanı oluşturma formu göster"
#: libraries/config/messages.inc.php:749
#, fuzzy
#| msgid ""
#| "Show or hide a column displaying the Creation timestamp for all tables."
msgid "Show or hide a column displaying the comments for all tables."
msgstr ""
"Tüm tablolar için Oluşturma zaman damgasını görüntüleyen sütunu gösterin "
"veya gizleyin."
msgstr "Tüm tablolar için yorumları görüntüleyen sütunu gösterin veya gizleyin."
#: libraries/config/messages.inc.php:750
#, fuzzy
#| msgid "Table comments"
msgid "Show table comments"
msgstr "Tablo yorumları"
msgstr "Tablo yorumlarını göster"
#: libraries/config/messages.inc.php:751
msgid "Show or hide a column displaying the Creation timestamp for all tables."
@ -9139,10 +9142,9 @@ msgid "phpMyAdmin documentation"
msgstr "phpMyAdmin belgeleri"
#: libraries/navigation/NavigationHeader.class.php:192
#, fuzzy
#| msgid "Navigation panel"
msgid "Navigation panel settings"
msgstr "Gezinti paneli"
msgstr "Gezinti paneli ayarları"
#: libraries/navigation/NavigationHeader.class.php:203
msgid "Reload navigation panel"
@ -9594,10 +9596,9 @@ msgstr "Veritabanını şuna yeniden adlandır:"
#: libraries/operations.lib.php:795 libraries/operations.lib.php:1026
#: libraries/operations.lib.php:1187 libraries/rte/rte_routines.lib.php:1101
#: libraries/tbl_columns_definition_form.lib.php:344
#, fuzzy
#| msgid "Edit Privileges"
msgid "Adjust Privileges"
msgstr "Yetkileri düzenle"
msgstr "Yetkileri ayarla"
#: libraries/operations.lib.php:113
#, php-format
@ -9789,10 +9790,10 @@ msgid "Table %s has been moved to %s. Privileges have been adjusted."
msgstr "%s tablosu %s üzerine taşındı. Yetkiler ayarlandı."
#: libraries/operations.lib.php:1962
#, fuzzy, php-format
#, php-format
#| msgid "Table %s has been copied to %s. Privileges have been realigned."
msgid "Table %s has been copied to %s. Privileges have been adjusted."
msgstr "%s tablosu %s üzerine kopyalandı. Yetkiler yeniden sıraya kondu."
msgstr "%s tablosu %s üzerine kopyalandı. Yetkiler ayarlandı."
#: libraries/operations.lib.php:1969
#, php-format
@ -11513,10 +11514,10 @@ msgid "Sorry, we failed to restore the dropped routine."
msgstr "Üzgünüm, kaldırılmış yordamı geri yükleme başarısız oldu."
#: libraries/rte/rte_routines.lib.php:382
#, fuzzy, php-format
#, php-format
#| msgid "Routine %1$s has been modified. Privileges have been realigned."
msgid "Routine %1$s has been modified. Privileges have been adjusted."
msgstr "Yordam %1$s değiştirildi. Yetkiler yeniden sıraya kondu."
msgstr "Yordam %1$s değiştirildi. Yetkiler ayarlandı."
#: libraries/rte/rte_routines.lib.php:387
#, php-format
@ -13927,13 +13928,12 @@ msgid "Effective"
msgstr "Etkili"
#: libraries/structure.lib.php:2678
#, fuzzy, php-format
#, php-format
#| msgid ""
#| "Table %1$s has been altered successfully. Privileges have been realigned."
msgid ""
"Table %1$s has been altered successfully. Privileges have been adjusted."
msgstr ""
"%1$s tablosu başarılı olarak değiştirildi. Yetkiler yeniden sıraya kondu."
msgstr "%1$s tablosu başarılı olarak değiştirildi. Yetkiler ayarlandı."
#: libraries/structure.lib.php:2682 libraries/tbl_indexes.lib.php:61
#: tbl_addfield.php:92

View File

@ -168,17 +168,12 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
/**
* Test for table navigation
*
* @param integer $pos_next the offset for the "next" page
* @param integer $pos_prev the offset for the "previous" page
* @param boolean $is_innodb the table type is innoDb or not
* @param string $output output from the _getTableNavigation method
*
* @return void
*
* @dataProvider providerForTestGetTableNavigation
*/
public function testGetTableNavigation(
$pos_next, $pos_prev, $is_innodb, $output
// $pos_next, $pos_prev, $is_innodb, $output
) {
$_SESSION['tmpval']['max_rows'] = '20';
$_SESSION['tmpval']['pos'] = true;