From a40ef5995d39560408d91311f9e896b36d927a3f Mon Sep 17 00:00:00 2001 From: bhargavi sabbisetty Date: Wed, 12 Apr 2017 15:07:53 +0000 Subject: [PATCH 1/3] Translated using Weblate (Telugu) Currently translated at 9.6% (308 of 3192 strings) [CI skip] --- po/te.po | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/po/te.po b/po/te.po index 06c78df9ec..daaf81451e 100644 --- a/po/te.po +++ b/po/te.po @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.1-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-04-10 13:08+0200\n" -"PO-Revision-Date: 2015-10-15 11:05+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Telugu \n" +"PO-Revision-Date: 2017-04-12 15:07+0000\n" +"Last-Translator: bhargavi sabbisetty \n" +"Language-Team: Telugu " +"\n" "Language: te\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.13\n" #: changelog.php:39 license.php:34 #, php-format @@ -24,10 +24,12 @@ msgid "" "The %s file is not available on this system, please visit %s for more " "information." msgstr "" +"%s1 ఫైలు ఈ సిస్టంలో అందుబాటులో లేదు, దయచేసి మరింత సమాచారం కొరకు %s2 " +"సందర్శించండి." #: db_central_columns.php:108 msgid "The central list of columns for the current database is empty." -msgstr "" +msgstr "ప్రస్తుత డేటాబేస్ కోసం నిలువు కేంద్ర జాబితా ఖాళీగా ఉంది." #: db_central_columns.php:133 msgid "Click to sort." @@ -41,7 +43,7 @@ msgstr "మరిన్ని అమరికలు" #: db_datadict.php:59 libraries/operations.lib.php:36 msgid "Database comment" -msgstr "డేటాబేస్ వ్యాఖ్య" +msgstr "డేటాబేస్ వ్యాఖ్యను" #: db_datadict.php:106 libraries/plugins/schema/pdf/PdfRelationSchema.php:596 #: templates/columns_definitions/column_definitions_form.phtml:89 From b3f6e5cdad97e6c0ae1ab7e1750c4ac8139a0204 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Tue, 18 Apr 2017 21:32:34 +0530 Subject: [PATCH 2/3] Fix Refresh of ProcessList Issue #13182 Specifically the error mentioned in the comment: https://github.com/phpmyadmin/phpmyadmin/issues/13182#issuecomment-294876981 Signed-off-by: Deven Bansod --- libraries/server_status_processes.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php index 7d31c582f4..75a1574e8a 100644 --- a/libraries/server_status_processes.lib.php +++ b/libraries/server_status_processes.lib.php @@ -228,8 +228,8 @@ function PMA_getHtmlForProcessListFilter() $retval = ''; $retval .= '
'; $retval .= '' . __('Filters') . ''; - $retval .= '
'; + $retval .= ''; + $retval .= URL::getHiddenInputs($url_params); $retval .= ''; $retval .= '
'; $retval .= ' Date: Tue, 18 Apr 2017 21:36:01 +0530 Subject: [PATCH 3/3] ChangeLog for b3f6e5cdad97e6c0ae1ab7e1750c4ac8139a0204 Signed-off-by: Deven Bansod --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 8a1c8274f5..e2b268b352 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - issue #13130 Fixed handling of errors in AJAX requests - issue #13152 Fixed PHP error in case of invalid table preferences - issue #13154 Fixed PHP error on password change +- issue Fix Refresh of Process List 4.7.0 (2017-03-28) - patch #12233 [Display] Improve message when renaming database to same name