From a9f3360890ccc97e96fc36d914f0811b0ecaf2e2 Mon Sep 17 00:00:00 2001 From: SabreCat Date: Tue, 3 Oct 2023 13:32:11 -0500 Subject: [PATCH] Squashed commit of the following: commit 9d99b6b3d7bab73fb7ae6a06b23db624a96535cb Author: SabreCat Date: Thu Sep 14 09:57:42 2023 -0500 fix(string): just Bank commit a4d34d487aa2d180beaac39fc616feb83940d473 Author: CuriousMagpie Date: Wed Sep 13 14:50:14 2023 -0400 fix(strings): remove/change "guild" to "group" commit dee572cd6336d3b119ab58dd3ff4a7a1cf9c98dd Merge: aefd8ec6c4 e332876d30 Author: CuriousMagpie Date: Wed Sep 13 13:54:50 2023 -0400 Merge branch 'develop' into misc-string-fixes commit aefd8ec6c46d28e3b918e68e81b73c2b24448abc Author: Sabe Jones Date: Tue Jul 25 14:10:25 2023 -0500 fix(config): correct habitica url format too commit 990da1c8f2015468f9b1e4360268f0a023fcbd10 Merge: c1d6e0b580 8558dcc3a8 Author: CuriousMagpie Date: Mon Jul 24 15:54:49 2023 -0400 Merge branch 'develop' into misc-string-fixes commit c1d6e0b580a47758f2dafb20e5ea0e2ee797ca99 Author: CuriousMagpie Date: Mon Jul 24 15:53:28 2023 -0400 fix(trusted_domains): removed https:// from the beginning of localhost commit b77cb874c96eb7f2fa051cd99505a9d36a0f2981 Merge: 7285aa36bd 71e165433a Author: CuriousMagpie Date: Thu May 11 16:26:17 2023 -0400 Merge branch 'develop' into misc-string-fixes commit 7285aa36bdaa901668598d1e5d47f0614b106856 Author: CuriousMagpie Date: Thu Feb 9 15:31:41 2023 -0500 fix(typo): correct February backgrounds release date to 2023, not 2022 commit 7aca2ee908064ead5ff7dd6e499ac300fc9c5dd0 Merge: 30edc124ac 0b8f2bc58e Author: CuriousMagpie Date: Thu Feb 9 15:30:34 2023 -0500 Merge branch 'develop' into misc-string-fixes commit 30edc124ac8481f23c3749cbec2a447e4252ca4c Author: CuriousMagpie Date: Mon Jan 30 13:27:10 2023 -0500 chore(fix): correct name of Fabulous Party Hat commit 20e336b7493df28220c0822f5f150ea5857d2c0d Author: CuriousMagpie Date: Fri Jan 20 14:46:27 2023 -0500 couple small changes to the footer as pointed out by users commit 16a02553731839f851b690714845c303c517aba8 Merge: e9a1450b57 d85436afbf Author: CuriousMagpie Date: Fri Jan 20 14:43:16 2023 -0500 Merge branch 'develop' into misc-string-fixes commit e9a1450b5702218b72e99ab68defce94ff831a7c Author: CuriousMagpie Date: Wed Jan 4 11:02:56 2023 -0500 chore(string): clarify polar pets requirements commit 9d25e07a4bb7af82fe136376e4902cc6845642f4 Merge: 906b7fcd43 c7aadede4d Author: CuriousMagpie Date: Wed Jan 4 11:01:16 2023 -0500 Merge branch 'develop' into misc-string-fixes commit 906b7fcd430bd8cf958717dd22e333afff3f7caf Author: CuriousMagpie Date: Fri Dec 16 13:00:59 2022 -0500 chore(typo): fix text in questBewilderNotes commit d0de66f3780a345a73dfd01f23013d48ab352105 Author: CuriousMagpie Date: Tue Nov 8 16:32:26 2022 -0500 chore(typo): who knew, that Y was actually important... commit c0a93ae202ebc18424b2d23414247196bd591d7b Merge: dbae5fb36b 978e8c4320 Author: CuriousMagpie Date: Tue Nov 8 16:30:52 2022 -0500 Merge branch 'develop' into misc-string-fixes commit dbae5fb36b3125a7eca516f0f1cb0cbbaff912b3 Author: CuriousMagpie Date: Mon Nov 7 13:06:54 2022 -0500 chore(fix): comma dangle commit 9365be609f923de05df3ec3c43712f1879b368c4 Merge: 8f2af4a7ea f6e5360bdd Author: CuriousMagpie Date: Mon Nov 7 12:35:56 2022 -0500 Merge branch 'develop' into misc-string-fixes commit 8f2af4a7ea7523d98a557638087317ec192c1eb6 Author: CuriousMagpie Date: Mon Nov 7 12:35:04 2022 -0500 chore(fix): restore string inadvertently removed during a refactor commit 77fe9450cb84afb974ef4a31965a66c44d6a590c Merge: 5780b71ef8 13c0d12045 Author: CuriousMagpie Date: Mon Sep 19 15:07:41 2022 -0400 Merge branch 'develop' into misc-string-fixes commit 5780b71ef8812b8a7e72aa0a88bb4ef36db0deb8 Author: SabreCat Date: Wed Sep 14 16:27:21 2022 -0500 fix(payments): remove duplicate entry from another modal commit f36d0ca0e2c6f57b077d6bed173210a2e2a5943b Merge: 92b26fdecd 5f440f1bfa Author: SabreCat Date: Wed Sep 14 16:15:01 2022 -0500 Merge branch 'develop' into misc-string-fixes commit 92b26fdecdf2598e047ce692448b0294520e4c21 Author: CuriousMagpie Date: Wed Jul 27 18:05:53 2022 -0400 fix(style): set border radii to 8px on upgrading-group id commit f359142aa50bd5b59f92524e8401557afa9fad53 Author: CuriousMagpie Date: Wed Jul 27 17:47:19 2022 -0400 fix: remove duplicated string and adjust upgrade button style commit b67ef33b63b95408d637c17c9d51bbd957b514de Merge: bd736235cc c09f078409 Author: CuriousMagpie Date: Wed Jul 27 17:09:23 2022 -0400 Merge branch 'misc-string-fixes' of https://github.com/CuriousMagpie/habitica into misc-string-fixes commit c09f0784098b600520d2e6ac8e0446c559fd56a3 Merge: 05811e3c70 ef3767f80b Author: Natalie L <78037386+CuriousMagpie@users.noreply.github.com> Date: Wed Jul 27 17:05:52 2022 -0400 Merge branch 'HabitRPG:develop' into misc-string-fixes commit bd736235cc4fe1e205e566260c8ce8b874754ad6 Merge: 88368a8c21 ef3767f80b Author: CuriousMagpie Date: Wed Jul 27 17:03:30 2022 -0400 Merge remote-tracking branch 'upstream/develop' into misc-string-fixes commit 05811e3c70b89e6671bd16876fec7e3b1358e3cb Author: CuriousMagpie Date: Fri Jun 24 15:01:23 2022 -0400 fix(string): corrected armorSpecialSummer2022MageNotes commit 4031c972538f3e660697957ed4696895130af782 Author: CuriousMagpie Date: Thu Jun 23 12:26:51 2022 -0400 fix(string): remove extra word from headSpecialSummer2022WarriorNotes commit e4af5c250f2e9542367b7a519adaeec8f59c5e93 Merge: 88368a8c21 76de241675 Author: CuriousMagpie Date: Thu Jun 23 11:27:04 2022 -0400 Merge branch 'develop' into misc-string-fixes commit 88368a8c211a54ccddb5e16195429ad835868a70 Author: CuriousMagpie Date: Tue Jun 21 13:49:46 2022 -0400 fix(strings): updated limited.json with "dateEnd" & "monthYYYY" months & put in chronological order commit 6ee08377e9b8a7585d0d053e3553e2c03595b679 Author: CuriousMagpie Date: Mon Jun 20 15:36:58 2022 -0400 fix(string): questVice1Notes html changed to a mobile-device friendly format --- website/common/locales/en/groups.json | 8 ++++---- website/common/locales/en/settings.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index 01dc58016d..89f3f443da 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -67,12 +67,12 @@ "applySortToHeader": "Apply Sort Options to Party Header", "confirmGuild": "Create Guild for 4 Gems?", "confirm": "Confirm", - "leaveGuild": "Leave Guild", + "leaveGuild": "Leave Group", "leaveParty": "Leave Party", "editParty": "Edit Party", - "editGuild": "Edit Guild", + "editGuild": "Edit Group", "joinParty": "Join Party", - "joinGuild": "Join Guild", + "joinGuild": "Join Group", "send": "Send", "pmsMarkedRead": "Your Private Messages have been marked as read", "possessiveParty": "<%= name %>'s Party", @@ -246,7 +246,7 @@ "viewParty": "View Party", "newGuildPlaceholder": "Enter your guild's name.", "newPartyPlaceholder": "Enter your party's name.", - "guildBank": "Guild Bank", + "guildBank": "Bank", "chatPlaceholder": "Type your message to Group members here", "partyChatPlaceholder": "Type your message to Party members here", "fetchRecentMessages": "Fetch Recent Messages", diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json index 8852243ff5..a9586a943c 100644 --- a/website/common/locales/en/settings.json +++ b/website/common/locales/en/settings.json @@ -126,8 +126,8 @@ "giftedSubscriptionInfo": "<%= name %> gifted you a <%= months %> month subscription", "giftedSubscriptionFull": "Hello <%= username %>, <%= sender %> has sent you <%= monthCount %> months of subscription!", "giftedSubscriptionWinterPromo": "Hello <%= username %>, you received <%= monthCount %> months of subscription as part of our holiday gift-giving promotion!", - "invitedParty": "Invited to a Party", - "invitedGuild": "Invited to a Guild", + "invitedParty": "You were invited to a Party", + "invitedGuild": "You were invited to a Group", "importantAnnouncements": "Reminders to check in to complete tasks and receive prizes", "weeklyRecaps": "Summaries of your account activity in the past week (Note: this is currently disabled due to performance issues, but we hope to have this back up and sending e-mails again soon!)", "onboarding": "Guidance with setting up your Habitica account",