gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

Browse Source
This commit is contained in:
Deven Bansod 2016-11-22 10:40:20 +05:30
commit 6f1ab31356
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
composer.json
View File

@ -29,12 +29,12 @@
"php": ">=5.5.0",
"ext-mbstring": "*",
"ext-xml": "*",
"phpmyadmin/sql-parser": "~3.4",
"phpmyadmin/sql-parser": "^3.4",
"phpmyadmin/motranslator": "^2.0",
"phpmyadmin/shapefile": "~0.1 || ~1.0",
"tecnickcom/tcpdf": "~6.2",
"phpseclib/phpseclib": "~2.0",
"google/recaptcha": "~1.1"
"phpmyadmin/shapefile": "^1.0",
"tecnickcom/tcpdf": "^6.2",
"phpseclib/phpseclib": "^2.0",
"google/recaptcha": "^1.1"
},
"suggest": {
"ext-zlib": "For gz import and export",
@ -44,7 +44,7 @@
"tecnickcom/tcpdf": "For PDF support"
},
"require-dev": {
"satooshi/php-coveralls": "~0.6",
"satooshi/php-coveralls": "^1.0",
"phpunit/phpunit": "~4.1",
"codacy/coverage": "dev-master",
"phpunit/phpunit-selenium": "~1.2",

18
po/fr.po
View File

@ -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: 2016-11-10 09:40+0100\n"
"PO-Revision-Date: 2016-11-16 13:27+0000\n"
"PO-Revision-Date: 2016-11-19 12:34+0000\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: French "
"<https://hosted.weblate.org/projects/phpmyadmin/master/fr/>\n"
@ -3942,12 +3942,11 @@ msgid "Language"
msgstr "Langue"
#: libraries/Linter.php:99
#, fuzzy
msgid ""
"Linting is disabled for this query because it exceeds the maximum length."
msgstr ""
"L'indentation automatique et les commentaires sont désactivés pour cette "
"requête car elle dépasse la longueur maximum."
"Le peluchage est désactivé pour cette requête, car elle dépasse la longueur "
"maximale."
#: libraries/Linter.php:165
#, php-format
@ -5001,7 +5000,6 @@ msgid "Attribute"
msgstr "Attribut"
#: libraries/central_columns.lib.php:709 libraries/central_columns.lib.php:1387
#, fuzzy
msgid "A_I"
msgstr "Incrémentation automatique"
@ -7632,18 +7630,14 @@ msgid "Show last check timestamp"
msgstr "Montrer la date de dernière vérification"
#: libraries/config/messages.inc.php:858
#, fuzzy
#| msgid "Show or hide a column displaying the comments for all tables."
msgid "Show or hide a column displaying the charset for all tables."
msgstr ""
"Montrer ou cacher une colonne affichant les commentaires pour toutes les "
"tables."
"Montrer ou cacher une colonne affichant le jeu de charactères pour toutes "
"les tables."
#: libraries/config/messages.inc.php:860
#, fuzzy
#| msgid "Show table comments"
msgid "Show table charset"
msgstr "Montrer les commentaires de table"
msgstr "Montrer le jeu de caractères de la table"
#: libraries/config/messages.inc.php:862
msgid ""