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

Fixup merge

Browse Source
This commit is contained in:
Michal Čihař 2011-06-07 13:27:38 +02:00
parent d14a6876cf
commit fcef36d1fc
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
po/fr.po
View File

@ -8079,13 +8079,8 @@ msgstr "passepartout"
#: server_privileges.php:2295
#| msgid "View %s has been dropped"
<<<<<<< HEAD
msgid "User has been added."
msgstr "La vue %s a été supprimée"
=======
msgid "New user has been added."
msgstr "Un utilisateur a été ajouté"
>>>>>>> pootle/master
#: server_processlist.php:29
#, php-format