From 9871b03912fc28ad38b4037ebf26a78aa937baba Mon Sep 17 00:00:00 2001
From: Minteck <contact@minteck.org>
Date: Sat, 7 Jan 2023 21:40:32 +0100
Subject: Update - This is an automated commit

---
 i18n/en.json                | 22 ++++++++++++----------
 i18n/fr.json                | 14 ++++++++------
 includes/banner.inc         |  6 +++---
 includes/navigation.inc     | 14 --------------
 includes/system/compare.inc |  4 ++--
 pages/bitset.inc            | 12 ++++++------
 6 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/i18n/en.json b/i18n/en.json
index 14925c4..6567d55 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,7 +8,7 @@
   "details": {
     "code": "Code:",
     "food": "Food:",
-    "memory": "Shared memory:",
+    "memory": "Memory polling:",
     "food_states": [
       "Not needed",
       "Not animals",
@@ -17,8 +17,8 @@
     ],
     "memory_states": [
       "None",
-      "Partial",
-      "Full"
+      "Conscious",
+      "Subconscious"
     ]
   },
   "footer": {
@@ -128,12 +128,12 @@
       "Relt."
     ],
     "memory": [
-      "Memory",
-      "Memory",
-      "Memory",
-      "Memory",
-      "Mem.",
-      "Mem."
+      "Polling",
+      "Polling",
+      "Polling",
+      "Polng.",
+      "Plg.",
+      "Plg."
     ],
     "fictive": [
       "Fictive",
@@ -169,7 +169,9 @@
       "Partial",
       "No",
       "Younger",
-      "Yes, but currently travelling"
+      "Yes, but currently travelling",
+      "Conscious",
+      "Subconscious"
     ]
   },
   "species": {
diff --git a/i18n/fr.json b/i18n/fr.json
index e17e811..4b3c984 100644
--- a/i18n/fr.json
+++ b/i18n/fr.json
@@ -8,17 +8,17 @@
   "details": {
     "code": "Code :",
     "food": "Nourriture :",
-    "memory": "Mémoire :",
+    "memory": "Accès mémoire :",
     "food_states": [
       "Pas besoin",
       "Pas d'animaux",
       "Pas de viande",
-      "TOut"
+      "Tout"
     ],
     "memory_states": [
-      "Pas partagée",
-      "Partiellement",
-      "Partagée"
+      "Impossible",
+      "Conscient",
+      "Inconscient"
     ]
   },
   "footer": {
@@ -169,7 +169,9 @@
       "Partiel",
       "Non",
       "Plus jeune",
-      "Oui, mais actuellement en voyage"
+      "Oui, mais actuellement en voyage",
+      "Conscient",
+      "Inconscient"
     ]
   },
   "species": {
diff --git a/includes/banner.inc b/includes/banner.inc
index 5b9aa1b..67d066f 100644
--- a/includes/banner.inc
+++ b/includes/banner.inc
@@ -334,13 +334,13 @@ function getMemberBannerData(string $id, string $system, bool $french = false) {
     if ($metadata["less_frequent"] ?? false) {
         $badges[] = [
             "id" => "nonverbal",
-            "color" => "#fd7e14",
+            "color" => "#6610f2",
             "html" => (
                 $french
                     ?
-                    '<span data-bs-toggle="tooltip" data-bs-html="true" title="<b>Fronts less often</b><br>' . ucfirst(getMemberPronouns($member['pronouns'])["subjective"]) . ' ' . (getMemberPronouns($member['pronouns'])["third"] ? "front" : "fronts") . ' less often than ' . getMemberPronouns($member['pronouns'])["possessive_det"] . ' headmates, this can due to various reasons." class="badge rounded-pill" style="background-color:#fd7e14;">Fronte moins souvent</span>'
+                    '<span data-bs-toggle="tooltip" data-bs-html="true" title="<b>Fronts less often</b><br>' . ucfirst(getMemberPronouns($member['pronouns'])["subjective"]) . ' ' . (getMemberPronouns($member['pronouns'])["third"] ? "front" : "fronts") . ' less often than ' . getMemberPronouns($member['pronouns'])["possessive_det"] . ' headmates, this can due to various reasons." class="badge rounded-pill" style="background-color:#6610f2;">Fronte moins souvent</span>'
                     :
-                    '<span data-bs-toggle="tooltip" data-bs-html="true" title="<b>Fronts less often</b><br>' . ucfirst(getMemberPronouns($member['pronouns'])["subjective"]) . ' ' . (getMemberPronouns($member['pronouns'])["third"] ? "front" : "fronts") . ' less often than ' . getMemberPronouns($member['pronouns'])["possessive_det"] . ' headmates, this can due to various reasons." class="badge rounded-pill" style="background-color:#fd7e14;">Fronts less often</span>'
+                    '<span data-bs-toggle="tooltip" data-bs-html="true" title="<b>Fronts less often</b><br>' . ucfirst(getMemberPronouns($member['pronouns'])["subjective"]) . ' ' . (getMemberPronouns($member['pronouns'])["third"] ? "front" : "fronts") . ' less often than ' . getMemberPronouns($member['pronouns'])["possessive_det"] . ' headmates, this can due to various reasons." class="badge rounded-pill" style="background-color:#6610f2;">Fronts less often</span>'
             )
         ];
     }
diff --git a/includes/navigation.inc b/includes/navigation.inc
index 1d312e5..345b168 100644
--- a/includes/navigation.inc
+++ b/includes/navigation.inc
@@ -254,13 +254,6 @@ $navigation_cloudburst = [
                     "link" => "/cloudburst/-/compare",
                     "stepped" => null
                 ],
-                [
-                    "name" => $pages["s:tree"]["name"][$lang["_name"]],
-                    "icon" => "/assets/icons/tree.svg",
-                    "invert" => true,
-                    "link" => "/cloudburst/-/tree",
-                    "stepped" => null
-                ],
                 [
                     "name" => $pages["s:species"]["name"][$lang["_name"]],
                     "icon" => "/assets/icons/species.svg",
@@ -333,13 +326,6 @@ $navigation_raindrops = [
                     "link" => "/raindrops/-/compare",
                     "stepped" => null
                 ],
-                [
-                    "name" => $pages["s:tree"]["name"][$lang["_name"]],
-                    "icon" => "/assets/icons/tree.svg",
-                    "invert" => true,
-                    "link" => "/raindrops/-/tree",
-                    "stepped" => null
-                ],
                 [
                     "name" => $pages["s:species"]["name"][$lang["_name"]],
                     "icon" => "/assets/icons/species.svg",
diff --git a/includes/system/compare.inc b/includes/system/compare.inc
index ea12582..dbcbfe4 100644
--- a/includes/system/compare.inc
+++ b/includes/system/compare.inc
@@ -154,9 +154,9 @@ function getMember(string $id) {
                 <span class="comparison-item">
                     <?php if ($metadata["shared_memory"] > 0): ?>
                         <?php if ($metadata["shared_memory"] === 1): ?>
-                            <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][1] ?>" src="/assets/icons/partial.svg" alt="<?= $lang["compare"]["state"][1] ?>" style="width:24px;">
+                            <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][5] ?>" src="/assets/icons/partial.svg" alt="<?= $lang["compare"]["state"][5] ?>" style="width:24px;">
                         <?php else: ?>
-                            <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][0] ?>" src="/assets/icons/complete.svg" alt="<?= $lang["compare"]["state"][0] ?>" style="width:24px;">
+                            <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][6] ?>" src="/assets/icons/complete.svg" alt="<?= $lang["compare"]["state"][6] ?>" style="width:24px;">
                         <?php endif; ?>
                     <?php else: ?>
                         <img data-bs-toggle="tooltip" title="<?= $lang["compare"]["state"][2] ?>" src="/assets/icons/none.svg" alt="<?= $lang["compare"]["state"][2] ?>" style="width:24px;">
diff --git a/pages/bitset.inc b/pages/bitset.inc
index c74fe64..a777b60 100644
--- a/pages/bitset.inc
+++ b/pages/bitset.inc
@@ -58,8 +58,8 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.inc';
         <div data-bs-toggle="tooltip" title="Sexual alignment" id="binary-bit-22" class="font-monospace tooltip-nohelp" style="color: #5fff4d; text-align: center;cursor: pointer;">0</div>
         <div data-bs-toggle="tooltip" title="Sexual alignment" id="binary-bit-23" class="font-monospace tooltip-nohelp" style="color: #5fff4d; text-align: center;cursor: pointer;">0</div>
         <div data-bs-toggle="tooltip" title="Sexual alignment" id="binary-bit-24" class="font-monospace tooltip-nohelp" style="color: #5fff4d; text-align: center;cursor: pointer;">0</div>
-        <div data-bs-toggle="tooltip" title="Shared memory access" id="binary-bit-25" class="font-monospace tooltip-nohelp" style="text-align: center;cursor: pointer;color:#fa77ef;">0</div>
-        <div data-bs-toggle="tooltip" title="Shared memory access" id="binary-bit-26" class="font-monospace tooltip-nohelp" style="text-align: center;cursor: pointer;color:#fa77ef;">0</div>
+        <div data-bs-toggle="tooltip" title="Memory polling" id="binary-bit-25" class="font-monospace tooltip-nohelp" style="text-align: center;cursor: pointer;color:#fa77ef;">0</div>
+        <div data-bs-toggle="tooltip" title="Memory polling" id="binary-bit-26" class="font-monospace tooltip-nohelp" style="text-align: center;cursor: pointer;color:#fa77ef;">0</div>
         <div data-bs-toggle="tooltip" title="Value reserved for future use" id="binary-bit-27" class="text-muted font-monospace tooltip-nohelp" style="text-align: center;cursor: pointer;">0</div>
         <div data-bs-toggle="tooltip" title="Little/younger" id="binary-bit-28" class="font-monospace tooltip-nohelp" style="text-align: center;cursor: pointer;color:#b277fa;">0</div>
         <div data-bs-toggle="tooltip" title="Little/younger" id="binary-bit-29" class="font-monospace tooltip-nohelp" style="text-align: center;cursor: pointer;color:#b277fa;">0</div>
@@ -298,13 +298,13 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/includes/header.inc';
         <tbody>
             <tr>
                 <td style="padding-right: 10px; text-align: right;">
-                    <b>Shared memory access: </b>
+                    <b>Memory polling: </b>
                 </td>
                 <td>
                     <select class="tooltip-nohelp form-select" style='display:inline-block;width:max-content;color:white;background-color:#111;border-color:#222;background-image:url("data:image/svg+xml,%3csvg xmlns=&apos;http://www.w3.org/2000/svg&apos; viewBox=&apos;0 0 16 16&apos;%3e%3cpath fill=&apos;none&apos; stroke=&apos;%23ffffff&apos; stroke-linecap=&apos;round&apos; stroke-linejoin=&apos;round&apos; stroke-width=&apos;2&apos; d=&apos;M2 5l6 6 6-6&apos;/%3e%3c/svg%3e");' id="value-0" onchange="updateFromSelection();">
-                        <option value="2">Full direct access</option>
-                        <option value="1">Partial direct access</option>
-                        <option value="0" selected>No direct access</option>
+                        <option value="2">Doing subconsciously</option>
+                        <option value="1">Consciously willing</option>
+                        <option value="0" selected>Incapable/not willing</option>
                     </select>
                 </td>
             </tr><tr>
-- 
cgit