From 2f978adba9ca345064f38844dabb484d33a933c3 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Mon, 20 Jan 2014 10:27:29 +0530 Subject: [PATCH 01/10] Fix bug#4013 AJAX request waiting until version info is retrieved Signed-off-by: Atul Pratap Singh --- libraries/Config.class.php | 2 ++ libraries/Util.class.php | 3 +++ 2 files changed, 5 insertions(+) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 46da6c871e..25cacfaf4a 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -753,7 +753,9 @@ class PMA_Config curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5); curl_setopt($ch, CURLOPT_USERAGENT, 'phpMyAdmin/' . PMA_VERSION); curl_setopt($ch, CURLOPT_TIMEOUT, 5); + session_write_close(); $data = @curl_exec($ch); + session_start(); if ($data === false) { return null; } diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 3fbdf06369..8d9fd8ea52 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -4204,6 +4204,7 @@ class PMA_Util = 'Proxy-Authorization: Basic ' . $auth; } } + session_write_close(); $response = file_get_contents( $file, false, @@ -4241,6 +4242,7 @@ class PMA_Util CURLOPT_TIMEOUT, $connection_timeout ); + session_write_close(); $response = curl_exec($curl_handle); } } @@ -4251,6 +4253,7 @@ class PMA_Util && strlen($data->date) && $save ) { + session_start(); $_SESSION['cache']['version_check'] = array( 'response' => $response, 'timestamp' => time() From 14a031cee7a3b14ddc63b1ebdad55327f9a9e953 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Mon, 20 Jan 2014 10:38:17 +0530 Subject: [PATCH 02/10] version info was being added multiple times Signed-off-by: Atul Pratap Singh --- js/functions.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/functions.js b/js/functions.js index c9e9691947..634e7c9eed 100644 --- a/js/functions.js +++ b/js/functions.js @@ -129,7 +129,10 @@ function PMA_current_version(data) if (data && data.version && data.date) { var current = parseVersionString(pmaversion); var latest = parseVersionString(data.version); - var version_information_message = PMA_messages.strLatestAvailable + ' ' + escapeHtml(data.version); + var version_information_message = '' + + PMA_messages.strLatestAvailable + + ' ' + escapeHtml(data.version) + + ''; if (latest > current) { var message = $.sprintf( PMA_messages.strNewerVersion, @@ -146,6 +149,7 @@ function PMA_current_version(data) if (latest === current) { version_information_message = ' (' + PMA_messages.strUpToDate + ')'; } + $('#li_pma_version span').remove(); $('#li_pma_version').append(version_information_message); } } @@ -156,6 +160,7 @@ function PMA_current_version(data) function PMA_display_git_revision() { $('#is_git_revision').remove(); + $('#li_pma_version_git').remove(); $.get( "index.php", { From 7d0af6a8fd49ca348fa1a781609e7269d6dd0f89 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Sun, 19 Jan 2014 16:38:11 +0100 Subject: [PATCH 03/10] Translated using Weblate (Dutch) Currently translated at 100.0% (2749 of 2749) --- po/nl.po | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/po/nl.po b/po/nl.po index 95c2fe3358..924c8379d3 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-17 11:08+0200\n" +"PO-Revision-Date: 2014-01-19 16:38+0200\n" "Last-Translator: Dieter Adriaenssens \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -4472,7 +4472,6 @@ msgid "Highlight pointer" msgstr "Muispijl markeren" #: libraries/config/messages.inc.php:28 -#, fuzzy #| msgid "" #| "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " #| "import and export operations" @@ -4481,7 +4480,7 @@ msgid "" "import operations" msgstr "" "[a@http://nl.wikipedia.org/wiki/Bzip2]bzip2[/a]-compressie inschakelen voor " -"import- en exportbewerkingen" +"importbewerkingen" #: libraries/config/messages.inc.php:29 msgid "Bzip2" @@ -4559,7 +4558,6 @@ msgid "Check config file permissions" msgstr "Controleer de rechten op het configuratiebestand" #: libraries/config/messages.inc.php:43 -#, fuzzy #| msgid "" #| "Compress gzip/bzip2 exports on the fly without the need for much memory; " #| "if you encounter problems with created gzip/bzip2 files disable this " @@ -4568,9 +4566,9 @@ msgid "" "Compress gzip exports on the fly without the need for much memory; if you " "encounter problems with created gzip files disable this feature" msgstr "" -"Comprimeer gzip/bzip2-exports in een keer zonder dat er veel geheugen voor " -"nodig is; indien u problemen ondervindt met de gemaakte gzip/bzip2-" -"bestanden, schakel deze functie dan uit" +"Comprimeer gzip-exports in een keer zonder dat er veel geheugen voor nodig " +"is; indien u problemen ondervindt met de gemaakte gzip-bestanden, schakel " +"deze functie dan uit" #: libraries/config/messages.inc.php:44 msgid "Compress on the fly" @@ -10339,7 +10337,6 @@ msgid "Use text field" msgstr "Tekstveld gebruiken" #: libraries/server_privileges.lib.php:1310 -#, fuzzy #| msgid "" #| "An account already exists with the same username but possibly a different " #| "hostname. Are you sure you wish to proceed?" @@ -10348,7 +10345,7 @@ msgid "" "hostname. " msgstr "" "Er bestaat al een account met dezelfde gebruikersnaam maar mogelijk met een " -"andere hostnaam. Weet u zeker dat u wilt doorgaan?" +"andere hostnaam. " #: libraries/server_privileges.lib.php:1446 msgid "Do not change the password" From f5843a8482d1cc9ef96fd76431becce3c7841295 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 19 Jan 2014 15:29:07 +0100 Subject: [PATCH 04/10] Translated using Weblate (French) Currently translated at 100.0% (2749 of 2749) --- po/fr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index c7ac3d44a2..aeb94c4ffb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-15 20:48+0200\n" +"PO-Revision-Date: 2014-01-19 15:29+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: French \n" "Language: fr\n" @@ -10333,7 +10333,6 @@ msgid "Use text field" msgstr "Entrez une valeur" #: libraries/server_privileges.lib.php:1310 -#, fuzzy #| msgid "" #| "An account already exists with the same username but possibly a different " #| "hostname. Are you sure you wish to proceed?" @@ -10342,7 +10341,7 @@ msgid "" "hostname. " msgstr "" "Un compte existe déjà avec le même nom d'utilisateur, mais éventuellement un " -"nom d'hôte différent. Êtes-vous sûr de vouloir continuer ?" +"nom d'hôte différent. " #: libraries/server_privileges.lib.php:1446 msgid "Do not change the password" From f8c7897af35972de9f0984aca5814d8e915a0268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 20 Jan 2014 11:22:06 +0100 Subject: [PATCH 05/10] Translated using Weblate (Italian) Currently translated at 89.4% (2459 of 2749) --- po/it.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/it.po b/po/it.po index f17cd2f4fa..7e32f1ca99 100644 --- a/po/it.po +++ b/po/it.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-14 21:59+0200\n" -"Last-Translator: Giorgio Zanetti \n" +"PO-Revision-Date: 2014-01-20 11:22+0200\n" +"Last-Translator: Michal Čihař \n" "Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" @@ -1577,7 +1577,7 @@ msgstr "Caricamento…" #: js/messages.php:230 msgid "Request Aborted!!" -msgstr "" +msgstr "Richiesta interrotta!" #: js/messages.php:231 msgid "Processing Request" From efaf259ccdf00ddbf735f4805ef412cbec1870ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 20 Jan 2014 11:22:03 +0100 Subject: [PATCH 06/10] Translated using Weblate (Portuguese) Currently translated at 56.1% (1543 of 2749) --- po/pt.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/pt.po b/po/pt.po index 4536fe4d91..3b1af1d529 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-14 19:21+0200\n" -"Last-Translator: Nuno Ferreira \n" -"Language-Team: Portuguese \n" +"PO-Revision-Date: 2014-01-20 11:22+0200\n" +"Last-Translator: Michal Čihař \n" +"Language-Team: Portuguese " +"\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1574,7 +1574,7 @@ msgstr "Carregando…" #: js/messages.php:230 msgid "Request Aborted!!" -msgstr "" +msgstr "Pedido anulado!!" #: js/messages.php:231 msgid "Processing Request" From e777087c862066075bb7611bec43ec22c4eab572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Sun, 19 Jan 2014 15:51:21 +0100 Subject: [PATCH 07/10] Translated using Weblate (Spanish) Currently translated at 100.0% (2749 of 2749) --- po/es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index 58cdf57365..09acf1a5ca 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-16 15:38+0200\n" +"PO-Revision-Date: 2014-01-19 15:51+0200\n" "Last-Translator: Matías Bellone \n" "Language-Team: Spanish \n" "Language: es\n" @@ -10385,7 +10385,6 @@ msgid "Use text field" msgstr "Use el campo de texto" #: libraries/server_privileges.lib.php:1310 -#, fuzzy #| msgid "" #| "An account already exists with the same username but possibly a different " #| "hostname. Are you sure you wish to proceed?" @@ -10394,7 +10393,7 @@ msgid "" "hostname. " msgstr "" "Ya existe una cuenta con el mismo nombre de usuario pero posiblemente un " -"nombre de servidor diferente. ¿Seguro que desea proceder?" +"nombre de servidor diferente. " #: libraries/server_privileges.lib.php:1446 msgid "Do not change the password" From 2d379147be6975b1045598ccab3822e36716c8ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 20 Jan 2014 11:54:30 +0100 Subject: [PATCH 08/10] Translated using Weblate (Urdu) Currently translated at 27.1% (745 of 2749) --- po/ur.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ur.po b/po/ur.po index 7d6ffbab70..61ec98c023 100644 --- a/po/ur.po +++ b/po/ur.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-15 15:03+0200\n" -"Last-Translator: Mehbooob Khan \n" +"PO-Revision-Date: 2014-01-20 11:54+0200\n" +"Last-Translator: Michal Čihař \n" "Language-Team: Urdu \n" "Language: ur\n" "MIME-Version: 1.0\n" @@ -223,12 +223,12 @@ msgstr "کوائفیہ نام خالی ہے!" #: db_operations.php:130 #, php-format msgid "Database %1$s has been renamed to %2$s" -msgstr "کوائفیہ %2$ نام %1$ میں تبدیل ہو چکا ہے" +msgstr "کوائفیہ%1$s نام%2$s میں تبدیل ہوچکا ہے" #: db_operations.php:136 #, php-format msgid "Database %1$s has been copied to %2$s" -msgstr "کوائفیہ %1$ نام %2$ میں نقل کیا جاچکا ہے" +msgstr "کوائفیہ %1$s نام %2$s میں نقل کیا جاچکا ہے" #: db_operations.php:260 #, php-format From 764ee49b34f5b85fb3f1670bc5e4620716bc1e98 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Mon, 20 Jan 2014 15:14:35 +0100 Subject: [PATCH 09/10] Translated using Weblate (Greek) Currently translated at 100.0% (2749 of 2749) --- po/el.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/el.po b/po/el.po index 1912a08a6d..fd035ab7e0 100644 --- a/po/el.po +++ b/po/el.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-15 22:23+0200\n" +"PO-Revision-Date: 2014-01-20 15:14+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: Greek \n" "Language: el\n" @@ -10343,7 +10343,6 @@ msgid "Use text field" msgstr "Χρησιμοποιήστε το πεδίο κειμένου" #: libraries/server_privileges.lib.php:1310 -#, fuzzy #| msgid "" #| "An account already exists with the same username but possibly a different " #| "hostname. Are you sure you wish to proceed?" @@ -10352,7 +10351,7 @@ msgid "" "hostname. " msgstr "" "Ένας λογαριασμός με το ίδιο όνομα χρήστη υπάρχει ήδη αλλά πιθανά διαφορετικό " -"φιλοξενητή. Θέλετε να συνεχίσετε;" +"φιλοξενητή. " #: libraries/server_privileges.lib.php:1446 msgid "Do not change the password" From e61445e126a109d6477a799f7f272b5bef548f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Mon, 20 Jan 2014 15:46:14 +0100 Subject: [PATCH 10/10] Translated using Weblate (Estonian) Currently translated at 100.0% (2749 of 2749) --- po/et.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/et.po b/po/et.po index c9b8846d26..9285b055d1 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-15 20:16+0200\n" +"PO-Revision-Date: 2014-01-20 15:46+0200\n" "Last-Translator: Kristjan Räts \n" "Language-Team: Estonian \n" "Language: et\n" @@ -10159,7 +10159,6 @@ msgid "Use text field" msgstr "Kasuta tekstivälja" #: libraries/server_privileges.lib.php:1310 -#, fuzzy #| msgid "" #| "An account already exists with the same username but possibly a different " #| "hostname. Are you sure you wish to proceed?" @@ -10168,7 +10167,7 @@ msgid "" "hostname. " msgstr "" "Sama nimega kasutaja konto on on juba olemas, kuid ilmselt teise hosti " -"nimega. Kas oled jätkamises kindel?" +"nimega. " #: libraries/server_privileges.lib.php:1446 msgid "Do not change the password"