From 096feb5e8f73607426253040853c708e86041fae Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Tue, 31 Dec 2019 10:51:43 +0000 Subject: [PATCH 1/4] Translated using Weblate (French) Currently translated at 100.0% (3332 of 3332 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/fr/ Signed-off-by: Olivier Humbert --- po/fr.po | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/po/fr.po b/po/fr.po index 946207fd75..e3c32bc87f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-12-23 15:37-0300\n" -"PO-Revision-Date: 2019-12-28 09:29+0000\n" +"PO-Revision-Date: 2020-01-01 11:21+0000\n" "Last-Translator: Olivier Humbert \n" "Language-Team: French \n" @@ -9904,17 +9904,17 @@ msgstr "" #: templates/display/import/import.twig:169 #: templates/display/export/format_dropdown.twig:2 msgid "Format:" -msgstr "Format : " +msgstr "Format :" #: libraries/classes/Plugins/Export/ExportCsv.php:66 #: libraries/classes/Plugins/Import/AbstractImportCsv.php:60 msgid "Columns separated with:" -msgstr "Colonnes séparées par : " +msgstr "Colonnes séparées par :" #: libraries/classes/Plugins/Export/ExportCsv.php:71 #: libraries/classes/Plugins/Import/AbstractImportCsv.php:66 msgid "Columns enclosed with:" -msgstr "Colonnes entourées par : " +msgstr "Colonnes entourées par :" #: libraries/classes/Plugins/Export/ExportCsv.php:76 #: libraries/classes/Plugins/Import/AbstractImportCsv.php:73 @@ -9924,7 +9924,7 @@ msgstr "Colonnes échappées avec :" #: libraries/classes/Plugins/Export/ExportCsv.php:81 #: libraries/classes/Plugins/Import/AbstractImportCsv.php:80 msgid "Lines terminated with:" -msgstr "Lignes terminées par : " +msgstr "Lignes terminées par :" #: libraries/classes/Plugins/Export/ExportCsv.php:86 #: libraries/classes/Plugins/Export/ExportExcel.php:54 @@ -9934,7 +9934,7 @@ msgstr "Lignes terminées par : " #: libraries/classes/Plugins/Export/ExportOdt.php:138 #: libraries/classes/Plugins/Export/ExportTexytext.php:95 msgid "Replace NULL with:" -msgstr "Remplacer NULL par : " +msgstr "Remplacer NULL par :" #: libraries/classes/Plugins/Export/ExportCsv.php:91 #: libraries/classes/Plugins/Export/ExportExcel.php:59 @@ -9943,7 +9943,7 @@ msgstr "Retirer les caractères de fin de ligne à l'intérieur des colonnes" #: libraries/classes/Plugins/Export/ExportExcel.php:69 msgid "Excel edition:" -msgstr "Version d'Excel : " +msgstr "Version d'Excel :" #: libraries/classes/Plugins/Export/ExportHtmlword.php:73 #: libraries/classes/Plugins/Export/ExportLatex.php:106 @@ -10108,7 +10108,7 @@ msgstr "Afficher les types média (MIME)" #: libraries/classes/Plugins/Export/ExportLatex.php:173 msgid "Put columns names in the first row:" -msgstr "Afficher les noms de colonnes en première ligne : " +msgstr "Afficher les noms de colonnes en première ligne :" #: libraries/classes/Plugins/Export/ExportLatex.php:221 #: libraries/classes/Plugins/Export/ExportSql.php:718 @@ -10122,7 +10122,7 @@ msgstr "Hôte :" #: libraries/classes/Plugins/Export/ExportSql.php:724 #: libraries/classes/Plugins/Export/ExportXml.php:249 msgid "Generation Time:" -msgstr "Généré le : " +msgstr "Généré le :" #: libraries/classes/Plugins/Export/ExportLatex.php:228 #: libraries/classes/Plugins/Export/ExportSql.php:728 @@ -10135,23 +10135,23 @@ msgstr "Version du serveur : " #: libraries/classes/Plugins/Export/ExportSql.php:730 #: libraries/classes/Plugins/Export/ExportXml.php:252 msgid "PHP Version:" -msgstr "Version de PHP : " +msgstr "Version de PHP :" #: libraries/classes/Plugins/Export/ExportLatex.php:259 #: libraries/classes/Plugins/Export/ExportSql.php:919 #: libraries/classes/Plugins/Export/ExportXml.php:420 #: libraries/classes/Plugins/Export/Helpers/Pdf.php:181 msgid "Database:" -msgstr "Base de données : " +msgstr "Base de données :" #: libraries/classes/Plugins/Export/ExportLatex.php:332 #: libraries/classes/Plugins/Export/ExportSql.php:2241 msgid "Data:" -msgstr "Données : " +msgstr "Données :" #: libraries/classes/Plugins/Export/ExportLatex.php:520 msgid "Structure:" -msgstr "Structure : " +msgstr "Structure :" #: libraries/classes/Plugins/Export/ExportMediawiki.php:86 msgid "Export table names" @@ -10163,7 +10163,7 @@ msgstr "Exporter les entêtes de table" #: libraries/classes/Plugins/Export/ExportPdf.php:104 msgid "Report title:" -msgstr "Titre du rapport : " +msgstr "Titre du rapport :" #: libraries/classes/Plugins/Export/ExportPdf.php:235 msgid "Dumping data" @@ -10205,8 +10205,8 @@ msgstr "Exporter les métadonnées" msgid "" "Database system or older MySQL server to maximize output compatibility with:" msgstr "" -"Maximiser la compatibilité avec un système de base de données ou un ancien " -"serveur MySQL : " +"Système de base de données ou ancien serveur MySQL pour maximiser la " +"compatibilité de sortie avec :" #: libraries/classes/Plugins/Export/ExportSql.php:238 msgid "Add statements:" @@ -10270,7 +10270,7 @@ msgstr "Fonction à utiliser lors du déchargement des données :" #: libraries/classes/Plugins/Export/ExportSql.php:423 msgid "Syntax to use when inserting data:" -msgstr "Syntaxe à utiliser lors de l'insertion de données : " +msgstr "Syntaxe à utiliser lors de l'insertion de données :" #: libraries/classes/Plugins/Export/ExportSql.php:433 msgid "" @@ -10354,17 +10354,17 @@ msgstr "Métadonnées pour la base de données %s" #: libraries/classes/Plugins/Export/ExportSql.php:1440 #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:649 msgid "Creation:" -msgstr "Création : " +msgstr "Création :" #: libraries/classes/Plugins/Export/ExportSql.php:1453 #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:660 msgid "Last update:" -msgstr "Dernière modification : " +msgstr "Dernière modification :" #: libraries/classes/Plugins/Export/ExportSql.php:1466 #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:671 msgid "Last check:" -msgstr "Dernière vérification : " +msgstr "Dernière vérification :" #: libraries/classes/Plugins/Export/ExportSql.php:1522 #, php-format @@ -10435,7 +10435,7 @@ msgstr "Exporter les contenus" #: libraries/classes/Plugins/Export/Helpers/Pdf.php:182 msgid "Table:" -msgstr "Table : " +msgstr "Table :" #: libraries/classes/Plugins/Export/Helpers/Pdf.php:183 msgid "Purpose:" @@ -10577,7 +10577,7 @@ msgstr "Le fichier importé ne contient aucune donnée !" #: libraries/classes/Plugins/Import/ImportSql.php:72 msgid "SQL compatibility mode:" -msgstr "Mode de compatibilité SQL : " +msgstr "Mode de compatibilité SQL :" #: libraries/classes/Plugins/Import/ImportSql.php:84 msgid "Do not use AUTO_INCREMENT for zero values" From 7955f672d777afba527debbe4b97d0e566187d49 Mon Sep 17 00:00:00 2001 From: Olivier Humbert Date: Wed, 1 Jan 2020 13:02:52 +0000 Subject: [PATCH 2/4] Translated using Weblate (French) Currently translated at 100.0% (3332 of 3332 strings) [CI skip] Translation: phpMyAdmin/5.0 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-0/fr/ Signed-off-by: Olivier Humbert --- po/fr.po | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/po/fr.po b/po/fr.po index e3c32bc87f..095ea90c1d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2019-12-23 15:37-0300\n" -"PO-Revision-Date: 2020-01-01 11:21+0000\n" +"PO-Revision-Date: 2020-01-02 13:21+0000\n" "Last-Translator: Olivier Humbert \n" "Language-Team: French \n" @@ -11087,7 +11087,7 @@ msgstr "Enregistrement des modèles d'exportation" #: libraries/classes/Relation.php:386 msgid "Quick steps to set up advanced features:" -msgstr "Guide rapide de configuration des fonctions avancées : " +msgstr "Guide rapide de configuration des fonctions avancées :" #: libraries/classes/Relation.php:392 #, php-format @@ -11340,7 +11340,7 @@ msgstr "Il faut fournir une définition pour l'évènement." #: libraries/classes/Rte/Routines.php:1358 #: libraries/classes/Rte/Routines.php:1563 msgid "Error in processing request:" -msgstr "Erreur dans le traitement de la requête : " +msgstr "Erreur dans le traitement de la requête :" #: libraries/classes/Rte/Footer.php:125 msgid "OFF" @@ -11356,7 +11356,7 @@ msgstr "État du planificateur d'évènements" #: libraries/classes/Rte/General.php:61 msgid "The backed up query was:" -msgstr "La requête conservée est : " +msgstr "La requête conservée est :" #: libraries/classes/Rte/Routines.php:142 msgid "" @@ -12020,7 +12020,7 @@ msgstr "Informations pour la connexion" #: templates/server/replication/master_add_slave_user.twig:16 #: templates/server/replication/change_master.twig:14 msgid "User name:" -msgstr "Nom d'utilisateur : " +msgstr "Nom d'utilisateur :" #: libraries/classes/Server/Privileges.php:1641 #: libraries/classes/Server/Privileges.php:1662 @@ -12477,7 +12477,7 @@ msgstr "Attributions de menu du groupe d'utilisateurs" #: libraries/classes/Server/UserGroups.php:257 msgid "Group name:" -msgstr "Nom du groupe : " +msgstr "Nom du groupe :" #: libraries/classes/Server/UserGroups.php:294 msgid "Server-level tabs" @@ -13746,7 +13746,7 @@ msgstr "Colonnes des graphiques" #: templates/server/status/monitor/index.twig:74 msgid "Chart arrangement" -msgstr "Actions sur la dispositions des graphiques :" +msgstr "Actions sur la dispositions des graphiques" #: templates/server/status/monitor/index.twig:75 msgid "" @@ -13780,7 +13780,7 @@ msgstr "" #: templates/server/status/monitor/index.twig:101 msgid "Using the monitor:" -msgstr "Utilisation de la surveillance : " +msgstr "Utilisation de la surveillance :" #: templates/server/status/monitor/index.twig:103 msgid "" @@ -13809,7 +13809,7 @@ msgstr "" #: templates/server/status/monitor/index.twig:114 msgid "Please note:" -msgstr "Note : " +msgstr "Veuillez noter :" #: templates/server/status/monitor/index.twig:117 msgid "" @@ -15203,7 +15203,7 @@ msgstr "" #: templates/server/replication/change_master.twig:26 msgid "Port:" -msgstr "Port : " +msgstr "Port :" #: templates/setup/config/index.twig:4 templates/setup/home/index.twig:93 msgid "Configuration file" @@ -15284,7 +15284,7 @@ msgstr "Voir l'état de l'esclave" #: templates/server/replication/slave_configuration.twig:37 msgid "Control slave:" -msgstr "Contrôler le serveur esclave : " +msgstr "Contrôler le serveur esclave :" #: templates/server/replication/slave_configuration.twig:47 msgid "Reset slave" @@ -15308,7 +15308,7 @@ msgstr "Arrêter seulement le fil d'exécution des entrées/sorties" #: templates/server/replication/slave_configuration.twig:73 msgid "Error management:" -msgstr "Gestion des erreurs : " +msgstr "Gestion des erreurs :" #: templates/server/replication/slave_configuration.twig:76 msgid "Skipping errors might lead into unsynchronized master and slave!" @@ -15479,7 +15479,7 @@ msgstr "Survol" #: templates/filter.twig:4 templates/server/status/variables/index.twig:14 msgid "Containing the word:" -msgstr "Contenant le mot : " +msgstr "Contenant le mot :" #: templates/database/designer/main.twig:21 #: templates/database/designer/main.twig:27 @@ -15932,7 +15932,7 @@ msgstr "Afficher les valeurs non formatées" #: templates/server/status/variables/index.twig:45 msgid "Related links:" -msgstr "Liens connexes : " +msgstr "Liens connexes :" #: templates/server/status/variables/index.twig:70 #: templates/server/variables/index.twig:28 @@ -16317,15 +16317,15 @@ msgstr "Nombre d'instructions exécutées depuis le démarrage :" #: templates/server/status/queries/index.twig:17 msgid "per hour:" -msgstr "par heure : " +msgstr "par heure :" #: templates/server/status/queries/index.twig:18 msgid "per minute:" -msgstr "par minute : " +msgstr "par minute :" #: templates/server/status/queries/index.twig:20 msgid "per second:" -msgstr "par seconde : " +msgstr "par seconde :" #: templates/server/status/queries/index.twig:32 msgid "Statements" @@ -16689,7 +16689,7 @@ msgstr "Conserver cette requête SQL dans les signets" #: templates/sql/bookmark.twig:15 msgid "Label:" -msgstr "Intitulé : " +msgstr "Intitulé :" #: templates/error/report_form.twig:6 msgid "" From c0a99eec944c68410f1faa318d883168ddeaaa22 Mon Sep 17 00:00:00 2001 From: Yash Bothra Date: Thu, 2 Jan 2020 15:26:57 +0100 Subject: [PATCH 3/4] fix #15726 - double icon on enum editor Signed-off-by: Yash Bothra --- themes/metro/scss/_enum-editor.scss | 1 - themes/pmahomme/scss/_enum-editor.scss | 1 - 2 files changed, 2 deletions(-) diff --git a/themes/metro/scss/_enum-editor.scss b/themes/metro/scss/_enum-editor.scss index 92e6dfb451..6583f6a22b 100644 --- a/themes/metro/scss/_enum-editor.scss +++ b/themes/metro/scss/_enum-editor.scss @@ -41,7 +41,6 @@ p.enum_notice { } img { - width: 1.8em; vertical-align: middle; } } diff --git a/themes/pmahomme/scss/_enum-editor.scss b/themes/pmahomme/scss/_enum-editor.scss index 044e641d7e..125e5ceabc 100644 --- a/themes/pmahomme/scss/_enum-editor.scss +++ b/themes/pmahomme/scss/_enum-editor.scss @@ -41,7 +41,6 @@ p.enum_notice { } img { - width: 1.8em; vertical-align: middle; } } From 9119a961effe66122a5d13b7c80677d17c1d5f52 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Thu, 2 Jan 2020 15:34:03 +0100 Subject: [PATCH 4/4] Add ChangeLog entry for #15726 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 97fc249139..53ebfcc277 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - issue Prevent line wrap in DB structure size column - issue Remove extra line break from downloaded blob content - issue #15725 Fixed error 500 when exporting - set time limit when $cfg['ExecTimeLimit'] used a string and not an int value +- issue #15726 Fixed double delete icons on enum editor 5.0.0 (2019-12-26) - issue #13896 Drop support for PHP 5.5, PHP 5.6, PHP 7.0 and HHVM