From 2b945a2c0c9eebabc8f4d9fb3baaeae0be0c0349 Mon Sep 17 00:00:00 2001
From: eris <femmediscord@gmail.com>
Date: Thu, 28 Jul 2022 06:12:38 +0000
Subject: [PATCH] Locale changes and change bubble icon

---
 .../timeline_menu/timeline_menu_content.js    |  4 +--
 .../timeline_menu/timeline_menu_content.vue   | 24 ++++++-------
 src/i18n/en.json                              | 34 +++++++++----------
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/components/timeline_menu/timeline_menu_content.js b/src/components/timeline_menu/timeline_menu_content.js
index 9121a983..2b969204 100644
--- a/src/components/timeline_menu/timeline_menu_content.js
+++ b/src/components/timeline_menu/timeline_menu_content.js
@@ -6,7 +6,7 @@ import {
   faBookmark,
   faEnvelope,
   faHome,
-  faCircle
+  faCommentMedical
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
@@ -15,7 +15,7 @@ library.add(
   faBookmark,
   faEnvelope,
   faHome,
-  faCircle
+  faCommentMedical
 )
 
 const TimelineMenuContent = {
diff --git a/src/components/timeline_menu/timeline_menu_content.vue b/src/components/timeline_menu/timeline_menu_content.vue
index 2e7c2bce..866520bf 100644
--- a/src/components/timeline_menu/timeline_menu_content.vue
+++ b/src/components/timeline_menu/timeline_menu_content.vue
@@ -12,18 +12,6 @@
         /><span :title="$t('nav.home_timeline_description')">{{ $t("nav.home_timeline") }}</span>
       </router-link>
     </li>
-    <li v-if="currentUser">
-      <router-link
-        class="menu-item"
-        :to="{ name: 'bubble-timeline' }"
-      >
-        <FAIcon
-          fixed-width
-          class="fa-scale-110 fa-old-padding "
-          icon="circle"
-        /><span :title="$t('nav.bubble_timeline_description')">{{ $t("nav.bubble_timeline") }}</span>
-      </router-link>
-    </li>
     <li v-if="currentUser || !privateMode">
       <router-link
         class="menu-item"
@@ -48,6 +36,18 @@
         /><span :title="$t('nav.twkn_timeline_description')">{{ $t("nav.twkn") }}</span>
       </router-link>
     </li>
+    <li v-if="currentUser">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'bubble-timeline' }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          icon="comment-medical"
+        /><span :title="$t('nav.bubble_timeline_description')">{{ $t("nav.bubble_timeline") }}</span>
+      </router-link>
+    </li>
     <li v-if="currentUser">
       <router-link
         class="menu-item"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 19e9ecaf..793c8928 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -21,7 +21,7 @@
                 "reject": "Reject",
                 "reject_desc": "This instance will not accept messages from the following instances:",
                 "quarantine": "Quarantine",
-                "quarantine_desc": "This instance will send only public posts to the following instances:",
+                "quarantine_desc": "This instance will not send posts to the following instances:",
                 "ftl_removal": "Removal from \"Known Network\" Timeline",
                 "ftl_removal_desc": "This instance removes these instances from \"Known Network\" timeline:",
                 "media_removal": "Media Removal",
@@ -148,18 +148,18 @@
         "about": "About",
         "administration": "Administration",
         "back": "Back",
-        "friend_requests": "Follow requests",
+        "friend_requests": "Follow Requests",
         "mentions": "Mentions",
-        "interactions": "Interactions",
-        "dms": "Direct messages",
-        "public_tl": "Public timeline",
+        "interactions": "Notifications",
+        "dms": "Direct Messages",
+        "public_tl": "Local Timeline",
         "public_timeline_description": "Public posts from this instance",
         "timeline": "Timeline",
-        "home_timeline": "Home timeline",
+        "home_timeline": "Home Timeline",
         "home_timeline_description": "Posts from people you follow",
-        "bubble_timeline": "Bubble timeline",
+        "bubble_timeline": "Recommended Instances",
         "bubble_timeline_description": "Posts from instances close to yours, as recommended by the admins",
-        "twkn": "Known Network",
+        "twkn": "Federated Timeline",
         "twkn_timeline_description": "Posts from the entire network",
         "bookmarks": "Bookmarks",
         "user_search": "User Search",
@@ -180,7 +180,7 @@
         "load_older": "Load older notifications",
         "notifications": "Notifications",
         "read": "Read!",
-        "repeated_you": "repeated your status",
+        "repeated_you": "boosted your status",
         "no_more_notifications": "No more notifications",
         "migrated_to": "migrated to",
         "reacted_with": "reacted with {0}",
@@ -217,7 +217,7 @@
         "storage_unavailable": "Pleroma could not access browser storage. Your login or your local settings won't be saved and you might encounter unexpected issues. Try enabling cookies."
     },
     "interactions": {
-        "favs_repeats": "Repeats and favorites",
+        "favs_repeats": "Boosts and favorites",
         "follows": "New follows",
         "moves": "User migrates",
         "load_older": "Load older interactions"
@@ -479,7 +479,7 @@
         "notification_visibility_follows": "Follows",
         "notification_visibility_likes": "Favorites",
         "notification_visibility_mentions": "Mentions",
-        "notification_visibility_repeats": "Repeats",
+        "notification_visibility_repeats": "Boosts",
         "notification_visibility_moves": "User Migrates",
         "notification_visibility_emoji_reactions": "Reactions",
         "notification_visibility_polls": "Ends of polls you voted in",
@@ -776,8 +776,8 @@
         "conversation": "Conversation",
         "error": "Error fetching timeline: {0}",
         "load_older": "Load older statuses",
-        "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated or quoted",
-        "repeated": "repeated",
+        "no_retweet_hint": "Post is marked as followers-only or direct and cannot be boosted or quoted",
+        "repeated": "boosted",
         "show_new": "Show new",
         "reload": "Reload",
         "up_to_date": "Up-to-date",
@@ -788,7 +788,7 @@
     },
     "status": {
         "favorites": "Favorites",
-        "repeats": "Repeats",
+        "repeats": "Boosts",
         "delete": "Delete status",
         "pin": "Pin on profile",
         "unpin": "Unpin from profile",
@@ -875,8 +875,8 @@
         "unmute": "Unmute",
         "unmute_progress": "Unmuting…",
         "mute_progress": "Muting…",
-        "hide_repeats": "Hide repeats",
-        "show_repeats": "Show repeats",
+        "hide_repeats": "Hide boosts",
+        "show_repeats": "Show boosts",
         "domain_muted": "Unblock domain",
         "mute_domain": "Block domain",
         "bot": "Bot",
@@ -928,7 +928,7 @@
     "tool_tip": {
         "media_upload": "Upload media",
         "quote": "Quote",
-        "repeat": "Repeat",
+        "repeat": "Boost",
         "reply": "Reply",
         "favorite": "Favorite",
         "add_reaction": "Add Reaction",