[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20793-g477f63e

Michal Čihař nijel at users.sourceforge.net
Thu Oct 6 09:21:28 CEST 2011


The branch, master has been updated
       via  477f63eabf4754f18271d7efd67bc00cadf94aca (commit)
       via  0ebae879ed50094123576522b1b0274c7f6f79ad (commit)
       via  14baa6eb4cc1a2fc41895950117ff7d6e6ea8dc0 (commit)
       via  5db9082d376cc36bd92f245d2ee3ac92d2e29c5c (commit)
       via  beead1c83744b591a51eb63de64bb3592fef3ea0 (commit)
       via  e7fbad228fb48171e142bf069bb09e0f31deb7f8 (commit)
       via  bff9e3aed41243236a24b23ff10e23cceb800c8d (commit)
       via  eba5ec4aaa4f89daca08afd69d368ad821ab6ea1 (commit)
       via  ae9e1e7105d7d48a1d85ac78efaf002c861867ee (commit)
       via  e453b0309f65a01b4705cd2f7581b861c68ec570 (commit)
       via  4ffb845526c66c3c05b0474be996e443344090c5 (commit)
       via  fca2a62831b4e5e105e9fa30507551225147c61f (commit)
       via  649a472d6b583f9b1e0d1d0f4c5cc5de3750e982 (commit)
       via  c947ac17834db9082e7dbcc3d51815a3a154117f (commit)
       via  e6d7415d7de5f198709e5e9b85afbfcfa4b63741 (commit)
       via  e11293885474412eb92d2ab7fdea54f761b5c846 (commit)
       via  97c1a4c4e1d7bb9b26ee6ace9d5ffa13be47c5f2 (commit)
      from  881dfb991bb0fbb9139d74898de7adf7cac9a934 (commit)


- Log -----------------------------------------------------------------
commit 477f63eabf4754f18271d7efd67bc00cadf94aca
Merge: 881dfb9 0ebae87
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Oct 6 09:20:51 2011 +0200

    Merge remote-tracking branch 'pootle/master'
    
    Conflicts:
    	po/fr.po

commit 0ebae879ed50094123576522b1b0274c7f6f79ad
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:57:20 2011 +0200

    Translation update done using Pootle.

commit 14baa6eb4cc1a2fc41895950117ff7d6e6ea8dc0
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:53:41 2011 +0200

    Translation update done using Pootle.

commit 5db9082d376cc36bd92f245d2ee3ac92d2e29c5c
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:52:56 2011 +0200

    Translation update done using Pootle.

commit beead1c83744b591a51eb63de64bb3592fef3ea0
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:46:54 2011 +0200

    Translation update done using Pootle.

commit e7fbad228fb48171e142bf069bb09e0f31deb7f8
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:46:29 2011 +0200

    Translation update done using Pootle.

commit bff9e3aed41243236a24b23ff10e23cceb800c8d
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:46:12 2011 +0200

    Translation update done using Pootle.

commit eba5ec4aaa4f89daca08afd69d368ad821ab6ea1
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:45:50 2011 +0200

    Translation update done using Pootle.

commit ae9e1e7105d7d48a1d85ac78efaf002c861867ee
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:43:39 2011 +0200

    Translation update done using Pootle.

commit e453b0309f65a01b4705cd2f7581b861c68ec570
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:43:16 2011 +0200

    Translation update done using Pootle.

commit 4ffb845526c66c3c05b0474be996e443344090c5
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:42:59 2011 +0200

    Translation update done using Pootle.

commit fca2a62831b4e5e105e9fa30507551225147c61f
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:42:17 2011 +0200

    Translation update done using Pootle.

commit 649a472d6b583f9b1e0d1d0f4c5cc5de3750e982
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:41:28 2011 +0200

    Translation update done using Pootle.

commit c947ac17834db9082e7dbcc3d51815a3a154117f
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:40:25 2011 +0200

    Translation update done using Pootle.

commit e6d7415d7de5f198709e5e9b85afbfcfa4b63741
Merge: e112938 6b786f7
Author: Pootle server <pootle at cihar.com>
Date:   Wed Oct 5 18:40:11 2011 +0200

    Merge remote-tracking branch 'origin/master'

commit e11293885474412eb92d2ab7fdea54f761b5c846
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:40:01 2011 +0200

    Translation update done using Pootle.

commit 97c1a4c4e1d7bb9b26ee6ace9d5ffa13be47c5f2
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Oct 5 18:39:12 2011 +0200

    Translation update done using Pootle.

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

Summary of changes:
 po/fr.po |   43 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/po/fr.po b/po/fr.po
index f772fac..9a65e33 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,7 +4,7 @@ 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-10-05 12:57-0400\n"
-"PO-Revision-Date: 2011-10-04 18:59+0200\n"
+"PO-Revision-Date: 2011-10-05 18:57+0200\n"
 "Last-Translator: Marc Delisle <marc at infomarc.info>\n"
 "Language-Team: french <fr at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -12516,6 +12516,9 @@ msgid ""
 "scan, including join queries that do not use indexes. Add indexes where "
 "applicable."
 msgstr ""
+"Ceci indique que plusieurs requêtes doivent effectuer un tri et/ou un "
+"balayage complet de table, incluant des jointures qui n'utilisent pas "
+"d'index. Ajouter des index si possible."
 
 #: po/advisory_rules.php:138
 #, php-format
@@ -12523,38 +12526,42 @@ msgid ""
 "Rate of reading fixed position average: %s, this value should be less than 1 "
 "per hour"
 msgstr ""
+"Taux de lecture d'une position fixe : %s, devrait être de moins de 1 par "
+"heure"
 
 #: po/advisory_rules.php:140
-#, fuzzy
 #| msgid "Where to show the table row links"
 msgid "Rate of reading next table row"
-msgstr "À quel endroit afficher les liens pour chaque ligne de données"
+msgstr "Taux de lecture de la ligne suivante"
 
 #: po/advisory_rules.php:141
-#, fuzzy
 #| msgid "Where to show the table row links"
 msgid "The rate of reading the next table row is high."
-msgstr "À quel endroit afficher les liens pour chaque ligne de données"
+msgstr "Le taux de lecture de la prochaine ligne dans la table est élevé."
 
 #: po/advisory_rules.php:142
 msgid ""
 "This indicates that many queries are doing full table scans. Add indexes "
 "where applicable."
 msgstr ""
+"Ceci indique que plusieurs requêtes doivent effectuer un balayage complet de "
+"table. Ajouter des index si possible."
 
 #: po/advisory_rules.php:143
 #, php-format
 msgid ""
 "Rate of reading next table row: %s, this value should be less than 1 per hour"
 msgstr ""
+"Taux de lecture de la prochaine ligne de table : %s, devrait être de moins "
+"de 1 par heure"
 
 #: po/advisory_rules.php:145
 msgid "tmp_table_size vs. max_heap_table_size"
-msgstr ""
+msgstr "tmp_table_size versus max_heap_table_size"
 
 #: po/advisory_rules.php:146
 msgid "tmp_table_size and max_heap_table_size are not the same."
-msgstr ""
+msgstr "tmp_table_size et max_heap_table_size n'ont pas la même valeur."
 
 #: po/advisory_rules.php:147
 msgid ""
@@ -12563,23 +12570,29 @@ msgid ""
 "wish to increase the in-memory table limit you will have to increase the "
 "other value as well."
 msgstr ""
+"Si vous avez intentionnellement changé l'une des valeurs : Le serveur "
+"utilise la plus petite valeur des deux pour déterminer la taille maximum des "
+"tables en mémoire. Si vous désirez augmenter cette taille, vous devez donc "
+"augmenter l'autre valeur."
 
 #: po/advisory_rules.php:148
 #, php-format
 msgid "Current values are tmp_table_size: %s, max_heap_table_size: %s"
 msgstr ""
+"Les valeurs courantes sont : tmp_table_size: %s, max_heap_table_size: %s"
 
 #: po/advisory_rules.php:150
-#, fuzzy
 #| msgid "Where to show the table row links"
 msgid "Percentage of temp tables on disk"
-msgstr "À quel endroit afficher les liens pour chaque ligne de données"
+msgstr "Pourcentage de tables temporaires sur disque"
 
 #: po/advisory_rules.php:151 po/advisory_rules.php:156
 msgid ""
 "Many temporary tables are being written to disk instead of being kept in "
 "memory."
 msgstr ""
+"Plusieurs tables temporaires sont écrites sur disque au lieu d'être "
+"conservées en mémoire."
 
 #: po/advisory_rules.php:152
 msgid ""
@@ -12591,6 +12604,13 @@ msgid ""
 "mentioned in the beginning of an <a href=\\\"http://www.facebook.com/note."
 "php?note_id=10150111255065841&comments\\\">Article by the Pythian Group</a>"
 msgstr ""
+"Augmenter {max_heap_table_size} et {tmp_table_size} pourrait aider. "
+"Cependant il y a toujours quelques tables temporaires qui sont écrites sur "
+"disque, peu importe la valeur de ces variables. Pour éliminer ces tables "
+"temporaires, il faut modifier les requêtes pour éviter ces conditions "
+"(Présence d'une colonne BLOB ou TEXT ou d'une colonne de taille supérieure à "
+"512 octets) tel que décrit dans cet <a href=\\\"http://www.facebook.com/note."
+"php?note_id=10150111255065841&comments\\\">arrticle par the Pythian Group</a>"
 
 #: po/advisory_rules.php:153
 #, php-format
@@ -12598,13 +12618,14 @@ msgid ""
 "%s%% of all temporary tables are being written to disk, this value should be "
 "below 25%%"
 msgstr ""
+"%s%% de toutes les tables temporaires sont écrites sur disque, cette valeur "
+"ne devrait pas dépasser 25%%"
 
 #: po/advisory_rules.php:155
-#, fuzzy
 #| msgid "%s table"
 #| msgid_plural "%s tables"
 msgid "Temp disk rate"
-msgstr "%s table"
+msgstr "Taux d'écriture des tables temporaires sur disque"
 
 #: po/advisory_rules.php:157
 msgid ""


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list