Blade Barringer
9e118cbfcc
Added gem popover title back in
2015-04-09 17:19:58 -05:00
Blade Barringer
252e2d0768
Removed gem popover string
2015-04-09 08:09:09 -05:00
Sphinx
7efb594838
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
2015-04-09 08:01:34 -05:00
Blade Barringer
553bd0d90b
Updated console message
2015-04-08 18:11:34 -05:00
TheHollidayInn
a317bc2920
Updated seeConsole message to be more helpful to the average user
2015-04-08 08:20:10 -05:00
Bryce Wojtowicz
0931d52d56
Edit: fixed tabs instead of spaces issue
2015-02-22 13:39:19 +08:00
Bryce Wojtowicz
44478d3792
Fixes #4645
...
Fixes Gem Display in modals to say [Gem] You have [n] Gems
Modified code to use a translatable string!
Thanks for the tip :)
2015-02-22 13:35:50 +08:00
Blade Barringer
88be8f3274
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
...
Conflicts:
common/img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
common/img/sprites/spritesmith/npcs/npc_bailey_broken.png
common/img/sprites/spritesmith/npcs/npc_justin_broken.png
common/img/sprites/spritesmith/npcs/npc_matt_broken.png
img/sprites/spritesmith/gear/events/birthday/broad_armor_special_birthday2015.png
img/sprites/spritesmith/gear/events/birthday/shop_armor_special_birthday2015.png
img/sprites/spritesmith/misc/inventory_quest_scroll_penguin.png
img/sprites/spritesmith/npcs/npc_bailey_broken.png
img/sprites/spritesmith/npcs/npc_justin_broken.png
img/sprites/spritesmith/quests/inventory_quest_scroll_penguin.png
2015-02-01 14:07:18 -06:00
Blade Barringer
4588be29ee
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
2015-01-23 15:29:56 -06:00
Blade Barringer
c91b0cd34a
Moved folders into common directory
2015-01-21 10:34:04 -06:00
