string edits and stuff

null
Merge remote-tracking branch 'upstream/WIP' into WIP
Revert "string edits and stuff"

This reverts commit cd55cf3b07687fba5810947588ed847c8f863452.
The French have Landed!

First round of french translations have arrived. Not the entire strings
file, but some.

Also it appears a merge happened again
String stuff I think
Revert "The French have Landed!"

This reverts commit 4783dc85e202672aa218e26e9c7320b48884880f.
I uh, botched some things up I think.

Had to undo one of those big commits. Should be fine and dandy now (I
hope, you may still want to double and triple check everything)
Merge pull request #2 from AnoraxAudio/WIP

French Strings