From 1454fafeb6a3ad0f3a045ca0a52690f3386fa8f8 Mon Sep 17 00:00:00 2001 From: Glen Anderson Date: Sun, 22 Feb 2015 10:10:24 +0000 Subject: [PATCH 1/4] Fix a grammatical error in donateText3 --- common/locales/en/npc.json | 2 +- common/locales/en@pirate/npc.json | 4 ++-- common/locales/en_GB/npc.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/locales/en/npc.json b/common/locales/en/npc.json index 3ee492cf72..90a9e0294b 100644 --- a/common/locales/en/npc.json +++ b/common/locales/en/npc.json @@ -18,7 +18,7 @@ "dismissAlert": "Dismiss This Alert", "donateText1": "Adds 20 Gems to your account. Gems are used to buy special in-game items, such as shirts and hairstyles.", "donateText2": "Help support HabitRPG", - "donateText3": "As an open source project, it can use all the help we can get!", + "donateText3": "As an open source project, it can use all the help it can get!", "donationDesc": "20 Gems, Donation to HabitRPG", "payWithCard": "Pay with Card", "payNote": "Note: PayPal sometimes takes a long time to clear. We recommend paying with card.", diff --git a/common/locales/en@pirate/npc.json b/common/locales/en@pirate/npc.json index 057ff664d7..eae1bcc527 100644 --- a/common/locales/en@pirate/npc.json +++ b/common/locales/en@pirate/npc.json @@ -18,7 +18,7 @@ "dismissAlert": "Dismiss This Alert", "donateText1": "Adds 20 Gems to ye account. Gems be used to buy special in-game items, such as shirts 'n hairstyles.", "donateText2": "Help support HabitRPG", - "donateText3": "As an open source project, it can use all the help we can get!", + "donateText3": "As an open source project, it can use all the help it can get!", "donationDesc": "20 Gems, Donation to HabitRPG", "payWithCard": "Pay with Card", "payNote": "Ahoy! PayPal sometimes takes a long time to clear. We recommend paying with card.", @@ -62,4 +62,4 @@ "spellsText": "Ye can now unlock class-specific spells. ye'll spy wit' ye eye ye first at level 11. ye mana replenishes 10 points per day, plus 1 point per completed", "toDo": "To-Do", "moreClass": "Fer more information on th' class-system, see" -} \ No newline at end of file +} diff --git a/common/locales/en_GB/npc.json b/common/locales/en_GB/npc.json index 7915715e66..b6cc7cb85c 100644 --- a/common/locales/en_GB/npc.json +++ b/common/locales/en_GB/npc.json @@ -18,7 +18,7 @@ "dismissAlert": "Dismiss This Alert", "donateText1": "Adds 20 Gems to your account. Gems are used to buy special in-game items, such as shirts and hairstyles.", "donateText2": "Help support HabitRPG", - "donateText3": "As an open source project, it can use all the help we can get!", + "donateText3": "As an open source project, it can use all the help it can get!", "donationDesc": "20 Gems, Donation to HabitRPG", "payWithCard": "Pay with Card", "payNote": "Note: PayPal sometimes takes a long time to clear. We recommend paying with card.", @@ -62,4 +62,4 @@ "spellsText": "You can now unlock class-specific spells. You'll see your first at level 11. Your mana replenishes 10 points per day, plus 1 point per completed", "toDo": "To-Do", "moreClass": "For more information on the class-system, see" -} \ No newline at end of file +} From d91b98d936afcd81b9358f0f1716bdb1e3a10b6c Mon Sep 17 00:00:00 2001 From: Glen Anderson Date: Sun, 22 Feb 2015 20:25:03 +0000 Subject: [PATCH 2/4] Revert changes to files managed by Transifex --- common/locales/en@pirate/npc.json | 4 ++-- common/locales/en_GB/npc.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/locales/en@pirate/npc.json b/common/locales/en@pirate/npc.json index eae1bcc527..057ff664d7 100644 --- a/common/locales/en@pirate/npc.json +++ b/common/locales/en@pirate/npc.json @@ -18,7 +18,7 @@ "dismissAlert": "Dismiss This Alert", "donateText1": "Adds 20 Gems to ye account. Gems be used to buy special in-game items, such as shirts 'n hairstyles.", "donateText2": "Help support HabitRPG", - "donateText3": "As an open source project, it can use all the help it can get!", + "donateText3": "As an open source project, it can use all the help we can get!", "donationDesc": "20 Gems, Donation to HabitRPG", "payWithCard": "Pay with Card", "payNote": "Ahoy! PayPal sometimes takes a long time to clear. We recommend paying with card.", @@ -62,4 +62,4 @@ "spellsText": "Ye can now unlock class-specific spells. ye'll spy wit' ye eye ye first at level 11. ye mana replenishes 10 points per day, plus 1 point per completed", "toDo": "To-Do", "moreClass": "Fer more information on th' class-system, see" -} +} \ No newline at end of file diff --git a/common/locales/en_GB/npc.json b/common/locales/en_GB/npc.json index b6cc7cb85c..7915715e66 100644 --- a/common/locales/en_GB/npc.json +++ b/common/locales/en_GB/npc.json @@ -18,7 +18,7 @@ "dismissAlert": "Dismiss This Alert", "donateText1": "Adds 20 Gems to your account. Gems are used to buy special in-game items, such as shirts and hairstyles.", "donateText2": "Help support HabitRPG", - "donateText3": "As an open source project, it can use all the help it can get!", + "donateText3": "As an open source project, it can use all the help we can get!", "donationDesc": "20 Gems, Donation to HabitRPG", "payWithCard": "Pay with Card", "payNote": "Note: PayPal sometimes takes a long time to clear. We recommend paying with card.", @@ -62,4 +62,4 @@ "spellsText": "You can now unlock class-specific spells. You'll see your first at level 11. Your mana replenishes 10 points per day, plus 1 point per completed", "toDo": "To-Do", "moreClass": "For more information on the class-system, see" -} +} \ No newline at end of file From 7e2e628224a328ab82dc6b23ea7863bc7f69d0a7 Mon Sep 17 00:00:00 2001 From: Glen Anderson Date: Wed, 6 May 2015 14:05:10 +0100 Subject: [PATCH 3/4] Improve wording on subscriber page --- common/locales/en/npc.json | 2 +- common/locales/en/subscriber.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/locales/en/npc.json b/common/locales/en/npc.json index c979e21ffb..cd1c382b7a 100644 --- a/common/locales/en/npc.json +++ b/common/locales/en/npc.json @@ -18,7 +18,7 @@ "dismissAlert": "Dismiss This Alert", "donateText1": "Adds 20 Gems to your account. Gems are used to buy special in-game items, such as shirts and hairstyles.", "donateText2": "Help support HabitRPG", - "donateText3": "As an open source project, it can use all the help it can get!", + "donateText3": "HabitRPG is an open source project that depends on our users for support. The money you spend on gems helps us keep the servers running, maintain a small staff, develop new features, and provide incentives for our volunteer programmers. Thank you for your generosity!", "donationDesc": "20 Gems, Donation to HabitRPG", "payWithCard": "Pay with Card", "payNote": "Note: PayPal sometimes takes a long time to clear. We recommend paying with card.", diff --git a/common/locales/en/subscriber.json b/common/locales/en/subscriber.json index 4f602a48a3..661a1323e0 100644 --- a/common/locales/en/subscriber.json +++ b/common/locales/en/subscriber.json @@ -3,17 +3,17 @@ "subscriptions": "Subscriptions", "subDescription": "Disable ads, buy gems with gold, monthly mystery item, retain progress history, double daily drop-caps, supports the devs. Click for more info.", "disableAds": "Disable ads", - "disableAdsText": "Ads will stay disabled while you have an active subscription (original users with disabled ads are grandfathered).", + "disableAdsText": "Ads are disabled while you have an active subscription (original donors are grandfathered).", "buyGemsGold": "Buy Gems with Gold", - "buyGemsGoldText": "(1 Gem costs <%= gemCost %> Gold) Addresses the \"pay to win\" concern, as everything is now achievable through hard work. There's a <%= gemLimit %> Gem monthly conversion cap to prevent farming.", + "buyGemsGoldText": "Alexander the Merchant will sell you gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> gems per month, but this cap increases by 5 gems for every three months of consecutive subscription, up to a maximum of 50 gems per month!" "retainHistory": "Retain full history entries", "retainHistoryText": "Makes your full history available in graphs and export. Non-subscriber histories get consolidated for database optimization.", "doubleDrops": "Daily drop-caps doubled", "doubleDropsText": "Complete your stable faster!", "mysteryItem": "Unique Monthly Subscription Items", - "mysteryItemText": "Each month, all subscribers will get a totally unique cosmetic item for their avatars!", + "mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.", "supportDevs": "Supports the developers", - "supportDevsText": "This open source project can use all the help it can get. Help us keep Habit alive!", + "supportDevsText": "Your subscription helps keep Habitica thriving and helps fund the development of new features. Thank you for your generosity!", "monthUSD": "USD / Month", "organization": "Organization", "groupPlans": "Corporate Plans", From 682fc07c26d2ec86414261212f35ffaccfc617a4 Mon Sep 17 00:00:00 2001 From: Glen Anderson Date: Wed, 6 May 2015 14:09:22 +0100 Subject: [PATCH 4/4] Fix a missing comma --- common/locales/en/subscriber.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/locales/en/subscriber.json b/common/locales/en/subscriber.json index 661a1323e0..e6e4876c09 100644 --- a/common/locales/en/subscriber.json +++ b/common/locales/en/subscriber.json @@ -5,7 +5,7 @@ "disableAds": "Disable ads", "disableAdsText": "Ads are disabled while you have an active subscription (original donors are grandfathered).", "buyGemsGold": "Buy Gems with Gold", - "buyGemsGoldText": "Alexander the Merchant will sell you gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> gems per month, but this cap increases by 5 gems for every three months of consecutive subscription, up to a maximum of 50 gems per month!" + "buyGemsGoldText": "Alexander the Merchant will sell you gems at a cost of <%= gemCost %> gold per gem. His monthly shipments are initially capped at <%= gemLimit %> gems per month, but this cap increases by 5 gems for every three months of consecutive subscription, up to a maximum of 50 gems per month!", "retainHistory": "Retain full history entries", "retainHistoryText": "Makes your full history available in graphs and export. Non-subscriber histories get consolidated for database optimization.", "doubleDrops": "Daily drop-caps doubled",