[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-3782-g163d929

Michal Čihař nijel at users.sourceforge.net
Wed Jun 15 22:48:28 CEST 2011 

The branch, master has been updated
       via  163d929abb3ea91c7b8fe8e58f64d3da7fa91a4e (commit)
       via  0aa13c5497949196c156c9984b70b8c70fe56709 (commit)
       via  b7e0265f0ba1eaae64df80177e856d851811bd0a (commit)
       via  56a2e05ccd7c3dba725d00cdb7e18e7f32b94998 (commit)
       via  bbc1ff47aed0e24b8f8774222e715f098cc2c4d8 (commit)
       via  1924fe1690d9625f36e5fb176381ecccc19d7abe (commit)
       via  1f7452532f257f09fbfe1be3ce01a20f825570b5 (commit)
       via  dbc95a1114f3a8194dd72a5b664debd3cea7a9ad (commit)
       via  589272937f4458713a5cda41b19687113dc7b676 (commit)
       via  3bcdbd2b34f7d71383944364658a0684cadb7d2e (commit)
       via  baa7ffb28fa89caf989f3b3494450d1b3b413f57 (commit)
       via  19845079c29f08de54044e7b12d0c21b59a79dbe (commit)
       via  e65b1bec7aa9d6d158bcdc279086af822077806d (commit)
       via  63d4ddf9895e063f65aa573a0daeff2f58101e18 (commit)
       via  a22921f7b576217d6fdcca28dfaf7134e6bd047b (commit)
       via  5d16747f00a6492e70e36a60fc0232fa3ec92fd0 (commit)
       via  f347b564bee2e3ad90c90790ebb2e1cb11455d59 (commit)
       via  1c43a338610e023ce94f9484f73c2e8848b14a3f (commit)
       via  90c0dc425e350b091d73a55534f0d858e035e9a7 (commit)
      from  08861788590164bab28c8dbaa4f58eebd772a7bc (commit)


- Log -----------------------------------------------------------------
commit 163d929abb3ea91c7b8fe8e58f64d3da7fa91a4e
Merge: b7e0265f0ba1eaae64df80177e856d851811bd0a 0aa13c5497949196c156c9984b70b8c70fe56709
Author: Michal Čihař <michal at cihar.com>
Date:   Wed Jun 15 22:48:05 2011 +0200

    Merge remote-tracking branch 'tyron/master'

commit 0aa13c5497949196c156c9984b70b8c70fe56709
Author: Tyron Madlener <tyronx at gmail.com>
Date:   Wed Jun 15 19:20:19 2011 +0200

    No php5.3 dependency & fixes ajax requests broken

commit b7e0265f0ba1eaae64df80177e856d851811bd0a
Merge: 56a2e05ccd7c3dba725d00cdb7e18e7f32b94998 08861788590164bab28c8dbaa4f58eebd772a7bc
Author: Pootle server <pootle at cihar.com>
Date:   Wed Jun 15 18:40:06 2011 +0200

    Merge remote-tracking branch 'origin/master'

commit 56a2e05ccd7c3dba725d00cdb7e18e7f32b94998
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 17:03:18 2011 +0200

    Translation update done using Pootle.

commit bbc1ff47aed0e24b8f8774222e715f098cc2c4d8
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 17:03:12 2011 +0200

    Translation update done using Pootle.

commit 1924fe1690d9625f36e5fb176381ecccc19d7abe
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 17:03:06 2011 +0200

    Translation update done using Pootle.

commit 1f7452532f257f09fbfe1be3ce01a20f825570b5
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 17:02:57 2011 +0200

    Translation update done using Pootle.

commit dbc95a1114f3a8194dd72a5b664debd3cea7a9ad
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 17:02:47 2011 +0200

    Translation update done using Pootle.

commit 589272937f4458713a5cda41b19687113dc7b676
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 17:02:37 2011 +0200

    Translation update done using Pootle.

commit 3bcdbd2b34f7d71383944364658a0684cadb7d2e
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 17:02:08 2011 +0200

    Translation update done using Pootle.

commit baa7ffb28fa89caf989f3b3494450d1b3b413f57
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 17:01:34 2011 +0200

    Translation update done using Pootle.

commit 19845079c29f08de54044e7b12d0c21b59a79dbe
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 17:00:47 2011 +0200

    Translation update done using Pootle.

commit e65b1bec7aa9d6d158bcdc279086af822077806d
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 17:00:33 2011 +0200

    Translation update done using Pootle.

commit 63d4ddf9895e063f65aa573a0daeff2f58101e18
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 17:00:25 2011 +0200

    Translation update done using Pootle.

commit a22921f7b576217d6fdcca28dfaf7134e6bd047b
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 16:59:24 2011 +0200

    Translation update done using Pootle.

commit 5d16747f00a6492e70e36a60fc0232fa3ec92fd0
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 16:58:45 2011 +0200

    Translation update done using Pootle.

commit f347b564bee2e3ad90c90790ebb2e1cb11455d59
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 16:58:38 2011 +0200

    Translation update done using Pootle.

commit 1c43a338610e023ce94f9484f73c2e8848b14a3f
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 16:58:29 2011 +0200

    Translation update done using Pootle.

commit 90c0dc425e350b091d73a55534f0d858e035e9a7
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 15 16:58:22 2011 +0200

    Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes:
 po/en_GB.po       |   14 ++++++--------
 po/fr.po          |   28 ++++++++++------------------
 server_status.php |    5 +----
 3 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/po/en_GB.po b/po/en_GB.po
index b5b3572..ce8c8c8 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-06-15 08:36-0400\n"
-"PO-Revision-Date: 2011-06-15 02:35+0200\n"
+"PO-Revision-Date: 2011-06-15 16:58+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: english-gb <en_GB at li.org>\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -4900,24 +4900,22 @@ msgid "Language"
 msgstr "Language"
 
 #: libraries/display_tbl.lib.php:397
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Restore column order"
-msgstr "Textarea columns"
+msgstr "Restore column order"
 
 #: libraries/display_tbl.lib.php:411
 msgid "Drag to reorder"
-msgstr ""
+msgstr "Drag to reorder"
 
 #: libraries/display_tbl.lib.php:412
-#, fuzzy
 #| msgid "Click to select"
 msgid "Click to sort"
-msgstr "Click to select"
+msgstr "Click to sort"
 
 #: libraries/display_tbl.lib.php:413
 msgid "Click to mark/unmark"
-msgstr ""
+msgstr "Click to mark/unmark"
 
 #: libraries/display_tbl.lib.php:425
 #, php-format
diff --git a/po/fr.po b/po/fr.po
index 38c6b0e..9228b92 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,13 +4,13 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel at lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-06-15 08:36-0400\n"
-"PO-Revision-Date: 2011-06-15 14:46+0200\n"
+"PO-Revision-Date: 2011-06-15 17:03+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: french <fr at li.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -4960,24 +4960,22 @@ msgid "Language"
 msgstr "Langue"
 
 #: libraries/display_tbl.lib.php:397
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Restore column order"
-msgstr "Taille horizontale pour une zone de texte"
+msgstr "Restaurer l'ordre des colonnes"
 
 #: libraries/display_tbl.lib.php:411
 msgid "Drag to reorder"
-msgstr ""
+msgstr "Faire glisser pour réordonner"
 
 #: libraries/display_tbl.lib.php:412
-#, fuzzy
 #| msgid "Click to select"
 msgid "Click to sort"
-msgstr "Cliquer pour sélectionner"
+msgstr "Cliquer pour trier"
 
 #: libraries/display_tbl.lib.php:413
 msgid "Click to mark/unmark"
-msgstr ""
+msgstr "Cliquer pour marquer/enlever les marques"
 
 #: libraries/display_tbl.lib.php:425
 #, php-format
@@ -9764,40 +9762,34 @@ msgid "X-Axis:"
 msgstr "Axe des X"
 
 #: tbl_chart.php:113
-#, fuzzy
 #| msgid "SQL queries"
 msgid "Series:"
-msgstr "Requêtes SQL"
+msgstr "Séries:"
 
 #: tbl_chart.php:115
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "The remaining columns"
-msgstr "Taille horizontale pour une zone de texte"
+msgstr "Les colonnes restantes"
 
 #: tbl_chart.php:128
-#, fuzzy
 #| msgid "X Axis label"
 msgid "X-Axis label:"
 msgstr "Étiquette pour l'axe des X"
 
 #: tbl_chart.php:128
-#, fuzzy
 #| msgid "Value"
 msgid "X Values"
-msgstr "Valeur"
+msgstr "Valeurs en X"
 
 #: tbl_chart.php:129
-#, fuzzy
 #| msgid "Y Axis label"
 msgid "Y-Axis label:"
 msgstr "Étiquette pour l'axe des Y"
 
 #: tbl_chart.php:129
-#, fuzzy
 #| msgid "Value"
 msgid "Y Values"
-msgstr "Valeur"
+msgstr "Valeurs en Y"
 
 #: tbl_create.php:56
 #, php-format
diff --git a/server_status.php b/server_status.php
index 2f06abd..2c4739f 100644
--- a/server_status.php
+++ b/server_status.php
@@ -25,13 +25,10 @@ if (isset($_REQUEST['ajax_request'])) {
     // Prevent ajax requests from being cached
     header('Cache-Control: no-cache, must-revalidate'); // HTTP/1.1
     header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); // Date in the past
-    header_remove('Last-Modified');
     // Send correct charset
     header('Content-Type: text/html; charset=UTF-8');
 
-    if (isset($_REQUEST["query_chart"])) {
-        exit(createQueryChart());
-    }
+    // real-time charting data
     if(isset($_REQUEST['chart_data'])) {
         switch($_REQUEST['type']) {
             case 'proc':


hooks/post-receive
-- 
phpMyAdmin

More information about the Git mailing list