Improve texts

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

js/.eslintrc.js

@@ -46,6 +46,8 @@ module.exports = {
     "@typescript-eslint/interface-name-prefix": "off",
     "@typescript-eslint/no-use-before-define": "off",
     "import/prefer-default-export": "off",
+    "import/extensions": "off",
+    "import/no-unresolved": "off",
   },
 
   ignorePatterns: ["src/typings/*.d.ts", "vue.config.js"],

js/package.json

@@ -78,7 +78,7 @@
     "@vue/eslint-config-airbnb": "^5.0.2",
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-typescript": "^5.0.2",
-    "@vue/test-utils": "1.0.4",
+    "@vue/test-utils": "1.0.5",
     "chai": "^4.1.2",
     "eslint": "^7.7.0",
     "eslint-config-prettier": "^6.11.0",

js/src/App.vue

@@ -107,45 +107,9 @@ export default class App extends Vue {
 <style lang="scss">
 @import "variables";
 
-/* Bulma imports */
-@import "~bulma/bulma";
-@import "~bulma-divider";
-
-/* Buefy imports */
-@import "~buefy/src/scss/buefy";
-
 /* Icons */
 $mdi-font-path: "~@mdi/font/fonts";
 @import "~@mdi/font/scss/materialdesignicons";
 
 @import "common";
-
-.fade-enter-active,
-.fade-leave-active {
-  transition: opacity 0.5s;
-}
-.fade-enter,
-.fade-leave-to {
-  opacity: 0;
-}
-
-body {
-  // background: #f7f8fa;
-  background: $body-background-color;
-  font-family: BlinkMacSystemFont, Roboto, Oxygen, Ubuntu, Cantarell, "Segoe UI", "Fira Sans",
-    "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-
-  /*main {*/
-  /*  margin: 1rem auto 0;*/
-  /*}*/
-}
-
-#mobilizon > .container > .message {
-  margin: 1rem auto auto;
-  .message-header {
-    button.delete {
-      background: #4a4a4a;
-    }
-  }
-}
 </style>

js/src/common.scss

@@ -12,7 +12,7 @@ a.out,
 }
 
 input.input {
-  border-color: $input-border-color !important;
+  // border-color: $input-border-color !important;
 }
 
 .section {
@@ -44,3 +44,41 @@ $color-black: #000;
   background: initial;
   margin-right: 0;
 }
+
+.select select {
+  border-color: $borders;
+}
+
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.5s;
+}
+.fade-enter,
+.fade-leave-to {
+  opacity: 0;
+}
+
+body {
+  // background: #f7f8fa;
+  background: $body-background-color;
+  font-family: BlinkMacSystemFont, Roboto, Oxygen, Ubuntu, Cantarell, "Segoe UI",
+    "Fira Sans", "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+
+  /*main {*/
+  /*  margin: 1rem auto 0;*/
+  /*}*/
+}
+
+#mobilizon > .container > .message {
+  margin: 1rem auto auto;
+  .message-header {
+    button.delete {
+      background: #4a4a4a;
+    }
+  }
+}
+
+.module-description {
+  margin-bottom: 2rem;
+  color: $violet-1;
+}

js/src/components/Discussion/DiscussionComment.vue

@@ -91,8 +91,9 @@ import { CURRENT_ACTOR_CLIENT } from "../../graphql/actor";
 export default class DiscussionComment extends Vue {
   @Prop({ required: true, type: Object }) comment!: IComment;
 
-  editMode: boolean = false;
+  editMode = false;
-  updatedComment: string = "";
+
+  updatedComment = "";
 
   currentActor!: IPerson;
 

js/src/components/Event/AddressAutoComplete.vue

@@ -45,6 +45,7 @@ import { IConfig } from "../../types/config.model";
 })
 export default class AddressAutoComplete extends Vue {
   @Prop({ required: true }) value!: IAddress;
+
   @Prop({ required: false }) placeholder!: string;
 
   addressData: IAddress[] = [];

js/src/components/Event/EventListCard.vue

@@ -186,7 +186,7 @@
 import { Component, Prop } from "vue-property-decorator";
 import DateCalendarIcon from "@/components/Event/DateCalendarIcon.vue";
 import { mixins } from "vue-class-component";
-import { RawLocation } from "vue-router";
+import { RawLocation, Route } from "vue-router";
 import {
   IParticipant,
   ParticipantRole,
@@ -246,12 +246,13 @@ export default class EventListCard extends mixins(ActorMixin, EventMixin) {
   /**
    * Delete the event
    */
-  async openDeleteEventModalWrapper() {
+  async openDeleteEventModalWrapper(): Promise<void> {
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     await this.openDeleteEventModal(this.participation.event, this.currentActor);
   }
 
-  async gotToWithCheck(participation: IParticipant, route: RawLocation) {
+  async gotToWithCheck(participation: IParticipant, route: RawLocation): Promise<Route> {
     if (participation.actor.id !== this.currentActor.id && participation.event.organizerActor) {
       const organizer = participation.event.organizerActor as IPerson;
       await changeIdentity(this.$apollo.provider.defaultClient, organizer);

js/src/components/Event/EventListViewCard.vue

@@ -50,12 +50,7 @@
 </template>
 
 <script lang="ts">
-import {
+import { ParticipantRole, EventVisibility, IEventCardOptions, IEvent } from "@/types/event.model";
-  IParticipant,
-  ParticipantRole,
-  EventVisibility,
-  IEventCardOptions,
-} from "@/types/event.model";
 import { Component, Prop } from "vue-property-decorator";
 import DateCalendarIcon from "@/components/Event/DateCalendarIcon.vue";
 import { IPerson } from "@/types/actor";
@@ -63,8 +58,6 @@ import { mixins } from "vue-class-component";
 import ActorMixin from "@/mixins/actor";
 import { CURRENT_ACTOR_CLIENT } from "@/graphql/actor";
 import EventMixin from "@/mixins/event";
-import { changeIdentity } from "@/utils/auth";
-import { Route } from "vue-router";
 import RouteName from "../../router/name";
 
 const defaultOptions: IEventCardOptions = {
@@ -88,7 +81,7 @@ export default class EventListViewCard extends mixins(ActorMixin, EventMixin) {
   /**
    * The participation associated
    */
-  @Prop({ required: true }) event!: IParticipant;
+  @Prop({ required: true }) event!: IEvent;
 
   /**
    * Options are merged with default options

js/src/components/Event/FullAddressAutoComplete.vue

@@ -118,6 +118,7 @@ import { IConfig } from "../../types/config.model";
 })
 export default class FullAddressAutoComplete extends Vue {
   @Prop({ required: true }) value!: IAddress;
+
   @Prop({ required: false, default: "" }) label!: string;
 
   addressData: IAddress[] = [];

js/src/components/Group/GroupSection.vue

@@ -1,50 +1,91 @@
 <template>
   <section>
-    <h2 :class="{ privateSection }">
+    <div class="group-section-title" :class="{ privateSection }">
-      <b-icon :icon="icon" />
+      <h2>
-      <span>{{ title }}</span>
+        <b-icon :icon="icon" />
-    </h2>
+        <span>{{ title }}</span>
-    <slot></slot>
+      </h2>
+      <router-link :to="route">{{ $t("View all") }}</router-link>
+    </div>
+    <div class="main-slot">
+      <slot></slot>
+    </div>
+    <div class="create-slot">
+      <slot name="create"></slot>
+    </div>
   </section>
 </template>
 
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-property-decorator";
+import { Route } from "vue-router";
 
 @Component
 export default class GroupSection extends Vue {
   @Prop({ required: true, type: String }) title!: string;
+
   @Prop({ required: true, type: String }) icon!: string;
+
   @Prop({ required: false, type: Boolean, default: true }) privateSection!: boolean;
+
+  @Prop({ required: true, type: Object }) route!: Route;
 }
 </script>
 <style lang="scss" scoped>
 @import "@/variables.scss";
 
-h2 {
+section {
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 2rem;
+  border: 2px solid $violet;
+
+  .create-slot {
+    display: flex;
+    justify-content: end;
+    padding-bottom: 0.5rem;
+    padding-right: 0.5rem;
+  }
+
+  .main-slot {
+    min-height: 5rem;
+    padding: 5px;
+  }
+}
+
+div.group-section-title {
   display: flex;
   align-items: stretch;
-  margin: 15px 0 30px;
+  background: $secondary;
+  color: #3a384c;
 
-  /deep/ span {
+  &.privateSection {
-    background: $secondary;
+    color: $violet-2;
-    display: inline;
+    background: $purple-2;
-    padding: 3px 8px;
+  }
-    color: #3a384c;
+
-    font-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial, serif;
+  /deep/ & > a {
-    font-weight: 500;
+    align-self: center;
-    font-size: 30px;
+    margin-right: 5px;
+    color: $orange-3;
+  }
+
+  h2 {
     flex: 1;
-  }
 
-  /deep/ span.icon {
+    /deep/ span {
-    flex: 0;
+      display: inline;
-    height: 100%;
+      padding: 3px 8px;
-  }
+      font-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial, serif;
-}
+      font-weight: 500;
+      font-size: 30px;
+      flex: 1;
+    }
 
-h2.privateSection /deep/ span {
+    /deep/ span.icon {
-  color: $violet-2;
+      flex: 0;
-  background: $purple-2;
+      height: 100%;
+    }
+  }
 }
 </style>

js/src/components/NavBar.vue

@@ -157,7 +157,7 @@ export default class NavBar extends Vue {
 
   RouteName = RouteName;
 
-  mobileNavbarActive: boolean = false;
+  mobileNavbarActive = false;
 
   @Watch("currentActor")
   async initializeListOfIdentities() {

js/src/components/Participation/UnloggedParticipation.vue

@@ -73,7 +73,6 @@
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
 import { FETCH_EVENT } from "@/graphql/event";
-import EventListCard from "@/components/Event/EventListCard.vue";
 import EventListViewCard from "@/components/Event/EventListViewCard.vue";
 import { EventModel, IEvent } from "@/types/event.model";
 import VerticalDivider from "@/components/Utils/VerticalDivider.vue";
@@ -86,7 +85,6 @@ import RouteName from "../../router/name";
   components: {
     VerticalDivider,
     EventListViewCard,
-    EventListCard,
     Subtitle,
   },
   apollo: {
@@ -114,7 +112,8 @@ export default class UnloggedParticipation extends Vue {
 
   config!: IConfig;
 
-  get host() {
+  // eslint-disable-next-line class-methods-use-this
+  get host(): string {
     return window.location.hostname;
   }
 

js/src/components/SearchField.vue

@@ -21,7 +21,7 @@ import RouteName from "../router/name";
 export default class SearchField extends Vue {
   @Prop({ type: String, required: false }) placeholder!: string;
 
-  search: string = "";
+  search = "";
 
   enter() {
     this.$emit("navbar-search");

js/src/i18n/en_US.json

@@ -149,7 +149,6 @@
   "Followings": "Followings",
   "For instance: London, Taekwondo, Architecture…": "For instance: London, Taekwondo, Architecture…",
   "Forgot your password ?": "Forgot your password ?",
-  "From a birthday party with friends and family to a march for climate change, right now, our gatherings are <b>trapped inside the tech giants’ platforms</b>. How can we organize, how can we click “Attend,” without <b>providing private data</b> to Facebook or <b>locking ourselves up</b> inside MeetUp?": "From a birthday party with friends and family to a march for climate change, right now, our gatherings are <b>trapped inside the tech giants’ platforms</b>. How can we organize, how can we click “Attend,” without <b>providing private data</b> to Facebook or <b>locking ourselves up</b> inside MeetUp?",
   "From the {startDate} at {startTime} to the {endDate} at {endTime}": "From the {startDate} at {startTime} to the {endDate} at {endTime}",
   "From the {startDate} at {startTime} to the {endDate}": "From the {startDate} at {startTime} to the {endDate}",
   "From the {startDate} to the {endDate}": "From the {startDate} to the {endDate}",
@@ -379,7 +378,6 @@
   "This Mobilizon instance and this event organizer allows anonymous participations, but requires validation through email confirmation.": "This Mobilizon instance and this event organizer allows anonymous participations, but requires validation through email confirmation.",
   "This email is already registered as participant for this event": "This email is already registered as participant for this event",
   "This information is saved only on your computer. Click for details": "This information is saved only on your computer. Click for details",
-  "This installation (called “instance“) can easily {interconnect}, thanks to {protocol}.": "This installation (called “instance“) can easily {interconnect}, thanks to {protocol}.",
   "This instance isn't opened to registrations, but you can register on other instances.": "This instance isn't opened to registrations, but you can register on other instances.",
   "This is a demonstration site to test the beta version of Mobilizon.": "This is a demonstration site to test the beta version of Mobilizon.",
   "This will delete / anonymize all content (events, comments, messages, participations…) created from this identity.": "This will delete / anonymize all content (events, comments, messages, participations…) created from this identity.",
@@ -411,9 +409,7 @@
   "Waiting for organization team approval.": "Waiting for organization team approval.",
   "Warning": "Warning",
   "We just sent an email to {email}": "We just sent an email to {email}",
-  "We want to develop a <b>digital common</b>, that everyone can make their own, which respects <b>privacy and activism by design</b>.": "We want to develop a <b>digital common</b>, that everyone can make their own, which respects <b>privacy and activism by design</b>.",
   "We will redirect you to your instance in order to interact with this event": "We will redirect you to your instance in order to interact with this event",
-  "We won’t change the world from Facebook. The tool we dream of, surveillance capitalism corporations won’t develop it, as they couldn’t profit from it. This is an opportunity to build something better, by taking another approach.": "We won’t change the world from Facebook. The tool we dream of, surveillance capitalism corporations won’t develop it, as they couldn’t profit from it. This is an opportunity to build something better, by taking another approach.",
   "Website / URL": "Website / URL",
   "Welcome back {username}!": "Welcome back {username}!",
   "Welcome back!": "Welcome back!",
@@ -472,7 +468,6 @@
   "{approved} / {total} seats": "{approved} / {total} seats",
   "{count} participants": "No participants yet | One participant | {count} participants",
   "{count} requests waiting": "{count} requests waiting",
-  "{license} guarantees {respect} of the people who will use it. Since {source}, anyone can audit it, which guarantees its transparency.": "{license} guarantees {respect} of the people who will use it. Since {source}, anyone can audit it, which guarantees its transparency.",
   "© The OpenStreetMap Contributors": "© The OpenStreetMap Contributors",
   "@{username} ({role})": "@{username} ({role})",
   "@{username}": "@{username}",
@@ -513,10 +508,7 @@
   "Upcoming events": "Upcoming events",
   "View all upcoming events": "View all upcoming events",
   "Resources": "Resources",
-  "View all resources": "View all resources",
   "Public page": "Public page",
-  "Post a public message": "Post a public message",
-  "View all todos": "View all todos",
   "Discussions": "Discussions",
   "No public upcoming events": "No public upcoming events",
   "Latest posts": "Latest posts",
@@ -575,8 +567,6 @@
   "digital habits of activists": "digital habits of activists",
   "Register on this instance": "Register on this instance",
   "Mobilizon is not developed by a secretive start-up, but by a group of friends who strive to {change_world}. So while we do work slower, we remain attentive and in touch with our users.": "Mobilizon is not developed by a secretive start-up, but by a group of friends who strive to {change_world}. So while we do work slower, we remain attentive and in touch with our users.",
-  "We asked professional designers to help us develop our vision for Mobilizon. We took time to study the {digital_habits} in order to understand the features they need to gather, organize, and mobilize.": "We asked professional designers to help us develop our vision for Mobilizon. We took time to study the {digital_habits} in order to understand the features they need to gather, organize, and mobilize.",
-  "So that, right from its conception, Mobilizon would {fit_needs_uses_people} who are going to use it.": "So that, right from its conception, Mobilizon would {fit_needs_uses_people} who are going to use it.",
   "fit the needs and uses of the people": "fit the needs and uses of the people",
   "Mobilizon is under development, we will add new features to this site during regular updates, until the release of <b>version 1 of the software in the fall of 2020</b>.": "Mobilizon is under development, we will add new features to this site during regular updates, until the release of <b>version 1 of the software in the fall of 2020</b>.",
   "To activate more notifications, head over to the notification settings.": "To activate more notifications, head over to the notification settings.",
@@ -656,7 +646,6 @@
   "An “application programming interface” or “API” is a communication protocol that allows software components to communicate with each other. The Mobilizon API, for example, can allow third-party software tools to communicate with Mobilizon instances to carry out certain actions, such as posting events on your behalf, automatically and remotely.": "An “application programming interface” or “API” is a communication protocol that allows software components to communicate with each other. The Mobilizon API, for example, can allow third-party software tools to communicate with Mobilizon instances to carry out certain actions, such as posting events on your behalf, automatically and remotely.",
   "SSL/TLS": "SSL/TLS",
   "Cookies and Local storage": "Cookies and Local storage",
-  "A cookie is a small file containing informations that is sent to your computer when you visit a website. When you visit the site again, the cookie allows that site to recognize your browser. Cookies may store user preferences and other information. You can configure your browser to refuse all cookies. However, this may result in some website features or services partially working. Local storage works the same way but allows to store more data.": "A cookie is a small file containing informations that is sent to your computer when you visit a website. When you visit the site again, the cookie allows that site to recognize your browser. Cookies may store user preferences and other information. You can configure your browser to refuse all cookies. However, this may result in some website features or services partially working. Local storage works the same way but allows to store more data.",
   "An instance is an installed version of the Mobilizon software running on a server. An instance can be run by anyone using the {mobilizon_software} or other federated apps, aka the “fediverse”. This instance's name is {instance_name}. Mobilizon is a federated network of multiple instances (just like email servers), users registered on different instances may communicate even though they didn't register on the same instance.": "An instance is an installed version of the Mobilizon software running on a server. An instance can be run by anyone using the {mobilizon_software} or other federated apps, aka the “fediverse”. This instance's name is {instance_name}. Mobilizon is a federated network of multiple instances (just like email servers), users registered on different instances may communicate even though they didn't register on the same instance.",
   "SSL and it's successor TLS are encryption technologies to secure data communications when using the service. You can recognize an encrypted connection in your browser's address line when the URL begins with {https} and the lock icon is displayed in your browser's address bar.": "SSL and it's successor TLS are encryption technologies to secure data communications when using the service. You can recognize an encrypted connection in your browser's address line when the URL begins with {https} and the lock icon is displayed in your browser's address bar.",
   "Home to {number} users": "Home to {number} users",
@@ -699,7 +688,6 @@
   "New discussion": "New discussion",
   "Create a discussion": "Create a discussion",
   "Create the discussion": "Create the discussion",
-  "View all discussions": "View all discussions",
   "Sign in with": "Sign in with",
   "Your email address was automatically set based on your {provider} account.": "Your email address was automatically set based on your {provider} account.",
   "You can't change your password because you are registered through {provider}.": "You can't change your password because you are registered through {provider}.",
@@ -749,7 +737,6 @@
   "Explore events": "Explore events",
   "#{tag}": "#{tag}",
   "{count} team members": "{count} team members",
-  "View all events": "View all events",
   "No resources yet": "No resources yet",
   "No posts yet": "No posts yet",
   "No ongoing todos": "No ongoing todos",
@@ -779,5 +766,30 @@
   "Federated Group Name": "Federated Group Name",
   "This is like your federated username (<code>{username}</code>) for groups. It will allow you to be found on the federation, and is guaranteed to be unique.": "This is like your federated username (<code>{username}</code>) for groups. It will allow you to be found on the federation, and is guaranteed to be unique.",
   "Banner": "Banner",
-  "A group with this name already exists": "A group with this name already exists"
+  "A group with this name already exists": "A group with this name already exists",
+  "Create or join an group and start organizing with other people": "Create or join an group and start organizing with other people",
+  "From a birthday party with friends and family to a march for climate change, right now, our gatherings are <b>trapped inside the tech giants’ platforms</b>. How can we organize, how can we click “Attend,” without <b>providing private data</b> to Facebook or <b>locking ourselves</b> inside MeetUp?": "From a birthday party with friends and family to a march for climate change, right now, our gatherings are <b>trapped inside the tech giants’ platforms</b>. How can we organize, how can we click “Attend,” without <b>providing private data</b> to Facebook or <b>locking ourselves</b> inside MeetUp?",
+  "We want to develop a <b>digital common</b> that everyone can make their own, one which respects <b>privacy and activism by design</b>.": "We want to develop a <b>digital common</b> that everyone can make their own, one which respects <b>privacy and activism by design</b>.",
+  "We can’t change the world from within Facebook. The tool we dream of, surveillance capitalism corporations won’t develop, as they cannot profit from it. This is an opportunity to build something better, by taking another approach.": "We can’t change the world from within Facebook. The tool we dream of, surveillance capitalism corporations won’t develop, as they cannot profit from it. This is an opportunity to build something better, by taking another approach.",
+  "Conceived with care for humans": "Conceived with care for humans",
+  "This installation (called “an instance“) can easily {interconnect}, thanks to {protocol}.": "This installation (called “an instance“) can easily {interconnect}, thanks to {protocol}.",
+  "{license} guarantees {respect} of the people who use it. Since {source}, anyone can audit it, which guarantees its transparency.": "{license} guarantees {respect} of the people who use it. Since {source}, anyone can audit it, which guarantees its transparency.",
+  "We asked professional designers to help us develop our vision for Mobilizon. We took time to study the {digital_habits} in order to understand the features they need to gather, organize, and mobilize so that right from its conception, Mobilizon would {fit_needs_uses_people} who are going to use it.": "We asked professional designers to help us develop our vision for Mobilizon. We took time to study the {digital_habits} in order to understand the features they need to gather, organize, and mobilize so that right from its conception, Mobilizon would {fit_needs_uses_people} who are going to use it.",
+  "Groups are spaces for coordination and preparation to better organize events and manage your community.": "Groups are spaces for coordination and preparation to better organize events and manage your community.",
+  "Keep the entire conversation about a specific topic together on a single page.": "Keep the entire conversation about a specific topic together on a single page.",
+  "Create to-do lists for all the tasks you need to do, assign them and set due dates.": "Create to-do lists for all the tasks you need to do, assign them and set due dates.",
+  "A place to store links to documents or resources of any type.": "A place to store links to documents or resources of any type.",
+  "{group}'s events": "{group}'s events",
+  "When someone from the group creates an event and attributes it to the group, it will show up here.": "When someone from the group creates an event and attributes it to the group, it will show up here.",
+  "View all": "View all",
+  "The username is a unique identifier of your account on this and all the other instances. It's as unique as an email address, which makes it easy for other people to interact with it.": "The username is a unique identifier of your account on this and all the other instances. It's as unique as an email address, which makes it easy for other people to interact with it.",
+  "Bio": "Bio",
+  "+ Start a discussion": "+ Start a discussion",
+  "+ Add a resource": "+ Add a resource",
+  "+ Add a todo": "+ Add a todo",
+  "+ Create an event": "+ Create an event",
+  "+ Post a public message": "+ Post a public message",
+  "A cookie is a small file containing information that is sent to your computer when you visit a website. When you visit the site again, the cookie allows that site to recognize your browser. Cookies may store user preferences and other information. You can configure your browser to refuse all cookies. However, this may result in some website features or services partially working. Local storage works the same way but allows you to store more data.": "A cookie is a small file containing information that is sent to your computer when you visit a website. When you visit the site again, the cookie allows that site to recognize your browser. Cookies may store user preferences and other information. You can configure your browser to refuse all cookies. However, this may result in some website features or services partially working. Local storage works the same way but allows you to store more data.",
+  "A place to publish something to the whole world, your community or just your group members.": "A place to publish something to the whole world, your community or just your group members.",
+  "No posts found": "No posts found"
 }

js/src/i18n/fr_FR.json

@@ -7,7 +7,6 @@
   "@{group}": "@{group}",
   "@{username}": "@{username}",
   "@{username} ({role})": "@{username} ({role})",
-  "A cookie is a small file containing informations that is sent to your computer when you visit a website. When you visit the site again, the cookie allows that site to recognize your browser. Cookies may store user preferences and other information. You can configure your browser to refuse all cookies. However, this may result in some website features or services partially working. Local storage works the same way but allows to store more data.": "Un cookie est un petit fichier contenant des informations qui est envoyé à votre ordinateur lorsque vous visitez un site web. Lorsque vous visitez le site à nouveau, le cookie permet à ce site de reconnaître votre navigateur. Les cookies peuvent stocker les préférences des utilisateur·ices et d'autres informations. Vous pouvez configurer votre navigateur pour qu'il refuse tous les cookies. Toutefois, cela peut entraîner le non-fonctionnement de certaines fonctions ou de certains services du site web. Le stockage local fonctionne de la même manière mais permet de stocker davantage de données.",
   "A place for your code of conduct, rules or guidelines. You can use HTML tags.": "Une section appropriée pour votre code de conduite, règles ou lignes directrices. Vous pouvez utiliser des balises HTML.",
   "A place to explain who you are and the things that set your instance apart. You can use HTML tags.": "Une section pour expliquer qui vous êtes et les aspects qui caractérisent votre instance. Vous pouvez utiliser des balises HTML.",
   "A user-friendly, emancipatory and ethical tool for gathering, organising, and mobilising.": "Un outil convivial, émancipateur et éthique pour se rassembler, s'organiser et se mobiliser.",
@@ -221,14 +220,12 @@
   "Fetch more": "En récupérer plus",
   "Find an address": "Trouver une adresse",
   "Find an instance": "Trouver une instance",
-  "Followed by {count} persons": "Suivi par {count} personnes",
   "Followers": "Abonnés",
   "Followings": "Abonnements",
   "For instance: London": "Par exemple : Lyon",
   "For instance: London, Taekwondo, Architecture…": "Par exemple : Lyon, Taekwondo, Architecture…",
   "Forgot your password ?": "Mot de passe oublié ?",
   "Forgot your password?": "Mot de passe oublié ?",
-  "From a birthday party with friends and family to a march for climate change, right now, our gatherings are <b>trapped inside the tech giants’ platforms</b>. How can we organize, how can we click “Attend,” without <b>providing private data</b> to Facebook or <b>locking ourselves up</b> inside MeetUp?": "De l’anniversaire entre ami·e·s à une marche pour le climat, aujourd’hui, les bonnes raisons de se rassembler sont <b>captées par les géants du web</b>. Comment s’organiser, comment cliquer sur « je participe » sans <b>livrer des données intimes</b> à Facebook ou<b> s’enfermer</b> dans MeetUp ?",
   "From the {startDate} at {startTime} to the {endDate}": "Du {startDate} à {startTime} jusqu'au {endDate}",
   "From the {startDate} at {startTime} to the {endDate} at {endTime}": "Du {startDate} à {startTime} au {endDate} à {endTime}",
   "From the {startDate} to the {endDate}": "Du {startDate} au {endDate}",
@@ -546,7 +543,6 @@
   "Sign in with": "Se connecter avec",
   "Sign up": "S'enregistrer",
   "Since you are a new member, private content can take a few minutes to appear.": "Étant donné que vous êtes un·e nouveau·elle membre, le contenu privé peut mettre quelques minutes à arriver.",
-  "So that, right from its conception, Mobilizon would {fit_needs_uses_people} who are going to use it.": "Afin que Mobilizon corresponde, dès sa conception, {fit_needs_uses_people} des personnes qui sont vouées à l’utiliser.",
   "Software to the people": "Des logiciels pour les gens",
   "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided a glossary here to help you understand them better:": "Certains termes, techniques ou non, utilisés dans le texte ci-dessous peuvent recouvrir des concepts difficiles à appréhender. Nous proposons ici un glossaire qui pourra vous aider à mieux les comprendre :",
   "Starts on…": "Débute le…",
@@ -598,7 +594,6 @@
   "This event is accessible only through it's link. Be careful where you post this link.": "Cet événement est accessible uniquement à travers son lien. Faites attention où vous le diffusez.",
   "This identity is not a member of any group.": "Cette identité n'est membre d'aucun groupe.",
   "This information is saved only on your computer. Click for details": "Cette information est sauvegardée uniquement sur votre appareil. Cliquez pour plus de details",
-  "This installation (called “instance“) can easily {interconnect}, thanks to {protocol}.": "Cette installation (appelée “instance“) peut facilement {interconnect}, grâce à {protocol}.",
   "This instance isn't opened to registrations, but you can register on other instances.": "Cette instance n'autorise pas les inscriptions, mais vous pouvez vous enregistrer sur d'autres instances.",
   "This is a demonstration site to test the beta version of Mobilizon.": "Ceci est un site de démonstration permettant de tester la version bêta de Mobilizon.",
   "This month": "Ce mois-ci",
@@ -651,12 +646,9 @@
   "Visible everywhere on the web (public)": "Visible partout sur le web (public)",
   "Waiting for organization team approval.": "En attente d'approbation par l'organisation.",
   "Warning": "Attention",
-  "We asked professional designers to help us develop our vision for Mobilizon. We took time to study the {digital_habits} in order to understand the features they need to gather, organize, and mobilize.": "Nous avons demandé de l’aide à des professionnel·les du design pour concevoir ce que pourrait être Mobilizon. Nous avons pris le temps d’étudier {digital_habits} afin de comprendre les fonctionnalités dont ils et elles ont besoin pour se rassembler, s’organiser, se mobiliser.",
   "We just sent an email to {email}": "Nous venons d'envoyer un email à {email}",
   "We use your timezone to make sure you get notifications for an event at the correct time.": "Nous utilisons votre fuseau horaire pour nous assurer que vous recevez les notifications pour un événement au bon moment.",
-  "We want to develop a <b>digital common</b>, that everyone can make their own, which respects <b>privacy and activism by design</b>.": "Nous voulons développer un <b>commun numérique</b>, que tout le monde pourra s’approprier, conçu dans <b>le respect de la vie privée et de l’action militante</b>.",
   "We will redirect you to your instance in order to interact with this event": "Nous vous redirigerons vers votre instance pour interagir avec cet événement",
-  "We won’t change the world from Facebook. The tool we dream of, surveillance capitalism corporations won’t develop it, as they couldn’t profit from it. This is an opportunity to build something better, by taking another approach.": "On ne changera pas le monde depuis Facebook. L’outil dont nous rêvons, les entreprises du capitalisme de surveillance sont incapables de le produire, car elles ne sauraient pas en tirer profit. C’est l’occasion de faire mieux qu’elles, en faisant autrement.",
   "We'll send you an email one hour before the event begins, to be sure you won't forget about it.": "Nous vous enverrons un email une heure avant que l'événement débute, pour être sûr que vous ne l'oubliez pas.",
   "We'll use your timezone settings to send a recap of the morning of the event.": "Nous prendrons en compte votre fuseau horaire pour vous envoyer un récapitulatif de vos événements le matin.",
   "Website": "Site web",
@@ -746,7 +738,6 @@
   "{count} requests waiting": "Une demande en attente|{count} demandes en attente",
   "{count} team members": "{count} membres d'équipe",
   "{instanceName} is an instance of the {mobilizon} software.": "{instanceName} est une instance du logiciel {mobilizon}.",
-  "{license} guarantees {respect} of the people who will use it. Since {source}, anyone can audit it, which guarantees its transparency.": "{license} garantit {respect} des personnes qui l'utiliseront. Puisque {source}, il est publiquement auditable, ce qui garantit sa transparence.",
   "{moderator} added a note on {report}": "{moderator} a ajouté une note sur {report}",
   "{moderator} closed {report}": "{moderator} a fermé {report}",
   "{moderator} deleted an event named \"{title}\"": "{moderator} a supprimé un événement nommé \"{title}\"",
@@ -780,5 +771,30 @@
   "Federated Group Name": "Nom fédéré du groupe",
   "This is like your federated username (<code>{username}</code>) for groups. It will allow you to be found on the federation, and is guaranteed to be unique.": "C'est comme votre addresse fédérée (<code>{username}</code>) pour les groupes. Cela vous permettra d'être trouvable sur la fédération, et est garanti d'être unique.",
   "Banner": "Bannière",
-  "A group with this name already exists": "Un groupe avec ce nom existe déjà"
+  "A group with this name already exists": "Un groupe avec ce nom existe déjà",
+  "Create or join an group and start organizing with other people": "Créez ou rejoignez un groupe et commencez à vous organiser avec d'autres personnes",
+  "From a birthday party with friends and family to a march for climate change, right now, our gatherings are <b>trapped inside the tech giants’ platforms</b>. How can we organize, how can we click “Attend,” without <b>providing private data</b> to Facebook or <b>locking ourselves</b> inside MeetUp?": "De l’anniversaire entre ami·e·s à une marche pour le climat, aujourd’hui, les bonnes raisons de se rassembler sont <b>captées par les géants du web</b>. Comment s’organiser, comment cliquer sur « je participe » sans <b>livrer des données intimes</b> à Facebook ou<b> s’enfermer</b> dans MeetUp ?",
+  "We want to develop a <b>digital common</b> that everyone can make their own, one which respects <b>privacy and activism by design</b>.": "Nous voulons développer un <b>commun numérique</b>, que tout le monde pourra s’approprier, conçu dans <b>le respect de la vie privée et de l’action militante</b>.",
+  "We can’t change the world from within Facebook. The tool we dream of, surveillance capitalism corporations won’t develop, as they cannot profit from it. This is an opportunity to build something better, by taking another approach.": "On ne peut pas changer le monde depuis Facebook. L’outil dont nous rêvons, les entreprises du capitalisme de surveillance ne le produiront pas, car elles ne peuvent pas en tirer profit. C’est l’occasion de faire mieux qu’elles, en faisant autrement.",
+  "Conceived with care for humans": "Conçu avec soin pour les humains",
+  "This installation (called “an instance“) can easily {interconnect}, thanks to {protocol}.": "Cette installation (appelée “une instance“) peut facilement {interconnect}, grâce à {protocol}.",
+  "{license} guarantees {respect} of the people who use it. Since {source}, anyone can audit it, which guarantees its transparency.": "{license} garantit {respect} des personnes qui l'utiliseront. Puisque {source}, il est publiquement auditable, ce qui garantit sa transparence.",
+  "We asked professional designers to help us develop our vision for Mobilizon. We took time to study the {digital_habits} in order to understand the features they need to gather, organize, and mobilize so that right from its conception, Mobilizon would {fit_needs_uses_people} who are going to use it.": "Nous avons demandé de l’aide à des professionnel·les du design pour concevoir ce que pourrait être Mobilizon. Nous avons pris le temps d’étudier {digital_habits} afin de comprendre les fonctionnalités dont ils et elles ont besoin pour se rassembler, s’organiser, se mobiliser afin que Mobilizon corresponde, dès sa conception, {fit_needs_uses_people} des personnes qui sont vouées à l’utiliser.",
+  "A cookie is a small file containing information that is sent to your computer when you visit a website. When you visit the site again, the cookie allows that site to recognize your browser. Cookies may store user preferences and other information. You can configure your browser to refuse all cookies. However, this may result in some website features or services partially working. Local storage works the same way but allows you to store more data.": "Un cookie est un petit fichier contenant des informations qui est envoyé à votre ordinateur lorsque vous visitez un site web. Lorsque vous visitez le site à nouveau, le cookie permet à ce site de reconnaître votre navigateur. Les cookies peuvent stocker les préférences des utilisateur·ices et d'autres informations. Vous pouvez configurer votre navigateur pour qu'il refuse tous les cookies. Toutefois, cela peut entraîner le non-fonctionnement de certaines fonctions ou de certains services du site web. Le stockage local fonctionne de la même manière mais permet de stocker davantage de données.",
+  "The username is a unique identifier of your account on this and all the other instances. It's as unique as an email address, which makes it easy for other people to interact with it.": "Le nom d'utilisateur·rice est un identifiant unique pour votre compte. Il est similaire à une adresse e-mail mais permettant à d'autres personnes de vous trouver.",
+  "Bio": "Présentation",
+  "Groups are spaces for coordination and preparation to better organize events and manage your community.": "Les groupes sont des espaces de coordination et de préparation pour mieux organiser des événements et gérer votre communauté.",
+  "Keep the entire conversation about a specific topic together on a single page.": "Rassemblez sur une seule page toute la conversation à propos d'un sujet spécifique.",
+  "Create to-do lists for all the tasks you need to do, assign them and set due dates.": "Créez des listes de choses à faire pour toutes les tâches que vous devez faire, attribuez les et fixez des dates d'échéance.",
+  "A place to store links to documents or resources of any type.": "Un endroit pour stocker des liens vers des documents ou des ressources de tout type.",
+  "{group}'s events": "Événements de {group}",
+  "When someone from the group creates an event and attributes it to the group, it will show up here.": "Lorsqu'un membre du groupe crée un événement et l'attribue au groupe, il s'affichera ici.",
+  "View all": "Voir tous",
+  "+ Start a discussion": "+ Lancer une discussion",
+  "+ Add a resource": "+ Ajouter une resource",
+  "+ Add a todo": "+ Ajouter un todo",
+  "+ Create an event": "+ Créer un événement",
+  "+ Post a public message": "+ Poster un message public",
+  "A place to publish something to the whole world, your community or just your group members.": "Un endroit pour publier quelque chose à l'intention du monde entier, de votre communauté ou simplement des membres de votre groupe.",
+  "No posts found": "Aucun billet trouvé"
 }

js/src/router/groups.ts

@@ -14,9 +14,12 @@ export enum GroupsRouteName {
   POST_EDIT = "POST_EDIT",
   POST = "POST",
   POSTS = "POSTS",
+  GROUP_EVENTS = "GROUP_EVENTS",
 }
 
 const resourceFolder = () => import("@/views/Resources/ResourceFolder.vue");
+const groupEvents = () =>
+  import(/* webpackChunkName: "groupEvents" */ "@/views/Event/GroupEvents.vue");
 
 export const groupsRoutes: RouteConfig[] = [
   {
@@ -99,4 +102,10 @@ export const groupsRoutes: RouteConfig[] = [
     props: true,
     name: GroupsRouteName.POSTS,
   },
+  {
+    path: "/@:preferredUsername/events",
+    component: groupEvents,
+    props: true,
+    name: GroupsRouteName.GROUP_EVENTS,
+  },
 ];

js/src/types/actor/actor.model.ts

@@ -63,7 +63,8 @@ export class Actor implements IActor {
 export function usernameWithDomain(actor: IActor, force = false): string {
   if (actor.domain) {
     return `${actor.preferredUsername}@${actor.domain}`;
-  } else if (force) {
+  }
+  if (force) {
     return `${actor.preferredUsername}@${window.location.hostname}`;
   }
   return actor.preferredUsername;

js/src/types/actor/group.model.ts

@@ -56,6 +56,7 @@ export class Group extends Actor implements IGroup {
 
     this.patch(hash);
   }
+
   physicalAddress: IAddress = new Address();
 
   patch(hash: any) {

js/src/types/discussions.ts

@@ -29,9 +29,9 @@ export class Discussion implements IDiscussion {
 
   lastComment?: IComment = undefined;
 
-  insertedAt: string = "";
+  insertedAt = "";
 
-  updatedAt: string = "";
+  updatedAt = "";
 
   constructor(hash?: IDiscussion) {
     if (!hash) return;

js/src/variables.scss

@@ -131,7 +131,11 @@ $subtitle-sup-size: 15px;
   margin: 15px auto 30px;
 }
 
-$input-border-color: #dbdbdb;
+//$input-border-color: #dbdbdb;
 $breadcrumb-item-color: $primary;
 $checkbox-background-color: #fff;
 $title-color: $violet-3;
+
+@import "~bulma";
+@import "~bulma-divider";
+@import "~buefy/src/scss/buefy";

js/src/views/About/AboutMobilizon.vue

@@ -9,7 +9,7 @@
               class="content"
               v-html="
                 $t(
-                  'From a birthday party with friends and family to a march for climate change, right now, our gatherings are <b>trapped inside the tech giants’ platforms</b>. How can we organize, how can we click “Attend,” without <b>providing private data</b> to Facebook or <b>locking ourselves up</b> inside MeetUp?'
+                  'From a birthday party with friends and family to a march for climate change, right now, our gatherings are <b>trapped inside the tech giants’ platforms</b>. How can we organize, how can we click “Attend,” without <b>providing private data</b> to Facebook or <b>locking ourselves</b> inside MeetUp?'
                 )
               "
             />
@@ -37,7 +37,7 @@
             <p
               v-html="
                 $t(
-                  'We want to develop a <b>digital common</b>, that everyone can make their own, which respects <b>privacy and activism by design</b>.'
+                  'We want to develop a <b>digital common</b> that everyone can make their own, one which respects <b>privacy and activism by design</b>.'
                 )
               "
             />
@@ -49,9 +49,10 @@
                   )
                 "
               />
+              <span> </span>
               <i18n
                 tag="span"
-                path="This installation (called “instance“) can easily {interconnect}, thanks to {protocol}."
+                path="This installation (called “an instance“) can easily {interconnect}, thanks to {protocol}."
               >
                 <b slot="interconnect">{{ $t("interconnect with others like it") }}</b>
                 <a slot="protocol" href="https://en.wikipedia.org/wiki/ActivityPub">{{
@@ -77,7 +78,7 @@
           <blockquote>
             {{
               $t(
-                "We won’t change the world from Facebook. The tool we dream of, surveillance capitalism corporations won’t develop it, as they couldn’t profit from it. This is an opportunity to build something better, by taking another approach."
+                "We can’t change the world from within Facebook. The tool we dream of, surveillance capitalism corporations won’t develop, as they cannot profit from it. This is an opportunity to build something better, by taking another approach."
               )
             }}
           </blockquote>
@@ -97,7 +98,7 @@
             <h2 class="title">{{ $t("Software to the people") }}</h2>
             <i18n
               tag="p"
-              path="{license} guarantees {respect} of the people who will use it. Since {source}, anyone can audit it, which guarantees its transparency."
+              path="{license} guarantees {respect} of the people who use it. Since {source}, anyone can audit it, which guarantees its transparency."
             >
               <a slot="license" href="https://choosealicense.com/licenses/agpl-3.0/">{{
                 $t("Mobilizon’s licence")
@@ -135,17 +136,12 @@
       <section>
         <div class="columns">
           <div class="column has-text-right-desktop">
-            <h2 class="title">{{ $t("Concieved with care for humans") }}</h2>
+            <h2 class="title">{{ $t("Conceived with care for humans") }}</h2>
             <i18n
               tag="p"
-              path="We asked professional designers to help us develop our vision for Mobilizon. We took time to study the {digital_habits} in order to understand the features they need to gather, organize, and mobilize."
+              path="We asked professional designers to help us develop our vision for Mobilizon. We took time to study the {digital_habits} in order to understand the features they need to gather, organize, and mobilize so that right from its conception, Mobilizon would {fit_needs_uses_people} who are going to use it."
             >
               <b slot="digital_habits">{{ $t("digital habits of activists") }}</b>
-            </i18n>
-            <i18n
-              tag="p"
-              path="So that, right from its conception, Mobilizon would {fit_needs_uses_people} who are going to use it."
-            >
               <b slot="fit_needs_uses_people">{{ $t("fit the needs and uses of the people") }}</b>
             </i18n>
           </div>

js/src/views/About/Glossary.vue

@@ -55,7 +55,7 @@
         <dd>
           {{
             $t(
-              "A cookie is a small file containing informations that is sent to your computer when you visit a website. When you visit the site again, the cookie allows that site to recognize your browser. Cookies may store user preferences and other information. You can configure your browser to refuse all cookies. However, this may result in some website features or services partially working. Local storage works the same way but allows to store more data."
+              "A cookie is a small file containing information that is sent to your computer when you visit a website. When you visit the site again, the cookie allows that site to recognize your browser. Cookies may store user preferences and other information. You can configure your browser to refuse all cookies. However, this may result in some website features or services partially working. Local storage works the same way but allows you to store more data."
             )
           }}
         </dd>

js/src/views/Account/IdentityPicker.vue

@@ -8,6 +8,7 @@
         <a
           class="list-item"
           v-for="identity in identities"
+          :key="identity.id"
           :class="{ 'is-active': identity.id === currentIdentity.id }"
           @click="changeCurrentIdentity(identity)"
         >
@@ -49,7 +50,7 @@ export default class IdentityPicker extends Vue {
 
   currentIdentity: IActor = this.value;
 
-  changeCurrentIdentity(identity: IActor) {
+  changeCurrentIdentity(identity: IActor): void {
     this.currentIdentity = identity;
     this.$emit("input", identity);
   }

js/src/views/Account/IdentityPickerWrapper.vue

@@ -3,8 +3,8 @@
     <div
       v-if="inline"
       class="inline box"
-      :class="{ 'has-background-grey-lighter': masked }"
+      :class="{ 'has-background-grey-lighter': masked, 'no-other-identity': !hasOtherIdentities }"
-      @click="isComponentModalActive = true"
+      @click="activateModal"
     >
       <div class="media">
         <div class="media-left">
@@ -23,29 +23,35 @@
         <div class="media-content" v-else>
           {{ `@${currentIdentity.preferredUsername}` }}
         </div>
-        <b-button type="is-text" @click="isComponentModalActive = true">
+        <b-button type="is-text" v-if="identities.length > 1" @click="activateModal">
           {{ $t("Change") }}
         </b-button>
       </div>
     </div>
-    <span v-else class="block" @click="isComponentModalActive = true">
+    <span v-else class="block" @click="activateModal">
       <figure class="image is-48x48" v-if="currentIdentity.avatar">
         <img class="is-rounded" :src="currentIdentity.avatar.url" alt="" />
       </figure>
       <b-icon v-else size="is-large" icon="account-circle" />
     </span>
-    <b-modal :active.sync="isComponentModalActive" has-modal-card>
+    <b-modal v-model="isComponentModalActive" has-modal-card>
       <identity-picker v-model="currentIdentity" @input="relay" />
     </b-modal>
   </div>
 </template>
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+import { IDENTITIES } from "@/graphql/actor";
 import { IActor } from "../../types/actor";
 import IdentityPicker from "./IdentityPicker.vue";
 
 @Component({
   components: { IdentityPicker },
+  apollo: {
+    identities: {
+      query: IDENTITIES,
+    },
+  },
 })
 export default class IdentityPickerWrapper extends Vue {
   @Prop() value!: IActor;
@@ -56,18 +62,30 @@ export default class IdentityPickerWrapper extends Vue {
 
   isComponentModalActive = false;
 
+  identities: IActor[] = [];
+
   currentIdentity: IActor = this.value;
 
   @Watch("value")
-  updateCurrentActor(value: IActor) {
+  updateCurrentActor(value: IActor): void {
     this.currentIdentity = value;
   }
 
-  relay(identity: IActor) {
+  relay(identity: IActor): void {
     this.currentIdentity = identity;
     this.$emit("input", identity);
     this.isComponentModalActive = false;
   }
+
+  get hasOtherIdentities(): boolean {
+    return this.identities.length > 1;
+  }
+
+  activateModal(): void {
+    if (this.hasOtherIdentities) {
+      this.isComponentModalActive = true;
+    }
+  }
 }
 </script>
 <style lang="scss">
@@ -76,7 +94,7 @@ export default class IdentityPickerWrapper extends Vue {
     cursor: pointer;
   }
 
-  .inline {
+  .inline:not(.no-other-identity) {
     cursor: pointer;
   }
 

js/src/views/Account/Profile.vue

@@ -91,7 +91,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue, Watch } from "vue-property-decorator";
+import { Component, Prop, Vue } from "vue-property-decorator";
 import EventCard from "@/components/Event/EventCard.vue";
 import { FETCH_PERSON, CURRENT_ACTOR_CLIENT } from "../../graphql/actor";
 import { MOBILIZON_INSTANCE_HOST } from "../../api/_entrypoint";
@@ -123,12 +123,6 @@ export default class Profile extends Vue {
 
   currentActor!: IPerson;
 
-  // // call again the method if the route changes
-  // @Watch('$route')
-  // onRouteChange() {
-  //   // this.fetchData()
-  // }
-
   feedUrls(format: "ics" | "webcal:" | "atom", isPublic = true): string {
     let url = format === "ics" ? "webcal:" : "";
     url += `//${MOBILIZON_INSTANCE_HOST}/`;
@@ -140,7 +134,7 @@ export default class Profile extends Vue {
     return url + (format === "ics" ? "ics" : "atom");
   }
 
-  async createToken() {
+  async createToken(): Promise<void> {
     const { data } = await this.$apollo.mutate({
       mutation: CREATE_FEED_TOKEN_ACTOR,
       variables: { actor_id: this.person.id },

js/src/views/Account/Register.vue

@@ -33,9 +33,16 @@
               </p>
             </b-field>
           </b-field>
+          <p class="description">
+            {{
+              $t(
+                "The username is a unique identifier of your account on this and all the other instances. It's as unique as an email address, which makes it easy for other people to interact with it."
+              )
+            }}
+          </p>
 
-          <b-field :label="$t('Description')">
+          <b-field :label="$t('Bio')">
-            <b-input type="textarea" v-model="identity.summary" />
+            <b-input type="textarea" maxlength="100" rows="2" v-model="identity.summary" />
           </b-field>
 
           <p class="control has-text-centered">
@@ -94,20 +101,20 @@ export default class Register extends mixins(identityEditionMixin) {
 
   host?: string = MOBILIZON_INSTANCE_HOST;
 
-  errors: object = {};
+  errors: Record<string, unknown> = {};
 
   validationSent = false;
 
   sendingValidation = false;
 
-  async created() {
+  async created(): Promise<void> {
     // Make sure no one goes to this page if we don't want to
     if (!this.email) {
       await this.$router.replace({ name: RouteName.PAGE_NOT_FOUND });
     }
   }
 
-  async submit() {
+  async submit(): Promise<void> {
     try {
       this.sendingValidation = true;
       this.errors = {};
@@ -170,4 +177,9 @@ export default class Register extends mixins(identityEditionMixin) {
 .container .columns {
   margin: 1rem auto 3rem;
 }
+
+p.description {
+  font-size: 0.9rem;
+  margin-bottom: 10px;
+}
 </style>

js/src/views/Admin/AdminGroupProfile.vue

@@ -197,13 +197,13 @@
 </template>
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-property-decorator";
+import { GET_GROUP, REFRESH_PROFILE } from "@/graphql/group";
 import { SUSPEND_PROFILE, UNSUSPEND_PROFILE } from "../../graphql/actor";
 import { IGroup, MemberRole } from "../../types/actor";
 import { usernameWithDomain, IActor } from "../../types/actor/actor.model";
 import RouteName from "../../router/name";
 import { IEvent } from "../../types/event.model";
 import ActorCard from "../../components/Account/ActorCard.vue";
-import { GET_GROUP, REFRESH_PROFILE } from "@/graphql/group";
 
 const EVENTS_PER_PAGE = 10;
 

js/src/views/Admin/GroupProfiles.vue

@@ -82,9 +82,9 @@
 </template>
 <script lang="ts">
 import { Component, Vue, Watch } from "vue-property-decorator";
+import { LIST_GROUPS } from "@/graphql/group";
 import { LIST_PROFILES } from "../../graphql/actor";
 import RouteName from "../../router/name";
-import { LIST_GROUPS } from "@/graphql/group";
 
 const PROFILES_PER_PAGE = 10;
 

js/src/views/Discussions/Discussion.vue

@@ -112,9 +112,9 @@ import { IDiscussion, Discussion } from "@/types/discussions";
 import { usernameWithDomain } from "@/types/actor";
 import DiscussionComment from "@/components/Discussion/DiscussionComment.vue";
 import { GraphQLError } from "graphql";
+import { DELETE_COMMENT, UPDATE_COMMENT } from "@/graphql/comment";
 import RouteName from "../../router/name";
 import { IComment } from "../../types/comment.model";
-import { DELETE_COMMENT, UPDATE_COMMENT } from "@/graphql/comment";
 
 @Component({
   apollo: {

js/src/views/Discussions/DiscussionsList.vue

@@ -26,13 +26,9 @@
       </ul>
     </nav>
     <section>
-      <div v-if="group.discussions.elements.length > 0">
+      <p>
-        <discussion-list-item
+        {{ $t("Keep the entire conversation about a specific topic together on a single page.") }}
-          :discussion="discussion"
+      </p>
-          v-for="discussion in group.discussions.elements"
-          :key="discussion.id"
-        />
-      </div>
       <b-button
         tag="router-link"
         :to="{
@@ -41,6 +37,13 @@
         }"
         >{{ $t("New discussion") }}</b-button
       >
+      <div v-if="group.discussions.elements.length > 0">
+        <discussion-list-item
+          :discussion="discussion"
+          v-for="discussion in group.discussions.elements"
+          :key="discussion.id"
+        />
+      </div>
     </section>
   </div>
 </template>
@@ -69,7 +72,7 @@ import RouteName from "../../router/name";
   },
   metaInfo() {
     return {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       title: this.$t("Discussions") as string,
       // all titles will be injected into this template

js/src/views/Event/Edit.vue

@@ -213,7 +213,7 @@
         </b-field>
       </form>
     </div>
-    <b-modal :active.sync="dateSettingsIsOpen" has-modal-card trap-focus>
+    <b-modal v-model="dateSettingsIsOpen" has-modal-card trap-focus>
       <form action>
         <div class="modal-card" style="width: auto">
           <header class="modal-card-head">

js/src/views/Event/GroupEvents.vue

@@ -0,0 +1,79 @@
+<template>
+  <div class="container section" v-if="group">
+    <nav class="breadcrumb" aria-label="breadcrumbs">
+      <ul>
+        <li>
+          <router-link
+            :to="{
+              name: RouteName.GROUP,
+              params: { preferredUsername: usernameWithDomain(group) },
+            }"
+            >{{ group.preferredUsername }}</router-link
+          >
+        </li>
+        <li class="is-active">
+          <router-link
+            :to="{
+              name: RouteName.TODO_LISTS,
+              params: { preferredUsername: usernameWithDomain(group) },
+            }"
+            >{{ $t("Events") }}</router-link
+          >
+        </li>
+      </ul>
+    </nav>
+    <section>
+      <h1 class="title" v-if="group">
+        {{ $t("{group}'s events", { group: group.name || group.preferredUsername }) }}
+      </h1>
+      <p>
+        {{
+          $t(
+            "When someone from the group creates an event and attributes it to the group, it will show up here."
+          )
+        }}
+      </p>
+      <b-loading :active.sync="$apollo.loading"></b-loading>
+      <section v-if="group && group.organizedEvents.total > 0">
+        <subtitle>
+          {{ $t("Past events") }}
+        </subtitle>
+        <transition-group name="list" tag="p">
+          <EventListViewCard v-for="event in group.organizedEvents.elements" :key="event.id" />
+        </transition-group>
+      </section>
+      <b-message
+        v-if="group.organizedEvents.elements.length === 0 && $apollo.loading === false"
+        type="is-danger"
+      >
+        {{ $t("No events found") }}
+      </b-message>
+    </section>
+  </div>
+</template>
+<script lang="ts">
+import { Component, Vue } from "vue-property-decorator";
+import { FETCH_GROUP } from "@/graphql/group";
+import RouteName from "@/router/name";
+import { IGroup, usernameWithDomain } from "../../types/actor";
+
+@Component({
+  apollo: {
+    group: {
+      query: FETCH_GROUP,
+      variables() {
+        return {
+          name: this.$route.params.preferredUsername,
+        };
+      },
+    },
+  },
+})
+export default class GroupEvents extends Vue {
+  group!: IGroup;
+
+  usernameWithDomain = usernameWithDomain;
+
+  RouteName = RouteName;
+}
+</script>

js/src/views/Group/Create.vue

@@ -56,9 +56,9 @@ import { Group, IPerson, usernameWithDomain, MemberRole } from "@/types/actor";
 import { CURRENT_ACTOR_CLIENT, PERSON_MEMBERSHIPS } from "@/graphql/actor";
 import { CREATE_GROUP } from "@/graphql/group";
 import PictureUpload from "@/components/PictureUpload.vue";
-import RouteName from "../../router/name";
 import { mixins } from "vue-class-component";
 import IdentityEditionMixin from "@/mixins/identityEdition";
+import RouteName from "../../router/name";
 import { convertToUsername } from "../../utils/username";
 
 @Component({
@@ -98,7 +98,7 @@ export default class CreateGroup extends mixins(IdentityEditionMixin) {
           };
           const membershipData = store.readQuery<{ person: IPerson }>(query);
           if (!membershipData) return;
-          const person: IPerson = membershipData.person;
+          const { person } = membershipData;
           person.memberships.elements.push({
             parent: createGroup,
             role: MemberRole.ADMINISTRATOR,

js/src/views/Group/Group.vue

@@ -120,109 +120,181 @@
       <!-- Private things -->
       <div class="block-column">
         <!-- Group discussions -->
-        <group-section :title="$t('Discussions')" icon="chat">
+        <group-section
-          <div v-if="group.discussions.total > 0">
+          :title="$t('Discussions')"
-            <discussion-list-item
+          icon="chat"
-              v-for="discussion in group.discussions.elements"
+          :route="{
-              :key="discussion.id"
+            name: RouteName.DISCUSSION_LIST,
-              :discussion="discussion"
+            params: { preferredUsername: usernameWithDomain(group) },
-            />
+          }"
-          </div>
+        >
-          <div v-else class="content has-text-grey has-text-centered">
+          <template v-slot:default>
-            <p>{{ $t("No discussions yet") }}</p>
+            <div v-if="group.discussions.total > 0">
-          </div>
+              <discussion-list-item
-          <router-link
+                v-for="discussion in group.discussions.elements"
-            :to="{
+                :key="discussion.id"
-              name: RouteName.DISCUSSION_LIST,
+                :discussion="discussion"
-              params: { preferredUsername: usernameWithDomain(group) },
-            }"
-            >{{ $t("View all discussions") }}</router-link
-          >
-        </group-section>
-        <!-- Todos -->
-        <group-section :title="$t('Ongoing tasks')" icon="checkbox-multiple-marked">
-          <div v-if="group.todoLists.elements.length > 0">
-            <div v-for="todoList in group.todoLists.elements" :key="todoList.id">
-              <router-link :to="{ name: RouteName.TODO_LIST, params: { id: todoList.id } }">
-                <h2 class="is-size-3">
-                  {{
-                    $tc("{title} ({count} todos)", todoList.todos.total, {
-                      count: todoList.todos.total,
-                      title: todoList.title,
-                    })
-                  }}
-                </h2>
-              </router-link>
-              <compact-todo
-                :todo="todo"
-                v-for="todo in todoList.todos.elements.slice(0, 3)"
-                :key="todo.id"
               />
             </div>
-          </div>
+            <div v-else class="content has-text-grey has-text-centered">
-          <div v-else class="content has-text-grey has-text-centered">
+              <p>{{ $t("No discussions yet") }}</p>
-            <p>{{ $t("No ongoing todos") }}</p>
+            </div>
-          </div>
+          </template>
-          <router-link :to="{ name: RouteName.TODO_LISTS }">{{ $t("View all todos") }}</router-link>
+          <template v-slot:create>
+            <router-link
+              :to="{
+                name: RouteName.CREATE_DISCUSSION,
+                params: { preferredUsername: usernameWithDomain(group) },
+              }"
+              class="button is-primary"
+              >{{ $t("+ Start a discussion") }}</router-link
+            >
+          </template>
         </group-section>
         <!-- Resources -->
-        <group-section :title="$t('Resources')" icon="link">
+        <group-section
-          <div v-if="group.resources.elements.length > 0">
+          :title="$t('Resources')"
-            <div v-for="resource in group.resources.elements" :key="resource.id">
+          icon="link"
-              <resource-item
+          :route="{
-                :resource="resource"
+            name: RouteName.RESOURCE_FOLDER_ROOT,
-                v-if="resource.type !== 'folder'"
+            params: { preferredUsername: usernameWithDomain(group) },
-                :inline="true"
+          }"
-              />
+        >
-              <folder-item :resource="resource" :group="group" v-else :inline="true" />
+          <template v-slot:default>
+            <div v-if="group.resources.elements.length > 0">
+              <div v-for="resource in group.resources.elements" :key="resource.id">
+                <resource-item
+                  :resource="resource"
+                  v-if="resource.type !== 'folder'"
+                  :inline="true"
+                />
+                <folder-item :resource="resource" :group="group" v-else :inline="true" />
+              </div>
             </div>
-          </div>
+            <div v-else-if="group" class="content has-text-grey has-text-centered">
-          <div v-else-if="group" class="content has-text-grey has-text-centered">
+              <p>{{ $t("No resources yet") }}</p>
-            <p>{{ $t("No resources yet") }}</p>
+            </div>
-          </div>
+          </template>
-          <router-link
+          <template v-slot:create>
-            :to="{
+            <router-link
-              name: RouteName.RESOURCE_FOLDER_ROOT,
+              :to="{
-              params: { preferredUsername: usernameWithDomain(group) },
+                name: RouteName.RESOURCE_FOLDER_ROOT,
-            }"
+                params: { preferredUsername: usernameWithDomain(group) },
-            >{{ $t("View all resources") }}</router-link
+              }"
-          >
+              class="button is-primary"
+              >{{ $t("+ Add a resource") }}</router-link
+            >
+          </template>
+        </group-section>
+        <!-- Todos -->
+        <group-section
+          :title="$t('Ongoing tasks')"
+          icon="checkbox-multiple-marked"
+          :route="{
+            name: RouteName.TODO_LISTS,
+            params: { preferredUsername: usernameWithDomain(group) },
+          }"
+        >
+          <template v-slot:default>
+            <div v-if="group.todoLists.elements.length > 0">
+              <div v-for="todoList in group.todoLists.elements" :key="todoList.id">
+                <router-link :to="{ name: RouteName.TODO_LIST, params: { id: todoList.id } }">
+                  <h2 class="is-size-3">
+                    {{
+                      $tc("{title} ({count} todos)", todoList.todos.total, {
+                        count: todoList.todos.total,
+                        title: todoList.title,
+                      })
+                    }}
+                  </h2>
+                </router-link>
+                <compact-todo
+                  :todo="todo"
+                  v-for="todo in todoList.todos.elements.slice(0, 3)"
+                  :key="todo.id"
+                />
+              </div>
+            </div>
+            <div v-else class="content has-text-grey has-text-centered">
+              <p>{{ $t("No ongoing todos") }}</p>
+            </div>
+          </template>
+          <template v-slot:create>
+            <router-link
+              :to="{
+                name: RouteName.TODO_LISTS,
+                params: { preferredUsername: usernameWithDomain(group) },
+              }"
+              class="button is-primary"
+              >{{ $t("+ Add a todo") }}</router-link
+            >
+          </template>
         </group-section>
       </div>
       <!-- Public things -->
       <div class="block-column">
         <!-- Events -->
-        <group-section :title="$t('Upcoming events')" icon="calendar" :privateSection="false">
+        <group-section
-          <div class="organized-events-wrapper" v-if="group && group.organizedEvents.total > 0">
+          :title="$t('Upcoming events')"
-            <EventMinimalistCard
+          icon="calendar"
-              v-for="event in group.organizedEvents.elements"
+          :privateSection="false"
-              :event="event"
+          :route="{
-              :key="event.uuid"
+            name: RouteName.GROUP_EVENTS,
-              class="organized-event"
+            params: { preferredUsername: usernameWithDomain(group) },
-            />
+          }"
-          </div>
+        >
-          <div v-else-if="group" class="content has-text-grey has-text-centered">
+          <template v-slot:default>
-            <p>{{ $t("No public upcoming events") }}</p>
+            <div class="organized-events-wrapper" v-if="group && group.organizedEvents.total > 0">
-          </div>
+              <EventMinimalistCard
-          <b-skeleton animated v-else></b-skeleton>
+                v-for="event in group.organizedEvents.elements"
-          <router-link :to="{}">{{ $t("View all events") }}</router-link>
+                :event="event"
+                :key="event.uuid"
+                class="organized-event"
+              />
+            </div>
+            <div v-else-if="group" class="content has-text-grey has-text-centered">
+              <p>{{ $t("No public upcoming events") }}</p>
+            </div>
+            <b-skeleton animated v-else></b-skeleton>
+          </template>
+          <template v-slot:create>
+            <router-link
+              :to="{
+                name: RouteName.CREATE_EVENT,
+              }"
+              class="button is-primary"
+              >{{ $t("+ Create an event") }}</router-link
+            >
+          </template>
         </group-section>
         <!-- Posts -->
-        <group-section :title="$t('Public page')" icon="bullhorn" :privateSection="false">
+        <group-section
-          <div v-if="group.posts.total > 0" class="posts-wrapper">
+          :title="$t('Public page')"
-            <post-list-item v-for="post in group.posts.elements" :key="post.id" :post="post" />
+          icon="bullhorn"
-          </div>
+          :privateSection="false"
-          <div v-else-if="group" class="content has-text-grey has-text-centered">
+          :route="{
-            <p>{{ $t("No posts yet") }}</p>
+            name: RouteName.POSTS,
-          </div>
+            params: { preferredUsername: usernameWithDomain(group) },
-          <router-link
+          }"
-            :to="{
+        >
-              name: RouteName.POST_CREATE,
+          <template v-slot:default>
-              params: { preferredUsername: usernameWithDomain(group) },
+            <div v-if="group.posts.total > 0" class="posts-wrapper">
-            }"
+              <post-list-item v-for="post in group.posts.elements" :key="post.id" :post="post" />
-            class="button is-primary"
+            </div>
-            >{{ $t("Post a public message") }}</router-link
+            <div v-else-if="group" class="content has-text-grey has-text-centered">
-          >
+              <p>{{ $t("No posts yet") }}</p>
+            </div>
+          </template>
+          <template v-slot:create>
+            <router-link
+              :to="{
+                name: RouteName.POST_CREATE,
+                params: { preferredUsername: usernameWithDomain(group) },
+              }"
+              class="button is-primary"
+              >{{ $t("+ Post a public message") }}</router-link
+            >
+          </template>
         </group-section>
       </div>
     </div>
@@ -294,11 +366,11 @@ import DiscussionListItem from "@/components/Discussion/DiscussionListItem.vue";
 import PostListItem from "@/components/Post/PostListItem.vue";
 import ResourceItem from "@/components/Resource/ResourceItem.vue";
 import FolderItem from "@/components/Resource/FolderItem.vue";
-import RouteName from "../../router/name";
 import { Address } from "@/types/address.model";
-import GroupSection from "../../components/Group/GroupSection.vue";
 import Invitations from "@/components/Group/Invitations.vue";
 import addMinutes from "date-fns/addMinutes";
+import GroupSection from "../../components/Group/GroupSection.vue";
+import RouteName from "../../router/name";
 
 @Component({
   apollo: {
@@ -493,7 +565,7 @@ div.container {
 
   .header,
   .public-container {
-    margin: auto 2rem;
+    margin: auto 1rem;
     display: flex;
     flex-direction: column;
   }
@@ -501,6 +573,7 @@ div.container {
   .block-container {
     display: flex;
     flex-wrap: wrap;
+    margin-top: 15px;
 
     &.presentation {
       border: 2px solid $purple-2;
@@ -560,7 +633,7 @@ div.container {
 
     .block-column {
       flex: 1;
-      margin: 0 2rem;
+      margin: 0 1rem;
 
       section {
         .posts-wrapper {

js/src/views/Group/GroupList.vue

@@ -21,8 +21,8 @@ import { Component, Vue } from "vue-property-decorator";
 import { LIST_GROUPS } from "@/graphql/group";
 import { Group, IGroup } from "@/types/actor";
 import GroupMemberCard from "@/components/Group/GroupMemberCard.vue";
-import RouteName from "../../router/name";
 import { Paginate } from "@/types/paginate";
+import RouteName from "../../router/name";
 
 @Component({
   apollo: {

js/src/views/Group/GroupSettings.vue

@@ -102,13 +102,13 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-property-decorator";
+import FullAddressAutoComplete from "@/components/Event/FullAddressAutoComplete.vue";
 import RouteName from "../../router/name";
 import { FETCH_GROUP, UPDATE_GROUP, DELETE_GROUP } from "../../graphql/group";
 import { IGroup, usernameWithDomain } from "../../types/actor";
 import { Address, IAddress } from "../../types/address.model";
 import { IMember, Group } from "../../types/actor/group.model";
 import { Paginate } from "../../types/paginate";
-import FullAddressAutoComplete from "@/components/Event/FullAddressAutoComplete.vue";
 
 @Component({
   apollo: {

js/src/views/Group/MyGroups.vue

@@ -1,6 +1,13 @@
 <template>
   <section class="section container">
     <h1 class="title">{{ $t("My groups") }}</h1>
+    <p>
+      {{
+        $t(
+          "Groups are spaces for coordination and preparation to better organize events and manage your community."
+        )
+      }}
+    </p>
     <router-link :to="{ name: RouteName.CREATE_GROUP }">{{ $t("Create group") }}</router-link>
     <b-loading :active.sync="$apollo.loading"></b-loading>
     <invitations
@@ -23,9 +30,8 @@ import { LOGGED_USER_MEMBERSHIPS } from "@/graphql/actor";
 import GroupMemberCard from "@/components/Group/GroupMemberCard.vue";
 import Invitations from "@/components/Group/Invitations.vue";
 import { Paginate } from "@/types/paginate";
-import { IGroup, IMember, MemberRole, usernameWithDomain } from "@/types/actor";
+import { IMember, MemberRole, usernameWithDomain } from "@/types/actor";
 import RouteName from "../../router/name";
-import { ACCEPT_INVITATION } from "../../graphql/member";
 
 @Component({
   components: {

js/src/views/Posts/Edit.vue

@@ -79,8 +79,8 @@
 </template>
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-property-decorator";
-import { CURRENT_ACTOR_CLIENT } from "../../graphql/actor";
 import { FETCH_GROUP } from "@/graphql/group";
+import { CURRENT_ACTOR_CLIENT } from "../../graphql/actor";
 import { TAGS } from "../../graphql/tags";
 import { CONFIG } from "../../graphql/config";
 import { FETCH_POST, CREATE_POST, UPDATE_POST, DELETE_POST } from "../../graphql/post";

js/src/views/Posts/List.vue

@@ -1,47 +1,57 @@
 <template>
-  <div>
+  <div class="container section" v-if="group">
-    <section class="section container">
+    <nav class="breadcrumb" aria-label="breadcrumbs" v-if="group">
-      <nav class="breadcrumb" aria-label="breadcrumbs" v-if="group">
+      <ul>
-        <ul>
+        <li>
-          <li>
+          <router-link :to="{ name: RouteName.MY_GROUPS }">{{ $t("My groups") }}</router-link>
-            <router-link :to="{ name: RouteName.MY_GROUPS }">{{ $t("My groups") }}</router-link>
+        </li>
-          </li>
+        <li>
-          <li>
+          <router-link
-            <router-link
+            v-if="group"
-              v-if="group"
+            :to="{
-              :to="{
+              name: RouteName.GROUP,
-                name: RouteName.GROUP,
+              params: { preferredUsername: usernameWithDomain(group) },
-                params: { preferredUsername: usernameWithDomain(group) },
+            }"
-              }"
+            >{{ group.name || group.preferredUsername }}</router-link
-              >{{ group.name || group.preferredUsername }}</router-link
+          >
-            >
+          <b-skeleton v-else :animated="true"></b-skeleton>
-            <b-skeleton v-else :animated="true"></b-skeleton>
+        </li>
-          </li>
+        <li class="is-active">
-          <li class="is-active">
+          <router-link
-            <router-link
+            v-if="group"
-              v-if="group"
+            :to="{
-              :to="{
+              name: RouteName.POSTS,
-                name: RouteName.POSTS,
+              params: { preferredUsername: usernameWithDomain(group) },
-                params: { preferredUsername: usernameWithDomain(group) },
+            }"
-              }"
+            >{{ $t("Posts") }}</router-link
-              >{{ $t("Posts") }}</router-link
+          >
-            >
+          <b-skeleton v-else :animated="true"></b-skeleton>
-            <b-skeleton v-else :animated="true"></b-skeleton>
+        </li>
-          </li>
+      </ul>
-        </ul>
+    </nav>
-      </nav>
+    <section>
-      <div v-if="group">
+      <p>
-        <router-link
+        {{
-          v-for="post in group.posts.elements"
+          $t(
-          :key="post.id"
+            "A place to publish something to the whole world, your community or just your group members."
-          :to="{ name: RouteName.POST, params: { slug: post.slug } }"
+          )
-        >
+        }}
-          {{ post.title }}
+      </p>
-        </router-link>
+      <router-link
-      </div>
+        v-for="post in group.posts.elements"
-      <b-skeleton v-else :animated="true"></b-skeleton>
+        :key="post.id"
+        :to="{ name: RouteName.POST, params: { slug: post.slug } }"
+      >
+        {{ post.title }}
+      </router-link>
+      <b-loading :active.sync="$apollo.loading"></b-loading>
+      <b-message
+        v-if="group.posts.elements.length === 0 && $apollo.loading === false"
+        type="is-danger"
+      >
+        {{ $t("No posts found") }}
+      </b-message>
     </section>
-    <pre>{{ group }}</pre>
   </div>
 </template>
 

js/src/views/Posts/Post.vue

@@ -42,8 +42,8 @@
 import { Component, Vue, Prop } from "vue-property-decorator";
 import Editor from "@/components/Editor.vue";
 import { GraphQLError } from "graphql";
-import { CURRENT_ACTOR_CLIENT, PERSON_MEMBERSHIPS } from "../../graphql/actor";
 import { FETCH_GROUP } from "@/graphql/group";
+import { CURRENT_ACTOR_CLIENT, PERSON_MEMBERSHIPS } from "../../graphql/actor";
 import { TAGS } from "../../graphql/tags";
 import { CONFIG } from "../../graphql/config";
 import { FETCH_POST, CREATE_POST } from "../../graphql/post";

js/src/views/Resources/ResourceFolder.vue

@@ -64,6 +64,9 @@
       </ul>
     </nav>
     <section>
+      <p v-if="resource.path === '/'" class="module-description">
+        {{ $t("A place to store links to documents or resources of any type.") }}
+      </p>
       <div class="list-header">
         <div class="list-header-right">
           <b-checkbox v-model="checkedAll" v-if="resource.children.total > 0" />
@@ -280,7 +283,7 @@ export default class Resources extends Mixins(ResourceMixin) {
 
   renameModal = false;
 
-  groupObject: object = {
+  groupObject: Record<string, unknown> = {
     name: "resources",
     pull: "clone",
     put: true,
@@ -288,10 +291,10 @@ export default class Resources extends Mixins(ResourceMixin) {
 
   mapServiceTypeToIcon = mapServiceTypeToIcon;
 
-  async createResource() {
+  async createResource(): Promise<void> {
     if (!this.resource.actor) return;
     try {
-      const { data } = await this.$apollo.mutate({
+      await this.$apollo.mutate({
         mutation: CREATE_RESOURCE,
         variables: {
           title: this.newResource.title,
@@ -341,7 +344,7 @@ export default class Resources extends Mixins(ResourceMixin) {
     }
   }
 
-  async previewResource() {
+  async previewResource(): Promise<void> {
     if (this.newResource.resourceUrl === "") return;
     const { data } = await this.$apollo.mutate({
       mutation: PREVIEW_RESOURCE_LINK,
@@ -355,31 +358,33 @@ export default class Resources extends Mixins(ResourceMixin) {
     this.newResource.type = "link";
   }
 
-  createSentenceForType(type: string) {
+  createSentenceForType(type: string): string {
     switch (type) {
       case "folder":
-        return this.$t("Create a folder");
+        return this.$t("Create a folder") as string;
       case "pad":
-        return this.$t("Create a pad");
+        return this.$t("Create a pad") as string;
       case "calc":
-        return this.$t("Create a calc");
+        return this.$t("Create a calc") as string;
       case "visio":
-        return this.$t("Create a visioconference");
+        return this.$t("Create a visioconference") as string;
+      default:
+        return "";
     }
   }
 
-  createFolderModal() {
+  createFolderModal(): void {
     this.newResource.type = "folder";
     this.createResourceModal = true;
   }
 
-  createResourceFromProvider(provider: IProvider) {
+  createResourceFromProvider(provider: IProvider): void {
-    this.newResource.resourceUrl = this.generateFullResourceUrl(provider);
+    this.newResource.resourceUrl = Resources.generateFullResourceUrl(provider);
     this.newResource.type = provider.software;
     this.createResourceModal = true;
   }
 
-  generateFullResourceUrl(provider: IProvider): string {
+  static generateFullResourceUrl(provider: IProvider): string {
     const randomString = [...Array(10)]
       .map(() => Math.random().toString(36)[3])
       .join("")
@@ -393,13 +398,13 @@ export default class Resources extends Mixins(ResourceMixin) {
     }
   }
 
-  get createResourceButtonLabel() {
+  get createResourceButtonLabel(): string {
-    if (!this.newResource.type) return;
+    if (!this.newResource.type) return "";
     return this.createSentenceForType(this.newResource.type);
   }
 
   @Watch("checkedAll")
-  watchCheckedAll() {
+  watchCheckedAll(): void {
     this.resource.children.elements.forEach(({ id }) => {
       if (!id) return;
       this.checkedResources[id] = this.checkedAll;
@@ -409,21 +414,22 @@ export default class Resources extends Mixins(ResourceMixin) {
   @Watch("checkedResources", { deep: true })
   watchValidCheckedResources(): string[] {
     const validCheckedResources: string[] = [];
-    for (const [key, value] of Object.entries(this.checkedResources)) {
+    Object.entries(this.checkedResources).forEach(([key, value]) => {
       if (value) {
         validCheckedResources.push(key);
       }
-    }
+    });
-    return (this.validCheckedResources = validCheckedResources);
+    this.validCheckedResources = validCheckedResources;
+    return this.validCheckedResources;
   }
 
-  async deleteMultipleResources() {
+  async deleteMultipleResources(): Promise<void> {
-    for (const resourceID of this.validCheckedResources) {
+    this.validCheckedResources.forEach(async (resourceID) => {
       await this.deleteResource(resourceID);
-    }
+    });
   }
 
-  async deleteResource(resourceID: string) {
+  async deleteResource(resourceID: string): Promise<void> {
     try {
       await this.$apollo.mutate({
         mutation: DELETE_RESOURCE,
@@ -449,7 +455,7 @@ export default class Resources extends Mixins(ResourceMixin) {
           const oldResource: IResource = deleteResource;
 
           resource.children.elements = resource.children.elements.filter(
-            (resource) => resource.id !== oldResource.id
+            (resourceElement) => resourceElement.id !== oldResource.id
           );
 
           store.writeQuery({
@@ -469,28 +475,28 @@ export default class Resources extends Mixins(ResourceMixin) {
     }
   }
 
-  handleRename(resource: IResource) {
+  handleRename(resource: IResource): void {
     this.renameModal = true;
     this.updatedResource = { ...resource };
   }
 
-  handleMove(resource: IResource) {
+  handleMove(resource: IResource): void {
     this.moveModal = true;
     this.updatedResource = { ...resource };
   }
 
-  async moveResource(resource: IResource, oldParent: IResource | undefined) {
+  async moveResource(resource: IResource, oldParent: IResource | undefined): Promise<void> {
     const parentPath = oldParent && oldParent.path ? oldParent.path || "/" : "/";
     await this.updateResource(resource, parentPath);
     this.moveModal = false;
   }
 
-  async renameResource() {
+  async renameResource(): Promise<void> {
     await this.updateResource(this.updatedResource);
     this.renameModal = false;
   }
 
-  async updateResource(resource: IResource, parentPath: string | null = null) {
+  async updateResource(resource: IResource, parentPath: string | null = null): Promise<void> {
     try {
       await this.$apollo.mutate<{ updateResource: IResource }>({
         mutation: UPDATE_RESOURCE,
@@ -518,10 +524,11 @@ export default class Resources extends Mixins(ResourceMixin) {
             console.error("Cannot update resource cache, because of null value.");
             return;
           }
-          const resource: IResource = data.updateResource;
+          const updatedResource: IResource = data.updateResource;
 
+          // eslint-disable-next-line vue/max-len
           oldParentCachedResource.children.elements = oldParentCachedResource.children.elements.filter(
-            (cachedResource) => cachedResource.id !== resource.id
+            (cachedResource) => cachedResource.id !== updatedResource.id
           );
 
           store.writeQuery({
@@ -535,14 +542,14 @@ export default class Resources extends Mixins(ResourceMixin) {
           console.log("Finished removing ressource from old parent");
 
           console.log("Adding resource to new parent");
-          if (!resource.parent || !resource.parent.path) {
+          if (!updatedResource.parent || !updatedResource.parent.path) {
             console.log("No cache found for new parent");
             return;
           }
           const newParentCachedData = store.readQuery<{ resource: IResource }>({
             query: GET_RESOURCE,
             variables: {
-              path: resource.parent.path,
+              path: updatedResource.parent.path,
               username: this.resource.actor.preferredUsername,
             },
           });
@@ -558,7 +565,7 @@ export default class Resources extends Mixins(ResourceMixin) {
           store.writeQuery({
             query: GET_RESOURCE,
             variables: {
-              path: resource.parent.path,
+              path: updatedResource.parent.path,
               username: this.resource.actor.preferredUsername,
             },
             data: { newParentCachedResource },

js/src/views/Search.vue

@@ -110,16 +110,7 @@
 
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import EventCard from "../components/Event/EventCard.vue";
-import { FETCH_EVENTS } from "../graphql/event";
-import { IEvent } from "../types/event.model";
-import RouteName from "../router/name";
-import { IAddress, Address } from "../types/address.model";
-import { SearchEvent, SearchGroup } from "../types/search.model";
-import AddressAutoComplete from "../components/Event/AddressAutoComplete.vue";
 import ngeohash from "ngeohash";
-import { SEARCH_EVENTS, SEARCH_GROUPS } from "../graphql/search";
-import { Paginate } from "../types/paginate";
 import {
   endOfToday,
   addDays,
@@ -133,6 +124,15 @@ import {
   startOfMonth,
   eachWeekendOfInterval,
 } from "date-fns";
+import EventCard from "../components/Event/EventCard.vue";
+import { FETCH_EVENTS } from "../graphql/event";
+import { IEvent } from "../types/event.model";
+import RouteName from "../router/name";
+import { IAddress, Address } from "../types/address.model";
+import { SearchEvent, SearchGroup } from "../types/search.model";
+import AddressAutoComplete from "../components/Event/AddressAutoComplete.vue";
+import { SEARCH_EVENTS, SEARCH_GROUPS } from "../graphql/search";
+import { Paginate } from "../types/paginate";
 import { IGroup } from "../types/actor";
 import GroupCard from "../components/Group/GroupCard.vue";
 import { CONFIG } from "../graphql/config";
@@ -206,9 +206,11 @@ const tabsName: { events: number; groups: number } = {
 })
 export default class Search extends Vue {
   @Prop({ type: String, required: false }) tag!: string;
+
   events: IEvent[] = [];
 
   searchEvents: Paginate<IEvent> & { initial: boolean } = { total: 0, elements: [], initial: true };
+
   searchGroups: Paginate<IGroup> = { total: 0, elements: [] };
 
   search: string = (this.$route.query.term as string) || "";
@@ -275,7 +277,7 @@ export default class Search extends Vue {
 
   radiusOptions: (number | null)[] = [1, 5, 10, 25, 50, 100, 150, null];
 
-  radius: number = 50;
+  radius = 50;
 
   submit() {
     this.$apollo.queries.searchEvents.refetch();
@@ -285,7 +287,7 @@ export default class Search extends Vue {
   updateSearchTerm() {
     this.$router.push({
       name: RouteName.SEARCH,
-      query: Object.assign({}, this.$route.query, { term: this.search }),
+      query: { ...this.$route.query, term: this.search },
     });
   }
 
@@ -294,7 +296,7 @@ export default class Search extends Vue {
     const searchType = this.activeTab === tabsName.events ? "events" : "groups";
     this.$router.push({
       name: RouteName.SEARCH,
-      query: Object.assign({}, this.$route.query, { searchType }),
+      query: { ...this.$route.query, searchType },
     });
   }
 

js/src/views/Todos/TodoLists.vue

@@ -4,7 +4,10 @@
       <ul>
         <li>
           <router-link
-            :to="{ name: RouteName.GROUP, params: { preferredUsername: group.preferredUsername } }"
+            :to="{
+              name: RouteName.GROUP,
+              params: { preferredUsername: usernameWithDomain(group) },
+            }"
             >{{ group.preferredUsername }}</router-link
           >
         </li>
@@ -12,7 +15,7 @@
           <router-link
             :to="{
               name: RouteName.TODO_LISTS,
-              params: { preferredUsername: group.preferredUsername },
+              params: { preferredUsername: usernameWithDomain(group) },
             }"
             >{{ $t("Task lists") }}</router-link
           >
@@ -20,6 +23,11 @@
       </ul>
     </nav>
     <section>
+      <p>
+        {{
+          $t("Create to-do lists for all the tasks you need to do, assign them and set due dates.")
+        }}
+      </p>
       <form class="form" @submit.prevent="createNewTodoList">
         <b-field :label="$t('List title')">
           <b-input v-model="newTodoList.title" />
@@ -45,7 +53,7 @@
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
 import { FETCH_GROUP } from "@/graphql/group";
-import { IGroup } from "@/types/actor";
+import { IGroup, usernameWithDomain } from "@/types/actor";
 import { ITodoList } from "@/types/todos";
 import { CREATE_TODO_LIST } from "@/graphql/todos";
 import CompactTodo from "@/components/Todo/CompactTodo.vue";
@@ -80,15 +88,17 @@ export default class TodoLists extends Vue {
 
   RouteName = RouteName;
 
-  get todoLists() {
+  usernameWithDomain = usernameWithDomain;
+
+  get todoLists(): ITodoList[] {
     return this.group.todoLists.elements;
   }
 
-  get todoListsCount() {
+  get todoListsCount(): number {
     return this.group.todoLists.total;
   }
 
-  async createNewTodoList() {
+  async createNewTodoList(): Promise<void> {
     await this.$apollo.mutate({
       mutation: CREATE_TODO_LIST,
       variables: {

js/src/views/User/Register.vue

@@ -7,7 +7,7 @@
         </h1>
         <i18n tag="p" path="{instanceName} is an instance of the {mobilizon} software.">
           <b slot="instanceName">{{ config.name }}</b>
-          <a href="https://joinmobilizon.org" target="_blank" slot="mobilizon">{{
+          <a href="https://joinmobilizon.org" target="_blank" class="out" slot="mobilizon">{{
             $t("Mobilizon")
           }}</a>
         </i18n>
@@ -23,10 +23,15 @@
                 <li>{{ $t("Create and manage several identities from the same account") }}</li>
                 <li>{{ $t("Create, edit or delete events") }}</li>
                 <li>{{ $t("Register for an event by choosing one of your identities") }}</li>
+                <li v-if="config.features.groups">
+                  {{ $t("Create or join an group and start organizing with other people") }}
+                </li>
               </ul>
             </div>
           </div>
-          <router-link :to="{ name: RouteName.ABOUT }">{{ $t("Learn more") }}</router-link>
+          <router-link class="out" :to="{ name: RouteName.ABOUT }">{{
+            $t("Learn more")
+          }}</router-link>
           <hr />
           <div class="content">
             <subtitle>{{ $t("About this instance") }}</subtitle>
@@ -79,10 +84,10 @@
 
             <b-checkbox required>
               <i18n tag="span" path="I agree to the {instanceRules} and {termsOfService}">
-                <router-link slot="instanceRules" :to="{ name: RouteName.RULES }">{{
+                <router-link class="out" slot="instanceRules" :to="{ name: RouteName.RULES }">{{
                   $t("instance rules")
                 }}</router-link>
-                <router-link slot="termsOfService" :to="{ name: RouteName.TERMS }">{{
+                <router-link class="out" slot="termsOfService" :to="{ name: RouteName.TERMS }">{{
                   $t("terms of service")
                 }}</router-link>
               </i18n>

js/vue.config.js

@@ -5,12 +5,12 @@ module.exports = {
   lintOnSave: true,
   filenameHashing: true,
   outputDir: path.resolve(__dirname, "../priv/static"),
-  configureWebpack: {
+  // configureWebpack: {
-    optimization: {
+  //   optimization: {
-      splitChunks: {
+  //     splitChunks: {
-        minSize: 10000,
+  //       minSize: 10000,
-        maxSize: 250000,
+  //       maxSize: 250000,
-      },
+  //     },
-    },
+  //   },
-  },
+  // },
 };

js/yarn.lock

@@ -874,9 +874,9 @@
     semver "^5.5.0"
 
 "@babel/preset-modules@^0.1.3":
-  version "0.1.3"
+  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
-  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+  integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -1359,9 +1359,9 @@
     "@types/geojson" "*"
 
 "@types/lodash@^4.14.141":
-  version "4.14.160"
+  version "4.14.161"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.160.tgz#2f1bba6500bc3cb9a732c6d66a083378fb0b0b29"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.161.tgz#a21ca0777dabc6e4f44f3d07f37b765f54188b18"
-  integrity sha512-aP03BShJoO+WVndoVj/WNcB/YBPt+CIU1mvaao2GRAHy2yg4pT/XS4XnVHEQBjPJGycWf/9seKEO9vopTJGkvA==
+  integrity sha512-EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==
 
 "@types/mime@*":
   version "2.0.3"
@@ -1396,9 +1396,9 @@
   integrity sha512-6nlq2eEh75JegDGUXis9wGTYIJpUvbori4qx++PRKQsV3YRkaqUNPNykzphniqPSZADXCouBuAnyptjUkMkhvw==
 
 "@types/node@*", "@types/node@>=6":
-  version "14.6.1"
+  version "14.6.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.1.tgz#fdf6f6c6c73d3d8eee9c98a9a0485bc524b048d7"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.2.tgz#264b44c5a28dfa80198fc2f7b6d3c8a054b9491f"
-  integrity sha512-HnYlg/BRF8uC1FyKRFZwRaCPTPYKa+6I8QiUZFLredaGOou481cgFS4wKRFyKvQtX8xudqkSdBczJHIYSQYKrQ==
+  integrity sha512-onlIwbaeqvZyniGPfdw/TEhKIh79pz66L1q06WUQqJLnAb6wbjvOtepLYTGHTqzdXgBYIE3ZdmqHDGsRsbBz7A==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1416,9 +1416,9 @@
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
 "@types/prosemirror-inputrules@^1.0.2":
-  version "1.0.2"
+  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@types/prosemirror-inputrules/-/prosemirror-inputrules-1.0.2.tgz#60b946ca2782f0f453b65105e2ebfd1730324caa"
+  resolved "https://registry.yarnpkg.com/@types/prosemirror-inputrules/-/prosemirror-inputrules-1.0.3.tgz#3f8f07921f692b6c7e4781fa426aee3e76b9018c"
-  integrity sha512-bKFneQUPnkZmzCJ1uoitpKH6PFW0hc4q55NsC7mFUCvX0eZl0GRKxyfV47jkJbsbyUQoO/QFv0WwLDz2bo15sA==
+  integrity sha512-cxMkCcu/di8//68jWc/NrRpvpCbizgq9vqv4rCRsAiuSiJ8L5hf4aFlCBUYCffuQnrY98uOfJ8YAUY3dbtaF9A==
   dependencies:
     "@types/prosemirror-model" "*"
     "@types/prosemirror-state" "*"
@@ -1976,10 +1976,10 @@
   resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.0-rc.9.tgz#81e71c2c40dbbfc4f05b3b4a3f92cb2842864aa3"
   integrity sha512-SHD7qwziiG6208nKrs0qqbWbYckvBiCBCLwlRjUb6NEDUMN0TOVyzyaTvdnHND9ion/ZMdwEKMtWWtgJJkHDdw==
 
-"@vue/test-utils@1.0.4":
+"@vue/test-utils@1.0.5":
-  version "1.0.4"
+  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.4.tgz#6341caccdf72da5914a5168e680ea12550fba98a"
+  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.5.tgz#676e1f986bb93ddc869d9c6cf1c820183d64d92f"
-  integrity sha512-uIdDqFauzNJWlhltLSZU+P3uHEgUQczklSv2b1EKC7JzxBg9OY/5sx8UyuJwBD+zuxidhFZ4SjTuPgr8cdf63w==
+  integrity sha512-P2x8kXwqfTXesAdfJQN146V1S3QD3Xv9wYZ1B09Oecmg7I3Fpqqo1CwfIn5ivwuXyBPQWFDH4vyBHynnYjIkRg==
   dependencies:
     dom-event-types "^1.0.0"
     lodash "^4.17.15"
@@ -2246,7 +2246,7 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
+ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
@@ -2261,7 +2261,7 @@ ajv@^5.5.2:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4:
   version "6.12.4"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
   integrity sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==
@@ -3394,9 +3394,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001111:
-  version "1.0.30001118"
+  version "1.0.30001120"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001118.tgz#116a9a670e5264aec895207f5e918129174c6f62"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001120.tgz#cd21d35e537214e19f7b9f4f161f7b0f2710d46c"
-  integrity sha512-RNKPLojZo74a0cP7jFMidQI7nvLER40HgNfgKQEJ2PFm225L0ectUungNQoK3Xk3StQcFbpBPNEvoWD59436Hg==
+  integrity sha512-JBP68okZs1X8D7MQTY602jxMYBmXEKOFkzTBaNSkubooMPFOAv2TXWaKle7qgHpjLDhUzA/TMT0qsNleVyXGUQ==
 
 case-sensitive-paths-webpack-plugin@^2.3.0:
   version "2.3.0"
@@ -4073,9 +4073,9 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 copy-webpack-plugin@^5.1.0, copy-webpack-plugin@^5.1.1:
-  version "5.1.1"
+  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.2.tgz#8a889e1dcafa6c91c6cd4be1ad158f1d3823bae2"
-  integrity sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==
+  integrity sha512-Uh7crJAco3AjBvgAy9Z75CjK8IG+gxaErro71THQ+vv/bl4HaQcpkexAY8KVW/T6D2W2IRr+couF/knIRkZMIQ==
   dependencies:
     cacache "^12.0.3"
     find-cache-dir "^2.1.0"
@@ -4087,7 +4087,7 @@ copy-webpack-plugin@^5.1.0, copy-webpack-plugin@^5.1.1:
     normalize-path "^3.0.0"
     p-limit "^2.2.1"
     schema-utils "^1.0.0"
-    serialize-javascript "^2.1.2"
+    serialize-javascript "^4.0.0"
     webpack-log "^2.0.0"
 
 core-js-compat@^3.6.2, core-js-compat@^3.6.5:
@@ -4993,9 +4993,9 @@ ejs@^2.6.1:
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
 electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.523:
-  version "1.3.550"
+  version "1.3.555"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.550.tgz#bf9bbb78182aac0fe2d23d3bd1483dde4483f512"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.555.tgz#a096716ff77cf8da9a608eb628fd6927869503d2"
-  integrity sha512-MWDHoJsSieBaJ6mObvi3V0eKZufR1iMJl56VIGdXCgFHyCUbVDGm2IMXUNjDxgbGbKa3tA5+zJmHuBQqRxGiLA==
+  integrity sha512-/55x3nF2feXFZ5tdGUOr00TxnUjUgdxhrn+eCJ1FAcoAt+cKQTjQkUC5XF4frMWE1R5sjHk+JueuBalimfe5Pg==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -9724,9 +9724,9 @@ openapi-to-graphql@2.1.0:
     swagger2openapi "^5.1.0"
 
 opener@^1.5.1:
-  version "1.5.1"
+  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.1.tgz#6d2f0e77f1a0af0032aca716c2c1fbb8e7e8abed"
+  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
-  integrity sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==
+  integrity sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==
 
 opn@5.4.0:
   version "5.4.0"
@@ -10825,9 +10825,9 @@ prettier@^1.18.2:
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
 pretty-bytes@^5.1.0:
-  version "5.3.0"
+  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz#cd89f79bbcef21e3d21eb0da68ffe93f803e884b"
-  integrity sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==
+  integrity sha512-s1Iam6Gwz3JI5Hweaz4GoCD1WUNUIyzePFy5+Js2hjwGVt2Z79wNN+ZKOZ2vB6C+Xs6njyB84Z1IthQg8d9LxA==
 
 pretty-error@^2.0.2:
   version "2.1.1"
@@ -12201,7 +12201,7 @@ scheduler@^0.19.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-schema-utils@2.7.0, schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
+schema-utils@2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
   integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
@@ -12219,6 +12219,15 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
+schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.5, schema-utils@^2.6.6, schema-utils@^2.7.0:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
+  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
+  dependencies:
+    "@types/json-schema" "^7.0.5"
+    ajv "^6.12.4"
+    ajv-keywords "^3.5.2"
+
 scss-tokenizer@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
@@ -12288,11 +12297,6 @@ send@0.17.1:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
-serialize-javascript@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
-  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
-
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -13071,9 +13075,9 @@ supports-color@^6.1.0:
     has-flag "^3.0.0"
 
 supports-color@^7.0.0, supports-color@^7.1.0:
-  version "7.1.0"
+  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
@@ -13930,9 +13934,9 @@ upper-case@^1.1.1:
   integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
 
 uri-js@^4.2.2:
-  version "4.2.2"
+  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602"
-  integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
+  integrity sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==
   dependencies:
     punycode "^2.1.0"
 

lib/web/templates/api/privacy.html.eex

@@ -1,6 +1,6 @@
 <article class="message">
   <p class="message-body">
-    <%= pgettext("terms", "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better.") |> raw %>
+    <%= pgettext("terms", "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better.") |> raw %>
   </p>
 </article>
 <h3><%= pgettext("terms", "What information do we collect?") %></h3>
@@ -9,7 +9,7 @@
     <b><%= pgettext("terms", "Basic account information") %></b>
     <p><%= pgettext(
       "terms",
-      "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+      "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
       ) |> raw %>
     </p>
   </li>
@@ -18,7 +18,7 @@
     <p>
       <%= pgettext(
       "terms",
-      "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
+      "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
       ) |> raw %>
     </p>
     <p>
@@ -58,7 +58,7 @@
 <p><%= pgettext("terms", "We will make a good faith effort to:") %></p>
 <ul>
   <li>
-    <%= pgettext("terms", "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.")%>
+    <%= pgettext("terms", "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days.")%>
   </li>
   <li>
     <%= pgettext("terms", "Retain the IP addresses associated with registered users no more than 12 months.") %>
@@ -75,16 +75,16 @@
   <li><%= pgettext("terms", "An internal ID for your current selected identity") %></li>
   <li><%= pgettext("terms", "Tokens to authenticate you") %></li>
 </ul>
-<p><%= pgettext("terms", "If you delete these informations, you need to login again.") %></p>
+<p><%= pgettext("terms", "If you delete this information, you need to login again.") %></p>
 <p><%=
   pgettext(
   "terms",
-  "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
+  "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
   )
   %>
 </p>
 <em>
-  <%= pgettext("terms", "Note: These informations are stored in your localStorage and not your cookies.") %>
+  <%= pgettext("terms", "Note: This information is stored in your localStorage and not your cookies.") %>
 </em>
 <h3 class="title"><%=
   pgettext("terms", "Do we disclose any information to outside parties?")
@@ -96,7 +96,7 @@
 </p>
 <p>
   <%=
-  pgettext("terms", "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one.")
+  pgettext("terms", "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one.")
   %>
 </p>
 <h3 class="title"><%=

lib/web/templates/api/terms.html.eex

@@ -12,42 +12,42 @@
 </article>
 <article class="message">
   <p class="message-body">
-    <%= pgettext("terms", "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better.") |> raw %>
+    <%= pgettext("terms", "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better.") |> raw %>
   </p>
 </article>
 <p><%= pgettext("terms", "Here are the important things you need to know about accessing and using the <b>%{instance_name}</b> (<a href=\"https://%{instance_url}\">%{instance_url}</a>) website and service (collectively, \"Service\"). These are our terms of service (\"Terms\"). Please read them carefully.", %{instance_name: @instance_name, instance_url: @instance_url}) |> raw %></p>
 <p>
-  <%= pgettext("terms", "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>.") |> raw %>
+  <%= pgettext("terms", "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page.") |> raw %>
 </p>
 <!-- Accept -->
 <h3><%= pgettext("terms", "Accepting these Terms") %></h3>
-<p><%= pgettext("terms", "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}.", %{contact: @instance_contact}) |> raw %></p>
+<p><%= pgettext("terms", "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}.", %{contact: @instance_contact}) |> raw %></p>
 <!-- Changes -->
 <h3>
   <%= pgettext("terms", "Changes to these Terms") %>
 </h3>
 <p>
-  <%= pgettext("terms", "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason.") %>
+  <%= pgettext("terms", "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature.") %>
 </p>
 <p>
   <%= pgettext("terms", "If we make major changes, we will notify our users in a clear and prominent manner. Minor changes may only be highlighted in the footer of our website. It is your responsibility to check the website regularly for changes to these Terms.") %>
 </p>
 <p>
-  <%= pgettext("terms", "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms.") %>
+  <%= pgettext("terms", "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms.") %>
 </p>
 <!-- Privacy policy -->
 <h3><%= pgettext("terms", "Privacy Policy") %></h3>
-<p><%= pgettext("terms", "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>.") |> raw %></p>
+<p><%= pgettext("terms", "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>.") |> raw %></p>
 <!-- Account security -->
 <h3><%= pgettext("terms", "Creating Accounts") %></h3>
-<p><%= pgettext("terms", "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>.", %{instance_name: @instance_name}) |> raw %></p>
+<p><%= pgettext("terms", "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>.", %{instance_name: @instance_name}) |> raw %></p>
 <p><%= pgettext("terms", "If you discover or suspect any Service security breaches, please let us know as soon as possible. For security holes in the Mobilizon software itself, please contact <a href=\"https://framagit.org/framasoft/mobilizon/\">its contributors</a> directly.") |> raw %></p>
-<p><%= pgettext("terms", "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge.") %></p>
+<p><%= pgettext("terms", "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge.") %></p>
 <!-- Your content -->
 <h3><%= pgettext("terms", "Your Content & Conduct") %></h3>
 <p><%= pgettext("terms", "Our Service allows you and other users to post, link and otherwise make available content. You are responsible for the content that you make available to the Service, including its legality, reliability, and appropriateness.") %></p>
-<p><%= pgettext("terms", "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set.") %></p>
+<p><%= pgettext("terms", "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set.") %></p>
-<p><%= pgettext("terms", "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service.") %></p>
+<p><%= pgettext("terms", "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service.") %></p>
 <p><%= pgettext("terms", "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system.") %></p>
 <p><%= pgettext("terms", "Since Mobilizon is a distributed network, it is possible, depending on the visibility rules set to your content, that your content has been distributed to other Mobilizon instances. When you delete your content, we will request those other instances to also delete the content. Our responsibility on the content being deleted from those other instances ends here. If for some reason, some other instance does not delete the content, we cannot be held responsible.") %></p>
 <p><%= pgettext("terms", "In order to make <b>%{instance_name}</b> a great place for all of us, please do not post, link and otherwise make available on or through the Service any of the following:", %{instance_name: @instance_name}) |> raw %></p>
@@ -68,7 +68,7 @@
   <%= pgettext("terms", "Finally, your use of the Service is also subject to acceptance of <a href=\"/rules\">the instance's own specific rules</a> regarding the code of conduct and moderation rules. Breaking those rules may also result in your account being disabled or suspended.") |> raw %>
 </p>
 <h3>
-  <%= pgettext("terms", "Our responsability") %>
+  <%= pgettext("terms", "Our responsibility") %>
 </h3>
 <p>
   <%= pgettext("terms", "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful.") %>

priv/gettext/ar/LC_MESSAGES/default.po

@@ -209,18 +209,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -462,36 +450,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -504,12 +462,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -576,12 +528,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -618,12 +564,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -648,12 +588,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -702,36 +636,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -744,13 +654,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -763,18 +666,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1276,12 +1167,121 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/be/LC_MESSAGES/default.po

@@ -206,18 +206,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -444,36 +432,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -486,12 +444,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -558,12 +510,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -600,12 +546,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -630,12 +570,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -684,36 +618,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -726,13 +636,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -745,18 +648,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1252,12 +1143,121 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/ca/LC_MESSAGES/default.po

@@ -216,18 +216,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -449,36 +437,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -491,12 +449,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -563,12 +515,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -605,12 +551,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -635,12 +575,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -689,36 +623,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -731,13 +641,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -750,18 +653,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1272,12 +1163,121 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/cs/LC_MESSAGES/default.po

@@ -206,18 +206,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -444,36 +432,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -486,12 +444,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -558,12 +510,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -600,12 +546,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -630,12 +570,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -684,36 +618,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -726,13 +636,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -745,18 +648,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1252,12 +1143,121 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/de/LC_MESSAGES/default.po

@@ -219,18 +219,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr "IPs und anderen Metadaten"
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -454,36 +442,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -496,12 +454,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -568,12 +520,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -610,12 +556,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -640,12 +580,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -694,36 +628,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -736,13 +646,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -755,18 +658,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1280,12 +1171,121 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/default.pot

@@ -192,18 +192,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -425,36 +413,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -467,12 +425,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -539,12 +491,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -581,12 +527,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -611,12 +551,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -665,36 +599,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -707,13 +617,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -726,18 +629,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1240,3 +1131,112 @@ msgstr ""
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/en/LC_MESSAGES/default.po

@@ -215,18 +215,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -448,36 +436,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -490,12 +448,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -562,12 +514,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -604,12 +550,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -634,12 +574,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -688,36 +622,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -730,13 +640,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -749,18 +652,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1254,12 +1145,121 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/fi/LC_MESSAGES/default.po

@@ -217,18 +217,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr "IP-osoitteet ja muu metadata"
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr "Jos poistat nämä tiedot, joudut kirjautumaan uudelleen."
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr "Huomaa: Nämä tiedot tallennetaan localStorage-tietoina eikä evästeinä."
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -492,68 +480,6 @@ msgstr ""
 "välttämätöntä lain tai sivustomme noudattamisen tahi meidän tai muiden "
 "oikeuksien, omaisuuden tai turvallisuuden suojelemisen kannalta."
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-"Säilyttämään kaikkien palvelimelle tehtyjen pyyntöjen IP-osoitteet "
-"sisältäviä palvelinlokeja, mikäli sellaisia pidetään, enintään 90 päivän "
-"ajan."
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-"Sinusta kerätään tietoja, kun rekisteröidyt tälle palvelimelle ja kun "
-"osallistut alustan käyttöön lukemalla ja kirjoittamalla tätä kautta jaettuja "
-"tietoja ja vaikutat niihin. Kun rekisteröidyt palvelimelle, sinulta kysytään "
-"<b>sähköpostiosoitetta, salasanaa</b> ja ainakin <b>käyttäjätunnusta</b>. "
-"Sähköpostiosoitteesi vahvistetaan yksilöllisen linkin sisältävällä "
-"sähköpostiviestillä. Jos kyseinen linkki avataan, sinun tiedetään olevan "
-"sähköpostiosoitteen haltija. Voit myös syöttää profiiliisi muita tietoja, "
-"kuten <b>näyttönimen ja esittelyn, sekä ladata profiilikuvan ja "
-"otsikkokuvan</b>. Käyttäjätunnus, näyttönimi, esittely, profiilikuva ja "
-"otsikkokuva <b>ovat aina julkista tietoa</b>. <b>Voit myös käyttää "
-"palvelinta rekisteröitymättä</b>."
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-"Jos et ole kirjautunut, laitteellesi ei tallenneta mitään tietoja, paitsi "
-"jos osallistut tapahtumaan anonyymisti. Siinä tapauksessa UUID:n tarkiste ja "
-"osallistumisen tila tallennetaan selaimeesi, jotta osallistumisen tila "
-"voidaan näyttää. Näiden tietojen poisto vaikuttaa vain siten, että "
-"osallistumisen tilaa ei enää näytetä selaimessa."
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-"Omat <b>tapahtumasi</b> ja <b>kommenttisi</b> välitetään omaa palvelintasi "
-"seuraaville palvelimille, mikä tarkoittaa, että niistä tallennetaan kopiot "
-"näille muille palvelimille. Kun poistat tapahtumia tai kommentteja, myös "
-"tämä toimenpide välitetään muille palvelimille. Niin ikään tapahtumaan "
-"osallistuminen välitetään muille palvelimille. Muista, että tämän ja muiden "
-"palvelinten ylläpitäjät voivat lukea näitä viestejä ja että vastaanottajat "
-"voivat kopioida viestin tekstinä tai kuvankaappauksena tai muulla tavoin "
-"levittää niitä edelleen."
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-"Sisältöäsi voidaan ladata verkoston muille palvelimille. Julkiset "
-"tapahtumasi ja kommenttisi toimitetaan omaa palvelintasi seuraaville "
-"palvelimille. Ryhmän kautta luotu sisältö välitetään ryhmän kaikkien "
-"jäsenten kaikille palvelimille, mikäli ryhmässä on muita kuin tätä "
-"palvelinta käyttäviä jäseniä."
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -566,15 +492,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr "Ehtojen muutokset"
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-"Oikeus ehtojen muuttamiseen milloin tahansa pidätetään. Ehtoja voi "
-"esimerkiksi olla tarpeen muuttaa, jos käyttöön otetaan uusia ominaisuuksia, "
-"tai muusta syystä."
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -659,14 +576,6 @@ msgstr ""
 "Jos toimit näiden ehtojen vastaisesti, voimme poistaa tai keskeyttää "
 "käyttöoikeutesi palveluun."
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-"Jos jatkat palvelun käyttöä muutettujen ehtojen astuttua voimaan, osoitat "
-"hyväksyneesi muutetut ehdot."
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -712,19 +621,6 @@ msgstr ""
 "käyttäjiä heidän käyttäessään palvelua, tai joka voi vahingoittaa, estää, "
 "ylikuormittaa tai rajoittaa palvelun toimivuutta"
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-"Julkaisemalla, linkittämällä tai saattamalla muulla tavoin sisältöä "
-"saataville palvelussa luovutat meille oikeuden näyttää ja jaella sisältöäsi "
-"palvelussa tai sen kautta (mukaan luettuna sovellusten kautta). Saatamme "
-"muotoilla palvelussa näytettävän sisällön ulkoasua, mutta emme muuta tai "
-"tarkista itse sisältöä. Sisällön näyttäminen ja jakelu tapahtuu yksinomaan "
-"sisällölle asettamiesi näkyvyysehtojen mukaisesti. Emme muuta sisällölle "
-"asettamiasi näkyvyysehtoja."
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -762,14 +658,6 @@ msgstr ""
 "Katso <a href=\"https://joinmobilizon.org\">täältä</a> tarkempia Mobilizon-"
 "ohjelmaa koskevia tietoja."
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-"<a href=\"/privacy\">Tietosuojakäytännössämme</a> kerrotaan, kuinka keräämme "
-"ja käytämme palvelun käyttäjien tietoja."
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -848,35 +736,6 @@ msgstr ""
 "Virukset, vioittuneet tiedot tai muut haitalliset, häiritsevät tai tuhoa "
 "aiheuttavat tiedostot tai koodikatkelmat."
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-"Emme ole vastuussa siitä, jos ohjelmointi- tai hallinnointivirheen vuoksi "
-"sisältösi päätyy alun perin tarkoitettua laajemman yleisön nähtäville. "
-"Meille myöntämiäsi rajoitettuja oikeuksia lukuun ottamatta kaikki "
-"julkaisemaasi, linkittämääsi tai muulla tavoin palvelussa tai sen kautta "
-"saataville saattamaasi sisältöä koskevat oikeudet säilyvät sinulla."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-"Emme ole vastuussa seurauksista, jos joku muu käyttää sähköpostiosoitettasi "
-"ja salasanaasi joko sinun tietäen tai tietämättäsi."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-"Luodessasi tilin sitoudut pitämään salasanasi turvallisena ja vain omana "
-"tietonasi ja hyväksyt kaikki palvelimelle <b>%{instance_name}</b> "
-"luovuttamiesi tilitietojen ja muiden tietojen luvattomaan käyttöön liittyvät "
-"riskit."
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
@@ -887,16 +746,6 @@ msgstr ""
 "järjestelmässämme tai varmuuskopioissamme. Niin ikään www-palvelimen "
 "käyttölokeja säilytetään järjestelmässä jonkin aikaa."
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-"Käyttäessäsi palvelua suostut kaikkiin alla olevien ehtojen rajoituksiin. "
-"Lue siis ehdot läpi ennen palvelun käyttöä. Jos et hyväksy kaikkia alla "
-"esitettyjä ehtoja, älä käytä palvelua. Jos et ymmärrä jotakin ehtoa, voit "
-"ottaa meihin yhteyttä osoitteeseen %{contact}."
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -911,16 +760,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr "Lähdekoodi"
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-"Jotkin seuraavassa käytettävät tekniset ja muut termit voivat olla hankalia "
-"ymmärtää. Laatimamme <a href=\"/glossary\">sanasto</a> voi auttaa niiden "
-"ymmärtämisessä."
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -943,26 +782,6 @@ msgstr ""
 "toimivat muulla tavoin asiattomasti, uhkaavasti, hyökkäävästi tai "
 "vahingollisesti."
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr "Meidän vastuumme"
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-"Tässä asiakirjassa ”me” tarkoittaa tämän Mobilizon-palvelimen omistajia, "
-"operaattoreita ja ylläpitäjiä. Mobilizon-ohjelman on tuottanut Mobilizon-"
-"toteuttajatiimi, ja tuotantoa on tukenut <a href=\"https://framasoft.org\""
-">Framasoft</a>, joka on ranskalainen voittoa tavoittelematon, vapaiden ja "
-"ilmaisten ohjelmistojen käyttöä edistävä kansansivistysjärjestö. Ellei "
-"toisin mainita, tämä Mobilizon-palvelin on Mobilizonin lähdekoodia käyttävä "
-"itsenäinen palvelu. Voit lukea lisää tästä palvelimesta <a href=\"/about/"
-"instance\">”Tietoja tästä palvelimesta” -sivulta</a>."
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1532,12 +1351,189 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+"<a href=\"/privacy\">Tietosuojakäytännössämme</a> kerrotaan, kuinka keräämme "
+"ja käytämme palvelun käyttäjien tietoja."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+"Jos jatkat palvelun käyttöä muutettujen ehtojen astuttua voimaan, osoitat "
+"hyväksyneesi muutetut ehdot."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr "Jos poistat nämä tiedot, joudut kirjautumaan uudelleen."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+"Jos et ole kirjautunut, laitteellesi ei tallenneta mitään tietoja, paitsi "
+"jos osallistut tapahtumaan anonyymisti. Siinä tapauksessa UUID:n tarkiste ja "
+"osallistumisen tila tallennetaan selaimeesi, jotta osallistumisen tila "
+"voidaan näyttää. Näiden tietojen poisto vaikuttaa vain siten, että "
+"osallistumisen tilaa ei enää näytetä selaimessa."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr "Huomaa: Nämä tiedot tallennetaan localStorage-tietoina eikä evästeinä."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr "Meidän vastuumme"
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+"Säilyttämään kaikkien palvelimelle tehtyjen pyyntöjen IP-osoitteet "
+"sisältäviä palvelinlokeja, mikäli sellaisia pidetään, enintään 90 päivän "
+"ajan."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+"Jotkin seuraavassa käytettävät tekniset ja muut termit voivat olla hankalia "
+"ymmärtää. Laatimamme <a href=\"/glossary\">sanasto</a> voi auttaa niiden "
+"ymmärtämisessä."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+"Emme ole vastuussa seurauksista, jos joku muu käyttää sähköpostiosoitettasi "
+"ja salasanaasi joko sinun tietäen tai tietämättäsi."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+"Emme ole vastuussa siitä, jos ohjelmointi- tai hallinnointivirheen vuoksi "
+"sisältösi päätyy alun perin tarkoitettua laajemman yleisön nähtäville. "
+"Meille myöntämiäsi rajoitettuja oikeuksia lukuun ottamatta kaikki "
+"julkaisemaasi, linkittämääsi tai muulla tavoin palvelussa tai sen kautta "
+"saataville saattamaasi sisältöä koskevat oikeudet säilyvät sinulla."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+"Sinusta kerätään tietoja, kun rekisteröidyt tälle palvelimelle ja kun "
+"osallistut alustan käyttöön lukemalla ja kirjoittamalla tätä kautta jaettuja "
+"tietoja ja vaikutat niihin. Kun rekisteröidyt palvelimelle, sinulta kysytään "
+"<b>sähköpostiosoitetta, salasanaa</b> ja ainakin <b>käyttäjätunnusta</b>. "
+"Sähköpostiosoitteesi vahvistetaan yksilöllisen linkin sisältävällä "
+"sähköpostiviestillä. Jos kyseinen linkki avataan, sinun tiedetään olevan "
+"sähköpostiosoitteen haltija. Voit myös syöttää profiiliisi muita tietoja, "
+"kuten <b>näyttönimen ja esittelyn, sekä ladata profiilikuvan ja "
+"otsikkokuvan</b>. Käyttäjätunnus, näyttönimi, esittely, profiilikuva ja "
+"otsikkokuva <b>ovat aina julkista tietoa</b>. <b>Voit myös käyttää "
+"palvelinta rekisteröitymättä</b>."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+"Oikeus ehtojen muuttamiseen milloin tahansa pidätetään. Ehtoja voi "
+"esimerkiksi olla tarpeen muuttaa, jos käyttöön otetaan uusia ominaisuuksia, "
+"tai muusta syystä."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+"Tässä asiakirjassa ”me” tarkoittaa tämän Mobilizon-palvelimen omistajia, "
+"operaattoreita ja ylläpitäjiä. Mobilizon-ohjelman on tuottanut Mobilizon-"
+"toteuttajatiimi, ja tuotantoa on tukenut <a href=\"https://framasoft.org\""
+">Framasoft</a>, joka on ranskalainen voittoa tavoittelematon, vapaiden ja "
+"ilmaisten ohjelmistojen käyttöä edistävä kansansivistysjärjestö. Ellei "
+"toisin mainita, tämä Mobilizon-palvelin on Mobilizonin lähdekoodia käyttävä "
+"itsenäinen palvelu. Voit lukea lisää tästä palvelimesta <a href=\"/about/"
+"instance\">”Tietoja tästä palvelimesta” -sivulta</a>."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+"Luodessasi tilin sitoudut pitämään salasanasi turvallisena ja vain omana "
+"tietonasi ja hyväksyt kaikki palvelimelle <b>%{instance_name}</b> "
+"luovuttamiesi tilitietojen ja muiden tietojen luvattomaan käyttöön liittyvät "
+"riskit."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+"Julkaisemalla, linkittämällä tai saattamalla muulla tavoin sisältöä "
+"saataville palvelussa luovutat meille oikeuden näyttää ja jaella sisältöäsi "
+"palvelussa tai sen kautta (mukaan luettuna sovellusten kautta). Saatamme "
+"muotoilla palvelussa näytettävän sisällön ulkoasua, mutta emme muuta tai "
+"tarkista itse sisältöä. Sisällön näyttäminen ja jakelu tapahtuu yksinomaan "
+"sisällölle asettamiesi näkyvyysehtojen mukaisesti. Emme muuta sisällölle "
+"asettamiasi näkyvyysehtoja."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+"Omat <b>tapahtumasi</b> ja <b>kommenttisi</b> välitetään omaa palvelintasi "
+"seuraaville palvelimille, mikä tarkoittaa, että niistä tallennetaan kopiot "
+"näille muille palvelimille. Kun poistat tapahtumia tai kommentteja, myös "
+"tämä toimenpide välitetään muille palvelimille. Niin ikään tapahtumaan "
+"osallistuminen välitetään muille palvelimille. Muista, että tämän ja muiden "
+"palvelinten ylläpitäjät voivat lukea näitä viestejä ja että vastaanottajat "
+"voivat kopioida viestin tekstinä tai kuvankaappauksena tai muulla tavoin "
+"levittää niitä edelleen."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""
+"Sisältöäsi voidaan ladata verkoston muille palvelimille. Julkiset "
+"tapahtumasi ja kommenttisi toimitetaan omaa palvelintasi seuraaville "
+"palvelimille. Ryhmän kautta luotu sisältö välitetään ryhmän kaikkien "
+"jäsenten kaikille palvelimille, mikäli ryhmässä on muita kuin tätä "
+"palvelinta käyttäviä jäseniä."

priv/gettext/it/LC_MESSAGES/default.po

@@ -208,18 +208,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -441,36 +429,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -483,12 +441,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -555,12 +507,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -597,12 +543,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -627,12 +567,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -681,36 +615,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -723,13 +633,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -742,18 +645,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1248,12 +1139,121 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/ja/LC_MESSAGES/default.po

@@ -206,18 +206,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -434,36 +422,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -476,12 +434,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -548,12 +500,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -590,12 +536,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -620,12 +560,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -674,36 +608,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -716,13 +626,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -735,18 +638,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1238,12 +1129,121 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/nl/LC_MESSAGES/default.po

@@ -217,18 +217,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -450,36 +438,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -492,12 +450,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -564,12 +516,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -606,12 +552,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -636,12 +576,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -690,36 +624,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -732,13 +642,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -751,18 +654,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1275,12 +1166,121 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/oc/LC_MESSAGES/default.po

@@ -212,20 +212,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr "Adreças IP e autras metadonadas"
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr "Se suprimissètz aquestas informacions, deuriatz vos tornar connectar."
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-"Nòta : aquestas informacions son gardadas dins lo localStorage e non pas "
-"dins de cookies."
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -450,36 +436,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -492,12 +448,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -564,12 +514,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -606,12 +550,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -636,12 +574,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -690,36 +622,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -732,13 +640,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -751,18 +652,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1277,12 +1166,123 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr "Se suprimissètz aquestas informacions, deuriatz vos tornar connectar."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+"Nòta : aquestas informacions son gardadas dins lo localStorage e non pas "
+"dins de cookies."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/pl/LC_MESSAGES/default.po

@@ -221,18 +221,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -459,36 +447,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -501,12 +459,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -573,12 +525,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -615,12 +561,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -645,12 +585,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -699,36 +633,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -741,13 +651,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -760,18 +663,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1288,12 +1179,121 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/pt/LC_MESSAGES/default.po

@@ -206,18 +206,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -439,36 +427,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -481,12 +439,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -553,12 +505,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -595,12 +541,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -625,12 +565,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -679,36 +613,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -721,13 +631,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -740,18 +643,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1245,12 +1136,121 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/pt_BR/LC_MESSAGES/default.po

@@ -219,20 +219,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr "IPs e outros metadados"
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr "Se você apagar esta informação, você precisa entrar novamente."
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-"Nota: Estas informações são armazenadas no seu armazenamento local "
-"(localStorage) e não no seus cookies."
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -504,69 +490,6 @@ msgstr ""
 "  da lei, fazer cumprir a política de nosso site ou proteger o direito, a "
 "propriedade ou segurança nossa e de outros."
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-"Conserve os registros do servidor que contenham o endereço IP de todas as "
-"solicitações a este servidor, de modo que permaneçam não mais que\n"
-"        90 dias."
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-"Nós coletamos informações de você quando você se registra neste servidor e "
-"reunimos dados quando você participa na plataforma\n"
-"      seja lendo, escrevendo e interagindo com o conteúdo compartilhado "
-"aqui. Se você se registra neste servidor, será solicitado que \n"
-"      você insira o seu endereço de email, uma senha e pelo ao menos um nome "
-"de usuário. O seu endereço de email será verificado\n"
-"      através de um email envaido a você e contendo um link. Se esse link é "
-"visitado, nós saberemos que você controla esse endereço\n"
-"      de email. Você talvez também insira informações adicionais no seu "
-"perfil, tais como o nome a exibir e sua biografia e ainda suba \n"
-"     uma foto sua para o perfil e uma image de cabeçalho. O nome de usuário, "
-"nome a exibir, biografia, foto do perfil e imagens de \n"
-"      cabeçalho são sempre exibidas publicamente. Mas você pode, no entanto, "
-"visitar este site sem se registrar."
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-"Se você não estiver conectado, nós não armazenamos nenhuma informação no seu "
-"aparelho, a menos que você participe de um evento\n"
-"  anonimamente. Neste caso nos armazenamos o hash do UUID e o status da "
-"participação no seu navegador, de modo que nós \n"
-"  podemos exibir o status da participação. Apagando esta informação vai "
-"somente impedir de exibir o status da participação .\n"
-"  no seu navegador."
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-"Seus eventos e comentários são entregues em outras instâncias que seguem a "
-"sua própria, isto é, eles são entregues\n"
-"      a diferentes servidores e cópias são armazenadas lá. Quando você apaga "
-"eventos ou comentários, esta instrução\n"
-"      é do mesmo modo entregue a essas instâncias. A ação de se juntar a um "
-"evento é federada também. Favor manter\n"
-"      em mente que os operadores dos servidores e qualquer servidor possam "
-"ver essas mensagens e fazerem uma captura\n"
-"      e, então, compartilha-las novamente."
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -579,12 +502,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -651,12 +568,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -693,12 +604,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -723,12 +628,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -777,36 +676,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -819,13 +694,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -838,18 +706,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1367,12 +1223,156 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr "Se você apagar esta informação, você precisa entrar novamente."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+"Se você não estiver conectado, nós não armazenamos nenhuma informação no seu "
+"aparelho, a menos que você participe de um evento\n"
+"  anonimamente. Neste caso nos armazenamos o hash do UUID e o status da "
+"participação no seu navegador, de modo que nós \n"
+"  podemos exibir o status da participação. Apagando esta informação vai "
+"somente impedir de exibir o status da participação .\n"
+"  no seu navegador."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+"Nota: Estas informações são armazenadas no seu armazenamento local "
+"(localStorage) e não no seus cookies."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+"Conserve os registros do servidor que contenham o endereço IP de todas as "
+"solicitações a este servidor, de modo que permaneçam não mais que\n"
+"        90 dias."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+"Nós coletamos informações de você quando você se registra neste servidor e "
+"reunimos dados quando você participa na plataforma\n"
+"      seja lendo, escrevendo e interagindo com o conteúdo compartilhado "
+"aqui. Se você se registra neste servidor, será solicitado que \n"
+"      você insira o seu endereço de email, uma senha e pelo ao menos um nome "
+"de usuário. O seu endereço de email será verificado\n"
+"      através de um email envaido a você e contendo um link. Se esse link é "
+"visitado, nós saberemos que você controla esse endereço\n"
+"      de email. Você talvez também insira informações adicionais no seu "
+"perfil, tais como o nome a exibir e sua biografia e ainda suba \n"
+"     uma foto sua para o perfil e uma image de cabeçalho. O nome de usuário, "
+"nome a exibir, biografia, foto do perfil e imagens de \n"
+"      cabeçalho são sempre exibidas publicamente. Mas você pode, no entanto, "
+"visitar este site sem se registrar."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+"Seus eventos e comentários são entregues em outras instâncias que seguem a "
+"sua própria, isto é, eles são entregues\n"
+"      a diferentes servidores e cópias são armazenadas lá. Quando você apaga "
+"eventos ou comentários, esta instrução\n"
+"      é do mesmo modo entregue a essas instâncias. A ação de se juntar a um "
+"evento é federada também. Favor manter\n"
+"      em mente que os operadores dos servidores e qualquer servidor possam "
+"ver essas mensagens e fazerem uma captura\n"
+"      e, então, compartilha-las novamente."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/ru/LC_MESSAGES/default.po

@@ -213,18 +213,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -451,36 +439,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -493,12 +451,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -565,12 +517,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -607,12 +553,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -637,12 +577,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -691,36 +625,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -733,13 +643,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -752,18 +655,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1263,12 +1154,121 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""

priv/gettext/sv/LC_MESSAGES/default.po

@@ -218,18 +218,6 @@ msgctxt "terms"
 msgid "IPs and other metadata"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:78
-msgctxt "terms"
-msgid "If you delete these informations, you need to login again."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:87
-msgctxt "terms"
-msgid "Note: These informations are stored in your localStorage and not your cookies."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/privacy.html.eex:17
 msgctxt "terms"
@@ -451,36 +439,6 @@ msgctxt "terms"
 msgid "No. We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This does not include trusted third parties who assist us in operating our site, conducting our business, or servicing you, so long as those parties agree to keep this information confidential. We may also release your information when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or others rights, property, or safety."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:61
-msgctxt "terms"
-msgid "Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:10
-msgctxt "terms"
-msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an e-mail address, a password</b> (hashed) and at least <b>an username</b>. Your e-mail address will be verified by an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:80
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting these informations will only stop displaying participation status in your browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:19
-msgctxt "terms"
-msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to events features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and informations, and that recipients may screenshot, copy or otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:99
-msgctxt "terms"
-msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is fowarded to all the instances of all the members of the group, in so far as these members reside on a different instance than this one."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:23
 msgctxt "terms"
@@ -493,12 +451,6 @@ msgctxt "terms"
 msgid "Changes to these Terms"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:30
-msgctxt "terms"
-msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature or for some other reason."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:85
 msgctxt "terms"
@@ -565,12 +517,6 @@ msgctxt "terms"
 msgid "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:36
-msgctxt "terms"
-msgid "If you continue to use the Service after the revised Terms go into effect, then you have accepted the revised Terms."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:63
 msgctxt "terms"
@@ -607,12 +553,6 @@ msgctxt "terms"
 msgid "Use the Service in any manner that could interfere with, disrupt, negatively affect or inhibit other users from fully enjoying the Service or that could damage, disable, overburden or impair the functioning of the Service;"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:49
-msgctxt "terms"
-msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens strictly only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:47
 msgctxt "terms"
@@ -637,12 +577,6 @@ msgctxt "terms"
 msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:40
-msgctxt "terms"
-msgid "For information about how we collect and use information about users of the Service, please check out our <a href=\"/privacy\">privacy policy</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:18
 msgctxt "terms"
@@ -691,36 +625,12 @@ msgctxt "terms"
 msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:50
-msgctxt "terms"
-msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than you had intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
-msgctxt "terms"
-msgid "We will not be liable for any loss that you may incur as a result of someone else using your email or password, either with or without your knowledge."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
-msgctxt "terms"
-msgid "When you create an account you also agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:51
 msgctxt "terms"
 msgid "You can remove the content that you posted by deleting it. Once you delete your content, it will not appear on the Service, but copies of your deleted content may remain in our system or backups for some period of time. Web server access logs might also be stored for some time in the system."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:24
-msgctxt "terms"
-msgid "If you access or use the Service, it means you agree to be bound by all of the terms below. So, before you use the Service, please read all of the terms. If you don't agree to all of the terms below, please do not use the Service. Also, if a term does not make sense to you, please let us know by contacting %{contact}."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:96
 msgctxt "terms"
@@ -733,13 +643,6 @@ msgctxt "terms"
 msgid "Source code"
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/privacy.html.eex:3
-#: lib/web/templates/api/terms.html.eex:15
-msgctxt "terms"
-msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We provide <a href=\"/glossary\">a glossary</a> to help you understand them better."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:93
 msgctxt "terms"
@@ -752,18 +655,6 @@ msgctxt "terms"
 msgid "Instance administrators (and community moderators, given the relevant access) are responsible for monitoring and acting on flagged content and other user reports, and have the right and responsibility to remove or edit content that is not aligned to this Instance set of rules, or to suspend, block or ban (temporarily or permanently) any account, community, or instance for breaking these terms, or for other behaviours that they deem inappropriate, threatening, offensive, or harmful."
 msgstr ""
 
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
-msgctxt "terms"
-msgid "Our responsability"
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a french not-for-profit popular educational organization advocating for Free/Libre Software. Unless explicity stated, this Mobilizon instance is an independant service using Mobilizon's source code. You may find more informations about this instance on the <a href=\"/about/instance\">\"About this instance\" page</a>."
-msgstr ""
-
 #, elixir-format
 #: lib/web/templates/api/terms.html.eex:6
 msgctxt "terms"
@@ -1266,12 +1157,121 @@ msgstr ""
 msgid "Your instance's moderation team has decided to suspend %{group_name} (%{group_address}). You are no longer a member of this group."
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:135
 msgid "The group %{group} has been deleted on %{instance}"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/web/email/group.ex:96
 msgid "The group %{group} has been suspended on %{instance}"
 msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:24
+msgctxt "terms"
+msgid "By accessing or using the Service, this means you agree to be bound by all the terms below. If these terms are in any way unclear, please let us know by contacting %{contact}."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:40
+msgctxt "terms"
+msgid "For information about how we collect and use information about users of the Service, please check our <a href=\"/privacy\">privacy policy</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:36
+msgctxt "terms"
+msgid "If you continue to use the Service after the revised Terms go into effect, you accept the revised Terms."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
+msgctxt "terms"
+msgid "If you delete this information, you need to login again."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
+msgctxt "terms"
+msgid "If you're not connected, we don't store any information on your device, unless you participate in an event anonymously. In this specific case we store the hash of an unique identifier for the event and participation status in your browser so that we may display participation status. Deleting this information will only stop displaying participation status in your browser."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:87
+msgctxt "terms"
+msgid "Note: This information is stored in your localStorage and not your cookies."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsibility"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:61
+msgctxt "terms"
+msgid "Retain server logs containing the IP address of all requests to this server, insofar as such logs are kept, no more than 90 days."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:3
+#: lib/web/templates/api/terms.html.eex:15
+msgctxt "terms"
+msgid "Some terms, technical or otherwise, used in the text below may cover concepts that are difficult to grasp. We have provided <a href=\"/glossary\">a glossary</a> to help you understand them better."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:45
+msgctxt "terms"
+msgid "We are not liable for any loss you may incur as a result of someone else using your email or password, either with or without your knowledge."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:50
+msgctxt "terms"
+msgid "We cannot be held responsible should a programming or administrative error make your content visible to a larger audience than intended. Aside from our limited right to your content, you retain all of your rights to the content you post, link and otherwise make available on or through the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:10
+msgctxt "terms"
+msgid "We collect information from you when you register on this instance and gather data when you participate in the platform by reading, writing, and interacting with content shared here. If you register on this instance, you will be asked to enter <b>an email address, a password</b> (hashed) and at least <b>an username</b>. Your email address will be verified by an email containing a unique link. Once the link is activated, we know you control that email address. You may also enter additional profile information such as <b>a display name and biography, and upload a profile picture and header image</b>. The username, display name, biography, profile picture and header image <b>are always listed publicly</b>. <b>You may however visit this instance without registering</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
+msgctxt "terms"
+msgid "We reserve the right to modify these Terms at any time. For instance, we may need to change these Terms if we come out with a new feature."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:20
+msgctxt "terms"
+msgid "When we say “we”, “our”, or “us” in this document, we are referring to the owners, operators and administrators of this Mobilizon instance. The Mobilizon software is provided by the team of Mobilizon contributors, supported by <a href=\"https://framasoft.org\">Framasoft</a>, a French not-for-profit organization advocating for Free/Libre Software. Unless explicitly stated, this Mobilizon instance is an independent service using Mobilizon's source code. You may find more information about this instance on the <a href=\"/about/instance\">\"About this instance\"</a> page."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:43
+msgctxt "terms"
+msgid "When you create an account you agree to maintain the security and confidentiality of your password and accept all risks of unauthorized access to your account data and any other information you provide to <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:49
+msgctxt "terms"
+msgid "When you post, link or otherwise make available content to the Service, you grant us the right and license to display and distribute your content on or through the Service (including via applications). We may format your content for display throughout the Service, but we will not edit or revise the substance of your content itself. The displaying and distribution of your content happens only according to the visibility rules you have set for the content. We will not modify the visibility of the content you have set."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
+msgctxt "terms"
+msgid "Your <b>events</b> and <b>comments</b> are delivered to other instances that follow your own, meaning they are delivered to different instances and copies are stored there. When you delete events or comments, this is likewise delivered to these other instances. All interactions related to event features - such as joining an event - or group features - such as managing resources - are federated as well. Please keep in mind that the operators of the instance and any receiving instances may view such messages and information, and that recipients may screenshot, copy or otherwise re-share them."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
+msgctxt "terms"
+msgid "Your content may be downloaded by other instances in the network. Your public events and comments are delivered to the instances following your own instance. Content created through a group is forwarded to all the instances of all the members of the group, insofar as these members reside on a different instance than this one."
+msgstr ""