pulled french translation from TX
minor change in locale files
pulled and recompiled french locale
Merge remote-tracking branch 'upstream/merge1' into merge1