Merge branch 'firefox-extension-link' of https://github.com/Markkop/habitica into Markkop-firefox-extension-link

website/client/src/components/settings/api.vue

@@ -32,14 +32,8 @@
             <br>
             {{ $t('beeminderDesc') }}
           </li>
-          <li>
-            <a
-              target="_blank"
-              href="https://chrome.google.com/webstore/detail/habitrpg-chat-client/hidkdfgonpoaiannijofifhjidbnilbb"
-            >{{ $t('chromeChatExtension') }}</a>
-            <br>
-            {{ $t('chromeChatExtensionDesc') }}
-          </li>
+          <li v-html="$t('chatExtension')"></li>
+          <span>{{ $t('chatExtensionDesc') }}</span>
           <li>
             <a
               target="_blank"
@@ -49,7 +43,6 @@
             {{ $t('dataToolDesc') }}
           </li>
           <li v-html="$t('otherExtensions')">
-            <br>
             {{ $t('otherDesc') }}
           </li>
         </ul>

website/common/locales/en/settings.json

@@ -77,8 +77,8 @@
     "dataToolDesc": "A webpage that shows you certain information from your Habitica account, such as statistics about your tasks, equipment, and skills.",
     "beeminder": "Beeminder",
     "beeminderDesc": "Let Beeminder automatically monitor your Habitica To-Dos. You can commit to maintaining a target number of To-Dos completed per day or per week, or you can commit to gradually reducing your remaining number of uncompleted To-Dos. (By \"commit\" Beeminder means under threat of paying actual money! But you may also just like Beeminder's fancy graphs.)",
-    "chromeChatExtension": "Chrome Chat Extension",
-    "chromeChatExtensionDesc": "The Chrome Chat Extension for Habitica adds an intuitive chat box to all of habitica.com. It allows users to chat in the Tavern, their party, and any guilds they are in.",
+    "chatExtension": "<a target='blank' href='https://chrome.google.com/webstore/detail/habitrpg-chat-client/hidkdfgonpoaiannijofifhjidbnilbb'>Chrome Chat Extension</a> and <a target='blank' href='https://addons.mozilla.org/en-US/firefox/addon/habitica-chat-client-v2/'>Firefox Chat Extension</a>",
+    "chatExtensionDesc": "The Chat Extension for Habitica adds an intuitive chat box to all of habitica.com. It allows users to chat in the Tavern, their party, and any guilds they are in.",
     "otherExtensions": "<a target='blank' href='http://habitica.fandom.com/wiki/Extensions,_Add-Ons,_and_Customizations'>Other Extensions</a>",
     "otherDesc": "Find other apps, extensions, and tools on the Habitica wiki.",
     "resetDo": "Do it, reset my account!",
@@ -111,7 +111,7 @@
     "emailNotifications": "Email Notifications",
     "wonChallenge": "You won a Challenge!",
     "newPM": "Received Private Message",
-    "newPMNotificationTitle": "New Message from <%= name %>",
+    "newPMInfo": "New Message from <%= name %>: <%= message %>",
     "giftedGems": "Gifted Gems",
     "giftedGemsInfo": "<%= name %> gifted you <%= amount %> Gems",
     "giftedGemsFull": "Hello <%= username %>, <%= sender %> has sent you <%= gemAmount %> gems!",
@@ -119,8 +119,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": "You were invited to a Party",
-    "invitedGuild": "You were invited to a  Guild",
+    "invitedParty": "Invited To Party",
+    "invitedGuild": "Invited To Guild",
     "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",
@@ -205,10 +205,6 @@
     "goToSettings": "Go to Settings",
     "usernameVerifiedConfirmation": "Your username, <%= username %>, is confirmed!",
     "usernameNotVerified": "Please confirm your username.",
-    "changeUsernameDisclaimer": "This username will be used for invitations, @mentions in chat, and messaging.",
-    "verifyUsernameVeteranPet": "One of these Veteran Pets will be waiting for you after you've finished confirming!",
-    "mentioning": "Mentioning",
-    "suggestMyUsername": "Suggest my username",
-    "everywhere": "Everywhere",
-    "onlyPrivateSpaces": "Only in private spaces"
+    "changeUsernameDisclaimer": "We will be transitioning login names to unique, public usernames soon. This username will be used for invitations, @mentions in chat, and messaging.",
+    "verifyUsernameVeteranPet": "One of these Veteran Pets will be waiting for you after you've finished confirming!"
 }