From 5a28dd33df053b517ca34e579c403f72584d149a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 3 Nov 2015 11:13:48 -0500 Subject: [PATCH 1/2] Fixes #11633 CodeMirror tooltip shows below modal window Signed-off-by: Marc Delisle --- ChangeLog | 1 + themes/pmahomme/css/codemirror.css.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ed2bc13cda..6191b2d7f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog - issue #11630 Warning: mysqli_fetch_array() expects parameter 1 to be mysqli_result, boolean given - issue #11632 Exporting GIS visualization ignores start and row count - issue #11476 Errors instead of git info when PHP has no gzip support +- issue #11633 CodeMirror tooltip shows below modal window 4.5.1.0 (2015-10-23) - issue Invalid argument supplied for foreach() diff --git a/themes/pmahomme/css/codemirror.css.php b/themes/pmahomme/css/codemirror.css.php index 8b3944334e..a7c6cb38ee 100644 --- a/themes/pmahomme/css/codemirror.css.php +++ b/themes/pmahomme/css/codemirror.css.php @@ -74,4 +74,7 @@ span.cm-number { } .CodeMirror-hints { z-index: 200; -} \ No newline at end of file +} +.CodeMirror-lint-tooltip { + z-index: 200; +} From 3c2d43f777116b88269cca39da368010a8d958f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Kate=C5=99i=C5=88=C3=A1k?= Date: Tue, 3 Nov 2015 07:59:05 +0100 Subject: [PATCH 2/2] Translated using Weblate (Czech) Currently translated at 94.1% (3040 of 3228 strings) [CI skip] --- po/cs.po | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/po/cs.po b/po/cs.po index 44e9754623..82fc6838ee 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-26 20:01-0400\n" -"PO-Revision-Date: 2015-09-03 10:02+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Czech \n" +"PO-Revision-Date: 2015-11-03 07:59+0200\n" +"Last-Translator: Petr Kateřiňák \n" +"Language-Team: Czech " +"\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 2.4-dev\n" +"X-Generator: Weblate 2.5-dev\n" #: changelog.php:37 license.php:30 #, php-format @@ -3496,10 +3496,9 @@ msgid "Relational key" msgstr "Relační klíč" #: libraries/DisplayResults.php:1728 -#, fuzzy #| msgid "Display foreign key relationships" msgid "Display column for relations" -msgstr "Zobrazit cizí klíče" +msgstr "Zobrazit sloupec pro relace" #: libraries/DisplayResults.php:1741 msgid "Show binary contents" @@ -3802,11 +3801,13 @@ msgstr "" msgid "" "Linting is disabled for this query because it exceeds the maximum length." msgstr "" +"Ověření syntaxe je pro tento dotaz vypnuto, protože překračuje maximální " +"délku." #: libraries/Linter.php:165 #, php-format msgid "%1$s (near %2$s)" -msgstr "" +msgstr "%1$s (poblíž %2$s)" #: libraries/Menu.php:198 libraries/ServerStatusData.php:422 #: libraries/config/messages.inc.php:933 @@ -4683,7 +4684,6 @@ msgid "Submit query" msgstr "Provést dotaz" #: libraries/Util.php:1275 libraries/config/messages.inc.php:898 -#, fuzzy #| msgid "Create PHP Code" msgid "Create PHP code" msgstr "Vytvořit PHP kód" @@ -4831,7 +4831,6 @@ msgid "Check privileges for database \"%s\"." msgstr "Zkontrolovat oprávnění pro databázi „%s“." #: libraries/build_html_for_db.lib.php:187 -#, fuzzy #| msgid "Check Privileges" msgid "Check privileges" msgstr "Zkontrolovat oprávnění" @@ -5534,6 +5533,8 @@ msgid "" "Find any errors in the query before executing it. Requires CodeMirror to be " "enabled." msgstr "" +"Vyhledání chyb v dotazu před jeho spuštěním. Je potřeba mít povolený " +"CodeMirror." #: libraries/config/messages.inc.php:67 msgid "Enable linter" @@ -5890,6 +5891,8 @@ msgid "" "Add IF NOT EXISTS (less efficient as indexes will be generated during table " "creation)" msgstr "" +"Přidat IF NOT EXISTS (méně účinné než generování klíčů během vytváření " +"tabulky)" #: libraries/config/messages.inc.php:211 msgid "Use ignore inserts" @@ -6372,7 +6375,7 @@ msgstr "Nepoužívat AUTO_INCREMENT pro nulové hodnoty" #, fuzzy #| msgid "Read misses" msgid "Read as multibytes" -msgstr "Výpadků při čtení" +msgstr "Číst jako řetězec" #: libraries/config/messages.inc.php:406 msgid "Initial state for sliders" @@ -6527,8 +6530,8 @@ msgid "" "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] " "([kbd]-1[/kbd] for no limit and [kbd]0[/kbd] for no change)." msgstr "" -"Počet bytů, které si může skript alokovat, např. [kbd]32M[/kbd] ([kbd]0[/" -"kbd] ruší omezení)." +"Počet bytů, které si může skript alokovat, např. [kbd]32M[/kbd] " +"([kbd]-1[/kbd] pro neomezené a [kbd]0[/kbd] pro žádnou změnu)." #: libraries/config/messages.inc.php:468 msgid "Memory limit"