Update frFR.lua

Correction set in the context - line 96-97
Merge pull request #197 from powerstrk/patch-52

Update frFR.lua
Merge pull request #196 from gOOvER/master

	Added missing Translations Strings - Part 6 + CodeStyle
Adding Quest Data Garhering
Merge pull request #198 from IrcDirk/master

Adding Quest Data Garhering
Tracking achievement criteria - use formatted info
removed .bak file
Carbonite.Weekly Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	Carbonite.Weekly/Locales/enUS.lua
	Carbonite.Weekly/NxWeekly.lua
	Carbonite/NxCom.lua
Added missing options
bug fix
Update koKR.lua
Merge pull request #200 from poby70/patch-1

Update koKR.lua
Merge remote-tracking branch 'upstream/master'