mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-17 22:57:21 +01:00
minor text fixes: accurate flavour text for Golden Knight testimonies collection quest, etc (#8826)
* make comment more accurate: members are removed, not banned They can rejoin with an invitation in a private group or at any time in a public group. * change windows line breaks to unix line breaks * change flavour text of Golden Knight collection quest to reduce number of testimonies * fix grammatical error noticed by mandyzhou * improve message about not being able to send PMs because we often see people report it as a bug * update instructions for cancelling Google subscriptions (thanks to Scea for noticing) * change Delete Completed on-hover message - fixes #8598 * correct the Orb of Rebirth's text about pets and mounts (they are not locked)
This commit is contained in:
@@ -114,7 +114,7 @@
|
||||
"messageRequired": "A message is required.",
|
||||
"toUserIDRequired": "A User ID is required",
|
||||
"gemAmountRequired": "A number of gems is required",
|
||||
"notAuthorizedToSendMessageToThisUser": "Can't send message to this user.",
|
||||
"notAuthorizedToSendMessageToThisUser": "You can't send a message to this player because they have chosen to block messages.",
|
||||
"privateMessageGiftGemsMessage": "Hello <%= receiverName %>, <%= senderName %> has sent you <%= gemAmount %> gems!",
|
||||
"privateMessageGiftSubscriptionMessage": "<%= numberOfMonths %> months of subscription! ",
|
||||
"cannotSendGemsToYourself": "Cannot send gems to yourself. Try a subscription instead.",
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
"questGoldenknight1DropGoldenknight2Quest": "The Golden Knight Part 2: Gold Knight (Scroll)",
|
||||
|
||||
"questGoldenknight2Text": "The Golden Knight, Part 2: Gold Knight",
|
||||
"questGoldenknight2Notes": "Armed with hundreds of Habitican's testimonies, you finally confront the Golden Knight. You begin to recite the Habitcan's complaints to her, one by one. \"And @Pfeffernusse says that your constant bragging-\" The knight raises her hand to silence you and scoffs, \"Please, these people are merely jealous of my success. Instead of complaining, they should simply work as hard as I! Perhaps I shall show you the power you can attain through diligence such as mine!\" She raises her morningstar and prepares to attack you!",
|
||||
"questGoldenknight2Notes": "Armed with dozens of Habiticans' testimonies, you finally confront the Golden Knight. You begin to recite the Habitcans' complaints to her, one by one. \"And @Pfeffernusse says that your constant bragging-\" The knight raises her hand to silence you and scoffs, \"Please, these people are merely jealous of my success. Instead of complaining, they should simply work as hard as I! Perhaps I shall show you the power you can attain through diligence such as mine!\" She raises her morningstar and prepares to attack you!",
|
||||
"questGoldenknight2Boss": "Gold Knight",
|
||||
"questGoldenknight2DropGoldenknight3Quest": "The Golden Knight Part 3: The Iron Knight (Scroll)",
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
"rebirthInList1": "Tasks, history, equipment, and settings remain.",
|
||||
"rebirthInList2": "Challenge, Guild, and Party memberships remain.",
|
||||
"rebirthInList3": "Gems, backer tiers, and contributor levels remain.",
|
||||
"rebirthInList4": "Items obtained from Gems or drops (such as pets and mounts) remain, though you cannot access them until you unlock them again.",
|
||||
"rebirthInList4": "Items obtained from Gems or drops (such as pets and mounts) remain.",
|
||||
"rebirthEarnAchievement": "You also earn an Achievement for beginning a new adventure!",
|
||||
"beReborn": "Be Reborn",
|
||||
"rebirthAchievement": "You've begun a new adventure! This is Rebirth <%= number %> for you, and the highest Level you've attained is <%= level %>. To stack this Achievement, begin your next new adventure when you've reached an even higher Level!",
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
"subscribed": "Subscribed",
|
||||
"manageSub": "Click to manage subscription",
|
||||
"cancelSub": "Cancel Subscription",
|
||||
"cancelSubInfoGoogle": "Please go to the \"My apps & games\" > \"Subscriptions\" section of the Google Play Store app to cancel your subscription or to see your subscription's termination date if you have already cancelled it. This screen is not able to show you whether your subscription has been cancelled.",
|
||||
"cancelSubInfoGoogle": "Please go to the \"Account\" > \"Subscriptions\" section of the Google Play Store app to cancel your subscription or to see your subscription's termination date if you have already cancelled it. This screen is not able to show you whether your subscription has been cancelled.",
|
||||
"cancelSubInfoApple": "Please follow <a href=\"https://support.apple.com/en-us/HT202039\">Apple’s official instructions</a> to cancel your subscription or to see your subscription's termination date if you have already cancelled it. This screen is not able to show you whether your subscription has been cancelled.",
|
||||
"canceledSubscription": "Canceled Subscription",
|
||||
"cancelingSubscription": "Canceling the subscription",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"clearCompleted": "Delete Completed",
|
||||
"lotOfToDos": "Your most recent 30 completed To-Dos are shown here. You can see older completed To-Dos from Data > Data Display Tool or Data > Export Data > User Data.",
|
||||
"deleteToDosExplanation": "If you click the button below, all of your completed To-Dos and archived To-Dos will be permanently deleted. Export them first if you want to keep a record of them.",
|
||||
"deleteToDosExplanation": "If you click the button below, all of your completed To-Dos and archived To-Dos will be permanently deleted, except for To-Dos from active challenges and Group Plans. Export them first if you want to keep a record of them.",
|
||||
"addmultiple": "Add Multiple",
|
||||
"addsingle": "Add Single",
|
||||
"habit": "Habit",
|
||||
|
||||
@@ -107,7 +107,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
|
||||
table.table.table-striped(ng-show='::group.memberCount > 1 || group.type !== "party"' bindonce='group')
|
||||
tr(ng-repeat='member in group.members track by member._id')
|
||||
td.media
|
||||
// allow leaders and administrators to ban members
|
||||
// allow leaders and administrators to remove members
|
||||
.pull-left(ng-show='(isAbleToEditGroup(group) && member._id != user._id)')
|
||||
a.media-object(ng-click='removeMember(group, member, true)')
|
||||
span.glyphicon.glyphicon-ban-circle(tooltip=env.t('banTip'))
|
||||
@@ -130,7 +130,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
|
||||
table.table.table-striped
|
||||
tr(ng-repeat='invite in group.invites')
|
||||
td.media
|
||||
// allow leaders and administrators to ban members
|
||||
// allow leaders and administrators to remove members
|
||||
.pull-left(ng-show='isAbleToEditGroup(group)')
|
||||
a.media-object(ng-click='removeMember(group, invite, false)')
|
||||
span.glyphicon.glyphicon-ban-circle(tooltip=env.t('banTip'))
|
||||
|
||||
Reference in New Issue
Block a user