deprecate seraphis, distinct Jamtis PQ entry, combined carrot with fcmp++

Author: plowsof

_i18n/en.yml

@@ -828,7 +828,7 @@ roadmap:
   p2pool: P2Pool released
   haveno: Haveno
 
-  seraphis-jamtis: Seraphis codebase & Jamtis(PQ)
+  jamtis: Jamtis PQ
   ospead: OSPEAD
   released-0-18: CLI and GUI 0.18 "Flourine Fermi" released
   hardfork-v15: Network upgrade v15 Hardfork

resources/roadmap/index.md

@@ -248,9 +248,8 @@ meta_descr: meta_descr.roadmap
                                     <li class="ongoing"><a href="https://github.com/Rucknium/OSPEAD">{% t roadmap.ospead %}</a></li>
                                     <li class="ongoing">{% t roadmap.bp++ %}</li>
                                     <li class="ongoing"><a href="https://cuprate.org/">{% t roadmap.cuprate %}</a></li>
-                                    <li class="ongoing"><a href="https://github.com/seraphis-migration/strategy/wiki/Our-Wallet-Rewrite-Project-After-Priority-Switched-From-Seraphis-to-FCMPs">{% t faq.fcmp %}</a></li>
-                                    <li class="ongoing"><a href="https://gist.github.com/tevador/639d083c994c1ef9401832c08e2b7832">{% t roadmap.seraphis-jamtis %}</a></li>
-                                    <li class="ongoing"><a href="https://github.com/jeffro256/carrot/blob/master/carrot.md">CARROT</a></li>
+                                    <li class="ongoing"><a href="https://github.com/seraphis-migration/strategy/wiki/Our-Wallet-Rewrite-Project-After-Priority-Switched-From-Seraphis-to-FCMPs">{% t faq.fcmp %}</a> + <a href="https://github.com/jeffro256/carrot/blob/master/carrot.md">CARROT</a></li>
+                                    <li class="ongoing"><a href="https://gist.github.com/tevador/639d083c994c1ef9401832c08e2b7832">{% t roadmap.jamtis %}</a></li>
                                     <li class="ongoing"><a href="https://beta.monerodevs.org">{% t roadmap.site-redesign %}</a></li>
                                     <li class="proposed"><a href="https://github.com/monero-project/research-lab/issues/94">{% t roadmap.mrl-tasks %}</a></li>
                             </ul>