From 9263a6cb026603159887597cb4a724fdb30894c6 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Thu, 17 Jul 2014 22:21:21 +0200 Subject: [PATCH 1/5] Fix display of #4459 fix. Signed-off-by: Hugues Peccatte --- themes/original/css/navigation.css.php | 2 +- themes/pmahomme/css/navigation.css.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/original/css/navigation.css.php b/themes/original/css/navigation.css.php index 36d694c7ef..4ba541579b 100644 --- a/themes/original/css/navigation.css.php +++ b/themes/original/css/navigation.css.php @@ -129,7 +129,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) { } #pma_navigation_tree_content a.hover_show_full { position: relative; - z-index: 9999; + z-index: 100; } #pma_navigation_tree a { color: ; diff --git a/themes/pmahomme/css/navigation.css.php b/themes/pmahomme/css/navigation.css.php index b83414768a..3e7743df30 100644 --- a/themes/pmahomme/css/navigation.css.php +++ b/themes/pmahomme/css/navigation.css.php @@ -115,7 +115,7 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) { } #pma_navigation_tree_content a.hover_show_full { position: relative; - z-index: 9999; + z-index: 100; } #pma_navigation_tree a { color: ; From 976f65759c733e47f8e5708966e98cd086abf810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevdimali=20=C4=B0sa?= Date: Fri, 18 Jul 2014 13:46:17 +0200 Subject: [PATCH 2/5] Translated using Weblate (Azerbaijani) Currently translated at 45.9% (1272 of 2768) --- po/az.po | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/po/az.po b/po/az.po index 7e3a9be7d7..4a1ff6377a 100644 --- a/po/az.po +++ b/po/az.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-07-17 21:46+0200\n" +"PO-Revision-Date: 2014-07-18 13:46+0200\n" "Last-Translator: Sevdimali İsa \n" "Language-Team: Azerbaijani " "\n" @@ -1841,10 +1841,9 @@ msgid "You can also edit most values
by clicking directly on them." msgstr "" #: js/messages.php:365 -#, fuzzy #| msgid "Go to link." msgid "Go to link:" -msgstr "Bağlantıya get." +msgstr "Bağlantıya get:" #: js/messages.php:366 msgid "Copy column name." @@ -6709,7 +6708,6 @@ msgid "gzipped" msgstr "gzip olaraq" #: libraries/display_export.lib.php:619 -#, fuzzy #| msgid "Save as file" msgid "View output as text" msgstr "Çıxış verilənlərini mətn olaraq göstər" @@ -7257,7 +7255,6 @@ msgid "Binary" msgstr "" #: libraries/insert_edit.lib.php:658 -#, fuzzy #| msgid "Because of its length,
this field might not be editable " msgid "Because of its length,
this column might not be editable." msgstr "Uzun olduğuna görə,
bu sütun redaktə edilməyə bilər." @@ -8625,7 +8622,6 @@ msgstr "" "returned (Default: …) ." #: libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php:33 -#, fuzzy #| msgid "" #| "plays an image and a link; the field contains the filename. The first ion " #| "is a URL prefix like \"http://www.example.com/\". The second and rd " @@ -8635,12 +8631,11 @@ msgid "" "option is a URL prefix like \"http://www.example.com/\". The second and " "third options are the width and the height in pixels." msgstr "" -"Displays an image and a link, the field contains the filename; first option " -"is a prefix like \"http://domain.com/\", second option is the width in " -"pixels, third is the height." +"Bir rəsm və link göstərir, sütun fayl adını özündə ehtiva edir; ilk seçim \"" +"http://domain.com/\" kimi URL prefiksidir, ikinci və üçüncü seçim isə piksel " +"olaraq eni və hündürlüyü göstərir." #: libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php:33 -#, fuzzy #| msgid "" #| "plays a link; the field contains the filename. The first option is a " #| "prefix like \"http://www.example.com/\". The second option is a title " @@ -8650,8 +8645,9 @@ msgid "" "prefix like \"http://www.example.com/\". The second option is a title for " "the link." msgstr "" -"Displays a link, the field contains the filename; first option is a prefix " -"like \"http://domain.com/\", second option is a title for the link." +"Linki göstərir; sütun fayl adını ehtiva edir. Birinci seçim \"" +"http://www.example.com/\" kimi URL prefiksidir. İkinci seçim isə link " +"başlığıdır." #: libraries/relation.lib.php:90 msgid "not OK" @@ -12228,29 +12224,26 @@ msgid "Import/Export coordinates for relational schema" msgstr "Relational schema" #: pmd_general.php:155 -#, fuzzy #| msgid "Submit Query" msgid "Build Query" -msgstr "Emri İcra Et" +msgstr "Sorğu yarat" #: pmd_general.php:162 msgid "Move Menu" msgstr "" #: pmd_general.php:176 -#, fuzzy msgid "Hide/Show all" -msgstr "Hamısını göster" +msgstr "Hamısını Göstər/Gizlət" #: pmd_general.php:180 msgid "Hide/Show Tables with no relation" msgstr "" #: pmd_general.php:225 -#, fuzzy #| msgid "Number of rows per page" msgid "Number of tables:" -msgstr "Sehife başına düşen setir sayı" +msgstr "Cədvəl sayı:" #: pmd_general.php:502 msgid "Delete relation" @@ -12263,17 +12256,15 @@ msgstr "Relation view" #: pmd_general.php:557 pmd_general.php:616 pmd_general.php:746 #: pmd_general.php:865 -#, fuzzy #| msgid "Export" msgid "Except" -msgstr "Eksport" +msgstr "Xaric" #: pmd_general.php:563 pmd_general.php:624 pmd_general.php:752 #: pmd_general.php:871 -#, fuzzy #| msgid "in query" msgid "subquery" -msgstr "in query" +msgstr "alt sorğu" #: pmd_general.php:567 pmd_general.php:669 #, fuzzy From ba6569735b27ca8e0ec6e3e090f6df7557a64b99 Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Fri, 18 Jul 2014 13:33:41 +0200 Subject: [PATCH 3/5] Translated using Weblate (Interlingua) Currently translated at 57.3% (1587 of 2768) --- po/ia.po | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/po/ia.po b/po/ia.po index 50079d8d01..1a5bb7b5b5 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-07-16 09:24+0200\n" +"PO-Revision-Date: 2014-07-18 13:33+0200\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " "\n" @@ -7572,30 +7572,36 @@ msgid "" "The size of a transaction log before rollover, and a new log is created. The " "default value is 16MB." msgstr "" +"Le grandor de un registro (log) de transactiones ante le rollover, e un nove " +"registro (log) es create. Le valor predefinite es 16MB." #: libraries/engines/pbxt.lib.php:48 msgid "Transaction buffer size" -msgstr "" +msgstr "Grandor del buffer (tampon) de transaction" #: libraries/engines/pbxt.lib.php:49 msgid "" "The size of the global transaction log buffer (the engine allocates 2 " "buffers of this size). The default is 1MB." msgstr "" +"Le grandor del buffer (tampon) global de log (registro) de transaction (le " +"motor alloca 2 bufferes de iste dimension). Le valor predefinite es 1MB." #: libraries/engines/pbxt.lib.php:53 msgid "Checkpoint frequency" -msgstr "" +msgstr "Frequentia de checkpoint (puncto de verifica)" #: libraries/engines/pbxt.lib.php:54 msgid "" "The amount of data written to the transaction log before a checkpoint is " "performed. The default value is 24MB." msgstr "" +"Le quantitate d edatos scribite in le registro (log) de transaction ante que " +"on exeque un checkpoint (puncto de verifica). Le valor predefinite es 24MB." #: libraries/engines/pbxt.lib.php:58 msgid "Data log threshold" -msgstr "" +msgstr "Limine del log (registro) de datos" #: libraries/engines/pbxt.lib.php:59 msgid "" @@ -7607,7 +7613,7 @@ msgstr "" #: libraries/engines/pbxt.lib.php:63 msgid "Garbage threshold" -msgstr "" +msgstr "Limine de corbe (garbage)" #: libraries/engines/pbxt.lib.php:64 msgid "" From a19cb1a2d51b2db92706504cfe82c2424f617962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sevdimali=20=C4=B0sa?= Date: Fri, 18 Jul 2014 20:11:16 +0200 Subject: [PATCH 4/5] Translated using Weblate (Azerbaijani) Currently translated at 46.3% (1282 of 2768) --- po/az.po | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/po/az.po b/po/az.po index 4a1ff6377a..c8a7b1a731 100644 --- a/po/az.po +++ b/po/az.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-07-18 13:46+0200\n" +"PO-Revision-Date: 2014-07-18 20:11+0200\n" "Last-Translator: Sevdimali İsa \n" "Language-Team: Azerbaijani " "\n" @@ -10536,16 +10536,14 @@ msgid "per hour:" msgstr "saat başına:" #: libraries/server_status_queries.lib.php:47 -#, fuzzy #| msgid "per minute" msgid "per minute:" -msgstr "deqiqede" +msgstr "dəqiqədə:" #: libraries/server_status_queries.lib.php:54 -#, fuzzy #| msgid "per second" msgid "per second:" -msgstr "saniyede" +msgstr "saniyədə:" #: libraries/server_status_queries.lib.php:93 msgid "Statements" @@ -10583,10 +10581,9 @@ msgid "Show unformatted values" msgstr "Cedvelleri göster" #: libraries/server_status_variables.lib.php:98 -#, fuzzy #| msgid "Relations" msgid "Related links:" -msgstr "Relations" +msgstr "Əlaqəli linklər:" #: libraries/server_status_variables.lib.php:329 msgid "" @@ -10595,9 +10592,8 @@ msgid "" msgstr "" #: libraries/server_status_variables.lib.php:333 -#, fuzzy msgid "The number of failed attempts to connect to the MySQL server." -msgstr "Limits the number of new connections the user may open per hour." +msgstr "MySQL serverinə bağlanmaq üçün uğursuz cəhdlərin sayıdır." #: libraries/server_status_variables.lib.php:336 msgid "" @@ -11186,40 +11182,34 @@ msgid "No users were found belonging to this user group." msgstr "" #: libraries/server_user_groups.lib.php:65 libraries/server_users.lib.php:30 -#, fuzzy #| msgid "User" msgid "User groups" -msgstr "İstifadeçi" +msgstr "İstifadəçi qrupları" #: libraries/server_user_groups.lib.php:79 -#, fuzzy #| msgid "Server version" msgid "Server level tabs" -msgstr "Server versiyası" +msgstr "Server səviyyə pəncərələri" #: libraries/server_user_groups.lib.php:80 -#, fuzzy #| msgid "Databases" msgid "Database level tabs" -msgstr "Me'lumat Bazaları" +msgstr "Verilənlər Bazaları səviyyə pəncərələri" #: libraries/server_user_groups.lib.php:81 -#, fuzzy #| msgid "Table comments" msgid "Table level tabs" -msgstr "Cədvəl haqqında izahat" +msgstr "Cədvəl səviyyə pəncərələri" #: libraries/server_user_groups.lib.php:110 -#, fuzzy msgid "View users" -msgstr "Her hansı istifadeçi" +msgstr "İstifadəçiləri göstər" #: libraries/server_user_groups.lib.php:147 #: libraries/server_user_groups.lib.php:208 -#, fuzzy #| msgid "Any user" msgid "Add user group" -msgstr "Her hansı istifadeçi" +msgstr "İstifadəçi qrupları əlavə et" #: libraries/server_user_groups.lib.php:211 #, php-format From 77ef5f373635b87230cfd956811ad75c130f0bf5 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 18 Jul 2014 16:18:49 -0400 Subject: [PATCH 5/5] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index fa52a49901..45add24a09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.2.7.0 (not yet released) - bug Broken links on home page +- bug #4494 Overlap in navigation panel 4.2.6.0 (2014-07-17) - bug #4471 Undefined index warning with referenced column.