N2C6

newline at end of file
Updated Carbonite.Quests locales to current
white space cleanup
Should tis be  QuestWatchTip  or  QuestWatch?
Update to work with LibSharedMedia-3.0 Fonts
Merge pull request #84 from Raka-loah/master

zhCN and zhTW locale update
Add Progress Bar as option
Updated to current
Merge remote-tracking branch 'upstream/master' into N2C6
Fix The Maelstrom continent number based on http://www.wowinterface.com/forums/showpost.php?p=302054&postcount=685

Probably based on the info from the function in Carbonite/NxMap.lua at line 8405
Updated Zones.lua
Updated translation files for https://github.com/nelegalno/Carbonite/commit/3d0cbf6064a25c93f5d075a5cce9651abca60324
Added missing localisation for settings/bonus task progress test
Merge remote-tracking branch 'upstream/master' into N2C6

Conflicts:
	Carbonite.Quests/Locales/enUS.lua
	Carbonite.Quests/Locales/zhCN.lua
Resolved merge conflicts
missed a translation in Carbonite.Quests/Locales/zhCN.lua
Merge pull request #78 from nelegalno/N2C6

N2C6
Translations and merge

nelegano's zone fix translation to german
merge commit bdd8b80aa82396187fb02e8620e21e1f5a072b82
from powerstrk
manually Merge with powerstk patch10

Merge for pull request  Patch 10 #81

Please make your code merged by kdiff otherwise no longer possible to
merge because in your files are some parts missing (Module Patch and
BONUS Task)
correction

copy failure
New NPCS for 86-90 and 91-100 quests
New Quests data.