Commit graph

176 commits

Author SHA1 Message Date
Blade Barringer
41a6818ea8 Revert inn text 2015-05-03 20:21:53 -05:00
Matteo Pagliazzi
0454938303 chore(i18n): update locales 2015-05-03 21:24:53 +02:00
Blade Barringer
b408f016fd Merge pull request #5119 from NotGonnaGitUs/develop
Made front page translatable
2015-05-03 09:43:43 -05:00
NotGonnaGitUs
4d5ec83234 Removed objects not used anywhere by env.t function. 2015-05-03 14:33:46 +05:30
Blade Barringer
68aedda3bb Merge branch 'develop' into hairlessbear-cron_dailies_fix 2015-05-02 22:10:58 -05:00
NotGonnaGitUs
0fc068ea93 Removed objects not used by front.jade, footer.jade or login-modale.jade 2015-05-02 20:02:20 +05:30
NotGonnaGitUs
21f470cd5a Removed objects not used front.jade or shared/footer.jade 2015-05-02 17:42:38 +05:30
NotGonnaGitUs
9e88a55d54 Removed objects not used by front.jade. 2015-05-02 17:12:46 +05:30
Matteo Pagliazzi
72f8c60ccf chore(i18n): update locales 2015-05-02 11:43:38 +02:00
NotGonnaGitUs
124df58644 Made front page translatable. 2015-05-01 21:18:25 +05:30
NotGonnaGitUs
02e7b52fbf Adding environment variables to the static front page for translation. - Halfway done. 2015-05-01 20:14:19 +05:30
Blade Barringer
9b22ac68da Merge pull request #5116 from HabitRPG/rebalancing-2015-03
Skills rebalancing
2015-04-30 21:10:31 -05:00
Matteo Pagliazzi
8dcbf75300 chore(i18n): update locales 2015-04-27 21:05:45 +02:00
Alys
ffcb765b7f change skill descriptions to new ones provided by Lemoness at https://github.com/HabitRPG/habitrpg/issues/3029#issuecomment-96103553 2015-04-26 16:58:09 +10:00
hairlessbear
f5f5753ea5 removed added EOF newlines 2015-04-25 14:53:44 -04:00
hairlessbear
d892314603 Update npc.json 2015-04-25 14:47:47 -04:00
hairlessbear
5a8b5be115 Update npc.json 2015-04-25 14:47:24 -04:00
hairlessbear
441d9b2a33 Reverting erroneous language changes 2015-04-25 14:46:35 -04:00
hairlessbear
9fe6b21523 Reverting erroneous language changes 2015-04-25 14:44:46 -04:00
hairlessbear
3f5d5929c5 Reverting erroneous language changes 2015-04-25 14:42:01 -04:00
hairlessbear
3c366e9ad3 Changed tavern text to Lemoness's specifications 2015-04-25 13:09:16 -04:00
hairlessbear
b87950d948 Updated tavern text to reflect modified dailies functionality 2015-04-25 12:15:15 -04:00
Sabe Jones
f9cf860ae8 Merge pull request #5058 from SabreCat/busy-bee
April 2015 Subscriber Items
2015-04-24 11:05:03 -05:00
Matteo Pagliazzi
ca3ac96d6d chore(i18n): update locales 2015-04-23 20:49:53 +02:00
Matteo Pagliazzi
37f7db3c4e feat(emails): add support for weekly recap emails 2015-04-22 16:30:53 +02:00
Matteo Pagliazzi
c699fcde49 chore(i18n): update locales 2015-04-22 16:22:11 +02:00
Alys
7c36e49243 Merge pull request #5022 from gisikw/dated-tasks-correct-impl
Dated tasks correct impl
2015-04-22 16:56:03 +10:00
Sabe Jones
7a7fc96818 feat(mystery): April Subscribee Items 2015-04-21 21:14:19 -05:00
Matteo Pagliazzi
ee7ba19ed1 feat(i18n): upload japanese, serbian and chinese (taiwan) 2015-04-19 13:34:20 +02:00
Matteo Pagliazzi
662c8cd529 chore(i18n): update locales 2015-04-19 13:28:21 +02:00
Alys
175ec9bb46 Merge pull request #5007 from stillsnowedin/develop
Updated the custom day start information in settings. (#5006)
2015-04-19 15:02:37 +10:00
Sabe Jones
f13c6cba00 feat(pets): Slime Quest 2015-04-15 18:08:43 -05:00
Matteo Pagliazzi
e474f0300c chore(i18n): update locales 2015-04-15 17:13:07 +02:00
Blade Barringer
fc979dfdaa create new string for quest participants to correct processing error
closes #5025, closes #5029
2015-04-14 17:52:08 -05:00
Kathryn Norris
8c45ab8dc4 Removed unused strings and altered custom day start text. (#5006) 2015-04-14 14:23:20 -07:00
Alys
6296a2f4df Merge pull request #4969 from Alys/explain-drops-2015-03-04
add text to Market for eggs, etc to explain to new users that the items will also drop
2015-04-14 18:22:47 +10:00
Alys
00abf0d694 update Drop System explanation 2015-04-14 17:57:10 +10:00
Kathryn Norris
5dc1d58f8f Altered custom day start text. (#5006) 2015-04-13 17:13:23 -07:00
Kathryn Norris
ea2ad4e4b5 Changed the text for custom day start info. (#5006) 2015-04-13 17:13:22 -07:00
Kathryn Norris
ddb7643ff7 Updated the custom day start information in settings. (#5006) 2015-04-13 17:13:22 -07:00
Alys
a7abbe0e05 changed drops Learn More link and added drop types to Drops Unlocked message 2015-04-14 08:01:32 +10:00
Matteo Pagliazzi
4fe740a403 chore(i18n): update locales 2015-04-13 19:31:53 +02:00
Kevin Gisi
02838214c7 Reimplement (broken) task ordering 2015-04-13 07:47:56 -04:00
Alys
8af1f0538b revert PR #4996 (Sort dated todos) because of problems sorting other tasks - see comments in #4996 2015-04-13 20:16:24 +10:00
Matteo Pagliazzi
9b19bd5076 chore(i18n): update locales 2015-04-11 14:53:33 +02:00
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
cdd0b29924 Merge branch 'develop' into gisikw-sort-dated-todos 2015-04-08 20:47:38 -05:00
Blade Barringer
3df45a8cb0 Merge branch 'TheHollidayInn-error-message-rewrite' into develop 2015-04-08 18:11:51 -05:00