Commit Graph

25 Commits

Author SHA1 Message Date
Blade Barringer 6c6e22f9e6 Part 1 of translation fixes 2015-08-07 23:43:37 -05:00
Blade Barringer 25fc92d59e chore(i18n): update locales 2015-07-30 22:49:22 -05:00
Blade Barringer de30d6bf0c chore(i18n): update locales 2015-07-22 07:41:49 -05:00
Blade Barringer 668a8bb6f6 chore(i18n): update locales 2015-07-16 12:04:10 -05:00
Matteo Pagliazzi 4b170cd4dc chore(i18n): update locales 2015-07-12 23:45:26 +02:00
Matteo Pagliazzi 5e8baf6c92 chore(i18n): update locales 2015-07-10 15:45:58 +02:00
Matteo Pagliazzi 2c41553d7a chore(i18n): update locales 2015-06-23 10:31:10 +02:00
Matteo Pagliazzi afc6fba5bf chore(i18n): update locales 2015-06-22 18:24:37 +02:00
Matteo Pagliazzi d3353aa751 chore(i18n): update locales 2015-06-15 13:20:09 +02:00
Matteo Pagliazzi 4ee3e711d1 chore(i18n): update locales 2015-06-08 18:57:38 +02:00
Matteo Pagliazzi 995721e0da chore(i18n): update locales 2015-05-31 15:36:54 +02:00
Matteo Pagliazzi 047ce0141f chore(i18n): update locales 2015-05-24 11:27:17 +02:00
Matteo Pagliazzi c699fcde49 chore(i18n): update locales 2015-04-22 16:22:11 +02:00
Matteo Pagliazzi 662c8cd529 chore(i18n): update locales 2015-04-19 13:28:21 +02:00
Matteo Pagliazzi 820909dd9b chore(i18n): update locales 2015-04-08 19:15:03 +02:00
Matteo Pagliazzi 61db64e963 chore(i18n): update locales 2015-04-03 13:28:45 +02:00
Matteo Pagliazzi 2937c13f6b chore(i18n): update locales 2015-03-29 22:30:53 +02:00
Matteo Pagliazzi 4c3e7f897e chore(i18n): update locales 2015-03-19 20:21:04 +01:00
Matteo Pagliazzi 6d163ecb5d chore(i18n): update locales 2015-03-18 12:13:36 +01:00
Matteo Pagliazzi b0b6864f1c chore(i18n): update locales 2015-03-16 19:56:35 +01:00
Blade Barringer 9ddb5e35fb Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/dist/sprites/habitrpg-shared.css
	common/img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	common/img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_10_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_11_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_12_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_13_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_14_TRUred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUEred.png
	img/sprites/spritesmith/customize/hair/hair_base_9_TRUred.png
2015-02-12 13:42:11 -06:00
Blade Barringer 45d1fb4c6e Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/dist/scripts/habitrpg-shared.js
2015-02-09 22:18:22 -06: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