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

Fix merge conflict

Browse Source
This commit is contained in:
Marc Delisle 2013-10-03 11:31:51 -04:00
commit d4fb9d9aab
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
po/fr.po
View File

@ -3,11 +3,11 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-10-03 11:28-0400\n"
"PO-Revision-Date: 2013-09-29 14:37+0200\n"
"POT-Creation-Date: 2013-10-03 17:03+0200\n"
"PO-Revision-Date: 2013-10-03 17:16+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: French <http://l10n.cihar.com/projects/phpmyadmin/master/fr/"
">\n"
"Language-Team: French <http://l10n.cihar.com/projects/phpmyadmin/master/fr/>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -2022,10 +2022,9 @@ msgid "Create view"
msgstr "Créer une vue"
#: js/messages.php:396
#, fuzzy
#| msgid "Server port"
msgid "Send Error Report"
msgstr "Port"
msgstr "Envoyer le rapport d'erreurs"
#: js/messages.php:397
msgid "Submit Error Report"