Add dispensing=yes for French amenity=pharmacy
Translate missing string to english
Merge remote-tracking branch 'frodrigo/master'
Fix unicode encoding of string in TagFix_MultipleTag.py