- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. bb8a928926085b0833f8b75ed8d6fbcae1959758
by Michal Čihař 06 Mar '11

06 Mar '11

The branch, master has been updated via bb8a928926085b0833f8b75ed8d6fbcae1959758 (commit) via 16409a45227fb3238639e87cb5cebefdfd2421ae (commit) via a439bf6060b9c6a97bb01f75a59e7eb60af4d384 (commit) via 3953942bfffef6cabe396811ff69846db2c2b227 (commit) via f7869274c0e919a4d0d89fa039640899cf340a5e (commit) via 0febfe75ddec8328c9fbf80de59bc02bf1ac9741 (commit) via 1d6b0426bf1f635a752e4a3b4491c0d7daeb7b56 (commit) via c88164c5f4d841cd41dff908c4208697033ca69b (commit) via 3ae7a5c1edcfbbab82bd934bd64afd15f93add02 (commit) via 3c9c1b6c6b4a22f5f92fcc0a48a83ac4ee591066 (commit) via fd4a22f975395c3a3fdf09adefee4bafa72983f6 (commit) via 1cafa644d83f2c3ff9092f3477e6c62409d5eee0 (commit) via 8da3bb025e42c2f178d837c422a43b6b6b073b17 (commit) via 3585826c86621d43ee3cfbde6813b3a8c733aae6 (commit) via 60dbc094b09821b3c862d7871ed0bed8207fbe1a (commit) via 7f7d8674980bce0e46d90447025022fa3ea7ca2e (commit) via 59576cd858f9c8e032ae129ca1bc65437c070a8e (commit) from ecd0e5c75da79c31c16d205f3426b316bf14d29a (commit) - Log ----------------------------------------------------------------- commit bb8a928926085b0833f8b75ed8d6fbcae1959758 Author: Michal Čihař <michal(a)cihar.com> Date: Sun Mar 6 23:23:18 2011 +0100 Update generated docs commit 16409a45227fb3238639e87cb5cebefdfd2421ae Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:39:03 2011 +0200 Translation update done using Pootle. commit a439bf6060b9c6a97bb01f75a59e7eb60af4d384 Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:38:39 2011 +0200 Translation update done using Pootle. commit 3953942bfffef6cabe396811ff69846db2c2b227 Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:38:25 2011 +0200 Translation update done using Pootle. commit f7869274c0e919a4d0d89fa039640899cf340a5e Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:38:20 2011 +0200 Translation update done using Pootle. commit 0febfe75ddec8328c9fbf80de59bc02bf1ac9741 Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:38:02 2011 +0200 Translation update done using Pootle. commit 1d6b0426bf1f635a752e4a3b4491c0d7daeb7b56 Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:37:03 2011 +0200 Translation update done using Pootle. commit c88164c5f4d841cd41dff908c4208697033ca69b Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:36:29 2011 +0200 Translation update done using Pootle. commit 3ae7a5c1edcfbbab82bd934bd64afd15f93add02 Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:36:12 2011 +0200 Translation update done using Pootle. commit 3c9c1b6c6b4a22f5f92fcc0a48a83ac4ee591066 Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:35:40 2011 +0200 Translation update done using Pootle. commit fd4a22f975395c3a3fdf09adefee4bafa72983f6 Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:34:53 2011 +0200 Translation update done using Pootle. commit 1cafa644d83f2c3ff9092f3477e6c62409d5eee0 Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:33:56 2011 +0200 Translation update done using Pootle. commit 8da3bb025e42c2f178d837c422a43b6b6b073b17 Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:32:44 2011 +0200 Translation update done using Pootle. commit 3585826c86621d43ee3cfbde6813b3a8c733aae6 Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:31:55 2011 +0200 Translation update done using Pootle. commit 60dbc094b09821b3c862d7871ed0bed8207fbe1a Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:31:41 2011 +0200 Translation update done using Pootle. commit 7f7d8674980bce0e46d90447025022fa3ea7ca2e Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:28:38 2011 +0200 Translation update done using Pootle. commit 59576cd858f9c8e032ae129ca1bc65437c070a8e Author: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr> Date: Sun Mar 6 15:28:22 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: output/fr/Documentation.html | 88 ++++++++++++++++++++++------------------- output/fr/README | 2 +- po/fr.po | 88 +++++++++++++++++++---------------------- 3 files changed, 89 insertions(+), 89 deletions(-) diff --git a/output/fr/Documentation.html b/output/fr/Documentation.html index 904b193..c325cfc 100644 --- a/output/fr/Documentation.html +++ b/output/fr/Documentation.html @@ -900,15 +900,16 @@ versions et peut aussi être écrit 'http') Protocol">HTTP</abbr>'</tt>) tel qu'introduit dans la version 1.3.0 vous permet de vous connecter comme n'importe utilisateur MySQL valide via HTTP-Auth.</li> - <li>'signon' authentication mode (<tt>$auth_type = 'signon'</tt>) as -introduced in 2.10.0 allows you to log in from prepared PHP session -data. This is useful for implementing single signon from another -application. Sample way how to seed session is in signon example: -<code>scripts/signon.php</code>. There is also alternative example using -OpenID - <code>scripts/openid.php</code>. You need to configure <a -href="#cfg_Servers_SignonSession" class="configrule">session name</a> and <a -href="#cfg_Servers_SignonURL" class="configrule">signon URL</a> to use this -authentication method.</li> + <li>Le mode d'authentification 'signon' +(<tt>$auth_type = 'signon'</tt>) qui a été introduit dans la +version 2.10.0 vous permet de vous connecter à partir de données de session +préparée PHP. Ceci est utile pour la mise en &oelig;uvre d'une connexion +unique (single signon) à partir d'une autre application. Un exemple +pour alimenter une session se trouve dans : +<code>scripts/signon.php</code>. Vous aurez besoin de configurer <a +href="#cfg_Servers_SignonSession" class="configrule">session name</a> et <a +href="#cfg_Servers_SignonURL" class="configrule">signon URL</a> pour +utiliser ce mode d'authentification.</li> </ul> Veuillez consulter la section <a href="#setup">Installation</a> sur @@ -1585,13 +1586,15 @@ serveurs auxquels se connecter.<br /> Si vous n'avez qu'un seul serveur, <tt>$cfg['ServerDefault']</tt> DOIT être défini sur ce serveur.</dd> - <dt id="cfg_AjaxEnable">$cfg['AjaxEnable'] boolean</dt> - <dd>Defines whether to refresh only parts of certain pages using Ajax -techniques. Applies only where a non-Ajax behavior is possible; for example, -the Designer feature is Ajax-only so this directive does not apply to it.</dd> + <dt id="cfg_AjaxEnable">$cfg['AjaxEnable'] booléen</dt> + <dd>Définit le rafraîchissement de parties de certaines pages en utilisant les +techniques Ajax. S'applique seulement où le comportement non Ajax est +possible. Par exemple la fonctionnalité Designer ne fonctionne qu'en Ajax, +donc cette directive ne s'applique à celle-ci.</dd> - <dt id="cfg_VersionCheck">$cfg['VersionCheck'] boolean</dt> - <dd>Enables check for latest versions using javascript on main phpMyAdmin page.</dd> + <dt id="cfg_VersionCheck">$cfg['VersionCheck'] booléen</dt> + <dd>Active la vérification des dernières versions en utilisant JavaScript sur la +page principale de phpMyAdmin.</dd> <dt id="cfg_MaxDbList">$cfg['MaxDbList'] entier</dt> <dd>Le nombre maximum de noms de bases de données à afficher dans @@ -2299,11 +2302,13 @@ booléen <span id="cfg_ModifyDeleteAtRight">$cfg['ModifyDeleteAtRight']</span> booléen </dt> - <dd>Defines the place where table row links (Edit, Inline edit, Copy, Delete) -would be put when tables contents are displayed (you may have them displayed -both at the left and at the right). "Left" and "right" -are parsed as "top" and "bottom" with vertical display -mode.</dd> + <dd>Définit l'endroit où les liens modifier, modifier inline, +copier et supprimer seront affichés quand le contenu des tables est +affichée (vous pouvez les voir affichés à la fois +à gauche et à droite). « Gauche » et +« droite » sont traduits par +« haut » et « bas » en mode +d'affichage vertical.</dd> <dt id="cfg_DefaultDisplay">$cfg['DefaultDisplay'] chaîne</dt> <dd>Il existe trois modes d'affichage : 'horizontal', 'horizontalflipped' @@ -3303,19 +3308,19 @@ la commande « source » dans MySQL : <tt>source <a id="faqmysqlversions" href="#faq1_17">1.17 Quelles versions de MySQL sont gérées par phpMyAdmin ?</a></h4> -<p> Since phpMyAdmin 3.0.x, only MySQL 5.0.1 and newer are supported. For older -MySQL versions, you need to use the latest 2.x branch. phpMyAdmin can -connect to your MySQL server using PHP's classic <a -href="http://php.net/mysql">MySQL extension</a> as well as the <a -href="http://php.net/mysqli">improved MySQL extension (MySQLi)</a> that is -available in php 5.0. The latter one should be used unless you have a good -reason not to do so.<br /> - When compiling PHP, we strongly recommend that you manually link the MySQL -extension of your choice to a MySQL client library of at least the same -minor version since the one that is bundled with some PHP distributions is -rather old and might cause problems <a href="#faq1_17a"> (see <abbr -title="Frequently Asked Questions">FAQ</abbr> 1.17a)</a>.<br /><br /> - MariaDB is also supported (versions 5.1 and 5.2 were tested). +<p> Depuis phpMyAdmin 3.0.x, seules les versions 5.0.1 et supérieures de MySQL +5.0.1 sont gérées. Pour les versions plus anciennes de MySQL, vous devez +utiliser la branche 2.x. phpMyAdmin peut se connecter à votre serveur MySQL +en utilisant <a href="http://php.net/mysqli">l'extension MySQL améliorée +(MySQLi)</a> disponible dans php 5.0. Cette dernière doit être utilisée à +moins que vous n'ayez de bonnes raisons de ne pas le faire.<br /> + En compilant PHP, nous recommandons fortement de lier manuellement +l'extension MySQL de votre choix à une bibliothèque client MySQL d'au moins +la même version mineure, puisque celle qui est fournie avec les +distributions de PHP actuelles est plutôt ancienne et pourrait causer des +problèmes (voir également <a href="#faq1_17a"><abbr title="Foire Aux +Questions">FAQ</abbr> 1.17a</a>).<br /><br /> + MariaDB est également géré (les versions 5.1 et 5.2 ont été testées). </p> <h5 id="faq1_17a"> @@ -4111,14 +4116,14 @@ résultats, mais cela peut avoir un sérieux impact sur les performances.</p> <h4 id="faq3_12"> - <a href="#faq3_12">3.12 (withdrawn).</a></h4> + <a href="#faq1_12">1.12 (retiré).</a></h4> <h4 id="faq3_13"> <a href="#faq3_13">3.13 J'obtiens une erreur en saisissant <tt>USE</tt> suivi du nom d'une base de données contenant un trait d'union.</a></h4> <p> - The tests I have made with MySQL 5.1.49 shows that the API does not accept -this syntax for the USE command. + Les tests que j'ai effectués avec l'API actuelle de MySQL 5.1.49, +montre que cette API n'accepte pas cette syntaxe pour la commande USE. </p> <h4 id="faq3_14"> @@ -4989,8 +4994,9 @@ complète sera :<br /><br /> '%phpMyAdmin%'</code> <br /><br /> - You can use multiple occurrences of <b>/*[VARIABLE]*/</b> in a single query -(that is, multiple occurrences of the <i>same</i> variable).<br /> + Vous pouvez utiliser de multiples occurrences de <b>/*['VARIABLE']*/</b> +dans une seule requête (c'est-à-dire de multiples occurrences de la +<i>même</i> variable).<br /> <b>REMARQUEZ L'ABSENCE D'ESPACES</b> à l'intérieur de la construction « /**/ ». Tout espace inséré sera plus tard également inséré en @@ -5203,8 +5209,8 @@ autres. </p> <h4 id="faq6_29"> - <a href="#faq6_29">6.29 Why can't I get a chart from my query result -table?</a></h4> + <a href="#faq6_29">6.29 Pourquoi ne puis-je obtenir un graphique à partir de +ma table des résultats de requêtes ?</a></h4> <p> Toutes les tables ne peuvent pas permettre la création d'un graphique. Seules les tables ayant une, deux ou trois colonnes peuvent être @@ -5705,7 +5711,7 @@ href="http://www.acko.net/node/56">http://www.acko.net/node/56</a>).</li> <li>Nicola Asuni (Tecnick.com) <ul> - <li>TCPDF library (<a href="http://www.tcpdf.org">http://www.tcpdf.org</a>)</li> + <li>Bibliothèque TCPDF (<a href="http://www.tcpdf.org">http://www.tcpdf.org</a>)</li> </ul></li> <li>Michael Keck <mkkeck_at_users.sourceforge.net> diff --git a/output/fr/README b/output/fr/README index 974d7fa..09383e0 100644 --- a/output/fr/README +++ b/output/fr/README @@ -22,7 +22,7 @@ Copyright (C) 2001-2011 Garvin Hicking <me_at_supergarv.de> Michael Keck <mkkeck_at_users.sourceforge.net> Sebastian Mendel <cybot_tm_at_users.sourceforge.net> - [check Documentation.txt/.html file for more details] + [consulter le fichier Documentation.txt/html pour plus de détails] Licence ------- diff --git a/po/fr.po b/po/fr.po index b96714e..c73e67a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs VERSION\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-03-02 13:51+0100\n" -"PO-Revision-Date: 2011-01-21 03:44+0200\n" -"Last-Translator: <joe.bruss(a)live.fr>\n" +"PO-Revision-Date: 2011-03-06 15:39+0200\n" +"Last-Translator: CÃ©dric Corazza <cedric.corazza(a)wanadoo.fr>\n" "Language-Team: none\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -2158,7 +2158,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd><ul><li> #: orig-docs/Documentation.html:756 -#, fuzzy msgid "" "'signon' authentication mode (<tt>$auth_type = 'signon'</tt>) as " "introduced in 2.10.0 allows you to log in from prepared PHP session data. " @@ -2170,16 +2169,16 @@ msgid "" "href=\"#cfg_Servers_SignonURL\" class=\"configrule\">signon URL</a> to use " "this authentication method." msgstr "" -"le mode d'authentification 'signon' (<tt>$auth_type = 'signon'</" -"tt>) qui a été introduit dans la version 2.10.0 vous permet " -"de vous connecter à partir de données de session pré" -"parée PHP. Ceci est utile pour la mise en &oelig;uvre d'une connexion " +"Le mode d'authentification 'signon' " +"(<tt>$auth_type = 'signon'</tt>) qui a été introduit dans la " +"version 2.10.0 vous permet de vous connecter à partir de données de session " +"préparée PHP. Ceci est utile pour la mise en &oelig;uvre d'une connexion " "unique (single signon) à partir d'une autre application. Un exemple " -"pour alimenter une session se trouve dans : <code>scripts/signon.php</" -"code>. Vous aurez besoin de configurer <a href=\"#cfg_Servers_SignonSession" -"\" class=\"configrule\">session name</a> et <a href=\"#cfg_Servers_SignonURL" -"\" class=\"configrule\">signon URL</a> pour utiliser ce mode " -"d'authentification." +"pour alimenter une session se trouve dans : " +"<code>scripts/signon.php</code>. Vous aurez besoin de configurer <a " +"href=\"#cfg_Servers_SignonSession\" class=\"configrule\">session name</a> et <a " +"href=\"#cfg_Servers_SignonURL\" class=\"configrule\">signon URL</a> pour " +"utiliser ce mode d'authentification." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:774 @@ -3661,9 +3660,8 @@ msgstr "" #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1296 -#, fuzzy msgid "$cfg['AjaxEnable'] boolean" -msgstr "$cfg['BrowseMarkerEnable'] booléen" +msgstr "$cfg['AjaxEnable'] booléen" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1297 @@ -3672,18 +3670,23 @@ msgid "" "techniques. Applies only where a non-Ajax behavior is possible; for example, " "the Designer feature is Ajax-only so this directive does not apply to it." msgstr "" +"Définit le rafraîchissement de parties de certaines pages en utilisant les " +"techniques Ajax. S'applique seulement où le comportement non Ajax est " +"possible. Par exemple la fonctionnalité Designer ne fonctionne qu'en Ajax, " +"donc cette directive ne s'applique à celle-ci." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1302 -#, fuzzy msgid "$cfg['VersionCheck'] boolean" -msgstr "$cfg['PersistentConnections'] booléen" +msgstr "$cfg['VersionCheck'] booléen" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1303 msgid "" "Enables check for latest versions using javascript on main phpMyAdmin page." msgstr "" +"Active la vérification des dernières versions en utilisant JavaScript sur la " +"page principale de phpMyAdmin." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1306 @@ -5660,7 +5663,6 @@ msgstr "" #. type: Content of: <html><body><div><dl><dd> #: orig-docs/Documentation.html:1889 -#, fuzzy msgid "" "Defines the place where table row links (Edit, Inline edit, Copy, Delete) " "would be put when tables contents are displayed (you may have them displayed " @@ -5668,12 +5670,13 @@ msgid "" "are parsed as "top" and "bottom" with vertical display " "mode." msgstr "" -"Définit l'endroit où les liens modifier et supprimer seront " -"affichés quand le contenu des tables est affichée (vous pouvez " -"les voir affichés à la fois à gauche et à " -"droite). « Gauche » et « droite " -"» sont traduits par « haut » et « " -"bas » en mode d'affichage vertical." +"Définit l'endroit où les liens modifier, modifier inline, " +"copier et supprimer seront affichés quand le contenu des tables est " +"affichée (vous pouvez les voir affichés à la fois " +"à gauche et à droite). « Gauche » et " +"« droite » sont traduits par " +"« haut » et « bas » en mode " +"d'affichage vertical." #. type: Content of: <html><body><div><dl><dt> #: orig-docs/Documentation.html:1896 @@ -8145,7 +8148,6 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2743 -#, fuzzy msgid "" "Since phpMyAdmin 3.0.x, only MySQL 5.0.1 and newer are supported. For older " "MySQL versions, you need to use the latest 2.x branch. phpMyAdmin can " @@ -8157,14 +8159,12 @@ msgstr "" "Depuis phpMyAdmin 3.0.x, seules les versions 5.0.1 et supérieures de MySQL " "5.0.1 sont gérées. Pour les versions plus anciennes de MySQL, vous devez " "utiliser la branche 2.x. phpMyAdmin peut se connecter à votre serveur MySQL " -"en utilisant l'extension PHP classique <a href=\"http://php.net/mysql" -"\">MySQL</a> ou <a href=\"http://php.net/mysqli\">l'extension MySQL " -"améliorée (MySQLi)</a> disponible dans php 5.0. Cette dernière doit être " -"utilisée à moins que vous n'ayez de bonnes raisons de ne pas le faire." +"en utilisant <a href=\"http://php.net/mysqli\">l'extension MySQL améliorée " +"(MySQLi)</a> disponible dans php 5.0. Cette dernière doit être utilisée à " +"moins que vous n'ayez de bonnes raisons de ne pas le faire." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2750 -#, fuzzy msgid "" "When compiling PHP, we strongly recommend that you manually link the MySQL " "extension of your choice to a MySQL client library of at least the same " @@ -8182,7 +8182,7 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:2755 msgid "MariaDB is also supported (versions 5.1 and 5.2 were tested)." -msgstr "" +msgstr "MariaDB est également géré (les versions 5.1 et 5.2 ont été testées)." #. type: Content of: <html><body><div><h5> #: orig-docs/Documentation.html:2759 @@ -10006,9 +10006,8 @@ msgstr "" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3412 -#, fuzzy msgid "<a href=\"#faq3_12\">3.12 (withdrawn).</a>" -msgstr "<a href=\"#faq1_13\">1.13 (retiré).</a>" +msgstr "<a href=\"#faq1_12\">1.12 (retiré).</a>" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3415 @@ -10021,17 +10020,12 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:3419 -#, fuzzy msgid "" "The tests I have made with MySQL 5.1.49 shows that the API does not accept " "this syntax for the USE command." msgstr "" -"Les tests que j'ai effectués avec l'API actuelle de MySQL 4.1.11, " -"montre que cette API n'accepte pas cette syntaxe pour la commande USE. En " -"encadrant le nom de la base de données avec des apostrophes " -"inversées (« ` »), cela fonctionne. Pour " -"ajouter encore à la confusion, aucune apostrophe inversée " -"n'est nécessaire en ligne de commande mysql." +"Les tests que j'ai effectués avec l'API actuelle de MySQL 5.1.49, " +"montre que cette API n'accepte pas cette syntaxe pour la commande USE." #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:3424 @@ -11980,13 +11974,13 @@ msgstr "" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4140 -#, fuzzy msgid "" "You can use multiple occurrences of <b>/*[VARIABLE]*/</b> in a single query " "(that is, multiple occurrences of the <i>same</i> variable)." msgstr "" "Vous pouvez utiliser de multiples occurrences de <b>/*['VARIABLE']*/</b> " -"dans une seule requête." +"dans une seule requête (c'est-à-dire de multiples occurrences de la " +"<i>même</i> variable)." #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4141 @@ -12499,13 +12493,12 @@ msgstr "" #. type: Content of: <html><body><div><h4> #: orig-docs/Documentation.html:4316 -#, fuzzy msgid "" "<a href=\"#faq6_29\">6.29 Why can't I get a chart from my query result table?" "</a>" msgstr "" -"<a href=\"#faq6_29\">6.28 Pourquoi ne puis-je obtenir un graphique à partir " -"de ma table des résultats de requêtes ?</a>" +"<a href=\"#faq6_29\">6.29 Pourquoi ne puis-je obtenir un graphique à partir de " +"ma table des résultats de requêtes ?</a>" #. type: Content of: <html><body><div><p> #: orig-docs/Documentation.html:4318 @@ -13709,13 +13702,14 @@ msgstr "support MySQLi" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4763 msgid "Nicola Asuni (Tecnick.com)" -msgstr "" +msgstr "Nicola Asuni (Tecnick.com)" #. type: Content of: <html><body><div><ul><li><ul><li> #: orig-docs/Documentation.html:4765 msgid "" "TCPDF library (<a href=\"http://www.tcpdf.org\">http://www.tcpdf.org</a>)" msgstr "" +"Bibliothèque TCPDF (<a href=\"http://www.tcpdf.org\">http://www.tcpdf.org</a>)" #. type: Content of: <html><body><div><ul><li> #: orig-docs/Documentation.html:4769 @@ -15047,7 +15041,7 @@ msgstr "" #. type: Plain text #: orig-docs/README:26 -#, fuzzy, no-wrap +#, no-wrap msgid "" "Copyright (C) 2001-2011\n" " Marc Delisle <marc_at_infomarc.info>\n" @@ -15060,7 +15054,7 @@ msgid "" " Sebastian Mendel <cybot_tm_at_users.sourceforge.net>\n" " [check Documentation.txt/.html file for more details]\n" msgstr "" -"Copyright (C) 2001-2010\n" +"Copyright (C) 2001-2011\n" " Marc Delisle <marc_at_infomarc.info>\n" " Olivier Müller <om_at_omnis.ch>\n" " Robin Johnson <robbat2_at_users.sourceforge.net>\n" hooks/post-receive -- phpMyAdmin localized documentation

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1896-g23b98fb
by Michal Čihař 06 Mar '11

06 Mar '11

The branch, master has been updated via 23b98fbd4a1f362c26aea71533d9ff481d9f865e (commit) via a1959e405752e603228faba89e7a29cee300846b (commit) via 8ae23bad506cc5f7ca28d06167fabbc0ecaa7a3a (commit) via bb223e80af04207a20f70247207d5d039387cac7 (commit) via 3cb5920e89852a9bf46d12e7dabe025acb00c083 (commit) via a1f8d424f2e8736f85624e4a0aae867f06c6823b (commit) via a49b7b9e3e2732fecae699e1d645427db7385933 (commit) via d63bf7089273b7ecce88d86f50ae1f9350eb0899 (commit) via 2d88999cdf709e93bc7df87dd4ea09d1ca43a04b (commit) via 43c13643e7c8b17c0b7639762a8c928c09b34bb9 (commit) via bab9c4233bcbcfac4c44c569d4d102d597118f72 (commit) via 35c22d30a5c16cf5621df5d892bcecfa25ae9d6e (commit) via d5608784f907276cbdc0fecb5eeb5e132f2eb588 (commit) via 4410529605ee28d783770c5e5fafe7b7629f7598 (commit) via 8dfa78ae114a88435d4dcf3019faa909380b1804 (commit) via d6eb81f911ec57aa362949c51c7eae81dcc3d999 (commit) via ae30b6cdf0c1f24272e98540ed207ff4b87fd00b (commit) via 9a68c4f47d7bff698285857fe104efa5e7059849 (commit) via 3d00123faad53c052ed804df9b12b3293dbd6665 (commit) via 88401dd991530b36b6ac7d9b3d09994318aeec0b (commit) via 131374267935c0701e2411d02b7ba329dd9e9709 (commit) via 114b5595c77cc681f473ca2dadbaca7277083c9d (commit) via 0e21963e99c20fee9c95e70781e8b41a630f25a8 (commit) via b0804c6f3391165941cb11b931869f6e0a01a5f9 (commit) via 842a99d83c54ca75af18891a33b268e7a2db2ade (commit) via e6ed796d99d35c06ea961f2ef764c7522fcfd770 (commit) via db3f00e68060c7a6f6e4d7bc07126caae8b376cf (commit) via f3b4bf01e7a705cb3e320557270bbcc528f396f1 (commit) via c32f10b9bd56be57214b71e2c0964b5d9bd38b70 (commit) via a6b480553c83d156d584be67a4b3dd66d64d45f2 (commit) via d58a0b4898e284dceccebe3d49f711f94dbbeeb3 (commit) via 4112786f5a05c8f34405ccd0d84548cbad265d98 (commit) via 79d502ace44f6b1ff5b3a516327e24d57f9de250 (commit) via 38dcdcafb0cd16b5569c1333e730939a5a1c0b61 (commit) via 80c67f3342a9434fbf9ac1d4293190bf2c78f286 (commit) via 80099a3944007d4b7f2388119b61f84bcf298af6 (commit) via 0237002b77175eef1f0fa65f073645fe474e5ed3 (commit) via bddfd49a3d1a007501c4e91a53a710121dffdbfe (commit) via 95eceb546dbdaf7c5fca61780362896e605c18ce (commit) via 92d6b954ee5293b4286ced2441b4e4478f9f2926 (commit) via b388087a2e64879023a1a54db22af8ea10f295a8 (commit) via 9e8f466672a55dbd3671d586ad28b0ca864bf489 (commit) via 737736911ad40772a9f34fca9734a5e4050350ee (commit) via a51bd56f774e71224c7dfa23420a7b24bca5f824 (commit) via 7274db2de45a6ffdea0e97a097f93e2cb6052ea5 (commit) via fef28bf84f50bd701b883c874503be9c79118ec2 (commit) via 8e2d9ef52f8899862c631004170e83cc90603472 (commit) via f01c1fcc2fa8fdf5637be6d00be9394dc8a68868 (commit) via 30f5c65b02d2bc768c8ac0e0e3b1a6bfdc0ac4ce (commit) via 1edea7e293e94ab7e1ca8644a8e1bb2d210e3cf2 (commit) via f0d7303617ea41cdd17e5f0b3f8d9611de8dd0be (commit) via b0da7225e1a106045e153832f859075e1db0e562 (commit) via b3c1ac13273d9e41144507569740d4e08889f368 (commit) via 4c37cd27d670811b2e922c30c932a3a3b697842b (commit) via 532ced109154dc4a8d5d8a4bd0080eb77ca6b6d6 (commit) via 99d7fabba96ec77d103914ec66e25e1ea34dd49e (commit) via 288b0395fca5a276306df207955454d0acfbb7e7 (commit) via 0058d590ecb3ec82e64fe1f5083905aee1b0105c (commit) via 4cd7a737c5e9d3bfa44d40edfb77a449e1397c5c (commit) via 24022cc493e230aa8f181e8a2450f6db6920ee35 (commit) via c3c40b555a529ef825452120e7e6a9a14da43751 (commit) via 317d55f554e1064d299e9d192e577c42ca719c54 (commit) via 258561d579640065d3be64b1cd06b3aed348e1d5 (commit) via cccf0c98143ce2adde359c33ae2a48a989066806 (commit) via b78fed2f33172f31f18f9b222767aa62d544bb60 (commit) via 1b633da39093e03b8a656d195cab7998dbd4641c (commit) via a36951decd14e26131038cc436452d13d35ec647 (commit) via ec8250d1467c90fed571990ec9ab03d2ec1a2e12 (commit) via bec25dd42393d66f5e5f10a7e6bc38af83165ddb (commit) via f377ab049b1a143ec47873bc5070b9c280c1a1c7 (commit) via ebac99071657dd76982f2670dbc8259f26fa9b41 (commit) via 31169cc95769360a7210b97a24180074cfcba667 (commit) via f1186a06fa6d9182c8bcf30c475774d2ee649d45 (commit) via d45bdb439709ef9df8a86bb7bace9444d27ea5a9 (commit) via b7e5185c58f1c2c88b021465ed1e076d749fbc93 (commit) via cce9f9104477df8c1b4fb576f9c6a6a405a36304 (commit) via 6434c319a5c5b8f254730235cbb094a8869759ab (commit) via 1659073f015d6da4a88ce1f14ec007dde4b615b8 (commit) via 24607715c131d8dd3b6aa595b0967d0209793902 (commit) via 544614fe9ebdf8dc4eefa5aa53574087a8792de4 (commit) via 3c3415d7e4e7cbd867f2a3be77f1c1824e1b1dee (commit) from dfa4668fe6d814e9a008bde1ed343d2eb60de680 (commit) - Log ----------------------------------------------------------------- commit 23b98fbd4a1f362c26aea71533d9ff481d9f865e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:57:04 2011 +0200 Translation update done using Pootle. commit a1959e405752e603228faba89e7a29cee300846b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:56:41 2011 +0200 Translation update done using Pootle. commit 8ae23bad506cc5f7ca28d06167fabbc0ecaa7a3a Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:56:06 2011 +0200 Translation update done using Pootle. commit bb223e80af04207a20f70247207d5d039387cac7 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:55:46 2011 +0200 Translation update done using Pootle. commit 3cb5920e89852a9bf46d12e7dabe025acb00c083 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:55:20 2011 +0200 Translation update done using Pootle. commit a1f8d424f2e8736f85624e4a0aae867f06c6823b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:55:12 2011 +0200 Translation update done using Pootle. commit a49b7b9e3e2732fecae699e1d645427db7385933 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:55:06 2011 +0200 Translation update done using Pootle. commit d63bf7089273b7ecce88d86f50ae1f9350eb0899 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:55:01 2011 +0200 Translation update done using Pootle. commit 2d88999cdf709e93bc7df87dd4ea09d1ca43a04b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:54:32 2011 +0200 Translation update done using Pootle. commit 43c13643e7c8b17c0b7639762a8c928c09b34bb9 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:54:27 2011 +0200 Translation update done using Pootle. commit bab9c4233bcbcfac4c44c569d4d102d597118f72 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:54:19 2011 +0200 Translation update done using Pootle. commit 35c22d30a5c16cf5621df5d892bcecfa25ae9d6e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:54:12 2011 +0200 Translation update done using Pootle. commit d5608784f907276cbdc0fecb5eeb5e132f2eb588 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:53:59 2011 +0200 Translation update done using Pootle. commit 4410529605ee28d783770c5e5fafe7b7629f7598 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:53:49 2011 +0200 Translation update done using Pootle. commit 8dfa78ae114a88435d4dcf3019faa909380b1804 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:53:43 2011 +0200 Translation update done using Pootle. commit d6eb81f911ec57aa362949c51c7eae81dcc3d999 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:53:30 2011 +0200 Translation update done using Pootle. commit ae30b6cdf0c1f24272e98540ed207ff4b87fd00b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:53:12 2011 +0200 Translation update done using Pootle. commit 9a68c4f47d7bff698285857fe104efa5e7059849 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:53:04 2011 +0200 Translation update done using Pootle. commit 3d00123faad53c052ed804df9b12b3293dbd6665 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:52:55 2011 +0200 Translation update done using Pootle. commit 88401dd991530b36b6ac7d9b3d09994318aeec0b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:52:48 2011 +0200 Translation update done using Pootle. commit 131374267935c0701e2411d02b7ba329dd9e9709 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:52:41 2011 +0200 Translation update done using Pootle. commit 114b5595c77cc681f473ca2dadbaca7277083c9d Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:52:31 2011 +0200 Translation update done using Pootle. commit 0e21963e99c20fee9c95e70781e8b41a630f25a8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:52:19 2011 +0200 Translation update done using Pootle. commit b0804c6f3391165941cb11b931869f6e0a01a5f9 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:52:13 2011 +0200 Translation update done using Pootle. commit 842a99d83c54ca75af18891a33b268e7a2db2ade Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:52:07 2011 +0200 Translation update done using Pootle. commit e6ed796d99d35c06ea961f2ef764c7522fcfd770 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:52:01 2011 +0200 Translation update done using Pootle. commit db3f00e68060c7a6f6e4d7bc07126caae8b376cf Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:51:54 2011 +0200 Translation update done using Pootle. commit f3b4bf01e7a705cb3e320557270bbcc528f396f1 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:51:48 2011 +0200 Translation update done using Pootle. commit c32f10b9bd56be57214b71e2c0964b5d9bd38b70 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:51:39 2011 +0200 Translation update done using Pootle. commit a6b480553c83d156d584be67a4b3dd66d64d45f2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:51:32 2011 +0200 Translation update done using Pootle. commit d58a0b4898e284dceccebe3d49f711f94dbbeeb3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:51:21 2011 +0200 Translation update done using Pootle. commit 4112786f5a05c8f34405ccd0d84548cbad265d98 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:51:10 2011 +0200 Translation update done using Pootle. commit 79d502ace44f6b1ff5b3a516327e24d57f9de250 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:50:56 2011 +0200 Translation update done using Pootle. commit 38dcdcafb0cd16b5569c1333e730939a5a1c0b61 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:50:47 2011 +0200 Translation update done using Pootle. commit 80c67f3342a9434fbf9ac1d4293190bf2c78f286 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:50:37 2011 +0200 Translation update done using Pootle. commit 80099a3944007d4b7f2388119b61f84bcf298af6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:50:27 2011 +0200 Translation update done using Pootle. commit 0237002b77175eef1f0fa65f073645fe474e5ed3 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:50:02 2011 +0200 Translation update done using Pootle. commit bddfd49a3d1a007501c4e91a53a710121dffdbfe Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:49:51 2011 +0200 Translation update done using Pootle. commit 95eceb546dbdaf7c5fca61780362896e605c18ce Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:49:21 2011 +0200 Translation update done using Pootle. commit 92d6b954ee5293b4286ced2441b4e4478f9f2926 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:48:32 2011 +0200 Translation update done using Pootle. commit b388087a2e64879023a1a54db22af8ea10f295a8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:47:31 2011 +0200 Translation update done using Pootle. commit 9e8f466672a55dbd3671d586ad28b0ca864bf489 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:47:24 2011 +0200 Translation update done using Pootle. commit 737736911ad40772a9f34fca9734a5e4050350ee Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:47:07 2011 +0200 Translation update done using Pootle. commit a51bd56f774e71224c7dfa23420a7b24bca5f824 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:46:45 2011 +0200 Translation update done using Pootle. commit 7274db2de45a6ffdea0e97a097f93e2cb6052ea5 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:46:34 2011 +0200 Translation update done using Pootle. commit fef28bf84f50bd701b883c874503be9c79118ec2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:46:27 2011 +0200 Translation update done using Pootle. commit 8e2d9ef52f8899862c631004170e83cc90603472 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:45:49 2011 +0200 Translation update done using Pootle. commit f01c1fcc2fa8fdf5637be6d00be9394dc8a68868 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:45:21 2011 +0200 Translation update done using Pootle. commit 30f5c65b02d2bc768c8ac0e0e3b1a6bfdc0ac4ce Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:44:54 2011 +0200 Translation update done using Pootle. commit 1edea7e293e94ab7e1ca8644a8e1bb2d210e3cf2 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:43:37 2011 +0200 Translation update done using Pootle. commit f0d7303617ea41cdd17e5f0b3f8d9611de8dd0be Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:42:30 2011 +0200 Translation update done using Pootle. commit b0da7225e1a106045e153832f859075e1db0e562 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:42:03 2011 +0200 Translation update done using Pootle. commit b3c1ac13273d9e41144507569740d4e08889f368 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:41:10 2011 +0200 Translation update done using Pootle. commit 4c37cd27d670811b2e922c30c932a3a3b697842b Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:38:54 2011 +0200 Translation update done using Pootle. commit 532ced109154dc4a8d5d8a4bd0080eb77ca6b6d6 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:37:29 2011 +0200 Translation update done using Pootle. commit 99d7fabba96ec77d103914ec66e25e1ea34dd49e Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:34:07 2011 +0200 Translation update done using Pootle. commit 288b0395fca5a276306df207955454d0acfbb7e7 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:31:53 2011 +0200 Translation update done using Pootle. commit 0058d590ecb3ec82e64fe1f5083905aee1b0105c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:31:39 2011 +0200 Translation update done using Pootle. commit 4cd7a737c5e9d3bfa44d40edfb77a449e1397c5c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:31:31 2011 +0200 Translation update done using Pootle. commit 24022cc493e230aa8f181e8a2450f6db6920ee35 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:31:17 2011 +0200 Translation update done using Pootle. commit c3c40b555a529ef825452120e7e6a9a14da43751 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:30:50 2011 +0200 Translation update done using Pootle. commit 317d55f554e1064d299e9d192e577c42ca719c54 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:30:33 2011 +0200 Translation update done using Pootle. commit 258561d579640065d3be64b1cd06b3aed348e1d5 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:28:58 2011 +0200 Translation update done using Pootle. commit cccf0c98143ce2adde359c33ae2a48a989066806 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:28:49 2011 +0200 Translation update done using Pootle. commit b78fed2f33172f31f18f9b222767aa62d544bb60 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:28:04 2011 +0200 Translation update done using Pootle. commit 1b633da39093e03b8a656d195cab7998dbd4641c Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:26:52 2011 +0200 Translation update done using Pootle. commit a36951decd14e26131038cc436452d13d35ec647 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:26:10 2011 +0200 Translation update done using Pootle. commit ec8250d1467c90fed571990ec9ab03d2ec1a2e12 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:25:41 2011 +0200 Translation update done using Pootle. commit bec25dd42393d66f5e5f10a7e6bc38af83165ddb Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:24:06 2011 +0200 Translation update done using Pootle. commit f377ab049b1a143ec47873bc5070b9c280c1a1c7 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:22:49 2011 +0200 Translation update done using Pootle. commit ebac99071657dd76982f2670dbc8259f26fa9b41 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:22:13 2011 +0200 Translation update done using Pootle. commit 31169cc95769360a7210b97a24180074cfcba667 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:21:51 2011 +0200 Translation update done using Pootle. commit f1186a06fa6d9182c8bcf30c475774d2ee649d45 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:20:46 2011 +0200 Translation update done using Pootle. commit d45bdb439709ef9df8a86bb7bace9444d27ea5a9 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:20:23 2011 +0200 Translation update done using Pootle. commit b7e5185c58f1c2c88b021465ed1e076d749fbc93 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:20:11 2011 +0200 Translation update done using Pootle. commit cce9f9104477df8c1b4fb576f9c6a6a405a36304 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:19:47 2011 +0200 Translation update done using Pootle. commit 6434c319a5c5b8f254730235cbb094a8869759ab Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:17:22 2011 +0200 Translation update done using Pootle. commit 1659073f015d6da4a88ce1f14ec007dde4b615b8 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:11:53 2011 +0200 Translation update done using Pootle. commit 24607715c131d8dd3b6aa595b0967d0209793902 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:11:36 2011 +0200 Translation update done using Pootle. commit 544614fe9ebdf8dc4eefa5aa53574087a8792de4 Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:03:43 2011 +0200 Translation update done using Pootle. commit 3c3415d7e4e7cbd867f2a3be77f1c1824e1b1dee Author: Victor Volkov <hanut(a)php-myadmin.ru> Date: Sun Mar 6 17:02:30 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/ru.po | 184 ++++++++++++++++++++++++++++---------------------------------- 1 files changed, 84 insertions(+), 100 deletions(-) diff --git a/po/ru.po b/po/ru.po index 33f5952..5684217 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-03-05 14:23-0500\n" -"PO-Revision-Date: 2011-02-13 20:59+0200\n" +"PO-Revision-Date: 2011-03-06 17:57+0200\n" "Last-Translator: Victor Volkov <hanut(a)php-myadmin.ru>\n" "Language-Team: russian <ru(a)li.org>\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Pootle 2.0.5\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "Целевое окно браузера не может быть обновлено. Возможно, вы закрыли " "родительское окно или ваш браузер блокирует межоконные обновления из-за " -"настроек безопасности" +"настроек безопасности." #: browse_foreigners.php:151 libraries/common.lib.php:2825 #: libraries/common.lib.php:2832 libraries/common.lib.php:3011 @@ -263,7 +263,7 @@ msgstr "Не указано имя базы данных!" #: db_operations.php:272 #, php-format msgid "Database %s has been renamed to %s" -msgstr "База данных `%s` переименована в `%s`." +msgstr "База данных %s переименована в %s" #: db_operations.php:276 #, php-format @@ -362,7 +362,7 @@ msgstr "Редакция или экспорт схемы связей" #: server_privileges.php:2082 server_synchronize.php:421 #: server_synchronize.php:864 tbl_tracking.php:586 test/theme.php:74 msgid "Table" -msgstr "Таблица " +msgstr "Таблица" #: db_printview.php:103 libraries/build_html_for_db.lib.php:30 #: libraries/db_structure.lib.php:47 libraries/header_printview.inc.php:62 @@ -419,8 +419,7 @@ msgstr "SQL-запрос был успешно выполнен" #: db_qbe.php:38 msgid "You have to choose at least one column to display" -msgstr "" -"Для выполнения запроса, должен быть выбран отображаемый столбец/столбцы." +msgstr "Для выполнения запроса, должен быть выбран отображаемый столбец/столбцы" #: db_qbe.php:183 msgid "Switch to" @@ -531,7 +530,7 @@ msgstr "регулярное выражение" #: db_search.php:229 #, php-format msgid "Search results for \"<i>%s</i>\" %s:" -msgstr "Результаты поиска по "<i>%s</i>" %s:" +msgstr "Результаты поиска по \"<i>%s</i>\" %s:" #: db_search.php:247 #, php-format @@ -579,7 +578,7 @@ msgstr "Поиск в базе данных" #: db_search.php:298 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" -msgstr "Слово(а) или значение(я) для поиска (групповой символ: "%"):" +msgstr "Слово(а) или значение(я) для поиска (групповой символ: \"%\"):" #: db_search.php:303 msgid "Find:" @@ -900,8 +899,8 @@ msgstr "" #: import.php:371 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" msgstr "" -"Модули импорта - отсутствуют! Проверьте содержимое каталога libraries/import " -"установленной копии phpMyAdmin." +"Отсутствуют модули импорта! Проверьте содержимое установленной копии " +"phpMyAdmin." #: import.php:396 msgid "The bookmark has been deleted." @@ -1155,7 +1154,7 @@ msgstr "Выберите внешний ключ" msgid "Please select the primary key or a unique key" msgstr "" "Выберите поле являющееся первичным (PRIMARY), или уникальным (UNIQUE) " -"индексом!" +"индексом" #: js/messages.php:103 pmd_general.php:88 tbl_relation.php:545 msgid "Choose column to display" @@ -1615,7 +1614,7 @@ msgstr "Ошибка при переименовании таблицы %1$s в #: libraries/Table.class.php:1129 #, php-format msgid "Table %s has been renamed to %s" -msgstr "Таблица `%s` была переименована в `%s`." +msgstr "Таблица %s была переименована в %s" #: libraries/Theme.class.php:160 #, php-format @@ -1700,7 +1699,7 @@ msgstr "Вы можете ввести хост/IP адрес и порт раз #: libraries/auth/cookie.auth.lib.php:243 msgid "Server:" -msgstr "Сервер" +msgstr "Сервер:" #: libraries/auth/cookie.auth.lib.php:248 msgid "Username:" @@ -1845,7 +1844,7 @@ msgstr "Реплицировано" #: libraries/build_html_for_db.lib.php:150 #, php-format msgid "Check privileges for database "%s"." -msgstr "Проверить привилегии для базы данных "%s"" +msgstr "Проверить привилегии для базы данных "%s"." #: libraries/build_html_for_db.lib.php:153 msgid "Check Privileges" @@ -2093,7 +2092,7 @@ msgstr "Конец" #: libraries/common.lib.php:2444 #, php-format msgid "Jump to database "%s"." -msgstr "Перейти к базе данных "%s"" +msgstr "Перейти к базе данных "%s"." #: libraries/common.lib.php:2463 #, php-format @@ -2332,9 +2331,9 @@ msgid "" "cross-frame scripting attacks" msgstr "" "Включение данного параметра позволяет странице расположенной на другом " -"домене вызвать phpMyAdmin внутри фрейма, что является потенциальной [strong]" -"дырой в безопасности[/strong] допуская возможность XFS (Cross Frame " -"Scripting)." +"домене вызвать phpMyAdmin внутри фрейма, что является потенциальной " +"[strong]дырой в безопасности[/strong] допуская возможность XFS (Cross Frame " +"Scripting)" #: libraries/config/messages.inc.php:22 msgid "Allow third party framing" @@ -2393,7 +2392,7 @@ msgid "" msgstr "" "Определяет вид редактирования полей типа CHAR и VARCHAR. [kbd]input[/kbd] - " "позволяет ограничить длину вводимых данных, [kbd]textarea[/kbd] - позволяет " -"использовать в полях перенос строки." +"использовать в полях перенос строки" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" @@ -2978,8 +2977,8 @@ msgid "" "storage[/a] in documentation" msgstr "" "Настройка phpMyAdmin для установки расширенных возможностей. Смотрите в " -"документации раздел описывающий [a@../Documentation.html#linked-tables]" -"хранение конфигурации[/a]" +"документации раздел описывающий [a@../Documentation.html#linked-" +"tables]хранение конфигурации[/a]" #: libraries/config/messages.inc.php:203 msgid "Changes tracking" @@ -3700,7 +3699,7 @@ msgid "" "available on [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]" msgstr "" "Специальный пользователь MySQL с ограниченными привилегиями. Подробнее " -"смотрите на [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]" +"смотрите на [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]" #: libraries/config/messages.inc.php:375 msgid "Control user" @@ -4143,8 +4142,8 @@ msgid "" "alias, the table name itself stays unchanged" msgstr "" "При выборе [kbd]nested[/kbd], комментарий таблицы будет выведен только у " -"корневого значения, разделенных указанной в директиве $cfg" -"['LeftFrameTableSeparator'] строкой, таблиц." +"корневого значения, разделенных указанной в директиве " +"$cfg['LeftFrameTableSeparator'] строкой, таблиц" #: libraries/config/messages.inc.php:457 msgid "Display table comment instead of its name" @@ -4621,7 +4620,7 @@ msgstr "Экспорт строк из таблицы \"%s\"" #: libraries/display_export.lib.php:97 msgid "Export Method:" -msgstr "Способ экспорта" +msgstr "Способ экспорта:" #: libraries/display_export.lib.php:113 msgid "Quick - display only the minimal options" @@ -4989,7 +4988,7 @@ msgstr "Домашний каталог для данных" #: libraries/engines/innodb.lib.php:23 msgid "The common part of the directory path for all InnoDB data files." -msgstr "Общая часть пути к каталогу для всех файлов данных InnoDB" +msgstr "Общая часть пути к каталогу для всех файлов данных InnoDB." #: libraries/engines/innodb.lib.php:26 msgid "Data files" @@ -5005,7 +5004,7 @@ msgid "" "when it becomes full." msgstr "" "Размер (в мегабайтах) автоматического увеличения файла данных при " -"переполнении табличной области" +"переполнении табличной области." #: libraries/engines/innodb.lib.php:34 msgid "Buffer pool size" @@ -5017,7 +5016,7 @@ msgid "" "tables." msgstr "" "Размер буфера памяти, который InnoDB использует для кеширования данных и " -"индексов своих таблиц" +"индексов своих таблиц." #: libraries/engines/innodb.lib.php:134 msgid "Buffer Pool" @@ -5565,7 +5564,7 @@ msgstr "(Создание отчета содержащего данные од #: libraries/export/pdf.php:24 msgid "Report title:" -msgstr "Заголовок отчета" +msgstr "Заголовок отчета:" #: libraries/export/php_array.php:16 msgid "PHP array" @@ -5668,8 +5667,8 @@ msgid "" "tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</code>" msgstr "" "комбинация обоих верхних вариантов<br />       Пример: " -"<code>INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)</" -"code>" +"<code>INSERT INTO tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), " +"(7,8,9)</code>" #: libraries/export/sql.php:157 msgid "" @@ -5779,11 +5778,11 @@ msgstr "Просмотреть детали структуры нажав на #: libraries/import.lib.php:1143 msgid "" "Change any of its settings by clicking the corresponding \"Options\" link" -msgstr "Изменить любой параметр нажав на соответствующую ссылку Параметр" +msgstr "Изменить любую настройку нажав на соответствующую ссылку \"Параметры\"" #: libraries/import.lib.php:1144 msgid "Edit its structure by following the \"Structure\" link" -msgstr "Отредактировать структуру перейдя по ссылке Структура" +msgstr "Отредактировать структуру перейдя по ссылке \"Структура\"" #: libraries/import.lib.php:1147 msgid "Go to database" @@ -6685,8 +6684,8 @@ msgid "" "For default values, please enter just a single value, without backslash " "escaping or quotes, using this format: a" msgstr "" -"Для значений поля \"По умолчанию\" не используйте символы экранирования и " -"кавычек." +"Для значений по умолчанию не добавляйте символы экранирования и кавычек, " +"формат значений: a" #: libraries/tbl_properties.inc.php:135 #, php-format @@ -6708,10 +6707,10 @@ msgid "" "quote (\"'\") amongst those values, precede it with a backslash (for example " "'\\\\xyz' or 'a\\'b')." msgstr "" -"Значения параметров преобразований должны иметь формат: 'a', 100, 'b', 'c'..." -"<br />Символы обратной косой черты (\\) и одинарной кавычки (') необходимо " -"экранировать (предварять) символом обратной косой черты, например: '\\\\xyz' " -"или 'a\\'b'." +"Значения параметров преобразований должны иметь формат: 'a', 100, b, " +"'c'...<br />Символы обратной косой черты (\"\\\") и одинарной кавычки (\"'\") " +"необходимо экранировать (предварять) символом обратной косой черты, " +"например: '\\\\xyz' или 'a\\'b'." #: libraries/tbl_properties.inc.php:371 msgid "ENUM or SET data too long?" @@ -6736,7 +6735,7 @@ msgid "" "No description is available for this transformation.<br />Please ask the " "author what %s does." msgstr "" -"На данный момент описание отсутствует.<br />Работа используемой функции " +"На данный момент описание отсутствует.<br />Работа используемой функции " "отображения преобразования %s, будет в скором времени описана." #: libraries/tbl_properties.inc.php:727 server_engines.php:56 @@ -6799,7 +6798,7 @@ msgstr "" #: libraries/transformations/image_jpeg__link.inc.php:9 msgid "Displays a link to download this image." -msgstr "Отображает ссылку для загрузки изображения" +msgstr "Отображает ссылку для загрузки изображения." #: libraries/transformations/text_plain__dateformat.inc.php:9 msgid "" @@ -6881,7 +6880,7 @@ msgstr "" #: libraries/transformations/text_plain__sql.inc.php:9 msgid "Formats text as SQL query with syntax highlighting." -msgstr "Форматирует текст в виде SQL запроса с подсветкой синтаксиса" +msgstr "Форматирует текст в виде SQL запроса с подсветкой синтаксиса." #: libraries/transformations/text_plain__substr.inc.php:9 msgid "" @@ -7018,7 +7017,7 @@ msgid "" msgstr "" "Конфигурационный файл phpMyAdmin содержит настройки MySQL по-умолчанию, " "согласно которым для привилегированного пользователя 'root' не задан пароль. " -"Такие настройки делают MySQL-сервер уязвимым для несанкционированного " +"Такие настройки делают MySQL-сервер уязвимым для несанкционированного " "доступа, поэтому настоятельно рекомендуется установить пароль для " "пользователя 'root'." @@ -7247,8 +7246,7 @@ msgstr "Активные параметры" #: pmd_help.php:26 msgid "To select relation, click :" -msgstr "" -"Для выбора связи нажмите на точке соединения, как показано на картинке:" +msgstr "Для выбора связи нажмите на точке соединения:" #: pmd_help.php:28 msgid "" @@ -7498,62 +7496,62 @@ msgstr "Отобразить дамп (схему) баз данных" #: server_privileges.php:31 server_privileges.php:273 msgid "Includes all privileges except GRANT." -msgstr "Содержит все привилегии, за исключением GRANT" +msgstr "Содержит все привилегии, за исключением GRANT." #: server_privileges.php:32 server_privileges.php:199 #: server_privileges.php:522 msgid "Allows altering the structure of existing tables." -msgstr "Разрешает изменение структуры существующих таблиц" +msgstr "Разрешает изменение структуры существующих таблиц." #: server_privileges.php:33 server_privileges.php:215 #: server_privileges.php:528 msgid "Allows altering and dropping stored routines." -msgstr "Разрешает изменение и удаление хранимых процедур" +msgstr "Разрешает изменение и удаление хранимых процедур." #: server_privileges.php:34 server_privileges.php:191 #: server_privileges.php:521 msgid "Allows creating new databases and tables." -msgstr "Разрешает создание новых баз данных и таблиц" +msgstr "Разрешает создание новых баз данных и таблиц." #: server_privileges.php:35 server_privileges.php:214 #: server_privileges.php:527 msgid "Allows creating stored routines." -msgstr "Разрешает создание хранимых процедур" +msgstr "Разрешает создание хранимых процедур." #: server_privileges.php:36 server_privileges.php:521 msgid "Allows creating new tables." -msgstr "Разрешает создание новых таблиц" +msgstr "Разрешает создание новых таблиц." #: server_privileges.php:37 server_privileges.php:202 #: server_privileges.php:525 msgid "Allows creating temporary tables." -msgstr "Разрешает создание временных таблиц" +msgstr "Разрешает создание временных таблиц." #: server_privileges.php:38 server_privileges.php:216 #: server_privileges.php:561 msgid "Allows creating, dropping and renaming user accounts." msgstr "" -"Разрешает создание, удаление и переименование учетных записей пользователей" +"Разрешает создание, удаление и переименование учетных записей пользователей." #: server_privileges.php:39 server_privileges.php:206 #: server_privileges.php:210 server_privileges.php:533 #: server_privileges.php:537 msgid "Allows creating new views." -msgstr "Разрешает создание новых представлений (CREATE VIEW)" +msgstr "Разрешает создание новых представлений (CREATE VIEW)." #: server_privileges.php:40 server_privileges.php:190 #: server_privileges.php:513 msgid "Allows deleting data." -msgstr "Разрешает удаление данных" +msgstr "Разрешает удаление данных." #: server_privileges.php:41 server_privileges.php:192 #: server_privileges.php:524 msgid "Allows dropping databases and tables." -msgstr "Разрешает удаление баз данных и таблиц" +msgstr "Разрешает удаление баз данных и таблиц." #: server_privileges.php:42 server_privileges.php:524 msgid "Allows dropping tables." -msgstr "Разрешает удаление таблиц" +msgstr "Разрешает удаление таблиц." #: server_privileges.php:43 server_privileges.php:207 #: server_privileges.php:541 @@ -7563,48 +7561,48 @@ msgstr "Разрешает настройку отложенных событи #: server_privileges.php:44 server_privileges.php:217 #: server_privileges.php:529 msgid "Allows executing stored routines." -msgstr "Разрешает выполнение хранимых процедур" +msgstr "Разрешает выполнение хранимых процедур." #: server_privileges.php:45 server_privileges.php:196 #: server_privileges.php:516 msgid "Allows importing data from and exporting data into files." -msgstr "Разрешает импорт и экспорт данных в файлы" +msgstr "Разрешает импорт и экспорт данных в файлы." #: server_privileges.php:46 server_privileges.php:547 msgid "" "Allows adding users and privileges without reloading the privilege tables." msgstr "" "Разрешает добавление пользователей и привилегий без перезагрузки таблиц " -"привилегий" +"привилегий." #: server_privileges.php:47 server_privileges.php:198 #: server_privileges.php:523 msgid "Allows creating and dropping indexes." -msgstr "Разрешает создание и удаление индексов" +msgstr "Разрешает создание и удаление индексов." #: server_privileges.php:48 server_privileges.php:188 #: server_privileges.php:449 server_privileges.php:511 msgid "Allows inserting and replacing data." -msgstr "Разрешает вставку и замену данных" +msgstr "Разрешает вставку и замену данных." #: server_privileges.php:49 server_privileges.php:203 #: server_privileges.php:556 msgid "Allows locking tables for the current thread." -msgstr "Разрешает блокировку таблиц для текущего потока" +msgstr "Разрешает блокировку таблиц для текущего потока." #: server_privileges.php:50 server_privileges.php:653 #: server_privileges.php:655 msgid "Limits the number of new connections the user may open per hour." msgstr "" "Максимальное количество новых подключений, которые пользователь может " -"установить в течение часа" +"установить в течение часа." #: server_privileges.php:51 server_privileges.php:641 #: server_privileges.php:643 msgid "Limits the number of queries the user may send to the server per hour." msgstr "" "Максимальное количество запросов, которые пользователь может отправить в " -"течение часа" +"течение часа." #: server_privileges.php:52 server_privileges.php:647 #: server_privileges.php:649 @@ -7613,12 +7611,12 @@ msgid "" "execute per hour." msgstr "" "Максимальное количество команд изменяющих какую-либо таблицу или базу " -"данных, которые пользователь может выполнить в течение часа" +"данных, которые пользователь может выполнить в течение часа." #: server_privileges.php:53 server_privileges.php:659 #: server_privileges.php:661 msgid "Limits the number of simultaneous connections the user may have." -msgstr "Максимальное количество одновременных подключений одного пользователя" +msgstr "Максимальное количество одновременных подключений одного пользователя." #: server_privileges.php:54 server_privileges.php:195 #: server_privileges.php:551 @@ -7628,42 +7626,42 @@ msgstr "Разрешает просмотр процессов всех поль #: server_privileges.php:55 server_privileges.php:197 #: server_privileges.php:455 server_privileges.php:557 msgid "Has no effect in this MySQL version." -msgstr "Не доступно в данной версии MySQL!" +msgstr "Не доступно в данной версии MySQL." #: server_privileges.php:56 server_privileges.php:193 #: server_privileges.php:552 msgid "Allows reloading server settings and flushing the server's caches." -msgstr "Разрешает перезагрузку настроек сервера и очистку его кешей" +msgstr "Разрешает перезагрузку настроек сервера и очистку его кешей." #: server_privileges.php:57 server_privileges.php:205 #: server_privileges.php:559 msgid "Allows the user to ask where the slaves / masters are." -msgstr "Разрешает запрашивать местонахождение головного и подчиненных серверов" +msgstr "Разрешает запрашивать местонахождение головного и подчиненных серверов." #: server_privileges.php:58 server_privileges.php:204 #: server_privileges.php:560 msgid "Needed for the replication slaves." -msgstr "Необходимо для подчиненных серверов при репликации" +msgstr "Необходимо для подчиненных серверов при репликации." #: server_privileges.php:59 server_privileges.php:187 #: server_privileges.php:446 server_privileges.php:510 msgid "Allows reading data." -msgstr "Разрешает выборку данных" +msgstr "Разрешает выборку данных." #: server_privileges.php:60 server_privileges.php:200 #: server_privileges.php:554 msgid "Gives access to the complete list of databases." -msgstr "Разрешает доступ к полному списку баз данных" +msgstr "Разрешает доступ к полному списку баз данных." #: server_privileges.php:61 server_privileges.php:211 #: server_privileges.php:213 server_privileges.php:526 msgid "Allows performing SHOW CREATE VIEW queries." -msgstr "Разрешает вывод запроса создающего представление (SHOW CREATE VIEW)" +msgstr "Разрешает вывод запроса создающего представление (SHOW CREATE VIEW)." #: server_privileges.php:62 server_privileges.php:194 #: server_privileges.php:553 msgid "Allows shutting down the server." -msgstr "Разрешает остановку сервера" +msgstr "Разрешает остановку сервера." #: server_privileges.php:63 server_privileges.php:201 #: server_privileges.php:550 @@ -7675,7 +7673,7 @@ msgstr "" "Разрешает установку соединения, даже при достижении максимального количества " "соединений. (Требуется для большинства административных задач, таких как " "установка глобальных переменных или завершение процессов других " -"пользователей)" +"пользователей)." #: server_privileges.php:64 server_privileges.php:208 #: server_privileges.php:542 @@ -7685,11 +7683,11 @@ msgstr "Разрешает создание и удаление триггеро #: server_privileges.php:65 server_privileges.php:189 #: server_privileges.php:452 server_privileges.php:512 msgid "Allows changing data." -msgstr "Разрешает изменение данных" +msgstr "Разрешает изменение данных." #: server_privileges.php:66 server_privileges.php:267 msgid "No privileges." -msgstr "Нет привилегий" +msgstr "Нет привилегий." #: server_privileges.php:309 server_privileges.php:310 msgctxt "None privileges" @@ -7756,7 +7754,7 @@ msgstr "Были изменены привилегии для %s." #: server_privileges.php:1223 #, php-format msgid "You have revoked the privileges for %s" -msgstr "Отменены привилегии для %s." +msgstr "Отменены привилегии для %s" #: server_privileges.php:1259 #, php-format @@ -8038,8 +8036,8 @@ msgid "" "master" msgstr "" "Сразу после перезапуска MySQL сервера, пожалуйста, нажмите кнопку OK, после " -"чего вы должны увидеть сообщение указывающее, что данный сервер <b>настроен</" -"b> как головной." +"чего вы должны увидеть сообщение указывающее, что данный сервер " +"<b>настроен</b> как головной" #: server_replication.php:291 msgid "Slave SQL Thread not running!" @@ -8333,8 +8331,8 @@ msgid "" "The number of \"random\" read-aheads InnoDB initiated. This happens when a " "query is to scan a large portion of a table but in random order." msgstr "" -"Количество "случайных" опережающих чтений, инициированных InnoDB. " -"Это происходит, когда запрос сканирует большую часть таблицы в случайном " +"Количество \"случайных\" опережающих чтений, инициированных InnoDB. Это " +"происходит, когда запрос сканирует большую часть таблицы в случайном " "порядке." #: server_status.php:75 @@ -9636,7 +9634,7 @@ msgstr "Отобразить дамп (схему) таблицы" #: tbl_indexes.php:66 msgid "The name of the primary key must be \"PRIMARY\"!" -msgstr "Имя первичного индекса должно быть PRIMARY!" +msgstr "Имя первичного индекса должно быть \"PRIMARY\"!" #: tbl_indexes.php:74 msgid "Can't rename index to PRIMARY!" @@ -9665,7 +9663,7 @@ msgstr "Тип индекса :" #: tbl_indexes.php:182 msgid "" "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)" -msgstr "(Имя "PRIMARY" должен иметь <b>только</b> первичный индекс!)" +msgstr "(Имя \"PRIMARY\" должен иметь <b>только</b> первичный индекс!)" #: tbl_indexes.php:249 #, php-format @@ -10134,17 +10132,3 @@ msgstr "VIEW название" #: view_operations.php:91 msgid "Rename view to" msgstr "Переименовать представление в" - -#, fuzzy -#~| msgid "Delete the matches for the %s table?" -#~ msgid "Delete the matches for the " -#~ msgstr "Удалить соответствия для таблицы %s?" - -#~ msgid "Show left delete link" -#~ msgstr "Отобразить ссылки удаления слева" - -#~ msgid "Show right delete link" -#~ msgstr "Отобразить ссылки удаления справа" - -#~ msgid "Mailing lists" -#~ msgstr "Списки рассылки" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1815-gdfa4668
by Marc Delisle 06 Mar '11

06 Mar '11

The branch, master has been updated via dfa4668fe6d814e9a008bde1ed343d2eb60de680 (commit) from 1b94d12c3e00fae78cc8042e1628a80ef5f817b7 (commit) - Log ----------------------------------------------------------------- commit dfa4668fe6d814e9a008bde1ed343d2eb60de680 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun Mar 6 08:30:51 2011 -0500 Bug #3187422 Form validation and submission ----------------------------------------------------------------------- Summary of changes: js/functions.js | 141 +++++++++++++++++++++----------------- libraries/tbl_properties.inc.php | 3 +- 2 files changed, 80 insertions(+), 64 deletions(-) diff --git a/js/functions.js b/js/functions.js index eae4b27..62ac60c 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1738,7 +1738,7 @@ $(document).ready(function() { * */ // .live() must be called after a selector, see http://api.jquery.com/live - $("#create_table_form.ajax input[name=do_save_data]").live('click', function(event) { + $("#create_table_form input[name=do_save_data]").live('click', function(event) { event.preventDefault(); /** @@ -1746,71 +1746,88 @@ $(document).ready(function() { */ var $form = $("#create_table_form"); - PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); - if (! $form.find('input:hidden').is('#ajax_request_hidden')) { - $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); - } - //User wants to submit the form - $.post($form.attr('action'), $form.serialize() + "&do_save_data=" + $(this).val(), function(data) { - if(data.success == true) { - $('#properties_message').html(''); - PMA_ajaxShowMessage(data.message); - // Only if the create table dialog (distinct panel) exists - if ($("#create_table_dialog").length > 0) { - $("#create_table_dialog").dialog("close").remove(); - } - - /** - * @var tables_table Object referring to the <tbody> element that holds the list of tables - */ - var tables_table = $("#tablesForm").find("tbody").not("#tbl_summary_row"); - // this is the first table created in this db - if (tables_table.length == 0) { - if (window.parent && window.parent.frame_content) { - window.parent.frame_content.location.reload(); - } - } else { - /** - * @var curr_last_row Object referring to the last <tr> element in {@link tables_table} - */ - var curr_last_row = $(tables_table).find('tr:last'); - /** - * @var curr_last_row_index_string String containing the index of {@link curr_last_row} - */ - var curr_last_row_index_string = $(curr_last_row).find('input:checkbox').attr('id').match(/\d+/)[0]; - /** - * @var curr_last_row_index Index of {@link curr_last_row} - */ - var curr_last_row_index = parseFloat(curr_last_row_index_string); - /** - * @var new_last_row_index Index of the new row to be appended to {@link tables_table} - */ - var new_last_row_index = curr_last_row_index + 1; - /** - * @var new_last_row_id String containing the id of the row to be appended to {@link tables_table} - */ - var new_last_row_id = 'checkbox_tbl_' + new_last_row_index; - - //append to table - $(data.new_table_string) - .find('input:checkbox') - .val(new_last_row_id) - .end() - .appendTo(tables_table); - - //Sort the table - $(tables_table).PMA_sort_table('th'); - } + /* + * First validate the form; if there is a problem, avoid submitting it + * + * checkTableEditForm() needs a pure element and not a jQuery object, + * this is why we pass $form[0] as a parameter (the jQuery object + * is actually an array of DOM elements) + */ - //Refresh navigation frame as a new table has been added - if (window.parent && window.parent.frame_navigation) { - window.parent.frame_navigation.location.reload(); + if (checkTableEditForm($form[0], $form.find('input[name=orig_num_fields]').val())) { + // OK, form passed validation step + if ($form.hasClass('ajax')) { + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + if (! $form.find('input:hidden').is('#ajax_request_hidden')) { + $form.append('<input type="hidden" id="ajax_request_hidden" name="ajax_request" value="true" />'); } - } + //User wants to submit the form + $.post($form.attr('action'), $form.serialize() + "&do_save_data=" + $(this).val(), function(data) { + if(data.success == true) { + $('#properties_message').html(''); + PMA_ajaxShowMessage(data.message); + // Only if the create table dialog (distinct panel) exists + if ($("#create_table_dialog").length > 0) { + $("#create_table_dialog").dialog("close").remove(); + } + + /** + * @var tables_table Object referring to the <tbody> element that holds the list of tables + */ + var tables_table = $("#tablesForm").find("tbody").not("#tbl_summary_row"); + // this is the first table created in this db + if (tables_table.length == 0) { + if (window.parent && window.parent.frame_content) { + window.parent.frame_content.location.reload(); + } + } else { + /** + * @var curr_last_row Object referring to the last <tr> element in {@link tables_table} + */ + var curr_last_row = $(tables_table).find('tr:last'); + /** + * @var curr_last_row_index_string String containing the index of {@link curr_last_row} + */ + var curr_last_row_index_string = $(curr_last_row).find('input:checkbox').attr('id').match(/\d+/)[0]; + /** + * @var curr_last_row_index Index of {@link curr_last_row} + */ + var curr_last_row_index = parseFloat(curr_last_row_index_string); + /** + * @var new_last_row_index Index of the new row to be appended to {@link tables_table} + */ + var new_last_row_index = curr_last_row_index + 1; + /** + * @var new_last_row_id String containing the id of the row to be appended to {@link tables_table} + */ + var new_last_row_id = 'checkbox_tbl_' + new_last_row_index; + + //append to table + $(data.new_table_string) + .find('input:checkbox') + .val(new_last_row_id) + .end() + .appendTo(tables_table); + + //Sort the table + $(tables_table).PMA_sort_table('th'); + } + + //Refresh navigation frame as a new table has been added + if (window.parent && window.parent.frame_navigation) { + window.parent.frame_navigation.location.reload(); + } + } else { + $('#properties_message').html(data.error); + } + }) // end $.post() + } // end if ($form.hasClass('ajax') else { - $('#properties_message').html(data.error); + // non-Ajax submit + $form.append('<input type="hidden" name="do_save_data" value="save" />'); + $form.submit(); } - }) // end $.post() + } // end if (checkTableEditForm() ) }) // end create table form (save) /** diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 14e4936..54e9d1d 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -774,8 +774,7 @@ if ($action == 'tbl_create.php') { ?> <fieldset class="tblFooters"> - <input type="submit" name="do_save_data" value="<?php echo __('Save'); ?>" - onclick="return checkTableEditForm(this.form, <?php echo $num_fields; ?>)" /> + <input type="submit" name="do_save_data" value="<?php echo __('Save'); ?>" /> <?php if ($action == 'tbl_create.php' || $action == 'tbl_addfield.php') { ?> <?php echo __('Or'); ?> <?php echo sprintf(__('Add %s column(s)'), '<input type="text" id="added_fields" name="added_fields" size="2" value="1" onfocus="this.select()" />'); ?> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1814-g1b94d12
by Marc Delisle 06 Mar '11

06 Mar '11

The branch, master has been updated via 1b94d12c3e00fae78cc8042e1628a80ef5f817b7 (commit) from 74a61f61da8de73853c17a5f198d63c3d675d046 (commit) - Log ----------------------------------------------------------------- commit 1b94d12c3e00fae78cc8042e1628a80ef5f817b7 Author: onebighack <onebighack(a)users.sourceforge.net> Date: Sun Mar 6 06:09:52 2011 -0500 -Bug #3200692 Second click on Inline edit -Bug #3200579 Hiding Inline edit problematic for text/geometry/blob: partial fix ----------------------------------------------------------------------- Summary of changes: js/sql.js | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/sql.js b/js/sql.js index 49380b0..a3c5c79 100644 --- a/js/sql.js +++ b/js/sql.js @@ -438,10 +438,13 @@ $(document).ready(function() { var txt=[]; for(var i=4; i < last_column; i++){ txt[i-4] = $this_hide.siblings("td:eq(" + i + ")").children(' .original_data').html(); + } for (var i=4; i < last_column; i++){ - $this_hide.siblings("td:eq(" + i + ")").empty(); - $this_hide.siblings("td:eq(" + i + ")").append(txt[i-4]); + if($this_hide.siblings("td:eq(" + i + ")").children().length !=0){ + $this_hide.siblings("td:eq(" + i + ")").empty(); + $this_hide.siblings("td:eq(" + i + ")").append(txt[i-4]); + } } $(this).prev().prev().remove(); $(this).prev().remove(); @@ -878,7 +881,8 @@ $(document).ready(function() { for ( var i=0;i<=2;i++) { $del_hide.next().remove(); } if(disp_mode!='vertical'){ $chg_submit.empty(); - $chg_submit.text(PMA_messages['strInlineEdit']); + $chg_submit.html('<span class="nowrap"></span>'); + $chg_submit.children('span.nowrap').text(PMA_messages['strInlineEdit']); } else { $chg_submit.children('span.nowrap').empty(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1813-g74a61f6
by Madhura Jayaratne 05 Mar '11

05 Mar '11

The branch, master has been updated via 74a61f61da8de73853c17a5f198d63c3d675d046 (commit) from b9a6342a17c73db5842978d79f65f4ebaa3ec77f (commit) - Log ----------------------------------------------------------------- commit 74a61f61da8de73853c17a5f198d63c3d675d046 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Mar 6 02:30:34 2011 +0530 Surround DB name and field names with quotes to distinguish them from SQL key words. ----------------------------------------------------------------------- Summary of changes: js/sql.js | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/sql.js b/js/sql.js index 32a9faa..49380b0 100644 --- a/js/sql.js +++ b/js/sql.js @@ -772,7 +772,7 @@ $(document).ready(function() { /** * @var sql_query String containing the SQL query to update this row */ - var sql_query = 'UPDATE ' + window.parent.table + ' SET '; + var sql_query = 'UPDATE `' + window.parent.table + '` SET '; $input_siblings.each(function() { /** @lends jQuery */ @@ -801,7 +801,7 @@ $(document).ready(function() { var value; if (is_null) { - sql_query += ' ' + field_name + "=NULL , "; + sql_query += ' `' + field_name + "`=NULL , "; } else { if($this_field.is(":not(.relation, .enum, .set)")) { this_field_params[field_name] = $this_field.find('textarea').val(); @@ -830,7 +830,7 @@ $(document).ready(function() { $.extend(relation_fields, this_field_params); } } - sql_query += ' ' + field_name + "='" + this_field_params[field_name].replace(/'/g, "''") + "' , "; + sql_query += ' `' + field_name + "`='" + this_field_params[field_name].replace(/'/g, "''") + "' , "; } }) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1812-gb9a6342
by Marc Delisle 05 Mar '11

05 Mar '11

The branch, master has been updated via b9a6342a17c73db5842978d79f65f4ebaa3ec77f (commit) from 05c8f3266051a961b13d2edfeaf4bd1ee597812a (commit) - Log ----------------------------------------------------------------- commit b9a6342a17c73db5842978d79f65f4ebaa3ec77f Author: onebighack <onebighack(a)users.sourceforge.net> Date: Sat Mar 5 14:38:46 2011 -0500 Bug #3200458 Hiding Inline edit problematic for foreign keys ----------------------------------------------------------------------- Summary of changes: js/sql.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/sql.js b/js/sql.js index 3e0388e..32a9faa 100644 --- a/js/sql.js +++ b/js/sql.js @@ -437,7 +437,7 @@ $(document).ready(function() { var last_column = $this_hide.siblings().length; var txt=[]; for(var i=4; i < last_column; i++){ - txt[i-4] = $this_hide.siblings("td:eq(" + i + ")").children(' .original_data').text(); + txt[i-4] = $this_hide.siblings("td:eq(" + i + ")").children(' .original_data').html(); } for (var i=4; i < last_column; i++){ $this_hide.siblings("td:eq(" + i + ")").empty(); @@ -473,7 +473,7 @@ $(document).ready(function() { } for( var i=6;i<=rows+2;i++){ - txt[i-6]=$this_row.siblings("tr:eq("+i+") td:eq("+pos+") span.original_data").text(); + txt[i-6]=$this_row.siblings("tr:eq("+i+") td:eq("+pos+") span.original_data").html(); } for (var i=6;i<=rows+2;i++){ $this_row.siblings("tr:eq("+i+") td:eq("+pos+")").empty(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1810-g53ba93b
by Michal Čihař 05 Mar '11

05 Mar '11

The branch, master has been updated via 53ba93b02e8395fb102cae35168133aa244cc155 (commit) from 0242446e4682cff050e2c61f151a266b1b86bc83 (commit) - Log ----------------------------------------------------------------- commit 53ba93b02e8395fb102cae35168133aa244cc155 Author: Michal Čihař <michal(a)cihar.com> Date: Sat Mar 5 15:11:29 2011 +0100 Remove debug code. This should never be commited. ----------------------------------------------------------------------- Summary of changes: scripts/update-po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/update-po b/scripts/update-po index ac89039..f293467 100755 --- a/scripts/update-po +++ b/scripts/update-po @@ -32,8 +32,8 @@ for loc in $LOCS ; do s/Project-Id-Version: phpMyAdmin .*/Project-Id-Version: phpMyAdmin '$ver'\\n"/; ' po/$loc.po if [ -f ../localized_docs/po/$loc.po ] ; then - msgmerge --previous -C /tmp/po/$loc.po -C ../localized_docs/po/$loc.po -U po/$loc.po po/phpmyadmin.pot + msgmerge --previous -C ../localized_docs/po/$loc.po -U po/$loc.po po/phpmyadmin.pot else - msgmerge --previous -C /tmp/po/$loc.po -U po/$loc.po po/phpmyadmin.pot + msgmerge --previous -U po/$loc.po po/phpmyadmin.pot fi done hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1809-g0242446
by Marc Delisle 05 Mar '11

05 Mar '11

The branch, master has been updated via 0242446e4682cff050e2c61f151a266b1b86bc83 (commit) via 555f5fa8c4878ac3a15f7145e394a2bf724e2c07 (commit) via 2630f3e34c4d445468a28b121fbaef29183bd029 (commit) from 7cbaf739e40a2642d0a3176a8cf961bfdea8ec75 (commit) - Log ----------------------------------------------------------------- commit 0242446e4682cff050e2c61f151a266b1b86bc83 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Mar 5 07:13:43 2011 -0500 Localize hide/submit messages Replace submit with Save (an existing message) commit 555f5fa8c4878ac3a15f7145e394a2bf724e2c07 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Mar 5 06:57:24 2011 -0500 Remove author name from variable name Tidy jQuery code Proper indentation commit 2630f3e34c4d445468a28b121fbaef29183bd029 Author: onebighack <onebighack(a)users.sourceforge.net> Date: Sat Mar 5 06:22:50 2011 -0500 Patch #3195202 Inline edit Hide ----------------------------------------------------------------------- Summary of changes: js/messages.php | 2 + js/sql.js | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 99 insertions(+), 8 deletions(-) diff --git a/js/messages.php b/js/messages.php index fc28b2e..9da01ca 100644 --- a/js/messages.php +++ b/js/messages.php @@ -86,6 +86,8 @@ $js_messages['strSearching'] = __('Searching'); $js_messages['strHideQueryBox'] = __('Hide query box'); $js_messages['strShowQueryBox'] = __('Show query box'); $js_messages['strInlineEdit'] = __('Inline Edit'); +$js_messages['strSave'] = __('Save'); +$js_messages['strHide'] = __('Hide'); /* For tbl_select.js */ $js_messages['strHideSearchCriteria'] = __('Hide search criteria'); diff --git a/js/sql.js b/js/sql.js index 1cbbca2..3e0388e 100644 --- a/js/sql.js +++ b/js/sql.js @@ -13,6 +13,7 @@ * @param string str * @return string the URL-decoded string */ +var data_vt; function PMA_urldecode(str) { return decodeURIComponent(str.replace(/\+/g, '%20')); } @@ -408,9 +409,83 @@ $(document).ready(function() { $(".inline_edit_anchor").live('click', function(event) { /** @lends jQuery */ event.preventDefault(); - $(this).removeClass('inline_edit_anchor').addClass('inline_edit_active'); + // adding submit and hide buttons to inline edit <td> + // for "hide", button the original data to be restored is present in .original_data + // looping through all columns or rows, to find the required data and then storing it in an array. + + var $this_children = $(this).children('span.nowrap').children('a').children('span.nowrap'); + if (disp_mode != 'vertical'){ + $this_children.empty(); + $this_children.text(PMA_messages['strSave']); + } else { + // vertical + data_vt = $this_children.html(); + $this_children.text(PMA_messages['strSave']); + } + + var hide_link = '<br /><br /><a id="hide">' + PMA_messages['strHide'] + '</a>'; + if (disp_mode != 'vertical'){ + $(this).append(hide_link); + $('#table_results tbody tr td a#hide').click(function(){ + $this_children = $(this).siblings('span.nowrap').children('a').children('span.nowrap'); + $this_children.empty(); + $this_children.text(PMA_messages['strInlineEdit']); + var $this_hide = $(this).parent(); + $this_hide.removeClass("inline_edit_active hover").addClass("inline_edit_anchor"); + var last_column = $this_hide.siblings().length; + var txt=[]; + for(var i=4; i < last_column; i++){ + txt[i-4] = $this_hide.siblings("td:eq(" + i + ")").children(' .original_data').text(); + } + for (var i=4; i < last_column; i++){ + $this_hide.siblings("td:eq(" + i + ")").empty(); + $this_hide.siblings("td:eq(" + i + ")").append(txt[i-4]); + } + $(this).prev().prev().remove(); + $(this).prev().remove(); + $(this).remove(); + }); + } else { + var txt=[]; + var rows=$(this).parent().siblings().length;; + + $(this).append(hide_link); + $('#table_results tbody tr td a#hide').click(function(){ + + var pos=$(this).parent().index(); + var $chg_submit=$(this).parent().children('span.nowrap').children('a').children('span.nowrap'); + $chg_submit.empty(); + $chg_submit.append(data_vt); + + var $this_row=$(this).parent().parent(); + //alert(pos); + if(parseInt(pos)%2==0){ + $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active").addClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor"); + + $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active hover").addClass("odd edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor"); + } else { + $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active").addClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor"); + + $this_row.siblings("tr:eq(3) td:eq(" + pos + ")").removeClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_active hover").addClass("even edit_row_anchor row_" + pos + " vpointer vmarker inline_edit_anchor"); + + } + + for( var i=6;i<=rows+2;i++){ + txt[i-6]=$this_row.siblings("tr:eq("+i+") td:eq("+pos+") span.original_data").text(); + } + for (var i=6;i<=rows+2;i++){ + $this_row.siblings("tr:eq("+i+") td:eq("+pos+")").empty(); + $this_row.siblings("tr:eq("+i+") td:eq("+pos+")").append(txt[i-6]); + } + $(this).prev().remove(); + $(this).prev().remove(); + $(this).remove(); + + }); + } + // Initialize some variables if(disp_mode == 'vertical') { /** @@ -636,8 +711,9 @@ $(document).ready(function() { * @see PMA_ajaxShowMessage() * @see getFieldName() */ - $(".inline_edit_active").live('click', function(event) { + $(".inline_edit_active span a").live('click', function(event) { /** @lends jQuery */ + event.preventDefault(); /** @@ -646,8 +722,7 @@ $(document).ready(function() { * being edited * */ - var $this_td = $(this); - + var $this_td = $(this).parent().parent(); var $test_element = ''; // to test the presence of a element // Initialize variables @@ -665,8 +740,7 @@ $(document).ready(function() { * @var where_clause String containing the WHERE clause to select this row */ var where_clause = $this_td.parents('tbody').find('tr').find('.where_clause:nth('+this_td_index+')').val(); - } - else { + } else { var $input_siblings = $this_td.parent('tr').find('.inline_edit'); var where_clause = $this_td.parent('tr').find('.where_clause').val(); } @@ -705,7 +779,7 @@ $(document).ready(function() { /** * @var this_field Object referring to this field (<td>) */ - var $this_field = $(this); + var $this_field = $(this); /** * @var field_name String containing the name of this field. * @see getFieldName() @@ -756,7 +830,6 @@ $(document).ready(function() { $.extend(relation_fields, this_field_params); } } - sql_query += ' ' + field_name + "='" + this_field_params[field_name].replace(/'/g, "''") + "' , "; } }) @@ -794,8 +867,24 @@ $(document).ready(function() { 'submit_type' : 'save' }; + // if inline_edit is successful, we need to go back to default view + var $del_hide=$(this).parent(); + var $chg_submit=$(this); + $.post('tbl_replace.php', post_params, function(data) { if(data.success == true) { + // deleting the hide button if my query was successful + // remove <br><br><a> tags + for ( var i=0;i<=2;i++) { $del_hide.next().remove(); } + if(disp_mode!='vertical'){ + $chg_submit.empty(); + $chg_submit.text(PMA_messages['strInlineEdit']); + } + else { + $chg_submit.children('span.nowrap').empty(); + $chg_submit.children('span.nowrap').append(data_vt); + } + PMA_ajaxShowMessage(data.message); $this_td.removeClass('inline_edit_active').addClass('inline_edit_anchor'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1806-g7cbaf73
by Madhura Jayaratne 05 Mar '11

05 Mar '11

The branch, master has been updated via 7cbaf739e40a2642d0a3176a8cf961bfdea8ec75 (commit) via 489d6bfce8447ca1a8a335fc7580c6b8b8963bf1 (commit) from 612598fe7fbc6c6cf6305a798e9b48b435ea7a91 (commit) - Log ----------------------------------------------------------------- commit 7cbaf739e40a2642d0a3176a8cf961bfdea8ec75 Merge: 489d6bfce8447ca1a8a335fc7580c6b8b8963bf1 612598fe7fbc6c6cf6305a798e9b48b435ea7a91 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Mar 5 09:55:10 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit 489d6bfce8447ca1a8a335fc7580c6b8b8963bf1 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sat Mar 5 09:53:51 2011 +0530 Bug #3196093 CSV import - Abort immediately and show error message on invalid parameters. ----------------------------------------------------------------------- Summary of changes: libraries/import/csv.php | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/libraries/import/csv.php b/libraries/import/csv.php index db8d09c..e41ea35 100644 --- a/libraries/import/csv.php +++ b/libraries/import/csv.php @@ -56,10 +56,12 @@ $csv_enclosed = strtr($csv_enclosed, $replacements); $csv_escaped = strtr($csv_escaped, $replacements); $csv_new_line = strtr($csv_new_line, $replacements); +$param_error = FALSE; if (strlen($csv_terminated) != 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); $message->addParam(__('Columns terminated by'), false); $error = TRUE; + $param_error = TRUE; // The default dialog of MS Excel when generating a CSV produces a // semi-colon-separated file with no chance of specifying the // enclosing character. Thus, users who want to import this file @@ -72,14 +74,22 @@ if (strlen($csv_terminated) != 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); $message->addParam(__('Columns enclosed by'), false); $error = TRUE; + $param_error = TRUE; } elseif (strlen($csv_escaped) != 1) { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); $message->addParam(__('Columns escaped by'), false); $error = TRUE; + $param_error = TRUE; } elseif (strlen($csv_new_line) != 1 && $csv_new_line != 'auto') { $message = PMA_Message::error(__('Invalid parameter for CSV import: %s')); $message->addParam(__('Lines terminated by'), false); $error = TRUE; + $param_error = TRUE; +} + +// If there is an error in the parameters entered, indicate that immediately. +if ($param_error) { + PMA_mysqlDie($message->getMessage(), '', '', $err_url); } $buffer = ''; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1804-g612598f
by Piotr Przybylski 04 Mar '11

04 Mar '11

The branch, master has been updated via 612598fe7fbc6c6cf6305a798e9b48b435ea7a91 (commit) from 260cf97a06e2e2cb046093228d4267f8501823b7 (commit) - Log ----------------------------------------------------------------- commit 612598fe7fbc6c6cf6305a798e9b48b435ea7a91 Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Fri Mar 4 23:06:49 2011 +0100 Fix CSP header: * add 'self' for img-src and script-src * version.js access: - remove protocol (shorter and useful mainly when HTTPS is required) - remove path (invalid syntax, only hosts are allowed there) ----------------------------------------------------------------------- Summary of changes: libraries/header_http.inc.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/header_http.inc.php b/libraries/header_http.inc.php index f7c27b2..9ad890d 100644 --- a/libraries/header_http.inc.php +++ b/libraries/header_http.inc.php @@ -22,7 +22,7 @@ $GLOBALS['now'] = gmdate('D, d M Y H:i:s') . ' GMT'; /* Prevent against ClickJacking by allowing frames only from same origin */ if (!$GLOBALS['cfg']['AllowThirdPartyFraming']) { header('X-Frame-Options: SAMEORIGIN'); - header('X-Content-Security-Policy: allow \'self\'; options inline-script eval-script; frame-ancestors \'self\'; img-src data:; script-src http://www.phpmyadmin.net/home_page/version.js'); + header('X-Content-Security-Policy: allow \'self\'; options inline-script eval-script; frame-ancestors \'self\'; img-src \'self\' data:; script-src \'self\' www.phpmyadmin.net'); } header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21 header('Last-Modified: ' . $GLOBALS['now']); hooks/post-receive -- phpMyAdmin

1 0