Ensure these strings are using translation functions too
Merge pull request #33 from Automattic/translation-strings

Ensure these strings are using translation functions too
Credit and bumping tested up to
Fixing gettext issues with parentheses
Giving some props
Capital S for Spanish
Code cleanup: remove unused method
Coding standards
Changes to the translations and new compiled mo file
Merge pull request #36 from rfzappala/master

New translations and mo file for fr_CA
Merge remote-tracking branch 'upstream/master'

Conflicts:
	frontend-uploader.php