Merge branch 'develop' into blade-Finish_weeklies_pr

This commit is contained in:
Blade Barringer
2015-06-04 12:45:23 -05:00
9 changed files with 95 additions and 9 deletions
+4 -1
View File
@@ -116,5 +116,8 @@
"sendGiftFromBalance": "From Balance",
"sendGiftPurchase": "Purchase",
"sendGiftMessagePlaceholder": "Personal message (optional)",
"sendGiftSubscription": "<%= months %> Month(s): $<%= price %>"
"sendGiftSubscription": "<%= months %> Month(s): $<%= price %>",
"inviteFriends": "Invite Friends",
"startAParty": "Start a Party",
"addToParty": "Add someone to your party"
}
+3 -1
View File
@@ -118,5 +118,7 @@
"resubscribe": "Resubscribe",
"promoCode": "Promo Code",
"promoCodeApplied": "Promo Code Applied! Check your inventory",
"promoPlaceholder": "Enter Promotion Code"
"promoPlaceholder": "Enter Promotion Code",
"couponText": "We sometimes have events and give out coupon codes for special gear. (eg, those who stop by our Wondercon booth)",
"displayInviteToPartyWhenPartyIs1": "Display Invite To Party button when party has 1 member."
}