From f5241954bdca2778767f9368cdf40698205d6a39 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 19 Jun 2020 19:27:10 +0200
Subject: [PATCH 1/2] Improve Terms of Service
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
js/package.json | 8 +-
js/src/components/Editor.vue | 84 +-
js/src/components/Settings/SettingsMenu.vue | 12 +-
js/src/graphql/admin.ts | 15 +
js/src/graphql/config.ts | 32 +
js/src/graphql/statistics.ts | 11 +
js/src/i18n/en_US.json | 53 +-
js/src/i18n/fr_FR.json | 85 +-
js/src/router/index.ts | 51 +-
js/src/router/name.ts | 4 +
js/src/types/admin.model.ts | 11 +
js/src/types/config.model.ts | 11 +-
js/src/types/statistics.model.ts | 5 +
js/src/views/About.vue | 279 +----
js/src/views/About/AboutInstance.vue | 163 +++
js/src/views/About/AboutMobilizon.vue | 236 ++++
js/src/views/About/Glossary.vue | 86 ++
js/src/views/About/Privacy.vue | 66 +
js/src/views/{ => About}/Rules.vue | 5 +-
js/src/views/{ => About}/Terms.vue | 11 +-
js/src/views/Admin/Profiles.vue | 10 +-
js/src/views/Admin/Settings.vue | 167 ++-
js/src/views/Admin/Users.vue | 6 +
js/src/views/Settings.vue | 4 +-
js/yarn.lock | 835 ++++++-------
lib/graphql/resolvers/admin.ex | 5 +
lib/graphql/resolvers/config.ex | 19 +-
lib/graphql/resolvers/statistics.ex | 19 +
lib/graphql/schema.ex | 2 +
lib/graphql/schema/admin.ex | 16 +
lib/graphql/schema/config.ex | 15 +
lib/graphql/schema/statistics.ex | 23 +
lib/mobilizon/config.ex | 79 +-
lib/service/git_status.ex | 21 +
lib/web/templates/api/privacy.html.eex | 119 ++
lib/web/templates/api/terms.html.eex | 249 ++--
mix.lock | 5 +-
priv/gettext/ar/LC_MESSAGES/default.po | 524 ++++++--
priv/gettext/be/LC_MESSAGES/default.po | 524 ++++++--
priv/gettext/ca/LC_MESSAGES/default.po | 524 ++++++--
priv/gettext/cs/LC_MESSAGES/default.po | 524 ++++++--
priv/gettext/de/LC_MESSAGES/default.po | 524 ++++++--
priv/gettext/default.pot | 524 ++++++--
priv/gettext/en/LC_MESSAGES/default.po | 524 ++++++--
priv/gettext/es/LC_MESSAGES/default.po | 652 +++++++---
priv/gettext/fi/LC_MESSAGES/default.po | 1240 ++++++++++++-------
priv/gettext/fr/LC_MESSAGES/default.po | 836 ++++++++++---
priv/gettext/it/LC_MESSAGES/default.po | 524 ++++++--
priv/gettext/ja/LC_MESSAGES/default.po | 524 ++++++--
priv/gettext/nl/LC_MESSAGES/default.po | 524 ++++++--
priv/gettext/oc/LC_MESSAGES/default.po | 726 ++++++++---
priv/gettext/pl/LC_MESSAGES/default.po | 524 ++++++--
priv/gettext/pt/LC_MESSAGES/default.po | 524 ++++++--
priv/gettext/pt_BR/LC_MESSAGES/default.po | 644 +++++++---
priv/gettext/ru/LC_MESSAGES/default.po | 524 ++++++--
priv/gettext/sv/LC_MESSAGES/default.po | 524 ++++++--
56 files changed, 10908 insertions(+), 3348 deletions(-)
create mode 100644 js/src/graphql/statistics.ts
create mode 100644 js/src/types/statistics.model.ts
create mode 100644 js/src/views/About/AboutInstance.vue
create mode 100644 js/src/views/About/AboutMobilizon.vue
create mode 100644 js/src/views/About/Glossary.vue
create mode 100644 js/src/views/About/Privacy.vue
rename js/src/views/{ => About}/Rules.vue (89%)
rename js/src/views/{ => About}/Terms.vue (85%)
create mode 100644 lib/graphql/resolvers/statistics.ex
create mode 100644 lib/graphql/schema/statistics.ex
create mode 100644 lib/service/git_status.ex
create mode 100644 lib/web/templates/api/privacy.html.eex
diff --git a/js/package.json b/js/package.json
index 3d418dbde..f10b3f45c 100644
--- a/js/package.json
+++ b/js/package.json
@@ -36,16 +36,16 @@
"ngeohash": "^0.6.3",
"phoenix": "^1.4.11",
"register-service-worker": "^1.7.1",
- "tippy.js": "4.3.5",
+ "tippy.js": "^6.2.3",
"tiptap": "^1.26.0",
- "tiptap-extensions": "^1.28.0",
+ "tiptap-extensions": "^1.29.1",
"v-tooltip": "2.0.2",
"vue": "^2.6.11",
"vue-apollo": "^3.0.3",
"vue-class-component": "^7.2.3",
"vue-i18n": "^8.14.0",
"vue-meta": "^2.3.1",
- "vue-property-decorator": "^8.4.1",
+ "vue-property-decorator": "^9.0.0",
"vue-router": "^3.1.6",
"vue-scrollto": "^2.17.1",
"vue2-leaflet": "^2.0.3",
@@ -90,7 +90,7 @@
"prettier-eslint": "^10.1.1",
"sass-loader": "^8.0.2",
"typescript": "~3.9.3",
- "vue-cli-plugin-styleguidist": "~4.24.0",
+ "vue-cli-plugin-styleguidist": "^4.25.0",
"vue-cli-plugin-svg": "~0.1.3",
"vue-i18n-extract": "^1.0.2",
"vue-template-compiler": "^2.6.11",
diff --git a/js/src/components/Editor.vue b/js/src/components/Editor.vue
index beae1205a..43800c8fa 100644
--- a/js/src/components/Editor.vue
+++ b/js/src/components/Editor.vue
@@ -156,14 +156,21 @@
<div
v-for="(actor, index) in filteredActors"
:key="actor.id"
- class="suggestion-list__item"
+ class="media suggestion-list__item"
:class="{ 'is-selected': navigatedActorIndex === index }"
@click="selectActor(actor)"
>
- {{ actor.name }}
+ <div class="media-left">
+ <figure class="image is-16x16" v-if="actor.avatar">
+ <img :src="actor.avatar.url" alt="" />
+ </figure>
+ </div>
+ <div class="media-content">
+ {{ actor.name }}
+ </div>
</div>
</template>
- <div v-else class="suggestion-list__item is-empty">{{ $t("No actors found") }}</div>
+ <div v-else class="suggestion-list__item is-empty">{{ $t("No profiles found") }}</div>
</div>
</div>
</template>
@@ -189,7 +196,7 @@ import {
Placeholder,
Mention,
} from "tiptap-extensions";
-import tippy, { Instance } from "tippy.js";
+import tippy, { Instance, sticky } from "tippy.js";
import { SEARCH_PERSONS } from "../graphql/search";
import { Actor, IActor, IPerson } from "../types/actor";
import Image from "./Editor/Image";
@@ -226,7 +233,7 @@ export default class EditorComponent extends Vue {
navigatedActorIndex = 0;
- popup!: Instance | null;
+ popup!: Instance[] | null;
get isDescriptionMode() {
return this.mode === "description";
@@ -319,18 +326,15 @@ export default class EditorComponent extends Vue {
* is called on every keyDown event while a suggestion is active
*/
onKeyDown: ({ event }: { event: KeyboardEvent }) => {
- // pressing up arrow
- if (event.keyCode === 38) {
+ if (event.key === "ArrowUp") {
this.upHandler();
return true;
}
- // pressing down arrow
- if (event.keyCode === 40) {
+ if (event.key === "ArrowDown") {
this.downHandler();
return true;
}
- // pressing enter
- if (event.keyCode === 13) {
+ if (event.key === "Enter") {
this.enterHandler();
return true;
}
@@ -440,6 +444,7 @@ export default class EditorComponent extends Vue {
this.editor.focus();
}
+ /** We use this to programatically insert an actor mention when creating a reply to comment */
replyToComment(comment: IComment) {
const actorModel = new Actor(comment.actor);
if (!this.editor) return;
@@ -455,40 +460,31 @@ export default class EditorComponent extends Vue {
* tiptap provides a virtualNode object for using popper.js (or tippy.js) for popups
* @param node
*/
- renderPopup(node: any) {
+ renderPopup(node: Element) {
if (this.popup) {
return;
}
- this.popup = tippy(node, {
+ this.popup = tippy("#mobilizon", {
+ // @ts-ignore
+ getReferenceClientRect: node.getBoundingClientRect,
+ appendTo: () => document.body,
content: this.$refs.suggestions as HTMLElement,
trigger: "mouseenter",
interactive: true,
+ sticky: true, // make sure position of tippy is updated when content changes
+ plugins: [sticky],
+ showOnCreate: true,
theme: "dark",
placement: "top-start",
inertia: true,
duration: [400, 200],
- showOnInit: true,
- arrow: true,
- arrowType: "round",
- }) as Instance;
- // we have to update tippy whenever the DOM is updated
- if (MutationObserver) {
- this.observer = new MutationObserver(() => {
- if (this.popup != null && this.popup.popperInstance) {
- this.popup.popperInstance.scheduleUpdate();
- }
- });
- this.observer.observe(this.$refs.suggestions as HTMLElement, {
- childList: true,
- subtree: true,
- characterData: true,
- });
- }
+ }) as Instance[];
}
destroyPopup() {
if (this.popup) {
- this.popup.destroy();
+ // @ts-ignore
+ this.popup[0].destroy();
this.popup = null;
}
if (this.observer) {
@@ -517,6 +513,7 @@ export default class EditorComponent extends Vue {
beforeDestroy() {
if (!this.editor) return;
+ this.destroyPopup();
this.editor.destroy();
}
}
@@ -733,32 +730,19 @@ $color-white: #eee;
opacity: 0.5;
}
}
+
+ .media + .media {
+ margin-top: 0;
+ padding-top: 0;
+ }
}
-.tippy-tooltip.dark-theme {
+.tippy-box[data-theme~="dark"] {
background-color: $color-black;
padding: 0;
font-size: 1rem;
text-align: inherit;
color: $color-white;
border-radius: 5px;
- .tippy-backdrop {
- display: none;
- }
- .tippy-roundarrow {
- fill: $color-black;
- }
- .tippy-popper[x-placement^="top"] & .tippy-arrow {
- border-top-color: $color-black;
- }
- .tippy-popper[x-placement^="bottom"] & .tippy-arrow {
- border-bottom-color: $color-black;
- }
- .tippy-popper[x-placement^="left"] & .tippy-arrow {
- border-left-color: $color-black;
- }
- .tippy-popper[x-placement^="right"] & .tippy-arrow {
- border-right-color: $color-black;
- }
}
.visually-hidden {
diff --git a/js/src/components/Settings/SettingsMenu.vue b/js/src/components/Settings/SettingsMenu.vue
index 8084e8238..419ce3f3b 100644
--- a/js/src/components/Settings/SettingsMenu.vue
+++ b/js/src/components/Settings/SettingsMenu.vue
@@ -1,7 +1,13 @@
<template>
- <ul>
- <SettingMenuSection v-for="section in menuValue" :key="section.title" :menu-section="section" />
- </ul>
+ <aside>
+ <ul>
+ <SettingMenuSection
+ v-for="section in menuValue"
+ :key="section.title"
+ :menu-section="section"
+ />
+ </ul>
+ </aside>
</template>
<script lang="ts">
import { Component, Prop, Vue } from "vue-property-decorator";
diff --git a/js/src/graphql/admin.ts b/js/src/graphql/admin.ts
index 478c63a45..742a29391 100644
--- a/js/src/graphql/admin.ts
+++ b/js/src/graphql/admin.ts
@@ -108,9 +108,14 @@ export const ADMIN_SETTINGS_FRAGMENT = gql`
fragment adminSettingsFragment on AdminSettings {
instanceName
instanceDescription
+ instanceLongDescription
+ contact
instanceTerms
instanceTermsType
instanceTermsUrl
+ instancePrivacyPolicy
+ instancePrivacyPolicyType
+ instancePrivacyPolicyUrl
instanceRules
registrationsOpen
}
@@ -129,18 +134,28 @@ export const SAVE_ADMIN_SETTINGS = gql`
mutation SaveAdminSettings(
$instanceName: String
$instanceDescription: String
+ $instanceLongDescription: String
+ $contact: String
$instanceTerms: String
$instanceTermsType: InstanceTermsType
$instanceTermsUrl: String
+ $instancePrivacyPolicy: String
+ $instancePrivacyPolicyType: InstancePrivacyType
+ $instancePrivacyPolicyUrl: String
$instanceRules: String
$registrationsOpen: Boolean
) {
saveAdminSettings(
instanceName: $instanceName
instanceDescription: $instanceDescription
+ instanceLongDescription: $instanceLongDescription
+ contact: $contact
instanceTerms: $instanceTerms
instanceTermsType: $instanceTermsType
instanceTermsUrl: $instanceTermsUrl
+ instancePrivacyPolicy: $instancePrivacyPolicy
+ instancePrivacyPolicyType: $instancePrivacyPolicyType
+ instancePrivacyPolicyUrl: $instancePrivacyPolicyUrl
instanceRules: $instanceRules
registrationsOpen: $registrationsOpen
) {
diff --git a/js/src/graphql/config.ts b/js/src/graphql/config.ts
index 0103d20b4..90ab6ef8e 100644
--- a/js/src/graphql/config.ts
+++ b/js/src/graphql/config.ts
@@ -78,6 +78,26 @@ export const TERMS = gql`
}
`;
+export const ABOUT = gql`
+ query About {
+ config {
+ name
+ description
+ longDescription
+ contact
+ registrationsOpen
+ registrationsWhitelist
+ anonymous {
+ participation {
+ allowed
+ }
+ }
+ version
+ federating
+ }
+ }
+`;
+
export const RULES = gql`
query Rules {
config {
@@ -86,6 +106,18 @@ export const RULES = gql`
}
`;
+export const PRIVACY = gql`
+ query Privacy($locale: String) {
+ config {
+ privacy(locale: $locale) {
+ type
+ url
+ bodyHtml
+ }
+ }
+ }
+`;
+
export const TIMEZONES = gql`
query {
config {
diff --git a/js/src/graphql/statistics.ts b/js/src/graphql/statistics.ts
new file mode 100644
index 000000000..2bef730ca
--- /dev/null
+++ b/js/src/graphql/statistics.ts
@@ -0,0 +1,11 @@
+import gql from "graphql-tag";
+
+export const STATISTICS = gql`
+ query {
+ statistics {
+ numberOfUsers
+ numberOfEvents
+ numberOfComments
+ }
+ }
+`;
diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json
index 5508375ac..10a4595c3 100644
--- a/js/src/i18n/en_US.json
+++ b/js/src/i18n/en_US.json
@@ -87,7 +87,6 @@
"Date and time settings": "Date and time settings",
"Date parameters": "Date parameters",
"Date": "Date",
- "Default Mobilizon.org terms": "Default Mobilizon.org terms",
"Default": "Default",
"Delete Comment": "Delete Comment",
"Delete Event": "Delete Event",
@@ -120,7 +119,6 @@
"Email": "Email",
"Ends on…": "Ends on…",
"Enter the link URL": "Enter the link URL",
- "Enter your own terms. HTML tags allowed. Mobilizon.org's terms are provided as template.": "Enter your own terms. HTML tags allowed. Mobilizon.org's terms are provided as template.",
"Error while changing email": "Error while changing email",
"Error while communicating with the server.": "Error while communicating with the server.",
"Error while saving report.": "Error while saving report.",
@@ -184,7 +182,6 @@
"Impossible to login, your email or password seems incorrect.": "Impossible to login, your email or password seems incorrect.",
"In the meantime, please consider that the software is not (yet) finished. More information {onBlog}.": "In the meantime, please consider that the software is not (yet) finished. More information {onBlog}.",
"Installing Mobilizon will allow communities to free themselves from the services of tech giants by creating <b>their own event platform</b>.": "Installing Mobilizon will allow communities to free themselves from the services of tech giants by creating <b>their own event platform</b>.",
- "Instance Description": "Instance Description",
"Instance Name": "Instance Name",
"Instance Terms Source": "Instance Terms Source",
"Instance Terms URL": "Instance Terms URL",
@@ -227,7 +224,6 @@
"New password": "New password",
"New profile": "New profile",
"Next page": "Next page",
- "No actors found": "No actors found",
"No address defined": "No address defined",
"No closed reports yet": "No closed reports yet",
"No comment": "No comment",
@@ -651,5 +647,52 @@
"Forgot your password?": "Forgot your password?",
"Enter your email address below, and we'll email you instructions on how to change your password.": "Enter your email address below, and we'll email you instructions on how to change your password.",
"Submit": "Submit",
- "Email address": "Email address"
+ "Email address": "Email address",
+ "Legal": "Legal",
+ "Terms of service": "Terms of service",
+ "Privacy policy": "Privacy policy",
+ "Instance rules": "Instance rules",
+ "Glossary": "Glossary",
+ "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:": "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:",
+ "Instance": "Instance",
+ "Mobilizon software": "Mobilizon software",
+ "Instance administrator": "Instance administrator",
+ "The instance administrator is the person or entity that runs this Mobilizon instance.": "The instance administrator is the person or entity that runs this Mobilizon instance.",
+ "Application": "Application",
+ "In the following context, an application is a software, either provided by the Mobilizon team or by a 3rd-party, used to interact with your instance.": "In the following context, an application is a software, either provided by the Mobilizon team or by a 3rd-party, used to interact with your instance.",
+ "API": "API",
+ "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",
+ "Who published {number} events": "Who published {number} events",
+ "And {number} comments": "And {number} comments",
+ "Instance configuration": "Instance configuration",
+ "Mobilizon version": "Mobilizon version",
+ "Registrations": "Registrations",
+ "Restricted": "Restricted",
+ "Enabled": "Enabled",
+ "If allowed by organizer": "If allowed by organizer",
+ "Instance Privacy Policy Source": "Instance Privacy Policy Source",
+ "default Mobilizon privacy policy": "default Mobilizon privacy policy",
+ "Set an URL to a page with your own privacy policy.": "Set an URL to a page with your own privacy policy.",
+ "Instance Privacy Policy URL": "Instance Privacy Policy URL",
+ "Instance Privacy Policy": "Instance Privacy Policy",
+ "The {default_privacy_policy} will be used. They will be translated in the user's language.": "The {default_privacy_policy} will be used. They will be translated in the user's language.",
+ "Enter your own terms. HTML tags allowed. The {mobilizon_terms} are provided as template.": "Enter your own terms. HTML tags allowed. The {mobilizon_terms} are provided as template.",
+ "Enter your own privacy policy. HTML tags allowed. The {mobilizon_privacy_policy} is provided as template.": "Enter your own privacy policy. HTML tags allowed. The {mobilizon_privacy_policy} is provided as template.",
+ "Default Mobilizon terms": "Default Mobilizon terms",
+ "Default Mobilizon privacy policy": "Default Mobilizon privacy policy",
+ "NOTE! The default terms have not been checked over by a lawyer and thus are unlikely to provide full legal protection for all situations for an instance admin using them. They are also not specific to all countries and jurisdictions. If you are unsure, please check with a lawyer.": "NOTE! The default terms have not been checked over by a lawyer and thus are unlikely to provide full legal protection for all situations for an instance admin using them. They are also not specific to all countries and jurisdictions. If you are unsure, please check with a lawyer.",
+ "Instance Short Description": "Instance Short Description",
+ "Instance Long Description": "Instance Long Description",
+ "Displayed on homepage and meta tags. Describe what Mobilizon is and what makes this instance special in a single paragraph.": "Displayed on homepage and meta tags. Describe what Mobilizon is and what makes this instance special in a single paragraph.",
+ "A place to explain who you are and the things that set your instance apart. You can use HTML tags.": "A place to explain who you are and the things that set your instance apart. You can use HTML tags.",
+ "A place for your code of conduct, rules or guidelines. You can use HTML tags.": "A place for your code of conduct, rules or guidelines. You can use HTML tags.",
+ "contact uninformed": "contact uninformed",
+ "Can be an email or a link, or just plain text.": "Can be an email or a link, or just plain text.",
+ "No profiles found": "No profiles found"
}
diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json
index 8627d864f..22ce64616 100644
--- a/js/src/i18n/fr_FR.json
+++ b/js/src/i18n/fr_FR.json
@@ -25,7 +25,6 @@
"Add to my calendar": "Ajouter à mon agenda",
"Additional comments": "Commentaires additionnels",
"Admin": "Admin",
- "Admin settings": "Paramètres administrateur",
"Admin settings successfully saved.": "Les paramètres administrateur ont bien été sauvegardés.",
"Administration": "Administration",
"All group members and other eventual server admins will still be able to view this information.": "Tous les membres du groupes et les administrateur·ices d'éventuels autres serveurs seront toujours en capacité de voir cette information.",
@@ -51,7 +50,6 @@
"Bold": "Gras",
"By @{group}": "Par @{group}",
"By @{username}": "Par @{username}",
- "By @{username} and @{group}": "Par @{username} et @{group}",
"By {username} and {group}": "Par {username} et {group}",
"Cancel": "Annuler",
"Cancel anonymous participation": "Annuler ma participation anonyme",
@@ -65,19 +63,16 @@
"Change my email": "Changer mon adresse e-mail",
"Change my identity…": "Changer mon identité…",
"Change my password": "Modifier mon mot de passe",
- "Change password": "Modifier mot de passe",
"Clear": "Effacer",
"Click to select": "Cliquez pour sélectionner",
"Click to upload": "Cliquez pour uploader",
"Close": "Fermé",
"Close comments for all (except for admins)": "Fermer les commentaires à tout le monde (excepté les administrateur⋅ices)",
"Closed": "Fermé",
- "Collections": "Collections",
"Comment deleted": "Commentaire supprimé",
"Comment from @{username} reported": "Commentaire de @{username} signalé",
"Comments": "Commentaires",
"Comments have been closed.": "Les commentaires sont fermés.",
- "Comments on the event page": "Commentaires sur la page de l'événement",
"Confirm my participation": "Confirmer ma participation",
"Confirm my particpation": "Confirmer ma participation",
"Confirmed: Will happen": "Confirmé : aura lieu",
@@ -92,11 +87,9 @@
"Create a new group": "Créer un nouveau groupe",
"Create a new identity": "Créer une nouvelle identité",
"Create a new list": "Créer une nouvelle liste",
- "Create a new task list": "Créer une nouvelle liste de tâches",
"Create a pad": "Créer un pad",
"Create a visioconference": "Créer une visio-conférence",
"Create and manage several identities from the same account": "Créer et gérer plusieurs identités sur un même compte",
- "Create folder": "Créer un dossier",
"Create group": "Créer un groupe",
"Create my event": "Créer mon évènement",
"Create my group": "Créer mon groupe",
@@ -116,8 +109,7 @@
"Date and time settings": "Paramètres de date et d'heure",
"Date parameters": "Paramètres de date",
"Decline": "Refuser",
- "Default": "Default",
- "Default Mobilizon.org terms": "Conditions d'utilisation par défaut de Mobilizon.org",
+ "Default": "Défaut",
"Delete": "Supprimer",
"Delete Comment": "Supprimer le commentaire",
"Delete Event": "Supprimer l'évènement",
@@ -153,9 +145,7 @@
"Either the participation has already been validated, either the validation token is incorrect.": "Soit la participation a déjà été validée, soit le jeton de validation est incorrect.",
"Email": "Email",
"Ends on…": "Se termine le…",
- "Enjoy discovering Mobilizon!": "Amusez-vous bien en découvrant Mobilizon !",
"Enter the link URL": "Entrez l'URL du lien",
- "Enter your own terms. HTML tags allowed. Mobilizon.org's terms are provided as template.": "Entrez vos propres conditions d'utilisations. Les balises HTML sont autorisées. Les conditions d'utilisation par défaut de Mobilizon.org sont fournies comme modèle.",
"Error while changing email": "Erreur lors de la modification de l'adresse email",
"Error while communicating with the server.": "Erreur de communication avec le serveur.",
"Error while saving report.": "Erreur lors de l'enregistrement du signalement.",
@@ -222,11 +212,9 @@
"If an account with this email exists, we just sent another confirmation email to {email}": "Si un compte avec un tel email existe, nous venons juste d'envoyer un nouvel email de confirmation à {email}",
"If this identity is the only administrator of some groups, you need to delete them before being able to delete this identity.": "Si cette identité est la seule administratrice de certains groupes, vous devez les supprimer avant de pouvoir supprimer cette identité.",
"If you want, you may send a message to the event organizer here.": "Si vous le désirez, vous pouvez laisser un message pour l'organisateur⋅ice de l'événement ci-dessous.",
- "Important event updates": "Mises à jour importantes des événements",
"Impossible to login, your email or password seems incorrect.": "Impossible de se connecter, votre email ou bien votre mot de passe semble incorrect.",
"In the meantime, please consider that the software is not (yet) finished. More information {onBlog}.": "D'ici là, veuillez considérer que le logiciel n'est pas (encore) fini. Plus d'informations {onBlog}.",
"Installing Mobilizon will allow communities to free themselves from the services of tech giants by creating <b>their own event platform</b>.": "Installer Mobilizon permettra à des collectifs de s’émanciper des outils des géants du web en créant <b>leur propre plateforme d’évènements</b>.",
- "Instance Description": "Description de l'instance",
"Instance Name": "Nom de l'instance",
"Instance Terms": "Conditions générales de l'instance",
"Instance Terms Source": "Source des conditions d'utilisation de l'instance",
@@ -246,7 +234,6 @@
"Leaving event \"{title}\"": "Annuler ma participation à l'évènement",
"Let's create a new common": "Créons un nouveau Common",
"License": "Licence",
- "Like title update, start or end date change, event being confirmed or cancelled.": "Comme le changement du titre de l'événement, de sa date de début ou de fin, ou bien qu'il soit confirmé ou bien annulé.",
"Limited number of places": "Nombre de places limité",
"List title": "Titre de la liste",
"Load more": "Voir plus",
@@ -263,7 +250,6 @@
"Message": "Message",
"Mobilizon is a federated network. You can interact with this event from a different server.": "Mobilizon est un réseau fédéré. Vous pouvez interagir avec cet événement depuis un serveur différent.",
"Mobilizon is a free/libre software that will allow communities to create <b>their own spaces</b> to publish events in order to better emancipate themselves from tech giants.": "Mobilizon est un logiciel libre qui permettra à des communautés de <b>créer leurs propres espaces</b> de publication d’évènements, afin de mieux s’émanciper des géants du web.",
- "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 first half of 2020</b>.": "Mobilizon est en cours de développement, nous ajouterons de nouvelles fonctionnalités à ce site lors de mises à jour régulières, jusqu'à la publication de <b>la version 1 du logiciel au premier semestre 2020</b>.",
"Mobilizon’s licence": "La licence de Mobilizon",
"Moderated comments (shown after approval)": "Commentaires modérés (affichés après validation)",
"Moderation": "Modération",
@@ -282,7 +268,7 @@
"New password": "Nouveau mot de passe",
"New profile": "Nouveau profil",
"Next page": "Page suivante",
- "No actors found": "Aucun acteur trouvé",
+ "No profiles found": "Aucun profil trouvé",
"No address defined": "Aucune adresse définie",
"No closed reports yet": "Aucun signalement fermé pour le moment",
"No comment": "Pas de commentaire",
@@ -297,12 +283,10 @@
"No instance to remove|Remove instance|Remove {number} instances": "Pas d'instances à supprimer|Supprimer une instance|Supprimer {number} instances",
"No message": "Pas de message",
"No moderation logs yet": "Pas encore de journaux de modération",
- "No notification settings yet": "Pas encore de paramètres de notification",
"No one is going to this event": "Personne n'a va encore|Une personne y va|{going} personnes y vont",
"No open reports yet": "Aucun signalement ouvert pour le moment",
"No participant to approve|Approve participant|Approve {number} participants": "Aucun⋅e participant⋅e à valider|Valider le ou la participant⋅e|Valider {number} participant⋅es",
"No participant to reject|Reject participant|Reject {number} participants": "Aucun⋅e participant⋅e à refuser|Refuser le ou la participant⋅e|Refuser {number} participant⋅es",
- "No preferences yet": "Pas encore de préférences",
"No public upcoming events": "Aucun événement public à venir",
"No resolved reports yet": "Aucun signalement résolu pour le moment",
"No resources selected": "Aucune ressource sélectionnée|Une ressource sélectionnée|{count} ressources sélectionnées",
@@ -319,7 +303,6 @@
"On {date} ending at {endTime}": "Le {date}, se terminant à {endTime}",
"On {date} from {startTime} to {endTime}": "Le {date} de {startTime} à {endTime}",
"On {date} starting at {startTime}": "Le {date} à partir de {startTime}",
- "One person is going": "Personne n'y va | Une personne y va | {approved} personnes y vont",
"Ongoing tasks": "Tâches en cours",
"Only accessible through link (private)": "Uniquement accessible par lien (privé)",
"Only alphanumeric characters and underscores are supported.": "Seuls les caractères alphanumériques et les tirets bas sont acceptés.",
@@ -347,7 +330,6 @@
"Participation requested!": "Participation demandée !",
"Password": "Mot de passe",
"Password (confirmation)": "Mot de passe (confirmation)",
- "Password change": "Changement de mot de passe",
"Password reset": "Réinitialisation du mot de passe",
"Past events": "Événements passés",
"Pending": "En attente",
@@ -357,9 +339,7 @@
"Please contact this instance's Mobilizon admin if you think this is a mistake.": "Veuillez contacter l'administrateur⋅ice de cette instance Mobilizon si vous pensez qu’il s’agit d’une erreur.",
"Please enter your password to confirm this action.": "Merci d'entrer votre mot de passe pour confirmer cette action.",
"Please make sure the address is correct and that the page hasn't been moved.": "Assurez‐vous que l’adresse est correcte et que la page n’a pas été déplacée.",
- "Please read the full rules": "Merci de lire les règles complètes",
"Please refresh the page and retry.": "Merci de rafraîchir la page puis réessayer.",
- "Please type at least 5 characters": "Merci d'entrer au moins 5 caractères",
"Post a comment": "Ajouter un commentaire",
"Post a public message": "Poster un message public",
"Post a reply": "Envoyer une réponse",
@@ -393,7 +373,6 @@
"Registrations are restricted by whitelisting.": "Les inscriptions sont restreintes par liste blanche.",
"Reject": "Rejeter",
"Rejected": "Rejetés",
- "Rejected participations": "Participations rejetées",
"Rename": "Renommer",
"Rename resource": "Renommer la resource",
"Reopen": "Réouvrir",
@@ -407,7 +386,6 @@
"Reported by {reporter}": "Signalé par {reporter}",
"Reported identity": "Identité signalée",
"Reports": "Signalements",
- "Requests": "Requêtes",
"Resend confirmation email": "Envoyer à nouveau l'email de confirmation",
"Reset my password": "Réinitialiser mon mot de passe",
"Resolved": "Résolu",
@@ -422,8 +400,6 @@
"Searching…": "Recherche en cours…",
"Select a timezone": "Selectionnez un fuseau horaire",
"Send email": "Envoyer un email",
- "Send me an email to reset my password": "Envoyez-moi un email pour réinitialiser mon mot de passe",
- "Send me the confirmation email once again": "Envoyez-moi l'email de confirmation encore une fois",
"Send the report": "Envoyer le signalement",
"Set an URL to a page with your own terms.": "Entrez une URL vers une page web avec vos propres conditions d'utilisation.",
"Settings": "Paramètres",
@@ -482,7 +458,7 @@
"Title": "Titre",
"To achieve your registration, please create a first identity profile.": "Pour finir votre inscription, veuillez créer un premier profil.",
"To change the world, change the software": "Changer de logiciel pour changer le monde",
- "To confirm, type your event title \"{eventTitle}\"": "Pour confirmer, entrez le titre de l'évènement « {eventTitle} »",
+ "To confirm, type your event title \"{eventTitle}\"": "Pour confirmer, entrez le titre de l'évènement « {eventTitle} »",
"To confirm, type your identity username \"{preferredUsername}\"": "Pour confirmer, entrez le nom de l’identité « {preferredUsername} »",
"Transfer to {outsideDomain}": "Transférer à {outsideDomain}",
"Type": "Type",
@@ -511,7 +487,6 @@
"View page on {hostname} (in a new window)": "Voir la page sur {hostname} (dans une nouvelle fenêtre)",
"Visible everywhere on the web (public)": "Visible partout sur le web (public)",
"Waiting for organization team approval.": "En attente d'approbation par l'organisation.",
- "Waiting list": "Liste d'attente",
"Warning": "Attention",
"We just sent an email to {email}": "Nous venons d'envoyer un email à {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>.": "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>.",
@@ -523,14 +498,11 @@
"Website / URL": "Site web / URL",
"Welcome back {username}!": "Bon retour {username} !",
"Welcome back!": "Bon retour !",
- "Welcome on your administration panel": "Bienvenue sur votre espace d'administration",
"Welcome to Mobilizon, {username}!": "Bienvenue sur Mobilizon, {username} !",
"Who can view this event and participate": "Qui peut voir cet évènement et y participer",
"World map": "Carte mondiale",
"Write something…": "Écrivez quelque chose…",
- "You and one other person are going to this event": "Vous êtes le ou la seul⋅e à vous rendre à cet évènement | Vous et une autre personne vous rendez à cet évènement | Vous et {approved} autres personnes vous rendez à cet évènement.",
"You are already a participant of this event.": "Vous participez déjà à cet évènement.",
- "You are already logged-in.": "Vous êtes déjà connecté.",
"You are participating in this event anonymously": "Vous participez à cet événement anonymement",
"You are participating in this event anonymously but didn't confirm participation": "Vous participez à cet événement anonymement mais vous n'avez pas confirmé votre participation",
"You can add tags by hitting the Enter key or by adding a comma": "Vous pouvez ajouter des tags en appuyant sur la touche Entrée ou bien en ajoutant une virgule",
@@ -561,8 +533,6 @@
"Your email is not whitelisted, you can't register.": "Votre email n'est pas sur la liste blanche, vous ne pouvez pas vous inscrire.",
"Your email will only be used to confirm that you're a real person and send you eventual updates for this event. It will NOT be transmitted to other instances or to the event organizer.": "Votre email sera uniquement utilisé pour confirmer que vous êtes bien une personne réelle et vous envoyer des éventuelles mises à jour pour cet événement. Il ne sera PAS transmis à d'autres instances ou à l'organisateur de l'événement.",
"Your federated identity": "Votre identité fédérée",
- "Your federated identity profile@instance": "Votre identité fédérée profil@instance",
- "Your local administrator resumed its policy:": "Votre administrateur⋅ice local a résumé sa politique ainsi :",
"Your participation has been confirmed": "Votre participation a été confirmée",
"Your participation has been rejected": "Votre participation a été rejettée",
"Your participation has been requested": "Votre participation a été demandée",
@@ -633,7 +603,6 @@
"Local": "Local·e",
"User": "Utilisateur·ice",
"{profile} (by default)": "{profile} (par défault)",
- "Locale": "Locale",
"Confirmed": "Confirmé·e",
"Confirmed at": "Confirmé·e à",
"Language": "Langue",
@@ -679,5 +648,51 @@
"Forgot your password?": "Mot de passe oublié ?",
"Enter your email address below, and we'll email you instructions on how to change your password.": "Indiquez votre adresse e-mail ci-dessous. Nous vous enverrons des instructions concernant la modification de votre mot de passe.",
"Submit": "Valider",
- "Email address": "Adresse email"
+ "Email address": "Adresse email",
+ "Legal": "Légal",
+ "Terms of service": "Conditions d'utilisation",
+ "Privacy policy": "Politique de confidentialité",
+ "Instance rules": "Règles de l'instance",
+ "Glossary": "Glossaire",
+ "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 :",
+ "Instance": "Instance",
+ "Mobilizon software": "logiciel Mobilizon",
+ "Instance administrator": "Administrateur·ice de l'instance",
+ "The instance administrator is the person or entity that runs this Mobilizon instance.": "L'administrateur·ice de l'instance est la personne ou entité qui gère cette instance Mobilizon.",
+ "Application": "Application",
+ "In the following context, an application is a software, either provided by the Mobilizon team or by a 3rd-party, used to interact with your instance.": "Dans le contexte suivant, une application est un logiciel, fourni par l'équipe Mobilizon ou bien une tierce partie, utilisé pour interagir avec votre instance.",
+ "API": "API",
+ "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.": "Une « interface de programmation d'application » ou « API » est un protocole de communication qui permet à des composants logiciels de communiquer entre eux. L'API de Mobilizon, par exemple, peut permettre à des outils logiciels tiers de communiquer avec des instances de Mobilizon pour effectuer certaines actions, comme la publication d'événements en votre nom, automatiquement et à distance.",
+ "SSL/TLS": "SSL/TLS",
+ "Cookies and Local storage": "Cookies et stockage local",
+ "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.",
+ "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.": "Une instance est une version du logiciel Mobilizon fonctionnant sur un serveur. Une instance peut être gérée par n'importe qui avec le {mobilizon_software} ou d'autres applications fédérées, correspondant au « fediverse ». Cette instance se nomme {instance_name}. Mobilizon est un réseau fédéré de multiples instances (tout comme des serveurs email), des utilisateur·ices inscrites sur différentes instances peuvent communiquer bien qu'iels ne se soient pas enregistré·es sur la même 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 et son successeur TLS sont des technologies de chiffrement qui permettent de sécuriser les communications de données lors de l'utilisation du service. Vous pouvez reconnaître une connexion chiffrée dans la barre d'adresse de votre navigateur lorsque l'URL commence par {https} et que l'icône du cadenas est affichée dans la barre d'adresse de votre navigateur.",
+ "Home to {number} users": "Abrite {number} utilisateur·ices",
+ "Who published {number} events": "Ayant publié {number} événements",
+ "And {number} comments": "Et {number} commentaires",
+ "Instance configuration": "Configuration de l'instance",
+ "Mobilizon version": "Version de Mobilizon",
+ "Registrations": "Inscriptions",
+ "Restricted": "Restreintes",
+ "Enabled": "Activé",
+ "If allowed by organizer": "Si autorisé par l'organisateur·ice",
+ "Default Mobilizon terms": "Conditions d'utilisation par défaut de Mobilizon",
+ "Instance Privacy Policy Source": "Source de la politique de confidentialité de l'instance",
+ "Default Mobilizon privacy policy": "Politique de confidentialité par défaut de Mobilizon",
+ "default Mobilizon privacy policy": "politique de confidentialité par défaut de Mobilizon",
+ "Set an URL to a page with your own privacy policy.": "Entrez une URL vers une page web avec votre propre politique de confidentialité.",
+ "Instance Privacy Policy URL": "URL de la politique de confidentialité de l'instance",
+ "Instance Privacy Policy": "Politique de confidentialité de l'instance",
+ "Enter your own terms. HTML tags allowed. The {mobilizon_terms} are provided as template.": "Entrez vos propres conditions d'utilisation. Les balises HTML sont autorisées. Les {mobilizon_terms} sont fournies comme modèle.",
+ "Enter your own privacy policy. HTML tags allowed. The {mobilizon_privacy_policy} is provided as template.": "Entrez votre propre politique de confidentialité. Les balises HTML sont autorisées. La {mobilizon_privacy_policy} est fournie comme modèle.",
+ "The {default_privacy_policy} will be used. They will be translated in the user's language.": "La {default_privacy_policy} sera utilisée. Elle sera traduite dans la langue de l'utilisateur·ice",
+ "NOTE! The default terms have not been checked over by a lawyer and thus are unlikely to provide full legal protection for all situations for an instance admin using them. They are also not specific to all countries and jurisdictions. If you are unsure, please check with a lawyer.": "REMARQUE : les conditions par défaut n'ont pas été vérifiées par un juriste et ne sont donc susceptibles de ne pas offrir une protection juridique complète dans toutes les situations pour un·e administrateur·ice d'instance qui les utilise. Elles ne sont pas non plus spécifiques à tous les pays et juridictions. Si vous n'êtes pas sûr, veuillez consulter un juriste.",
+ "Instance Short Description": "Description courte de l'instance",
+ "Instance Long Description": "Description longue de l'instance",
+ "Displayed on homepage and meta tags. Describe what Mobilizon is and what makes this instance special in a single paragraph.": "Affichée sur la page d'accueil et dans les balises meta. Décrivez ce qu'est Mobilizon et ce qui rend spécifique cette instance en un seul paragraphe.",
+ "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 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.",
+ "contact uninformed": "contact non renseigné",
+ "Can be an email or a link, or just plain text.": "Peut être une adresse email ou bien un lien, ou alors du simple texte brut."
}
diff --git a/js/src/router/index.ts b/js/src/router/index.ts
index 82590eadf..e7cce702c 100644
--- a/js/src/router/index.ts
+++ b/js/src/router/index.ts
@@ -66,18 +66,45 @@ const router = new Router({
name: RouteName.ABOUT,
component: () => import(/* webpackChunkName: "about" */ "@/views/About.vue"),
meta: { requiredAuth: false },
- },
- {
- path: "/terms",
- name: RouteName.TERMS,
- component: () => import(/* webpackChunkName: "cookies" */ "@/views/Terms.vue"),
- meta: { requiredAuth: false },
- },
- {
- path: "/rules",
- name: RouteName.RULES,
- component: () => import(/* webpackChunkName: "cookies" */ "@/views/Rules.vue"),
- meta: { requiredAuth: false },
+ redirect: { name: RouteName.ABOUT_INSTANCE },
+ children: [
+ {
+ path: "mobilizon",
+ name: RouteName.ABOUT_MOBILIZON,
+ component: () =>
+ import(/* webpackChunkName: "about" */ "@/views/About/AboutMobilizon.vue"),
+ },
+ {
+ path: "instance",
+ name: RouteName.ABOUT_INSTANCE,
+ component: () =>
+ import(/* webpackChunkName: "about" */ "@/views/About/AboutInstance.vue"),
+ },
+ {
+ path: "/terms",
+ name: RouteName.TERMS,
+ component: () => import(/* webpackChunkName: "cookies" */ "@/views/About/Terms.vue"),
+ meta: { requiredAuth: false },
+ },
+ {
+ path: "/privacy",
+ name: RouteName.PRIVACY,
+ component: () => import(/* webpackChunkName: "cookies" */ "@/views/About/Privacy.vue"),
+ meta: { requiredAuth: false },
+ },
+ {
+ path: "/rules",
+ name: RouteName.RULES,
+ component: () => import(/* webpackChunkName: "cookies" */ "@/views/About/Rules.vue"),
+ meta: { requiredAuth: false },
+ },
+ {
+ path: "/glossary",
+ name: RouteName.GLOSSARY,
+ component: () => import(/* webpackChunkName: "cookies" */ "@/views/About/Glossary.vue"),
+ meta: { requiredAuth: false },
+ },
+ ],
},
{
path: "/interact",
diff --git a/js/src/router/name.ts b/js/src/router/name.ts
index 72e7e0970..72243e1f3 100644
--- a/js/src/router/name.ts
+++ b/js/src/router/name.ts
@@ -9,9 +9,13 @@ import { UserRouteName } from "./user";
enum GlobalRouteName {
HOME = "Home",
ABOUT = "About",
+ ABOUT_MOBILIZON = "ABOUT_MOBILIZON",
+ ABOUT_INSTANCE = "ABOUT_INSTANCE",
PAGE_NOT_FOUND = "PageNotFound",
SEARCH = "Search",
TERMS = "TERMS",
+ PRIVACY = "PRIVACY",
+ GLOSSARY = "GLOSSARY",
INTERACT = "INTERACT",
RULES = "RULES",
}
diff --git a/js/src/types/admin.model.ts b/js/src/types/admin.model.ts
index 01c929a21..6791ec120 100644
--- a/js/src/types/admin.model.ts
+++ b/js/src/types/admin.model.ts
@@ -14,12 +14,23 @@ export enum InstanceTermsType {
CUSTOM = "CUSTOM",
}
+export enum InstancePrivacyType {
+ DEFAULT = "DEFAULT",
+ URL = "URL",
+ CUSTOM = "CUSTOM",
+}
+
export interface IAdminSettings {
instanceName: string;
instanceDescription: string;
+ instanceLongDescription: string;
+ contact: string;
instanceTerms: string;
instanceTermsType: InstanceTermsType;
instanceTermsUrl: string | null;
+ instancePrivacyPolicy: string;
+ instancePrivacyPolicyType: InstanceTermsType;
+ instancePrivacyPolicyUrl: string | null;
instanceRules: string;
registrationsOpen: boolean;
}
diff --git a/js/src/types/config.model.ts b/js/src/types/config.model.ts
index 7ec0be70a..61f0aaad9 100644
--- a/js/src/types/config.model.ts
+++ b/js/src/types/config.model.ts
@@ -1,9 +1,11 @@
-import { InstanceTermsType } from "./admin.model";
+import { InstanceTermsType, InstancePrivacyType } from "./admin.model";
import { IProvider } from "./resource";
export interface IConfig {
name: string;
description: string;
+ longDescription: string;
+ contact: string;
registrationsOpen: boolean;
registrationsWhitelist: boolean;
@@ -59,10 +61,17 @@ export interface IConfig {
type: InstanceTermsType;
url: string;
};
+ privacy: {
+ bodyHtml: string;
+ type: InstancePrivacyType;
+ url: string;
+ };
rules: string;
resourceProviders: IProvider[];
timezones: string[];
features: {
groups: boolean;
};
+ federating: boolean;
+ version: string;
}
diff --git a/js/src/types/statistics.model.ts b/js/src/types/statistics.model.ts
new file mode 100644
index 000000000..e30f2ccf7
--- /dev/null
+++ b/js/src/types/statistics.model.ts
@@ -0,0 +1,5 @@
+export interface IStatistics {
+ numberOfUsers: number;
+ numberOfEvents: number;
+ numberOfComments: number;
+}
diff --git a/js/src/views/About.vue b/js/src/views/About.vue
index dc574f9e2..e39ccbd0d 100644
--- a/js/src/views/About.vue
+++ b/js/src/views/About.vue
@@ -1,17 +1,15 @@
<template>
<div>
- <div class="hero intro is-medium is-primary">
+ <div class="hero intro is-small is-primary">
<div class="hero-body">
<div class="container">
<h1 class="title">{{ $t("About Mobilizon") }}</h1>
- <p class="subtitle">
- <span>
- {{
- $t(
- "A user-friendly, emancipatory and ethical tool for gathering, organising, and mobilising."
- )
- }}
- </span>
+ <p>
+ {{
+ $t(
+ "A user-friendly, emancipatory and ethical tool for gathering, organising, and mobilising."
+ )
+ }}
</p>
<b-button
icon-left="open-in-new"
@@ -24,165 +22,56 @@
</div>
</div>
</div>
- <div class="container">
- <section>
- <div class="columns">
- <div class="column has-text-left-desktop">
- <h2 class="title">{{ $t("Gather ⋅ Organize ⋅ Mobilize") }}</h2>
- <p
- 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?'
- )
- "
- />
- <p
- v-html="
- $t(
- 'Mobilizon is a free/libre software that will allow communities to create <b>their own spaces</b> to publish events in order to better emancipate themselves from tech giants.'
- )
- "
- />
- </div>
- <div class="column has-text-right-desktop has-text-centered-mobile">
- <img
- src="img/about/action-mobilizon.png"
- width="300"
- :alt="$t('Organize and take action, freely')"
- />
- </div>
- </div>
- </section>
- <section>
- <div class="columns">
- <div class="column has-text-right-desktop">
- <h2 class="title">{{ $t("Let's create a new common") }}</h2>
- <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>.'
- )
- "
- />
- <p>
- <span
- v-html="
- $t(
- 'Installing Mobilizon will allow communities to free themselves from the services of tech giants by creating <b>their own event platform</b>.'
- )
- "
- />
- <i18n
- tag="span"
- path="This installation (called “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">{{
- $t("a decentralised federation protocol")
- }}</a>
- </i18n>
+ <main class="container">
+ <div class="columns">
+ <div class="column is-one-quarter-desktop">
+ <aside class="menu">
+ <p class="menu-label">
+ {{ $t("About") }}
</p>
- </div>
- <div class="column has-text-left-desktop has-text-centered-mobile">
- <img
- src="img/about/common-mobilizon.png"
- width="300"
- :alt="$t('Let\'s create a new common')"
- />
- </div>
+ <ul class="menu-list">
+ <li>
+ <router-link :to="{ name: RouteName.ABOUT_INSTANCE }">{{
+ $t("About this instance")
+ }}</router-link>
+ </li>
+ <li>
+ <router-link :to="{ name: RouteName.ABOUT_MOBILIZON }">{{
+ $t("About Mobilizon")
+ }}</router-link>
+ </li>
+ </ul>
+ <p class="menu-label">
+ {{ $t("Legal") }}
+ </p>
+ <ul class="menu-list">
+ <li>
+ <router-link :to="{ name: RouteName.TERMS }">{{
+ $t("Terms of service")
+ }}</router-link>
+ </li>
+ <li>
+ <router-link :to="{ name: RouteName.PRIVACY }">{{
+ $t("Privacy policy")
+ }}</router-link>
+ </li>
+ <li>
+ <router-link :to="{ name: RouteName.RULES }">{{
+ $t("Instance rules")
+ }}</router-link>
+ </li>
+ <li>
+ <router-link :to="{ name: RouteName.GLOSSARY }">{{ $t("Glossary") }}</router-link>
+ </li>
+ </ul>
+ </aside>
</div>
- </section>
- </div>
- <div class="hero quote is-secondary">
- <div class="hero-body">
- <div class="container">
- <h2 class="title">{{ $t("To change the world, change the software") }}</h2>
- <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."
- )
- }}
- </blockquote>
- <footer class="blockquote-footer">
- <a
- href="https://framablog.org/2019/05/14/mobilizon-lets-finance-a-software-to-free-our-events-from-facebook/"
- >{{ $t("Read Framasoft’s statement of intent on the Framablog") }}</a
- >
- </footer>
+ <div class="column router">
+ <router-view />
</div>
</div>
- </div>
- <div class="container">
- <section>
- <div class="columns">
- <div class="column">
- <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."
- >
- <a slot="license" href="https://choosealicense.com/licenses/agpl-3.0/">{{
- $t("Mobilizon’s licence")
- }}</a>
- <b slot="respect">{{ $t("respect of the fundamental freedoms") }}</b>
- <a slot="source" href="https://framagit.org/framasoft/mobilizon">{{
- $t("its source code is public")
- }}</a>
- </i18n>
- <p>
- {{
- $t(
- "If the direction given by the development team does not suit you, you have the legal right to create your own version of the software, with your own governance choices."
- )
- }}
- </p>
- <i18n
- tag="p"
- path="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."
- >
- <a slot="change_world" href="https://framasoft.org">{{
- $t("change the world, one byte at a time")
- }}</a>
- </i18n>
- </div>
- <div class="column has-text-right-desktop has-text-centered-mobile">
- <img
- src="img/about/software-to-the-people-mobilizon.png"
- width="300"
- :alt="('Software to the people')"
- />
- </div>
- </div>
- </section>
- <section>
- <div class="columns">
- <div class="column has-text-right-desktop">
- <h2 class="title">{{ $t("Concieved 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."
- >
- <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>
- <div class="column has-text-left-desktop has-text-centered-mobile">
- <img
- src="img/about/concieved-mobilizon.png"
- width="300"
- :alt="$t('Concieved with care for humans')"
- />
- </div>
- </div>
- </section>
- </div>
+ </main>
+
<!-- We hide the "Find an instance button until https://joinmobilizon.org gets a instance picker -->
<div class="hero register is-primary is-medium" v-if="config && config.registrationsOpen">
<div class="hero-body">
@@ -234,13 +123,13 @@ export default class About extends Vue {
.hero.is-primary {
background: $background-color;
- .subtitle {
- padding: 1rem;
- display: block;
- span {
- color: lighten($background-color, 10%);
- }
+ .title {
+ margin: 30px auto 1rem auto;
+ }
+
+ p {
+ margin-bottom: 1rem;
}
}
@@ -248,49 +137,17 @@ export default class About extends Vue {
background: lighten($background-color, 20%);
}
-section {
- padding: 3rem 0;
-
- &:not(:last-child) {
- border-bottom: 0.1rem dotted #777;
- }
-
- p {
- margin-top: 1.5rem;
- }
-
- &:nth-child(odd) .columns {
- flex-direction: row-reverse;
- }
+aside.menu {
+ position: sticky;
+ top: 2rem;
+ margin-top: 2rem;
}
-.hero.quote {
- background: lighten($secondary, 20%);
- h2 {
- background: initial;
- }
+.router.column {
+ background: $white;
+}
- blockquote {
- border-left: 0.2em solid #333;
- display: block;
- padding-left: 1em;
-
- &:before {
- content: "« ";
- }
-
- &:after {
- content: " »";
- }
- }
-
- .blockquote-footer a {
- color: #6c757d;
- background: initial;
-
- &:before {
- content: "\2014\00A0";
- }
- }
+ul.menu-list > li > a {
+ text-decoration: none;
}
</style>
diff --git a/js/src/views/About/AboutInstance.vue b/js/src/views/About/AboutInstance.vue
new file mode 100644
index 000000000..389d633c1
--- /dev/null
+++ b/js/src/views/About/AboutInstance.vue
@@ -0,0 +1,163 @@
+<template>
+ <div v-if="config">
+ <section class="hero is-primary">
+ <div class="hero-body">
+ <div class="container">
+ <h2 class="title">{{ config.name }}</h2>
+ <p>{{ config.description }}</p>
+ </div>
+ </div>
+ </section>
+ <section class="columns contact-statistics" v-if="statistics">
+ <div class="column is-three-quarters-desktop statistics">
+ <i18n tag="p" path="Home to {number} users">
+ <strong slot="number">{{ statistics.numberOfUsers }}</strong>
+ </i18n>
+ <i18n tag="p" path="Who published {number} events">
+ <strong slot="number">{{ statistics.numberOfEvents }}</strong>
+ </i18n>
+ <i18n tag="p" path="And {number} comments">
+ <strong slot="number">{{ statistics.numberOfComments }}</strong>
+ </i18n>
+ </div>
+ <div class="column contact">
+ <h4>{{ $t("Contact") }}</h4>
+ <p>
+ <a :title="config.contact" v-if="generateConfigLink()" :href="generateConfigLink().uri">{{
+ generateConfigLink().text
+ }}</a>
+ <span v-else-if="config.contact">{{ config.contact }}</span>
+ <span v-else>{{ $t("contact uninformed") }}</span>
+ </p>
+ </div>
+ </section>
+ <hr />
+ <section class="long-description">
+ <div v-html="config.longDescription" />
+ </section>
+ <hr />
+ <section class="config">
+ <h3 class="subtitle">{{ $t("Instance configuration") }}</h3>
+ <table class="table is-fullwidth">
+ <tr>
+ <td>{{ $t("Mobilizon version") }}</td>
+ <td>{{ config.version }}</td>
+ </tr>
+ <tr>
+ <td>{{ $t("Registrations") }}</td>
+ <td v-if="config.registrationsOpen && config.registrationsWhitelist">
+ {{ $t("Restricted") }}
+ </td>
+ <td v-if="config.registrationsOpen && !config.registrationsWhitelist">
+ {{ $t("Open") }}
+ </td>
+ <td v-else>{{ $t("Closed") }}</td>
+ </tr>
+ <tr>
+ <td>{{ $t("Federation") }}</td>
+ <td v-if="config.federating">{{ $t("Enabled") }}</td>
+ <td v-else>{{ $t("Disabled") }}</td>
+ </tr>
+ <tr>
+ <td>{{ $t("Anonymous participations") }}</td>
+ <td v-if="config.anonymous.participation.allowed">{{ $t("If allowed by organizer") }}</td>
+ <td v-else>{{ $t("Disabled") }}</td>
+ </tr>
+ </table>
+ </section>
+ </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-property-decorator";
+import { ABOUT } from "../../graphql/config";
+import { STATISTICS } from "../../graphql/statistics";
+import { IConfig } from "../../types/config.model";
+import { IStatistics } from "../../types/statistics.model";
+
+@Component({
+ apollo: {
+ config: ABOUT,
+ statistics: STATISTICS,
+ },
+})
+export default class AboutInstance extends Vue {
+ config!: IConfig;
+ statistics!: IStatistics;
+
+ get isContactEmail(): boolean {
+ return this.config && this.config.contact.includes("@");
+ }
+
+ get isContactURL(): boolean {
+ return this.config && this.config.contact.match(/^https?:\/\//g) !== null;
+ }
+
+ generateConfigLink(): { uri: string; text: string } | null {
+ if (!this.config.contact) return null;
+ if (this.isContactEmail) {
+ return { uri: `mailto:${this.config.contact}`, text: this.config.contact };
+ } else if (this.isContactURL) {
+ return {
+ uri: this.config.contact,
+ text: this.urlToHostname(this.config.contact) || (this.$t("Contact") as string),
+ };
+ }
+ return null;
+ }
+
+ urlToHostname(url: string): string | null {
+ try {
+ return new URL(url).hostname;
+ } catch (e) {
+ return null;
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../../variables.scss";
+
+section {
+ &:not(:first-child) {
+ margin: 2rem auto;
+ }
+
+ &.hero {
+ h2.title {
+ margin: auto;
+ }
+ }
+
+ &.contact-statistics {
+ margin: 2px auto;
+ .statistics {
+ display: flex;
+ p {
+ text-align: right;
+ flex: 1;
+ padding: 0 15px;
+
+ & > * {
+ display: block;
+ }
+
+ strong {
+ font-weight: 500;
+ font-size: 32px;
+ line-height: 48px;
+ }
+ }
+ }
+ .contact {
+ p {
+ width: 200px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ }
+ }
+}
+</style>
diff --git a/js/src/views/About/AboutMobilizon.vue b/js/src/views/About/AboutMobilizon.vue
new file mode 100644
index 000000000..33bfbb182
--- /dev/null
+++ b/js/src/views/About/AboutMobilizon.vue
@@ -0,0 +1,236 @@
+<template>
+ <div class="container">
+ <div class="container">
+ <section>
+ <div class="columns">
+ <div class="column has-text-left-desktop">
+ <h2 class="title">{{ $t("Gather ⋅ Organize ⋅ Mobilize") }}</h2>
+ <p
+ 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?'
+ )
+ "
+ />
+ <p
+ v-html="
+ $t(
+ 'Mobilizon is a free/libre software that will allow communities to create <b>their own spaces</b> to publish events in order to better emancipate themselves from tech giants.'
+ )
+ "
+ />
+ </div>
+ <div class="column has-text-right-desktop has-text-centered-mobile">
+ <img
+ src="/img/about/action-mobilizon.png"
+ width="300"
+ :alt="$t('Organize and take action, freely')"
+ />
+ </div>
+ </div>
+ </section>
+ <section>
+ <div class="columns">
+ <div class="column has-text-right-desktop">
+ <h2 class="title">{{ $t("Let's create a new common") }}</h2>
+ <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>.'
+ )
+ "
+ />
+ <p>
+ <span
+ v-html="
+ $t(
+ 'Installing Mobilizon will allow communities to free themselves from the services of tech giants by creating <b>their own event platform</b>.'
+ )
+ "
+ />
+ <i18n
+ tag="span"
+ path="This installation (called “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">{{
+ $t("a decentralised federation protocol")
+ }}</a>
+ </i18n>
+ </p>
+ </div>
+ <div class="column has-text-left-desktop has-text-centered-mobile">
+ <img
+ src="/img/about/common-mobilizon.png"
+ width="300"
+ :alt="$t('Let\'s create a new common')"
+ />
+ </div>
+ </div>
+ </section>
+ </div>
+ <div class="hero quote is-secondary">
+ <div class="hero-body">
+ <div class="container">
+ <h2 class="title">{{ $t("To change the world, change the software") }}</h2>
+ <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."
+ )
+ }}
+ </blockquote>
+ <footer class="blockquote-footer">
+ <a
+ href="https://framablog.org/2019/05/14/mobilizon-lets-finance-a-software-to-free-our-events-from-facebook/"
+ >{{ $t("Read Framasoft’s statement of intent on the Framablog") }}</a
+ >
+ </footer>
+ </div>
+ </div>
+ </div>
+ <div class="container">
+ <section>
+ <div class="columns">
+ <div class="column">
+ <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."
+ >
+ <a slot="license" href="https://choosealicense.com/licenses/agpl-3.0/">{{
+ $t("Mobilizon’s licence")
+ }}</a>
+ <b slot="respect">{{ $t("respect of the fundamental freedoms") }}</b>
+ <a slot="source" href="https://framagit.org/framasoft/mobilizon">{{
+ $t("its source code is public")
+ }}</a>
+ </i18n>
+ <p>
+ {{
+ $t(
+ "If the direction given by the development team does not suit you, you have the legal right to create your own version of the software, with your own governance choices."
+ )
+ }}
+ </p>
+ <i18n
+ tag="p"
+ path="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."
+ >
+ <a slot="change_world" href="https://framasoft.org">{{
+ $t("change the world, one byte at a time")
+ }}</a>
+ </i18n>
+ </div>
+ <div class="column has-text-right-desktop has-text-centered-mobile">
+ <img
+ src="/img/about/software-to-the-people-mobilizon.png"
+ width="300"
+ :alt="('Software to the people')"
+ />
+ </div>
+ </div>
+ </section>
+ <section>
+ <div class="columns">
+ <div class="column has-text-right-desktop">
+ <h2 class="title">{{ $t("Concieved 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."
+ >
+ <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>
+ <div class="column has-text-left-desktop has-text-centered-mobile">
+ <img
+ src="/img/about/concieved-mobilizon.png"
+ width="300"
+ :alt="$t('Concieved with care for humans')"
+ />
+ </div>
+ </div>
+ </section>
+ </div>
+ </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-property-decorator";
+
+@Component
+export default class AboutMobilizon extends Vue {}
+</script>
+
+<style lang="scss" scoped>
+@import "../../variables.scss";
+
+.hero.is-primary {
+ background: $background-color;
+ .subtitle {
+ padding: 1rem;
+ display: block;
+
+ span {
+ color: lighten($background-color, 10%);
+ }
+ }
+}
+
+.hero.register {
+ background: lighten($background-color, 20%);
+}
+
+section {
+ padding: 3rem 0;
+
+ &:not(:last-child) {
+ border-bottom: 0.1rem dotted #777;
+ }
+
+ p {
+ margin-top: 1.5rem;
+ }
+
+ &:nth-child(odd) .columns {
+ flex-direction: row-reverse;
+ }
+}
+
+.hero.quote {
+ background: lighten($secondary, 20%);
+ h2 {
+ background: initial;
+ }
+
+ blockquote {
+ border-left: 0.2em solid #333;
+ display: block;
+ padding-left: 1em;
+
+ &:before {
+ content: "« ";
+ }
+
+ &:after {
+ content: " »";
+ }
+ }
+
+ .blockquote-footer a {
+ color: #6c757d;
+ background: initial;
+
+ &:before {
+ content: "\2014\00A0";
+ }
+ }
+}
+</style>
diff --git a/js/src/views/About/Glossary.vue b/js/src/views/About/Glossary.vue
new file mode 100644
index 000000000..1c14cbf34
--- /dev/null
+++ b/js/src/views/About/Glossary.vue
@@ -0,0 +1,86 @@
+<template>
+ <div class="container section">
+ <h2 class="title">{{ $t("Glossary") }}</h2>
+ <div class="content" v-if="config">
+ <p>
+ {{
+ $t(
+ "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:"
+ )
+ }}
+ </p>
+ <dl>
+ <dt>{{ $t("Instance") }}</dt>
+ <i18n
+ tag="dd"
+ path="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."
+ >
+ <a slot="mobilizon_software" href="https://joinmobilizon.org">{{
+ $t("Mobilizon software")
+ }}</a>
+ <b slot="instance_name">{{ config.name }}</b>
+ </i18n>
+ <dt>{{ $t("Instance administrator") }}</dt>
+ <dd>
+ {{
+ $t(
+ "The instance administrator is the person or entity that runs this Mobilizon instance."
+ )
+ }}
+ </dd>
+ <dt>{{ $t("Application") }}</dt>
+ <dd>
+ {{
+ $t(
+ "In the following context, an application is a software, either provided by the Mobilizon team or by a 3rd-party, used to interact with your instance."
+ )
+ }}
+ </dd>
+ <dt>{{ $t("API") }}</dt>
+ <dd>
+ {{
+ $t(
+ "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."
+ )
+ }}
+ </dd>
+ <dt>{{ $t("SSL/TLS") }}</dt>
+ <i18n
+ tag="dd"
+ path="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."
+ >
+ <code slot="https">https://</code>
+ </i18n>
+ <dt>{{ $t("Cookies and Local storage") }}</dt>
+ <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."
+ )
+ }}
+ </dd>
+ </dl>
+ </div>
+ </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-property-decorator";
+import { ABOUT } from "../../graphql/config";
+import { IConfig } from "../../types/config.model";
+
+@Component({
+ apollo: {
+ config: ABOUT,
+ },
+})
+export default class Glossary extends Vue {
+ config!: IConfig;
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/ dt {
+ font-weight: bold;
+}
+</style>
diff --git a/js/src/views/About/Privacy.vue b/js/src/views/About/Privacy.vue
new file mode 100644
index 000000000..b6ee7e69f
--- /dev/null
+++ b/js/src/views/About/Privacy.vue
@@ -0,0 +1,66 @@
+<template>
+ <div class="container section">
+ <h2 class="title">{{ $t("Privacy Policy") }}</h2>
+ <div class="content" v-html="config.privacy.bodyHtml" />
+ </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Watch } from "vue-property-decorator";
+import { PRIVACY } from "@/graphql/config";
+import { IConfig } from "@/types/config.model";
+import { InstancePrivacyType } from "@/types/admin.model";
+
+@Component({
+ apollo: {
+ config: {
+ query: PRIVACY,
+ variables() {
+ return {
+ locale: this.locale,
+ };
+ },
+ skip() {
+ return !this.locale;
+ },
+ },
+ },
+})
+export default class Privacy extends Vue {
+ config!: IConfig;
+
+ locale: string | null = null;
+
+ created() {
+ this.locale = this.$i18n.locale;
+ }
+
+ @Watch("config", { deep: true })
+ watchConfig(config: IConfig) {
+ if (config.privacy.type) {
+ console.log(this.config.privacy);
+ this.redirectToUrl();
+ }
+ }
+
+ redirectToUrl() {
+ if (this.config.privacy.type === InstancePrivacyType.URL) {
+ window.location.replace(this.config.privacy.url);
+ }
+ }
+}
+</script>
+<style lang="scss" scoped>
+@import "@/variables.scss";
+
+main > .container {
+ background: $white;
+
+ /deep/ dt {
+ font-weight: bold;
+ }
+}
+.content /deep/ li {
+ margin-bottom: 1rem;
+}
+</style>
diff --git a/js/src/views/Rules.vue b/js/src/views/About/Rules.vue
similarity index 89%
rename from js/src/views/Rules.vue
rename to js/src/views/About/Rules.vue
index f8a48f2d8..3750b5acc 100644
--- a/js/src/views/Rules.vue
+++ b/js/src/views/About/Rules.vue
@@ -11,7 +11,7 @@ import { Component, Vue, Watch } from "vue-property-decorator";
import { RULES } from "@/graphql/config";
import { IConfig } from "@/types/config.model";
import { InstanceTermsType } from "@/types/admin.model";
-import RouteName from "../router/name";
+import RouteName from "../../router/name";
@Component({
apollo: {
@@ -32,4 +32,7 @@ export default class Rules extends Vue {
main > .container {
background: $white;
}
+.content /deep/ li {
+ margin-bottom: 1rem;
+}
</style>
diff --git a/js/src/views/Terms.vue b/js/src/views/About/Terms.vue
similarity index 85%
rename from js/src/views/Terms.vue
rename to js/src/views/About/Terms.vue
index caa200994..466189a62 100644
--- a/js/src/views/Terms.vue
+++ b/js/src/views/About/Terms.vue
@@ -1,6 +1,6 @@
<template>
<div class="container section">
- <h2 class="title">{{ $t("Privacy Policy") }}</h2>
+ <h2 class="title">{{ $t("Terms") }}</h2>
<div class="content" v-html="config.terms.bodyHtml" />
</div>
</template>
@@ -10,7 +10,6 @@ import { Component, Vue, Watch } from "vue-property-decorator";
import { TERMS } from "@/graphql/config";
import { IConfig } from "@/types/config.model";
import { InstanceTermsType } from "@/types/admin.model";
-import RouteName from "../router/name";
@Component({
apollo: {
@@ -49,14 +48,10 @@ export default class Terms extends Vue {
window.location.replace(this.config.terms.url);
}
}
-
- RouteName = RouteName;
}
</script>
<style lang="scss" scoped>
-@import "@/variables.scss";
-
-main > .container {
- background: $white;
+.content /deep/ li {
+ margin-bottom: 1rem;
}
</style>
diff --git a/js/src/views/Admin/Profiles.vue b/js/src/views/Admin/Profiles.vue
index e4a2ee53c..f757e2f51 100644
--- a/js/src/views/Admin/Profiles.vue
+++ b/js/src/views/Admin/Profiles.vue
@@ -23,7 +23,10 @@
size="is-small"
/>
</template>
- <router-link :to="{ name: RouteName.ADMIN_PROFILE, params: { id: props.row.id } }">
+ <router-link
+ class="profile"
+ :to="{ name: RouteName.ADMIN_PROFILE, params: { id: props.row.id } }"
+ >
<article class="media">
<figure class="media-left" v-if="props.row.avatar">
<p class="image is-48x48">
@@ -136,3 +139,8 @@ export default class Profiles extends Vue {
}
}
</script>
+<style lang="scss" scoped>
+a.profile {
+ text-decoration: none;
+}
+</style>
diff --git a/js/src/views/Admin/Settings.vue b/js/src/views/Admin/Settings.vue
index 74a9f1a16..519c031e8 100644
--- a/js/src/views/Admin/Settings.vue
+++ b/js/src/views/Admin/Settings.vue
@@ -4,9 +4,24 @@
<b-field :label="$t('Instance Name')">
<b-input v-model="adminSettings.instanceName" />
</b-field>
- <b-field :label="$t('Instance Description')">
- <b-input type="textarea" v-model="adminSettings.instanceDescription" />
- </b-field>
+ <div class="field">
+ <label class="label has-help">{{ $t("Instance Short Description") }}</label>
+ <small>
+ {{
+ $t(
+ "Displayed on homepage and meta tags. Describe what Mobilizon is and what makes this instance special in a single paragraph."
+ )
+ }}
+ </small>
+ <b-input type="textarea" v-model="adminSettings.instanceDescription" rows="2" />
+ </div>
+ <div class="field">
+ <label class="label has-help">{{ $t("Contact") }}</label>
+ <small>
+ {{ $t("Can be an email or a link, or just plain text.") }}
+ </small>
+ <b-input v-model="adminSettings.contact" />
+ </div>
<b-field :label="$t('Allow registrations')">
<b-switch v-model="adminSettings.registrationsOpen">
<p class="content" v-if="adminSettings.registrationsOpen">
@@ -15,9 +30,24 @@
<p class="content" v-else>{{ $t("Registration is closed.") }}</p>
</b-switch>
</b-field>
- <b-field :label="$t('Instance Rules')">
+ <div class="field">
+ <label class="label has-help">{{ $t("Instance Long Description") }}</label>
+ <small>
+ {{
+ $t(
+ "A place to explain who you are and the things that set your instance apart. You can use HTML tags."
+ )
+ }}
+ </small>
+ <b-input type="textarea" v-model="adminSettings.instanceLongDescription" rows="4" />
+ </div>
+ <div class="field">
+ <label class="label has-help">{{ $t("Instance Rules") }}</label>
+ <small>
+ {{ $t("A place for your code of conduct, rules or guidelines. You can use HTML tags.") }}
+ </small>
<b-input type="textarea" v-model="adminSettings.instanceRules" />
- </b-field>
+ </div>
<b-field :label="$t('Instance Terms Source')">
<div class="columns">
<div class="column is-one-third-desktop">
@@ -26,7 +56,7 @@
v-model="adminSettings.instanceTermsType"
name="instanceTermsType"
:native-value="InstanceTermsType.DEFAULT"
- >{{ $t("Default Mobilizon.org terms") }}</b-radio
+ >{{ $t("Default Mobilizon terms") }}</b-radio
>
</b-field>
<b-field>
@@ -65,6 +95,11 @@
>{{ $t("default Mobilizon terms") }}</a
>
</i18n>
+ <b>{{
+ $t(
+ "NOTE! The default terms have not been checked over by a lawyer and thus are unlikely to provide full legal protection for all situations for an instance admin using them. They are also not specific to all countries and jurisdictions. If you are unsure, please check with a lawyer."
+ )
+ }}</b>
</div>
<div
class="notification"
@@ -78,13 +113,20 @@
v-if="adminSettings.instanceTermsType === InstanceTermsType.CUSTOM"
>
<b>{{ $t("Custom") }}</b>
- <p class="content">
- {{
- $t(
- "Enter your own terms. HTML tags allowed. Mobilizon.org's terms are provided as template."
- )
- }}
- </p>
+ <i18n
+ tag="p"
+ class="content"
+ path="Enter your own terms. HTML tags allowed. The {mobilizon_terms} are provided as template."
+ >
+ <a
+ slot="mobilizon_terms"
+ href="https://mobilizon.org/terms"
+ target="_blank"
+ rel="noopener"
+ >
+ {{ $t("default Mobilizon terms") }}</a
+ >
+ </i18n>
</div>
</div>
</div>
@@ -99,7 +141,97 @@
:label="$t('Instance Terms')"
v-if="adminSettings.instanceTermsType === InstanceTermsType.CUSTOM"
>
- <b-input type="textarea" v-model="adminSettings.instanceTerms" />
+ <b-input type="textarea" v-model="adminSettings.instancePrivacyPolicy" />
+ </b-field>
+ <b-field :label="$t('Instance Privacy Policy Source')">
+ <div class="columns">
+ <div class="column is-one-third-desktop">
+ <b-field>
+ <b-radio
+ v-model="adminSettings.instancePrivacyPolicyType"
+ name="instancePrivacyType"
+ :native-value="InstancePrivacyType.DEFAULT"
+ >{{ $t("Default Mobilizon privacy policy") }}</b-radio
+ >
+ </b-field>
+ <b-field>
+ <b-radio
+ v-model="adminSettings.instancePrivacyPolicyType"
+ name="instancePrivacyType"
+ :native-value="InstancePrivacyType.URL"
+ >{{ $t("Custom URL") }}</b-radio
+ >
+ </b-field>
+ <b-field>
+ <b-radio
+ v-model="adminSettings.instancePrivacyPolicyType"
+ name="instancePrivacyType"
+ :native-value="InstancePrivacyType.CUSTOM"
+ >{{ $t("Custom text") }}</b-radio
+ >
+ </b-field>
+ </div>
+ <div class="column">
+ <div
+ class="notification"
+ v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.DEFAULT"
+ >
+ <b>{{ $t("Default") }}</b>
+ <i18n
+ tag="p"
+ class="content"
+ path="The {default_privacy_policy} will be used. They will be translated in the user's language."
+ >
+ <a
+ slot="default_privacy_policy"
+ href="https://mobilizon.org/terms"
+ target="_blank"
+ rel="noopener"
+ >{{ $t("default Mobilizon privacy policy") }}</a
+ >
+ </i18n>
+ </div>
+ <div
+ class="notification"
+ v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.URL"
+ >
+ <b>{{ $t("URL") }}</b>
+ <p class="content">{{ $t("Set an URL to a page with your own privacy policy.") }}</p>
+ </div>
+ <div
+ class="notification"
+ v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.CUSTOM"
+ >
+ <b>{{ $t("Custom") }}</b>
+ <i18n
+ tag="p"
+ class="content"
+ path="Enter your own privacy policy. HTML tags allowed. The {mobilizon_privacy_policy} is provided as template."
+ >
+ <a
+ slot="mobilizon_privacy_policy"
+ href="https://mobilizon.org/privacy"
+ target="_blank"
+ rel="noopener"
+ >
+ {{ $t("default Mobilizon privacy policy") }}</a
+ >
+ </i18n>
+ </div>
+ </div>
+ </div>
+ </b-field>
+ <b-field
+ :label="$t('Instance Privacy Policy URL')"
+ v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.URL"
+ >
+ <b-input type="URL" v-model="adminSettings.instancePrivacyPolicyUrl" />
+ </b-field>
+ <b-field
+ :label="$t('Instance Privacy Policy')"
+ v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.CUSTOM"
+ >
+ <b-input type="textarea" v-model="adminSettings.instancePrivacyPolicy" />
</b-field>
<b-button native-type="submit" type="is-primary">{{ $t("Save") }}</b-button>
</form>
@@ -108,7 +240,7 @@
<script lang="ts">
import { Component, Vue } from "vue-property-decorator";
import { ADMIN_SETTINGS, SAVE_ADMIN_SETTINGS } from "@/graphql/admin";
-import { IAdminSettings, InstanceTermsType } from "../../types/admin.model";
+import { IAdminSettings, InstanceTermsType, InstancePrivacyType } from "../../types/admin.model";
import RouteName from "../../router/name";
@Component({
@@ -120,6 +252,7 @@ export default class Settings extends Vue {
adminSettings!: IAdminSettings;
InstanceTermsType = InstanceTermsType;
+ InstancePrivacyType = InstancePrivacyType;
RouteName = RouteName;
@@ -148,4 +281,8 @@ export default class Settings extends Vue {
text-decoration-color: #fea72b !important;
text-decoration-thickness: 2px !important;
}
+
+label.label.has-help {
+ margin-bottom: 0;
+}
</style>
diff --git a/js/src/views/Admin/Users.vue b/js/src/views/Admin/Users.vue
index 27a1d8e08..41429a10b 100644
--- a/js/src/views/Admin/Users.vue
+++ b/js/src/views/Admin/Users.vue
@@ -28,6 +28,7 @@
/>
</template>
<router-link
+ class="user-profile"
:to="{ name: RouteName.ADMIN_USER_PROFILE, params: { id: props.row.id } }"
:class="{ disabled: props.row.disabled }"
>
@@ -49,6 +50,7 @@
<template slot="detail" slot-scope="props">
<router-link
+ class="profile"
v-for="actor in props.row.actors"
:key="actor.id"
:to="{ name: RouteName.ADMIN_PROFILE, params: { id: actor.id } }"
@@ -130,6 +132,10 @@ export default class Users extends Vue {
<style lang="scss" scoped>
@import "../../variables.scss";
+a.profile,
+a.user-profile {
+ text-decoration: none;
+}
a.disabled {
color: $danger;
text-decoration: line-through;
diff --git a/js/src/views/Settings.vue b/js/src/views/Settings.vue
index 61819f758..d14517eea 100644
--- a/js/src/views/Settings.vue
+++ b/js/src/views/Settings.vue
@@ -1,5 +1,5 @@
<template>
- <aside class="section container">
+ <div class="section container">
<h1 class="title">{{ $t("Settings") }}</h1>
<div class="columns">
<SettingsMenu class="column is-one-quarter-desktop" :menu="menu" />
@@ -18,7 +18,7 @@
<router-view />
</div>
</div>
- </aside>
+ </div>
</template>
<script lang="ts">
import { Component, Vue, Watch } from "vue-property-decorator";
diff --git a/js/yarn.lock b/js/yarn.lock
index 445ed20c8..ec64a8cd7 100644
--- a/js/yarn.lock
+++ b/js/yarn.lock
@@ -41,35 +41,35 @@
dependencies:
"@babel/highlight" "^7.0.0"
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.1.tgz#d5481c5095daa1c57e16e54c6f9198443afb49ff"
- integrity sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.3.tgz#324bcfd8d35cd3d47dae18cde63d752086435e9a"
+ integrity sha512-fDx9eNW0qz0WkUeqL6tXEXzVlPh6Y5aCDEZesl0xBGA8ndRukX91Uk44ZqnkECp01NAZUdCAl+aiQNGi0k88Eg==
dependencies:
- "@babel/highlight" "^7.10.1"
+ "@babel/highlight" "^7.10.3"
-"@babel/compat-data@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.1.tgz#b1085ffe72cd17bf2c0ee790fc09f9626011b2db"
- integrity sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==
+"@babel/compat-data@^7.10.1", "@babel/compat-data@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.3.tgz#9af3e033f36e8e2d6e47570db91e64a846f5d382"
+ integrity sha512-BDIfJ9uNZuI0LajPfoYV28lX8kyCPMHY6uY4WH1lJdcicmAfxCK5ASzaeV0D/wsUaRH/cLk+amuxtC37sZ8TUg==
dependencies:
browserslist "^4.12.0"
invariant "^2.2.4"
semver "^5.5.0"
"@babel/core@^7.7.5", "@babel/core@^7.9.6":
- version "7.10.2"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.2.tgz#bd6786046668a925ac2bd2fd95b579b92a23b36a"
- integrity sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.10.3.tgz#73b0e8ddeec1e3fdd7a2de587a60e17c440ec77e"
+ integrity sha512-5YqWxYE3pyhIi84L84YcwjeEgS+fa7ZjK6IBVGTjDVfm64njkR2lfDhVR5OudLk8x2GK59YoSyVv+L/03k1q9w==
dependencies:
- "@babel/code-frame" "^7.10.1"
- "@babel/generator" "^7.10.2"
+ "@babel/code-frame" "^7.10.3"
+ "@babel/generator" "^7.10.3"
"@babel/helper-module-transforms" "^7.10.1"
"@babel/helpers" "^7.10.1"
- "@babel/parser" "^7.10.2"
- "@babel/template" "^7.10.1"
- "@babel/traverse" "^7.10.1"
- "@babel/types" "^7.10.2"
+ "@babel/parser" "^7.10.3"
+ "@babel/template" "^7.10.3"
+ "@babel/traverse" "^7.10.3"
+ "@babel/types" "^7.10.3"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.1"
@@ -90,12 +90,12 @@
source-map "^0.5.0"
trim-right "^1.0.1"
-"@babel/generator@^7.10.1", "@babel/generator@^7.10.2":
- version "7.10.2"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.2.tgz#0fa5b5b2389db8bfdfcc3492b551ee20f5dd69a9"
- integrity sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==
+"@babel/generator@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.3.tgz#32b9a0d963a71d7a54f5f6c15659c3dbc2a523a5"
+ integrity sha512-drt8MUHbEqRzNR0xnF8nMehbY11b1SDkRw03PSNH/3Rb2Z35oxkddVSi3rcaak0YJQ86PCuE7Qx1jSFhbLNBMA==
dependencies:
- "@babel/types" "^7.10.2"
+ "@babel/types" "^7.10.3"
jsesc "^2.5.1"
lodash "^4.17.13"
source-map "^0.5.0"
@@ -108,12 +108,12 @@
"@babel/types" "^7.10.1"
"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.1.tgz#0ec7d9be8174934532661f87783eb18d72290059"
- integrity sha512-cQpVq48EkYxUU0xozpGCLla3wlkdRRqLWu1ksFMXA9CM5KQmyyRpSEsYXbao7JUkOw/tAaYKCaYyZq6HOFYtyw==
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.3.tgz#4e9012d6701bef0030348d7f9c808209bd3e8687"
+ integrity sha512-lo4XXRnBlU6eRM92FkiZxpo1xFLmv3VsPFk61zJKMm7XYJfwqXHsYJTY6agoc4a3L8QPw1HqWehO18coZgbT6A==
dependencies:
- "@babel/helper-explode-assignable-expression" "^7.10.1"
- "@babel/types" "^7.10.1"
+ "@babel/helper-explode-assignable-expression" "^7.10.3"
+ "@babel/types" "^7.10.3"
"@babel/helper-compilation-targets@^7.10.2", "@babel/helper-compilation-targets@^7.9.6":
version "7.10.2"
@@ -126,15 +126,15 @@
levenary "^1.1.1"
semver "^5.5.0"
-"@babel/helper-create-class-features-plugin@^7.10.1":
- version "7.10.2"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz#7474295770f217dbcf288bf7572eb213db46ee67"
- integrity sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==
+"@babel/helper-create-class-features-plugin@^7.10.1", "@babel/helper-create-class-features-plugin@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.3.tgz#2783daa6866822e3d5ed119163b50f0fc3ae4b35"
+ integrity sha512-iRT9VwqtdFmv7UheJWthGc/h2s7MqoweBF9RUj77NFZsg9VfISvBTum3k6coAhJ8RWv2tj3yUjA03HxPd0vfpQ==
dependencies:
- "@babel/helper-function-name" "^7.10.1"
- "@babel/helper-member-expression-to-functions" "^7.10.1"
- "@babel/helper-optimise-call-expression" "^7.10.1"
- "@babel/helper-plugin-utils" "^7.10.1"
+ "@babel/helper-function-name" "^7.10.3"
+ "@babel/helper-member-expression-to-functions" "^7.10.3"
+ "@babel/helper-optimise-call-expression" "^7.10.3"
+ "@babel/helper-plugin-utils" "^7.10.3"
"@babel/helper-replace-supers" "^7.10.1"
"@babel/helper-split-export-declaration" "^7.10.1"
@@ -147,59 +147,59 @@
"@babel/helper-regex" "^7.10.1"
regexpu-core "^4.7.0"
-"@babel/helper-define-map@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.1.tgz#5e69ee8308648470dd7900d159c044c10285221d"
- integrity sha512-+5odWpX+OnvkD0Zmq7panrMuAGQBu6aPUgvMzuMGo4R+jUOvealEj2hiqI6WhxgKrTpFoFj0+VdsuA8KDxHBDg==
+"@babel/helper-define-map@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.3.tgz#d27120a5e57c84727b30944549b2dfeca62401a8"
+ integrity sha512-bxRzDi4Sin/k0drWCczppOhov1sBSdBvXJObM1NLHQzjhXhwRtn7aRWGvLJWCYbuu2qUk3EKs6Ci9C9ps8XokQ==
dependencies:
- "@babel/helper-function-name" "^7.10.1"
- "@babel/types" "^7.10.1"
+ "@babel/helper-function-name" "^7.10.3"
+ "@babel/types" "^7.10.3"
lodash "^4.17.13"
-"@babel/helper-explode-assignable-expression@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.1.tgz#e9d76305ee1162ca467357ae25df94f179af2b7e"
- integrity sha512-vcUJ3cDjLjvkKzt6rHrl767FeE7pMEYfPanq5L16GRtrXIoznc0HykNW2aEYkcnP76P0isoqJ34dDMFZwzEpJg==
+"@babel/helper-explode-assignable-expression@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.3.tgz#9dc14f0cfa2833ea830a9c8a1c742b6e7461b05e"
+ integrity sha512-0nKcR64XrOC3lsl+uhD15cwxPvaB6QKUDlD84OT9C3myRbhJqTMYir69/RWItUvHpharv0eJ/wk7fl34ONSwZw==
dependencies:
- "@babel/traverse" "^7.10.1"
- "@babel/types" "^7.10.1"
+ "@babel/traverse" "^7.10.3"
+ "@babel/types" "^7.10.3"
-"@babel/helper-function-name@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz#92bd63829bfc9215aca9d9defa85f56b539454f4"
- integrity sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==
+"@babel/helper-function-name@^7.10.1", "@babel/helper-function-name@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.3.tgz#79316cd75a9fa25ba9787ff54544307ed444f197"
+ integrity sha512-FvSj2aiOd8zbeqijjgqdMDSyxsGHaMt5Tr0XjQsGKHD3/1FP3wksjnLAWzxw7lvXiej8W1Jt47SKTZ6upQNiRw==
dependencies:
- "@babel/helper-get-function-arity" "^7.10.1"
- "@babel/template" "^7.10.1"
- "@babel/types" "^7.10.1"
+ "@babel/helper-get-function-arity" "^7.10.3"
+ "@babel/template" "^7.10.3"
+ "@babel/types" "^7.10.3"
-"@babel/helper-get-function-arity@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz#7303390a81ba7cb59613895a192b93850e373f7d"
- integrity sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==
+"@babel/helper-get-function-arity@^7.10.1", "@babel/helper-get-function-arity@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.3.tgz#3a28f7b28ccc7719eacd9223b659fdf162e4c45e"
+ integrity sha512-iUD/gFsR+M6uiy69JA6fzM5seno8oE85IYZdbVVEuQaZlEzMO2MXblh+KSPJgsZAUx0EEbWXU0yJaW7C9CdAVg==
dependencies:
- "@babel/types" "^7.10.1"
+ "@babel/types" "^7.10.3"
-"@babel/helper-hoist-variables@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.1.tgz#7e77c82e5dcae1ebf123174c385aaadbf787d077"
- integrity sha512-vLm5srkU8rI6X3+aQ1rQJyfjvCBLXP8cAGeuw04zeAM2ItKb1e7pmVmLyHb4sDaAYnLL13RHOZPLEtcGZ5xvjg==
+"@babel/helper-hoist-variables@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.3.tgz#d554f52baf1657ffbd7e5137311abc993bb3f068"
+ integrity sha512-9JyafKoBt5h20Yv1+BXQMdcXXavozI1vt401KBiRc2qzUepbVnd7ogVNymY1xkQN9fekGwfxtotH2Yf5xsGzgg==
dependencies:
- "@babel/types" "^7.10.1"
+ "@babel/types" "^7.10.3"
-"@babel/helper-member-expression-to-functions@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz#432967fd7e12a4afef66c4687d4ca22bc0456f15"
- integrity sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==
+"@babel/helper-member-expression-to-functions@^7.10.1", "@babel/helper-member-expression-to-functions@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.3.tgz#bc3663ac81ac57c39148fef4c69bf48a77ba8dd6"
+ integrity sha512-q7+37c4EPLSjNb2NmWOjNwj0+BOyYlssuQ58kHEWk1Z78K5i8vTUsteq78HMieRPQSl/NtpQyJfdjt3qZ5V2vw==
dependencies:
- "@babel/types" "^7.10.1"
+ "@babel/types" "^7.10.3"
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.1", "@babel/helper-module-imports@^7.8.3":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz#dd331bd45bccc566ce77004e9d05fe17add13876"
- integrity sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.1", "@babel/helper-module-imports@^7.10.3", "@babel/helper-module-imports@^7.8.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.3.tgz#766fa1d57608e53e5676f23ae498ec7a95e1b11a"
+ integrity sha512-Jtqw5M9pahLSUWA+76nhK9OG8nwYXzhQzVIGFoNaHnXF/r4l7kz4Fl0UAW7B6mqC5myoJiBP5/YQlXQTMfHI9w==
dependencies:
- "@babel/types" "^7.10.1"
+ "@babel/types" "^7.10.3"
"@babel/helper-module-transforms@^7.10.1":
version "7.10.1"
@@ -214,17 +214,17 @@
"@babel/types" "^7.10.1"
lodash "^4.17.13"
-"@babel/helper-optimise-call-expression@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz#b4a1f2561870ce1247ceddb02a3860fa96d72543"
- integrity sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==
+"@babel/helper-optimise-call-expression@^7.10.1", "@babel/helper-optimise-call-expression@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.3.tgz#f53c4b6783093195b0f69330439908841660c530"
+ integrity sha512-kT2R3VBH/cnSz+yChKpaKRJQJWxdGoc6SjioRId2wkeV3bK0wLLioFpJROrX0U4xr/NmxSSAWT/9Ih5snwIIzg==
dependencies:
- "@babel/types" "^7.10.1"
+ "@babel/types" "^7.10.3"
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.1", "@babel/helper-plugin-utils@^7.8.0":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.1.tgz#ec5a5cf0eec925b66c60580328b122c01230a127"
- integrity sha512-fvoGeXt0bJc7VMWZGCAEBEMo/HAjW2mP8apF5eXK0wSqwLAVHAISCWRoLMBMUs2kqeaG77jltVqu4Hn8Egl3nA==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.1", "@babel/helper-plugin-utils@^7.10.3", "@babel/helper-plugin-utils@^7.8.0":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.3.tgz#aac45cccf8bc1873b99a85f34bceef3beb5d3244"
+ integrity sha512-j/+j8NAWUTxOtx4LKHybpSClxHoq6I91DQ/mKgAXn5oNUPIUiGppjPIX3TDtJWPrdfP9Kfl7e4fgVMiQR9VE/g==
"@babel/helper-regex@^7.10.1":
version "7.10.1"
@@ -233,16 +233,16 @@
dependencies:
lodash "^4.17.13"
-"@babel/helper-remap-async-to-generator@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.1.tgz#bad6aaa4ff39ce8d4b82ccaae0bfe0f7dbb5f432"
- integrity sha512-RfX1P8HqsfgmJ6CwaXGKMAqbYdlleqglvVtht0HGPMSsy2V6MqLlOJVF/0Qyb/m2ZCi2z3q3+s6Pv7R/dQuZ6A==
+"@babel/helper-remap-async-to-generator@^7.10.1", "@babel/helper-remap-async-to-generator@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.3.tgz#18564f8a6748be466970195b876e8bba3bccf442"
+ integrity sha512-sLB7666ARbJUGDO60ZormmhQOyqMX/shKBXZ7fy937s+3ID8gSrneMvKSSb+8xIM5V7Vn6uNVtOY1vIm26XLtA==
dependencies:
"@babel/helper-annotate-as-pure" "^7.10.1"
"@babel/helper-wrap-function" "^7.10.1"
- "@babel/template" "^7.10.1"
- "@babel/traverse" "^7.10.1"
- "@babel/types" "^7.10.1"
+ "@babel/template" "^7.10.3"
+ "@babel/traverse" "^7.10.3"
+ "@babel/types" "^7.10.3"
"@babel/helper-replace-supers@^7.10.1":
version "7.10.1"
@@ -269,10 +269,10 @@
dependencies:
"@babel/types" "^7.10.1"
-"@babel/helper-validator-identifier@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz#5770b0c1a826c4f53f5ede5e153163e0318e94b5"
- integrity sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==
+"@babel/helper-validator-identifier@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.3.tgz#60d9847f98c4cea1b279e005fdb7c28be5412d15"
+ integrity sha512-bU8JvtlYpJSBPuj1VUmKpFGaDZuLxASky3LhaKj3bmpSTY6VWooSM8msk+Z0CZoErFye2tlABF6yDkT3FOPAXw==
"@babel/helper-wrap-function@^7.10.1":
version "7.10.1"
@@ -293,27 +293,27 @@
"@babel/traverse" "^7.10.1"
"@babel/types" "^7.10.1"
-"@babel/highlight@^7.0.0", "@babel/highlight@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz#841d098ba613ba1a427a2b383d79e35552c38ae0"
- integrity sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==
+"@babel/highlight@^7.0.0", "@babel/highlight@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.3.tgz#c633bb34adf07c5c13156692f5922c81ec53f28d"
+ integrity sha512-Ih9B/u7AtgEnySE2L2F0Xm0GaM729XqqLfHkalTsbjXGyqmf/6M0Cu0WpvqueUlW+xk88BHw9Nkpj49naU+vWw==
dependencies:
- "@babel/helper-validator-identifier" "^7.10.1"
+ "@babel/helper-validator-identifier" "^7.10.3"
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.10.1", "@babel/parser@^7.10.2", "@babel/parser@^7.6.0":
- version "7.10.2"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0"
- integrity sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==
+"@babel/parser@^7.10.3", "@babel/parser@^7.6.0":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.3.tgz#7e71d892b0d6e7d04a1af4c3c79d72c1f10f5315"
+ integrity sha512-oJtNJCMFdIMwXGmx+KxuaD7i3b8uS7TTFYW/FNG2BT8m+fmGHoiPYoH0Pe3gya07WuFmM5FCDIr1x0irkD/hyA==
-"@babel/plugin-proposal-async-generator-functions@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.1.tgz#6911af5ba2e615c4ff3c497fe2f47b35bf6d7e55"
- integrity sha512-vzZE12ZTdB336POZjmpblWfNNRpMSua45EYnRigE2XsZxcXcIyly2ixnTJasJE4Zq3U7t2d8rRF7XRUuzHxbOw==
+"@babel/plugin-proposal-async-generator-functions@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.3.tgz#5a02453d46e5362e2073c7278beab2e53ad7d939"
+ integrity sha512-WUUWM7YTOudF4jZBAJIW9D7aViYC/Fn0Pln4RIHlQALyno3sXSjqmTA4Zy1TKC2D49RCR8Y/Pn4OIUtEypK3CA==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.1"
- "@babel/helper-remap-async-to-generator" "^7.10.1"
+ "@babel/helper-plugin-utils" "^7.10.3"
+ "@babel/helper-remap-async-to-generator" "^7.10.3"
"@babel/plugin-syntax-async-generators" "^7.8.0"
"@babel/plugin-proposal-class-properties@^7.10.1", "@babel/plugin-proposal-class-properties@^7.8.3":
@@ -325,12 +325,12 @@
"@babel/helper-plugin-utils" "^7.10.1"
"@babel/plugin-proposal-decorators@^7.8.3":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.1.tgz#9373c2d8db45345c6e30452ad77b469758e5c8f7"
- integrity sha512-xBfteh352MTke2U1NpclzMDmAmCdQ2fBZjhZQQfGTjXw6qcRYMkt528sA1U8o0ThDCSeuETXIj5bOGdxN+5gkw==
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.10.3.tgz#2fc6b5696028adccfcd14bc826c184c578b857f8"
+ integrity sha512-Rzwn5tcYFTdWWK3IrhMZkMDjzFQLIGYqHvv9XuzNnEB91Y6gHr/JjazYV1Yec9g0yMLhy1p/21eiW1P7f5UN4A==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.10.1"
- "@babel/helper-plugin-utils" "^7.10.1"
+ "@babel/helper-create-class-features-plugin" "^7.10.3"
+ "@babel/helper-plugin-utils" "^7.10.3"
"@babel/plugin-syntax-decorators" "^7.10.1"
"@babel/plugin-proposal-dynamic-import@^7.10.1":
@@ -365,12 +365,12 @@
"@babel/helper-plugin-utils" "^7.10.1"
"@babel/plugin-syntax-numeric-separator" "^7.10.1"
-"@babel/plugin-proposal-object-rest-spread@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.1.tgz#cba44908ac9f142650b4a65b8aa06bf3478d5fb6"
- integrity sha512-Z+Qri55KiQkHh7Fc4BW6o+QBuTagbOp9txE+4U1i79u9oWlf2npkiDx+Rf3iK3lbcHBuNy9UOkwuR5wOMH3LIQ==
+"@babel/plugin-proposal-object-rest-spread@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.10.3.tgz#b8d0d22f70afa34ad84b7a200ff772f9b9fce474"
+ integrity sha512-ZZh5leCIlH9lni5bU/wB/UcjtcVLgR8gc+FAgW2OOY+m9h1II3ItTO1/cewNUcsIDZSYcSaz/rYVls+Fb0ExVQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.1"
+ "@babel/helper-plugin-utils" "^7.10.3"
"@babel/plugin-syntax-object-rest-spread" "^7.8.0"
"@babel/plugin-transform-parameters" "^7.10.1"
@@ -382,12 +382,12 @@
"@babel/helper-plugin-utils" "^7.10.1"
"@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-"@babel/plugin-proposal-optional-chaining@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.1.tgz#15f5d6d22708629451a91be28f8facc55b0e818c"
- integrity sha512-dqQj475q8+/avvok72CF3AOSV/SGEcH29zT5hhohqqvvZ2+boQoOr7iGldBG5YXTO2qgCgc2B3WvVLUdbeMlGA==
+"@babel/plugin-proposal-optional-chaining@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.10.3.tgz#9a726f94622b653c0a3a7a59cdce94730f526f7c"
+ integrity sha512-yyG3n9dJ1vZ6v5sfmIlMMZ8azQoqx/5/nZTSWX1td6L1H1bsjzA8TInDChpafCZiJkeOFzp/PtrfigAQXxI1Ng==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.1"
+ "@babel/helper-plugin-utils" "^7.10.3"
"@babel/plugin-syntax-optional-chaining" "^7.8.0"
"@babel/plugin-proposal-private-methods@^7.10.1":
@@ -521,26 +521,26 @@
"@babel/helper-plugin-utils" "^7.10.1"
lodash "^4.17.13"
-"@babel/plugin-transform-classes@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.1.tgz#6e11dd6c4dfae70f540480a4702477ed766d733f"
- integrity sha512-P9V0YIh+ln/B3RStPoXpEQ/CoAxQIhRSUn7aXqQ+FZJ2u8+oCtjIXR3+X0vsSD8zv+mb56K7wZW1XiDTDGiDRQ==
+"@babel/plugin-transform-classes@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.3.tgz#8d9a656bc3d01f3ff69e1fccb354b0f9d72ac544"
+ integrity sha512-irEX0ChJLaZVC7FvvRoSIxJlmk0IczFLcwaRXUArBKYHCHbOhe57aG8q3uw/fJsoSXvZhjRX960hyeAGlVBXZw==
dependencies:
"@babel/helper-annotate-as-pure" "^7.10.1"
- "@babel/helper-define-map" "^7.10.1"
- "@babel/helper-function-name" "^7.10.1"
- "@babel/helper-optimise-call-expression" "^7.10.1"
- "@babel/helper-plugin-utils" "^7.10.1"
+ "@babel/helper-define-map" "^7.10.3"
+ "@babel/helper-function-name" "^7.10.3"
+ "@babel/helper-optimise-call-expression" "^7.10.3"
+ "@babel/helper-plugin-utils" "^7.10.3"
"@babel/helper-replace-supers" "^7.10.1"
"@babel/helper-split-export-declaration" "^7.10.1"
globals "^11.1.0"
-"@babel/plugin-transform-computed-properties@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.1.tgz#59aa399064429d64dce5cf76ef9b90b7245ebd07"
- integrity sha512-mqSrGjp3IefMsXIenBfGcPXxJxweQe2hEIwMQvjtiDQ9b1IBvDUjkAtV/HMXX47/vXf14qDNedXsIiNd1FmkaQ==
+"@babel/plugin-transform-computed-properties@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.3.tgz#d3aa6eef67cb967150f76faff20f0abbf553757b"
+ integrity sha512-GWzhaBOsdbjVFav96drOz7FzrcEW6AP5nax0gLIpstiFaI3LOb2tAg06TimaWU6YKOfUACK3FVrxPJ4GSc5TgA==
dependencies:
- "@babel/helper-plugin-utils" "^7.10.1"
+ "@babel/helper-plugin-utils" "^7.10.3"
"@babel/plugin-transform-destructuring@^7.10.1":
version "7.10.1"
@@ -620,14 +620,14 @@
"@babel/helper-simple-access" "^7.10.1"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-systemjs@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.1.tgz#9962e4b0ac6aaf2e20431ada3d8ec72082cbffb6"
- integrity sha512-ewNKcj1TQZDL3YnO85qh9zo1YF1CHgmSTlRQgHqe63oTrMI85cthKtZjAiZSsSNjPQ5NCaYo5QkbYqEw1ZBgZA==
+"@babel/plugin-transform-modules-systemjs@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.3.tgz#004ae727b122b7b146b150d50cba5ffbff4ac56b"
+ integrity sha512-GWXWQMmE1GH4ALc7YXW56BTh/AlzvDWhUNn9ArFF0+Cz5G8esYlVbXfdyHa1xaD1j+GnBoCeoQNlwtZTVdiG/A==
dependencies:
- "@babel/helper-hoist-variables" "^7.10.1"
+ "@babel/helper-hoist-variables" "^7.10.3"
"@babel/helper-module-transforms" "^7.10.1"
- "@babel/helper-plugin-utils" "^7.10.1"
+ "@babel/helper-plugin-utils" "^7.10.3"
babel-plugin-dynamic-import-node "^2.3.3"
"@babel/plugin-transform-modules-umd@^7.10.1":
@@ -638,10 +638,10 @@
"@babel/helper-module-transforms" "^7.10.1"
"@babel/helper-plugin-utils" "^7.10.1"
-"@babel/plugin-transform-named-capturing-groups-regex@^7.8.3":
- version "7.8.3"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz#a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"
- integrity sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.3.tgz#a4f8444d1c5a46f35834a410285f2c901c007ca6"
+ integrity sha512-I3EH+RMFyVi8Iy/LekQm948Z4Lz4yKT7rK+vuCAeRm0kTa6Z5W7xuhRxDNJv0FPya/her6AUgrDITb70YHtTvA==
dependencies:
"@babel/helper-create-regexp-features-plugin" "^7.8.3"
@@ -675,10 +675,10 @@
dependencies:
"@babel/helper-plugin-utils" "^7.10.1"
-"@babel/plugin-transform-regenerator@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.1.tgz#10e175cbe7bdb63cc9b39f9b3f823c5c7c5c5490"
- integrity sha512-B3+Y2prScgJ2Bh/2l9LJxKbb8C8kRfsG4AdPT+n7ixBHIxJaIG8bi8tgjxUMege1+WqSJ+7gu1YeoMVO3gPWzw==
+"@babel/plugin-transform-regenerator@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.3.tgz#6ec680f140a5ceefd291c221cb7131f6d7e8cb6d"
+ integrity sha512-H5kNeW0u8mbk0qa1jVIVTeJJL6/TJ81ltD4oyPx0P499DhMJrTmmIFCmJ3QloGpQG8K9symccB7S7SJpCKLwtw==
dependencies:
regenerator-transform "^0.14.2"
@@ -690,12 +690,12 @@
"@babel/helper-plugin-utils" "^7.10.1"
"@babel/plugin-transform-runtime@^7.9.6":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.1.tgz#fd1887f749637fb2ed86dc278e79eb41df37f4b1"
- integrity sha512-4w2tcglDVEwXJ5qxsY++DgWQdNJcCCsPxfT34wCUwIf2E7dI7pMpH8JczkMBbgBTNzBX62SZlNJ9H+De6Zebaw==
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.3.tgz#3b287b06acc534a7cb6e6c71d6b1d88b1922dd6c"
+ integrity sha512-b5OzMD1Hi8BBzgQdRHyVVaYrk9zG0wset1it2o3BgonkPadXfOv0aXRqd7864DeOIu3FGKP/h6lr15FE5mahVw==
dependencies:
- "@babel/helper-module-imports" "^7.10.1"
- "@babel/helper-plugin-utils" "^7.10.1"
+ "@babel/helper-module-imports" "^7.10.3"
+ "@babel/helper-plugin-utils" "^7.10.3"
resolve "^1.8.1"
semver "^5.5.1"
@@ -721,13 +721,13 @@
"@babel/helper-plugin-utils" "^7.10.1"
"@babel/helper-regex" "^7.10.1"
-"@babel/plugin-transform-template-literals@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.1.tgz#914c7b7f4752c570ea00553b4284dad8070e8628"
- integrity sha512-t7B/3MQf5M1T9hPCRG28DNGZUuxAuDqLYS03rJrIk2prj/UV7Z6FOneijhQhnv/Xa039vidXeVbvjK2SK5f7Gg==
+"@babel/plugin-transform-template-literals@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.3.tgz#69d39b3d44b31e7b4864173322565894ce939b25"
+ integrity sha512-yaBn9OpxQra/bk0/CaA4wr41O0/Whkg6nqjqApcinxM7pro51ojhX6fv1pimAnVjVfDy14K0ULoRL70CA9jWWA==
dependencies:
"@babel/helper-annotate-as-pure" "^7.10.1"
- "@babel/helper-plugin-utils" "^7.10.1"
+ "@babel/helper-plugin-utils" "^7.10.3"
"@babel/plugin-transform-typeof-symbol@^7.10.1":
version "7.10.1"
@@ -752,23 +752,23 @@
"@babel/helper-plugin-utils" "^7.10.1"
"@babel/preset-env@^7.9.6":
- version "7.10.2"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.2.tgz#715930f2cf8573b0928005ee562bed52fb65fdfb"
- integrity sha512-MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA==
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.10.3.tgz#3e58c9861bbd93b6a679987c7e4bd365c56c80c9"
+ integrity sha512-jHaSUgiewTmly88bJtMHbOd1bJf2ocYxb5BWKSDQIP5tmgFuS/n0gl+nhSrYDhT33m0vPxp+rP8oYYgPgMNQlg==
dependencies:
- "@babel/compat-data" "^7.10.1"
+ "@babel/compat-data" "^7.10.3"
"@babel/helper-compilation-targets" "^7.10.2"
- "@babel/helper-module-imports" "^7.10.1"
- "@babel/helper-plugin-utils" "^7.10.1"
- "@babel/plugin-proposal-async-generator-functions" "^7.10.1"
+ "@babel/helper-module-imports" "^7.10.3"
+ "@babel/helper-plugin-utils" "^7.10.3"
+ "@babel/plugin-proposal-async-generator-functions" "^7.10.3"
"@babel/plugin-proposal-class-properties" "^7.10.1"
"@babel/plugin-proposal-dynamic-import" "^7.10.1"
"@babel/plugin-proposal-json-strings" "^7.10.1"
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.10.1"
"@babel/plugin-proposal-numeric-separator" "^7.10.1"
- "@babel/plugin-proposal-object-rest-spread" "^7.10.1"
+ "@babel/plugin-proposal-object-rest-spread" "^7.10.3"
"@babel/plugin-proposal-optional-catch-binding" "^7.10.1"
- "@babel/plugin-proposal-optional-chaining" "^7.10.1"
+ "@babel/plugin-proposal-optional-chaining" "^7.10.3"
"@babel/plugin-proposal-private-methods" "^7.10.1"
"@babel/plugin-proposal-unicode-property-regex" "^7.10.1"
"@babel/plugin-syntax-async-generators" "^7.8.0"
@@ -785,8 +785,8 @@
"@babel/plugin-transform-async-to-generator" "^7.10.1"
"@babel/plugin-transform-block-scoped-functions" "^7.10.1"
"@babel/plugin-transform-block-scoping" "^7.10.1"
- "@babel/plugin-transform-classes" "^7.10.1"
- "@babel/plugin-transform-computed-properties" "^7.10.1"
+ "@babel/plugin-transform-classes" "^7.10.3"
+ "@babel/plugin-transform-computed-properties" "^7.10.3"
"@babel/plugin-transform-destructuring" "^7.10.1"
"@babel/plugin-transform-dotall-regex" "^7.10.1"
"@babel/plugin-transform-duplicate-keys" "^7.10.1"
@@ -797,24 +797,24 @@
"@babel/plugin-transform-member-expression-literals" "^7.10.1"
"@babel/plugin-transform-modules-amd" "^7.10.1"
"@babel/plugin-transform-modules-commonjs" "^7.10.1"
- "@babel/plugin-transform-modules-systemjs" "^7.10.1"
+ "@babel/plugin-transform-modules-systemjs" "^7.10.3"
"@babel/plugin-transform-modules-umd" "^7.10.1"
- "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.10.3"
"@babel/plugin-transform-new-target" "^7.10.1"
"@babel/plugin-transform-object-super" "^7.10.1"
"@babel/plugin-transform-parameters" "^7.10.1"
"@babel/plugin-transform-property-literals" "^7.10.1"
- "@babel/plugin-transform-regenerator" "^7.10.1"
+ "@babel/plugin-transform-regenerator" "^7.10.3"
"@babel/plugin-transform-reserved-words" "^7.10.1"
"@babel/plugin-transform-shorthand-properties" "^7.10.1"
"@babel/plugin-transform-spread" "^7.10.1"
"@babel/plugin-transform-sticky-regex" "^7.10.1"
- "@babel/plugin-transform-template-literals" "^7.10.1"
+ "@babel/plugin-transform-template-literals" "^7.10.3"
"@babel/plugin-transform-typeof-symbol" "^7.10.1"
"@babel/plugin-transform-unicode-escapes" "^7.10.1"
"@babel/plugin-transform-unicode-regex" "^7.10.1"
"@babel/preset-modules" "^0.1.3"
- "@babel/types" "^7.10.2"
+ "@babel/types" "^7.10.3"
browserslist "^4.12.0"
core-js-compat "^3.6.2"
invariant "^2.2.2"
@@ -833,9 +833,9 @@
esutils "^2.0.2"
"@babel/runtime-corejs2@^7.0.0":
- version "7.10.2"
- resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.10.2.tgz#532f20b839684615f97e9f700f630e995efed426"
- integrity sha512-ZLwsFnNm3WpIARU1aLFtufjMHsmEnc8TjtrfAjmbgMbeoyR+LuQoyESoNdTfeDhL6IdY12SpeycXMgSgl8XGXA==
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.10.3.tgz#81bc99a96bfcb6db3f0dcf73fdc577cc554d341b"
+ integrity sha512-enKvnR/kKFbZFgXYo165wtSA5OeiTlgsnU4jV3vpKRhfWUJjLS6dfVcjIPeRcgJbgEgdgu0I+UyBWqu6c0GumQ==
dependencies:
core-js "^2.6.5"
regenerator-runtime "^0.13.4"
@@ -848,32 +848,32 @@
regenerator-runtime "^0.12.0"
"@babel/runtime@^7.0.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.6":
- version "7.10.2"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839"
- integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.3.tgz#670d002655a7c366540c67f6fd3342cd09500364"
+ integrity sha512-RzGO0RLSdokm9Ipe/YD+7ww8X2Ro79qiXZF3HU9ljrM+qnJmH1Vqth+hbiQZy761LnMJTMitHDuKVYTk3k4dLw==
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/template@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811"
- integrity sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==
+"@babel/template@^7.10.1", "@babel/template@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.3.tgz#4d13bc8e30bf95b0ce9d175d30306f42a2c9a7b8"
+ integrity sha512-5BjI4gdtD+9fHZUsaxPHPNpwa+xRkDO7c7JbhYn2afvrkDu5SfAAbi9AIMXw2xEhO/BR35TqiW97IqNvCo/GqA==
dependencies:
- "@babel/code-frame" "^7.10.1"
- "@babel/parser" "^7.10.1"
- "@babel/types" "^7.10.1"
+ "@babel/code-frame" "^7.10.3"
+ "@babel/parser" "^7.10.3"
+ "@babel/types" "^7.10.3"
-"@babel/traverse@^7.10.1":
- version "7.10.1"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz#bbcef3031e4152a6c0b50147f4958df54ca0dd27"
- integrity sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==
+"@babel/traverse@^7.10.1", "@babel/traverse@^7.10.3":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.3.tgz#0b01731794aa7b77b214bcd96661f18281155d7e"
+ integrity sha512-qO6623eBFhuPm0TmmrUFMT1FulCmsSeJuVGhiLodk2raUDFhhTECLd9E9jC4LBIWziqt4wgF6KuXE4d+Jz9yug==
dependencies:
- "@babel/code-frame" "^7.10.1"
- "@babel/generator" "^7.10.1"
- "@babel/helper-function-name" "^7.10.1"
+ "@babel/code-frame" "^7.10.3"
+ "@babel/generator" "^7.10.3"
+ "@babel/helper-function-name" "^7.10.3"
"@babel/helper-split-export-declaration" "^7.10.1"
- "@babel/parser" "^7.10.1"
- "@babel/types" "^7.10.1"
+ "@babel/parser" "^7.10.3"
+ "@babel/types" "^7.10.3"
debug "^4.1.0"
globals "^11.1.0"
lodash "^4.17.13"
@@ -887,12 +887,12 @@
lodash "^4.2.0"
to-fast-properties "^2.0.0"
-"@babel/types@^7.10.1", "@babel/types@^7.10.2", "@babel/types@^7.4.4", "@babel/types@^7.6.0":
- version "7.10.2"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d"
- integrity sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==
+"@babel/types@^7.10.1", "@babel/types@^7.10.3", "@babel/types@^7.4.4", "@babel/types@^7.6.0":
+ version "7.10.3"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.3.tgz#6535e3b79fea86a6b09e012ea8528f935099de8e"
+ integrity sha512-nZxaJhBXBQ8HVoIcGsf9qWep3Oh3jCENK54V4mRF7qaJabVsAYdbTtmSD8WmAp1R6ytPiu5apMwSXyxB1WlaBA==
dependencies:
- "@babel/helper-validator-identifier" "^7.10.1"
+ "@babel/helper-validator-identifier" "^7.10.3"
lodash "^4.17.13"
to-fast-properties "^2.0.0"
@@ -1038,6 +1038,11 @@
"@nodelib/fs.scandir" "2.1.3"
fastq "^1.6.0"
+"@popperjs/core@^2.3.2":
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.4.2.tgz#7c6dc4ecef16149fd7a736710baa1b811017fdca"
+ integrity sha512-JlGTGRYHC2QK+DDbePyXdBdooxFq2+noLfWpRqJtkxcb/oYWzOF0kcbfvvbWrwevCC1l6hLUg1wHYT+ona5BWQ==
+
"@sindresorhus/is@^0.14.0":
version "0.14.0"
resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
@@ -1053,9 +1058,9 @@
string-width "^2.0.0"
"@soda/get-current-script@^1.0.0":
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/@soda/get-current-script/-/get-current-script-1.0.1.tgz#f4afffcb36e069a801d5339c90499601c47a2516"
- integrity sha512-zeOomWIE52M9JpYXlsR3iOf7TXTTmNQHnSbqjMsQZ5phzfAenHzL/1+vQ0ZoJfagocK11LNf8vnn2JG0ufRMUQ==
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/@soda/get-current-script/-/get-current-script-1.0.2.tgz#a53515db25d8038374381b73af20bb4f2e508d87"
+ integrity sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w==
"@szmarczak/http-timer@^1.1.2":
version "1.1.2"
@@ -1139,9 +1144,9 @@
"@types/geojson" "*"
"@types/lodash@^4.14.141":
- version "4.14.155"
- resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.155.tgz#e2b4514f46a261fd11542e47519c20ebce7bc23a"
- integrity sha512-vEcX7S7aPhsBCivxMwAANQburHBtfN9RdyXFk84IJmu2Z4Hkg1tOFgaslRiEqqvoLtbCBi6ika1EMspE+NZ9Lg==
+ version "4.14.156"
+ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.156.tgz#cbe30909c89a1feeb7c60803e785344ea0ec82d1"
+ integrity sha512-l2AgHXcKUwx2DsvP19wtRPqZ4NkONjmorOdq4sMcxIjqdIuuV/ULo2ftuv4NUpevwfW7Ju/UKLqo0ZXuEt/8lQ==
"@types/minimatch@*":
version "3.0.3"
@@ -1229,9 +1234,9 @@
integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
"@types/tapable@*":
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.5.tgz#9adbc12950582aa65ead76bffdf39fe0c27a3c02"
- integrity sha512-/gG2M/Imw7cQFp8PGvz/SwocNrmKFjFsm5Pb8HdbHkZ1K8pmuPzOX4VeVoiEecFCVf4CsN1r3/BRvx+6sNqwtQ==
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74"
+ integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==
"@types/uglify-js@*":
version "3.9.2"
@@ -1303,13 +1308,13 @@
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
-"@typescript-eslint/experimental-utils@3.2.0":
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.2.0.tgz#4dab8fc9f44f059ec073470a81bb4d7d7d51e6c5"
- integrity sha512-UbJBsk+xO9dIFKtj16+m42EvUvsjZbbgQ2O5xSTSfVT1Z3yGkL90DVu0Hd3029FZ5/uBgl+F3Vo8FAcEcqc6aQ==
+"@typescript-eslint/experimental-utils@3.4.0":
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.4.0.tgz#8a44dfc6fb7f1d071937b390fe27608ebda122b8"
+ integrity sha512-rHPOjL43lOH1Opte4+dhC0a/+ks+8gOBwxXnyrZ/K4OTAChpSjP76fbI8Cglj7V5GouwVAGaK+xVwzqTyE/TPw==
dependencies:
"@types/json-schema" "^7.0.3"
- "@typescript-eslint/typescript-estree" "3.2.0"
+ "@typescript-eslint/typescript-estree" "3.4.0"
eslint-scope "^5.0.0"
eslint-utils "^2.0.0"
@@ -1324,13 +1329,13 @@
eslint-visitor-keys "^1.1.0"
"@typescript-eslint/parser@^3.0.0":
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.2.0.tgz#d9d7867456b1b8ecae9e724269b0bc932f06cbca"
- integrity sha512-Vhu+wwdevDLVDjK1lIcoD6ZbuOa93fzqszkaO3iCnmrScmKwyW/AGkzc2UvfE5TCoCXqq7Jyt6SOXjsIlpqF4A==
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.4.0.tgz#fe52b68c5cb3bba3f5d875bd17adb70420d49d8d"
+ integrity sha512-ZUGI/de44L5x87uX5zM14UYcbn79HSXUR+kzcqU42gH0AgpdB/TjuJy3m4ezI7Q/jk3wTQd755mxSDLhQP79KA==
dependencies:
"@types/eslint-visitor-keys" "^1.0.0"
- "@typescript-eslint/experimental-utils" "3.2.0"
- "@typescript-eslint/typescript-estree" "3.2.0"
+ "@typescript-eslint/experimental-utils" "3.4.0"
+ "@typescript-eslint/typescript-estree" "3.4.0"
eslint-visitor-keys "^1.1.0"
"@typescript-eslint/typescript-estree@2.34.0":
@@ -1346,10 +1351,10 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/typescript-estree@3.2.0":
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.2.0.tgz#c735f1ca6b4d3cd671f30de8c9bde30843e7ead8"
- integrity sha512-uh+Y2QO7dxNrdLw7mVnjUqkwO/InxEqwN0wF+Za6eo3coxls9aH9kQ/5rSvW2GcNanebRTmsT5w1/92lAOb1bA==
+"@typescript-eslint/typescript-estree@3.4.0":
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.4.0.tgz#6a787eb70b48969e4cd1ea67b057083f96dfee29"
+ integrity sha512-zKwLiybtt4uJb4mkG5q2t6+W7BuYx2IISiDNV+IY68VfoGwErDx/RfVI7SWL4gnZ2t1A1ytQQwZ+YOJbHHJ2rw==
dependencies:
debug "^4.1.1"
eslint-visitor-keys "^1.1.0"
@@ -1376,10 +1381,10 @@
lodash.kebabcase "^4.1.1"
svg-tags "^1.0.0"
-"@vue/babel-preset-app@^4.4.4":
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.4.4.tgz#e40929ca89ea3d547ea20cf0a15c222c9ad1ba38"
- integrity sha512-9b74d/lz4GEc9zkF3C+vjgEXYqu9ITq1DimUT+IVRJDvhgnV+a3C+pQY4Kl4PZSOyqkTHM7jE6eG2K5DUwKpWg==
+"@vue/babel-preset-app@^4.4.5":
+ version "4.4.5"
+ resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.4.5.tgz#f769fe270702bfaf39020592d1d7ed18eaa6e2d1"
+ integrity sha512-od8qd5TXR4lJtvxfhXlI4+sOLA3sNRXU8qMhPviGBi8sprppJoa5Lm4iomdX4B+C086b9WX4HuLFC1J/k7sVmw==
dependencies:
"@babel/core" "^7.9.6"
"@babel/helper-compilation-targets" "^7.9.6"
@@ -1444,39 +1449,39 @@
"@vue/babel-plugin-transform-vue-jsx" "^1.1.2"
camelcase "^5.0.0"
-"@vue/cli-overlay@^4.4.4":
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-4.4.4.tgz#43268a8cdcd3ad741dfa51006b576064fbbe6e8e"
- integrity sha512-cTvtifIpsSVF2dPF+ibUoAq+hMkEbg4EYTsf6dUuUrBKi1G2tyZ3Pnx54U2NpqXjJMykqMGX+i+BxpIG5tJCGw==
+"@vue/cli-overlay@^4.4.5":
+ version "4.4.5"
+ resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-4.4.5.tgz#feb7be0caac080927f1941612c0a8e41996190af"
+ integrity sha512-4RtoBpmnAODzHpUsuAAoZ5u4YEkcQHvdRXiC4yXEmk7Kfc8WXUC+n9UsIiXKhSTA7NUnQyWTL7nXaR9gQhn3Kg==
"@vue/cli-plugin-babel@~4.4.4":
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.4.4.tgz#18904b5e38173291b37054c2f0393fb8c748f37b"
- integrity sha512-VctlKy5oEYhI+AiPpzlorjDmuhbpoRQcKXpBdf2bXvq0+uuTQg7UXmPX0RKJejnFTKSJZvuPTihgfCWiyh9C3Q==
+ version "4.4.5"
+ resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.4.5.tgz#ebdd8f982c26b57642a122f574113d254aedfa2d"
+ integrity sha512-iw1blSJToR8pPONY6PU0yCYhJAOF1AD5pinO357QF8WiCzn2RMQ2l234brs/iU+3yjtPFVKXWrQ+OJDttkpjqQ==
dependencies:
"@babel/core" "^7.9.6"
- "@vue/babel-preset-app" "^4.4.4"
- "@vue/cli-shared-utils" "^4.4.4"
+ "@vue/babel-preset-app" "^4.4.5"
+ "@vue/cli-shared-utils" "^4.4.5"
babel-loader "^8.1.0"
cache-loader "^4.1.0"
thread-loader "^2.1.3"
webpack "^4.0.0"
"@vue/cli-plugin-e2e-cypress@~4.4.4":
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/@vue/cli-plugin-e2e-cypress/-/cli-plugin-e2e-cypress-4.4.4.tgz#2118623e881d14c422cbaffd967ed5c39dd6e8a9"
- integrity sha512-IYoI3gxO6kzaO8CdqSzFqdvFr649+oW3by3jTqenxu6q1w8YSs8RPPb3Q1E3CL6or4k9dMfGI9mmehF1pXB6eA==
+ version "4.4.5"
+ resolved "https://registry.yarnpkg.com/@vue/cli-plugin-e2e-cypress/-/cli-plugin-e2e-cypress-4.4.5.tgz#f41f350f62c8207fc7c770770868c08337cd34e6"
+ integrity sha512-G1fVajNPFNTJ3VDQk30V1fNMsUHlJMykzGVbS3HDS0INUrKrE4HWkwiYOb8G6sL1nQTMMD0FDSLn8saoACNk8A==
dependencies:
- "@vue/cli-shared-utils" "^4.4.4"
+ "@vue/cli-shared-utils" "^4.4.5"
cypress "^3.8.3"
eslint-plugin-cypress "^2.10.3"
"@vue/cli-plugin-eslint@~4.4.4":
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.4.4.tgz#19fd1da1863a90584b78939cce1ce94c49ed4388"
- integrity sha512-B+l3smq3Lyob9qiuywC/IymCCyV2Gm/l1ZtxRzQI98RDTKei1PrRriIi3Hrg/AkK59HirwR7P7wiNhF2Pqg3VA==
+ version "4.4.5"
+ resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.4.5.tgz#11eb77da1dba8f78302edb939d4a875fc7dded26"
+ integrity sha512-2igWVdzU367F/EZNNeTkEsd7F+jxVj3lq184Sip89yZHZsULk5BnCEsTJPBNAPfSRky3LF2Pj85t58erGdrHvw==
dependencies:
- "@vue/cli-shared-utils" "^4.4.4"
+ "@vue/cli-shared-utils" "^4.4.5"
eslint-loader "^2.2.1"
globby "^9.2.0"
inquirer "^7.1.0"
@@ -1484,28 +1489,28 @@
yorkie "^2.0.0"
"@vue/cli-plugin-pwa@~4.4.4":
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/@vue/cli-plugin-pwa/-/cli-plugin-pwa-4.4.4.tgz#d29e1f8e2ff9acb4b6ffa82b6f765a0aa4a8d90a"
- integrity sha512-V9MdKP5WPo0W/0eGmml93U2bdh4gyfaiZAWOD4BZQDBN/hk0Q32VaImVtYorLNU5uw66XbUHtsIseOSPOSR7PQ==
+ version "4.4.5"
+ resolved "https://registry.yarnpkg.com/@vue/cli-plugin-pwa/-/cli-plugin-pwa-4.4.5.tgz#b35c1f51c8f53d81fd7d328396b11c582c38e628"
+ integrity sha512-8IEgxWeTFHYOY5T7+LI9dAhWmHMSI9qqJ8EMcwQtGWcBac6fthXOhyafbFkEaVyW5gAMc1XCAyKv50KRgcXfcw==
dependencies:
- "@vue/cli-shared-utils" "^4.4.4"
+ "@vue/cli-shared-utils" "^4.4.5"
webpack "^4.0.0"
workbox-webpack-plugin "^4.3.1"
-"@vue/cli-plugin-router@^4.4.4", "@vue/cli-plugin-router@~4.4.4":
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-4.4.4.tgz#59e11dd55df854618616ad4f013b20c52e4a3a68"
- integrity sha512-jZTupo+zFz1YHH3Q4WC5nJW5wlNEDqX//m+atwUISPahVEG6/EV8HwJnQDT7EQ9re4v78xI27eOtyNw+qSyiSA==
+"@vue/cli-plugin-router@^4.4.5", "@vue/cli-plugin-router@~4.4.4":
+ version "4.4.5"
+ resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-4.4.5.tgz#9c987161ee3986744ce6bab7a3a09b5ec86c2759"
+ integrity sha512-vVTCQy4nYEDA8yqeJg8ohobDtAKCyuhkYDEzY0V9yoNzgSpRCgJtM0FDozPmaQpBHoeud17h2bf6hy6SuXUs3Q==
dependencies:
- "@vue/cli-shared-utils" "^4.4.4"
+ "@vue/cli-shared-utils" "^4.4.5"
"@vue/cli-plugin-typescript@~4.4.4":
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/@vue/cli-plugin-typescript/-/cli-plugin-typescript-4.4.4.tgz#bac7a4d33bc40df48ef1e49310183de029976e64"
- integrity sha512-7ds7JwrA10YnMAdIYE4PnFltiZzjMclaTl5J6Ibwh0tGwRqAIX+AJ3euX7KqYi2hcPGwFZPx8zhSQhrxtkdrZA==
+ version "4.4.5"
+ resolved "https://registry.yarnpkg.com/@vue/cli-plugin-typescript/-/cli-plugin-typescript-4.4.5.tgz#0db0c9abf5a74d9e7312231e5ee71eec829a7cdd"
+ integrity sha512-erQU38JW2oeSRP6MqFjNpeH85yBuNiHUb698zi89VPyphKdFtvuhDpx95hXmVF9UfbsCwe7vWX9Q9zJbxQLCAQ==
dependencies:
"@types/webpack-env" "^1.15.2"
- "@vue/cli-shared-utils" "^4.4.4"
+ "@vue/cli-shared-utils" "^4.4.5"
cache-loader "^4.1.0"
fork-ts-checker-webpack-plugin "^3.1.1"
globby "^9.2.0"
@@ -1516,33 +1521,33 @@
yorkie "^2.0.0"
"@vue/cli-plugin-unit-mocha@~4.4.4":
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/@vue/cli-plugin-unit-mocha/-/cli-plugin-unit-mocha-4.4.4.tgz#d190caea51d8852554c344babd9e03b8fe5a9775"
- integrity sha512-U+MZp0XYQUZcrkWE2g+CqPk6vA7qguCfCTr7bxhNMrhJSAdML4D3sTJN6+aoCNYs8+jNfyPfTkrKI4Ad6D/cRg==
+ version "4.4.5"
+ resolved "https://registry.yarnpkg.com/@vue/cli-plugin-unit-mocha/-/cli-plugin-unit-mocha-4.4.5.tgz#43a43063b8a8a42585406f4a32b5007dd89710a6"
+ integrity sha512-QePQkhMt2qMfFNRuhe7KN9ujfhBhWP0V58QGf+oP8LBfI8JsL2+qJCgr0JZ1AtZzFgOmfjiYN7V7Q0dfJ9PAtQ==
dependencies:
- "@vue/cli-shared-utils" "^4.4.4"
+ "@vue/cli-shared-utils" "^4.4.5"
jsdom "^15.2.1"
jsdom-global "^3.0.2"
mocha "^6.2.2"
mochapack "^1.1.15"
-"@vue/cli-plugin-vuex@^4.4.4":
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.4.4.tgz#42328c161978823a1eac97a07832a7aa225cbb9b"
- integrity sha512-A2SZD0B5yPz60W7go2ZYTIHooQse7bhhNUlinGQrdYeQCuURKUqqUbl/zF8u/8Qqo6nZ4F469fHNH6XWRN9Nnw==
+"@vue/cli-plugin-vuex@^4.4.5":
+ version "4.4.5"
+ resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.4.5.tgz#4c4cf7f2f2361fb82ca8cc2062521d6c9741b849"
+ integrity sha512-CyWWv41cgVE7vcq/NcuH6Ee0zqFJFvIqkWVf3as6S5wRdeF5VHuhBh+5/A0zPyZOL6FVs32khYqvez+x6tVdfg==
"@vue/cli-service@~4.4.4":
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-4.4.4.tgz#256c990e49a2ff8dc533b773c504a65435c75c4c"
- integrity sha512-AKWpBpBAB+LHJ8JpArM2BJ0I2REy9lG7xIkJn9k3Vw9gadejx+y74P0bJh/J8hY65kDTFltO1BW1Kv3URw/ifQ==
+ version "4.4.5"
+ resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-4.4.5.tgz#4e2c9d30bef47356f24834d0239301b68d414062"
+ integrity sha512-6EiH2Cr3GAjLFU2pmxEwU5uDqFG1kpT47UWRZD7CssZFfEVIkfo1bQdHapy/hS7p1u216bckzkRhNvdOUPvXkA==
dependencies:
"@intervolga/optimize-cssnano-plugin" "^1.0.5"
"@soda/friendly-errors-webpack-plugin" "^1.7.1"
"@soda/get-current-script" "^1.0.0"
- "@vue/cli-overlay" "^4.4.4"
- "@vue/cli-plugin-router" "^4.4.4"
- "@vue/cli-plugin-vuex" "^4.4.4"
- "@vue/cli-shared-utils" "^4.4.4"
+ "@vue/cli-overlay" "^4.4.5"
+ "@vue/cli-plugin-router" "^4.4.5"
+ "@vue/cli-plugin-vuex" "^4.4.5"
+ "@vue/cli-shared-utils" "^4.4.5"
"@vue/component-compiler-utils" "^3.1.2"
"@vue/preload-webpack-plugin" "^1.1.0"
"@vue/web-component-wrapper" "^1.2.0"
@@ -1589,10 +1594,10 @@
webpack-dev-server "^3.11.0"
webpack-merge "^4.2.2"
-"@vue/cli-shared-utils@^4.4.4":
- version "4.4.4"
- resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.4.4.tgz#b9685b73a604c8a7ee82d6fc3319fe7bb2cdb274"
- integrity sha512-ccMZtTMSutR35V5nrU/eyj+zRMomTRGBTLwJPmaJ2sRiW/93MTggQGXDWC8JRAA8yiU1N8xza8mjBxS0O2wIAA==
+"@vue/cli-shared-utils@^4.4.5":
+ version "4.4.5"
+ resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.4.5.tgz#fe5025a28043fec9d6a301107325433a63eafccc"
+ integrity sha512-DChYSjidHZmHtxROIp1WHlvhp06AkUzNBdkw0+uJ6FWHSQmkeRpsCU9XYTdsyRbatHzO0wnJ6GO+20yl3ZzLPw==
dependencies:
"@hapi/joi" "^15.0.1"
chalk "^2.4.2"
@@ -1604,7 +1609,6 @@
ora "^3.4.0"
read-pkg "^5.1.1"
request "^2.88.2"
- request-promise-native "^1.0.8"
semver "^6.1.0"
strip-ansi "^6.0.0"
@@ -1893,9 +1897,9 @@ acorn-walk@^6.0.1:
integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
acorn-walk@^7.1.1:
- version "7.1.1"
- resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.1.1.tgz#345f0dffad5c735e7373d2fec9a1023e6a44b83e"
- integrity sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+ integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
acorn@^3.1.0:
version "3.3.0"
@@ -1948,9 +1952,9 @@ ajv-errors@^1.0.0:
integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
- version "3.4.1"
- resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
- integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
+ version "3.5.0"
+ resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.0.tgz#5c894537098785926d71e696114a53ce768ed773"
+ integrity sha512-eyoaac3btgU8eJlvh01En8OCKzRqlLe2G5jDsCr3RiE2uLGMEEB1aaGwVVpwR8M95956tGH6R+9edC++OvzaVw==
ajv@5, ajv@^5.5.1:
version "5.5.2"
@@ -2519,16 +2523,16 @@ atob@^2.1.2:
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
autoprefixer@^9.8.0:
- version "9.8.0"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.0.tgz#68e2d2bef7ba4c3a65436f662d0a56a741e56511"
- integrity sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==
+ version "9.8.2"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.2.tgz#7347396ee576b18687041bfbacd76d78e27baa56"
+ integrity sha512-9UwMMU8Rg7Fj0c55mbOpXrr/2WrRqoOwOlLNTyyYt+nhiyQdIBWipp5XWzt+Lge8r3DK5y+EHMc1OBf8VpZA6Q==
dependencies:
browserslist "^4.12.0"
- caniuse-lite "^1.0.30001061"
- chalk "^2.4.2"
+ caniuse-lite "^1.0.30001084"
+ kleur "^4.0.1"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
- postcss "^7.0.30"
+ postcss "^7.0.32"
postcss-value-parser "^4.1.0"
aws-sign2@~0.7.0:
@@ -3181,10 +3185,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001061:
- version "1.0.30001083"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001083.tgz#52410c20c6f029f604f0d45eca0439a82e712442"
- integrity sha512-CnYJ27awX4h7yj5glfK7r1TOI13LBytpLzEgfj0s4mY75/F8pnQcYjL+oVpmS38FB59+vU0gscQ9D8tc+lIXvA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001084:
+ version "1.0.30001087"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001087.tgz#4a0bdc5998a114fcf8b7954e7ba6c2c29831c54a"
+ integrity sha512-KAQRGtt+eGCQBSp2iZTQibdCf9oe6cNTi5lmpsW38NnxP4WMYzfU6HCRmh4kJyh6LrTM9/uyElK4xcO93kafpg==
capture-stack-trace@^1.0.0:
version "1.0.1"
@@ -3631,9 +3635,9 @@ code-point-at@^1.0.0:
integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
codemirror@^5.39.0:
- version "5.54.0"
- resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.54.0.tgz#82b6adf662b29eeb7b867fe7839d49e25e4a0b38"
- integrity sha512-Pgf3surv4zvw+KaW3doUU7pGjF0BPU8/sj7eglWJjzni46U/DDW8pu3nZY0QgQKUcICDXRkq8jZmq0y6KhxM3Q==
+ version "5.55.0"
+ resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.55.0.tgz#23731f641288f202a6858fdc878f3149e0e04363"
+ integrity sha512-TumikSANlwiGkdF/Blnu/rqovZ0Y3Jh8yy9TqrPbSM0xxSucq3RgnpVDQ+mD9q6JERJEIT2FMuF/fBGfkhIR/g==
collapse-white-space@^1.0.2:
version "1.0.6"
@@ -4929,9 +4933,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.413:
- version "1.3.473"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.473.tgz#d0cd5fe391046fb70674ec98149f0f97609d29b8"
- integrity sha512-smevlzzMNz3vMz6OLeeCq5HRWEj2AcgccNPYnAx4Usx0IOciq9DU36RJcICcS09hXoY7t7deRfVYKD14IrGb9A==
+ version "1.3.481"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.481.tgz#0d59e72a0aaeb876b43fb1d6e84bf0dfc99617e8"
+ integrity sha512-q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA==
elegant-spinner@^1.0.1:
version "1.0.1"
@@ -4939,9 +4943,9 @@ elegant-spinner@^1.0.1:
integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=
elliptic@^6.0.0, elliptic@^6.5.2:
- version "6.5.2"
- resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz#05c5678d7173c049d8ca433552224a495d0e3762"
- integrity sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==
+ version "6.5.3"
+ resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6"
+ integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==
dependencies:
bn.js "^4.4.0"
brorand "^1.0.1"
@@ -4995,19 +4999,10 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
dependencies:
once "^1.4.0"
-enhanced-resolve@4.1.0:
- version "4.1.0"
- resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
- integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
- dependencies:
- graceful-fs "^4.1.2"
- memory-fs "^0.4.0"
- tapable "^1.0.0"
-
-enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
- version "4.1.1"
- resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz#2937e2b8066cd0fe7ce0990a98f0d71a35189f66"
- integrity sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==
+enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0, enhanced-resolve@^4.1.1:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz#5d43bda4a0fd447cb0ebbe71bef8deff8805ad0d"
+ integrity sha512-S7eiFb/erugyd1rLb6mQ3Vuq+EXHv5cpCkNqqIkYkBgN2QdFnyCZzFBleqwGEx4lgNGYij81BWnCrFNK7vxvjQ==
dependencies:
graceful-fs "^4.1.2"
memory-fs "^0.5.0"
@@ -5107,9 +5102,9 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
escodegen@^1.11.1, escodegen@^1.12.0:
- version "1.14.2"
- resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.2.tgz#14ab71bf5026c2aa08173afba22c6f3173284a84"
- integrity sha512-InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A==
+ version "1.14.3"
+ resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
+ integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
dependencies:
esprima "^4.0.1"
estraverse "^4.2.0"
@@ -5135,9 +5130,9 @@ eslint-config-prettier@^6.0.0, eslint-config-prettier@^6.11.0:
get-stdin "^6.0.0"
eslint-import-resolver-node@^0.3.3:
- version "0.3.3"
- resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404"
- integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==
+ version "0.3.4"
+ resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
+ integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
dependencies:
debug "^2.6.9"
resolve "^1.13.1"
@@ -5250,9 +5245,9 @@ eslint-utils@^2.0.0:
eslint-visitor-keys "^1.1.0"
eslint-visitor-keys@^1.1.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.2.0.tgz#74415ac884874495f78ec2a97349525344c981fa"
- integrity sha512-WFb4ihckKil6hu3Dp798xdzSfddwKKU3+nGniKF6HfeW6OLd2OUDEPP7TcHtB5+QXOKg2s6B2DaMPE1Nn/kxKQ==
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+ integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
eslint@^6.7.2, eslint@^6.8.0:
version "6.8.0"
@@ -5645,9 +5640,9 @@ fast-glob@^2.0.2, fast-glob@^2.2.6:
micromatch "^3.1.10"
fast-glob@^3.0.3:
- version "3.2.2"
- resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.2.tgz#ade1a9d91148965d4bf7c51f72e1ca662d32e63d"
- integrity sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==
+ version "3.2.4"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.4.tgz#d20aefbf99579383e7f3cc66529158c9b98554d3"
+ integrity sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==
dependencies:
"@nodelib/fs.stat" "^2.0.2"
"@nodelib/fs.walk" "^1.2.3"
@@ -5859,7 +5854,7 @@ find@^0.2.7:
dependencies:
traverse-chain "~0.1.0"
-findup-sync@3.0.0:
+findup-sync@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
@@ -5917,11 +5912,9 @@ flush-write-stream@^1.0.0:
readable-stream "^2.3.6"
follow-redirects@^1.0.0:
- version "1.11.0"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb"
- integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==
- dependencies:
- debug "^3.0.0"
+ version "1.12.1"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.12.1.tgz#de54a6205311b93d60398ebc01cf7015682312b6"
+ integrity sha512-tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg==
for-in@^1.0.2:
version "1.0.2"
@@ -6260,7 +6253,7 @@ global-dirs@^0.1.0:
dependencies:
ini "^1.3.4"
-global-modules@2.0.0:
+global-modules@2.0.0, global-modules@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
@@ -7106,7 +7099,7 @@ import-lazy@^2.1.0:
resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
-import-local@2.0.0, import-local@^2.0.0:
+import-local@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
@@ -7268,12 +7261,7 @@ internal-ip@^4.3.0:
default-gateway "^4.2.0"
ipaddr.js "^1.9.0"
-interpret@1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
- integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
-
-interpret@^1.0.0, interpret@^1.2.0:
+interpret@^1.0.0, interpret@^1.2.0, interpret@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
@@ -7858,9 +7846,9 @@ jest-worker@^25.4.0:
supports-color "^7.0.0"
js-base64@^2.1.8, js-base64@^2.1.9, js-base64@^2.3.2:
- version "2.5.2"
- resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz#313b6274dda718f714d00b3330bbae6e38e90209"
- integrity sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==
+ version "2.6.1"
+ resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.1.tgz#c328374225d2e65569791ded73c258e2c59334c7"
+ integrity sha512-G5x2saUTupU9D/xBY9snJs3TxvwX8EkpLFiYlPpDt/VmMHOXprnSU1nxiTmFbijCX4BLF/cMRIfAcC5BiMYgFQ==
js-beautify@^1.6.12:
version "1.11.0"
@@ -8224,6 +8212,11 @@ kleur@^3.0.3:
resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
+kleur@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.0.1.tgz#3d4948534b666e2578f93b6fafb62108e64f05ef"
+ integrity sha512-Qs6SqCLm63rd0kNVh+wO4XsWLU6kgfwwaPYsLiClWf0Tewkzsa6MvB21bespb8cz+ANS+2t3So1ge3gintzhlw==
+
latest-version@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
@@ -8817,7 +8810,7 @@ memory-fs@^0.2.0:
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290"
integrity sha1-8rslNovBIeORwlIN6Slpyu4KApA=
-memory-fs@^0.4.0, memory-fs@^0.4.1:
+memory-fs@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
@@ -9605,9 +9598,9 @@ object-hash@^1.1.4:
integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
object-inspect@^1.7.0:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
- integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
+ integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
object-is@^1.0.1:
version "1.1.2"
@@ -9845,7 +9838,7 @@ os-locale@^2.0.0:
lcid "^1.0.0"
mem "^1.1.0"
-os-locale@^3.0.0, os-locale@^3.1.0:
+os-locale@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
@@ -10312,7 +10305,7 @@ pnp-webpack-plugin@^1.6.4:
dependencies:
ts-pnp "^1.1.6"
-popper.js@^1.14.7, popper.js@^1.15.0:
+popper.js@^1.15.0:
version "1.16.1"
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
@@ -10691,7 +10684,7 @@ postcss@^5.2.17:
source-map "^0.5.6"
supports-color "^3.2.3"
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.27, postcss@^7.0.30, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
version "7.0.32"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
@@ -11908,7 +11901,7 @@ request-promise-core@1.1.3:
dependencies:
lodash "^4.17.15"
-request-promise-native@^1.0.7, request-promise-native@^1.0.8:
+request-promise-native@^1.0.7:
version "1.0.8"
resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36"
integrity sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==
@@ -13061,13 +13054,6 @@ supports-color@6.0.0:
dependencies:
has-flag "^3.0.0"
-supports-color@6.1.0, supports-color@^6.1.0:
- version "6.1.0"
- resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
- integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
- dependencies:
- has-flag "^3.0.0"
-
supports-color@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -13080,6 +13066,13 @@ supports-color@^3.2.3:
dependencies:
has-flag "^1.0.0"
+supports-color@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+ integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+ dependencies:
+ has-flag "^3.0.0"
+
supports-color@^7.0.0, supports-color@^7.1.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
@@ -13268,9 +13261,9 @@ terser-webpack-plugin@^2.2.1, terser-webpack-plugin@^2.2.2, terser-webpack-plugi
webpack-sources "^1.4.3"
terser@^4.1.2, terser@^4.6.12:
- version "4.7.0"
- resolved "https://registry.yarnpkg.com/terser/-/terser-4.7.0.tgz#15852cf1a08e3256a80428e865a2fa893ffba006"
- integrity sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==
+ version "4.8.0"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
+ integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
dependencies:
commander "^2.20.0"
source-map "~0.6.1"
@@ -13289,9 +13282,9 @@ thenify-all@^1.0.0:
thenify ">= 3.1.0 < 4"
"thenify@>= 3.1.0 < 4":
- version "3.3.0"
- resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.0.tgz#e69e38a1babe969b0108207978b9f62b88604839"
- integrity sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/thenify/-/thenify-3.3.1.tgz#8932e686a4066038a016dd9e2ca46add9838a95f"
+ integrity sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==
dependencies:
any-promise "^1.0.0"
@@ -13359,12 +13352,12 @@ tiny-warning@^1.0.2:
resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
-tippy.js@4.3.5:
- version "4.3.5"
- resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-4.3.5.tgz#882bff8d92f09bb0546d2826d5668c0560006f54"
- integrity sha512-NDq3efte8nGK6BOJ1dDN1/WelAwfmh3UtIYXXck6+SxLzbIQNZE/cmRSnwScZ/FyiKdIcvFHvYUgqmoGx8CcyA==
+tippy.js@^6.2.3:
+ version "6.2.3"
+ resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.2.3.tgz#0a5db67dc6bd9129233b26052b7ae2b2047fd73e"
+ integrity sha512-MzqHMrr2C0IC8ZUnG5kLQPxonWJ7V+Usqiy2W5b+dCvAfousio0mA85h+Ea5wRq94AQGd8mbFGeciRgkP+F+7w==
dependencies:
- popper.js "^1.14.7"
+ "@popperjs/core" "^2.3.2"
tiptap-commands@^1.13.1:
version "1.13.1"
@@ -13380,7 +13373,7 @@ tiptap-commands@^1.13.1:
prosemirror-utils "0.9.6"
tiptap-utils "^1.9.1"
-tiptap-extensions@^1.28.0:
+tiptap-extensions@^1.29.1:
version "1.29.1"
resolved "https://registry.yarnpkg.com/tiptap-extensions/-/tiptap-extensions-1.29.1.tgz#70679bd57ffcc6a67358f58d03e574b40e0432bb"
integrity sha512-xwBvlGAN0W9+F5DB/s/pH8LcOaUq7WgPffv7KOGU26jmPKq8JAXXwZXn8DOmPYaRo9RscF0Tg9AADOM+0vcLkQ==
@@ -14148,12 +14141,7 @@ v-tooltip@2.0.2:
popper.js "^1.15.0"
vue-resize "^0.4.5"
-v8-compile-cache@2.0.3:
- version "2.0.3"
- resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
- integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
-
-v8-compile-cache@^2.0.3:
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
@@ -14238,12 +14226,12 @@ vue-class-component@^7.2.3:
resolved "https://registry.yarnpkg.com/vue-class-component/-/vue-class-component-7.2.3.tgz#a5b1abd53513a72ad51098752e2dedd499807cca"
integrity sha512-oEqYpXKaFN+TaXU+mRLEx8dX0ah85aAJEe61mpdoUrq0Bhe/6sWhyZX1JjMQLhVsHAkncyhedhmCdDVSasUtDw==
-vue-cli-plugin-styleguidist@~4.24.0:
- version "4.24.1"
- resolved "https://registry.yarnpkg.com/vue-cli-plugin-styleguidist/-/vue-cli-plugin-styleguidist-4.24.1.tgz#0ac3fee6ce3b9836b1ff1c2bd8cddc962b1e528a"
- integrity sha512-SK4aP2xIjyVqBHEj6rDjymOErDhvebQ84i4W1raU1IUjP1VBEsFqTMrWzPe9y9R+wt4KFaR9EOX87j2MqS+gYg==
+vue-cli-plugin-styleguidist@^4.25.0:
+ version "4.25.0"
+ resolved "https://registry.yarnpkg.com/vue-cli-plugin-styleguidist/-/vue-cli-plugin-styleguidist-4.25.0.tgz#8aab348db3983217c7be63cd92f8ad462cd4da89"
+ integrity sha512-7TPPOscE2j+0otWy5EFAS6us48mBEfGboycJE8bStSbnImNtBEBmIwAx2Jy8sd8Mnf1biSl0fzMzPizd1MVylQ==
dependencies:
- vue-styleguidist "^4.24.1"
+ vue-styleguidist "^4.25.0"
webpack-merge "^4.2.1"
vue-cli-plugin-svg@~0.1.3:
@@ -14257,10 +14245,10 @@ vue-cli-plugin-svg@~0.1.3:
url-loader "^2.0.0"
vue-svg-loader "^0.12.0"
-vue-docgen-api@^4.24.0:
- version "4.24.0"
- resolved "https://registry.yarnpkg.com/vue-docgen-api/-/vue-docgen-api-4.24.0.tgz#d258e299958c9a9d6c8c573afeaed7dd205a17a9"
- integrity sha512-alb0lJSUMEaMxQw6/THemXnwCUVQGsFhR9VyrCmkHe2LpoIB8dfLgqTK9DrsGJS0iCy/qVWxeflr+ybgQREXpA==
+vue-docgen-api@^4.25.0:
+ version "4.25.0"
+ resolved "https://registry.yarnpkg.com/vue-docgen-api/-/vue-docgen-api-4.25.0.tgz#844d68c0badf0e30284283df94a2d544958b553a"
+ integrity sha512-HlYQ7MK9AhkXfnTlJcNWMDvCnSo1q6M0lbO0U39OdEUoQpzYqzBXSMvPZjuvYe6Tmdhuhl2PD7L37J5RspkVnw==
dependencies:
"@babel/parser" "^7.6.0"
"@babel/types" "^7.6.0"
@@ -14343,10 +14331,10 @@ vue-meta@^2.3.1:
dependencies:
deepmerge "^4.2.2"
-vue-property-decorator@^8.4.1:
- version "8.5.0"
- resolved "https://registry.yarnpkg.com/vue-property-decorator/-/vue-property-decorator-8.5.0.tgz#9af64c5301413f4732640cc0d046879417e64994"
- integrity sha512-0RueJN/shPWf5gM8GLUD6bYiXr+q7bu+S1tgr7XwgBSng10H5DLQjVYfJ5XHAOPFo7fBfY1nxljBQ95qryAiWg==
+vue-property-decorator@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/vue-property-decorator/-/vue-property-decorator-9.0.0.tgz#0a5f6d47d33ca62a8876108ccfa65c2c4fb7325a"
+ integrity sha512-oegTNPItuHOkW0AP1MnbdNwkmyhfsUIIXvIRHpgC18tVoEo21/i6kItyeekjMs8JgZJeuHzsaTc/DZaJFH4IWQ==
vue-resize@^0.4.5:
version "0.4.5"
@@ -14373,10 +14361,10 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
hash-sum "^1.0.2"
loader-utils "^1.0.2"
-vue-styleguidist@^4.24.1:
- version "4.24.1"
- resolved "https://registry.yarnpkg.com/vue-styleguidist/-/vue-styleguidist-4.24.1.tgz#1c1e569e838cbe59e97fe1cea175c3e03e625a79"
- integrity sha512-N3YVnNKQk57E+R/cAUi/QvZLxqzpPaMASv43jyFlf6GdK3p3smQ/4jHB7yheg8nJdjG/4BV+CV88VZV+HnUmSg==
+vue-styleguidist@^4.25.0:
+ version "4.25.0"
+ resolved "https://registry.yarnpkg.com/vue-styleguidist/-/vue-styleguidist-4.25.0.tgz#280cd6addefd0aa7d0f4047af56c0b17c5fcf2f2"
+ integrity sha512-tmKA+iHlbDKFJ2EIK6zQ9eeKXdoNPCuWKGKxdO3oiIdS8t47SslIJQ6TCQHQEx0CkGv1B4EHPybAouiJGSsTSw==
dependencies:
"@vxna/mini-html-webpack-template" "^1.0.0"
ast-types "^0.13.2"
@@ -14426,7 +14414,7 @@ vue-styleguidist@^4.24.1:
style-loader "^1.0.0"
terser-webpack-plugin "^2.2.2"
to-ast "^1.0.0"
- vue-docgen-api "^4.24.0"
+ vue-docgen-api "^4.25.0"
vue-inbrowser-compiler "^4.23.3"
vue-inbrowser-compiler-utils "^4.23.3"
webpack-dev-server "^3.11.0"
@@ -14561,21 +14549,21 @@ webpack-chain@^6.4.0:
javascript-stringify "^2.0.1"
webpack-cli@^3.3.11:
- version "3.3.11"
- resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz#3bf21889bf597b5d82c38f215135a411edfdc631"
- integrity sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==
+ version "3.3.12"
+ resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz#94e9ada081453cd0aa609c99e500012fd3ad2d4a"
+ integrity sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==
dependencies:
- chalk "2.4.2"
- cross-spawn "6.0.5"
- enhanced-resolve "4.1.0"
- findup-sync "3.0.0"
- global-modules "2.0.0"
- import-local "2.0.0"
- interpret "1.2.0"
- loader-utils "1.2.3"
- supports-color "6.1.0"
- v8-compile-cache "2.0.3"
- yargs "13.2.4"
+ chalk "^2.4.2"
+ cross-spawn "^6.0.5"
+ enhanced-resolve "^4.1.1"
+ findup-sync "^3.0.0"
+ global-modules "^2.0.0"
+ import-local "^2.0.0"
+ interpret "^1.4.0"
+ loader-utils "^1.4.0"
+ supports-color "^6.1.0"
+ v8-compile-cache "^2.1.1"
+ yargs "^13.3.2"
webpack-dev-middleware@^3.7.2:
version "3.7.2"
@@ -15045,7 +15033,7 @@ yaml-ast-parser@^0.0.40:
resolved "https://registry.yarnpkg.com/yaml-ast-parser/-/yaml-ast-parser-0.0.40.tgz#08536d4e73d322b1c9ce207ab8dd70e04d20ae6e"
integrity sha1-CFNtTnPTIrHJziB6uN1w4E0grm4=
-yargs-parser@13.1.2, yargs-parser@^13.1.0, yargs-parser@^13.1.1, yargs-parser@^13.1.2:
+yargs-parser@13.1.2, yargs-parser@^13.1.1, yargs-parser@^13.1.2:
version "13.1.2"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
@@ -15110,23 +15098,6 @@ yargs@12.0.5:
y18n "^3.2.1 || ^4.0.0"
yargs-parser "^11.1.1"
-yargs@13.2.4:
- version "13.2.4"
- resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
- integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
- dependencies:
- cliui "^5.0.0"
- find-up "^3.0.0"
- get-caller-file "^2.0.1"
- os-locale "^3.1.0"
- require-directory "^2.1.1"
- require-main-filename "^2.0.0"
- set-blocking "^2.0.0"
- string-width "^3.0.0"
- which-module "^2.0.0"
- y18n "^4.0.0"
- yargs-parser "^13.1.0"
-
yargs@13.3.2, yargs@^13.3.0, yargs@^13.3.2:
version "13.3.2"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
diff --git a/lib/graphql/resolvers/admin.ex b/lib/graphql/resolvers/admin.ex
index 2d0634a31..29cd1470f 100644
--- a/lib/graphql/resolvers/admin.ex
+++ b/lib/graphql/resolvers/admin.ex
@@ -161,11 +161,16 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
{:ok,
%{
instance_description: Config.instance_description(),
+ instance_long_description: Config.instance_long_description(),
instance_name: Config.instance_name(),
registrations_open: Config.instance_registrations_open?(),
+ contact: Config.contact(),
instance_terms: Config.instance_terms(),
instance_terms_type: Config.instance_terms_type(),
instance_terms_url: Config.instance_terms_url(),
+ instance_privacy_policy: Config.instance_privacy(),
+ instance_privacy_policy_type: Config.instance_privacy_type(),
+ instance_privacy_policy_url: Config.instance_privacy_url(),
instance_rules: Config.instance_rules()
}}
end
diff --git a/lib/graphql/resolvers/config.ex b/lib/graphql/resolvers/config.ex
index 44ddb3864..0e6aadf4f 100644
--- a/lib/graphql/resolvers/config.ex
+++ b/lib/graphql/resolvers/config.ex
@@ -41,6 +41,19 @@ defmodule Mobilizon.GraphQL.Resolvers.Config do
{:ok, %{body_html: body_html, type: type, url: url}}
end
+ def privacy(_parent, %{locale: locale}, _resolution) do
+ type = Config.instance_privacy_type()
+
+ {url, body_html} =
+ case type do
+ "URL" -> {Config.instance_privacy_url(), nil}
+ "DEFAULT" -> {nil, Config.generate_privacy(locale)}
+ _ -> {nil, Config.instance_privacy(locale)}
+ end
+
+ {:ok, %{body_html: body_html, type: type, url: url}}
+ end
+
defp config_cache do
case Cachex.fetch(:config, "full_config", fn _key ->
case build_config_cache() do
@@ -58,8 +71,10 @@ defmodule Mobilizon.GraphQL.Resolvers.Config do
name: Config.instance_name(),
registrations_open: Config.instance_registrations_open?(),
registrations_whitelist: Config.instance_registrations_whitelist?(),
+ contact: Config.contact(),
demo_mode: Config.instance_demo_mode?(),
description: Config.instance_description(),
+ long_description: Config.instance_long_description(),
anonymous: %{
participation: %{
allowed: Config.anonymous_participation?(),
@@ -107,7 +122,9 @@ defmodule Mobilizon.GraphQL.Resolvers.Config do
features: %{
groups: Config.instance_group_feature_enabled?()
},
- rules: Config.instance_rules()
+ rules: Config.instance_rules(),
+ version: Config.instance_version(),
+ federating: Config.instance_federating()
}
end
end
diff --git a/lib/graphql/resolvers/statistics.ex b/lib/graphql/resolvers/statistics.ex
new file mode 100644
index 000000000..4cf8b4227
--- /dev/null
+++ b/lib/graphql/resolvers/statistics.ex
@@ -0,0 +1,19 @@
+defmodule Mobilizon.GraphQL.Resolvers.Statistics do
+ @moduledoc """
+ Handles the statistics-related GraphQL calls.
+ """
+
+ alias Mobilizon.Service.Statistics, as: StatisticsModule
+
+ @doc """
+ Gets config.
+ """
+ def get_statistics(_parent, _params, _context) do
+ {:ok,
+ %{
+ number_of_users: StatisticsModule.get_cached_value(:local_users),
+ number_of_events: StatisticsModule.get_cached_value(:local_events),
+ number_of_comments: StatisticsModule.get_cached_value(:local_comments)
+ }}
+ end
+end
diff --git a/lib/graphql/schema.ex b/lib/graphql/schema.ex
index 2bb98e959..3f20d9f11 100644
--- a/lib/graphql/schema.ex
+++ b/lib/graphql/schema.ex
@@ -32,6 +32,7 @@ defmodule Mobilizon.GraphQL.Schema do
import_types(Schema.ConfigType)
import_types(Schema.ReportType)
import_types(Schema.AdminType)
+ import_types(Schema.StatisticsType)
@desc "A struct containing the id of the deleted object"
object :deleted_object do
@@ -137,6 +138,7 @@ defmodule Mobilizon.GraphQL.Schema do
import_fields(:todo_queries)
import_fields(:conversation_queries)
import_fields(:resource_queries)
+ import_fields(:statistics_queries)
end
@desc """
diff --git a/lib/graphql/schema/admin.ex b/lib/graphql/schema/admin.ex
index c9e62a439..2d85474a1 100644
--- a/lib/graphql/schema/admin.ex
+++ b/lib/graphql/schema/admin.ex
@@ -75,9 +75,14 @@ defmodule Mobilizon.GraphQL.Schema.AdminType do
object :admin_settings do
field(:instance_name, :string)
field(:instance_description, :string)
+ field(:instance_long_description, :string)
+ field(:contact, :string)
field(:instance_terms, :string)
field(:instance_terms_type, :instance_terms_type)
field(:instance_terms_url, :string)
+ field(:instance_privacy_policy, :string)
+ field(:instance_privacy_policy_type, :instance_privacy_type)
+ field(:instance_privacy_policy_url, :string)
field(:instance_rules, :string)
field(:registrations_open, :boolean)
end
@@ -88,6 +93,12 @@ defmodule Mobilizon.GraphQL.Schema.AdminType do
value(:custom, as: "CUSTOM")
end
+ enum :instance_privacy_type do
+ value(:url, as: "URL")
+ value(:default, as: "DEFAULT")
+ value(:custom, as: "CUSTOM")
+ end
+
object :admin_queries do
@desc "Get the list of action logs"
field :action_logs, type: list_of(:action_log) do
@@ -151,9 +162,14 @@ defmodule Mobilizon.GraphQL.Schema.AdminType do
field :save_admin_settings, type: :admin_settings do
arg(:instance_name, :string)
arg(:instance_description, :string)
+ arg(:instance_long_description, :string)
+ arg(:contact, :string)
arg(:instance_terms, :string)
arg(:instance_terms_type, :instance_terms_type)
arg(:instance_terms_url, :string)
+ arg(:instance_privacy_policy, :string)
+ arg(:instance_privacy_policy_type, :instance_privacy_type)
+ arg(:instance_privacy_policy_url, :string)
arg(:instance_rules, :string)
arg(:registrations_open, :boolean)
diff --git a/lib/graphql/schema/config.ex b/lib/graphql/schema/config.ex
index 19b390191..b9cbf36da 100644
--- a/lib/graphql/schema/config.ex
+++ b/lib/graphql/schema/config.ex
@@ -11,6 +11,8 @@ defmodule Mobilizon.GraphQL.Schema.ConfigType do
# Instance name
field(:name, :string)
field(:description, :string)
+ field(:long_description, :string)
+ field(:contact, :string)
field(:registrations_open, :boolean)
field(:registrations_whitelist, :boolean)
@@ -23,12 +25,19 @@ defmodule Mobilizon.GraphQL.Schema.ConfigType do
field(:resource_providers, list_of(:resource_provider))
field(:timezones, list_of(:string))
field(:features, :features)
+ field(:version, :string)
+ field(:federating, :boolean)
field(:terms, :terms, description: "The instance's terms") do
arg(:locale, :string, default_value: "en")
resolve(&Config.terms/3)
end
+ field(:privacy, :privacy, description: "The instance's privacy policy") do
+ arg(:locale, :string, default_value: "en")
+ resolve(&Config.privacy/3)
+ end
+
field(:rules, :string, description: "The instance's rules")
end
@@ -38,6 +47,12 @@ defmodule Mobilizon.GraphQL.Schema.ConfigType do
field(:body_html, :string)
end
+ object :privacy do
+ field(:url, :string)
+ field(:type, :instance_privacy_type)
+ field(:body_html, :string)
+ end
+
object :lonlat do
field(:longitude, :float)
field(:latitude, :float)
diff --git a/lib/graphql/schema/statistics.ex b/lib/graphql/schema/statistics.ex
new file mode 100644
index 000000000..ebb2ba2ca
--- /dev/null
+++ b/lib/graphql/schema/statistics.ex
@@ -0,0 +1,23 @@
+defmodule Mobilizon.GraphQL.Schema.StatisticsType do
+ @moduledoc """
+ Schema representation for Statistics
+ """
+ use Absinthe.Schema.Notation
+
+ alias Mobilizon.GraphQL.Resolvers.Statistics
+
+ @desc "A statistics object"
+ object :statistics do
+ # Instance name
+ field(:number_of_users, :integer, description: "The number of local users")
+ field(:number_of_events, :integer, description: "The number of local events")
+ field(:number_of_comments, :integer, description: "The number of local comments")
+ end
+
+ object :statistics_queries do
+ @desc "Get the instance statistics"
+ field :statistics, :statistics do
+ resolve(&Statistics.get_statistics/3)
+ end
+ end
+end
diff --git a/lib/mobilizon/config.ex b/lib/mobilizon/config.ex
index 0b4a97f70..bbcdb9db5 100644
--- a/lib/mobilizon/config.ex
+++ b/lib/mobilizon/config.ex
@@ -5,6 +5,7 @@ defmodule Mobilizon.Config do
alias Mobilizon.Actors
alias Mobilizon.Actors.Actor
+ alias Mobilizon.Service.GitStatus
@spec instance_config :: keyword
def instance_config, do: Application.get_env(:mobilizon, :instance)
@@ -27,28 +28,62 @@ defmodule Mobilizon.Config do
instance_config()[:description]
)
+ @spec instance_long_description :: String.t()
+ def instance_long_description,
+ do:
+ Mobilizon.Admin.get_admin_setting_value(
+ "instance",
+ "instance_long_description"
+ )
+
+ @spec contact :: String.t()
+ def contact do
+ Mobilizon.Admin.get_admin_setting_value("instance", "contact")
+ end
+
@spec instance_terms(String.t()) :: String.t()
def instance_terms(locale \\ "en") do
Mobilizon.Admin.get_admin_setting_value("instance", "instance_terms", generate_terms(locale))
end
- @spec instance_terms :: String.t()
+ @spec instance_terms_type :: String.t()
def instance_terms_type do
Mobilizon.Admin.get_admin_setting_value("instance", "instance_terms_type", "DEFAULT")
end
- @spec instance_terms :: String.t()
+ @spec instance_terms_url :: String.t()
def instance_terms_url do
Mobilizon.Admin.get_admin_setting_value("instance", "instance_terms_url")
end
+ @spec instance_privacy(String.t()) :: String.t()
+ def instance_privacy(locale \\ "en") do
+ Mobilizon.Admin.get_admin_setting_value(
+ "instance",
+ "instance_privacy_policy",
+ generate_privacy(locale)
+ )
+ end
+
+ @spec instance_privacy_type :: String.t()
+ def instance_privacy_type do
+ Mobilizon.Admin.get_admin_setting_value("instance", "instance_privacy_policy_type", "DEFAULT")
+ end
+
+ @spec instance_privacy_url :: String.t()
+ def instance_privacy_url do
+ Mobilizon.Admin.get_admin_setting_value("instance", "instance_privacy_policy_url")
+ end
+
@spec instance_rules :: String.t()
def instance_rules do
Mobilizon.Admin.get_admin_setting_value("instance", "instance_rules")
end
@spec instance_version :: String.t()
- def instance_version, do: Mix.Project.config()[:version]
+ def instance_version do
+ GitStatus.commit()
+ end
@spec instance_hostname :: String.t()
def instance_hostname, do: instance_config()[:hostname]
@@ -84,7 +119,10 @@ defmodule Mobilizon.Config do
@spec instance_user_agent :: String.t()
def instance_user_agent,
- do: "#{instance_name()} #{instance_hostname()} - Mobilizon #{Mix.Project.config()[:version]}"
+ do: "#{instance_name()} #{instance_hostname()} - Mobilizon #{instance_version()}"
+
+ @spec instance_federating :: String.t()
+ def instance_federating, do: instance_config()[:federating]
@spec instance_geocoding_provider :: atom()
def instance_geocoding_provider,
@@ -255,7 +293,38 @@ defmodule Mobilizon.Config do
Phoenix.View.render_to_string(
Mobilizon.Web.APIView,
"terms.html",
- []
+ %{
+ instance_name: instance_name(),
+ instance_url: instance_hostname(),
+ instance_contact: instance_contact_html()
+ }
)
end
+
+ def generate_privacy(locale) do
+ import Mobilizon.Web.Gettext
+ put_locale(locale)
+
+ Phoenix.View.render_to_string(
+ Mobilizon.Web.APIView,
+ "privacy.html",
+ %{instance_name: instance_name()}
+ )
+ end
+
+ defp instance_contact_html do
+ contact = contact()
+
+ cond do
+ String.contains?(contact, "@") ->
+ "<a href=\"mailto:#{contact}\">#{contact}</a>"
+
+ String.match?(contact, ~r/^https?:\/\//) ->
+ %URI{host: host} = URI.parse(contact)
+ "<a href=\"#{contact}\">#{host}</a>"
+
+ true ->
+ contact
+ end
+ end
end
diff --git a/lib/service/git_status.ex b/lib/service/git_status.ex
new file mode 100644
index 000000000..0d6e7a36b
--- /dev/null
+++ b/lib/service/git_status.ex
@@ -0,0 +1,21 @@
+defmodule Mobilizon.Service.GitStatus do
+ @moduledoc """
+ See https://github.com/CrowdHailer/git_status/
+ """
+ require Logger
+
+ @commit (case System.cmd("git", ["describe", "--tags", "--dirty"]) do
+ {hash, 0} ->
+ String.trim(hash)
+
+ _ ->
+ Logger.warn("Could not read git commit hash")
+ "UNKNOWN"
+ end)
+
+ @doc """
+ The git commit hash read at compile time, if present
+ """
+ @spec commit :: String.t()
+ def commit, do: @commit
+end
diff --git a/lib/web/templates/api/privacy.html.eex b/lib/web/templates/api/privacy.html.eex
new file mode 100644
index 000000000..236f15bf2
--- /dev/null
+++ b/lib/web/templates/api/privacy.html.eex
@@ -0,0 +1,119 @@
+<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 %>
+ </p>
+</article>
+<h3><%= pgettext("terms", "What information do we collect?") %></h3>
+<ul>
+ <li>
+ <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>."
+ ) |> raw %>
+ </p>
+ </li>
+ <li>
+ <b><%= pgettext("terms", "Published events and comments") %></b>
+ <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."
+ ) |> raw %>
+ </p>
+ <p>
+ <b><%= pgettext("terms", "Do not share any dangerous information over Mobilizon.") %></b>
+ </p>
+ </li>
+ <li>
+ <b><%= pgettext("terms", "IPs and other metadata") %></b>
+ <p>
+ <%= pgettext("terms", "We also may retain server logs which include the IP address of every request to our server.") %>
+ </p>
+ </li>
+</ul>
+<h3><%= pgettext("terms", "What do we use your information for?") %></h3>
+<p><%=
+ pgettext(
+ "terms",
+ "Any of the information we collect from you may be used in the following ways:"
+ )
+ %></p>
+<ul>
+ <li><%= pgettext("terms", "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to
+ interact with other people's content and post your own content if you are logged in.") %></li>
+ <li><%= pgettext("terms", "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban
+ evasion or other violations.") %></li>
+ <li><%= pgettext("terms", "The email address you provide may be used to send you information, updates and notifications about other people
+ interacting with your content or sending you messages and to respond to inquiries, and/or other requests or
+ questions.") %></li>
+</ul>
+<h3 class="title"><%= pgettext("terms", "How do we protect your information?") %></h3>
+<p>
+ <%=
+ pgettext("terms", "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm.")
+ %>
+</p>
+<h3 class="title"><%= pgettext("terms", "What is our data retention policy?") %></h3>
+<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.")%>
+ </li>
+ <li>
+ <%= pgettext("terms", "Retain the IP addresses associated with registered users no more than 12 months.") %>
+ </li>
+</ul>
+<p><%= pgettext("terms", "You may irreversibly delete your account at any time.") %></p>
+<h3 class="title"><%= pgettext("terms", "Do we use cookies?") %></h3>
+<p><%=
+ pgettext("terms", "We store the following information on your device when you connect:")
+ %>
+</p>
+<ul>
+ <li><%= pgettext("terms", "An internal user ID") %></li>
+ <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'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."
+ )
+ %>
+</p>
+<em>
+ <%= pgettext("terms", "Note: These informations are stored in your localStorage and not your cookies.") %>
+</em>
+<h3 class="title"><%=
+ pgettext("terms", "Do we disclose any information to outside parties?")
+ %></h3>
+<p>
+ <%=
+ pgettext("terms", "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.")
+ %>
+</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.")
+ %>
+</p>
+<h3 class="title"><%=
+ pgettext("terms", "Site usage by children")
+ %></h3>
+<p>
+ <%= pgettext("terms", "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site.") |> raw %>
+</p>
+<p>
+ <%= pgettext("terms", "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site.") |> raw %>
+</p>
+<p>
+ <%= pgettext("terms", "Law requirements can be different if this server is in another jurisdiction.") %>
+</p>
+<h3 class="title"><%=
+ pgettext("terms", "Changes to our Privacy Policy")
+ %></h3>
+<p><%= pgettext("terms", "If we decide to change our privacy policy, we will post those changes on this page.") %></p>
+<p><%= pgettext("terms", "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020.") |> raw %></p>
+<p><%= pgettext("terms", "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>.") |> raw %></p>
diff --git a/lib/web/templates/api/terms.html.eex b/lib/web/templates/api/terms.html.eex
index 52368fc5e..463857552 100644
--- a/lib/web/templates/api/terms.html.eex
+++ b/lib/web/templates/api/terms.html.eex
@@ -1,163 +1,98 @@
-<h3><%= pgettext("terms", "What information do we collect?") %></h3>
-<ul>
- <li>
- <em><%= pgettext("terms", "Basic account information") %></em>
- <p><%= pgettext(
- "terms",
- "We collect information from you when you register on this server and gather data when you participate in the
- platform by reading, writing, and interacting with content shared here. If you register on this server, you will
- be asked to enter an e-mail address, a password and at least an username. 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 a display name and biography, and upload a profile picture and
- header image. The username, display name, biography, profile picture and header image are always listed publicly.
- You may, however, visit this server without registering."
- ) %>
- </p>
- </li>
- <li>
- <em><%= pgettext("terms", "Published events and comments") %></em>
- <p>
- <%= pgettext(
- "terms",
- "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to
- different servers and copies are stored there. When you delete events or comments, this is likewise delivered to
- these other instances. The action of joining an event is federated as well. Please keep in mind that the operators
- of the server and any receiving server may view such messages, and that recipients may screenshot, copy or
- otherwise re-share them."
- ) %>
- <em><%= pgettext("terms", "Do not share any dangerous information over Mobilizon.") %></em>
- </p>
- </li>
- <li>
- <em><%= pgettext("terms", "IPs and other metadata") %></em>
- <p>
- <%=
- pgettext(
- "terms",
- "We also may retain server logs which include the IP address of every request to our server."
- )
- %>
- </p>
- </li>
-</ul>
-<h3><%= pgettext("terms", "What do we use your information for?") %></h3>
-<p><%=
- pgettext(
- "terms",
- "Any of the information we collect from you may be used in the following ways:"
- )
- %></p>
-<ul>
- <li><%= pgettext("terms", "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to
- interact with other people's content and post your own content if you are logged in.") %></li>
- <li><%= pgettext("terms", "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban
- evasion or other violations.") %></li>
- <li><%= pgettext("terms", "The email address you provide may be used to send you information, updates and notifications about other people
- interacting with your content or sending you messages and to respond to inquiries, and/or other requests or
- questions.") %></li>
-</ul>
-<h3 class="title"><%= pgettext("terms", "How do we protect your information?") %></h3>
+<article class="message is-primary">
+ <div class="message-body">
+ <h3><%= pgettext("terms", "Short version") %></h3>
+ <ul>
+ <li><%= pgettext("terms", "Your content is yours") %></li>
+ <li><%= pgettext("terms", "<b>%{instance_name}</b> will not use or transmit or resell your personal data", %{instance_name: @instance_name}) |> raw %></li>
+ <li><%= pgettext("terms", "You must respect the law when using <b>%{instance_name}</b>", %{instance_name: @instance_name}) |> raw %></li>
+ <li><%= pgettext("terms", "You must respect other people and <b>%{instance_name}</b>'s rules when using the service", %{instance_name: @instance_name}) |> raw %></li>
+ <li><%= pgettext("terms", "The service is provided without warranties and these terms may change in the future") %></li>
+ </ul>
+ </div>
+</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 %>
+ </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",
- "We implement a variety of security measures to maintain the safety of your personal information when you enter,
- submit, or access your personal information. Among other things, your browser session, as well as the traffic between
- your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way
- algorithm."
- )
- %>
+ <%= 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 %>
</p>
-<h3 class="title"><%= pgettext("terms", "What is our data retention policy?") %></h3>
-<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."
- )%>
- </li>
- <li>
- <%=
- pgettext(
- "terms",
- "Retain the IP addresses associated with registered users no more than 12 months."
- )
- %>
- </li>
-</ul>
+<!-- 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>
+<!-- Changes -->
+<h3>
+ <%= pgettext("terms", "Changes to these Terms") %>
+</h3>
<p>
- <%=
- pgettext(
- "terms",
- "You can request and download an archive of your content, including your posts, media attachments, profile picture,
- and header image."
- )
- %>
-</p>
-
-<p><%= pgettext("terms", "You may irreversibly delete your account at any time.") %></p>
-<h3 class="title"><%= pgettext("terms", "Do we use cookies?") %></h3>
-<p><%=
- pgettext("terms", "We store the following information on your device when you connect:")
- %>
-</p>
-<ul>
- <li><%= pgettext("terms", "An internal user ID") %></li>
- <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're not connected, we don't store any information on your device, unless you participate in an event
- anonymously. In that case we store the hash of the UUID 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."
- )
- %>
-</p>
-<em>
- <%= pgettext("terms", "Note: These informations are stored in your localStorage and not your cookies.") %>
-</em>
-<h3 class="title"><%=
- pgettext("terms", "Do we disclose any information to outside parties?")
- %></h3>
-<p>
- <%=
- pgettext(
- "terms",
- "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."
- )
- %>
+ <%= 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.") %>
</p>
<p>
- <%=
- pgettext(
- "terms",
- "Your content may be downloaded by other servers in the network. Your content is delivered to the servers
- following your instance, and direct messages are delivered to the servers of the recipients, in so far as these
- recipients reside on a different server than this one."
- )
- %>
+ <%= 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>
-
-<h3 class="title"><%=
- pgettext("terms", "Site usage by children")
- %></h3>
-<p><%= pgettext("terms", "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site.") |> raw %></p>
-<p><%= pgettext("terms", "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site.") |> raw %></p>
-<p><%= pgettext("terms", "Law requirements can be different if this server is in another jurisdiction.") %></p>
-
-<h3 class="title"><%=
- pgettext("terms", "Changes to our Privacy Policy")
- %></h3>
-<p><%= pgettext("terms", "If we decide to change our privacy policy, we will post those changes on this page.") %></p>
-<p><%= pgettext("terms", "This document is CC-BY-SA. It was last updated January 16, 2020.") %></p>
-<p><%= pgettext("terms", "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies.") |> raw %></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.") %>
+</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>
+<!-- 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", "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>
+<!-- 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", "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", "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>
+<ul>
+ <li><%= pgettext("terms", "Content that is illegal or unlawful, that would otherwise create liability;") %></li>
+ <li><%= pgettext("terms", "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;") %></li>
+ <li><%= pgettext("terms", "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and") %></li>
+ <li><%= pgettext("terms", "Viruses, corrupted data or other harmful, disruptive or destructive files or code.") %></li>
+</ul>
+<p><%= pgettext("terms", "Also, you agree that you will not do any of the following in connection with the Service or other users:") %></p>
+<ul>
+ <li><%= pgettext("terms", "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;") %></li>
+ <li><%= pgettext("terms", "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;") %></li>
+ <li><%= pgettext("terms", "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;") %></li>
+ <li><%= pgettext("terms", "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties.") %></li>
+</ul>
+<p>
+ <%= 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") %>
+</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.") %>
+</p>
+<p>
+ <%= pgettext("terms", "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules.") %>
+</p>
+<h3><%= pgettext("terms", "Source code") %></h3>
+<p><%= pgettext("terms", "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it.") |> raw %></p>
+<p><%= pgettext("terms", "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>.") |> raw %></p>
+<!-- Links -->
+<h3><%= pgettext("terms", "Hyperlinks and Third Party Content") %></h3>
+<p><%= pgettext("terms", "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk.", %{instance_name: @instance_name}) |> raw %></p>
+<p><%= pgettext("terms", "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content.") %></p>
+<!-- Termination -->
+<h3><%= pgettext("terms", "Termination") %></h3>
+<p><%= pgettext("terms", "If you breach any of these Terms, we have the right to suspend or disable your access to or use of the Service.") %></p>
+<h3><%= pgettext("terms", "Entire Agreement") %></h3>
+<p><%= pgettext("terms", "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service.", %{instance_name: @instance_name}) |> raw %></p>
+<!-- Feedback -->
+<h3><%= pgettext("terms", "Feedback") %></h3>
+<p><%= pgettext("terms", "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>.", %{instance_name: @instance_name}) |> raw %></p>
+<!-- Questions -->
+<h3><%= pgettext("terms", "Questions & Contact Information") %></h3>
+<p><%= pgettext("terms", "Questions or comments about the Service may be directed to us at %{contact}", %{contact: @instance_contact}) |> raw %></p>
+<p><%= pgettext("terms", "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020.") |> raw %></p>
+<p><%= pgettext("terms", "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>.") |> raw %></p>
diff --git a/mix.lock b/mix.lock
index b4f36b52b..13a34361a 100644
--- a/mix.lock
+++ b/mix.lock
@@ -35,7 +35,7 @@
"ex_cldr": {:hex, :ex_cldr, "2.16.1", "905b03c38b5fb51668a347f2e6b586bcb2c0816cd98f7d913104872c43cbc61f", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:cldr_utils, "~> 2.9", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:decimal, "~> 1.6", [hex: :decimal, repo: "hexpm", optional: false]}, {:gettext, "~> 0.13", [hex: :gettext, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: true]}], "hexpm", "006e500769982e57e6f3e32cbc4664345f78b014bb5ff48ddc394d67c86c1a8d"},
"ex_cldr_calendars": {:hex, :ex_cldr_calendars, "1.9.0", "ace1c57ba3850753c9ac6ddb89dc0c9a9e5e1c57ecad587e21c8925ad30a3838", [:mix], [{:calendar_interval, "~> 0.2", [hex: :calendar_interval, repo: "hexpm", optional: true]}, {:earmark, "~> 1.0", [hex: :earmark, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.13", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:ex_cldr_units, "~> 3.0", [hex: :ex_cldr_units, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a4b07773e2a326474f44a6bc51fffbec634859a1bad5cc6e6eb55eba45115541"},
"ex_cldr_currencies": {:hex, :ex_cldr_currencies, "2.5.0", "e369ae3c1cd5cd20aa20988b153fd2902b4ab08aec63ca8757d7104bdb79f867", [:mix], [{:ex_cldr, "~> 2.14", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "ba16b1df60bcec52c986481bbdfa7cfaec899b610f869d2b3c5a9a8149f67668"},
- "ex_cldr_dates_times": {:hex, :ex_cldr_dates_times, "2.5.0", "910b22d3daef3725300606bcda4eba814055ad73a9c8247240547178023ce188", [:mix], [{:calendar_interval, "~> 0.2", [hex: :calendar_interval, repo: "hexpm", optional: true]}, {:ex_cldr_calendars, "~> 1.8", [hex: :ex_cldr_calendars, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.15", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "1ffce0b07949b507b2630ace55bd256779ed9ede8a2b88b7fe422f0ac8b5ea69"},
+ "ex_cldr_dates_times": {:hex, :ex_cldr_dates_times, "2.5.1", "9439d1c40cfd03c3d8f3f60f5d3e3f2c6eaf0fd714541d687531cce78cfb9909", [:mix], [{:calendar_interval, "~> 0.2", [hex: :calendar_interval, repo: "hexpm", optional: true]}, {:ex_cldr_calendars, "~> 1.8", [hex: :ex_cldr_calendars, repo: "hexpm", optional: false]}, {:ex_cldr_numbers, "~> 2.15", [hex: :ex_cldr_numbers, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "62a2f8d41ec6e789137bbf3ac7c944885a8ef6b7ce475905d056d1805b482427"},
"ex_cldr_numbers": {:hex, :ex_cldr_numbers, "2.15.0", "207843c6ddae802a2b5fd43eb95c4b65eae8a0a876ce23ae4413eb098b222977", [:mix], [{:decimal, "~> 1.6 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:ex_cldr, "~> 2.15", [hex: :ex_cldr, repo: "hexpm", optional: false]}, {:ex_cldr_currencies, "~> 2.5", [hex: :ex_cldr_currencies, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "3c6c220e03590f08e2f3cb4f3e0c2e1a78fe56a12229331edb952cbdc67935e1"},
"ex_crypto": {:hex, :ex_crypto, "0.10.0", "af600a89b784b36613a989da6e998c1b200ff1214c3cfbaf8deca4aa2f0a1739", [:mix], [{:poison, ">= 2.0.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm", "ccc7472cfe8a0f4565f97dce7e9280119bf15a5ea51c6535e5b65f00660cde1c"},
"ex_doc": {:hex, :ex_doc, "0.22.1", "9bb6d51508778193a4ea90fa16eac47f8b67934f33f8271d5e1edec2dc0eee4c", [:mix], [{:earmark, "~> 1.4.0", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "d957de1b75cb9f78d3ee17820733dc4460114d8b1e11f7ee4fd6546e69b1db60"},
@@ -60,6 +60,7 @@
"geolix": {:hex, :geolix, "1.1.0", "8b0fe847fef486d9e8b7c21eae6cbc2d998fb249e61d3f4f136f8016b9c1c833", [:mix], [{:poolboy, "~> 1.0", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "980854f2aef30c288dc79e86c5267806d704c4525fde1b75de9a92f67fb16300"},
"geolix_adapter_mmdb2": {:hex, :geolix_adapter_mmdb2, "0.5.0", "5912723d9538ecddc6b29b1d8041b917b735a78fd3c122bfea8c44aa782e3369", [:mix], [{:geolix, "~> 1.1", [hex: :geolix, repo: "hexpm", optional: false]}, {:mmdb2_decoder, "~> 3.0", [hex: :mmdb2_decoder, repo: "hexpm", optional: false]}], "hexpm", "cb1485b6a0a2d3e541949207428a245718dbf1258453a0df0e5fdd925bcecd3e"},
"gettext": {:hex, :gettext, "0.18.0", "406d6b9e0e3278162c2ae1de0a60270452c553536772167e2d701f028116f870", [:mix], [], "hexpm", "c3f850be6367ebe1a08616c2158affe4a23231c70391050bf359d5f92f66a571"},
+ "git_status": {:hex, :git_status, "0.1.0", "228b5d2e62c60a157314ff7398a92ab9a108005f4e532d4ecb07bc62fdd67e85", [:mix], [], "hexpm", "2393ee163f71ff75d5374bf20ceab6ea200249ed1beee5a4a31a8e599710de19"},
"guardian": {:hex, :guardian, "2.1.1", "1f02b349f6ba765647cc834036a8d76fa4bd65605342fe3a031df3c99d0d411a", [:mix], [{:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: false]}, {:plug, "~> 1.3.3 or ~> 1.4", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "189b87ba7ce6b40d6ba029138098b96ffc4ae78f229f5b39539b9141af8bf0f8"},
"guardian_db": {:hex, :guardian_db, "2.0.3", "18c847efbf7ec3c0dd44c7aecaeeb2777588bbb8d2073ffc36e71037108b3be6", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "~> 3.1", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:guardian, "~> 1.0 or ~> 2.0", [hex: :guardian, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.13", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "17306e09498bca379fb8eded2ac44d7690f738ca14b17080d06a948d034ea087"},
"guardian_phoenix": {:hex, :guardian_phoenix, "2.0.1", "89a817265af09a6ddf7cb1e77f17ffca90cea2db10ff888375ef34502b2731b1", [:mix], [{:guardian, "~> 2.0", [hex: :guardian, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.3", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "21f439246715192b231f228680465d1ed5fbdf01555a4a3b17165532f5f9a08c"},
@@ -87,7 +88,7 @@
"mix_test_watch": {:hex, :mix_test_watch, "1.0.2", "34900184cbbbc6b6ed616ed3a8ea9b791f9fd2088419352a6d3200525637f785", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}], "hexpm", "47ac558d8b06f684773972c6d04fcc15590abdb97aeb7666da19fcbfdc441a07"},
"mmdb2_decoder": {:hex, :mmdb2_decoder, "3.0.0", "54828676a36e75e9a25bc9a0bb0598d4c7fcc767bf0b40674850b22e05b7b6cc", [:mix], [], "hexpm", "359dc9242915538d1dceb9f6d96c72201dca76ce62e49d22e2ed1e86f20bea8e"},
"mochiweb": {:hex, :mochiweb, "2.20.1", "e4dbd0ed716f076366ecf62ada5755a844e1d95c781e8c77df1d4114be868cdf", [:rebar3], [], "hexpm", "d1aeee7870470d2fa9eae0b3d5ab6c33801aa2d82b10e9dade885c5c921b36aa"},
- "mock": {:hex, :mock, "0.3.4", "c5862eb3b8c64237f45f586cf00c9d892ba07bb48305a43319d428ce3c2897dd", [:mix], [{:meck, "~> 0.8.13", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "e6d886252f1a41f4ba06ecf2b4c8d38760b34b1c08a11c28f7397b2e03995964"},
+ "mock": {:hex, :mock, "0.3.5", "feb81f52b8dcf0a0d65001d2fec459f6b6a8c22562d94a965862f6cc066b5431", [:mix], [{:meck, "~> 0.8.13", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm", "6fae404799408300f863550392635d8f7e3da6b71abdd5c393faf41b131c8728"},
"mogrify": {:hex, :mogrify, "0.7.4", "9b2496dde44b1ce12676f85d7dc531900939e6367bc537c7243a1b089435b32d", [:mix], [], "hexpm", "50d79e337fba6bc95bfbef918058c90f50b17eed9537771e61d4619488f099c3"},
"nimble_parsec": {:hex, :nimble_parsec, "0.6.0", "32111b3bf39137144abd7ba1cce0914533b2d16ef35e8abc5ec8be6122944263", [:mix], [], "hexpm", "27eac315a94909d4dc68bc07a4a83e06c8379237c5ea528a9acff4ca1c873c52"},
"oban": {:hex, :oban, "1.2.0", "7cca94d341be43d220571e28f69131c4afc21095b25257397f50973d3fc59b07", [:mix], [{:ecto_sql, "~> 3.1", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.14", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "ba5f8b3f7d76967b3e23cf8014f6a13e4ccb33431e4808f036709a7f822362ee"},
diff --git a/priv/gettext/ar/LC_MESSAGES/default.po b/priv/gettext/ar/LC_MESSAGES/default.po
index 489ab1814..b1ad01119 100644
--- a/priv/gettext/ar/LC_MESSAGES/default.po
+++ b/priv/gettext/ar/LC_MESSAGES/default.po
@@ -22,7 +22,7 @@ msgid "If you didn't request this, please ignore this email. Your password won't
msgstr ""
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr ""
@@ -381,241 +381,181 @@ msgid "Participation confirmation"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr ""
@@ -847,3 +787,405 @@ msgstr ""
#: lib/web/templates/email/email.text.eex:9
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
msgstr ""
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/be/LC_MESSAGES/default.po b/priv/gettext/be/LC_MESSAGES/default.po
index c748678b0..0a41eda6f 100644
--- a/priv/gettext/be/LC_MESSAGES/default.po
+++ b/priv/gettext/be/LC_MESSAGES/default.po
@@ -19,7 +19,7 @@ msgid "If you didn't request this, please ignore this email. Your password won't
msgstr ""
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr ""
@@ -378,241 +378,181 @@ msgid "Participation confirmation"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr ""
@@ -823,3 +763,405 @@ msgstr ""
#: lib/web/templates/email/email.text.eex:9
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
msgstr ""
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/ca/LC_MESSAGES/default.po b/priv/gettext/ca/LC_MESSAGES/default.po
index bc706de4a..f84e04cdc 100644
--- a/priv/gettext/ca/LC_MESSAGES/default.po
+++ b/priv/gettext/ca/LC_MESSAGES/default.po
@@ -23,7 +23,7 @@ msgstr ""
"canviarà si cliques l'enllaç de sota i n'escrius una altra."
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr "Flux per %{email} a Mobilizon"
@@ -399,241 +399,181 @@ msgid "Participation confirmation"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr ""
@@ -847,3 +787,405 @@ msgstr ""
"Mobilizon està en desenvolupament. Hi anirem afegint funcionalitats amb "
"actualitzacions freqüents fins a la versió 1.0, a la primera meitat "
"del 2020."
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/cs/LC_MESSAGES/default.po b/priv/gettext/cs/LC_MESSAGES/default.po
index c2a706ada..400da1495 100644
--- a/priv/gettext/cs/LC_MESSAGES/default.po
+++ b/priv/gettext/cs/LC_MESSAGES/default.po
@@ -19,7 +19,7 @@ msgid "If you didn't request this, please ignore this email. Your password won't
msgstr ""
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr ""
@@ -378,241 +378,181 @@ msgid "Participation confirmation"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr ""
@@ -823,3 +763,405 @@ msgstr ""
#: lib/web/templates/email/email.text.eex:9
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
msgstr ""
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/de/LC_MESSAGES/default.po b/priv/gettext/de/LC_MESSAGES/default.po
index ebae3b0d5..5b2046ec5 100644
--- a/priv/gettext/de/LC_MESSAGES/default.po
+++ b/priv/gettext/de/LC_MESSAGES/default.po
@@ -24,7 +24,7 @@ msgstr ""
"neues erstellst."
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr "Feed für %{email} auf Mobilizon"
@@ -404,121 +404,97 @@ msgid "Participation confirmation"
msgstr "Teilnahme Bestätigung"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr "Ein interne Benutzer ID"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr "Benutzen wir Cookies?"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr "Wie schützen wir deinen Informationen?"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr "IPs und anderen Metadaten"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr "Veröffentlichte Veranstaltungen und Kommentare"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
@@ -526,121 +502,85 @@ msgstr ""
":"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr "Du kannst jederzeit dein Konto löschen."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr "Änderungen unserer Datenschutzerklärung"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr "Welche Informationen sammeln wir ?"
@@ -854,3 +794,405 @@ msgstr ""
"Mobilizon befindet sich in der Entwicklung.Bis zur Veröffentlichung von "
"Version 1.0 im ersten Halbjahr 2020 werden wir es über regelmäßige Updates "
"mit neuen Funktionen versorgen."
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/default.pot b/priv/gettext/default.pot
index f57798cb3..a229444c5 100644
--- a/priv/gettext/default.pot
+++ b/priv/gettext/default.pot
@@ -5,7 +5,7 @@ msgid "If you didn't request this, please ignore this email. Your password won't
msgstr ""
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr ""
@@ -364,241 +364,181 @@ msgid "Participation confirmation"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr ""
@@ -802,3 +742,405 @@ msgstr ""
#: lib/web/templates/email/email.text.eex:9
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
msgstr ""
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/en/LC_MESSAGES/default.po b/priv/gettext/en/LC_MESSAGES/default.po
index 71582d4e5..13a3b23c3 100644
--- a/priv/gettext/en/LC_MESSAGES/default.po
+++ b/priv/gettext/en/LC_MESSAGES/default.po
@@ -28,7 +28,7 @@ msgid "If you didn't request this, please ignore this email. Your password won't
msgstr "If you didn't request this, please ignore this email. Your password won't change until you access the link below and create a new one."
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr "Feed for %{email} on Mobilizon"
@@ -387,241 +387,181 @@ msgid "Participation confirmation"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr ""
@@ -825,3 +765,405 @@ msgstr "Mobilizon is under development, we will add new features to this site du
#: lib/web/templates/email/email.text.eex:9
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
msgstr "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the first half of 2020."
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/es/LC_MESSAGES/default.po b/priv/gettext/es/LC_MESSAGES/default.po
index 74dde9ffd..f9623bc35 100644
--- a/priv/gettext/es/LC_MESSAGES/default.po
+++ b/priv/gettext/es/LC_MESSAGES/default.po
@@ -23,7 +23,7 @@ msgstr ""
"cambiará al menos que use el siguiente enlace para crear una nueva."
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr "Feed para% {email} en Mobilizon"
@@ -402,19 +402,19 @@ msgid "Participation confirmation"
msgstr "Confirmación de participación"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr "Un ID interno para su identidad seleccionada actualmente"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr "Un ID de usuario interna"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
@@ -422,62 +422,49 @@ msgstr ""
"siguientes maneras:"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr "Información básica de la cuenta"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr "No comparta ninguna información peligrosa a través de Mobilizon."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr "¿Divulgamos alguna información a terceros?"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr "¿Usamos cookies?"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr "¿Cómo protegemos tu información?"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr "dirección IP y otros metadatos"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: lib/web/templates/api/privacy.html.eex:78
msgctxt "terms"
msgid "If you delete these informations, you need to login again."
msgstr "Si eliminas esta información, deberás iniciar sesión nuevamente."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-"Si no estás conectado, no almacenamos ninguna información en tu dispositivo, "
-"a menos que participes en un evento\n"
-" de forma anónima En ese caso, almacenamos el \"hash\" del UUID y el estado "
-"de participación en su navegador para que podamos\n"
-" mostrar el estado de participación. Eliminar esta información solo dejará "
-"de mostrar el estado de participación en tu\n"
-" navegador."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: lib/web/templates/api/privacy.html.eex:87
msgctxt "terms"
msgid "Note: These informations are stored in your localStorage and not your cookies."
msgstr ""
@@ -485,13 +472,13 @@ msgstr ""
"tus cookies."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr "Eventos publicados y comentarios"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
@@ -499,13 +486,13 @@ msgstr ""
"meses."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr "Fichas para \"autenticarte\""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
@@ -513,129 +500,44 @@ msgstr ""
"dirección IP de cada solicitud a nuestro servidor."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-"Recopilamos información tuya cuando te registras en este servidor y "
-"recopilamos datos cuando participas en la\n"
-" plataforma leyendo, escribiendo e interactuando con el contenido "
-"compartido aquí. Si te registras en este servidor, se te pedirá\n"
-" que introduzcas una dirección de correo electrónico, una contraseña y "
-"al menos un nombre de usuario. Tu dirección de correo electrónico será "
-"verificada por\n"
-" un correo electrónico que contiene un enlace único. Si se visita ese "
-"enlace, sabemos que tu controlas la dirección de correo electrónico. Puedes\n"
-" también introducir información de perfil adicional, como un nombre "
-"para mostrar y una biografía, o subir una foto de perfil e\n"
-" imagen de cabecera. El nombre de usuario, el nombre para mostrar, la "
-"biografía, la imagen de perfil y la imagen del encabezado siempre se listan "
-"públicamente.\n"
-" Sin embargo, también puedes visitar este servidor sin registrarse."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-"No vendemos, intercambiamos ni transferimos a terceros su información de "
-"identificación personal. Esto\n"
-" no incluye a terceros confiables que nos ayudan a operar nuestro sitio, "
-"realizar nuestro negocio o darte servicio,\n"
-" siempre y cuando esas partes acuerden mantener esta información "
-"confidencial. También podemos divulgar tu información.\n"
-" cuando creamos que la liberación es apropiada para cumplir con la ley, "
-"hacer cumplir las políticas de nuestro sitio o proteger los derechos, "
-"nuestros o\n"
-" de otros , propiedades o seguridad."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-"Implementamos una variedad de medidas de seguridad para mantener la "
-"seguridad de tu información personal cuando introduces,\n"
-" envías o accedes a su información personal. Entre otras cosas, tu sesión "
-"de navegador, así como el tráfico entre\n"
-" tus aplicaciones y la API, están protegidas con SSL / TLS, y su contraseña "
-"se codifica con un fuerte algoritmo \n"
-" unidireccional."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
"Almacenamos la siguiente información en tu dispositivo cuando te conectas:"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr "Haremos un esfuerzo de buena fe para:"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr "¿Para qué utilizamos tu información?"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr "¿Cuál es nuestra política de retención de datos?"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-"Puedes solicitar y descargar un archivo de su contenido, incluidas tus "
-"publicaciones, archivos adjuntos de medios, foto de perfil,\n"
-" y la imagen del encabezado."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr "Puede eliminar irreversiblemente su cuenta en cualquier momento."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-"Tu contenidos puede ser descargado por otros servidores en la red. tus "
-"contenidos se entregan a los servidores.\n"
-" siguiendo tu instancia, y los mensajes directos se entregan a los "
-"servidores de los destinatarios, en la medida en que estos\n"
-" destinatarios residen en un servidor diferente a este."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-"Tus eventos y comentarios se envían a otras instancias que siguen a la suya, "
-"lo que significa que se envían a\n"
-" diferentes servidores y se almacenan copias allí. Cuando eliminas "
-"eventos o comentarios, esto también se ejecuta en\n"
-" estas otras instancias. La acción de unirse a un evento también está "
-"federada. Por favor ten en cuenta que los operadores\n"
-" del servidor y cualquier servidor receptor puede ver dichos mensajes, "
-"y los destinatarios pueden capturar, copiar o\n"
-" de incluso volver a compartirlos."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr "Cambios a nuestra política de privacidad"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
@@ -646,7 +548,7 @@ msgstr ""
"Reglamento general de protección de datos </a>) no utilice este sitio ."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
@@ -658,7 +560,7 @@ msgstr ""
"sitio."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
@@ -666,7 +568,7 @@ msgstr ""
"cambios en esta página."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
@@ -674,32 +576,13 @@ msgstr ""
"en otra jurisdicción."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-"Originalmente adaptado de la <a href=\"https://mastodon.social/terms\"> "
-"Mastodon </a> y <a href=\"https://github.com/discourse/discourse\"> Discurso "
-"</a> de políticas de privacidad."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-"Conserve los registros del servidor que contengan la dirección IP de todas "
-"las solicitudes a este servidor, en la medida en que dichos registros se "
-"mantengan, no más\n"
-" de 90 días."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr "Uso del sitio por niños"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
@@ -711,15 +594,7 @@ msgstr ""
" preguntas."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-"Este documento es CC-BY-SA. Se actualizó por última vez el 16 de enero de "
-"2020."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
@@ -728,7 +603,7 @@ msgstr ""
" evasión u otras violaciones."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
@@ -738,7 +613,7 @@ msgstr ""
"contenido si ha iniciado sesión."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr "¿Qué información recopilamos?"
@@ -969,3 +844,468 @@ msgstr ""
"Mobilizon está en desarrollo, agregaremos nuevas funciones a este sitio "
"durante las actualizaciones periódicas, hasta el lanzamiento de la versión 1 "
"del software en la primera mitad de 2020."
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+"Implementamos una variedad de medidas de seguridad para mantener la "
+"seguridad de tu información personal cuando introduces,\n"
+" envías o accedes a su información personal. Entre otras cosas, tu sesión "
+"de navegador, así como el tráfico entre\n"
+" tus aplicaciones y la API, están protegidas con SSL / TLS, y su contraseña "
+"se codifica con un fuerte algoritmo \n"
+" unidireccional."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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 ""
+"No vendemos, intercambiamos ni transferimos a terceros su información de "
+"identificación personal. Esto\n"
+" no incluye a terceros confiables que nos ayudan a operar nuestro sitio, "
+"realizar nuestro negocio o darte servicio,\n"
+" siempre y cuando esas partes acuerden mantener esta información "
+"confidencial. También podemos divulgar tu información.\n"
+" cuando creamos que la liberación es apropiada para cumplir con la ley, "
+"hacer cumplir las políticas de nuestro sitio o proteger los derechos, "
+"nuestros o\n"
+" de otros , propiedades o seguridad."
+
+#, 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 los registros del servidor que contengan la dirección IP de todas "
+"las solicitudes a este servidor, en la medida en que dichos registros se "
+"mantengan, no más\n"
+" de 90 días."
+
+#, 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 ""
+"Recopilamos información tuya cuando te registras en este servidor y "
+"recopilamos datos cuando participas en la\n"
+" plataforma leyendo, escribiendo e interactuando con el contenido "
+"compartido aquí. Si te registras en este servidor, se te pedirá\n"
+" que introduzcas una dirección de correo electrónico, una contraseña y "
+"al menos un nombre de usuario. Tu dirección de correo electrónico será "
+"verificada por\n"
+" un correo electrónico que contiene un enlace único. Si se visita ese "
+"enlace, sabemos que tu controlas la dirección de correo electrónico. Puedes\n"
+" también introducir información de perfil adicional, como un nombre "
+"para mostrar y una biografía, o subir una foto de perfil e\n"
+" imagen de cabecera. El nombre de usuario, el nombre para mostrar, la "
+"biografía, la imagen de perfil y la imagen del encabezado siempre se listan "
+"públicamente.\n"
+" Sin embargo, también puedes visitar este servidor sin registrarse."
+
+#, 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 ""
+"Si no estás conectado, no almacenamos ninguna información en tu dispositivo, "
+"a menos que participes en un evento\n"
+" de forma anónima En ese caso, almacenamos el \"hash\" del UUID y el estado "
+"de participación en su navegador para que podamos\n"
+" mostrar el estado de participación. Eliminar esta información solo dejará "
+"de mostrar el estado de participación en tu\n"
+" 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 ""
+"Tus eventos y comentarios se envían a otras instancias que siguen a la suya, "
+"lo que significa que se envían a\n"
+" diferentes servidores y se almacenan copias allí. Cuando eliminas "
+"eventos o comentarios, esto también se ejecuta en\n"
+" estas otras instancias. La acción de unirse a un evento también está "
+"federada. Por favor ten en cuenta que los operadores\n"
+" del servidor y cualquier servidor receptor puede ver dichos mensajes, "
+"y los destinatarios pueden capturar, copiar o\n"
+" de incluso volver a compartirlos."
+
+#, 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 ""
+"Tu contenidos puede ser descargado por otros servidores en la red. tus "
+"contenidos se entregan a los servidores.\n"
+" siguiendo tu instancia, y los mensajes directos se entregan a los "
+"servidores de los destinatarios, en la medida en que estos\n"
+" destinatarios residen en un servidor diferente a este."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:23
+msgctxt "terms"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+"Originalmente adaptado de la <a href=\"https://mastodon.social/terms\"> "
+"Mastodon </a> y <a href=\"https://github.com/discourse/discourse\"> Discurso "
+"</a> de políticas de privacidad."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+"Originalmente adaptado de la <a href=\"https://mastodon.social/terms\"> "
+"Mastodon </a> y <a href=\"https://github.com/discourse/discourse\"> Discurso "
+"</a> de políticas de privacidad."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/fi/LC_MESSAGES/default.po b/priv/gettext/fi/LC_MESSAGES/default.po
index eb74f1721..f2e6b8852 100644
--- a/priv/gettext/fi/LC_MESSAGES/default.po
+++ b/priv/gettext/fi/LC_MESSAGES/default.po
@@ -14,501 +14,866 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Weblate 4.1\n"
+#, elixir-format
#: lib/web/templates/email/password_reset.html.eex:48
#: lib/web/templates/email/password_reset.text.eex:12
-#, elixir-format
msgid "If you didn't request this, please ignore this email. Your password won't change until you access the link below and create a new one."
msgstr ""
"Jos et lähettänyt pyyntöä, voit jättää tämän viestin huomiotta. Salasanasi "
"ei vaihdu, ennen kuin käytät alla olevaa linkkiä ja luot uuden salasanan."
-#: lib/service/export/feed.ex:169
#, elixir-format
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr "Mobilizon-syöte osoitteeseen %{email}"
+#, elixir-format
#: lib/web/templates/email/email.html.eex:151
#: lib/web/templates/email/email.text.eex:16
-#, elixir-format
msgid "%{instance} is a Mobilizon server."
msgstr "%{instance} on Mobilizon-palvelin."
-#: lib/web/templates/email/report.html.eex:41
#, elixir-format
+#: lib/web/templates/email/report.html.eex:41
msgid "%{reporter_name} (%{reporter_username}) reported the following content."
msgstr "%{reporter_name} (%{reporter_username}) raportoi seuraavan sisällön."
-#: lib/web/templates/email/report.html.eex:52
#, elixir-format
+#: lib/web/templates/email/report.html.eex:52
msgid "%{title} by %{creator}"
msgstr "%{title} luojalta %{creator}"
-#: lib/web/templates/email/registration_confirmation.html.eex:58
#, elixir-format
+#: lib/web/templates/email/registration_confirmation.html.eex:58
msgid "Activate my account"
msgstr "Aktivoi tilini"
+#, elixir-format
#: lib/web/templates/email/email.html.eex:120
#: lib/web/templates/email/email.text.eex:14
-#, elixir-format
msgid "Ask the community on Framacolibri"
msgstr "Kysy yhteisöltä Framacolibrissa"
+#, elixir-format
#: lib/web/templates/email/report.html.eex:66
#: lib/web/templates/email/report.text.eex:13
-#, elixir-format
msgid "Comments"
msgstr "Kommentit"
+#, elixir-format
#: lib/web/templates/email/report.html.eex:50
#: lib/web/templates/email/report.text.eex:6
-#, elixir-format
msgid "Event"
msgstr "Tapahtuma"
-#: lib/web/templates/email/registration_confirmation.html.eex:45
#, elixir-format
+#: lib/web/templates/email/registration_confirmation.html.eex:45
msgid "If you didn't request this, please ignore this email."
msgstr "Jos et lähettänyt pyyntöä, voit jättää tämän viestin huomiotta."
-#: lib/web/email/user.ex:48
#, elixir-format
+#: lib/web/email/user.ex:48
msgid "Instructions to reset your password on %{instance}"
msgstr "Ohjeet salasanan palauttamiseen palvelimella %{instance}"
-#: lib/web/templates/email/email.html.eex:152
#, elixir-format
+#: lib/web/templates/email/email.html.eex:152
msgid "Learn more about Mobilizon."
msgstr "Lue lisää Mobilizonista."
-#: lib/web/templates/email/registration_confirmation.html.eex:13
#, elixir-format
+#: lib/web/templates/email/registration_confirmation.html.eex:13
msgid "Nearly here!"
msgstr "Melkein valmista!"
+#, elixir-format
#: lib/web/templates/email/email.html.eex:117
#: lib/web/templates/email/email.text.eex:12
-#, elixir-format
msgid "Need some help? Something not working properly?"
msgstr "Tarvitsetko apua? Eikö kaikki toimi niin kuin pitäisi?"
-#: lib/web/templates/email/report.html.eex:13
#, elixir-format
+#: lib/web/templates/email/report.html.eex:13
msgid "New report on %{instance}"
msgstr "Uusi raportti palvelimella %{instance}"
+#, elixir-format
#: lib/web/templates/email/report.html.eex:84
#: lib/web/templates/email/report.text.eex:22
-#, elixir-format
msgid "Reason"
msgstr "Syy"
-#: lib/web/templates/email/password_reset.html.eex:61
#, elixir-format
+#: lib/web/templates/email/password_reset.html.eex:61
msgid "Reset Password"
msgstr "Palauta salasana"
-#: lib/web/templates/email/password_reset.html.eex:41
#, elixir-format
+#: lib/web/templates/email/password_reset.html.eex:41
msgid "Resetting your password is easy. Just press the button below and follow the instructions. We'll have you up and running in no time."
msgstr ""
"Salasana on helppo palauttaa. Paina alla olevaa painiketta ja noudata "
"ohjeita. Pääset tuota pikaa jatkamaan käyttöä."
-#: lib/web/templates/email/password_reset.html.eex:13
#, elixir-format
+#: lib/web/templates/email/password_reset.html.eex:13
msgid "Trouble signing in?"
msgstr "Ongelmia sisäänkirjautumisessa?"
-#: lib/web/templates/email/report.html.eex:104
#, elixir-format
+#: lib/web/templates/email/report.html.eex:104
msgid "View the report"
msgstr "Näytä raportti"
-#: lib/web/templates/email/registration_confirmation.html.eex:38
#, elixir-format
+#: lib/web/templates/email/registration_confirmation.html.eex:38
msgid "You created an account on %{host} with this email address. You are one click away from activating it."
msgstr ""
"Loit palvelimelle %{host} tilin tällä sähköpostiosoitteella. Aktivoi se "
"yhdellä napsautuksella."
-#: lib/web/email/user.ex:28
#, elixir-format
+#: lib/web/email/user.ex:28
msgid "Instructions to confirm your Mobilizon account on %{instance}"
msgstr "Ohjeet Mobilizon-tilin vahvistamiseen palvelimella %{instance}"
-#: lib/web/email/admin.ex:23
#, elixir-format
+#: lib/web/email/admin.ex:23
msgid "New report on Mobilizon instance %{instance}"
msgstr "Uusi raportti Mobilizon-palvelimella %{instance}"
-#: lib/web/templates/email/registration_confirmation.text.eex:1
#, elixir-format
+#: lib/web/templates/email/registration_confirmation.text.eex:1
msgid "Activate your account"
msgstr "Aktivoi tilisi"
-#: lib/web/templates/email/event_participation_approved.html.eex:13
#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:13
msgid "All good!"
msgstr "Kaikki kunnossa!"
+#, elixir-format
#: lib/web/templates/email/event_participation_approved.html.eex:45
#: lib/web/templates/email/event_participation_approved.text.eex:7
-#, elixir-format
msgid "An organizer just approved your participation. You're now going to this event!"
msgstr ""
"Järjestäjä hyväksyi juuri osallistumisesi. Olet nyt mukana tapahtumassa!"
+#, elixir-format
#: lib/web/templates/email/before_event_notification.html.eex:51
#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_updated.html.eex:119
-#, elixir-format
msgid "Go to event page"
msgstr "Siirry tapahtuman sivulle"
+#, elixir-format
#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:70
#: lib/web/templates/email/before_event_notification.html.eex:63 lib/web/templates/email/before_event_notification.text.eex:5
#: lib/web/templates/email/event_participation_approved.html.eex:70 lib/web/templates/email/event_updated.html.eex:131
#: lib/web/templates/email/event_updated.text.eex:32
-#, elixir-format
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr ""
"Jos haluat perua osallistumisesi, siirry tapahtuman sivulle yllä olevasta "
"linkistä ja napsauta siellä osallistumispainiketta."
+#, elixir-format
#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:11
#: lib/web/templates/email/event_participation_approved.text.eex:11
-#, elixir-format
msgid "If you need to cancel your participation, just access the previous link and click on the participation button."
msgstr ""
"Jos haluat perua osallistumisesi, avaa edellä oleva linkki ja napsauta "
"siellä osallistumispainiketta."
-#: lib/web/templates/email/email.text.eex:16
#, elixir-format
+#: lib/web/templates/email/email.text.eex:16
msgid "Learn more about Mobilizon:"
msgstr "Lue lisää Mobilizonista:"
-#: lib/web/templates/email/report.text.eex:1
#, elixir-format
+#: lib/web/templates/email/report.text.eex:1
msgid "New report from %{reporter} on %{instance}"
msgstr "Uusi raportti käyttäjältä %{reporter} palvelimella %{instance}"
-#: lib/web/templates/email/event_participation_approved.text.eex:1
#, elixir-format
+#: lib/web/templates/email/event_participation_approved.text.eex:1
msgid "Participation approved"
msgstr "Osallistuminen hyväksytty"
-#: lib/web/templates/email/event_participation_rejected.text.eex:1
#, elixir-format
+#: lib/web/templates/email/event_participation_rejected.text.eex:1
msgid "Participation rejected"
msgstr "Osallistuminen hylätty"
-#: lib/web/templates/email/password_reset.text.eex:1
#, elixir-format
+#: lib/web/templates/email/password_reset.text.eex:1
msgid "Password reset"
msgstr "Salasanan palautus"
-#: lib/web/templates/email/password_reset.text.eex:7
#, elixir-format
+#: lib/web/templates/email/password_reset.text.eex:7
msgid "Resetting your password is easy. Just click the link below and follow the instructions. We'll have you up and running in no time."
msgstr ""
"Salasana on helppo palauttaa. Paina alla olevaa linkkiä ja noudata ohjeita. "
"Pääset tuota pikaa jatkamaan käyttöä."
-#: lib/web/templates/email/event_participation_rejected.html.eex:13
#, elixir-format
+#: lib/web/templates/email/event_participation_rejected.html.eex:13
msgid "Sorry!"
msgstr "Anteeksi!"
+#, elixir-format
#: lib/web/templates/email/event_participation_rejected.html.eex:45
#: lib/web/templates/email/event_participation_rejected.text.eex:7
-#, elixir-format
msgid "Unfortunately, the organizers rejected your participation."
msgstr "Ikävä kyllä järjestäjät hylkäsivät osallistumisesi."
-#: lib/web/templates/email/registration_confirmation.text.eex:5
#, elixir-format
+#: lib/web/templates/email/registration_confirmation.text.eex:5
msgid "You created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email."
msgstr ""
"Loit palvelimelle %{host} tilin tällä sähköpostiosoitteella. Aktivoi se "
"yhdellä napsautuksella. Jos et luonut tiliä itse, voit jättää tämän viestin "
"huomiotta."
+#, elixir-format
#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:38
#: lib/web/templates/email/event_participation_approved.html.eex:38
-#, elixir-format
msgid "You requested to participate in event %{title}"
msgstr "Lähetit pyynnön osallistua tapahtumaan %{title}"
+#, elixir-format
#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:5
#: lib/web/templates/email/event_participation_approved.text.eex:5 lib/web/templates/email/event_participation_rejected.html.eex:38
#: lib/web/templates/email/event_participation_rejected.text.eex:5
-#, elixir-format
msgid "You requested to participate in event %{title}."
msgstr "Lähetit pyynnön osallistua tapahtumaan %{title}."
-#: lib/web/email/participation.ex:92
#, elixir-format
+#: lib/web/email/participation.ex:92
msgid "Your participation to event %{title} has been approved"
msgstr "Osallistumisesi tapahtumaan %{title} on hyväksytty"
-#: lib/web/email/participation.ex:71
#, elixir-format
+#: lib/web/email/participation.ex:71
msgid "Your participation to event %{title} has been rejected"
msgstr "Osallistumisesi tapahtumaan %{title) on hylätty"
-#: lib/web/templates/email/event_updated.html.eex:82
#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr "Tapahtuman päättyminen"
-#: lib/web/email/event.ex:35
#, elixir-format
+#: lib/web/email/event.ex:35
msgid "Event %{title} has been updated"
msgstr "Tapahtumaa %{title} on päivitetty"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:13
#: lib/web/templates/email/event_updated.text.eex:1
-#, elixir-format
msgid "Event updated!"
msgstr "Tapahtuma päivitetty!"
-#: lib/web/templates/email/event_updated.text.eex:27
#, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:27
msgid "New date and time for ending of event: %{ends_on}"
msgstr "Tapahtumalla on uusi päättymisaika: %{ends_on}"
-#: lib/web/templates/email/event_updated.text.eex:23
#, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:23
msgid "New date and time for start of event: %{begins_on}"
msgstr "Tapahtumalla on uusi alkamisaika: %{begins_on}"
-#: lib/web/templates/email/event_updated.text.eex:19
#, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:19
msgid "New title: %{title}"
msgstr "Uusi otsikko: %{title}"
-#: lib/web/templates/email/event_updated.html.eex:72
#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr "Tapahtuman alku"
-#: lib/web/templates/email/event_updated.text.eex:5
#, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:5
msgid "The event %{title} was just updated"
msgstr "Tapahtumaa %{title} päivitettiin juuri"
-#: lib/web/templates/email/event_updated.html.eex:38
#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:38
msgid "The event %{title} was updated"
msgstr "Tapahtumaa %{title} päivitettiin"
-#: lib/web/templates/email/event_updated.html.eex:62
#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr "Otsikko"
-#: lib/web/templates/email/event_updated.text.eex:30
#, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:30
msgid "View the updated event on: %{link}"
msgstr "Katso päivitetty tapahtuma: %{linkki}"
+#, elixir-format
#: lib/web/templates/email/password_reset.html.eex:38
#: lib/web/templates/email/password_reset.text.eex:5
-#, elixir-format
msgid "You requested a new password for your account on %{instance}."
msgstr "Pyysit uutta salasanaa tilillesi palvelimella %{instance}."
-#: lib/web/templates/email/email.html.eex:91
#, elixir-format
+#: lib/web/templates/email/email.html.eex:91
msgid "In the meantime, please consider that the software is not (yet) finished. More information %{a_start}on our blog%{a_end}."
msgstr ""
"Huomaathan, että ohjelma ei ole (vielä) täysin valmis. Lisätietoja "
"%{a_start}blogissamme%{a_end}."
+#, elixir-format
#: lib/web/templates/email/email.html.eex:87
#: lib/web/templates/email/email.text.eex:6
-#, elixir-format
msgid "This is a demonstration site to test the beta version of Mobilizon."
msgstr "Tällä esittelysivulla voit koekäyttää Mobilizonin beetaversiota."
-#: lib/web/templates/email/email.html.eex:85
#, elixir-format
+#: lib/web/templates/email/email.html.eex:85
msgid "Warning"
msgstr "Varoitus"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:54
#: lib/web/templates/email/event_updated.text.eex:14
-#, elixir-format
msgid "Event has been cancelled"
msgstr "Tapahtuma on peruttu"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:50
#: lib/web/templates/email/event_updated.text.eex:10
-#, elixir-format
msgid "Event has been confirmed"
msgstr "Tapahtuma on vahvistettu"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:52
#: lib/web/templates/email/event_updated.text.eex:12
-#, elixir-format
msgid "Event status has been set as tentative"
msgstr "Tapahtuma on merkitty alustavaksi"
-#: lib/web/templates/email/email.html.eex:88
#, elixir-format
+#: lib/web/templates/email/email.html.eex:88
msgid "%{b_start}Please do not use it in any real way%{b_end}"
msgstr "%{b_start}Älä käytä todellisiin tarkoituksiin%{b_end}"
-#: lib/web/templates/email/report.html.eex:39
#, elixir-format
+#: lib/web/templates/email/report.html.eex:39
msgid "Someone on %{instance} reported the following content."
msgstr "Seuraava sisältö raportoitiin palvelimelta %{instance}."
-#: lib/web/templates/email/email.text.eex:10
#, elixir-format
+#: lib/web/templates/email/email.text.eex:10
msgid "In the meantime, please consider that the software is not (yet) finished. More information on our blog:"
msgstr ""
"Huomaathan, että ohjelma ei ole (vielä) täysin valmis. Lisätietoja "
"blogissamme:"
-#: lib/web/templates/email/email.text.eex:7
#, elixir-format
+#: lib/web/templates/email/email.text.eex:7
msgid "Please do not use it in any real way"
msgstr "Älä käytä todellisiin tarkoituksiin"
-#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:58
#, elixir-format
+#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:58
msgid "Confirm my participation"
msgstr "Vahvista osallistumiseni"
-#: lib/web/email/participation.ex:114
#, elixir-format
+#: lib/web/email/participation.ex:114
msgid "Confirm your participation to event %{title}"
msgstr "Vahvista osallistumisesi tapahtumaan %{title}"
+#, elixir-format
#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:45
#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:7
-#, elixir-format
msgid "If you didn't request this email, you can simply ignore it."
msgstr "Jos et lähettänyt pyyntöä, voit jättää tämän viestin huomiotta."
+#, elixir-format
#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:13
#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:1
-#, elixir-format
msgid "Participation confirmation"
msgstr "Osallistumisen vahvistus"
-#: lib/web/templates/api/terms.html.eex:108
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr "Valittuna olevan identiteettisi sisäinen tunniste"
-#: lib/web/templates/api/terms.html.eex:107
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr "Sisäinen käyttäjätunniste"
-#: lib/web/templates/api/terms.html.eex:45
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr "Kaikkia sinulta kerättäviä tietoja voidaan käyttää seuraavin tavoin:"
-#: lib/web/templates/api/terms.html.eex:4
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr "Tilin perustiedot"
-#: lib/web/templates/api/terms.html.eex:28
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr "Älä jaa vaarallisia tietoja Mobilizonin kautta."
-#: lib/web/templates/api/terms.html.eex:126
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr "Luovutetaanko tietoja ulkopuolisille?"
-#: lib/web/templates/api/terms.html.eex:101
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr "Käytetäänkö evästeitä?"
-#: lib/web/templates/api/terms.html.eex:59
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr "Kuinka tietojasi suojataan?"
-#: lib/web/templates/api/terms.html.eex:32
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr "IP-osoitteet ja muu metadata"
-#: lib/web/templates/api/terms.html.eex:111
#, 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."
-#: lib/web/templates/api/terms.html.eex:113
-#, elixir-format
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-"Jos et ole kirjautunut, laitteellesi ei tallenneta mitään tietoja, paitsi "
-"jos osallistut tapahtumaan anonyymisti.\n"
-" Siinä tapauksessa UUID:n tarkiste ja osallistumisen tila tallennetaan "
-"selaimeesi, jotta osallistumisen tila\n"
-" voidaan näyttää. Näiden tietojen poisto vaikuttaa vain siten, että "
-"osallistumisen tilaa ei enää näytetä\n"
-" selaimessa."
-
-#: lib/web/templates/api/terms.html.eex:123
#, 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ä."
-#: lib/web/templates/api/terms.html.eex:18
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr "Julkaistut tapahtumat ja kommentit"
-#: lib/web/templates/api/terms.html.eex:83
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
"Säilyttämään rekisteröityjen käyttäjien IP-osoitteita enintään 12 kuukautta."
-#: lib/web/templates/api/terms.html.eex:109
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr "Tunnistautumismerkkisi"
-#: lib/web/templates/api/terms.html.eex:35
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
"Myös palvelinlokeja, jotka sisältävät jokaisen palvelimelle tehdyn pyynnön "
"IP-osoitteen, saatetaan säilyttää."
-#: lib/web/templates/api/terms.html.eex:5
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
+msgid "We store the following information on your device when you connect:"
+msgstr "Kun muodostat yhteyden, laitteellesi tallennetaan seuraavat tiedot:"
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:58
+msgctxt "terms"
+msgid "We will make a good faith effort to:"
+msgstr "Pyrimme parhaamme mukaan seuraavaan:"
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:35
+msgctxt "terms"
+msgid "What do we use your information for?"
+msgstr "Mihin käytämme tietojasi?"
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:57
+msgctxt "terms"
+msgid "What is our data retention policy?"
+msgstr "Millainen tietojensäilytyskäytäntö meillä on?"
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:67
+msgctxt "terms"
+msgid "You may irreversibly delete your account at any time."
+msgstr "Voit milloin tahansa poistaa tilisi pysyvästi."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:115
+msgctxt "terms"
+msgid "Changes to our Privacy Policy"
+msgstr "Muutokset tietosuojakäytäntöön"
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:106
+msgctxt "terms"
+msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
+msgstr ""
+"Jos palvelin sijaitsee EU:n tai EEA:n alueella: Sivusto ja sen tuotteet ja "
+"palvelut on tarkoitettu vähintään 16 vuoden ikäisille. Jos olet alle 16 "
+"vuotta, yleisen tietosuoja-asetuksen (<a href=\"https://fi.wikipedia.org/"
+"wiki/Yleinen_tietosuoja-asetus\">yleinen tietosuoja-asetus</a>) mukaisesti "
+"et voi käyttää tätä sivustoa."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:109
+msgctxt "terms"
+msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
+msgstr ""
+"Jos palvelin sijaitsee Yhdysvalloissa: Sivusto ja sen tuotteet ja palvelut "
+"on tarkoitettu vähintään 13 vuoden ikäisille. Jos olet alle 13 vuotta, COPPA-"
+"lain (<a href=\"https://en.wikipedia.org/wiki/Children%"
+"27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection "
+"Act</a>) mukaisesti et voi käyttää tätä sivustoa."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:117
+msgctxt "terms"
+msgid "If we decide to change our privacy policy, we will post those changes on this page."
+msgstr ""
+"Jos päätämme muuttaa tietosuojakäytäntöämme, muutoksesta kerrotaan tällä "
+"sivulla."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:112
+msgctxt "terms"
+msgid "Law requirements can be different if this server is in another jurisdiction."
+msgstr ""
+"Lakisääteiset vaatimukset saattavat poiketa tästä, jos palvelin sijaitsee "
+"muulla lainkäyttöalueella."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:103
+msgctxt "terms"
+msgid "Site usage by children"
+msgstr "Lapset sivuston käyttäjinä"
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:47
+msgctxt "terms"
+msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
+msgstr ""
+"Antamaasi sähköpostiosoitteeseen voidaan lähettää tietoja, päivityksiä ja "
+"ilmoituksia, kun muut vaikuttavat\n"
+" julkaisemaasi sisältöön, lähettävät sinulle viestejä tai vastaavat "
+"kyselyihisi, tai muihin pyyntöihin tai kysymyksiin\n"
+" liittyen."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:45
+msgctxt "terms"
+msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
+msgstr ""
+"Auttamaan yhteisön moderoinnissa esimerkiksi vertaamalla IP-osoitettasi "
+"muihin tiedossa oleviin osoitteisiin\n"
+" porttikieltojen kiertämisen tai muiden rikkomusten havaitsemiseksi."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:43
+msgctxt "terms"
+msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
+msgstr ""
+"Mobilizonin perustoimintojen toteuttamiseksi. Palvelimen käytännöstä "
+"riippuen muiden tekemään sisältöön\n"
+" vaikuttaminen ja oman sisällön julkaiseminen saattaa olla mahdollista "
+"vain sisäänkirjautuneena."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:6
+msgctxt "terms"
+msgid "What information do we collect?"
+msgstr "Mitä tietoja kerätään?"
+
+#, elixir-format
+#: lib/web/templates/email/email_changed_new.html.eex:38
+#: lib/web/templates/email/email_changed_new.text.eex:5
+msgid "Confirm the new address to change your email."
+msgstr "Vahvista uusi sähköpostiosoite, jotta se vaihdetaan."
+
+#, elixir-format
+#: lib/web/templates/email/email_changed_new.html.eex:64
+#: lib/web/templates/email/email_changed_new.text.eex:10
+msgid "If this change wasn't initiated by you, please ignore this email. The email address for the Mobilizon account won't change until you access the link above."
+msgstr ""
+"Jos et pyytänyt vaihtoa, voit jättää tämän viestin huomiotta. Mobilizon-"
+"tilin sähköpostiosoitetta ei vaihdeta, ellei yllä olevaa linkkiä avata."
+
+#, elixir-format
+#: lib/web/templates/email/email_changed_old.html.eex:62
+#: lib/web/templates/email/email_changed_old.text.eex:9
+msgid "If you did not ask to change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account."
+msgstr ""
+"Jos et pyytänyt sähköpostiosoitteen vaihtoa, joku on todennäköisesti päässyt "
+"käyttämään tiliäsi. Vaihda salasanasi viipymättä, tai ota yhteyttä "
+"palvelimen ylläpitäjään, jos et pääse käyttämään tiliäsi."
+
+#, elixir-format
+#: lib/web/email/user.ex:175
+msgid "Mobilizon on %{instance}: confirm your email address"
+msgstr "Mobilizon palvelimella %{instance}: vahvista sähköpostiosoitteesi"
+
+#, elixir-format
+#: lib/web/email/user.ex:152
+msgid "Mobilizon on %{instance}: email changed"
+msgstr "Mobilizon palvelimella %{instance}: sähköpostiosoite vaihdettu"
+
+#, elixir-format
+#: lib/web/templates/email/email_changed_old.html.eex:13
+#: lib/web/templates/email/email_changed_old.text.eex:1
+msgid "New email address"
+msgstr "Uusi sähköpostiosoite"
+
+#, elixir-format
+#: lib/web/templates/email/email_changed_old.html.eex:38
+#: lib/web/templates/email/email_changed_old.text.eex:5
+msgid "The email address for your account on %{host} is being changed to:"
+msgstr "Palvelimella %{host} olevan tilisi sähköpostiosoitteeksi vaihdetaan:"
+
+#, elixir-format
+#: lib/web/templates/email/email_changed_new.html.eex:13
+#: lib/web/templates/email/email_changed_new.html.eex:51 lib/web/templates/email/email_changed_new.text.eex:1
+msgid "Verify email address"
+msgstr "Vahvista sähköpostiosoite"
+
+#, elixir-format
+#: lib/web/templates/email/notification_each_week.html.eex:70
+#: lib/web/templates/email/notification_each_week.text.eex:14 lib/web/templates/email/on_day_notification.html.eex:70
+#: lib/web/templates/email/on_day_notification.text.eex:14
+msgid "If you need to cancel your participation, just access the event page through the link above and click on the participation button."
+msgid_plural "If you need to cancel your participation, just access the event page through the links above and click on the participation button."
+msgstr[0] ""
+"Jos haluat perua osallistumisesi, siirry tapahtuman sivulle yllä olevasta "
+"linkistä ja napsauta siellä osallistumispainiketta."
+msgstr[1] ""
+"Jos haluat perua osallistumisesi, siirry tapahtuman sivulle yllä olevasta "
+"linkistä ja napsauta siellä osallistumispainiketta."
+
+#, elixir-format
+#: lib/web/email/notification.ex:46
+msgid "One event planned today"
+msgid_plural "%{nb_events} events planned today"
+msgstr[0] "Yksi suunniteltu tapahtuma tänään"
+msgstr[1] "%{nb_events} suunniteltua tapahtumaa tänään"
+
+#, elixir-format
+#: lib/web/templates/email/on_day_notification.html.eex:38
+#: lib/web/templates/email/on_day_notification.text.eex:4
+msgid "You have one event today:"
+msgid_plural "You have %{total} events today:"
+msgstr[0] "Sinulla on tänään yksi tapahtuma:"
+msgstr[1] "Sinulla on tänään %{total} tapahtumaa:"
+
+#, elixir-format
+#: lib/web/templates/email/group_invite.html.eex:38
+#: lib/web/templates/email/group_invite.text.eex:5
+msgid "%{inviter} just invited you to join their group %{group}"
+msgstr "%{inviter} kutsui sinut ryhmään %{group}"
+
+#, elixir-format
+#: lib/web/templates/email/group_invite.html.eex:13
+#: lib/web/templates/email/group_invite.text.eex:1
+msgid "Come along!"
+msgstr "Tule mukaan!"
+
+#, elixir-format
+#: lib/web/email/notification.ex:24
+msgid "Don't forget to go to %{title}"
+msgstr "Muista %{title}"
+
+#, elixir-format
+#: lib/web/templates/email/on_day_notification.html.eex:13
+#: lib/web/templates/email/on_day_notification.text.eex:1
+msgid "Events today"
+msgstr "Tapahtuma"
+
+#, elixir-format
+#: lib/web/templates/email/before_event_notification.html.eex:38
+#: lib/web/templates/email/before_event_notification.text.eex:3
+msgid "Get ready for %{title}"
+msgstr "%{title} tulee, oletko valmis?"
+
+#, elixir-format
+#: lib/web/templates/email/group_invite.html.eex:59
+msgid "See my groups"
+msgstr "Näytä omat ryhmät"
+
+#, elixir-format
+#: lib/web/templates/email/group_invite.html.eex:45
+#: lib/web/templates/email/group_invite.text.eex:7
+msgid "To accept this invitation, head over to your groups."
+msgstr "Hyväksy kutsu siirtymällä omiin ryhmiisi."
+
+#, elixir-format
+#: lib/web/templates/email/before_event_notification.html.eex:13
+#: lib/web/templates/email/before_event_notification.text.eex:1
+msgid "Upcoming event"
+msgstr "Tuleva tapahtuma"
+
+#, elixir-format
+#: lib/web/templates/email/before_event_notification.text.eex:4
+msgid "View the event on: %{link}"
+msgstr "Katso päivitetty tapahtuma: %{linkki}"
+
+#, elixir-format
+#: lib/web/email/group.ex:28
+msgid "You have been invited by %{inviter} to join group %{group}"
+msgstr "%{inviter} kutsui sinut ryhmään %{group}"
+
+#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:92
+msgid "Event address"
+msgstr "Tapahtuman osoite"
+
+#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:102
+msgid "Physical address was removed"
+msgstr "Käyntiosoite poistettiin"
+
+#, elixir-format
+#: lib/web/email/notification.ex:70
+msgid "One event planned this week"
+msgid_plural "%{nb_events} events planned this week"
+msgstr[0] "Yksi suunniteltu tapahtuma tällä viikolla"
+msgstr[1] "%{nb_events} suunniteltua tapahtumaa tällä viikolla"
+
+#, elixir-format
+#: lib/web/email/notification.ex:92
+msgid "One participation request for event %{title} to process"
+msgid_plural "%{number_participation_requests} participation requests for event %{title} to process"
+msgstr[0] "Yksi osallistujapyyntö tapahtumaan %{title} odottaa käsittelyä"
+msgstr[1] ""
+"%{number_participation_requests} osallistujapyyntöä tapahtumaan %{title} "
+"odottaa käsittelyä"
+
+#, elixir-format
+#: lib/web/templates/email/notification_each_week.html.eex:38
+#: lib/web/templates/email/notification_each_week.text.eex:4
+msgid "You have one event this week:"
+msgid_plural "You have %{total} events this week:"
+msgstr[0] "Sinulla on tällä viikolla yksi tapahtuma:"
+msgstr[1] "Sinulla on tällä viikolla %{total} tapahtumaa:"
+
+#, elixir-format
+#: lib/web/templates/email/pending_participation_notification.html.eex:38
+#: lib/web/templates/email/pending_participation_notification.text.eex:4
+msgid "You have one pending participation to process:"
+msgid_plural "You have %{number_participation_requests} participation requests to process:"
+msgstr[0] "Yksi osallistujapyyntö odottaa käsittelyäsi:"
+msgstr[1] ""
+"%{number_participation_requests} osallistujapyyntöä odottaa käsittelyäsi:"
+
+#, elixir-format
+#: lib/web/templates/email/notification_each_week.html.eex:13
+#: lib/web/templates/email/notification_each_week.text.eex:1
+msgid "Events this week"
+msgstr "Tämän viikon tapahtumat"
+
+#, elixir-format
+#: lib/web/templates/email/pending_participation_notification.html.eex:51
+#: lib/web/templates/email/pending_participation_notification.text.eex:6
+msgid "Manage pending participation requests"
+msgstr "Hallinnoi odottavia osallistujapyyntöjä"
+
+#, elixir-format
+#: lib/web/templates/email/pending_participation_notification.html.eex:13
+#: lib/web/templates/email/pending_participation_notification.text.eex:1
+msgid "Pending participations to process"
+msgstr "Osallistujapyyntöjä odottamassa käsittelyä"
+
+#, elixir-format
+#: lib/web/templates/email/pending_participation_notification.html.eex:64
+#: lib/web/templates/email/pending_participation_notification.text.eex:8
+msgid "You receive this email because you chose to get notifications for pending participations to your events. You may disable or change the configuration for these notification in your Mobilizon user settings."
+msgstr ""
+"Sait tämän viestin, koska olet tilannut ilmoitukset tapahtumiesi "
+"osallistujapyynnöistä. Voit muuttaa ilmoitusasetuksia Mobilizon-"
+"käyttäjäasetuksista."
+
+#, elixir-format
+#: lib/web/templates/email/email.html.eex:90
+msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of %{b_start}version 1 of the software in the fall of 2020%{b_end}."
+msgstr ""
+"Mobilizonin kehitystyö on vielä käynnissä, ja tälle sivulle lisätään "
+"säännöllisesti uusia ominaisuuksia, kunnes %{b_start}ohjelman versio 1 "
+"julkaistaan vuoden 2020 alkupuoliskolla%{b_end}."
+
+#, elixir-format
+#: lib/web/templates/email/email.text.eex:9
+msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
+msgstr ""
+"Mobilizonin kehitystyö on vielä käynnissä, ja tälle sivulle lisätään "
+"säännöllisesti uusia ominaisuuksia, kunnes ohjelman versio 1 julkaistaan "
+"vuoden 2020 alkupuoliskolla."
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+"Henkilötietojasi suojataan niiden syöttämisen, lähettämisen ja käyttämisen "
+"aikana erilaisin turvallisuustoimin.\n"
+" Muun muassa selainistunnon sekä sovellusten ja sovellusrajapinnan välinen "
+"tietoliikenne ovat SSL/TLS-suojattuja,\n"
+" ja salasanasi salataan vahvalla yksisuuntaisella algoritmilla."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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 ""
+"Emme myy tai muulla tavoin luovuta henkilötietoja ulkopuolisille. Tämä ei "
+"koske luotettuja kolmansia\n"
+" osapuolia, joita käytämme apuna sivuston toiminnassa, liiketoiminnassamme "
+"sekä palvelujen tuottamisessa.\n"
+" Myös nämä kolmannet osapuolet ovat sitoutuneet pitämään tiedot "
+"luottamuksellisina. Saatamme luovuttaa\n"
+" luovuttaa tietojasi myös siinä tapauksessa, jos katsomme sen olevan "
+"välttämätöntä lain tai sivustomme\n"
+" 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\n"
+" 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\n"
@@ -524,87 +889,23 @@ msgstr ""
"aina julkista tietoa. Voit myös käyttää\n"
" palvelinta rekisteröitymättä."
-#: lib/web/templates/api/terms.html.eex:130
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:80
msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
+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 ""
-"Emme myy tai muulla tavoin luovuta henkilötietoja ulkopuolisille. Tämä ei "
-"koske luotettuja kolmansia\n"
-" osapuolia, joita käytämme apuna sivuston toiminnassa, liiketoiminnassamme "
-"sekä palvelujen tuottamisessa.\n"
-" Myös nämä kolmannet osapuolet ovat sitoutuneet pitämään tiedot "
-"luottamuksellisina. Saatamme luovuttaa\n"
-" luovuttaa tietojasi myös siinä tapauksessa, jos katsomme sen olevan "
-"välttämätöntä lain tai sivustomme\n"
-" noudattamisen tahi meidän tai muiden oikeuksien, omaisuuden tai "
-"turvallisuuden suojelemisen kannalta."
+"Jos et ole kirjautunut, laitteellesi ei tallenneta mitään tietoja, paitsi "
+"jos osallistut tapahtumaan anonyymisti.\n"
+" Siinä tapauksessa UUID:n tarkiste ja osallistumisen tila tallennetaan "
+"selaimeesi, jotta osallistumisen tila\n"
+" voidaan näyttää. Näiden tietojen poisto vaikuttaa vain siten, että "
+"osallistumisen tilaa ei enää näytetä\n"
+" selaimessa."
-#: lib/web/templates/api/terms.html.eex:62
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:19
msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-"Henkilötietojasi suojataan niiden syöttämisen, lähettämisen ja käyttämisen "
-"aikana erilaisin turvallisuustoimin.\n"
-" Muun muassa selainistunnon sekä sovellusten ja sovellusrajapinnan välinen "
-"tietoliikenne ovat SSL/TLS-suojattuja,\n"
-" ja salasanasi salataan vahvalla yksisuuntaisella algoritmilla."
-
-#: lib/web/templates/api/terms.html.eex:103
-#, elixir-format
-msgctxt "terms"
-msgid "We store the following information on your device when you connect:"
-msgstr "Kun muodostat yhteyden, laitteellesi tallennetaan seuraavat tiedot:"
-
-#: lib/web/templates/api/terms.html.eex:72
-#, elixir-format
-msgctxt "terms"
-msgid "We will make a good faith effort to:"
-msgstr "Pyrimme parhaamme mukaan seuraavaan:"
-
-#: lib/web/templates/api/terms.html.eex:43
-#, elixir-format
-msgctxt "terms"
-msgid "What do we use your information for?"
-msgstr "Mihin käytämme tietojasi?"
-
-#: lib/web/templates/api/terms.html.eex:71
-#, elixir-format
-msgctxt "terms"
-msgid "What is our data retention policy?"
-msgstr "Millainen tietojensäilytyskäytäntö meillä on?"
-
-#: lib/web/templates/api/terms.html.eex:92
-#, elixir-format
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-"Voit pyytää omasta sisällöstäsi ladattavaksi arkiston, joka sisältää "
-"julkaisusi, tiedostoliitteesi, profiilikuvasi ja\n"
-" otsikkokuvasi."
-
-#: lib/web/templates/api/terms.html.eex:100
-#, elixir-format
-msgctxt "terms"
-msgid "You may irreversibly delete your account at any time."
-msgstr "Voit milloin tahansa poistaa tilisi pysyvästi."
-
-#: lib/web/templates/api/terms.html.eex:142
-#, elixir-format
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-"Muut palvelimet verkossa voivat ladata sisältöäsi. Sisältösi välitetään omaa "
-"palvelintasi seuraaville\n"
-" palvelimille, ja suorat viestit välitetään viestien vastaanottajien "
-"palvelimille, mikäli vastaanottajat ovat\n"
-" muulla kuin tällä palvelimella."
-
-#: lib/web/templates/api/terms.html.eex:20
-#, elixir-format
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
+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 tapahtumasi ja kommenttisi välitetään omaa palvelintasi seuraaville "
"palvelimille, mikä tarkoittaa, että niistä\n"
@@ -616,334 +917,369 @@ msgstr ""
"että vastaanottajat voivat kopioida viestin\n"
" tekstinä tai kuvankaappauksena tai muulla tavoin levittää niitä edelleen."
-#: lib/web/templates/api/terms.html.eex:159
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:99
msgctxt "terms"
-msgid "Changes to our Privacy Policy"
-msgstr "Muutokset tietosuojakäytäntöön"
-
-#: lib/web/templates/api/terms.html.eex:154
-#, elixir-format
-msgctxt "terms"
-msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
+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 ""
-"Jos palvelin sijaitsee EU:n tai EEA:n alueella: Sivusto ja sen tuotteet ja "
-"palvelut on tarkoitettu vähintään 16 vuoden ikäisille. Jos olet alle 16 "
-"vuotta, yleisen tietosuoja-asetuksen (<a href=\"https://fi.wikipedia.org/"
-"wiki/Yleinen_tietosuoja-asetus\">yleinen tietosuoja-asetus</a>) mukaisesti "
-"et voi käyttää tätä sivustoa."
-#: lib/web/templates/api/terms.html.eex:155
#, elixir-format
+#: lib/web/templates/api/terms.html.eex:23
msgctxt "terms"
-msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
+msgid "Accepting these Terms"
msgstr ""
-"Jos palvelin sijaitsee Yhdysvalloissa: Sivusto ja sen tuotteet ja palvelut "
-"on tarkoitettu vähintään 13 vuoden ikäisille. Jos olet alle 13 vuotta, COPPA-"
-"lain (<a href=\"https://en.wikipedia.org/wiki/Children%"
-"27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection "
-"Act</a>) mukaisesti et voi käyttää tätä sivustoa."
-#: lib/web/templates/api/terms.html.eex:161
#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
msgctxt "terms"
-msgid "If we decide to change our privacy policy, we will post those changes on this page."
+msgid "Changes to these Terms"
msgstr ""
-"Jos päätämme muuttaa tietosuojakäytäntöämme, muutoksesta kerrotaan tällä "
-"sivulla."
-#: lib/web/templates/api/terms.html.eex:156
#, elixir-format
+#: lib/web/templates/api/terms.html.eex:30
msgctxt "terms"
-msgid "Law requirements can be different if this server is in another jurisdiction."
+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 ""
-"Lakisääteiset vaatimukset saattavat poiketa tästä, jos palvelin sijaitsee "
-"muulla lainkäyttöalueella."
-#: lib/web/templates/api/terms.html.eex:163
#, elixir-format
+#: lib/web/templates/api/terms.html.eex:85
msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
msgstr ""
"Omaksuttu alun perin <a href=\"https://mastodon.social/terms\">Mastodonin</a>"
" ja <a href=\"https://github.com/discourse/discourse\">Discoursen</a> "
"tietosuojakäytännöistä."
-#: lib/web/templates/api/terms.html.eex:75
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
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\n than 90 days."
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
msgstr ""
-"Säilyttämään kaikkien palvelimelle tehtyjen pyyntöjen IP-osoitteet "
-"sisältäviä palvelinlokeja, mikäli sellaisia\n"
-" pidetään, enintään 90 päivän ajan."
+"Omaksuttu alun perin <a href=\"https://mastodon.social/terms\">Mastodonin</a>"
+" ja <a href=\"https://github.com/discourse/discourse\">Discoursen</a> "
+"tietosuojakäytännöistä."
-#: lib/web/templates/api/terms.html.eex:152
#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
msgctxt "terms"
-msgid "Site usage by children"
-msgstr "Lapset sivuston käyttäjinä"
+msgid "Short version"
+msgstr ""
-#: lib/web/templates/api/terms.html.eex:55
#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
msgctxt "terms"
-msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
+msgid "The service is provided without warranties and these terms may change in the future"
msgstr ""
-"Antamaasi sähköpostiosoitteeseen voidaan lähettää tietoja, päivityksiä ja "
-"ilmoituksia, kun muut vaikuttavat\n"
-" julkaisemaasi sisältöön, lähettävät sinulle viestejä tai vastaavat "
-"kyselyihisi, tai muihin pyyntöihin tai kysymyksiin\n"
-" liittyen."
-#: lib/web/templates/api/terms.html.eex:162
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
msgstr ""
-"Tämän asiakirjan käyttöoikeutena on CC-BY-SA. Päivitetty viimeksi 16.1.2020."
-#: lib/web/templates/api/terms.html.eex:53
#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
msgctxt "terms"
-msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
msgstr ""
-"Auttamaan yhteisön moderoinnissa esimerkiksi vertaamalla IP-osoitettasi "
-"muihin tiedossa oleviin osoitteisiin\n"
-" porttikieltojen kiertämisen tai muiden rikkomusten havaitsemiseksi."
-#: lib/web/templates/api/terms.html.eex:51
#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
msgctxt "terms"
-msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
msgstr ""
-"Mobilizonin perustoimintojen toteuttamiseksi. Palvelimen käytännöstä "
-"riippuen muiden tekemään sisältöön\n"
-" vaikuttaminen ja oman sisällön julkaiseminen saattaa olla mahdollista "
-"vain sisäänkirjautuneena."
-#: lib/web/templates/api/terms.html.eex:1
#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
msgctxt "terms"
-msgid "What information do we collect?"
-msgstr "Mitä tietoja kerätään?"
-
-#: lib/web/templates/email/email_changed_new.html.eex:38
-#: lib/web/templates/email/email_changed_new.text.eex:5
-#, elixir-format
-msgid "Confirm the new address to change your email."
-msgstr "Vahvista uusi sähköpostiosoite, jotta se vaihdetaan."
-
-#: lib/web/templates/email/email_changed_new.html.eex:64
-#: lib/web/templates/email/email_changed_new.text.eex:10
-#, elixir-format
-msgid "If this change wasn't initiated by you, please ignore this email. The email address for the Mobilizon account won't change until you access the link above."
+msgid "You must respect the law when using <b>%{instance_name}</b>"
msgstr ""
-"Jos et pyytänyt vaihtoa, voit jättää tämän viestin huomiotta. Mobilizon-"
-"tilin sähköpostiosoitetta ei vaihdeta, ellei yllä olevaa linkkiä avata."
-#: lib/web/templates/email/email_changed_old.html.eex:62
-#: lib/web/templates/email/email_changed_old.text.eex:9
#, elixir-format
-msgid "If you did not ask to change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account."
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
msgstr ""
-"Jos et pyytänyt sähköpostiosoitteen vaihtoa, joku on todennäköisesti päässyt "
-"käyttämään tiliäsi. Vaihda salasanasi viipymättä, tai ota yhteyttä "
-"palvelimen ylläpitäjään, jos et pääse käyttämään tiliäsi."
-
-#: lib/web/email/user.ex:175
-#, elixir-format
-msgid "Mobilizon on %{instance}: confirm your email address"
-msgstr "Mobilizon palvelimella %{instance}: vahvista sähköpostiosoitteesi"
-
-#: lib/web/email/user.ex:152
-#, elixir-format
-msgid "Mobilizon on %{instance}: email changed"
-msgstr "Mobilizon palvelimella %{instance}: sähköpostiosoite vaihdettu"
-
-#: lib/web/templates/email/email_changed_old.html.eex:13
-#: lib/web/templates/email/email_changed_old.text.eex:1
-#, elixir-format
-msgid "New email address"
-msgstr "Uusi sähköpostiosoite"
-
-#: lib/web/templates/email/email_changed_old.html.eex:38
-#: lib/web/templates/email/email_changed_old.text.eex:5
-#, elixir-format
-msgid "The email address for your account on %{host} is being changed to:"
-msgstr "Palvelimella %{host} olevan tilisi sähköpostiosoitteeksi vaihdetaan:"
-
-#: lib/web/templates/email/email_changed_new.html.eex:13
-#: lib/web/templates/email/email_changed_new.html.eex:51 lib/web/templates/email/email_changed_new.text.eex:1
-#, elixir-format
-msgid "Verify email address"
-msgstr "Vahvista sähköpostiosoite"
-
-#: lib/web/templates/email/notification_each_week.html.eex:70
-#: lib/web/templates/email/notification_each_week.text.eex:14 lib/web/templates/email/on_day_notification.html.eex:70
-#: lib/web/templates/email/on_day_notification.text.eex:14
-#, elixir-format
-msgid "If you need to cancel your participation, just access the event page through the link above and click on the participation button."
-msgid_plural "If you need to cancel your participation, just access the event page through the links above and click on the participation button."
-msgstr[0] ""
-"Jos haluat perua osallistumisesi, siirry tapahtuman sivulle yllä olevasta "
-"linkistä ja napsauta siellä osallistumispainiketta."
-msgstr[1] ""
-"Jos haluat perua osallistumisesi, siirry tapahtuman sivulle yllä olevasta "
-"linkistä ja napsauta siellä osallistumispainiketta."
-
-#: lib/web/email/notification.ex:46
-#, elixir-format
-msgid "One event planned today"
-msgid_plural "%{nb_events} events planned today"
-msgstr[0] "Yksi suunniteltu tapahtuma tänään"
-msgstr[1] "%{nb_events} suunniteltua tapahtumaa tänään"
-
-#: lib/web/templates/email/on_day_notification.html.eex:38
-#: lib/web/templates/email/on_day_notification.text.eex:4
-#, elixir-format
-msgid "You have one event today:"
-msgid_plural "You have %{total} events today:"
-msgstr[0] "Sinulla on tänään yksi tapahtuma:"
-msgstr[1] "Sinulla on tänään %{total} tapahtumaa:"
-
-#: lib/web/templates/email/group_invite.html.eex:38
-#: lib/web/templates/email/group_invite.text.eex:5
-#, elixir-format
-msgid "%{inviter} just invited you to join their group %{group}"
-msgstr "%{inviter} kutsui sinut ryhmään %{group}"
-
-#: lib/web/templates/email/group_invite.html.eex:13
-#: lib/web/templates/email/group_invite.text.eex:1
-#, elixir-format
-msgid "Come along!"
-msgstr "Tule mukaan!"
-
-#: lib/web/email/notification.ex:24
-#, elixir-format
-msgid "Don't forget to go to %{title}"
-msgstr "Muista %{title}"
-
-#: lib/web/templates/email/on_day_notification.html.eex:13
-#: lib/web/templates/email/on_day_notification.text.eex:1
-#, elixir-format
-msgid "Events today"
-msgstr "Tapahtuma"
-
-#: lib/web/templates/email/before_event_notification.html.eex:38
-#: lib/web/templates/email/before_event_notification.text.eex:3
-#, elixir-format
-msgid "Get ready for %{title}"
-msgstr "%{title} tulee, oletko valmis?"
-
-#: lib/web/templates/email/group_invite.html.eex:59
-#, elixir-format
-msgid "See my groups"
-msgstr "Näytä omat ryhmät"
-
-#: lib/web/templates/email/group_invite.html.eex:45
-#: lib/web/templates/email/group_invite.text.eex:7
-#, elixir-format
-msgid "To accept this invitation, head over to your groups."
-msgstr "Hyväksy kutsu siirtymällä omiin ryhmiisi."
-
-#: lib/web/templates/email/before_event_notification.html.eex:13
-#: lib/web/templates/email/before_event_notification.text.eex:1
-#, elixir-format
-msgid "Upcoming event"
-msgstr "Tuleva tapahtuma"
-
-#: lib/web/templates/email/before_event_notification.text.eex:4
-#, elixir-format
-msgid "View the event on: %{link}"
-msgstr "Katso päivitetty tapahtuma: %{linkki}"
-
-#: lib/web/email/group.ex:28
-#, elixir-format
-msgid "You have been invited by %{inviter} to join group %{group}"
-msgstr "%{inviter} kutsui sinut ryhmään %{group}"
-
-#: lib/web/templates/email/event_updated.html.eex:92
-#, elixir-format
-msgid "Event address"
-msgstr "Tapahtuman osoite"
-
-#: lib/web/templates/email/event_updated.html.eex:102
-#, elixir-format
-msgid "Physical address was removed"
-msgstr "Käyntiosoite poistettiin"
-
-#: lib/web/email/notification.ex:70
-#, elixir-format
-msgid "One event planned this week"
-msgid_plural "%{nb_events} events planned this week"
-msgstr[0] "Yksi suunniteltu tapahtuma tällä viikolla"
-msgstr[1] "%{nb_events} suunniteltua tapahtumaa tällä viikolla"
-
-#: lib/web/email/notification.ex:92
-#, elixir-format
-msgid "One participation request for event %{title} to process"
-msgid_plural "%{number_participation_requests} participation requests for event %{title} to process"
-msgstr[0] "Yksi osallistujapyyntö tapahtumaan %{title} odottaa käsittelyä"
-msgstr[1] ""
-"%{number_participation_requests} osallistujapyyntöä tapahtumaan %{title} "
-"odottaa käsittelyä"
-
-#: lib/web/templates/email/notification_each_week.html.eex:38
-#: lib/web/templates/email/notification_each_week.text.eex:4
-#, elixir-format
-msgid "You have one event this week:"
-msgid_plural "You have %{total} events this week:"
-msgstr[0] "Sinulla on tällä viikolla yksi tapahtuma:"
-msgstr[1] "Sinulla on tällä viikolla %{total} tapahtumaa:"
-
-#: lib/web/templates/email/pending_participation_notification.html.eex:38
-#: lib/web/templates/email/pending_participation_notification.text.eex:4
-#, elixir-format
-msgid "You have one pending participation to process:"
-msgid_plural "You have %{number_participation_requests} participation requests to process:"
-msgstr[0] "Yksi osallistujapyyntö odottaa käsittelyäsi:"
-msgstr[1] ""
-"%{number_participation_requests} osallistujapyyntöä odottaa käsittelyäsi:"
-
-#: lib/web/templates/email/notification_each_week.html.eex:13
-#: lib/web/templates/email/notification_each_week.text.eex:1
-#, elixir-format
-msgid "Events this week"
-msgstr "Tämän viikon tapahtumat"
-
-#: lib/web/templates/email/pending_participation_notification.html.eex:51
-#: lib/web/templates/email/pending_participation_notification.text.eex:6
-#, elixir-format
-msgid "Manage pending participation requests"
-msgstr "Hallinnoi odottavia osallistujapyyntöjä"
-
-#: lib/web/templates/email/pending_participation_notification.html.eex:13
-#: lib/web/templates/email/pending_participation_notification.text.eex:1
-#, elixir-format
-msgid "Pending participations to process"
-msgstr "Osallistujapyyntöjä odottamassa käsittelyä"
-
-#: lib/web/templates/email/pending_participation_notification.html.eex:64
-#: lib/web/templates/email/pending_participation_notification.text.eex:8
-#, elixir-format
-msgid "You receive this email because you chose to get notifications for pending participations to your events. You may disable or change the configuration for these notification in your Mobilizon user settings."
-msgstr ""
-"Sait tämän viestin, koska olet tilannut ilmoitukset tapahtumiesi "
-"osallistujapyynnöistä. Voit muuttaa ilmoitusasetuksia Mobilizon-"
-"käyttäjäasetuksista."
-
-#: lib/web/templates/email/email.html.eex:90
-#, elixir-format
-msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of %{b_start}version 1 of the software in the fall of 2020%{b_end}."
-msgstr ""
-"Mobilizonin kehitystyö on vielä käynnissä, ja tälle sivulle lisätään "
-"säännöllisesti uusia ominaisuuksia, kunnes %{b_start}ohjelman versio 1 "
-"julkaistaan vuoden 2020 alkupuoliskolla%{b_end}."
-
-#: lib/web/templates/email/email.text.eex:9
-#, elixir-format
-msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
-msgstr ""
-"Mobilizonin kehitystyö on vielä käynnissä, ja tälle sivulle lisätään "
-"säännöllisesti uusia ominaisuuksia, kunnes ohjelman versio 1 julkaistaan "
-"vuoden 2020 alkupuoliskolla."
diff --git a/priv/gettext/fr/LC_MESSAGES/default.po b/priv/gettext/fr/LC_MESSAGES/default.po
index 3efa2f725..d932ca9e9 100644
--- a/priv/gettext/fr/LC_MESSAGES/default.po
+++ b/priv/gettext/fr/LC_MESSAGES/default.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2020-06-10 09:07+0200\n"
+"PO-Revision-Date: 2020-06-22 11:16+0200\n"
"Last-Translator: matograine <tom.ngr@zaclys.net>\n"
"Language-Team: French <https://weblate.framasoft.org/projects/mobilizon/backend/fr/>\n"
"Language: fr\n"
@@ -20,661 +20,1151 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Poedit 2.3\n"
-#: lib/web/templates/email/password_reset.html.eex:48 lib/web/templates/email/password_reset.text.eex:12
+#, elixir-format
+#: lib/web/templates/email/password_reset.html.eex:48
+#: lib/web/templates/email/password_reset.text.eex:12
msgid "If you didn't request this, please ignore this email. Your password won't change until you access the link below and create a new one."
msgstr "Si vous n'avez pas demandé ceci, vous pouvez ignorer cet email. Votre mot de passe ne changera pas tant que vous n'en créerez pas un nouveau en cliquant sur le lien ci-dessous."
-#: lib/service/export/feed.ex:169
+#, elixir-format
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr "Flux pour %{email} sur Mobilizon"
-#: lib/web/templates/email/email.html.eex:151 lib/web/templates/email/email.text.eex:16
+#, elixir-format
+#: lib/web/templates/email/email.html.eex:151
+#: lib/web/templates/email/email.text.eex:16
msgid "%{instance} is a Mobilizon server."
msgstr "%{instance} est une instance Mobilizon."
+#, elixir-format
#: lib/web/templates/email/report.html.eex:41
msgid "%{reporter_name} (%{reporter_username}) reported the following content."
msgstr "%{reporter_name} (%{reporter_username}) a signalé le contenu suivant."
+#, elixir-format
#: lib/web/templates/email/report.html.eex:52
msgid "%{title} by %{creator}"
msgstr "%{title} par %{creator}"
+#, elixir-format
#: lib/web/templates/email/registration_confirmation.html.eex:58
msgid "Activate my account"
msgstr "Activer mon compte"
-#: lib/web/templates/email/email.html.eex:120 lib/web/templates/email/email.text.eex:14
+#, elixir-format
+#: lib/web/templates/email/email.html.eex:120
+#: lib/web/templates/email/email.text.eex:14
msgid "Ask the community on Framacolibri"
msgstr "Demander à la communauté sur Framacolibri"
-#: lib/web/templates/email/report.html.eex:66 lib/web/templates/email/report.text.eex:13
+#, elixir-format
+#: lib/web/templates/email/report.html.eex:66
+#: lib/web/templates/email/report.text.eex:13
msgid "Comments"
msgstr "Commentaires"
-#: lib/web/templates/email/report.html.eex:50 lib/web/templates/email/report.text.eex:6
+#, elixir-format
+#: lib/web/templates/email/report.html.eex:50
+#: lib/web/templates/email/report.text.eex:6
msgid "Event"
msgstr "Événement"
+#, elixir-format
#: lib/web/templates/email/registration_confirmation.html.eex:45
msgid "If you didn't request this, please ignore this email."
msgstr "Si vous n'avez pas demandé ceci, merci d'ignorer cet email."
+#, elixir-format
#: lib/web/email/user.ex:48
msgid "Instructions to reset your password on %{instance}"
msgstr "Instructions pour réinitialiser votre mot de passe sur %{instance}"
+#, elixir-format
#: lib/web/templates/email/email.html.eex:152
msgid "Learn more about Mobilizon."
msgstr "En apprendre plus à propos de Mobilizon."
+#, elixir-format
#: lib/web/templates/email/registration_confirmation.html.eex:13
msgid "Nearly here!"
msgstr "Vous y êtes presque !"
-#: lib/web/templates/email/email.html.eex:117 lib/web/templates/email/email.text.eex:12
+#, elixir-format
+#: lib/web/templates/email/email.html.eex:117
+#: lib/web/templates/email/email.text.eex:12
msgid "Need some help? Something not working properly?"
msgstr "Besoin d'aide ? Quelque chose ne fonctionne pas correctement ?"
+#, elixir-format
#: lib/web/templates/email/report.html.eex:13
msgid "New report on %{instance}"
msgstr "Nouveau signalement sur %{instance}"
-#: lib/web/templates/email/report.html.eex:84 lib/web/templates/email/report.text.eex:22
+#, elixir-format
+#: lib/web/templates/email/report.html.eex:84
+#: lib/web/templates/email/report.text.eex:22
msgid "Reason"
msgstr "Raison"
+#, elixir-format
#: lib/web/templates/email/password_reset.html.eex:61
msgid "Reset Password"
msgstr "Réinitialiser mon mot de passe"
+#, elixir-format
#: lib/web/templates/email/password_reset.html.eex:41
msgid "Resetting your password is easy. Just press the button below and follow the instructions. We'll have you up and running in no time."
msgstr "Réinitialiser votre mot de passe est facile. Cliquez simplement sur le bouton et suivez les inscriptions. Vous serez opérationnel en un rien de temps."
+#, elixir-format
#: lib/web/templates/email/password_reset.html.eex:13
msgid "Trouble signing in?"
msgstr "Des problèmes à vous connecter ?"
+#, elixir-format
#: lib/web/templates/email/report.html.eex:104
msgid "View the report"
msgstr "Voir le signalement"
+#, elixir-format
#: lib/web/templates/email/registration_confirmation.html.eex:38
msgid "You created an account on %{host} with this email address. You are one click away from activating it."
msgstr "Vous avez créé un compte sur %{host} avec cette adresse email. Vous êtes à un clic de l'activer."
+#, elixir-format
#: lib/web/email/user.ex:28
msgid "Instructions to confirm your Mobilizon account on %{instance}"
msgstr "Instructions pour confirmer votre compte Mobilizon sur %{instance}"
+#, elixir-format
#: lib/web/email/admin.ex:23
msgid "New report on Mobilizon instance %{instance}"
msgstr "Nouveau signalement sur l'instance Mobilizon %{instance}"
+#, elixir-format
#: lib/web/templates/email/registration_confirmation.text.eex:1
msgid "Activate your account"
msgstr "Activer mon compte"
+#, elixir-format
#: lib/web/templates/email/event_participation_approved.html.eex:13
msgid "All good!"
msgstr "Tout est bon !"
-#: lib/web/templates/email/event_participation_approved.html.eex:45 lib/web/templates/email/event_participation_approved.text.eex:7
+#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:45
+#: lib/web/templates/email/event_participation_approved.text.eex:7
msgid "An organizer just approved your participation. You're now going to this event!"
msgstr "Un⋅e organisateur⋅ice vient d'approuver votre participation. Vous allez désormais à cet événement !"
-#: lib/web/templates/email/before_event_notification.html.eex:51 lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_updated.html.eex:119
+#, elixir-format
+#: lib/web/templates/email/before_event_notification.html.eex:51
+#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_updated.html.eex:119
msgid "Go to event page"
msgstr "Aller à la page de l'événement"
-#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:70 lib/web/templates/email/before_event_notification.html.eex:63 lib/web/templates/email/before_event_notification.text.eex:5 lib/web/templates/email/event_participation_approved.html.eex:70 lib/web/templates/email/event_updated.html.eex:131 lib/web/templates/email/event_updated.text.eex:32
+#, elixir-format
+#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:70
+#: lib/web/templates/email/before_event_notification.html.eex:63 lib/web/templates/email/before_event_notification.text.eex:5
+#: lib/web/templates/email/event_participation_approved.html.eex:70 lib/web/templates/email/event_updated.html.eex:131
+#: lib/web/templates/email/event_updated.text.eex:32
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr "Si vous avez besoin d'annuler votre participation, il suffit d'accéder à la page de l'événement à partir du lien ci-dessus et de cliquer sur le bouton de participation."
-#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:11 lib/web/templates/email/event_participation_approved.text.eex:11
+#, elixir-format
+#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:11
+#: lib/web/templates/email/event_participation_approved.text.eex:11
msgid "If you need to cancel your participation, just access the previous link and click on the participation button."
msgstr "Si vous avez besoin d'annuler votre participation, accédez au lien ci-dessus et cliquez sur le bouton de participation."
+#, elixir-format
#: lib/web/templates/email/email.text.eex:16
msgid "Learn more about Mobilizon:"
msgstr "En apprendre plus à propos de Mobilizon :"
+#, elixir-format
#: lib/web/templates/email/report.text.eex:1
msgid "New report from %{reporter} on %{instance}"
msgstr "Nouveau signalement sur %{instance}"
+#, elixir-format
#: lib/web/templates/email/event_participation_approved.text.eex:1
msgid "Participation approved"
msgstr "Participation approuvée"
+#, elixir-format
#: lib/web/templates/email/event_participation_rejected.text.eex:1
msgid "Participation rejected"
msgstr "Participation refusée"
+#, elixir-format
#: lib/web/templates/email/password_reset.text.eex:1
msgid "Password reset"
msgstr "Réinitialisation du mot de passe"
+#, elixir-format
#: lib/web/templates/email/password_reset.text.eex:7
msgid "Resetting your password is easy. Just click the link below and follow the instructions. We'll have you up and running in no time."
msgstr "Réinitialiser votre mot de passe est facile. Cliquez simplement sur le bouton et suivez les inscriptions. Vous serez opérationnel en un rien de temps."
+#, elixir-format
#: lib/web/templates/email/event_participation_rejected.html.eex:13
msgid "Sorry!"
msgstr "Désolé !"
-#: lib/web/templates/email/event_participation_rejected.html.eex:45 lib/web/templates/email/event_participation_rejected.text.eex:7
+#, elixir-format
+#: lib/web/templates/email/event_participation_rejected.html.eex:45
+#: lib/web/templates/email/event_participation_rejected.text.eex:7
msgid "Unfortunately, the organizers rejected your participation."
msgstr "Malheureusement, les organisateur⋅ices ont rejeté votre demande de participation."
+#, elixir-format
#: lib/web/templates/email/registration_confirmation.text.eex:5
msgid "You created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email."
msgstr "Vous avez créé un compte sur %{host} avec cette adresse email. Vous êtes à un clic de l'activer."
-#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:38 lib/web/templates/email/event_participation_approved.html.eex:38
+#, elixir-format
+#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:38
+#: lib/web/templates/email/event_participation_approved.html.eex:38
msgid "You requested to participate in event %{title}"
msgstr "Vous avez demandé à participer à l'événement %{title}"
-#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:5 lib/web/templates/email/event_participation_approved.text.eex:5 lib/web/templates/email/event_participation_rejected.html.eex:38 lib/web/templates/email/event_participation_rejected.text.eex:5
+#, elixir-format
+#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:5
+#: lib/web/templates/email/event_participation_approved.text.eex:5 lib/web/templates/email/event_participation_rejected.html.eex:38
+#: lib/web/templates/email/event_participation_rejected.text.eex:5
msgid "You requested to participate in event %{title}."
msgstr "Vous avez demandé à participer à l'événement %{title}."
+#, elixir-format
#: lib/web/email/participation.ex:92
msgid "Your participation to event %{title} has been approved"
msgstr "Votre participation à l'événement %{title} a été approuvée"
+#, elixir-format
#: lib/web/email/participation.ex:71
msgid "Your participation to event %{title} has been rejected"
msgstr "Votre participation à l'événement %{title} a été rejetée"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr "Fin de l'événement"
+#, elixir-format
#: lib/web/email/event.ex:35
msgid "Event %{title} has been updated"
msgstr "L'événement %{title} a été mis à jour"
-#: lib/web/templates/email/event_updated.html.eex:13 lib/web/templates/email/event_updated.text.eex:1
+#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:13
+#: lib/web/templates/email/event_updated.text.eex:1
msgid "Event updated!"
msgstr "Événement mis à jour !"
+#, elixir-format
#: lib/web/templates/email/event_updated.text.eex:27
msgid "New date and time for ending of event: %{ends_on}"
msgstr "Nouvelle date et heure de fin de l'événement : %{ends_on}"
+#, elixir-format
#: lib/web/templates/email/event_updated.text.eex:23
msgid "New date and time for start of event: %{begins_on}"
msgstr "Nouvelle date et heure de début de l'événement : %{begins_on}"
+#, elixir-format
#: lib/web/templates/email/event_updated.text.eex:19
msgid "New title: %{title}"
msgstr "Nouveau titre : %{title}"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr "Début de l'événement"
+#, elixir-format
#: lib/web/templates/email/event_updated.text.eex:5
msgid "The event %{title} was just updated"
msgstr "L'événement %{title} vient d'être mis à jour"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:38
msgid "The event %{title} was updated"
msgstr "L'événement %{title} a été mis à jour"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr "Titre"
+#, elixir-format
#: lib/web/templates/email/event_updated.text.eex:30
msgid "View the updated event on: %{link}"
msgstr "Voir l'événement mis à jour sur : %{link}"
-#: lib/web/templates/email/password_reset.html.eex:38 lib/web/templates/email/password_reset.text.eex:5
+#, elixir-format
+#: lib/web/templates/email/password_reset.html.eex:38
+#: lib/web/templates/email/password_reset.text.eex:5
msgid "You requested a new password for your account on %{instance}."
msgstr "Vous avez demandé un nouveau mot de passe pour votre compte sur %{instance}."
+#, elixir-format
#: lib/web/templates/email/email.html.eex:91
msgid "In the meantime, please consider that the software is not (yet) finished. More information %{a_start}on our blog%{a_end}."
msgstr "D'ici là, veuillez considérer que le logiciel n'est pas (encore) fini. Plus d'informations %{a_start}sur notre blog%{a_end}."
-#: lib/web/templates/email/email.html.eex:87 lib/web/templates/email/email.text.eex:6
+#, elixir-format
+#: lib/web/templates/email/email.html.eex:87
+#: lib/web/templates/email/email.text.eex:6
msgid "This is a demonstration site to test the beta version of Mobilizon."
msgstr "Ceci est un site de démonstration permettant de tester la version bêta de Mobilizon."
+#, elixir-format
#: lib/web/templates/email/email.html.eex:85
msgid "Warning"
msgstr "Attention"
-#: lib/web/templates/email/event_updated.html.eex:54 lib/web/templates/email/event_updated.text.eex:14
+#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:54
+#: lib/web/templates/email/event_updated.text.eex:14
msgid "Event has been cancelled"
msgstr "L'événement a été annulé"
-#: lib/web/templates/email/event_updated.html.eex:50 lib/web/templates/email/event_updated.text.eex:10
+#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:50
+#: lib/web/templates/email/event_updated.text.eex:10
msgid "Event has been confirmed"
msgstr "L'événement a été confirmé"
-#: lib/web/templates/email/event_updated.html.eex:52 lib/web/templates/email/event_updated.text.eex:12
+#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:52
+#: lib/web/templates/email/event_updated.text.eex:12
msgid "Event status has been set as tentative"
msgstr "Le statut de l'événement a été défini comme « à confirmer »"
+#, elixir-format
#: lib/web/templates/email/email.html.eex:88
msgid "%{b_start}Please do not use it in any real way%{b_end}"
msgstr "%{b_start}Veuillez ne pas l'utiliser pour aucun évènement réel%{b_end}"
+#, elixir-format
#: lib/web/templates/email/report.html.eex:39
msgid "Someone on %{instance} reported the following content."
msgstr "Quelqu'un sur %{instance} a signalé le contenu suivant."
+#, elixir-format
#: lib/web/templates/email/email.text.eex:10
msgid "In the meantime, please consider that the software is not (yet) finished. More information on our blog:"
msgstr "D'ici là, veuillez considérer que le logiciel n'est pas (encore) fini. Plus d'informations sur notre blog :"
+#, elixir-format
#: lib/web/templates/email/email.text.eex:7
msgid "Please do not use it in any real way"
msgstr "Veuillez ne pas l'utiliser pour un cas réel"
+#, elixir-format
#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:58
msgid "Confirm my participation"
msgstr "Confirmer ma participation"
+#, elixir-format
#: lib/web/email/participation.ex:114
msgid "Confirm your participation to event %{title}"
msgstr "Confirmer ma participation à l'événement %{title}"
-#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:45 lib/web/templates/email/anonymous_participation_confirmation.text.eex:7
+#, elixir-format
+#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:45
+#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:7
msgid "If you didn't request this email, you can simply ignore it."
msgstr "Si vous n'avez pas demandé ceci, merci d'ignorer cet email."
-#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:13 lib/web/templates/email/anonymous_participation_confirmation.text.eex:1
+#, elixir-format
+#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:13
+#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:1
msgid "Participation confirmation"
msgstr "Confirmation de participation"
-#: lib/web/templates/api/terms.html.eex:108
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr "Une identité interne pour l'identité sélectionnée actuellement"
-#: lib/web/templates/api/terms.html.eex:107
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
-msgstr "Une identité utilisateur interne"
+msgstr "Une identité utilisateur·ice interne"
-#: lib/web/templates/api/terms.html.eex:45
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr "Les informations que nous vous nous fournissez pourront être utilisées ainsi :"
-#: lib/web/templates/api/terms.html.eex:4
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr "Informations basiques du compte"
-#: lib/web/templates/api/terms.html.eex:28
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
-msgstr "Ne partagez aucune information dangereuse relative à Mobilizon."
+msgstr "Ne partagez aucune information sensible à l'aide de Mobilizon."
-#: lib/web/templates/api/terms.html.eex:126
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr "Partageons-nous des informations à des tiers ?"
-#: lib/web/templates/api/terms.html.eex:101
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr "Utilisons-nous des cookies ?"
-#: lib/web/templates/api/terms.html.eex:59
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr "Comment protégeons-nous vos informations ?"
-#: lib/web/templates/api/terms.html.eex:32
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
-msgstr "adresses IP et autres métadonnées"
+msgstr "Adresses IP et autres métadonnées"
-#: lib/web/templates/api/terms.html.eex:111
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:78
msgctxt "terms"
msgid "If you delete these informations, you need to login again."
msgstr "Si vous supprimez ces informations, vous devrez vous connecter de nouveau."
-#: lib/web/templates/api/terms.html.eex:113
-msgctxt "terms"
-msgid ""
-"If you're not connected, we don't store any information on your device, unless you participate in an event\n"
-" anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n"
-" display participation status. Deleting these informations will only stop displaying participation status in your\n"
-" browser."
-msgstr "Si vous n'êtes pas connecté.e, nous ne conserverons aucune information sur votre appareil, sauf si vous participez anonymement à un évènement. Dans ce cas nous conservons le hash de l'UUID et les statuts de participation dans votre navigateur pour pouvoir les afficher. Supprimer ces informations aura pour seule conséquence que votre participation ne sera plus affichée dans votre navigateur."
-
-#: lib/web/templates/api/terms.html.eex:123
+#, 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 "Attention : Ces informations sont conservées dans votre stockage local et non vos cookies."
-#: lib/web/templates/api/terms.html.eex:18
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr "Évènements publiés et commentaires"
-#: lib/web/templates/api/terms.html.eex:83
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
-msgstr "Ne conservez les adresses IP associées aux utilisateurs enregistrés pas plus de 12 mois."
+msgstr "Ne pas conserver les adresses IP associées aux utilisateur·ices enregistrés pas plus de 12 mois."
-#: lib/web/templates/api/terms.html.eex:109
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
-msgstr "Jetons pour vous identifer"
+msgstr "Jetons pour vous identifier"
-#: lib/web/templates/api/terms.html.eex:35
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr "Nous pouvons également conserver les données d'authentification y compris les adresses IP de toutes les requêtes de notre serveur."
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid ""
-"We collect information from you when you register on this server and gather data when you participate in the\n"
-" platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n"
-" be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n"
-" an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n"
-" also enter additional profile information such as a display name and biography, and upload a profile picture and\n"
-" header image. The username, display name, biography, profile picture and header image are always listed publicly.\n"
-" You may, however, visit this server without registering."
-msgstr ""
-"Nous collectons des informations sur vous lorsque vous vous inscrivez sur ce serveur et récupérons des données lorsque vous utilisez la plateforme en lisant, écrivant, et en interagissant avec les contenus partagés. Si vous vous inscrivez sur ce serveur, nous vous demanderons une adresse courriel, un mot de passe et au moins un nom d'utilisateur.ice. Votre adresse courriel sera vérifiée par l'envoi d'un courriel de confirmation contenant un lien unique. Si ce lien est visité, nous saurons que vous contrôlez l'adresse. Vous pouvez également entrer des informations supplémentaires au profil, comme un pseudonyme affiché, une biographie, une image de profil et une image d'en-tête. Le nom d'utilisateur, le pseudonyme affiché, la biographie, les images de profil et d'en-tête "
-"sont toujours publiques. Vous pouvez toutefois utiliser ce serveur sans vous inscrire."
-
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid ""
-"We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n"
-" does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n"
-" you, so long as those parties agree to keep this information confidential. We may also release your information\n"
-" when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n"
-" others rights, property, or safety."
-msgstr "Nous ne vendons ni ne transférons à aucun tiers les informations permettant de vous identifier. Ceci n'inclut pas les parties tierces qui nous aident dans la maintenance de ce site, gérer notre commerce, ou vous rendre service, tant que ces parties s'engagent à garder cette information confidentielle. Nous pouvons également publier ces informations si nous considérons que cela est nécessaire pour respecter la loi, respecter nos CGU, ou protéger nos droits, nos propriétés, ou notre sécurité, ou celles de tiers."
-
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid ""
-"We implement a variety of security measures to maintain the safety of your personal information when you enter,\n"
-" submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n"
-" your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n"
-" algorithm."
-msgstr "Nous utilisons plusieurs mesures de sécurité pour assurer la confidentialité de vos informations personnelles lorsque vous soumettez ou accédez à vos informations. Entre autres, votre session de navigateur et la connection entre vos applications et l'API sont sécurisés par SSL/TLS, et votre mot de passe est hashé avec un algorythme fort à sens unique."
-
-#: lib/web/templates/api/terms.html.eex:103
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr "Nous conservons les informations suivantes sur votre appareil lorsque vous vous connectez :"
-#: lib/web/templates/api/terms.html.eex:72
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr "Nous mettrons tout en possible pour :"
-#: lib/web/templates/api/terms.html.eex:43
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr "Comment utilisons-nous vos informations ?"
-#: lib/web/templates/api/terms.html.eex:71
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr "Quelle est notre politique de conservation des données ?"
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid ""
-"You can request and download an archive of your content, including your posts, media attachments, profile picture,\n"
-" and header image."
-msgstr "Vous pouvez demander, télécharger, et archiver vos données. Ceci inclut vos posts, médias liés, images de profil et d'en-tête."
-
-#: lib/web/templates/api/terms.html.eex:100
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr "Vous pouvez supprimer votre compte à tout moment de façon irréversible."
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid ""
-"Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n"
-" following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n"
-" recipients reside on a different server than this one."
-msgstr "Vos publications peuvent être téléchargées par d'autres serveurs du réseau. Vos publications sont transmises aux serveurs abonnés à votre instance, et les messages directs sont transmis aux serveurs des destinataire, si celleux-ci sont inscrit.e.s sur une autre instance que la vôtre."
-
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid ""
-"Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n"
-" different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n"
-" these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n"
-" of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n"
-" otherwise re-share them."
-msgstr "Vos évènements et commentaires sont transmis aux instances qui suivent la vôtre, ce qui signifie que d'autres serveurs possèderont des copies de ces contenus. Lorsque vous supprimez un évènement ou un commentaire, ceci est transmis de la même façon aux autres instances. L'action de rejoindre un évènement est fédérée de la même manière. Veuillez noter que les administrateurs de cette instances et de toutes les instances fédérées peuvent voir ces messages, et que les destinataires peuvent les copier, en faire des captures d'écran et les re-partager de différentes façons."
-
-#: lib/web/templates/api/terms.html.eex:159
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr "Modifications de notre politique de confidentialité"
-#: lib/web/templates/api/terms.html.eex:154
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr "Si ce serveur est dans l'Union Européenne ou dans l'Espace Economique Européen : nos sites, produits et services sont tous destinés aux personnes âgées de plus de 16 ans. Si vous avez moins de 16 ans, suivant le RGPD (<a href=\"https://fr.wikipedia.org/wiki/R%C3%A8glement_g%C3%A9n%C3%A9ral_sur_la_protection_des_donn%C3%A9es\">Règlement général sur la protection des données</a>), n'utilisez pas ce site."
-#: lib/web/templates/api/terms.html.eex:155
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr "Si le serveur est situé aux Etats-Unis : Notre site, nos produits et services sont tous à destination de personnes agées d'au moins 13 ans. Si vous avez moins de 13 ans, d'après les recommandations de COOPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) n'utilisez pas ce site."
-#: lib/web/templates/api/terms.html.eex:161
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr "Si nous décidons de changer notre politique de confidentialité, nous présenterons ces changements sur cette page."
-#: lib/web/templates/api/terms.html.eex:156
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr "Les conditions juridiques peuvent différer si le serveur est sous une autre juridiction."
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr "Adaptée à l'origine des politiques de confidentialité de <a href=\"https://mastodon.social/terms\">Mastodon</a> et <a href=\"https://github.com/discourse/discourse\">Discourse</a>."
-
-#: lib/web/templates/api/terms.html.eex:75
-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\n"
-" than 90 days."
-msgstr "Conserver les journaux du serveur contenant l'adresse IP de toutes les demandes adressées à ce serveur, dans la mesure où ces journaux sont conservés, pas plus de 90 jours."
-
-#: lib/web/templates/api/terms.html.eex:152
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr "Utilisation du site par les enfants"
-#: lib/web/templates/api/terms.html.eex:55
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
-msgid ""
-"The email address you provide may be used to send you information, updates and notifications about other people\n"
-" interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n"
-" questions."
+msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr "L'adresse électronique que vous fournissez peut être utilisée pour vous envoyer des informations, des mises à jour et des notifications concernant d'autres personnes qui interagissent avec votre contenu ou vous envoient des messages et pour répondre à des demandes, et/ou à d'autres requêtes ou questions."
-#: lib/web/templates/api/terms.html.eex:162
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr "Ce document est CC-BY-SA. Il a été mis à jour pour la dernière fois le 16 janvier 2020."
-
-#: lib/web/templates/api/terms.html.eex:53
-msgctxt "terms"
-msgid ""
-"To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n"
-" evasion or other violations."
+msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr "Pour aider à la modération de la communauté, par exemple en comparant votre adresse IP avec d'autres adresses connues afin de déterminer s'il y a contournement d'un bannissement ou d'autres violations."
-#: lib/web/templates/api/terms.html.eex:51
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
-msgid ""
-"To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n"
-" interact with other people's content and post your own content if you are logged in."
+msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr "Fournir la fonctionnalité de base de Mobilizon. Selon la politique de cette instance, vous ne pourrez interagir avec le contenu d'autres personnes et publier votre propre contenu que si vous êtes connecté."
-#: lib/web/templates/api/terms.html.eex:1
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr "Quelles informations collectons-nous ?"
-#: lib/web/templates/email/email_changed_new.html.eex:38 lib/web/templates/email/email_changed_new.text.eex:5
+#, elixir-format
+#: lib/web/templates/email/email_changed_new.html.eex:38
+#: lib/web/templates/email/email_changed_new.text.eex:5
msgid "Confirm the new address to change your email."
msgstr "Confirmez le changement d'adresse email."
-#: lib/web/templates/email/email_changed_new.html.eex:64 lib/web/templates/email/email_changed_new.text.eex:10
+#, elixir-format
+#: lib/web/templates/email/email_changed_new.html.eex:64
+#: lib/web/templates/email/email_changed_new.text.eex:10
msgid "If this change wasn't initiated by you, please ignore this email. The email address for the Mobilizon account won't change until you access the link above."
msgstr "Si vous n'êtes pas à l'origine de ce changement d'adresse email, vous pouvez ignorer ce message. L'adresse email du compte Mobilizon ne sera pas modifiée tant que vous n'accédez pas au lien ci-dessus."
-#: lib/web/templates/email/email_changed_old.html.eex:62 lib/web/templates/email/email_changed_old.text.eex:9
+#, elixir-format
+#: lib/web/templates/email/email_changed_old.html.eex:62
+#: lib/web/templates/email/email_changed_old.text.eex:9
msgid "If you did not ask to change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account."
msgstr "Si vous n'avez pas demandé à changer votre adresse email, il est probable que quelqu'un ait accédé à votre compte. Veuillez changer votre mot de passe immédiatement ou contacter l'administrateur du serveur si vous n'arrivez plus à vous contacter."
+#, elixir-format
#: lib/web/email/user.ex:175
msgid "Mobilizon on %{instance}: confirm your email address"
msgstr "Mobilizon sur %{instance}: confirmez votre adresse email"
+#, elixir-format
#: lib/web/email/user.ex:152
msgid "Mobilizon on %{instance}: email changed"
msgstr "Mobilizon sur %{instance}: adresse email modifiée"
-#: lib/web/templates/email/email_changed_old.html.eex:13 lib/web/templates/email/email_changed_old.text.eex:1
+#, elixir-format
+#: lib/web/templates/email/email_changed_old.html.eex:13
+#: lib/web/templates/email/email_changed_old.text.eex:1
msgid "New email address"
msgstr "Nouvelle adresse email"
-#: lib/web/templates/email/email_changed_old.html.eex:38 lib/web/templates/email/email_changed_old.text.eex:5
+#, elixir-format
+#: lib/web/templates/email/email_changed_old.html.eex:38
+#: lib/web/templates/email/email_changed_old.text.eex:5
msgid "The email address for your account on %{host} is being changed to:"
msgstr "L'adresse email pour votre compte sur %{host} est en train d'être changée pour :"
-#: lib/web/templates/email/email_changed_new.html.eex:13 lib/web/templates/email/email_changed_new.html.eex:51 lib/web/templates/email/email_changed_new.text.eex:1
+#, elixir-format
+#: lib/web/templates/email/email_changed_new.html.eex:13
+#: lib/web/templates/email/email_changed_new.html.eex:51 lib/web/templates/email/email_changed_new.text.eex:1
msgid "Verify email address"
msgstr "Vérifier l'adresse email"
-#: lib/web/templates/email/notification_each_week.html.eex:70 lib/web/templates/email/notification_each_week.text.eex:14 lib/web/templates/email/on_day_notification.html.eex:70 lib/web/templates/email/on_day_notification.text.eex:14
+#, elixir-format
+#: lib/web/templates/email/notification_each_week.html.eex:70
+#: lib/web/templates/email/notification_each_week.text.eex:14 lib/web/templates/email/on_day_notification.html.eex:70
+#: lib/web/templates/email/on_day_notification.text.eex:14
msgid "If you need to cancel your participation, just access the event page through the link above and click on the participation button."
msgid_plural "If you need to cancel your participation, just access the event page through the links above and click on the participation button."
msgstr[0] "Si vous avez besoin d'annuler votre participation, il suffit d'accéder à la page de l'événement à partir du lien ci-dessus et de cliquer sur le bouton de participation."
msgstr[1] "Si vous avez besoin d'annuler votre participation, il suffit d'accéder à la page de l'événement à partir du lien ci-dessus et de cliquer sur le bouton de participation."
+#, elixir-format
#: lib/web/email/notification.ex:46
msgid "One event planned today"
msgid_plural "%{nb_events} events planned today"
msgstr[0] "Un événement prévu aujourd'hui"
msgstr[1] "%{nb_events} événements prévus aujourd'hui"
-#: lib/web/templates/email/on_day_notification.html.eex:38 lib/web/templates/email/on_day_notification.text.eex:4
+#, elixir-format
+#: lib/web/templates/email/on_day_notification.html.eex:38
+#: lib/web/templates/email/on_day_notification.text.eex:4
msgid "You have one event today:"
msgid_plural "You have %{total} events today:"
msgstr[0] "Vous avez un événement aujourd'hui :"
msgstr[1] "Vous avez %{total} événements aujourd'hui :"
-#: lib/web/templates/email/group_invite.html.eex:38 lib/web/templates/email/group_invite.text.eex:5
+#, elixir-format
+#: lib/web/templates/email/group_invite.html.eex:38
+#: lib/web/templates/email/group_invite.text.eex:5
msgid "%{inviter} just invited you to join their group %{group}"
msgstr "%{inviter} vient de vous inviter à rejoindre son groupe %{group}"
-#: lib/web/templates/email/group_invite.html.eex:13 lib/web/templates/email/group_invite.text.eex:1
+#, elixir-format
+#: lib/web/templates/email/group_invite.html.eex:13
+#: lib/web/templates/email/group_invite.text.eex:1
msgid "Come along!"
msgstr "Rejoignez-nous !"
+#, elixir-format
#: lib/web/email/notification.ex:24
msgid "Don't forget to go to %{title}"
msgstr "N'oubliez pas de vous rendre à %{title}"
-#: lib/web/templates/email/on_day_notification.html.eex:13 lib/web/templates/email/on_day_notification.text.eex:1
+#, elixir-format
+#: lib/web/templates/email/on_day_notification.html.eex:13
+#: lib/web/templates/email/on_day_notification.text.eex:1
msgid "Events today"
msgstr "Événement"
-#: lib/web/templates/email/before_event_notification.html.eex:38 lib/web/templates/email/before_event_notification.text.eex:3
+#, elixir-format
+#: lib/web/templates/email/before_event_notification.html.eex:38
+#: lib/web/templates/email/before_event_notification.text.eex:3
msgid "Get ready for %{title}"
msgstr "Préparez vous pour %{title}"
+#, elixir-format
#: lib/web/templates/email/group_invite.html.eex:59
msgid "See my groups"
msgstr "Voir mes groupes"
-#: lib/web/templates/email/group_invite.html.eex:45 lib/web/templates/email/group_invite.text.eex:7
+#, elixir-format
+#: lib/web/templates/email/group_invite.html.eex:45
+#: lib/web/templates/email/group_invite.text.eex:7
msgid "To accept this invitation, head over to your groups."
msgstr "Pour accepter cette invitation, rendez-vous dans vos groupes."
-#: lib/web/templates/email/before_event_notification.html.eex:13 lib/web/templates/email/before_event_notification.text.eex:1
+#, elixir-format
+#: lib/web/templates/email/before_event_notification.html.eex:13
+#: lib/web/templates/email/before_event_notification.text.eex:1
msgid "Upcoming event"
msgstr "Événement à venir"
+#, elixir-format
#: lib/web/templates/email/before_event_notification.text.eex:4
msgid "View the event on: %{link}"
msgstr "Voir l'événement mis à jour sur : %{link}"
+#, elixir-format
#: lib/web/email/group.ex:28
msgid "You have been invited by %{inviter} to join group %{group}"
msgstr "Vous avez été invité par %{inviter} à rejoindre le groupe %{group}"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:92
msgid "Event address"
msgstr "Adresse de l'événement"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:102
msgid "Physical address was removed"
msgstr "L'adresse physique a été enlevée"
+#, elixir-format
#: lib/web/email/notification.ex:70
msgid "One event planned this week"
msgid_plural "%{nb_events} events planned this week"
msgstr[0] "Un événement prévu aujourd'hui"
msgstr[1] "%{nb_events} événements prévus aujourd'hui"
+#, elixir-format
#: lib/web/email/notification.ex:92
msgid "One participation request for event %{title} to process"
msgid_plural "%{number_participation_requests} participation requests for event %{title} to process"
msgstr[0] "Une demande de participation à l'événement %{title} à traiter"
msgstr[1] "%{number_participation_requests} demandes de participation à l'événement %{title} à traiter"
-#: lib/web/templates/email/notification_each_week.html.eex:38 lib/web/templates/email/notification_each_week.text.eex:4
+#, elixir-format
+#: lib/web/templates/email/notification_each_week.html.eex:38
+#: lib/web/templates/email/notification_each_week.text.eex:4
msgid "You have one event this week:"
msgid_plural "You have %{total} events this week:"
msgstr[0] "Vous avez un événement aujourd'hui :"
msgstr[1] "Vous avez %{total} événements aujourd'hui :"
-#: lib/web/templates/email/pending_participation_notification.html.eex:38 lib/web/templates/email/pending_participation_notification.text.eex:4
+#, elixir-format
+#: lib/web/templates/email/pending_participation_notification.html.eex:38
+#: lib/web/templates/email/pending_participation_notification.text.eex:4
msgid "You have one pending participation to process:"
msgid_plural "You have %{number_participation_requests} participation requests to process:"
msgstr[0] "Vous avez une demande de participation en attente à traiter :"
msgstr[1] "Vous avez %{number_participation_requests} demandes de participation en attente à traiter :"
-#: lib/web/templates/email/notification_each_week.html.eex:13 lib/web/templates/email/notification_each_week.text.eex:1
+#, elixir-format
+#: lib/web/templates/email/notification_each_week.html.eex:13
+#: lib/web/templates/email/notification_each_week.text.eex:1
msgid "Events this week"
msgstr "Événements cette semaine"
-#: lib/web/templates/email/pending_participation_notification.html.eex:51 lib/web/templates/email/pending_participation_notification.text.eex:6
+#, elixir-format
+#: lib/web/templates/email/pending_participation_notification.html.eex:51
+#: lib/web/templates/email/pending_participation_notification.text.eex:6
msgid "Manage pending participation requests"
msgstr "Gérer les demandes de participation en attente"
-#: lib/web/templates/email/pending_participation_notification.html.eex:13 lib/web/templates/email/pending_participation_notification.text.eex:1
+#, elixir-format
+#: lib/web/templates/email/pending_participation_notification.html.eex:13
+#: lib/web/templates/email/pending_participation_notification.text.eex:1
msgid "Pending participations to process"
msgstr "Demandes de participation en attente"
-#: lib/web/templates/email/pending_participation_notification.html.eex:64 lib/web/templates/email/pending_participation_notification.text.eex:8
+#, elixir-format
+#: lib/web/templates/email/pending_participation_notification.html.eex:64
+#: lib/web/templates/email/pending_participation_notification.text.eex:8
msgid "You receive this email because you chose to get notifications for pending participations to your events. You may disable or change the configuration for these notification in your Mobilizon user settings."
msgstr "Vous recevez ce courriel parce que vous avez choisi de recevoir des notifications pour les participations en attente à vos événements. Vous pouvez désactiver ou modifier la configuration de ces notifications dans vos paramètres d'utilisateur·ice Mobilizon."
+#, elixir-format
#: lib/web/templates/email/email.html.eex:90
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of %{b_start}version 1 of the software in the fall of 2020%{b_end}."
msgstr "Mobilizon est en cours de développement, nous ajouterons de nouvelles fonctionnalités à ce site lors de mises à jour régulières, jusqu'à la publication de %{b_start}la version 1 du logiciel à l'automne 2020%{b_end}."
+#, elixir-format
#: lib/web/templates/email/email.text.eex:9
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
msgstr "Mobilizon est en cours de développement, nous ajouterons de nouvelles fonctionnalités à ce site lors de mises à jour régulières, jusqu'à la publication de la version 1 du logiciel à l'automne 2020."
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr "L'organisateur·ice de l'événement n'a pas ajouté de description."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr "Nous utilisons plusieurs mesures de sécurité pour assurer la confidentialité de vos informations personnelles lorsque vous soumettez ou accédez à vos informations. Entre autres, votre session de navigateur et la connexion entre vos applications et l'API sont sécurisés par SSL/TLS, et votre mot de passe est haché avec un algorithme fort à sens unique."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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 "Non. Nous ne vendons, n’échangeons ou ne transférons d’une quelque manière que soit des informations permettant de vous identifier personnellement. Cela n’inclut pas les tierces parties de confiance qui nous aident à opérer ce site, à conduire nos activités commerciales ou à vous servir, tant qu’elles acceptent de garder ces informations confidentielles. Nous sommes également susceptibles de partager vos informations quand nous pensons que c’est nécessaire pour nous conformer à la loi, pour appliquer les politiques de notre site ainsi que pour défendre nos droits, notre propriété, notre sécurité et celles et ceux d’autres personnes."
+
+#, 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 "Conserver les journaux du serveur contenant l'adresse IP de toutes les demandes adressées à ce serveur, dans la mesure où ces journaux sont conservés, pas plus de 90 jours."
+
+#, 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 ""
+"Nous collectons des informations sur vous lorsque vous vous inscrivez sur cette instance et récupérons des données lorsque vous utilisez la plateforme en lisant, écrivant, et en interagissant avec les contenus partagés. Si vous vous inscrivez sur cette instance, nous vous demanderons <b>une adresse courriel, un mot de passe</b> (haché) et au moins <b>un nom d'utilisateur.ice</b>. Votre adresse courriel sera vérifiée par l'envoi d'un courriel de confirmation contenant un lien unique. Si ce lien est visité, nous saurons que vous contrôlez l'adresse. Vous pouvez également entrer des informations supplémentaires au profil, comme <b>un pseudonyme, une biographie, une image de profil et une image d'en-tête</b>. Le nom d'utilisateur, le pseudonyme affiché, la biographie, les images "
+"de profil et d'en-tête <b>sont toujours publiques</b>. <b>Vous pouvez toutefois utiliser ce serveur sans vous inscrire</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 "Si vous n'êtes pas connecté·e, nous ne conserverons aucune information sur votre appareil, sauf si vous participez anonymement à un évènement. Dans ce cas spécifique nous conservons le hash d'un identifiant unique pour l'événement et les statuts de participation dans votre navigateur pour pouvoir les afficher. Supprimer ces informations aura pour seule conséquence que votre participation ne sera plus affichée dans votre navigateur."
+
+#, 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 "Vos <b>évènements</b> et <b>commentaires</b> sont transmis aux instances qui suivent la vôtre, ce qui signifie que d'autres instances posséderont des copies de ces contenus. Lorsque vous supprimez un évènement ou un commentaire, ceci est transmis de la même façon aux autres instances. Toutes les interactions liées aux fonctionnalités des événements - comme rejoindre un événement - ou bien aux fonctionnalités de groupes - comme gérer ses ressources - sont également fédérées. Veuillez noter que les administrateur·ices de cette instance et de toutes les instances fédérées peuvent voir ces messages, et que les destinataires peuvent les copier, en faire des captures d'écran et les repartager de différentes façons."
+
+#, 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 "Votre contenu peut être téléchargé par d'autres instances du réseau. Vos événements publics et commentaires sont transmis aux instances abonnées à votre instance. Le contenu créé à travers un groupe est transmis à toutes les instances de tous les membres du groupe, si celleux-ci sont inscrit·e·s sur une autre instance que la vôtre."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:23
+msgctxt "terms"
+msgid "Accepting these Terms"
+msgstr "Acceptation de ces Conditions"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+msgctxt "terms"
+msgid "Changes to these Terms"
+msgstr "Modifications de ces Conditions d'Utilisation"
+
+#, 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 "Nous nous réservons le droit de modifier ces Conditions à tout moment. Par exemple, nous pouvons être amenés à modifier ces Conditions si nous proposons une nouvelle fonctionnalité ou pour toute autre raison."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:85
+msgctxt "terms"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr "Une grande partie du contenu du Service provient de vous et d'autres personnes, et nous ne l'examinons, ne le vérifions ni ne l'authentifions, et il peut contenir des inexactitudes ou de fausses informations. Nous ne faisons aucune déclaration, garantie ou assurance concernant la qualité, la pertinence, la véracité, l'exactitude ou l'exhaustivité de tout contenu du Service. Vous reconnaissez être seul responsable et assumez tous les risques découlant de votre utilisation ou de votre confiance dans tout contenu."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr "De plus, vous acceptez de ne pas faire ce qui suit en relation avec le Service ou les autres utilisateur·ices :"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr "Contourner ou tenter de contourner tout filtrage, mesures de sécurité, limites d'accès ou autres caractéristiques destinées à protéger le Service, les utilisateur·ices du Service ou des tiers."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr "Recueillir des informations personnelles sur les autres utilisateur·ices, ou intimider, menacer, traquer ou harceler de toute autre manière les autres utilisateurs du Service ;"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr "Du contenu qui est illégal ou illicite, qui autrement entraînerait une responsabilité ;"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr "Du contenu susceptible d'enfreindre ou de violer un brevet, une marque de commerce, un secret commercial, un droit d'auteur, un droit à la vie privée, un droit de publicité ou tout autre droit intellectuel ou autre de toute partie ;"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr "Création de compte"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr "Accord complet"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr "Commentaires"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr "Liens hypertexte et contenu tiers"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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 "Si vous enfreignez l'une de ces Conditions, nous avons le droit de suspendre ou de désactiver votre accès ou votre utilisation du Service."
+
+#, 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 "Si vous continuez à utiliser le Service après l'entrée en vigueur des Conditions révisées, alors vous avez accepté les conditions révisées."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:63
+msgctxt "terms"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr "Usurper l'identité d'une personne ou d'une entité ou afficher au nom d'une personne ou d'une entité, ou encore présenter de manière inexacte votre affiliation à une personne ou une entité ;"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr "Notre Service vous permet, ainsi qu'à d'autres utilisateur·ices, de publier, d'établir des liens et de mettre à disposition du contenu. Vous êtes responsable du contenu que vous mettez à la disposition du service, y compris de sa légalité, de sa fiabilité et de sa pertinence."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr "Politique de confidentialité"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr "Questions et coordonnées"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr "Résiliation"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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 "Utiliser le Service de toute manière qui pourrait interférer, perturber, affecter négativement ou empêcher d'autres utilisateur·ices de profiter pleinement du Service ou qui pourrait endommager, désactiver, surcharger ou altérer le fonctionnement du Service ;"
+
+#, 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 "Lorsque vous publiez, liez ou mettez à disposition un contenu sur le Service, vous nous accordez le droit et la licence d'afficher et de distribuer votre contenu sur ou via le Service (y compris via des applications). Nous pouvons formater votre contenu pour l'afficher dans le Service, mais nous ne modifierons pas ou ne réviserons pas la substance de votre contenu lui-même. L'affichage et la distribution de votre contenu se fait strictement selon les règles de visibilité que vous avez définies pour le contenu. Nous ne modifierons pas la visibilité du contenu que vous avez défini."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:47
+msgctxt "terms"
+msgid "Your Content & Conduct"
+msgstr "Votre contenu et votre conduite"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr "<b>%{instance_name}</b> ne fait aucune revendication et n'accepte aucune responsabilité concernant les sites web de tiers accessibles par lien hypertexte depuis le Service ou les sites web liés au Service. Lorsque vous quittez le Service, vous devez savoir que les présentes Conditions et nos politiques de confidentialité ne sont plus applicables. L'inclusion d'un lien n'implique pas l'approbation par <b>%{instance_name}</b> du site. L'utilisation de tout site web lié est aux risques et périls de l'utilisateur·ice."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr "Enfin, votre utilisation du Service est également soumise à l'acceptation des <a href=\"/rules\">règles spécifiques de l'instance </a> concernant le code de conduite et les règles de modération. Le non-respect de ces règles peut également entraîner la désactivation ou la suspension de votre compte."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+msgctxt "terms"
+msgid "For full details about the Mobilizon software <a href=\"https://joinmobilizon.org\">see here</a>."
+msgstr "Pour plus de détails sur le logiciel Mobilizon <a href=\"https://joinmobilizon.org\">voir ici</a>."
+
+#, 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 "Pour savoir comment nous recueillons et utilisons les informations sur les utilisateur·ice·s du Service, veuillez consulter notre <a href=\"/privacy\">politique de confidentialité</a>."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:18
+msgctxt "terms"
+msgid "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."
+msgstr "Voici les points importants que vous devez savoir sur l'accès et l'utilisation du site web et du Service <b>%{instance_name}</b> (<a href=\"https://%{instance_url}\">%{instance_url}</a>) (conjointement, \"Service\"). Ce sont nos conditions de service (\"Conditions\"). Veuillez les lire attentivement."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr "Si nous apportons des changements majeurs, nous en informerons nos utilisateur·ices de manière claire et visible. Il est possible que les changements mineurs ne soient mis en évidence que dans le pied de page de cette page. Il est de votre responsabilité de vérifier régulièrement sur le site web si des modifications ont été apportées aux présentes Conditions."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr "Afin de faire de <b>%{instance_name}</b> un endroit idéal pour nous toutes et tous, nous vous prions de ne pas publier, relier ou rendre disponible sur ou par le biais du Service l'un des éléments suivants :"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr "Les informations privées de toute personne tierce (par exemple, les adresses, les numéros de téléphone, les adresses électroniques, les numéros de sécurité sociale et les numéros de carte de crédit) ;"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr "Mobilizon étant un réseau distribué, il est possible, en fonction des règles de visibilité définies pour votre contenu, que celui-ci ait été distribué à d'autres instances de Mobilizon. Lorsque vous supprimez votre contenu, nous demandons à ces autres instances de supprimer également le contenu. Notre responsabilité quant au contenu supprimé de ces autres instances s'arrête ici. Si, pour une raison quelconque, une autre instance ne supprime pas le contenu, nous ne pouvons être tenus responsables."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr "Les présentes Conditions constituent l'intégralité de l'accord entre vous et <b>%{instance_name}</b> concernant l'utilisation du Service, remplaçant tout accord préalable entre vous et <b>%{instance_name}</b> relatif à votre utilisation du Service."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr "Ce Service fonctionne sur une instance de Mobilizon. Ce code source est sous <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">licence AGPLv3</a> ce qui signifie que vous êtes autorisé et même encouragé à prendre le code source, le modifier et l'utiliser."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+msgctxt "terms"
+msgid "Viruses, corrupted data or other harmful, disruptive or destructive files or code."
+msgstr "Virus, données corrompues ou autres fichiers ou codes nuisibles, perturbateurs ou destructeurs."
+
+#, 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 "Nous ne pouvons être tenus responsables si une erreur de programmation ou d'administration rend votre contenu visible à un public plus large que celui que vous aviez prévu. Outre notre droit limité sur votre contenu, vous conservez tous vos droits sur le contenu que vous publiez, mettez en lien et rendez disponible sur ou via le Service."
+
+#, 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 "Nous ne sommes pas responsables des pertes que vous pourriez subir si quelqu'un d'autre utilise votre adresse électronique ou votre mot de passe, à votre insu ou non."
+
+#, 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 "Lorsque vous créez un compte, vous acceptez également de maintenir la sécurité et la confidentialité de votre mot de passe et vous acceptez tous les risques d'accès non autorisé aux données de votre compte et à toute autre information que vous fournissez à <b>%{instance_name}</b>."
+
+#, 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 "Vous pouvez supprimer le contenu que vous avez publié en le supprimant. Une fois que vous avez supprimé votre contenu, il n'apparaîtra plus sur le Service, mais des copies de votre contenu supprimé peuvent rester dans notre système ou des sauvegardes pendant un certain temps. Les journaux d'accès au serveur web peuvent également être stockés pendant un certain temps dans le système."
+
+#, 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 "Si vous accédez à ou utilisez le Service, cela signifie que vous acceptez d'être lié·e par toutes les Conditions ci-dessous. Ainsi, avant d'utiliser le Service, veuillez lire toutes les conditions. Si vous n'acceptez pas l'ensemble des conditions ci-dessous, veuillez ne pas utiliser le Service. De même, si une condition n'a pas de sens pour vous, veuillez nous le faire savoir en contactant %{contact}."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:96
+msgctxt "terms"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr "Les questions ou commentaires concernant le Service peuvent nous être adressés à %{contact}"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+msgctxt "terms"
+msgid "Source code"
+msgstr "Code source"
+
+#, 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 "Certains termes, techniques ou non, utilisés dans le texte ci-dessous peuvent recouvrir des concepts difficiles à appréhender. Nous proposons <a href=\"/glossary\">un glossaire</a> qui pourra vous aider à mieux les comprendre."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:93
+msgctxt "terms"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr "Nous aimons les retours d'information. N'hésitez pas à nous faire savoir ce que vous pensez du Service, des présentes Conditions et, en général, de <b>%{instance_name}</b>."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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 "Les administrateurs d'instance (et les modérateurs de la communauté, sous réserve d'un accès approprié) sont chargés de surveiller et d'agir sur les contenus signalés et autres rapports d'utilisateur·ices, et ont le droit et la responsabilité de supprimer ou de modifier les contenus qui ne sont pas conformes aux règles de cette d'instance, ou de suspendre, bloquer ou interdire (temporairement ou définitivement) tout compte, communauté ou instance pour violation de ces conditions, ou pour d'autres comportements qu'ils jugent inappropriés, menaçants, offensants ou nuisibles."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:71
+msgctxt "terms"
+msgid "Our responsability"
+msgstr "Notre responsabilité"
+
+#, 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 "Lorsque nous disons « nous », « notre » ou « nos » dans ce document, nous faisons référence aux propriétaires, opérateur·ices et administrateur·ices de cette instance de Mobilizon. Le logiciel Mobilizon est fourni par l'équipe des contributeur·ices de Mobilizon, soutenue par <a href=\"https://framasoft.org\">Framasoft</a>, une organisation française d'éducation populaire à but non lucratif qui défend les logiciels libres. Sauf mention explicite, cette instance de Mobilizon est un service indépendant utilisant le code source de Mobilizon. Vous pouvez trouver plus d'informations sur cette instance sur la page <a href=\"/about/instance\">« A propos de cette instance »</a>."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:6
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr "<b>%{instance_name}</b> n'utilisera pas ni ne transmettra ou revendra vos données"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr "Si vous découvrez ou soupçonnez des failles de sécurité du Service, veuillez nous en informer dès que possible. Pour les failles de sécurité dans le logiciel Mobilizon lui-même, veuillez contacter directement <a href=\"https://framagit.org/framasoft/mobilizon/\">ses contributeur·ices</a>."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr "Les administrateur·ices d'instance doivent s'assurer que chaque communauté hébergée sur l'instance est correctement modérée conformément aux règles définies."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr "Adaptée à l'origine des politiques de confidentialité de <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> et <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a>, aussi sous licence <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr "Adaptée à l'origine des politiques de confidentialité de <a href=\"https://mastodon.social/terms\">Mastodon</a> et <a href=\"https://github.com/discourse/discourse\">Discourse</a>, aussi sous licence <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr "Version courte"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr "Le service est fourni sans garanties et ces conditions peuvent changer dans le futur"
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr "Ce document est sous licence <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. La dernière mise à jour date du 18 juin 2020."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr "Ce document est sous licence <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. La dernière mise à jour date du 22 juin 2020."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr "Vous devez respecter les autres et les règles de <b>%{instance_name}</b> lorsque vous utilisez le service"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr "Vous devez respecter la loi lorsque vous utilisez <b>%{instance_name}</b>"
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr "Votre contenu vous appartient"
diff --git a/priv/gettext/it/LC_MESSAGES/default.po b/priv/gettext/it/LC_MESSAGES/default.po
index 48dc0e1ca..de11b3241 100644
--- a/priv/gettext/it/LC_MESSAGES/default.po
+++ b/priv/gettext/it/LC_MESSAGES/default.po
@@ -21,7 +21,7 @@ msgid "If you didn't request this, please ignore this email. Your password won't
msgstr ""
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr ""
@@ -381,241 +381,181 @@ msgid "Participation confirmation"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr ""
@@ -819,3 +759,405 @@ msgstr ""
#: lib/web/templates/email/email.text.eex:9
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
msgstr ""
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/ja/LC_MESSAGES/default.po b/priv/gettext/ja/LC_MESSAGES/default.po
index 7d9f36edf..78d9332fb 100644
--- a/priv/gettext/ja/LC_MESSAGES/default.po
+++ b/priv/gettext/ja/LC_MESSAGES/default.po
@@ -19,7 +19,7 @@ msgid "If you didn't request this, please ignore this email. Your password won't
msgstr ""
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr ""
@@ -378,241 +378,181 @@ msgid "Participation confirmation"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr ""
@@ -809,3 +749,405 @@ msgstr ""
#: lib/web/templates/email/email.text.eex:9
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
msgstr ""
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/nl/LC_MESSAGES/default.po b/priv/gettext/nl/LC_MESSAGES/default.po
index 21af510b2..7cb4c3fbb 100644
--- a/priv/gettext/nl/LC_MESSAGES/default.po
+++ b/priv/gettext/nl/LC_MESSAGES/default.po
@@ -24,7 +24,7 @@ msgstr ""
"instelt."
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr "Feed voor %{email} op Mobilizon"
@@ -402,241 +402,181 @@ msgid "Participation confirmation"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr ""
@@ -850,3 +790,405 @@ msgstr ""
"Mobilizon is in ontwikkeling, we zullen regelmatig nieuwe functies toevoegen "
"aan deze site via updates, tot versie 1 van de software "
"beschikbaar is in de eerste helft van 2020."
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/oc/LC_MESSAGES/default.po b/priv/gettext/oc/LC_MESSAGES/default.po
index d48b698f0..efb2b85c8 100644
--- a/priv/gettext/oc/LC_MESSAGES/default.po
+++ b/priv/gettext/oc/LC_MESSAGES/default.po
@@ -14,680 +14,618 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 3.11.2\n"
+#, elixir-format
#: lib/web/templates/email/password_reset.html.eex:48
#: lib/web/templates/email/password_reset.text.eex:12
-#, elixir-format
msgid "If you didn't request this, please ignore this email. Your password won't change until you access the link below and create a new one."
msgstr ""
"S’avètz pas demandat aquò, podètz ignorar aqueste corrièl. Vòstre senhal cambiarà pas mentre que cliquetz pas lo ligam çai-jos e ne definiscatz un novèl."
-#: lib/service/export/feed.ex:169
#, elixir-format
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr "Flux per %{email} sus Mobilizon"
+#, elixir-format
#: lib/web/templates/email/email.html.eex:151
#: lib/web/templates/email/email.text.eex:16
-#, elixir-format
msgid "%{instance} is a Mobilizon server."
msgstr "%{instance} es una instància Mobilizon."
-#: lib/web/templates/email/report.html.eex:41
#, elixir-format
+#: lib/web/templates/email/report.html.eex:41
msgid "%{reporter_name} (%{reporter_username}) reported the following content."
msgstr "%{reporter_name} (%{reporter_username}) a senhalat lo contengut seguent."
-#: lib/web/templates/email/report.html.eex:52
#, elixir-format
+#: lib/web/templates/email/report.html.eex:52
msgid "%{title} by %{creator}"
msgstr "%{title} per %{creator}"
-#: lib/web/templates/email/registration_confirmation.html.eex:58
#, elixir-format
+#: lib/web/templates/email/registration_confirmation.html.eex:58
msgid "Activate my account"
msgstr "Activar mon compte"
+#, elixir-format
#: lib/web/templates/email/email.html.eex:120
#: lib/web/templates/email/email.text.eex:14
-#, elixir-format
msgid "Ask the community on Framacolibri"
msgstr "Demandatz a la comunautat sus Framacolibri"
+#, elixir-format
#: lib/web/templates/email/report.html.eex:66
#: lib/web/templates/email/report.text.eex:13
-#, elixir-format
msgid "Comments"
msgstr "Comentaris"
+#, elixir-format
#: lib/web/templates/email/report.html.eex:50
#: lib/web/templates/email/report.text.eex:6
-#, elixir-format
msgid "Event"
msgstr "Eveniment"
-#: lib/web/templates/email/registration_confirmation.html.eex:45
#, elixir-format
+#: lib/web/templates/email/registration_confirmation.html.eex:45
msgid "If you didn't request this, please ignore this email."
msgstr "S’avètz pas demandat aquò, mercés d’ignorar aqueste messatge."
-#: lib/web/email/user.ex:48
#, elixir-format
+#: lib/web/email/user.ex:48
msgid "Instructions to reset your password on %{instance}"
msgstr "Consignas per reïnincializar vòstre senhal sus %{instance}"
-#: lib/web/templates/email/email.html.eex:152
#, elixir-format
+#: lib/web/templates/email/email.html.eex:152
msgid "Learn more about Mobilizon."
msgstr "Ne saber mai tocant Mobilizon."
-#: lib/web/templates/email/registration_confirmation.html.eex:13
#, elixir-format
+#: lib/web/templates/email/registration_confirmation.html.eex:13
msgid "Nearly here!"
msgstr "I sètz gaireben !"
+#, elixir-format
#: lib/web/templates/email/email.html.eex:117
#: lib/web/templates/email/email.text.eex:12
-#, elixir-format
msgid "Need some help? Something not working properly?"
msgstr "Besonh d’ajuda ? Quicòm truca ?"
-#: lib/web/templates/email/report.html.eex:13
#, elixir-format
+#: lib/web/templates/email/report.html.eex:13
msgid "New report on %{instance}"
msgstr "Nòu senhalament sus %{instance}"
+#, elixir-format
#: lib/web/templates/email/report.html.eex:84
#: lib/web/templates/email/report.text.eex:22
-#, elixir-format
msgid "Reason"
msgstr "Rason"
-#: lib/web/templates/email/password_reset.html.eex:61
#, elixir-format
+#: lib/web/templates/email/password_reset.html.eex:61
msgid "Reset Password"
msgstr "Reïnicializar mon senhal"
-#: lib/web/templates/email/password_reset.html.eex:41
#, elixir-format
+#: lib/web/templates/email/password_reset.html.eex:41
msgid "Resetting your password is easy. Just press the button below and follow the instructions. We'll have you up and running in no time."
msgstr "Reïnicializar vòstre senhal es facil. Clicatz simplament lo boton e seguètz las consignas. Seretz prèst d’aquí un momenton."
-#: lib/web/templates/email/password_reset.html.eex:13
#, elixir-format
+#: lib/web/templates/email/password_reset.html.eex:13
msgid "Trouble signing in?"
msgstr "De dificultats a vos connectar ?"
-#: lib/web/templates/email/report.html.eex:104
#, elixir-format
+#: lib/web/templates/email/report.html.eex:104
msgid "View the report"
msgstr "Veire lo senhalament"
-#: lib/web/templates/email/registration_confirmation.html.eex:38
#, elixir-format
+#: lib/web/templates/email/registration_confirmation.html.eex:38
msgid "You created an account on %{host} with this email address. You are one click away from activating it."
msgstr "Avètz creat un compte sus %{host} amb aquesta adreça electronica. Sètz a un clic de l’activar."
-#: lib/web/email/user.ex:28
#, elixir-format
+#: lib/web/email/user.ex:28
msgid "Instructions to confirm your Mobilizon account on %{instance}"
msgstr "Consignas per confirmar vòstre compte Mobilizon sus %{instance}"
-#: lib/web/email/admin.ex:23
#, elixir-format
+#: lib/web/email/admin.ex:23
msgid "New report on Mobilizon instance %{instance}"
msgstr "Nòu senhalament sus l’instància Mobilizon %{instance}"
-#: lib/web/templates/email/registration_confirmation.text.eex:1
#, elixir-format
+#: lib/web/templates/email/registration_confirmation.text.eex:1
msgid "Activate your account"
msgstr "Activar mon compte"
-#: lib/web/templates/email/event_participation_approved.html.eex:13
#, elixir-format
+#: lib/web/templates/email/event_participation_approved.html.eex:13
msgid "All good!"
msgstr "Aquò’s tot bon !"
+#, elixir-format
#: lib/web/templates/email/event_participation_approved.html.eex:45
#: lib/web/templates/email/event_participation_approved.text.eex:7
-#, elixir-format
msgid "An organizer just approved your participation. You're now going to this event!"
msgstr ""
"L’organizator ven d’aprovar vòstra participacion. Ara anatz a aqueste "
"eveniment !"
+#, elixir-format
#: lib/web/templates/email/before_event_notification.html.eex:51
#: lib/web/templates/email/event_participation_approved.html.eex:58 lib/web/templates/email/event_updated.html.eex:119
-#, elixir-format
msgid "Go to event page"
msgstr "Anar a la pagina de l’eveniment"
+#, elixir-format
#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:70
#: lib/web/templates/email/before_event_notification.html.eex:63 lib/web/templates/email/before_event_notification.text.eex:5
#: lib/web/templates/email/event_participation_approved.html.eex:70 lib/web/templates/email/event_updated.html.eex:131
#: lib/web/templates/email/event_updated.text.eex:32
-#, elixir-format
msgid "If you need to cancel your participation, just access the event page through link above and click on the participation button."
msgstr ""
"Se vos fa besonh d’anullar vòstra participacion, vos cal pas qu’accedir a la pagina de l’eveniment via lo ligam çai-jos e clicar lo boton de "
"participacion."
+#, elixir-format
#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:11
#: lib/web/templates/email/event_participation_approved.text.eex:11
-#, elixir-format
msgid "If you need to cancel your participation, just access the previous link and click on the participation button."
msgstr "Se vos fa besonh d’anullar vòstra participacion, vos cal pas qu’accedir al ligam çai-jos e clicar lo boton de participacion."
-#: lib/web/templates/email/email.text.eex:16
#, elixir-format
+#: lib/web/templates/email/email.text.eex:16
msgid "Learn more about Mobilizon:"
msgstr "Ne saber mai tocant Mobilizon :"
-#: lib/web/templates/email/report.text.eex:1
#, elixir-format
+#: lib/web/templates/email/report.text.eex:1
msgid "New report from %{reporter} on %{instance}"
msgstr "Nòu senhalament sus %{instance}"
-#: lib/web/templates/email/event_participation_approved.text.eex:1
#, elixir-format
+#: lib/web/templates/email/event_participation_approved.text.eex:1
msgid "Participation approved"
msgstr "Participacion aprovada"
-#: lib/web/templates/email/event_participation_rejected.text.eex:1
#, elixir-format
+#: lib/web/templates/email/event_participation_rejected.text.eex:1
msgid "Participation rejected"
msgstr "Participacion regetada"
-#: lib/web/templates/email/password_reset.text.eex:1
#, elixir-format
+#: lib/web/templates/email/password_reset.text.eex:1
msgid "Password reset"
msgstr "Reïnicializacion del senhal"
-#: lib/web/templates/email/password_reset.text.eex:7
#, elixir-format
+#: lib/web/templates/email/password_reset.text.eex:7
msgid "Resetting your password is easy. Just click the link below and follow the instructions. We'll have you up and running in no time."
msgstr "Reïnicializar vòstre senhal es facil. Clicatz simplament lo boton e seguètz las consignas. Seretz prèst d’aquí un momenton."
-#: lib/web/templates/email/event_participation_rejected.html.eex:13
#, elixir-format
+#: lib/web/templates/email/event_participation_rejected.html.eex:13
msgid "Sorry!"
msgstr "Nos dòl !"
+#, elixir-format
#: lib/web/templates/email/event_participation_rejected.html.eex:45
#: lib/web/templates/email/event_participation_rejected.text.eex:7
-#, elixir-format
msgid "Unfortunately, the organizers rejected your participation."
msgstr ""
"Malaürosament, los organizaires an regetada vòstra demanda de participacion."
-#: lib/web/templates/email/registration_confirmation.text.eex:5
#, elixir-format
+#: lib/web/templates/email/registration_confirmation.text.eex:5
msgid "You created an account on %{host} with this email address. You are one click away from activating it. If this wasn't you, please ignore this email."
msgstr "Avètz creat un compte sus %{host} amb aquesta adreça electronica. Sètz a un clic de l’activar."
+#, elixir-format
#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:38
#: lib/web/templates/email/event_participation_approved.html.eex:38
-#, elixir-format
msgid "You requested to participate in event %{title}"
msgstr "Avètz demandat de participar a l’eveniment %{title}"
+#, elixir-format
#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:5
#: lib/web/templates/email/event_participation_approved.text.eex:5 lib/web/templates/email/event_participation_rejected.html.eex:38
#: lib/web/templates/email/event_participation_rejected.text.eex:5
-#, elixir-format
msgid "You requested to participate in event %{title}."
msgstr "Avètz demandat de participar a l’eveniment %{title}."
-#: lib/web/email/participation.ex:92
#, elixir-format
+#: lib/web/email/participation.ex:92
msgid "Your participation to event %{title} has been approved"
msgstr "Vòstra participacion a l’eveniment %{title} es estada aprovada"
-#: lib/web/email/participation.ex:71
#, elixir-format
+#: lib/web/email/participation.ex:71
msgid "Your participation to event %{title} has been rejected"
msgstr "Vòstra participacion a l’eveniment %{title} es estada regetada"
-#: lib/web/templates/email/event_updated.html.eex:82
#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:82
msgid "Ending of event"
msgstr "Fin de l’eveniment"
-#: lib/web/email/event.ex:35
#, elixir-format
+#: lib/web/email/event.ex:35
msgid "Event %{title} has been updated"
msgstr "L’eveniment %{title} es estat actualizat"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:13
#: lib/web/templates/email/event_updated.text.eex:1
-#, elixir-format
msgid "Event updated!"
msgstr "Eveniment actualizat !"
-#: lib/web/templates/email/event_updated.text.eex:27
#, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:27
msgid "New date and time for ending of event: %{ends_on}"
msgstr "Novèla data e ora de fin de l’eveniment : %{ends_on}"
-#: lib/web/templates/email/event_updated.text.eex:23
#, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:23
msgid "New date and time for start of event: %{begins_on}"
msgstr "Novèla data e ora de debuta de l’eveniment : %{begins_on}"
-#: lib/web/templates/email/event_updated.text.eex:19
#, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:19
msgid "New title: %{title}"
msgstr "Títol novèl : %{title}"
-#: lib/web/templates/email/event_updated.html.eex:72
#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:72
msgid "Start of event"
msgstr "Debuta de l’eveniment"
-#: lib/web/templates/email/event_updated.text.eex:5
#, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:5
msgid "The event %{title} was just updated"
msgstr "L’eveniment %{title} es estat actualizat"
-#: lib/web/templates/email/event_updated.html.eex:38
#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:38
msgid "The event %{title} was updated"
msgstr "L’eveniment %{title} es estat actualizat"
-#: lib/web/templates/email/event_updated.html.eex:62
#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:62
msgid "Title"
msgstr "Títol"
-#: lib/web/templates/email/event_updated.text.eex:30
#, elixir-format
+#: lib/web/templates/email/event_updated.text.eex:30
msgid "View the updated event on: %{link}"
msgstr "Veire l’eveniment actualizat sus : %{link}"
+#, elixir-format
#: lib/web/templates/email/password_reset.html.eex:38
#: lib/web/templates/email/password_reset.text.eex:5
-#, elixir-format
msgid "You requested a new password for your account on %{instance}."
msgstr "Avètz demandat un nòu senhal per vòstre compte sus %{instance}."
-#: lib/web/templates/email/email.html.eex:91
#, elixir-format
+#: lib/web/templates/email/email.html.eex:91
msgid "In the meantime, please consider that the software is not (yet) finished. More information %{a_start}on our blog%{a_end}."
msgstr ""
"D’aquel temps, consideratz que lo logicial es pas (encara) acabat. Mai d’"
"informacion %{a_start}sus nòstre blòg%{a_end}."
+#, elixir-format
#: lib/web/templates/email/email.html.eex:87
#: lib/web/templates/email/email.text.eex:6
-#, elixir-format
msgid "This is a demonstration site to test the beta version of Mobilizon."
msgstr ""
"Aquò es un site de demostracion per ensajar la version beta de Mobilizon."
-#: lib/web/templates/email/email.html.eex:85
#, elixir-format
+#: lib/web/templates/email/email.html.eex:85
msgid "Warning"
msgstr "Avertiment"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:54
#: lib/web/templates/email/event_updated.text.eex:14
-#, elixir-format
msgid "Event has been cancelled"
msgstr "L’eveniment es estat anullat"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:50
#: lib/web/templates/email/event_updated.text.eex:10
-#, elixir-format
msgid "Event has been confirmed"
msgstr "L’eveniment es estat confirmat"
+#, elixir-format
#: lib/web/templates/email/event_updated.html.eex:52
#: lib/web/templates/email/event_updated.text.eex:12
-#, elixir-format
msgid "Event status has been set as tentative"
msgstr "L’estatut de l’eveniment es estat definit coma « de confirmar »"
-#: lib/web/templates/email/email.html.eex:88
#, elixir-format
+#: lib/web/templates/email/email.html.eex:88
msgid "%{b_start}Please do not use it in any real way%{b_end}"
msgstr "%{b_start}Mercés de l’utilizar pas d’un biais real%{b_end}"
-#: lib/web/templates/email/report.html.eex:39
#, elixir-format
+#: lib/web/templates/email/report.html.eex:39
msgid "Someone on %{instance} reported the following content."
msgstr "Qualqu’un de %{instance} a senhalat aqueste contengut."
-#: lib/web/templates/email/email.text.eex:10
#, elixir-format
+#: lib/web/templates/email/email.text.eex:10
msgid "In the meantime, please consider that the software is not (yet) finished. More information on our blog:"
msgstr ""
"D’aquel temps, consideratz que lo logicial es pas (encara) acabat. Mai d’"
"informacions sus nòstre blòg :"
-#: lib/web/templates/email/email.text.eex:7
#, elixir-format
+#: lib/web/templates/email/email.text.eex:7
msgid "Please do not use it in any real way"
msgstr "Mercés de l’utilizar pas d’un biais real"
-#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:58
#, elixir-format
+#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:58
msgid "Confirm my participation"
msgstr "Confirmar ma participacion"
-#: lib/web/email/participation.ex:114
#, elixir-format
+#: lib/web/email/participation.ex:114
msgid "Confirm your participation to event %{title}"
msgstr "Confirmatz vòstra participacion a l’eveniment %{title}"
+#, elixir-format
#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:45
#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:7
-#, elixir-format
msgid "If you didn't request this email, you can simply ignore it."
msgstr "S’avètz pas demandat aquò, mercés d’ignorar aqueste messatge."
+#, elixir-format
#: lib/web/templates/email/anonymous_participation_confirmation.html.eex:13
#: lib/web/templates/email/anonymous_participation_confirmation.text.eex:1
-#, elixir-format
msgid "Participation confirmation"
msgstr "Confirmacion de participacion"
-#: lib/web/templates/api/terms.html.eex:108
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr "Un ID intèrn de la vòstra identitat actualament seleccionada"
-#: lib/web/templates/api/terms.html.eex:107
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr "Un ID intèrn d’utilizaire"
-#: lib/web/templates/api/terms.html.eex:45
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
"Qual que siá informacion que reculem de vosautres pòt èsser utilizada dels "
"biaisses seguents :"
-#: lib/web/templates/api/terms.html.eex:4
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr "Informacion basicas de compte"
-#: lib/web/templates/api/terms.html.eex:28
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr "Partegetz pas cap d’informacion perilhosa sus Mobilizon."
-#: lib/web/templates/api/terms.html.eex:126
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr "Divulgam d’informacions amb de tèrças partidas ?"
-#: lib/web/templates/api/terms.html.eex:101
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr "Utilizam de cookies ?"
-#: lib/web/templates/api/terms.html.eex:59
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr "Cossí protegissèm vòstras informacions ?"
-#: lib/web/templates/api/terms.html.eex:32
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr "Adreças IP e autras metadonadas"
-#: lib/web/templates/api/terms.html.eex:111
#, 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."
-#: lib/web/templates/api/terms.html.eex:113
-#, elixir-format
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#: lib/web/templates/api/terms.html.eex:123
#, 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."
-#: lib/web/templates/api/terms.html.eex:18
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr "Eveniments e comentaris publicats"
-#: lib/web/templates/api/terms.html.eex:83
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
-#: lib/web/templates/api/terms.html.eex:109
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr "Getons per vos identificar"
-#: lib/web/templates/api/terms.html.eex:35
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
-#: lib/web/templates/api/terms.html.eex:5
-#, elixir-format
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#: lib/web/templates/api/terms.html.eex:130
-#, elixir-format
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#: lib/web/templates/api/terms.html.eex:62
-#, elixir-format
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#: lib/web/templates/api/terms.html.eex:103
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
"Gardam las informacions seguentas sus vòstre aparelh quand vos connectatz :"
-#: lib/web/templates/api/terms.html.eex:72
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
-#: lib/web/templates/api/terms.html.eex:43
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr "Per qué utilizam vòstras informacions ?"
-#: lib/web/templates/api/terms.html.eex:71
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr "Quinas son nòstras politicas de conservacions de donadas ?"
-#: lib/web/templates/api/terms.html.eex:92
-#, elixir-format
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#: lib/web/templates/api/terms.html.eex:100
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
-#: lib/web/templates/api/terms.html.eex:142
-#, elixir-format
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#: lib/web/templates/api/terms.html.eex:20
-#, elixir-format
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#: lib/web/templates/api/terms.html.eex:159
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr "Cambiaments dins nòstra politica de confidencialitat"
-#: lib/web/templates/api/terms.html.eex:154
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
-#: lib/web/templates/api/terms.html.eex:155
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
-#: lib/web/templates/api/terms.html.eex:161
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
-#: lib/web/templates/api/terms.html.eex:156
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
-#: lib/web/templates/api/terms.html.eex:163
-#, elixir-format
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#: lib/web/templates/api/terms.html.eex:75
-#, elixir-format
-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\n than 90 days."
-msgstr ""
-
-#: lib/web/templates/api/terms.html.eex:152
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr "Utilizacion del site pels enfants"
-#: lib/web/templates/api/terms.html.eex:55
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
-#: lib/web/templates/api/terms.html.eex:162
-#, elixir-format
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-"Aqueste document es jos licéncia CC-BY-SA. Sa darrièra mesa a jorn es del 16 "
-"de genièr de 2020."
-
-#: lib/web/templates/api/terms.html.eex:53
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
-#: lib/web/templates/api/terms.html.eex:51
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
-#: lib/web/templates/api/terms.html.eex:1
#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr "Quinas informacions reculem ?"
+#, elixir-format
#: lib/web/templates/email/email_changed_new.html.eex:38
#: lib/web/templates/email/email_changed_new.text.eex:5
-#, elixir-format
msgid "Confirm the new address to change your email."
msgstr "Confirmatz l’adreça novèla per dire de cambiar vòstre corrièl."
+#, elixir-format
#: lib/web/templates/email/email_changed_new.html.eex:64
#: lib/web/templates/email/email_changed_new.text.eex:10
-#, elixir-format
msgid "If this change wasn't initiated by you, please ignore this email. The email address for the Mobilizon account won't change until you access the link above."
msgstr ""
+#, elixir-format
#: lib/web/templates/email/email_changed_old.html.eex:62
#: lib/web/templates/email/email_changed_old.text.eex:9
-#, elixir-format
msgid "If you did not ask to change your email, it is likely that someone has gained access to your account. Please change your password immediately or contact the server admin if you're locked out of your account."
msgstr ""
-#: lib/web/email/user.ex:175
#, elixir-format
+#: lib/web/email/user.ex:175
msgid "Mobilizon on %{instance}: confirm your email address"
msgstr "Mobilizon sus %{instance} : confirmatz vòstra adreça electronica"
-#: lib/web/email/user.ex:152
#, elixir-format
+#: lib/web/email/user.ex:152
msgid "Mobilizon on %{instance}: email changed"
msgstr "Mobilizon sus %{instance} : adreça electronica cambiada"
+#, elixir-format
#: lib/web/templates/email/email_changed_old.html.eex:13
#: lib/web/templates/email/email_changed_old.text.eex:1
-#, elixir-format
msgid "New email address"
msgstr "Adreça electronica novèla"
+#, elixir-format
#: lib/web/templates/email/email_changed_old.html.eex:38
#: lib/web/templates/email/email_changed_old.text.eex:5
-#, elixir-format
msgid "The email address for your account on %{host} is being changed to:"
msgstr ""
"L’adreça electronica per vòstre compte sus %{host} es a èsser cambiada per :"
+#, elixir-format
#: lib/web/templates/email/email_changed_new.html.eex:13
#: lib/web/templates/email/email_changed_new.html.eex:51 lib/web/templates/email/email_changed_new.text.eex:1
-#, elixir-format
msgid "Verify email address"
msgstr "Verificar l’adreça electronica"
+#, elixir-format
#: lib/web/templates/email/notification_each_week.html.eex:70
#: lib/web/templates/email/notification_each_week.text.eex:14 lib/web/templates/email/on_day_notification.html.eex:70
#: lib/web/templates/email/on_day_notification.text.eex:14
-#, elixir-format
msgid "If you need to cancel your participation, just access the event page through the link above and click on the participation button."
msgid_plural "If you need to cancel your participation, just access the event page through the links above and click on the participation button."
msgstr[0] ""
@@ -699,96 +637,96 @@ msgstr[1] ""
"pagina de l’eveniment via los ligams çai-jos e clicar lo boton de "
"participacion."
-#: lib/web/email/notification.ex:46
#, elixir-format
+#: lib/web/email/notification.ex:46
msgid "One event planned today"
msgid_plural "%{nb_events} events planned today"
msgstr[0] "Un eveniment previst uèi"
msgstr[1] "%{nb_events} eveniments previstes uèi"
+#, elixir-format
#: lib/web/templates/email/on_day_notification.html.eex:38
#: lib/web/templates/email/on_day_notification.text.eex:4
-#, elixir-format
msgid "You have one event today:"
msgid_plural "You have %{total} events today:"
msgstr[0] "Avètz un eveniment uèi :"
msgstr[1] "Avètz %{total} eveniments uèi :"
+#, elixir-format
#: lib/web/templates/email/group_invite.html.eex:38
#: lib/web/templates/email/group_invite.text.eex:5
-#, elixir-format
msgid "%{inviter} just invited you to join their group %{group}"
msgstr ""
+#, elixir-format
#: lib/web/templates/email/group_invite.html.eex:13
#: lib/web/templates/email/group_invite.text.eex:1
-#, elixir-format
msgid "Come along!"
msgstr "Rejonhètz-nos !"
-#: lib/web/email/notification.ex:24
#, elixir-format
+#: lib/web/email/notification.ex:24
msgid "Don't forget to go to %{title}"
msgstr "Oblidatz pas d’anar a %{title}"
+#, elixir-format
#: lib/web/templates/email/on_day_notification.html.eex:13
#: lib/web/templates/email/on_day_notification.text.eex:1
-#, elixir-format
msgid "Events today"
msgstr "Eveniment"
+#, elixir-format
#: lib/web/templates/email/before_event_notification.html.eex:38
#: lib/web/templates/email/before_event_notification.text.eex:3
-#, elixir-format
msgid "Get ready for %{title}"
msgstr "Preparatz-vos per %{title}"
-#: lib/web/templates/email/group_invite.html.eex:59
#, elixir-format
+#: lib/web/templates/email/group_invite.html.eex:59
msgid "See my groups"
msgstr "Veire mos grops"
+#, elixir-format
#: lib/web/templates/email/group_invite.html.eex:45
#: lib/web/templates/email/group_invite.text.eex:7
-#, elixir-format
msgid "To accept this invitation, head over to your groups."
msgstr "Per dire d’acceptar aquesta invitacion, anatz als vòstres grops."
+#, elixir-format
#: lib/web/templates/email/before_event_notification.html.eex:13
#: lib/web/templates/email/before_event_notification.text.eex:1
-#, elixir-format
msgid "Upcoming event"
msgstr "Eveniments venents"
-#: lib/web/templates/email/before_event_notification.text.eex:4
#, elixir-format
+#: lib/web/templates/email/before_event_notification.text.eex:4
msgid "View the event on: %{link}"
msgstr "Veire l’eveniment actualizat sus : %{link}"
-#: lib/web/email/group.ex:28
#, elixir-format
+#: lib/web/email/group.ex:28
msgid "You have been invited by %{inviter} to join group %{group}"
msgstr "%{inviter} vos a convidat a rejónher lo grop %{group}"
-#: lib/web/templates/email/event_updated.html.eex:92
#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:92
msgid "Event address"
msgstr "L’adreça de l’eveniment"
-#: lib/web/templates/email/event_updated.html.eex:102
#, elixir-format
+#: lib/web/templates/email/event_updated.html.eex:102
msgid "Physical address was removed"
msgstr "L’adreça fisica es estada levada"
-#: lib/web/email/notification.ex:70
#, elixir-format
+#: lib/web/email/notification.ex:70
msgid "One event planned this week"
msgid_plural "%{nb_events} events planned this week"
msgstr[0] "Un eveniment previst aquesta setmana"
msgstr[1] "%{nb_events} eveniments previstes aquesta setmana"
-#: lib/web/email/notification.ex:92
#, elixir-format
+#: lib/web/email/notification.ex:92
msgid "One participation request for event %{title} to process"
msgid_plural "%{number_participation_requests} participation requests for event %{title} to process"
msgstr[0] "Una demanda de participacion a l’eveniment %{title} a tractar"
@@ -796,58 +734,460 @@ msgstr[1] ""
"%{number_participation_requests} demandas de participacion a l’eveniment "
"%{title} a tractar"
+#, elixir-format
#: lib/web/templates/email/notification_each_week.html.eex:38
#: lib/web/templates/email/notification_each_week.text.eex:4
-#, elixir-format
msgid "You have one event this week:"
msgid_plural "You have %{total} events this week:"
msgstr[0] ""
msgstr[1] ""
+#, elixir-format
#: lib/web/templates/email/pending_participation_notification.html.eex:38
#: lib/web/templates/email/pending_participation_notification.text.eex:4
-#, elixir-format
msgid "You have one pending participation to process:"
msgid_plural "You have %{number_participation_requests} participation requests to process:"
msgstr[0] ""
msgstr[1] ""
+#, elixir-format
#: lib/web/templates/email/notification_each_week.html.eex:13
#: lib/web/templates/email/notification_each_week.text.eex:1
-#, elixir-format
msgid "Events this week"
msgstr "Eveniments aquesta setmana"
+#, elixir-format
#: lib/web/templates/email/pending_participation_notification.html.eex:51
#: lib/web/templates/email/pending_participation_notification.text.eex:6
-#, elixir-format
msgid "Manage pending participation requests"
msgstr "Gerir las demandas de participacions en espèra"
+#, elixir-format
#: lib/web/templates/email/pending_participation_notification.html.eex:13
#: lib/web/templates/email/pending_participation_notification.text.eex:1
-#, elixir-format
msgid "Pending participations to process"
msgstr "Demandas de participacions en espèra"
+#, elixir-format
#: lib/web/templates/email/pending_participation_notification.html.eex:64
#: lib/web/templates/email/pending_participation_notification.text.eex:8
-#, elixir-format
msgid "You receive this email because you chose to get notifications for pending participations to your events. You may disable or change the configuration for these notification in your Mobilizon user settings."
msgstr ""
-#: lib/web/templates/email/email.html.eex:90
#, elixir-format
+#: lib/web/templates/email/email.html.eex:90
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of %{b_start}version 1 of the software in the fall of 2020%{b_end}."
msgstr ""
"Mobilizon es en desvolopament, ajustarem de nòvas foncionalitats a aqueste "
"site pendent de mesas a jorn regularas, fins a la publicacion de %{b_start}"
"la version 1 del logicial al primièr semèstre 2020%{b_end}."
-#: lib/web/templates/email/email.text.eex:9
#, elixir-format
+#: lib/web/templates/email/email.text.eex:9
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
msgstr ""
"Mobilizon es en desvolopament, ajustarem de nòvas foncionalitats a aqueste "
"site pendent de mesas a jorn regularas, fins a la publicacion de "
"la version 1 del logicial al primièr semèstre 2020."
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/pl/LC_MESSAGES/default.po b/priv/gettext/pl/LC_MESSAGES/default.po
index ea6465fe9..ff0181b8d 100644
--- a/priv/gettext/pl/LC_MESSAGES/default.po
+++ b/priv/gettext/pl/LC_MESSAGES/default.po
@@ -25,7 +25,7 @@ msgstr ""
"nowego."
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr "Strumień dla %{email} na Mobilizon"
@@ -405,241 +405,181 @@ msgid "Participation confirmation"
msgstr "Potwierdzenie uczestnictwa"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr "Wewnętrzne ID dla obecnie wybranej tożsamości"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr "Wewnętrzne ID użytkownika"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr ""
@@ -862,3 +802,405 @@ msgstr ""
"Mobilizon jest w fazie rozwoju. Nowe funkcje będą regularnie dodawane, do "
"wydania pierwszej wersji oprogramowania w pierwszej połowie 2020 "
"roku."
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/pt/LC_MESSAGES/default.po b/priv/gettext/pt/LC_MESSAGES/default.po
index b0ef30869..8ecafdc49 100644
--- a/priv/gettext/pt/LC_MESSAGES/default.po
+++ b/priv/gettext/pt/LC_MESSAGES/default.po
@@ -19,7 +19,7 @@ msgid "If you didn't request this, please ignore this email. Your password won't
msgstr ""
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr ""
@@ -378,241 +378,181 @@ msgid "Participation confirmation"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr ""
@@ -816,3 +756,405 @@ msgstr ""
#: lib/web/templates/email/email.text.eex:9
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
msgstr ""
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/pt_BR/LC_MESSAGES/default.po b/priv/gettext/pt_BR/LC_MESSAGES/default.po
index ad50f7e7a..54eb8dd1c 100644
--- a/priv/gettext/pt_BR/LC_MESSAGES/default.po
+++ b/priv/gettext/pt_BR/LC_MESSAGES/default.po
@@ -23,7 +23,7 @@ msgstr ""
"será modificada até que você acesse o link abaixo e crie uma nova senha."
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr "Feed para %{email} sobre o Mobilizon"
@@ -401,19 +401,19 @@ msgid "Participation confirmation"
msgstr "Confirmação de participação"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr "Um ID interno para a sua atual identidade selecionada"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr "Um ID interno"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
@@ -421,62 +421,49 @@ msgstr ""
"maneiras:"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr "Informações básicas da conta"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr "Não compartilhe nenhuma informação perigosa no Mobilizon."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr "Nós divulgamos alguma informação a terceiros?"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr "Utilizamos cookies?"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr "Como nós protegemos as suas informações?"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr "IPs e outros metadados"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n 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/terms.html.eex:123
+#: lib/web/templates/api/privacy.html.eex:87
msgctxt "terms"
msgid "Note: These informations are stored in your localStorage and not your cookies."
msgstr ""
@@ -484,13 +471,13 @@ msgstr ""
"(localStorage) e não no seus cookies."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr "Eventos publicados e comentários"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
@@ -498,13 +485,13 @@ msgstr ""
"meses."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr "Tokens para autenticar você"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
@@ -512,129 +499,44 @@ msgstr ""
"IP de cada solicitação ao nosso servidor."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-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:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-"Nós não vendemos, negociamos, ou então transferimos para terceiros suas "
-"informações de identificação pessoal.\n"
-" Isso não inclui parceiros, nos quais confiamos, que nos dão assistência na "
-"operação do nosso site, na condução do\n"
-" nosso negócio, ou servido você, contanto que esses parceiros concordem em "
-"manter essas informações como confidencial.\n"
-" Nós podemos também liberar sua informação quando nós acreditamos que a "
-"liberação seja apropriada para o cumprimento\n"
-" 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/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-"Implementamos uma variedade de medidas de segurança para manter protegida a "
-"sua informação pessoal quando você\n"
-" as envia ou quando você acessa sua informação pessoal. Entre outras "
-"coisas, como a sessão do seu navegador, e também\n"
-" o tráfico entre a suas aplicações e o API estão ambos protegidos com SSL/"
-"TLS, e a sua senha esta em forma de hash usando\n"
-" um forte algoritmo de mão única."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
"Nós armazenamos a seguinte informação no seu aparelho quando você conecta:"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr "Iremos fazer um esforço de boa fé para:"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr "Para que usamos a sua informação?"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr "Qual é a nossa política de retenção de dados?"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-"Você pode solicitar e baixar um arquivo do seu conteúdo, incluindo suas "
-"publicações, anexos de médias, foto do perfil\n"
-" e imagem do cabeçalho."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr "Você poderá excluir sua conta a qualquer momento."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-"Seu conteúdo poderá ser baixado por outros servidores na rede. Seu conteúdo "
-"é entregue para outros servidores\n"
-" seguindo sua instância e as mensagens diretas são entregues para os "
-"servidores dos destinatários, seja qual for\n"
-" a distância em que os recipientes dos destinatários estejam ou residem em "
-"um servidor diferente desse."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n 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/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr "Mudanças em nossa Política de Privacidade"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
@@ -646,7 +548,7 @@ msgstr ""
"Regulamentação de Proteção de Dados Gerais- </a>) não use este site."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
@@ -658,7 +560,7 @@ msgstr ""
"Online das Crianças </a>) não use este site."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
@@ -666,7 +568,7 @@ msgstr ""
"mudanças nesta página."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
@@ -674,31 +576,13 @@ msgstr ""
"jurisdição."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-"Originalmente adaptado das politicas privadas de <a href=\"https://mastodon."
-"social/terms\">Mastodon</a> e <a href=\"https://github.com/discourse/"
-"discourse\">Discourse</a>."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n 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/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr "Uso do site por crianças"
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
@@ -709,15 +593,7 @@ msgstr ""
" ou dúvidas."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-"Este documento tem licença CC-BY-SA. e foi atualizada em 16 de Janeiro de "
-"2020."
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
@@ -726,7 +602,7 @@ msgstr ""
" evasões ou outras violações."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
@@ -736,7 +612,7 @@ msgstr ""
"próprio conteúdo se você estiver logado (dentro do sistema)."
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr "Quais informações coletamos?"
@@ -956,3 +832,461 @@ msgstr ""
"Mobilizon está em desenvolvimento, iremos adicionar novos recursos neste "
"site durante atualizações regulares, até o lançamento da versão 1 do "
"aplicativo no primeiro semestre de 2020."
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+"Implementamos uma variedade de medidas de segurança para manter protegida a "
+"sua informação pessoal quando você\n"
+" as envia ou quando você acessa sua informação pessoal. Entre outras "
+"coisas, como a sessão do seu navegador, e também\n"
+" o tráfico entre a suas aplicações e o API estão ambos protegidos com SSL/"
+"TLS, e a sua senha esta em forma de hash usando\n"
+" um forte algoritmo de mão única."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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 ""
+"Nós não vendemos, negociamos, ou então transferimos para terceiros suas "
+"informações de identificação pessoal.\n"
+" Isso não inclui parceiros, nos quais confiamos, que nos dão assistência na "
+"operação do nosso site, na condução do\n"
+" nosso negócio, ou servido você, contanto que esses parceiros concordem em "
+"manter essas informações como confidencial.\n"
+" Nós podemos também liberar sua informação quando nós acreditamos que a "
+"liberação seja apropriada para o cumprimento\n"
+" 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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+"Originalmente adaptado das politicas privadas de <a href=\"https://mastodon."
+"social/terms\">Mastodon</a> e <a href=\"https://github.com/discourse/"
+"discourse\">Discourse</a>."
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+"Originalmente adaptado das politicas privadas de <a href=\"https://mastodon."
+"social/terms\">Mastodon</a> e <a href=\"https://github.com/discourse/"
+"discourse\">Discourse</a>."
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/ru/LC_MESSAGES/default.po b/priv/gettext/ru/LC_MESSAGES/default.po
index 4aa12cad3..81ee4a551 100644
--- a/priv/gettext/ru/LC_MESSAGES/default.po
+++ b/priv/gettext/ru/LC_MESSAGES/default.po
@@ -24,7 +24,7 @@ msgstr ""
"изменится, если не перейти по приведённой ссылке и не указать новый."
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr "Лента для %{email} в Mobilizon"
@@ -389,241 +389,181 @@ msgid "Participation confirmation"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr ""
@@ -834,3 +774,405 @@ msgstr ""
#: lib/web/templates/email/email.text.eex:9
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
msgstr ""
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
diff --git a/priv/gettext/sv/LC_MESSAGES/default.po b/priv/gettext/sv/LC_MESSAGES/default.po
index fcbd4d1da..bee9937f2 100644
--- a/priv/gettext/sv/LC_MESSAGES/default.po
+++ b/priv/gettext/sv/LC_MESSAGES/default.po
@@ -24,7 +24,7 @@ msgstr ""
"nytt."
#, elixir-format
-#: lib/service/export/feed.ex:169
+#: lib/service/export/feed.ex:170
msgid "Feed for %{email} on Mobilizon"
msgstr "Flöde för %{email} på Mobilizon"
@@ -400,241 +400,181 @@ msgid "Participation confirmation"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:108
+#: lib/web/templates/api/privacy.html.eex:75
msgctxt "terms"
msgid "An internal ID for your current selected identity"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:107
+#: lib/web/templates/api/privacy.html.eex:74
msgctxt "terms"
msgid "An internal user ID"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:45
+#: lib/web/templates/api/privacy.html.eex:37
msgctxt "terms"
msgid "Any of the information we collect from you may be used in the following ways:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:4
+#: lib/web/templates/api/privacy.html.eex:9
msgctxt "terms"
msgid "Basic account information"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:28
+#: lib/web/templates/api/privacy.html.eex:25
msgctxt "terms"
msgid "Do not share any dangerous information over Mobilizon."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:126
+#: lib/web/templates/api/privacy.html.eex:90
msgctxt "terms"
msgid "Do we disclose any information to outside parties?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:101
+#: lib/web/templates/api/privacy.html.eex:68
msgctxt "terms"
msgid "Do we use cookies?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:59
+#: lib/web/templates/api/privacy.html.eex:51
msgctxt "terms"
msgid "How do we protect your information?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:32
+#: lib/web/templates/api/privacy.html.eex:29
msgctxt "terms"
msgid "IPs and other metadata"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:111
+#: 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/terms.html.eex:113
-msgctxt "terms"
-msgid "If you're not connected, we don't store any information on your device, unless you participate in an event\n anonymously. In that case we store the hash of the UUID and participation status in your browser so that we may\n display participation status. Deleting these informations will only stop displaying participation status in your\n browser."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:123
+#: 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/terms.html.eex:18
+#: lib/web/templates/api/privacy.html.eex:17
msgctxt "terms"
msgid "Published events and comments"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:83
+#: lib/web/templates/api/privacy.html.eex:64
msgctxt "terms"
msgid "Retain the IP addresses associated with registered users no more than 12 months."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:109
+#: lib/web/templates/api/privacy.html.eex:76
msgctxt "terms"
msgid "Tokens to authenticate you"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:35
+#: lib/web/templates/api/privacy.html.eex:31
msgctxt "terms"
msgid "We also may retain server logs which include the IP address of every request to our server."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:5
-msgctxt "terms"
-msgid "We collect information from you when you register on this server and gather data when you participate in the\n platform by reading, writing, and interacting with content shared here. If you register on this server, you will\n be asked to enter an e-mail address, a password and at least an username. Your e-mail address will be verified by\n an email containing a unique link. If that link is visited, we know that you control the e-mail address. You may\n also enter additional profile information such as a display name and biography, and upload a profile picture and\n header image. The username, display name, biography, profile picture and header image are always listed publicly.\n You may, however, visit this server without registering."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:130
-msgctxt "terms"
-msgid "We do not sell, trade, or otherwise transfer to outside parties your personally identifiable information. This\n does not include trusted third parties who assist us in operating our site, conducting our business, or servicing\n you, so long as those parties agree to keep this information confidential. We may also release your information\n when we believe release is appropriate to comply with the law, enforce our site policies, or protect ours or\n others rights, property, or safety."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:62
-msgctxt "terms"
-msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter,\n submit, or access your personal information. Among other things, your browser session, as well as the traffic between\n your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way\n algorithm."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:103
+#: lib/web/templates/api/privacy.html.eex:70
msgctxt "terms"
msgid "We store the following information on your device when you connect:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:72
+#: lib/web/templates/api/privacy.html.eex:58
msgctxt "terms"
msgid "We will make a good faith effort to:"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:43
+#: lib/web/templates/api/privacy.html.eex:35
msgctxt "terms"
msgid "What do we use your information for?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:71
+#: lib/web/templates/api/privacy.html.eex:57
msgctxt "terms"
msgid "What is our data retention policy?"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:92
-msgctxt "terms"
-msgid "You can request and download an archive of your content, including your posts, media attachments, profile picture,\n and header image."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:100
+#: lib/web/templates/api/privacy.html.eex:67
msgctxt "terms"
msgid "You may irreversibly delete your account at any time."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:142
-msgctxt "terms"
-msgid "Your content may be downloaded by other servers in the network. Your content is delivered to the servers\n following your instance, and direct messages are delivered to the servers of the recipients, in so far as these\n recipients reside on a different server than this one."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:20
-msgctxt "terms"
-msgid "Your events and comments are delivered to other instances that follow your own, meaning they are delivered to\n different servers and copies are stored there. When you delete events or comments, this is likewise delivered to\n these other instances. The action of joining an event is federated as well. Please keep in mind that the operators\n of the server and any receiving server may view such messages, and that recipients may screenshot, copy or\n otherwise re-share them."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:159
+#: lib/web/templates/api/privacy.html.eex:115
msgctxt "terms"
msgid "Changes to our Privacy Policy"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:154
+#: lib/web/templates/api/privacy.html.eex:106
msgctxt "terms"
msgid "If this server is in the EU or the EEA: Our site, products and services are all directed to people who are at least 16 years old. If you are under the age of 16, per the requirements of the GDPR (<a href=\"https://en.wikipedia.org/wiki/General_Data_Protection_Regulation\">General Data Protection Regulation</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:155
+#: lib/web/templates/api/privacy.html.eex:109
msgctxt "terms"
msgid "If this server is in the USA: Our site, products and services are all directed to people who are at least 13 years old. If you are under the age of 13, per the requirements of COPPA (<a href=\"https://en.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act\">Children's Online Privacy Protection Act</a>) do not use this site."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:161
+#: lib/web/templates/api/privacy.html.eex:117
msgctxt "terms"
msgid "If we decide to change our privacy policy, we will post those changes on this page."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:156
+#: lib/web/templates/api/privacy.html.eex:112
msgctxt "terms"
msgid "Law requirements can be different if this server is in another jurisdiction."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:163
-msgctxt "terms"
-msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:75
-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\n than 90 days."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:152
+#: lib/web/templates/api/privacy.html.eex:103
msgctxt "terms"
msgid "Site usage by children"
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:55
+#: lib/web/templates/api/privacy.html.eex:47
msgctxt "terms"
msgid "The email address you provide may be used to send you information, updates and notifications about other people\n interacting with your content or sending you messages and to respond to inquiries, and/or other requests or\n questions."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:162
-msgctxt "terms"
-msgid "This document is CC-BY-SA. It was last updated January 16, 2020."
-msgstr ""
-
-#, elixir-format
-#: lib/web/templates/api/terms.html.eex:53
+#: lib/web/templates/api/privacy.html.eex:45
msgctxt "terms"
msgid "To aid moderation of the community, for example comparing your IP address with other known ones to determine ban\n evasion or other violations."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:51
+#: lib/web/templates/api/privacy.html.eex:43
msgctxt "terms"
msgid "To provide the core functionality of Mobilizon. Depending on this instance's policy you may only be able to\n interact with other people's content and post your own content if you are logged in."
msgstr ""
#, elixir-format
-#: lib/web/templates/api/terms.html.eex:1
+#: lib/web/templates/api/privacy.html.eex:6
msgctxt "terms"
msgid "What information do we collect?"
msgstr ""
@@ -842,3 +782,405 @@ msgstr ""
#: lib/web/templates/email/email.text.eex:9
msgid "Mobilizon is under development, we will add new features to this site during regular updates, until the release of version 1 of the software in the fall of 2020."
msgstr ""
+
+#, elixir-format
+#: lib/service/metadata/event.ex:47
+msgid "The event organizer didn't add any description."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:54
+msgctxt "terms"
+msgid "We implement a variety of security measures to maintain the safety of your personal information when you enter, submit, or access your personal information. Among other things, your browser session, as well as the traffic between your applications and the API, are secured with SSL/TLS, and your password is hashed using a strong one-way algorithm."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:94
+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"
+msgid "Accepting these Terms"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:27
+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"
+msgid "A lot of the content on the Service is from you and others, and we don't review, verify or authenticate it, and it may include inaccuracies or false information. We make no representations, warranties, or guarantees relating to the quality, suitability, truth, accuracy or completeness of any content contained in the Service. You acknowledge sole responsibility for and assume all risk arising from your use of or reliance on any content."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:60
+msgctxt "terms"
+msgid "Also, you agree that you will not do any of the following in connection with the Service or other users:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:65
+msgctxt "terms"
+msgid "Circumvent or attempt to circumvent any filtering, security measures, rate limits or other features designed to protect the Service, users of the Service, or third parties."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:64
+msgctxt "terms"
+msgid "Collect any personal information about other users, or intimidate, threaten, stalk or otherwise harass other users of the Service;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:55
+msgctxt "terms"
+msgid "Content that is illegal or unlawful, that would otherwise create liability;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:56
+msgctxt "terms"
+msgid "Content that may infringe or violate any patent, trademark, trade secret, copyright, right of privacy, right of publicity or other intellectual or other right of any party;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:42
+msgctxt "terms"
+msgid "Creating Accounts"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:89
+msgctxt "terms"
+msgid "Entire Agreement"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:92
+msgctxt "terms"
+msgid "Feedback"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:83
+msgctxt "terms"
+msgid "Hyperlinks and Third Party Content"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:88
+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"
+msgid "Impersonate or post on behalf of any person or entity or otherwise misrepresent your affiliation with a person or entity;"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:48
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:39
+msgctxt "terms"
+msgid "Privacy Policy"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:95
+msgctxt "terms"
+msgid "Questions & Contact Information"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:87
+msgctxt "terms"
+msgid "Termination"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:62
+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"
+msgid "Your Content & Conduct"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:84
+msgctxt "terms"
+msgid "<b>%{instance_name}</b> makes no claim or representation regarding, and accepts no responsibility for third party websites accessible by hyperlink from the Service or websites linking to the Service. When you leave the Service, you should be aware that these Terms and our policies no longer govern. The inclusion of any link does not imply endorsement by <b>%{instance_name}</b> of the site. Use of any such linked website is at the user's own risk."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:68
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:81
+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"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:33
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:53
+msgctxt "terms"
+msgid "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:"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:57
+msgctxt "terms"
+msgid "Private information of any third party (e.g., addresses, phone numbers, email addresses, Social Security numbers and credit card numbers); and"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:52
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:90
+msgctxt "terms"
+msgid "These Terms constitute the entire agreement between you and <b>%{instance_name}</b> regarding the use of the Service, superseding any prior agreements between you and <b>%{instance_name}</b> relating to your use of the Service."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:80
+msgctxt "terms"
+msgid "This Service runs on a Mobilizon instance. This source code is licensed under an <a href=\"https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)\">AGPLv3 license</a> which means you are allowed to and even encouraged to take the source code, modify it and use it."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:58
+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"
+msgid "Questions or comments about the Service may be directed to us at %{contact}"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:79
+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"
+msgid "We love feedback. Please let us know what you think of the Service, these Terms and, in general, <b>%{instance_name}</b>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:74
+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"
+msgid "<b>%{instance_name}</b> will not use or transmit or resell your personal data"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:44
+msgctxt "terms"
+msgid "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."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:77
+msgctxt "terms"
+msgid "Instance administrators should ensure that every community hosted on the instance is properly moderated according to the defined rules."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:98
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://joindiaspora.com/terms\">Diaspora*</a> and <a href=\"https://github.com/appdotnet/terms-of-service\">App.net</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:119
+msgctxt "terms"
+msgid "Originally adapted from the <a href=\"https://mastodon.social/terms\">Mastodon</a> and <a href=\"https://github.com/discourse/discourse\">Discourse</a> privacy policies, also licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:3
+msgctxt "terms"
+msgid "Short version"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:9
+msgctxt "terms"
+msgid "The service is provided without warranties and these terms may change in the future"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/privacy.html.eex:118
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 18, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:97
+msgctxt "terms"
+msgid "This document is licensed under <a href=\"https://creativecommons.org/licenses/by-sa/4.0/\">CC BY-SA</a>. It was last updated June 22, 2020."
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:8
+msgctxt "terms"
+msgid "You must respect other people and <b>%{instance_name}</b>'s rules when using the service"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:7
+msgctxt "terms"
+msgid "You must respect the law when using <b>%{instance_name}</b>"
+msgstr ""
+
+#, elixir-format
+#: lib/web/templates/api/terms.html.eex:5
+msgctxt "terms"
+msgid "Your content is yours"
+msgstr ""
From a5ccb79a51f62360f0f3c38c8c7742f466090cf1 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 23 Jun 2020 10:10:19 +0200
Subject: [PATCH 2/2] Fix settings menu allowing showing everything for
everyone
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
js/src/views/Settings.vue | 37 ++++++++++++++++++++++++-------------
1 file changed, 24 insertions(+), 13 deletions(-)
diff --git a/js/src/views/Settings.vue b/js/src/views/Settings.vue
index d14517eea..fdc7dd925 100644
--- a/js/src/views/Settings.vue
+++ b/js/src/views/Settings.vue
@@ -28,6 +28,8 @@ import RouteName from "../router/name";
import { ISettingMenuSection } from "../types/setting-menu.model";
import { IPerson, Person } from "../types/actor";
import { IDENTITIES } from "../graphql/actor";
+import { CURRENT_USER_CLIENT } from "../graphql/user";
+import { ICurrentUser, ICurrentUserRole } from "../types/current-user.model";
@Component({
components: { SettingsMenu },
@@ -36,6 +38,7 @@ import { IDENTITIES } from "../graphql/actor";
query: IDENTITIES,
update: (data) => data.identities.map((identity: IPerson) => new Person(identity)),
},
+ currentUser: CURRENT_USER_CLIENT,
},
})
export default class Settings extends Vue {
@@ -47,6 +50,8 @@ export default class Settings extends Vue {
newIdentity!: ISettingMenuSection;
+ currentUser!: ICurrentUser;
+
mounted() {
this.newIdentity = {
title: this.$t("New profile") as string,
@@ -76,7 +81,11 @@ export default class Settings extends Vue {
to: { name: RouteName.IDENTITIES } as Route,
items: [this.newIdentity],
},
- {
+ ];
+ if (
+ [ICurrentUserRole.MODERATOR, ICurrentUserRole.ADMINISTRATOR].includes(this.currentUser.role)
+ ) {
+ this.menu.push({
title: this.$t("Moderation") as string,
to: { name: RouteName.MODERATION } as Route,
items: [
@@ -94,9 +103,19 @@ export default class Settings extends Vue {
title: this.$t("Moderation log") as string,
to: { name: RouteName.REPORT_LOGS } as Route,
},
+ {
+ title: this.$t("Users") as string,
+ to: { name: RouteName.USERS } as Route,
+ },
+ {
+ title: this.$t("Profiles") as string,
+ to: { name: RouteName.PROFILES } as Route,
+ },
],
- },
- {
+ });
+ }
+ if (this.currentUser.role === ICurrentUserRole.ADMINISTRATOR) {
+ this.menu.push({
title: this.$t("Admin") as string,
to: { name: RouteName.ADMIN } as Route,
items: [
@@ -122,17 +141,9 @@ export default class Settings extends Vue {
},
],
},
- {
- title: this.$t("Users") as string,
- to: { name: RouteName.USERS } as Route,
- },
- {
- title: this.$t("Profiles") as string,
- to: { name: RouteName.PROFILES } as Route,
- },
],
- },
- ];
+ });
+ }
}
@Watch("identities")