Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git/.git] / README.md

diff --git a/README.md b/README.md
index a0a8b56..d4a4933 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,38 +3,28 @@ Friendica - your open and free social network
 
 Welcome to the free social web. Friendica is a platform for decentralised social communication linking to other independent social and corporate services.
 
-Friendica connects you to a federated communications network of thousands of servers called the Fediverse. Through various protocols you can interact with anyone on [Friendica]( https://friendi.ca), [Mastodon](https://joinmastodon.org), [Lemmy](https://join-lemmy.org/), [Diaspora](https://diasporafoundation.org), [Misskey](https://join.misskey.page), [Peertube](https://joinpeertube.org/), [Pixelfed](https://pixelfed.org/), [Pleroma](https://pleroma.social) and many more. Receiving content from Tumblr, Wordpress and RSS is also possible. Friendica allows to import and mirror your content via add-ons such as ITTT and Buffer. You can customize and control how publicly or privately you want to share your content.
-
-Being part of the Fediverse allows you to be free from data-harvesting corporations. Enjoy open social communication, independent of any specific provider.
-
-[Join Friendica]((https://dir.friendica.social/servers)) today or setup [your own Friendica instance](doc/Install.md).
-
-### Screenshots
-
-| ![Frio theme in mobile browser](images/screenshots/friendica-frio-mobile-profile-1.png?raw=true "Frio theme in mobile browser") ![Frio theme in mobile browser](images/screenshots/friendica-frio-mobile-profile-2.png?raw=true "Frio theme in mobile browser") |
-|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
-|                                                                                                    *Frio theme, mobile browser. Timeline and composer view.*                                                                                                    |
-|                                                                ![Frio theme in desktop browser](images/screenshots/friendica-frio-green-profile-1.png?raw=true "Frio theme in desktop browser")                                                                 |
-|                                                                                    *Frio theme, desktop browser. Timeline view, contact info popped up, control menu open.*                                                                                     |
-|                                                                ![Frio theme in desktop browser](images/screenshots/friendica-frio-green-profile-2.png?raw=true "Frio theme in desktop browser")                                                                 |
-|                                                                                           *Frio theme, desktop browser. Menu open for controlling individual posts.*                                                                                            |
-|                                                                 ![Frio theme in desktop browser](images/screenshots/friendica-frio-red-profile-3.png?raw=true "Frio theme in desktop browser")                                                                  |
-|                                                                                              *Frio theme, desktop browser. Profile view, notification menu open.*                                                                                               |
-|                                                                 ![Frio theme in desktop browser](images/screenshots/friendica-frio-red-profile-2.png?raw=true "Frio theme in desktop browser")                                                                  |
-|                                                                                                         *Number of new posts, in total and by circle.*                                                                                                          |
-|                                                                 ![Frio theme in desktop browser](images/screenshots/friendica-frio-red-profile-1.png?raw=true "Frio theme in desktop browser")                                                                  |
-|                                                                                                                 *Calendar with popup of event.*                                                                                                                 |
-|                                     ![Frio theme default colour in standard browser on tablet](images/screenshots/friendica-frio-default-profile-1.png?raw=true "Frio theme default colour in standard browser on tablet")                                      |
-|                                                                                         *Notifications menu and private messages counter, standard browser on tablet.*                                                                                          |
-|                                                                ![Frio theme in desktop browser](images/screenshots/friendica-frio-brown-profile-2.png?raw=true "Frio theme in desktop browser")                                                                 |
-|                                                                                                         *Number of visible contacts, standard browser.*                                                                                                         |
-|                                                                ![Frio theme in desktop browser](images/screenshots/friendica-frio-brown-profile-1.png?raw=true "Frio theme in desktop browser")                                                                 |
-|                                                                                                   *Network posts chronologically ordered, standard browser.*                                                                                                    |
-|                                                                    ![Vier theme in desktop browser](images/screenshots/friendica-vier-profile.png?raw=true "Vier theme in desktop browser")                                                                     |
-|                                                                                                      *Vier theme, desktop browser. Public timeline view.*                                                                                                       |
-|                                                                   ![Vier theme in desktop browser](images/screenshots/friendica-vier-community.png?raw=true "Vier theme in desktop browser")                                                                    |
-|                                                                                                    *Vier theme, desktop browser. Community post displayed.*                                                                                                     |
+Friendica connects you to a federated communications network of thousands of servers called the Fediverse.
+Through various protocols you can interact with anyone on [Friendica]( https://friendi.ca), [Mastodon](https://joinmastodon.org), [Lemmy](https://join-lemmy.org/), [Diaspora](https://diasporafoundation.org), [Misskey](https://join.misskey.page), [Peertube](https://joinpeertube.org/), [Pixelfed](https://pixelfed.org/), [Pleroma](https://pleroma.social) and many more.
+Receiving content from Tumblr, WordPress and RSS is also possible.
+Friendica allows to import and mirror your content via add-ons such as ITTT and Buffer.
+You can control the privacy scope of your content.
+
+Being part of the Fediverse allows you to be free from data-harvesting corporations.
+Enjoy open social communication, independent of any specific provider.
+
+[Join Friendica](https://dir.friendica.social/servers) today or set up [your own Friendica instance](doc/Install.md).
+
+### Friendica on desktop
+
+![Frio theme in desktop browser](images/screenshots/friendica-2023-12-frio-desktop.png?raw=true "Frio theme in desktop browser")
+
+### Friendica on mobile
+
+<p float="left">
+<img src="images/screenshots/friendica-2023-10-frio-mobile-timeline-dark-blue.png" width="370" alt="frio on mobile, dark color scheme">
+<img src="images/screenshots/friendica-2023-10-frio-mobile-options-light-blue.png" width="370" alt="frio on mobile, light color scheme">
+</p>
 
 ## Endorsements
 
-- [![Awesome Humane Tech](images/humane-tech-badge.svg)](https://github.com/humanetech-community/awesome-humane-tech) On August 12th 2020, Friendica was added to [the curated Awesome Humane Tech directory](https://github.com/humanetech-community/awesome-humane-tech) in [the "Fediverse" category](https://github.com/humanetech-community/awesome-humane-tech#fediverse).
+- Friendica is listed on [![Awesome Humane Tech](images/humane-tech-badge.svg)](https://codeberg.org/teaserbot-labs/delightful-humane-design) in the [Fediverse category](https://codeberg.org/teaserbot-labs/delightful-humane-design#fediverse).