Pulling in commits from shared repo

Additional changes to other languages are required before merging!

https://trello.com/c/SvTsLdRF/12-translations
"0leg
It would be great if we could have "%number_of% Participants" instead of just "Participants" in the source language so that we could translate it as "участников: %number_of%" which is the only correct way to translate it into Russian without grammatical mistakes. (This example is from Challenges tab.)"
Conflicts:
	locales/en/challenge.json
This commit is contained in:
Sphinx 2014-03-01 20:07:05 +05:00 committed by Blade Barringer
parent 69e1b4f8e6
commit 7efb594838
2 changed files with 2 additions and 1 deletions

View file

@ -37,7 +37,7 @@
"publicChallenges": "Minimum 1 Gem for <strong> public challenges </strong> (helps prevent spam, it really does).",
"officialChallenge": "Official HabitRPG Challenge",
"by": "by",
"participants": "Participants",
"participants": "<%= membercount %> Participants",
"join": "Join",
"exportChallengeCSV": "Export to CSV",
"selectGroup": "Please select group",

View file

@ -41,6 +41,7 @@
"gemButton": "You have <%= number %> Gems.",
"moreInfo": "More Info",
"gemsWhatFor": "Purchased using real money. Used for buying special items and services (eggs, hatching potions, Fortify, etc.). You'll need to unlock those features before being able to use Gems.",
"gemsPopTitle": "Gems",
"veteran": "Veteran",
"veteranText": "Has weathered Habit The Grey (our pre Angular website), and has gained many battle-scars from its bugs.",
"originalUser": "Original User!",