From bb685ff61ca26560ae74cea5c1d69904b7d9d9a4 Mon Sep 17 00:00:00 2001
From: eris <femmediscord@gmail.com>
Date: Fri, 16 Dec 2022 07:21:33 +0000
Subject: [PATCH] Locale changes and default settings update

---
 src/i18n/en.json        | 26 +++++++++++++-------------
 src/modules/config.js   |  4 ++--
 src/modules/instance.js |  8 ++++----
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 32785561..4ad7920d 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1,11 +1,11 @@
 {
     "about": {
-        "bubble_instances": "Local Bubble Instances",
+        "bubble_instances": "Recommended Instances",
         "bubble_instances_description": "Instances chosen by the admins to represent the local area of this instance",
         "mrf": {
             "federation": "Federation",
             "keyword": {
-                "ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
+                "ftl_removal": "Removal from Federated Timeline",
                 "is_replaced_by": "→",
                 "keyword_policies": "Keyword policies",
                 "reject": "Reject",
@@ -16,8 +16,8 @@
             "simple": {
                 "accept": "Accept",
                 "accept_desc": "This instance only accepts messages from the following instances:",
-                "ftl_removal": "Removal from \"Known Network\" Timeline",
-                "ftl_removal_desc": "This instance removes these instances from \"Known Network\" timeline:",
+                "ftl_removal": "Removal from Federated Timeline",
+                "ftl_removal_desc": "This instance removes these instances from the federated timeline:",
                 "instance": "Instance",
                 "media_nsfw": "Media force-set as sensitive",
                 "media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:",
@@ -27,8 +27,8 @@
                 "quarantine": "Quarantine",
                 "quarantine_desc": "This instance will not send posts to the following instances:",
                 "reason": "Reason",
-                "reject": "Reject",
-                "reject_desc": "This instance will not accept messages from the following instances:",
+                "reject": "Instance Blocks",
+                "reject_desc": "This instance blocks messages to and from the following instances:",
                 "simple_policies": "Instance-specific policies"
             }
         },
@@ -302,12 +302,12 @@
         "announcements": "Announcements",
         "back": "Back",
         "bookmarks": "Bookmarks",
-        "bubble_timeline": "Bubble timeline",
+        "bubble_timeline": "Recommended Instances",
         "bubble_timeline_description": "Posts from instances close to yours, as recommended by the admins",
         "chats": "Chats",
-        "dms": "Direct messages",
-        "friend_requests": "Follow requests",
-        "home_timeline": "Home timeline",
+        "dms": "Direct Messages",
+        "friend_requests": "Follow Requests",
+        "home_timeline": "Home Timeline",
         "home_timeline_description": "Posts from people you follow",
         "interactions": "Interactions",
         "lists": "Lists",
@@ -315,11 +315,11 @@
         "moderation": "Moderation",
         "preferences": "Preferences",
         "public_timeline_description": "Public posts from this instance",
-        "public_tl": "Public timeline",
+        "public_tl": "Local Timeline",
         "search": "Search",
         "timeline": "Timeline",
         "timelines": "Timelines",
-        "twkn": "Known Network",
+        "twkn": "Federated Timeline",
         "twkn_timeline_description": "Posts from the entire network",
         "user_search": "User Search",
         "who_to_follow": "Who to follow"
@@ -379,7 +379,7 @@
             "text/x.misskeymarkdown": "MFM"
         },
         "content_warning": "Content Warning (optional)",
-        "default": "Just arrived at Luna Nova Academy",
+        "default": "Just landed on Neptune",
         "direct_warning_to_all": "This post will be visible to all the mentioned users.",
         "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
         "edit_remote_warning": "Changes made to the post may not be visible on some instances!",
diff --git a/src/modules/config.js b/src/modules/config.js
index 718868f1..5adc2d3a 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -52,11 +52,11 @@ export const defaultState = {
   loopVideoSilentOnly: true,
   streaming: false,
   emojiReactionsOnTimeline: true,
-  alwaysShowNewPostButton: false,
+  alwaysShowNewPostButton: true,
   autohideFloatingPostButton: false,
   pauseOnUnfocused: true,
   stopGifs: undefined,
-  replyVisibility: 'all',
+  replyVisibility: 'following',
   thirdColumnMode: 'notifications',
   notificationVisibility: {
     follows: true,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 02cbe1f8..3e7af739 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -20,11 +20,11 @@ const defaultState = {
   defaultBanner: '/images/banner.png',
   background: '/static/aurora_borealis.jpg',
   collapseMessageWithSubject: true,
-  greentext: false,
+  greentext: true,
   useAtIcon: false,
   mentionLinkDisplay: 'short',
   mentionLinkShowTooltip: true,
-  mentionLinkShowAvatar: false,
+  mentionLinkShowAvatar: true,
   mentionLinkFadeDomain: true,
   mentionLinkShowYous: false,
   mentionLinkBoldenYou: true,
@@ -37,7 +37,7 @@ const defaultState = {
   hidePostStats: false,
   hideBotIndication: false,
   hideSiteFavicon: false,
-  hideSiteName: false,
+  hideSiteName: true,
   hideUserStats: false,
   muteBotStatuses: false,
   modalOnRepeat: false,
@@ -60,7 +60,7 @@ const defaultState = {
   showFeaturesPanel: true,
   showInstanceSpecificPanel: false,
   showNavShortcuts: true,
-  showWiderShortcuts: true,
+  showWiderShortcuts: false,
   sidebarRight: false,
   subjectLineBehavior: 'email',
   theme: 'pleroma-dark',