Merge tag '1.1.2' into chapril

Currently translated at 100.0% (987 of 987 strings)

Translation: Mobilizon/Frontend
Translate-URL: https://weblate.framasoft.org/projects/mobilizon/frontend/sl/

.dockerignore

@@ -15,6 +15,5 @@ Makefile
 README.md
 SECURITY.md
 ssh_match_hostname
-support
 .js/package-lock.json
 js/node_modules

.gitlab-ci.yml

@@ -184,7 +184,7 @@ pages:
     - mkdir -p /kaniko/.docker
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$CI_REGISTRY_AUTH\",\"email\":\"$CI_REGISTRY_EMAIL\"}}}" > /kaniko/.docker/config.json
   script:
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/docker/production/Dockerfile --destination $DOCKER_IMAGE_NAME --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP --build-arg CI_COMMIT_TAG=$CI_COMMIT_TAG
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/docker/production/Dockerfile --destination $DOCKER_IMAGE_NAME --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP
 
 build-docker-master:
   <<: *docker

CHANGELOG.md

@@ -5,6 +5,72 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.1.2 - 28-04-2021
+
+### Changed
+
+- Added an unique index on the addresses url
+- Added org.opencontainers.image.source annotation to the Docker image 
+- Improved the moderation action logs interface
+
+### Fixes
+
+- **Fixed some invalid email headers**
+- **Fixed and repaired default profile still pointing on deleted profile**
+- Fixed some ActivityPub issues and improve error handling
+- Fixed a duplicate sentence in the email changed html template
+- Fixed resource metadata remote image URL
+- Fixed not only remote groups being refreshed after the acceptation of an invite
+- Fixed an UI overflow on the organizer metadata block if the organizer remote username is too long
+
+### Translations
+
+- German
+- Russian
+
+## 1.1.1 - 22-04-2021
+
+### Changed
+
+- Allow to remove user location setting and location information on an event or group
+- Instance level feeds are now shown on the instance About page, and are exposed as `rel=alternate` links, if instance level feeds are activated in the config
+- Webfinger module now queries the host-meta XRD endpoint to detect the webfinger well-known endpoint
+- Instance maximum upload sizes are now exposed in the API
+- Improve handling of media files which are too heavy
+- Improve details when editing or showing an user through CLI
+- More strict browser compatibility
+- Renamed "Close events" to "Nearby events" ("close" is too close to "closed")
+- Improved Sentry integration
+
+### Fixes
+
+- Fixed accessing a group discussion page without being a member (the page was just broken)
+- Fixed reloading the members list after excluding a member
+- Fixed comments being closed under an event message when not connected
+- Fixed path issue when fetching favicon for resources
+- Fixed content type and size missing for profile avatars
+- Fixed HTTP clients user-agent not using runtime configuration
+- Fixed the `support` folder not being copied into releases
+- Fixed the participation button position when text is too long or in some cases
+- Fixed the incorrect CSP configuration
+- Fixed discussions being sent to followers instead of members
+- Fixed showing broken public UI for deleted/suspended group
+- Fixed warning when getting out of creating/editing an unsaved event that was broken for some languages
+- Fixed addresses being not trimmed in the iCalendar exports
+- Fixed editing an user's email in CLI
+- Fixed suspended actors being refreshed
+
+
+### Translations
+
+- Gaelic
+- German
+- Kabyle (New!)
+- Norwegian
+- Russian
+- Slovenian
+- Spanish
+
 ## 1.1.0 - 31-03-2021
 
 This version introduces a new way to install and host Mobilizon : Elixir releases. This is the new default way of installing Mobilizon. Please read [UPGRADE.md](./UPGRADE.md#upgrading-from-10-to-11) for details on how to migrate to Elixir binary releases or stay on source install.

UPGRADE.md

@@ -16,7 +16,7 @@ Staying on source releases means:
 * You can change things in Mobilizon's code and recompile right away to test changes
 
 ## Releases
-If you want to migrate to releases, [we provide a full guide](https://tcit.frama.io/documentation/administration/upgrading/source_to_release/). You may do this at any time.
+If you want to migrate to releases, [we provide a full guide](https://docs.joinmobilizon.org/administration/upgrading/source_to_release/). You may do this at any time.
 
 ## Source install
 To stay on a source release, you just need to check the following things:

config/config.exs

@@ -25,9 +25,9 @@ config :mobilizon, :instance,
   allow_relay: true,
   federating: true,
   remote_limit: 100_000,
-  upload_limit: 10_000_000,
+  upload_limit: 10_485_760,
-  avatar_upload_limit: 2_000_000,
+  avatar_upload_limit: 2_097_152,
-  banner_upload_limit: 4_000_000,
+  banner_upload_limit: 4_194_304,
   remove_orphan_uploads: true,
   orphan_upload_grace_period_hours: 48,
   remove_unconfirmed_users: true,

docker/production/Dockerfile

@@ -23,6 +23,7 @@ COPY priv ./priv
 COPY config/config.exs config/prod.exs ./config/
 COPY config/docker.exs ./config/runtime.exs
 COPY rel ./rel
+COPY support ./support
 COPY --from=assets ./priv/static ./priv/static
 
 RUN mix phx.digest \
@@ -33,14 +34,13 @@ FROM alpine
 
 ARG BUILD_DATE
 ARG VCS_REF
-ARG CI_COMMIT_TAG
-ARG MOBILIZON_VERSION=${CI_COMMIT_TAG}
 
 LABEL org.opencontainers.image.title="mobilizon" \
     org.opencontainers.image.description="Mobilizon for Docker" \
     org.opencontainers.image.vendor="joinmobilizon.org" \
     org.opencontainers.image.documentation="https://docs.joinmobilizon.org" \
     org.opencontainers.image.licenses="AGPL-3.0" \
+    org.opencontainers.image.source="https://framagit.org/framasoft/mobilizon" \
     org.opencontainers.image.url="https://joinmobilizon.org" \
     org.opencontainers.image.revision=$VCS_REF \
     org.opencontainers.image.created=$BUILD_DATE
@@ -56,7 +56,7 @@ EXPOSE 4000
 ENV MOBILIZON_DOCKER=true
 
 COPY --from=builder --chown=nobody:nobody _build/prod/rel/mobilizon ./
-RUN cp /releases/${MOBILIZON_VERSION}/runtime.exs /etc/mobilizon/config.exs
+RUN cp /releases/*/runtime.exs /etc/mobilizon/config.exs
 COPY docker/production/docker-entrypoint.sh ./
 
 ENTRYPOINT ["./docker-entrypoint.sh"]

js/.prettierrc.json

@@ -0,0 +1 @@
+{}

js/fragmentTypes.json

@@ -5,17 +5,50 @@
         "kind": "INTERFACE",
         "name": "ActionLogObject",
         "possibleTypes": [
+          {
+            "name": "Comment"
+          },
           {
             "name": "Event"
           },
           {
-            "name": "Comment"
+            "name": "Person"
           },
           {
             "name": "Report"
           },
           {
             "name": "ReportNote"
+          },
+          {
+            "name": "User"
+          }
+        ]
+      },
+      {
+        "kind": "INTERFACE",
+        "name": "ActivityObject",
+        "possibleTypes": [
+          {
+            "name": "Comment"
+          },
+          {
+            "name": "Discussion"
+          },
+          {
+            "name": "Event"
+          },
+          {
+            "name": "Group"
+          },
+          {
+            "name": "Member"
+          },
+          {
+            "name": "Post"
+          },
+          {
+            "name": "Resource"
           }
         ]
       },
@@ -33,6 +66,18 @@
             "name": "Application"
           }
         ]
+      },
+      {
+        "kind": "INTERFACE",
+        "name": "Interactable",
+        "possibleTypes": [
+          {
+            "name": "Event"
+          },
+          {
+            "name": "Group"
+          }
+        ]
       }
     ]
   }

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobilizon",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -28,7 +28,6 @@
     "bulma-divider": "^0.2.0",
     "core-js": "^3.6.4",
     "date-fns": "^2.16.0",
-    "eslint-plugin-cypress": "^2.10.3",
     "graphql": "^15.0.0",
     "graphql-tag": "^2.10.3",
     "intersection-observer": "^0.12.0",
@@ -42,7 +41,7 @@
     "tiptap": "^1.32.0",
     "tiptap-extensions": "^1.34.0",
     "unfetch": "^4.2.0",
-    "v-tooltip": "^2.1.2",
+    "v-tooltip": "^2.1.3",
     "vue": "^2.6.11",
     "vue-apollo": "^3.0.3",
     "vue-class-component": "^7.2.3",
@@ -65,11 +64,11 @@
     "@types/prosemirror-state": "^1.2.4",
     "@types/prosemirror-view": "^1.11.4",
     "@types/vuedraggable": "^2.23.0",
-    "@typescript-eslint/eslint-plugin": "^4.14.1",
+    "@typescript-eslint/eslint-plugin": "^4.18.0",
-    "@typescript-eslint/parser": "^4.14.1",
+    "@typescript-eslint/parser": "^4.18.0",
     "@vue/cli-plugin-babel": "~4.5.12",
     "@vue/cli-plugin-e2e-cypress": "~4.5.12",
-    "@vue/cli-plugin-eslint": "~4.5.12",
+    "@vue/cli-plugin-eslint": "~4.5.0",
     "@vue/cli-plugin-pwa": "~4.5.12",
     "@vue/cli-plugin-router": "~4.5.12",
     "@vue/cli-plugin-typescript": "~4.5.12",
@@ -78,17 +77,19 @@
     "@vue/eslint-config-prettier": "^6.0.0",
     "@vue/eslint-config-typescript": "^7.0.0",
     "@vue/test-utils": "^1.1.0",
-    "eslint": "^7.7.0",
+    "eslint": "^6.7.2",
-    "eslint-config-prettier": "^7.0.0",
+    "eslint-plugin-cypress": "^2.10.3",
-    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-vue": "^7.0.0",
+    "eslint-plugin-prettier": "^3.3.1",
+    "eslint-plugin-vue": "^6.2.2",
+    "flush-promises": "^1.0.2",
     "jest-junit": "^12.0.0",
-    "mock-apollo-client": "^0.5",
+    "mock-apollo-client": "^0.6",
-    "prettier": "2.2.1",
+    "prettier": "^2.2.1",
     "prettier-eslint": "^12.0.0",
     "sass": "^1.29.0",
-    "sass-loader": "^10.0.1",
+    "sass-loader": "^8.0.2",
-    "typescript": "^4.2.3",
+    "typescript": "~4.1.5",
     "vue-cli-plugin-svg": "~0.1.3",
     "vue-i18n-extract": "^1.0.2",
     "vue-template-compiler": "^2.6.11",

js/src/apollo/utils.ts

@@ -6,28 +6,10 @@ import { AUTH_ACCESS_TOKEN, AUTH_REFRESH_TOKEN } from "@/constants";
 import { REFRESH_TOKEN } from "@/graphql/auth";
 import { saveTokenData } from "@/utils/auth";
 import { ApolloClient } from "apollo-client";
+import introspectionQueryResultData from "../../fragmentTypes.json";
 
 export const fragmentMatcher = new IntrospectionFragmentMatcher({
-  introspectionQueryResultData: {
+  introspectionQueryResultData,
-    __schema: {
-      types: [
-        {
-          kind: "UNION",
-          name: "SearchResult",
-          possibleTypes: [
-            { name: "Event" },
-            { name: "Person" },
-            { name: "Group" },
-          ],
-        },
-        {
-          kind: "INTERFACE",
-          name: "Actor",
-          possibleTypes: [{ name: "Person" }, { name: "Group" }],
-        },
-      ],
-    },
-  },
 });
 
 export async function refreshAccessToken(

js/src/components/Account/ActorAutoComplete.vue

@@ -10,7 +10,7 @@
     @select="handleSelect"
     @infinite-scroll="getAsyncData"
   >
-    <template slot-scope="props">
+    <template #default="props">
       <div class="media">
         <div class="media-left">
           <img

js/src/components/Admin/Followers.vue

@@ -78,7 +78,7 @@
         ></b-table-column
       >
 
-      <template slot="detail" slot-scope="props">
+      <template #detail="props">
         <article>
           <div class="content">
             <strong>{{ props.row.actor.name }}</strong>

js/src/components/Admin/Followings.vue

@@ -103,7 +103,7 @@
         ></b-table-column
       >
 
-      <template slot="detail" slot-scope="props">
+      <template #detail="props">
         <article>
           <div class="content">
             <strong>{{ props.row.targetActor.name }}</strong>

js/src/components/Comment/CommentTree.vue

@@ -39,7 +39,7 @@
         </div>
       </article>
     </form>
-    <b-notification v-else :closable="false">{{
+    <b-notification v-else-if="isConnected" :closable="false">{{
       $t("The organiser has chosen to close comments.")
     }}</b-notification>
     <p
@@ -65,7 +65,7 @@
           @delete-comment="deleteComment"
         />
       </transition-group>
-      <div v-else-if="isAbleToComment" class="no-comments">
+      <div class="no-comments">
         <span>{{ $t("No comments yet") }}</span>
       </div>
     </transition>
@@ -350,11 +350,15 @@ export default class CommentTree extends Vue {
   }
 
   get isAbleToComment(): boolean {
-    if (this.currentActor?.id) {
+    if (this.isConnected) {
       return this.areCommentsClosed || this.isEventOrganiser;
     }
     return false;
   }
+
+  get isConnected(): boolean {
+    return this.currentActor?.id != undefined;
+  }
 }
 </script>
 

js/src/components/Event/AddressAutoComplete.vue

@@ -12,7 +12,7 @@
         expanded
         @select="updateSelected"
       >
-        <template slot-scope="{ option }">
+        <template #default="{ option }">
           <b-icon :icon="option.poiInfos.poiIcon.icon" />
           <b>{{ option.poiInfos.name }}</b
           ><br />
@@ -150,7 +150,7 @@ export default class AddressAutoComplete extends Vue {
   }
 
   get queryText(): string {
-    if (this.value) {
+    if (this.value !== undefined) {
       return new Address(this.value).fullName;
     }
     return this.initialQueryText;

js/src/components/Event/EventMetadataBlock.vue

@@ -32,6 +32,7 @@ div.eventMetadataBlock {
 
   p {
     flex: 1;
+    overflow: hidden;
 
     &.padding-left {
       padding-left: 20px;

js/src/components/Event/FullAddressAutoComplete.vue

@@ -22,7 +22,7 @@
         expanded
         @select="updateSelected"
       >
-        <template slot-scope="{ option }">
+        <template #default="{ option }">
           <b-icon :icon="option.poiInfos.poiIcon.icon" />
           <b>{{ option.poiInfos.name }}</b
           ><br />
@@ -31,7 +31,7 @@
         <template slot="empty">
           <span v-if="isFetching">{{ $t("Searching…") }}</span>
           <div v-else-if="queryText.length >= 3" class="is-enabled">
-            <span>{{ $t('No results for "{queryText}"') }}</span>
+            <span>{{ $t('No results for "{queryText}"', { queryText }) }}</span>
             <span>{{
               $t(
                 "You can try another search term or drag and drop the marker on the map",
@@ -46,6 +46,12 @@
           </div>
         </template>
       </b-autocomplete>
+      <b-button
+        :disabled="!queryText"
+        @click="resetAddress"
+        class="reset-area"
+        icon-left="close"
+      />
     </b-field>
     <div class="map" v-if="selected && selected.geom && selected.poiInfos">
       <map-leaflet
@@ -295,6 +301,20 @@ export default class FullAddressAutoComplete extends Vue {
       );
     });
   }
+
+  @Watch("queryText")
+  resetAddressOnEmptyField(queryText: string): void {
+    if (queryText === "" && this.selected?.id) {
+      console.log("doing reset");
+      this.resetAddress();
+    }
+  }
+
+  resetAddress(): void {
+    this.$emit("input", null);
+    this.queryText = "";
+    this.selected = new Address();
+  }
 }
 </script>
 <style lang="scss">

js/src/components/PictureUpload.vue

@@ -1,15 +1,35 @@
 <template>
   <div class="root">
-    <figure class="image" v-if="imageSrc">
+    <figure class="image" v-if="imageSrc && !imagePreviewLoadingError">
-      <img :src="imageSrc" />
+      <img :src="imageSrc" @error="showImageLoadingError" />
     </figure>
     <figure class="image is-128x128" v-else>
-      <div class="image-placeholder">
+      <div
-        <span class="has-text-centered">{{ textFallback }}</span>
+        class="image-placeholder"
+        :class="{ error: imagePreviewLoadingError }"
+      >
+        <span class="has-text-centered" v-if="imagePreviewLoadingError">{{
+          $t("Error while loading the preview")
+        }}</span>
+        <span class="has-text-centered" v-else>{{ textFallback }}</span>
       </div>
     </figure>
 
     <div class="action-buttons">
+      <p v-if="pictureFile" class="metadata">
+        <span class="name" :title="pictureFile.name">{{
+          pictureFile.name
+        }}</span>
+        <span class="size">({{ formatBytes(pictureFile.size) }})</span>
+      </p>
+      <p v-if="pictureTooBig" class="picture-too-big">
+        {{
+          $t(
+            "The selected picture is too heavy. You need to select a file smaller than {size}.",
+            { size: formatBytes(maxSize) }
+          )
+        }}
+      </p>
       <b-field class="file is-primary">
         <b-upload @input="onFileChanged" :accept="accept" class="file-label">
           <span class="file-cta">
@@ -47,6 +67,10 @@ figure.image {
   justify-content: center;
   align-items: center;
 
+  &.error {
+    border: 2px solid red;
+  }
+
   span {
     flex: 1;
     color: #eee;
@@ -56,6 +80,27 @@ figure.image {
 .action-buttons {
   display: flex;
   flex-direction: column;
+
+  .file {
+    justify-content: center;
+  }
+
+  .metadata {
+    display: inline-flex;
+
+    .name {
+      max-width: 200px;
+      display: block;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+      margin-right: 5px;
+    }
+  }
+}
+
+.picture-too-big {
+  color: $danger;
 }
 </style>
 
@@ -87,30 +132,32 @@ export default class PictureUpload extends Vue {
   })
   textFallback!: string;
 
-  imageSrc: string | null = this.defaultImage ? this.defaultImage.url : null;
+  @Prop({ type: Number, required: false, default: 10_485_760 })
+  maxSize!: number;
 
   file!: File | null;
 
-  mounted(): void {
+  imagePreviewLoadingError = false;
-    if (this.pictureFile) {
+
-      this.updatePreview(this.pictureFile);
+  get pictureTooBig(): boolean {
+    return this.pictureFile?.size > this.maxSize;
+  }
+
+  get imageSrc(): string | null {
+    if (this.pictureFile !== undefined) {
+      if (this.pictureFile === null) return null;
+      try {
+        return URL.createObjectURL(this.pictureFile);
+      } catch (e) {
+        console.error(e);
+      }
     }
-  }
+    return this.defaultImage ? this.defaultImage.url : null;
-
-  @Watch("pictureFile")
-  onPictureFileChanged(val: File): void {
-    this.updatePreview(val);
-  }
-
-  @Watch("defaultImage")
-  onDefaultImageChange(defaultImage: IMedia): void {
-    this.imageSrc = defaultImage ? defaultImage.url : null;
   }
 
   onFileChanged(file: File | null): void {
     this.$emit("change", file);
 
-    this.updatePreview(file);
     this.file = file;
   }
 
@@ -118,13 +165,23 @@ export default class PictureUpload extends Vue {
     this.onFileChanged(null);
   }
 
-  private updatePreview(file?: File | null) {
+  @Watch("imageSrc")
-    if (file) {
+  resetImageLoadingError(): void {
-      this.imageSrc = URL.createObjectURL(file);
+    this.imagePreviewLoadingError = false;
-      return;
+  }
-    }
 
-    this.imageSrc = null;
+  showImageLoadingError(): void {
+    this.imagePreviewLoadingError = true;
+  }
+
+  // https://gist.github.com/zentala/1e6f72438796d74531803cc3833c039c
+  formatBytes(bytes: number, decimals: number): string {
+    if (bytes == 0) return "0 Bytes";
+    const k = 1024,
+      dm = decimals || 2,
+      sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"],
+      i = Math.floor(Math.log(bytes) / Math.log(k));
+    return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + " " + sizes[i];
   }
 }
 </script>

js/src/graphql/config.ts

@@ -75,6 +75,14 @@ export const CONFIG = gql`
           label
         }
       }
+      uploadLimits {
+        default
+        avatar
+        banner
+      }
+      instanceFeeds {
+        enabled
+      }
     }
   }
 `;
@@ -108,6 +116,9 @@ export const ABOUT = gql`
       }
       version
       federating
+      instanceFeeds {
+        enabled
+      }
     }
   }
 `;

js/src/graphql/report.ts

@@ -158,45 +158,69 @@ export const CREATE_REPORT_NOTE = gql`
 `;
 
 export const LOGS = gql`
-  query {
+  query ActionLogs($page: Int, $limit: Int) {
-    actionLogs {
+    actionLogs(page: $page, limit: $limit) {
-      id
+      elements {
-      action
-      actor {
         id
-        preferredUsername
+        action
-        domain
+        actor {
-        avatar {
-          id
-          url
-        }
-      }
-      object {
-        ... on Report {
-          id
-        }
-        ... on ReportNote {
-          report {
-            id
-          }
-        }
-        ... on Event {
-          id
-          title
-        }
-        ... on Person {
           id
           preferredUsername
           domain
-          name
+          avatar {
+            id
+            url
+          }
         }
-        ... on User {
+        object {
-          id
+          ... on Report {
-          email
+            id
-          confirmedAt
+          }
+          ... on ReportNote {
+            report {
+              id
+            }
+          }
+          ... on Event {
+            id
+            title
+          }
+          ... on Comment {
+            id
+            text
+            event {
+              id
+              title
+              uuid
+            }
+            actor {
+              id
+              preferredUsername
+              domain
+              name
+            }
+          }
+          ... on Person {
+            id
+            preferredUsername
+            domain
+            name
+          }
+          ... on Group {
+            id
+            preferredUsername
+            domain
+            name
+          }
+          ... on User {
+            id
+            email
+            confirmedAt
+          }
         }
+        insertedAt
       }
-      insertedAt
+      total
     }
   }
 `;

js/src/i18n/ca.json

@@ -132,7 +132,7 @@
   "Click to upload": "Clica per pujar",
   "Close": "Deshabilita",
   "Close comments for all (except for admins)": "Deshabilita els comentaris per a tothom excepte admins",
-  "Close events": "Activitats prop de tu",
+  "Events nearby": "Activitats prop de tu",
   "Closed": "Deshabilitats",
   "Comment deleted": "S'ha esborrat el comentari",
   "Comment from @{username} reported": "S'ha denunciat un comentari de @{username}",
@@ -490,7 +490,6 @@
   "No moderation logs yet": "Encara no hi ha registres de moderació",
   "No more activity to display.": "No hi ha res més a mostrar.",
   "No notification settings yet": "Encara no hi ha configuració de les modificacions",
-  "No one is going to this event": "Ningú ha confirmat|Hi va una persona|Hi aniran {going} persones",
   "No open reports yet": "No hi ha cap denúncia oberta",
   "No participant matches the filters": "Cap participant coincideix amb els filtres",
   "No participant to approve|Approve participant|Approve {number} participants": "Cap participant per aprovar|Aprova la participant|Aprova {number} participants",

js/src/i18n/de.json

@@ -8,10 +8,11 @@
   "+ Post a public message": "+ Schreibe eine öffentliche Nachricht",
   "+ Start a discussion": "+ Starte eine Diskussion",
   "<b>Please do not use it in any real way.</b>": "<b>Bitte benutze diese Seite nicht für tatsächliche Veranstaltungsplanung.</b>",
-  "<b>{contact}</b> will be displayed as contact.": "<b>{contact}</b> wird als Kontakt angezeigt.|<b>{contact}</b> wird als Kontakte angezeigt.",
+  "<b>{contact}</b> will be displayed as contact.": "<b>{contact}</b> wird als Kontakt angezeigt.|<b>{contact}</b> werden als Kontakte angezeigt.",
   "@{group}": "@{group}",
   "@{username}": "@{username}",
   "@{username} ({role})": "@{username} ({role})",
+  "@{username}'s follow request was accepted": "Die Folgeanfrage von @{username} wurde angenommen",
   "@{username}'s follow request was rejected": "@{username}'s Folgeanfrage wurde zurückgewiesen",
   "A cookie is a small file containing information that is sent to your computer when you visit a website. When you visit the site again, the cookie allows that site to recognize your browser. Cookies may store user preferences and other information. You can configure your browser to refuse all cookies. However, this may result in some website features or services partially working. Local storage works the same way but allows you to store more data.": "Ein Cookie ist eine kleine Datei mit Informationen, die an Ihren Computer gesendet wird, wenn Sie eine Website besuchen. Wenn Sie die Website erneut besuchen, ermöglicht das Cookie dieser Website, Ihren Browser zu erkennen. Cookies können Benutzereinstellungen und andere Informationen speichern. Sie können Ihren Browser so konfigurieren, dass er alle Cookies ablehnt. Dies kann jedoch dazu führen, dass einige Funktionen oder Dienste der Website nur eingeschränkt funktionieren. Die lokale Speicherung funktioniert auf die gleiche Weise, ermöglicht es Ihnen jedoch, mehr Daten zu speichern.",
   "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.": "Ein Cookie ist eine kleine Datei, die auf deinen Computer übertragen wird, wenn du eine Webseite aufrufst. Sie enthält Informationen, die es der Webseite ermöglichen, deinen Computer beim nächsten Besuch wiederzuerkennen. Cookies können auch genutzt werden, um nutzerspezifische Einstellungen oder andere Informationen zu speichern. Du kannst deinen Browser so einstellen, dass er alle Cookies ablehnt oder diese beim Schließen des Browsers löscht. Dies kann jedoch dazu führen, das einige Funktionalitäten von Webseiten oder Diensten nicht mehr vollständig funktionieren. Lokale Website-Daten erfüllen den selben Zweck, erlauben es einer Webseite aber, größere Datenmengen auf deinem Computer zu speichern.",
@@ -42,6 +43,7 @@
   "Actions": "Aktionen",
   "Activated": "Aktiviert",
   "Active": "Aktiv",
+  "Activity": "Ereignisse",
   "Actor": "Akteur",
   "Add": "Hinzufügen",
   "Add / Remove…": "Hinzufügen / Entfernen…",
@@ -60,6 +62,7 @@
   "Admin settings successfully saved.": "Admineinstellungen erfolgreich gespeichert.",
   "Administration": "Administration",
   "Administrator": "Administrator",
+  "All activities": "Alle Ereignisse",
   "All good, let's continue!": "Das passt, weiter geht's!",
   "All group members and other eventual server admins will still be able to view this information.": "Alle Gruppenmitglieder und andere Server-Administrator:innen können diese Information dennoch einsehen.",
   "All the places have already been taken": "Alle Plätze sind schon vergeben",
@@ -72,9 +75,9 @@
   "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.": "Als Instanz bezeichnen wir eine Installation der Mobilizon-Software auf einem Server. Eine Instanz kann von jedem mit Hilfe der {mobilizon_software} oder anderer kompatibler Software betrieben werden. Der Name dieser Instanz lautet „{instance_name}“. Diese Instanz ist Teil des „Fediverse“, einem Netzwerk aus vielen verbundenen Instanzen, die alle miteinander kommunizieren können. Nutzer von verschiedenen Instanzen können so - genau wie beim E-Mail-System - miteinander kommunizieren, auch wenn sie Accounts bei völlig verschiedenen Instanzen registriert haben.",
   "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.": "Eine Programmierschnittstelle, auch API genannt (von englisch „application programming interface“) definiert ein Kommunikationsprotokoll, das Softwarekomponenten erlaubt, miteinander zu interagieren. Die Mobilizon-API ermöglicht Drittanbietersoftware beispielsweise automatisiert bestimmte Aktionen auszuführen, z.B. das Erstellen von Veranstaltungen in Ihrem Namen.",
   "And {number} comments": "Und {number} Kommentare",
-  "Anonymous participant": "Anonymer Teilnehmer",
+  "Anonymous participant": "Anonyme*r Teilnehmer*in",
   "Anonymous participants will be asked to confirm their participation through e-mail.": "Anonyme Teilnehmer werden gebeten, ihre Teilnahme per E-Mail zu bestätigen.",
-  "Anonymous participations": "Anonyme Teilnehmer",
+  "Anonymous participations": "Anonyme Teilnehmer*innen",
   "Any day": "Egal wann",
   "Anyone can join freely": "Jeder kann frei beitreten",
   "Anyone wanting to be a member from your group will be able to from your group page.": "Jeder, der ein Mitglied Ihrer Gruppe werden möchte, kann dies von Ihrer Gruppenseite aus tun.",
@@ -89,6 +92,7 @@
   "Are you sure you want to cancel the event creation? You'll lose all modifications.": "Sind Sie sich sicher, dass Sie das Erstellen der Veranstaltung abbrechen möchten? Alle Änderungen werden verloren gehen.",
   "Are you sure you want to cancel the event edition? You'll lose all modifications.": "Sind Sie sich sicher, dass die Veranstaltung abrechen möchten? Sie verlieren dann alle Änderungen.",
   "Are you sure you want to cancel your participation at event \"{title}\"?": "Sind Sie sicher, dass Sie Ihre Teilnahme an der Veranstaltung \"{Titel}\" stornieren möchten?",
+  "Are you sure you want to delete this entire discussion?": "Sind Sie sicher, dass sie die gesamte Diskussion löschen wollen?",
   "Are you sure you want to delete this event? This action cannot be reverted.": "Sind Sie sicher, dass Sie diese Veranstaltung löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden.",
   "As the event organizer has chosen to manually validate participation requests, your participation will be really confirmed only once you receive an email stating it's being accepted.": "Da der Veranstalter sich entschieden hat, die Teilnahmeanfragen manuell zu validieren, wird Ihre Teilnahme erst dann wirklich bestätigt, wenn Sie eine E-Mail erhalten, in der die Annahme bestätigt wird.",
   "Assigned to": "Zugewiesen an",
@@ -101,6 +105,7 @@
   "Bold": "Fett",
   "By @{group}": "Von @{group}",
   "By @{username}": "von @{username}",
+  "By others": "Von Anderen",
   "By {author}": "Von {author}",
   "By {group}": "Von {group}",
   "By {username} and {group}": "Nach {username} und {group}",
@@ -133,6 +138,7 @@
   "Closed": "Geschlossen",
   "Comment deleted": "Kommentar gelöscht",
   "Comment from @{username} reported": "Kommentar von @{username} gemeldet",
+  "Comment text can't be empty": "Der Kommentar darf nicht leer sein",
   "Comments": "Kommentare",
   "Comments are closed for everybody else.": "Kommentare sind für alle anderen geschlossen.",
   "Comments have been closed.": "Die Kommentarfunktion wurde deaktiviert.",
@@ -167,6 +173,7 @@
   "Create my event": "Erstelle eine neue Veranstaltung",
   "Create my group": "Erstelle eine Gruppe",
   "Create my profile": "Erstelle mein Profil",
+  "Create new links": "Erstelle neue Links",
   "Create resource": "Ressource erstellen",
   "Create the discussion": "Beginne die Diskussion",
   "Create to-do lists for all the tasks you need to do, assign them and set due dates.": "Erstellen Sie To-Do-Listen für alle Aufgaben, die Sie erledigen müssen, weisen Sie diese zu und legen Sie Fälligkeitsdaten fest.",
@@ -195,11 +202,13 @@
   "Delete Event": "Veranstaltung löschen",
   "Delete account": "Account löschen",
   "Delete conversation": "Lösche Konversation",
+  "Delete discussion": "Diskussion löschen",
   "Delete event": "Veranstaltung löschen",
   "Delete everything": "Alles löschen",
   "Delete group": "Gruppe löschen",
   "Delete my account": "Mein Konto löschen",
   "Delete post": "Beitrag löschen",
+  "Delete this discussion": "Diese Diskussion löschen",
   "Delete this identity": "Diese Identität löschen",
   "Delete your identity": "Ihre Identität löschen",
   "Delete {eventTitle}": "Lösche {eventTitle}",
@@ -235,7 +244,7 @@
   "Either the account is already validated, either the validation token is incorrect.": "Das Konto ist bereits bestätigt oder der Bestätigungstoken ist abgelaufen.",
   "Either the email has already been changed, either the validation token is incorrect.": "Die E-Mail-Adresse wurde bereits geändert oder der Bestätigungstoken ist abgelaufen.",
   "Either the participation has already been validated, either the validation token is incorrect.": "Die Teilnahme wurde bereits bestätigt oder der Bestätigungstoken ist abgelaufen.",
-  "Either the participation request has already been validated, either the validation token is incorrect.": "Entweder wurde die Teilnahmeanfrage bereits validiert, oder das Validierungs-Token ist falsch.",
+  "Either the participation request has already been validated, either the validation token is incorrect.": "Die Teilnahmeanfrage wurde schon bestätigt, oder das Bestätigungs-Token ist nicht gültig.",
   "Email": "E-Mail",
   "Email address": "E-Mail-Adresse",
   "Email notifications": "E-Mail-Benachrichtigungen",
@@ -252,6 +261,7 @@
   "Error stacktrace": "Error-Stacktrace",
   "Error while changing email": "Fehler beim Ändern der E-Mail-Adresse",
   "Error while communicating with the server.": "Fehler bei der Kommunikation mit dem Server.",
+  "Error while loading the preview": "Fehler beim Laden der Vorschau",
   "Error while login with {provider}. Retry or login another way.": "Fehler bei der Anmeldung mit {provider}. Versuchen Sie es erneut oder nutzen Sie eine andere Login-Möglichkeit.",
   "Error while login with {provider}. This login provider doesn't exist.": "Fehler bei der Anmeldung über {provider}. Dieser Anbieter existiert nicht.",
   "Error while reporting group {groupTitle}": "Fehler beim melden der Gruppe {groupTitle}",
@@ -272,6 +282,7 @@
   "Event {eventTitle} deleted": "Veranstaltung {eventTitle} gelöscht",
   "Event {eventTitle} reported": "Veranstaltung {eventTitle} gemeldet",
   "Events": "Veranstaltungen",
+  "Events nearby": "Veranstaltungen in Ihrer Nähe",
   "Events tagged with {tag}": "Veranstaltung getaggt mit {tag}",
   "Everything": "Alles",
   "Ex: mobilizon.fr": "Z.B.: mobilizon.fr",
@@ -299,8 +310,9 @@
   "Forgot your password?": "Passwort vergessen?",
   "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?": "Von der Geburtstagsparty mit Freunden und Familie bis hin zu Demonstrationen gegen den Klimawandel, momentan sind unsere Veranstaltungen <b>in den Platformen der Tech-Giganten gefangen</b>. Wie können wir uns organisieren, wie können wir auf „Teilnehmen“ klicken ohne <b>private Daten an Facebook zu geben</b> oder <b>abhängig von MeetUp zu sein</b>?",
   "From the {startDate} at {startTime} to the {endDate}": "Vom {startDate} um {startTime} bis zum {endDate}",
-  "From the {startDate} at {startTime} to the {endDate} at {endTime}": "Vom {startDate} um {startTime} bis zum {endDate} um {endTime}",
+  "From the {startDate} at {startTime} to the {endDate} at {endTime}": "Vom {startDate} um {startTime} Uhr bis zum {endDate} um {endTime} Uhr",
   "From the {startDate} to the {endDate}": "Vom {startDate} bis zum {endDate}",
+  "From yourself": "Von Ihnen selbst",
   "Gather ⋅ Organize ⋅ Mobilize": "Treffen ⋅ Organisieren ⋅ Mobilisieren",
   "General": "Allgemein",
   "General information": "Allgemeine Informationen",
@@ -311,7 +323,7 @@
   "Go to the event page": "Zur Veranstaltungsseite",
   "Going as {name}": "Teilnehmen als {name}",
   "Group": "Gruppe",
-  "Group Followers": "Follower dieser Gruppe",
+  "Group Followers": "Follower*innen dieser Gruppe",
   "Group List": "Gruppenliste",
   "Group Members": "Gruppenmitglieder",
   "Group address": "Gruppenadresse",
@@ -368,10 +380,11 @@
   "Instance Short Description": "Kurzbeschreibung der Instanz",
   "Instance Slogan": "Slogan der Instanz",
   "Instance Terms": "Nutzungsbedingungen der Instanz",
-  "Instance Terms Source": "Herkunft der Nutzungsbedingungen der Instanz",
+  "Instance Terms Source": "Herkunft der Instanz-Regeln",
   "Instance Terms URL": "URL der Nutzungsbedingungen der Instanz",
   "Instance administrator": "Administrator der Instanz",
   "Instance configuration": "Einstellungen der Instanz",
+  "Instance feeds": "Instanz Feeds",
   "Instance languages": "Sprache der Instanz",
   "Instance rules": "Instanz-Regeln",
   "Instance settings": "Einstellungen der Instanz",
@@ -410,6 +423,7 @@
   "Limited number of places": "Limitierte Anzahl an Plätzen",
   "List title": "Titel der Liste",
   "Load more": "Mehr anzeigen",
+  "Load more activities": "Mehr Ereignisse laden",
   "Loading comments…": "Lade Kommentare…",
   "Local": "Lokal",
   "Locality": "Ort",
@@ -424,7 +438,7 @@
   "Manage my notifications": "Meine Benachrichtigungen verwalten",
   "Manage my settings": "Meine Einstellungen verwalten",
   "Manage participations": "Teilnehmer verwalten",
-  "Manually approve new followers": "Neue Follower manuell genehmigen",
+  "Manually approve new followers": "Neue Follower*innen manuell genehmigen",
   "Manually invite new members": "Manuelles Einladen neuer Mitglieder",
   "Mark as resolved": "Als gelöst markieren",
   "Member": "Mitglied",
@@ -464,13 +478,14 @@
   "New members": "Neue Mitglieder",
   "New note": "Neue Notiz",
   "New password": "Neues Passwort",
+  "New post": "Neuer Beitrag",
   "New profile": "Neues Profil",
   "Next": "Nächste",
   "Next month": "Nächsten Monat",
   "Next page": "Nächste Seite",
   "Next week": "Nächste Woche",
   "No address defined": "Keine Adresse festgelegt",
-  "No closed reports yet": "Noch keine geschlossenen Berichte",
+  "No closed reports yet": "Bisher keine geschlossenen Berichte",
   "No comment": "Kein Kommentar",
   "No comments yet": "Noch keine Kommentare",
   "No discussions yet": "Noch keine Diskussionen gestartet",
@@ -479,8 +494,9 @@
   "No follower matches the filters": "Kein Follower passt zu diesen Filtern",
   "No group found": "Keine Gruppe gefunden",
   "No groups found": "Keine Gruppen gefunden",
+  "No information": "Keine Informationen",
   "No instance follows your instance yet.": "Noch keine Instanz folgt deiner Instanz.",
-  "No instance to approve|Approve instance|Approve {number} instances": "Keine Instanz zu prüfen|Überprüfe Instanz|Überprüfe {number} Instanzen",
+  "No instance to approve|Approve instance|Approve {number} instances": "Keine Instanz zu prüfen|Genehmige Instanz|Genehmige {number} Instanzen",
   "No instance to reject|Reject instance|Reject {number} instances": "Keine Instanz abzulehnen|Lehne Instanz ab|Lehne {number} Instanzen ab",
   "No instance to remove|Remove instance|Remove {number} instances": "Keine Instanz zu entfernen|Entferne Instanz|Entferne {number} Instanzen",
   "No languages found": "Keine Sprachen gefunden",
@@ -488,7 +504,6 @@
   "No message": "Keine Nachricht",
   "No moderation logs yet": "Bisher keine Moderationsprotokolle",
   "No more activity to display.": "Es gibt keine weiteren anzuzeigenden Ereignisse.",
-  "No one is going to this event": "Niemand nimmt an dieser Veranstaltung teil|Eine Person nimmt teil|{going} Personen nehmen teil",
   "No ongoing todos": "Keine aktiven To-dos",
   "No open reports yet": "Bisher keine ausstehenden Berichte",
   "No participant matches the filters": "Kein Teilnehmer entspricht den Filterkriterien",
@@ -514,6 +529,7 @@
   "Nothing to see here": "Hier gibt es nichts zu sehen",
   "Notification before the event": "Benachrichtigung vor der Veranstaltung",
   "Notification on the day of the event": "Benachrichtigung am Tag der Veranstaltung",
+  "Notifications": "Benachrichtigungen",
   "Notifications for manually approved participations to an event": "Benachrichtigungen bei manuell bestätigten Teilnahmen an einer Veranstlatung",
   "Now, create your first profile:": "Erstellen Sie jetzt Ihr erstes Profil:",
   "Number of places": "Anzahl der Plätze",
@@ -571,12 +587,13 @@
   "Password reset": "Passwort zurücksetzen",
   "Past events": "Vergangene Veranstaltungen",
   "Pending": "Ausstehend",
+  "Personal feeds": "Persönliche Feeds",
   "Pick": "Wähle",
   "Pick a group": "Wählen Sie eine Gruppe",
   "Pick a profile or a group": "Wähle ein Profil der eine Gruppe",
   "Pick an identity": "Wählen Sie eine Identität",
   "Pick an instance": "Wähle eine Instanz",
-  "Please add as many details as possible to help identify the problem.": "Bitte gib uns so viele Details wie möglich, die uns helfen könnten, das Problem zu analysieren.",
+  "Please add as many details as possible to help identify the problem.": "Bitte geben Sie uns so viele Details wie möglich, die uns helfen könnten, das Problem zu analysieren.",
   "Please check your spam folder if you didn't receive the email.": "Bitte sehen Sie auch in Ihrem Spam-Ordner nach, wenn Sie keine E-Mail erhalten haben.",
   "Please contact this instance's Mobilizon admin if you think this is a mistake.": "Bitte kontaktieren Sie den Administrator dieser Mobilizon-Instanz, wenn Sie denken, dass dies ein Fehler ist.",
   "Please do not use it in any real way.": "Bitte nicht im praktischen Einsatz verwenden.",
@@ -601,12 +618,13 @@
   "Privacy policy": "Datenschutzerklärung",
   "Private event": "Private Veranstaltung",
   "Private feeds": "Private Feeds",
+  "Profile feeds": "Profil-Feeds",
   "Profiles": "Profile",
   "Profiles and federation": "Profile und Föderation",
   "Promote": "Promoten",
   "Public": "Öffentlich",
   "Public RSS/Atom Feed": "Öffentlicher RSS/Atom-Feed",
-  "Public comment moderation": "Öffentliche Kommentare",
+  "Public comment moderation": "Moderation öffentlicher Kommentare",
   "Public event": "Öffentliche Veranstaltung",
   "Public feeds": "Öffentliche Feeds",
   "Public iCal Feed": "Öffentlicher iCal-Feed",
@@ -623,6 +641,7 @@
   "Redirecting to content…": "Weiterleitung zum Inhalt…",
   "Redirecting to event…": "Weiterleiten zur Veranstaltung…",
   "Refresh profile": "Profil aktualisieren",
+  "Regenerate new links": "Erstelle die Links neu",
   "Region": "Region",
   "Register": "Registrieren",
   "Register an account on Mobilizon!": "Erstelle einen Mobilizon-Account!",
@@ -729,14 +748,21 @@
   "The event organizer didn't add any description.": "Der Organisator hat keine Beschreibung hinzugefügt.",
   "The event organizer manually approves participations. Since you've chosen to participate without an account, please explain why you want to participate to this event.": "Der Organisator möchte Teilnahmen manuell bestätigen. Wenn Sie ohne Konto teilnehmen möchten, erklären Sie bitte warum Sie an der Veranstaltung interessiert sind.",
   "The event title will be ellipsed.": "Der Titel der Veranstaltung wird verkürzt dargestellt.",
-  "The event will show as attributed to this group.": "Das Ereignis wird als dieser Gruppe zugehörig angezeigt.",
+  "The event will show as attributed to this group.": "Die Veranstaltung wird als dieser Gruppe zugehörig angezeigt.",
-  "The event will show as attributed to your personal profile.": "Das Ereignis wird als Ihrem persönlichen Profil zugewiesen angezeigt.",
+  "The event will show as attributed to this profile.": "Die Veranstaltung wird als Ihrem Profil zugewiesen angezeigt.",
+  "The event will show as attributed to your personal profile.": "Die Veranstaltung wird als Ihrem persönlichen Profil zugewiesen angezeigt.",
   "The event will show the group as organizer.": "Bei diese Veranstaltung wird die Gruppe als Organisationsteam angezeigt.",
   "The event {event} was created by {profile}.": "Die Veranstaltung {event} wurde erstellt von {profile}.",
   "The event {event} was deleted by {profile}.": "Die Veranstaltung {event} wurde von {profile} gelöscht.",
   "The event {event} was updated by {profile}.": "Die Veranstaltung {event} wurde von {profile} aktualisiert.",
   "The events you created are not shown here.": "Die Veranstaltung, die Sie erstellt haben ist hier nicht gelistet.",
+  "The group can now be joined by anyone.": "Der Gruppe können nun alle beitreten.",
+  "The group can now only be joined with an invite.": "Der Gruppe kann nun ausschließlich durch Einladung beigetreten werden.",
   "The group will be publicly listed in search results and may be suggested in the explore section. Only public informations will be shown on it's page.": "Diese Gruppe wird öffentlich in Suchergebnissen sichtbar sein und könnte im Bereich „Entdecken“ auftauchen. Nur öffentliche Informationen werden auf der Gruppenseite angezeigt.",
+  "The group's avatar was changed.": "Der Profilbild der Gruppe wurde geändert.",
+  "The group's banner was changed.": "Das Gruppenbanner wurde geändert.",
+  "The group's physical address was changed.": "Die physische Adresse der Gruppe wurde geändert.",
+  "The group's short description was changed.": "Die Kurzbeschreibung der Gruppe wurde geändert.",
   "The instance administrator is the person or entity that runs this Mobilizon instance.": "Der Administrator der Instanz ist die Person oder Organisation, die diese Mobilizon-Instanz betreibt.",
   "The member was removed from the group {group}": "Das Mitglied wurde aus der Gruppe {group} entfernt",
   "The new email doesn't seem to be valid": "Die neue E-Mail-Adresse scheint ungültig zu sein",
@@ -751,6 +777,7 @@
   "The post {post} was deleted by {profile}.": "Der Beitrag {post} wurde von {profile} gelöscht.",
   "The post {post} was updated by {profile}.": "Der Beitrag {post} wurde von {profile} aktualisiert.",
   "The report will be sent to the moderators of your instance. You can explain why you report this content below.": "Die Meldung wird an die Moderatoren Ihrer Instanz gesendet. Sie können unten erläutern, warum Sie diesen Inhalt melden.",
+  "The selected picture is too heavy. You need to select a file smaller than {size}.": "Die ausgewählte Bilddatei ist zu groß. Die Datei darf höchstens {size} groß sein.",
   "The technical details of the error can help developers solve the problem more easily. Please add them to your feedback.": "Die technischen Details des Fehlers können den Entwickler*innen helfen, das Problem einfacher zu lösen. Bitte füge sie der Rückmeldung hinzu.",
   "The user account you're trying to login as has not been confirmed yet. Check your email inbox and eventually your spam folder.": "Der Account, mit dem Du dich einloggen willst, wurde noch nicht bestätigt. Schau in deinem E-Mail-Postfach und in deinem Spam-Ordner nach.",
   "The {default_privacy_policy} will be used. They will be translated in the user's language.": "Die {default_privacy_policy} wird verwendet. Sie wird in die Sprache des Nutzers übersetzt.",
@@ -760,6 +787,8 @@
   "There will be no way to recover your data.": "Es gibt keinen Weg Ihre Daten wiederherszustellen.",
   "There's no discussions yet": "Es gibt noch keine Diskussion",
   "These events may interest you": "Diese Veranstaltungen könnten Sie interessieren",
+  "These feeds contain event data for the events for which any of your profiles is a participant or creator. You should keep these private. You can find feeds for specific profiles on each profile edition page.": "Diese Feeds enthalten Veranstaltungsdaten für alle Veranstaltungen, für die irgendeines Ihrer Profile Teilnehmer*in oder Ersteller*in ist.",
+  "These feeds contain event data for the events for which this specific profile is a participant or creator. You should keep these private. You can find feeds for all of your profiles into your notification settings.": "Diese Feeds enthalten Veranstaltungsdaten für alle Veranstaltungen, für die dieses Profil Teilnehmer*in oder Ersteller*in ist.",
   "This Mobilizon instance and this event organizer allows anonymous participations, but requires validation through email confirmation.": "Diese Mobilizon-Instanz und der Organisator akzeptieren anonyme Teilnahmen, aber eine Bestätigung per E-Mail ist erforderlich.",
   "This URL is not supported": "Diese URL wird nicht unterstützt",
   "This email is already registered as participant for this event": "Diese E-Mail-Adresse ist bereits als Teilnehmer:in für die Veranstaltung registriert",
@@ -804,14 +833,18 @@
   "URL": "URL",
   "URL copied to clipboard": "URL in die Zwischenablage kopiert",
   "Unable to copy to clipboard": "Kopieren in die Zwischenablage nicht möglich",
+  "Unable to create the group. One of the pictures may be too heavy.": "Das Erstellen der Gruppe ist fehlgeschlagen. Eines der Bilder ist eventuell zu groß.",
+  "Unable to create the profile. The avatar picture may be too heavy.": "Das Erstellen des Profils ist fehlgeschlagen. Das Profilbild ist eventuell zu groß.",
   "Unable to detect timezone.": "Zeitzone kann nicht erkannt werden.",
   "Unable to load event for participation. The error details are provided below:": "Event für die Teilnahme kann nicht geladen werden. Die Fehlerdetails finden Sie unten:",
   "Unable to save your participation in this browser.": "Ihre Teilnahme kann in diesem Browser nicht gespeichert werden.",
+  "Unable to update the profile. The avatar picture may be too heavy.": "Die Aktualisierung des Profils ist fehlgeschlagen. Das Profilbild ist eventuell zu groß.",
   "Unfortunately, this instance isn't opened to registrations": "Leider lässt diese Instanz keine Registrierungen zu",
   "Unfortunately, your participation request was rejected by the organizers.": "Leider wurde Ihre Teilnahmeanfrage vom Organisator abgelehnt.",
   "Unknown": "Unbekannt",
   "Unknown actor": "Unbekannter Akteur",
   "Unknown error.": "Unbekannter Fehler.",
+  "Unknown value for the openness setting.": "Unbekannter Wert für die Zugangsbeschränkungen.",
   "Unsaved changes": "Nicht gespeicherte Änderungen",
   "Unset group": "Auswahl der Gruppe aufheben",
   "Unsuspend": "Freigeben",
@@ -839,6 +872,9 @@
   "View event page": "Veranstaltungsseite anzeigen",
   "View everything": "Alles anzeigen",
   "View page on {hostname} (in a new window)": "Seite auf {hostname} anzeigen (in einem neuen Fenster)",
+  "Visibility was set to an unknown value.": "Die Sichtbarkeit wurde in unbekannt geändert.",
+  "Visibility was set to private.": "Die Sichtbarkeit wurde in privat geändert.",
+  "Visibility was set to public.": "Die Sichtbarkeit wurde in öffentlich geändert.",
   "Visible everywhere on the web": "Öffentlich sichtbar im gesamten Internet",
   "Visible everywhere on the web (public)": "Sichtbar im ganzen Internet (öffentlich)",
   "Waiting for organization team approval.": "Warte auf die Bestätigung des Organisationsteams.",
@@ -867,13 +903,14 @@
   "Who published {number} events": "Die {number} Veranstaltungen angelegt haben",
   "Why create an account?": "Warum ein Konto erstellen?",
   "Will allow to display and manage your participation status on the event page when using this device. Uncheck if you're using a public device.": "Ermöglicht die Anzeige und Verwaltung Ihres Teilnahmestatus auf der Veranstaltungsseite, wenn Sie dieses Gerät verwenden. Deaktivieren Sie diese Option, wenn Sie ein öffentliches Gerät verwenden.",
-  "Within {number} kilometers of {place}": "|Innerhalb eines Kilometers von {place}|Innerhalb {number} Kilometer von {place}",
+  "Within {number} kilometers of {place}": "|Innerhalb eines Kilometers von {place}|Innerhalb von {number} Kilometer von {place}",
   "World map": "Weltkarte",
   "Write something…": "Schreiben Sie etwas…",
   "Yesterday": "Gestern",
   "You accepted the invitation to join the group.": "Sie haben die Einladung zur Gruppe angenommen.",
   "You added the member {member}.": "Sie haben das Mitglied {member} hinzugefügt.",
   "You and one other person are going to this event": "Du gehst alleine zu dieser Veranstaltung | Du und eine weitere Person gehen zu dieser Veranstaltung | Du und {approved} weitere Personen gehen zu dieser Veranstaltung.",
+  "You archived the discussion {discussion}.": "Sie haben die Diskussion {discussion} archiviert.",
   "You are already a participant of this event.": "Du nimmst bereits an dieser Veranstaltung teil.",
   "You are already logged-in.": "Du bist bereits eingeloggt.",
   "You are not an administrator for this group.": "Sie sind kein Administrator dieser Gruppe.",
@@ -881,16 +918,23 @@
   "You are not part of any group.": "Sie sind kein Teil einer Gruppe.",
   "You are participating in this event anonymously": "Sie nehmen anonym an dieser Veranstaltung teil",
   "You are participating in this event anonymously but didn't confirm participation": "Sie nehmen an dieser Veranstaltung anonym teil, haben aber Ihre Teilnahme noch nicht bestätigt",
-  "You can add tags by hitting the Enter key or by adding a comma": "Sie können Tags hinzufügen, indem Sie Enter drücken oder durch ein Komma trennen",
+  "You can add tags by hitting the Enter key or by adding a comma": "Sie können Schlagworte hinzufügen, indem Sie Enter drücken oder durch ein Komma trennen",
   "You can pick your timezone into your preferences.": "Sie können Ihre Zeitzone in den Einstellungen festlegen.",
   "You can try another search term or drag and drop the marker on the map": "Sie können einen anderen Suchbegriff verwenden oder die Markierung auf der Karte verschieben",
   "You can't change your password because you are registered through {provider}.": "Sie können Ihr Passwort nicht ändern, weil Sie über {provider} angemeldet sind.",
   "You can't remove your last identity.": "Du kannst deine letzte Identität nicht löschen.",
   "You can't reset your password because you use a 3rd-party auth provider to login.": "Du kannst dein Passwort nicht zurücksetzen, weil du über einen Drittanbieter eingeloggt bist.",
+  "You created the discussion {discussion}.": "Sie haben die Diskussion {discussion} erstellt.",
   "You created the event {event}.": "Sie haben die Veranstaltung {event} erstellt.",
+  "You created the folder {resource}.": "Sie haben den Ordner {resource} erstellt.",
+  "You created the group {group}.": "Sie haben die Gruppe {group} erstellt.",
   "You created the post {post}.": "Sie haben den Beitrag {post} erstellt.",
+  "You created the resource {resource}.": "Sie haben die Ressource {resource} erstellt.",
+  "You deleted the discussion {discussion}.": "Sie haben die Diskussion {discussion} gelöscht.",
   "You deleted the event {event}.": "Sie haben die Veranstaltung {event} gelöscht.",
+  "You deleted the folder {resource}.": "Sie haben den Ordner {resource} gelöscht.",
   "You deleted the post {post}.": "Sie haben den Beitrag {post} gelöscht.",
+  "You deleted the resource {resource}.": "Sie haben die Ressource {resource} gelöscht.",
   "You demoted the member {member} to an unknown role.": "Sie haben {member} zu einer unbekannten Rolle zurückgestuft.",
   "You demoted {member} to moderator.": "Sie haben {member} zum/zur Moderator/in zurückgestuft.",
   "You demoted {member} to simple member.": "Sie haben {member} zu einem einfachen Mitglied zurückgestuft.",
@@ -909,16 +953,30 @@
   "You may also ask to {resend_confirmation_email}.": "Du kannst auch die {resend_confirmation_email}.",
   "You may clear all participation information for this device with the buttons below.": "Sie können alle Teilnahmeinformationen für dieses Gerät mit den Schaltflächen unten löschen.",
   "You may now close this window, or {return_to_event}.": "Sie können das Fenster jetzt schließe oder {return_to_event}.",
+  "You may show some members as contacts.": "Sie können einige Mitglieder als Kontakte anzeigen lassen.",
+  "You moved the folder {resource} into {new_path}.": "Sie haben den Ordner {resource} nach {new_path} verschoben.",
+  "You moved the folder {resource} to the root folder.": "Sie haben den Ordner {resource} in das Root-Verzeichnis verschoben.",
+  "You moved the resource {resource} into {new_path}.": "Sie haben die Ressource {resource} nach {new_path} verschoben.",
+  "You moved the resource {resource} to the root folder.": "Sie haben die Ressource {resource} in das Root-Verzeichnis verschoben.",
   "You need to create the group before you create an event.": "Sie müssen zunächst eine Gruppe anlegen, bevor Sie eine Veranstaltung anlegen können.",
   "You need to login.": "Sie müssen sich einloggen.",
+  "You posted a comment on the event {event}.": "Sie haben die Veranstaltung {event} kommentiert.",
   "You promoted the member {member} to an unknown role.": "Sie haben {member} einer unbekannten Rolle zugewiesen.",
   "You promoted {member} to administrator.": "Sie haben {member} zum/zur Administrator/in befördert.",
   "You promoted {member} to moderator.": "Sie haben {member} zum/zur Moderator/in befördert.",
+  "You renamed the discussion from {old_discussion} to {discussion}.": "Sie haben die Diskussion {old_discussion} in {discussion} umbenannt.",
+  "You renamed the folder from {old_resource_title} to {resource}.": "Sie haben den Ordner {old_resource_title} in {resource} umbenannt.",
+  "You renamed the resource from {old_resource_title} to {resource}.": "Sie haben die Ressource {old_resource_title} in {resource} umbenannt.",
+  "You replied to a comment on the event {event}.": "Sie haben auf ein Kommentar in der Veranstaltung {event} geantwortet.",
+  "You replied to the discussion {discussion}.": "Sie haben auf die Diskussion {discussion} geantwortet.",
   "You requested to join the group.": "Sie haben die angefragt der Gruppe beizutreten.",
   "You updated the event {event}.": "Sie haben die Veranstaltung {event} aktualisiert.",
+  "You updated the group {group}.": "Sie haben die Gruppe {group} aktualisiert.",
   "You updated the member {member}.": "Sie haben {member} aktualisiert.",
   "You updated the post {post}.": "Sie haben den Beitrag {post} aktualisiert.",
+  "You were demoted to an unknown role by {profile}.": "Sie wurden von {profile} in eine unbekannte Rolle zurückgestuft.",
   "You were demoted to moderator by {profile}.": "Sie wurden von {profile} zum/zur Moderator/in zurückgestuft.",
+  "You were demoted to simple member by {profile}.": "Sie wurden von {profile} zum einfachen Mitglied zurückgestuft.",
   "You were promoted to administrator by {profile}.": "Sie wurden von {profile} zum/zur Administrator/in befördert.",
   "You were promoted to an unknown role by {profile}.": "Sie wurden von {profile} zu einer unbekannten Rolle befördert.",
   "You were promoted to moderator by {profile}.": "Sie wurden von {profile} zum/zur Moderator/in befördert.",
@@ -927,6 +985,7 @@
   "You will find here all the events you have created or of which you are a participant.": "Hier finden Sie alle Ereignisse, die Sie erstellt haben oder an denen Sie beteiligt sind.",
   "You wish to participate to the following event": "Sie möchten an der folgenden Veranstaltung teilnehmen",
   "You'll get a weekly recap every Monday for upcoming events, if you have any.": "Sie erhalten jeden Montag eine Benachrichtigung über Ihre anstehenden Veranstaltungen.",
+  "You'll need to change the URLs where there were previously entered.": "Sie müssen die URLs überall dort ändern, wo sie zuvor eingetragen wurden.",
   "You'll need to transmit the group URL so people may access the group's profile.": "Du musst die Adresse (URL) der Gruppe weitergeben, um Leuten Zugriff auf das Gruppenprofil zu geben.",
   "You'll need to transmit the group URL so people may access the group's profile. The group won't be findable in Mobilizon's search or regular search engines.": "Sie müssen die Gruppen-URL übertragen, damit andere Personen auf das Profil der Gruppe zugreifen können. Die Gruppe wird nicht in der Mobilizonsuche oder in normalen Suchmaschinen gefunden.",
   "You'll receive a confirmation email.": "Sie erhalten eine Bestätigungsmail.",
@@ -934,6 +993,7 @@
   "Your account has been validated": "Ihr Account wurde validiert",
   "Your account is being validated": "Ihr Account wird validiert",
   "Your account is nearly ready, {username}": "Ihr Account ist fast bereit, {username}",
+  "Your city or region and the radius will only be used to suggest you events nearby. The event radius will consider the administrative center of the area.": "Ihr Ort, Landkreis oder Bundesland wird nur genutzt um Ihnen Veranstaltungen in Ihrer Nähe anzuzeigen. Der Veranstaltungsradius berücksichtigt den Verwaltungssitz des Gebietes.",
   "Your current email is {email}. You use it to log in.": "Ihre aktuelle E-Mail-Adresse ist {email}. Diese kann zum Anmelden verwendet werden.",
   "Your email": "Ihre E-Mail",
   "Your email address was automatically set based on your {provider} account.": "Ihre E-Mail-Adresse wurde automatisch basierend auf Ihrem {provider}-Account gesetzt.",
@@ -959,7 +1019,7 @@
   "Your timezone is currently set to {timezone}.": "Ihre Zeitzone ist aktuell {timezone}.",
   "Your timezone was detected as {timezone}.": "Ihre Zeitzone wurde erkannt als {timezone}.",
   "Your timezone {timezone} isn't supported.": "Ihre Zeitzone {timezone} wird nicht unterstützt.",
-  "Your upcoming events": "Deine bevorstehenden Veranstaltungen",
+  "Your upcoming events": "Ihre bevorstehenden Veranstaltungen",
   "[This comment has been deleted by it's author]": "[Dieser Kommentar wurde vom Autor entfernt]",
   "[This comment has been deleted]": "[Ihr Kommentar wurde gelöscht]",
   "[deleted]": "[gelöscht]",
@@ -1022,15 +1082,36 @@
   "{number} organized events": "Keine organisierten Veranstaltungen|Eine organisierte Veranstaltung|{number} organisierte Veranstaltungen",
   "{number} participations": "Keine Teilnehmer|Ein Teilnehmer|{number} Teilnehmer",
   "{number} posts": "Keine Beiträge |Ein Beitrag|{number} Beiträge",
+  "{old_group_name} was renamed to {group}.": "{old_group_name} wurde in {group} umbenannt.",
   "{profile} (by default)": "{profile} (Standard)",
   "{profile} added the member {member}.": "{profile} hat das Mitglied {member} hinzugefügt.",
+  "{profile} archived the discussion {discussion}.": "{profile} hat die Diskussion {discussion} archiviert.",
+  "{profile} created the discussion {discussion}.": "{profile} hat die Diskussion {discussion} erstellt.",
+  "{profile} created the folder {resource}.": "{profile} hat den Ordner {resource} erstellt.",
+  "{profile} created the group {group}.": "{profile} hat die Gruppe {group} erstellt.",
+  "{profile} created the resource {resource}.": "{profile} hat die Ressource {resource} erstellt.",
+  "{profile} deleted the discussion {discussion}.": "{profile} hat die Diskussion {discussion} gelöscht.",
+  "{profile} deleted the folder {resource}.": "{profile} hat den Ordner {resource} gelöscht.",
+  "{profile} deleted the resource {resource}.": "{profile} hat die Ressource {resource} gelöscht.",
   "{profile} demoted {member} to an unknown role.": "{profile} hat {member} zu einer unbekannten Rolle zurückgestuft.",
   "{profile} demoted {member} to moderator.": "{profile} hat {member} zum/zur Moderator/in zurückgestuft.",
   "{profile} demoted {member} to simple member.": "{profile} hat {member} zu einem einfachen Mitglied zurückgestuft.",
   "{profile} excluded member {member}.": "{profile} hat {member} ausgeschlossen.",
+  "{profile} moved the folder {resource} into {new_path}.": "{profile} hat den Ordner {resource} nach {new_path} verschoben.",
+  "{profile} moved the folder {resource} to the root folder.": "{profile} hat den Ordner {resource} in das Root-Verzeichnis verschoben.",
+  "{profile} moved the resource {resource} into {new_path}.": "{profile} hat die Ressource {resource} nach {new_path} verschoben.",
+  "{profile} moved the resource {resource} to the root folder.": "{profile} hat die Ressource {resource} in das Root-Verzeichnis verschoben.",
+  "{profile} posted a comment on the event {event}.": "{profile} hat die Veranstaltung {event} kommentiert.",
   "{profile} promoted {member} to administrator.": "{profile} hat {member} zum/zur Administrator/in befördert.",
   "{profile} promoted {member} to an unknown role.": "{profile} hat {member} zu einer unbekannten Rolle befördert.",
   "{profile} promoted {member} to moderator.": "{profile} hat {member} zum/zur Moderator/in befördert.",
+  "{profile} quit the group.": "{profile} hat die Gruppe verlassen.",
+  "{profile} renamed the discussion from {old_discussion} to {discussion}.": "{profile} hat die Diskussion {old_discussion} in {discussion} umbenannt.",
+  "{profile} renamed the folder from {old_resource_title} to {resource}.": "{profile} hat den Ordner {old_resource_title} in {resource} umbenannt.",
+  "{profile} renamed the resource from {old_resource_title} to {resource}.": "{profile} hat die Ressource {old_resource_title} in {resource} umbenannt.",
+  "{profile} replied to a comment on the event {event}.": "{profile} hat auf ein Kommentar in der Veranstaltung {event} geantwortet.",
+  "{profile} replied to the discussion {discussion}.": "{profile} hat auf die Diskussion {discussion} geantwortet.",
+  "{profile} updated the group {group}.": "{profile} hat die Gruppe {group} aktualisiert.",
   "{profile} updated the member {member}.": "{profile} hat {member} aktualisiert.",
   "{title} ({count} todos)": "{title} ({count} To-dos)",
   "{username} was invited to {group}": "{username} wurde zu {group} eingeladen",

js/src/i18n/en_US.json

@@ -425,7 +425,7 @@
   "This identity is not a member of any group.": "This identity is not a member of any group.",
   "(Masked)": "(Masked)",
   "{available}/{capacity} available places": "No places left|{available}/{capacity} available places",
-  "No one is going to this event": "No one is going to this event|One person going|{going} persons going",
+  "No one is participating|One person participating|{going} people participating": "No one is participating|One person participating|{going} people participating",
   "By @{group}": "By @{group}",
   "Date and time": "Date and time",
   "Location": "Location",
@@ -858,7 +858,7 @@
   "Your upcoming events": "Your upcoming events",
   "Last published events": "Last published events",
   "On {instance}": "On {instance}",
-  "Close events": "Close events",
+  "Events nearby": "Events nearby",
   "Within {number} kilometers of {place}": "|Within one kilometer of {place}|Within {number} kilometers of {place}",
   "@{username}": "@{username}",
   "Yesterday": "Yesterday",
@@ -979,5 +979,16 @@
   "Personal feeds": "Personal feeds",
   "These feeds contain event data for the events for which any of your profiles is a participant or creator. You should keep these private. You can find feeds for specific profiles on each profile edition page.": "These feeds contain event data for the events for which any of your profiles is a participant or creator. You should keep these private. You can find feeds for specific profiles on each profile edition page.",
   "The event will show as attributed to this profile.": "The event will show as attributed to this profile.",
-  "You may show some members as contacts.": "You may show some members as contacts."
+  "You may show some members as contacts.": "You may show some members as contacts.",
+  "The selected picture is too heavy. You need to select a file smaller than {size}.": "The selected picture is too heavy. You need to select a file smaller than {size}.",
+  "Unable to create the group. One of the pictures may be too heavy.": "Unable to create the group. One of the pictures may be too heavy.",
+  "Unable to update the profile. The avatar picture may be too heavy.": "Unable to update the profile. The avatar picture may be too heavy.",
+  "Unable to create the profile. The avatar picture may be too heavy.": "Unable to create the profile. The avatar picture may be too heavy.",
+  "Error while loading the preview": "Error while loading the preview",
+  "Instance feeds": "Instance feeds",
+  "{moderator} suspended group {profile}": "{moderator} suspended group {profile}",
+  "{moderator} has unsuspended group {profile}": "{moderator} has unsuspended group {profile}",
+  "{moderator} has done an unknown action": "{moderator} has done an unknown action",
+  "{moderator} has deleted a comment from {author} under the event {event}": "{moderator} has deleted a comment from {author} under the event {event}",
+  "{moderator} has deleted a comment from {author}": "{moderator} has deleted a comment from {author}"
 }

js/src/i18n/es.json

@@ -138,7 +138,7 @@
   "Click to upload": "Haz clic para subir (upload)",
   "Close": "Cerrar",
   "Close comments for all (except for admins)": "Cerrar comentarios para todos (excepto para administradores)",
-  "Close events": "Eventos cercanos",
+  "Events nearby": "Eventos cercanos",
   "Closed": "Cerrado",
   "Collections": "Colecciones",
   "Comment deleted": "Comentario borrado",
@@ -273,6 +273,7 @@
   "Error stacktrace": "Seguimiento de errores",
   "Error while changing email": "Error al cambiar el correo electrónico",
   "Error while communicating with the server.": "Error al comunicarse con el servidor.",
+  "Error while loading the preview": "Error al cargar la vista previa",
   "Error while login with {provider}. Retry or login another way.": "Error al iniciar sesión con {provider}. Vuelva a intentarlo o inicie sesión de otra manera.",
   "Error while login with {provider}. This login provider doesn't exist.": "Error al iniciar sesión con {provider}. Este proveedor de inicio de sesión no existe.",
   "Error while reporting group {groupTitle}": "Error al informar sobre el grupo {groupTitle}",
@@ -396,6 +397,7 @@
   "Instance Terms URL": "URL de Términos de Instancia",
   "Instance administrator": "Administrador de instancia",
   "Instance configuration": "Configuración de instancia",
+  "Instance feeds": "Flujos de instancias",
   "Instance languages": "Idiomas de instancia",
   "Instance rules": "Reglas de instancia",
   "Instance settings": "Configuraciones de instancia",
@@ -519,7 +521,6 @@
   "No moderation logs yet": "Aún no hay registros de moderación",
   "No more activity to display.": "No hay más actividad para mostrar.",
   "No notification settings yet": "Aún no hay configuración de notificaciones",
-  "No one is going to this event": "Nadie asistirá a este evento|Una persona irá|{going} irán personas",
   "No ongoing todos": "No hay tareas pendientes (\"to-do\") en marcha",
   "No open reports yet": "Aún no hay informes abiertos",
   "No participant matches the filters": "Ningún participante coincide con los filtros",
@@ -793,6 +794,7 @@
   "The post {post} was deleted by {profile}.": "La publicación {post} ha sido borrada por {profile}.",
   "The post {post} was updated by {profile}.": "La publicación {post} ha sido actualizada por {profile}.",
   "The report will be sent to the moderators of your instance. You can explain why you report this content below.": "El informe se enviará a los moderadores de su instancia. Puede explicar por qué declara este contenido a continuación.",
+  "The selected picture is too heavy. You need to select a file smaller than {size}.": "La imagen seleccionada es demasiado pesada. Debe seleccionar un archivo menor que {size}.",
   "The technical details of the error can help developers solve the problem more easily. Please add them to your feedback.": "Los detalles técnicos del error pueden ayudar a los desarrolladores a resolver el problema más fácilmente. Agrégalos a tus comentarios.",
   "The user account you're trying to login as has not been confirmed yet. Check your email inbox and eventually your spam folder.": "La cuenta de usuario que está intentando iniciar sesión aún no se ha confirmado. Verifique su bandeja de entrada de correo electrónico y eventualmente su carpeta de correo no deseado.",
   "The username is a unique identifier of your account on this and all the other instances. It's as unique as an email address, which makes it easy for other people to interact with it.": "El nombre de usuario es un identificador único de su cuenta en esta y todas las demás instancias. Es tan único como una dirección de correo electrónico, lo que facilita que otras personas interactúen con él.",
@@ -851,9 +853,12 @@
   "URL": "URL",
   "URL copied to clipboard": "URL copiada al portapapeles",
   "Unable to copy to clipboard": "No se puede copiar al portapapeles",
+  "Unable to create the group. One of the pictures may be too heavy.": "No se pudo crear el grupo. Es posible que una de las imágenes sea demasiado pesada.",
+  "Unable to create the profile. The avatar picture may be too heavy.": "No se pudo crear el perfil. Es posible que la imagen del avatar sea demasiado pesada.",
   "Unable to detect timezone.": "No se pudo detectar la zona horaria.",
   "Unable to load event for participation. The error details are provided below:": "No se puede cargar el evento para participar. Los detalles del error se proporcionan a continuación:",
   "Unable to save your participation in this browser.": "No se puede guardar su participación en este navegador.",
+  "Unable to update the profile. The avatar picture may be too heavy.": "No se pudo actualizar el perfil. Es posible que la imagen del avatar sea demasiado pesada.",
   "Unfortunately, this instance isn't opened to registrations": "Desafortunadamente, esta instancia no está abierta a registros",
   "Unfortunately, your participation request was rejected by the organizers.": "Lamentablemente, su solicitud de participación fue rechazada por los organizadores.",
   "Unknown": "Desconocido",

js/src/i18n/fi.json

@@ -480,7 +480,6 @@
   "No message": "Ei viestiä",
   "No moderation logs yet": "Moderointilokia ei vielä ole",
   "No notification settings yet": "Ei vielä ilmoitusasetuksia",
-  "No one is going to this event": "Kukaan ei ole menossa tähän tapahtumaan|Yksi henkilö menossa|{going} henkilöä menossa",
   "No ongoing todos": "Ei keskeneräisiä tehtäviä",
   "No open reports yet": "Avoimia raportteja ei vielä ole",
   "No participant matches the filters": "Ei suodattimia vastaavia osallistujia",

js/src/i18n/fr_FR.json

@@ -128,7 +128,7 @@
   "Click to upload": "Cliquez pour téléverser",
   "Close": "Fermé",
   "Close comments for all (except for admins)": "Fermer les commentaires à tout le monde (excepté les administrateur⋅rice·s)",
-  "Close events": "Événements proches",
+  "Events nearby": "Événements proches",
   "Closed": "Fermé",
   "Comment deleted": "Commentaire supprimé",
   "Comment from @{username} reported": "Commentaire de @{username} signalé",
@@ -479,7 +479,7 @@
   "No message": "Pas de message",
   "No moderation logs yet": "Pas encore de journaux de modération",
   "No more activity to display.": "Il n'y a plus d'activités à afficher.",
-  "No one is going to this event": "Personne n'y va|Une personne y va|{going} personnes y vont",
+  "No one is participating|One person participating|{going} people participating": "Personne ne participe|Une personne participe|{going} personnes participent",
   "No ongoing todos": "Pas de todos en cours",
   "No open reports yet": "Aucun signalement ouvert pour le moment",
   "No participant matches the filters": "Aucun·e participant·e ne correspond aux filtres",
@@ -1073,5 +1073,16 @@
   "Personal feeds": "Flux personnels",
   "These feeds contain event data for the events for which any of your profiles is a participant or creator. You should keep these private. You can find feeds for specific profiles on each profile edition page.": "Ces flux contiennent des informations sur les événements pour lesquels n'importe lequel de vos profils est un⋅e participant⋅e ou un⋅e créateur⋅ice. Vous devriez les garder privés. Vous pouvez trouver des flux spécifiques à chaque profil sur la page d'édition des profils.",
   "The event will show as attributed to this profile.": "L'événement sera affiché comme attribué à ce profil.",
-  "You may show some members as contacts.": "Vous pouvez afficher certain⋅es membres en tant que contacts."
+  "You may show some members as contacts.": "Vous pouvez afficher certain⋅es membres en tant que contacts.",
+  "The selected picture is too heavy. You need to select a file smaller than {size}.": "L'image sélectionnée est trop lourde. Vous devez sélectionner un fichier de moins de {size}.",
+  "Unable to create the group. One of the pictures may be too heavy.": "Impossible de créer le groupe. Une des images est trop lourde.",
+  "Unable to update the profile. The avatar picture may be too heavy.": "Impossible de mettre à jour le profil. L'image d'avatar est probablement trop lourde.",
+  "Unable to create the profile. The avatar picture may be too heavy.": "Impossible de créer le profil. L'image d'avatar est probablement trop lourde.",
+  "Error while loading the preview": "Erreur lors du chargement de l'aperçu",
+  "Instance feeds": "Flux de l'instance",
+  "{moderator} suspended group {profile}": "{moderator} a suspendu le groupe {profile}",
+  "{moderator} has unsuspended group {profile}": "{moderator} a annulé la suspension du groupe {profile}",
+  "{moderator} has done an unknown action": "{moderator} a effectué une action inconnue",
+  "{moderator} has deleted a comment from {author} under the event {event}": "{moderator} a supprimé un commentaire de {author} sous l'événement {event}",
+  "{moderator} has deleted a comment from {author}": "{moderator} a supprimé un commentaire de {author}"
 }

js/src/i18n/gd.json

@@ -122,7 +122,7 @@
   "Click to upload": "Briog airson luchdadh suas",
   "Close": "Dùin",
   "Close comments for all (except for admins)": "Dùin na beachdan dhan a h-uile duine (ach rianairean)",
-  "Close events": "Tachartasan am fagas",
+  "Events nearby": "Tachartasan am fagas",
   "Closed": "Dùinte",
   "Comment deleted": "Chaidh am beachd a sguabadh às",
   "Comment from @{username} reported": "Chaidh gearan a dhèanamh mu bheachd le @{username}",
@@ -179,7 +179,7 @@
   "Delete": "Sguab às",
   "Delete Comment": "Sguab às am beachd",
   "Delete Event": "Sguab às an tachartas",
-  "Delete account": "Sguab à an cunntas",
+  "Delete account": "Sguab às an cunntas",
   "Delete conversation": "Sguab às an còmhradh",
   "Delete discussion": "Sguab às an deasbad",
   "Delete event": "Sguab às an tachartas",
@@ -447,7 +447,6 @@
   "No message": "Chan eil teachdaireachd ann",
   "No moderation logs yet": "Chan eil loga maorsainneachd ann fhathast",
   "No more activity to display.": "Chan eil barrachd ghnìomhan ri an sealltainn ann.",
-  "No one is going to this event": "Thèid {going} ann|Thèid {going} ann|Thèid {going} ann|Thèid {going} ann",
   "No open reports yet": "Chan eil gearan gun fhuasgladh ann",
   "No participant matches the filters": "Chan eil com-pàirtiche sam bith a’ maidseadh nan criathragan",
   "No participant to approve|Approve participant|Approve {number} participants": "Aontaich ri {number} chom-pàirtiche|Aontaich ri {number} chom-pàirtiche|Aontaich ri {number} com-pàirtichean|Aontaich ri {number} com-pàirtiche",

js/src/i18n/gl.json

@@ -131,7 +131,7 @@
   "Click to upload": "Preme para subir",
   "Close": "Pechar",
   "Close comments for all (except for admins)": "Pechar comentarios para todos (excepto admins)",
-  "Close events": "Pechar eventos",
+  "Events nearby": "Pechar eventos",
   "Closed": "Pechado",
   "Comment deleted": "Comentario eliminado",
   "Comment from @{username} reported": "Comentario de @{username} denunciado",
@@ -257,6 +257,7 @@
   "Error stacktrace": "Informe do erro",
   "Error while changing email": "Fallo ó cambiar o email",
   "Error while communicating with the server.": "Fallo de comunicación co servidor.",
+  "Error while loading the preview": "Fallo ao subir a vista previa",
   "Error while login with {provider}. Retry or login another way.": "Erro ó conectar con {provider}. Reintentar ou conectar doutro xeito.",
   "Error while login with {provider}. This login provider doesn't exist.": "Erro ó conectar con {provider}. Este provedor podería non existir.",
   "Error while reporting group {groupTitle}": "Erro ó denunciar o grupo {groupTitle}",
@@ -373,6 +374,7 @@
   "Instance Terms URL": "URL dos Termos da instancia",
   "Instance administrator": "Administradora da instancia",
   "Instance configuration": "Configuración da instancia",
+  "Instance feeds": "Fontes da instancia",
   "Instance languages": "Idiomas da instancia",
   "Instance rules": "Normas da instancia",
   "Instance settings": "Axustes da instancia",
@@ -491,7 +493,6 @@
   "No message": "Sen mensaxe",
   "No moderation logs yet": "Sen rexistros da moderación",
   "No more activity to display.": "Sen máis actividade que amosar.",
-  "No one is going to this event": "Ninguén vai a este evento|Unha persoa vai ir|{going} persoas van ir",
   "No open reports yet": "Aínda non se presentaron denuncias",
   "No participant matches the filters": "Ningún participante para estos filtros",
   "No participant to approve|Approve participant|Approve {number} participants": "Sen participantes que aprobar|Aprobar participante|Aprobar {number} participantes",
@@ -739,6 +740,7 @@
   "The post {post} was deleted by {profile}.": "A publicación {post} foi eliminada por {profile}.",
   "The post {post} was updated by {profile}.": "A publicación {post} foi actualizada por {profile}.",
   "The report will be sent to the moderators of your instance. You can explain why you report this content below.": "A denuncia vaise enviar á moderación da instancia. Podes explicar aquí abaixo as razóns para denunciar.",
+  "The selected picture is too heavy. You need to select a file smaller than {size}.": "A imaxe seleccionada é demasiado grande. Debes escoller un ficheiro menor de {size}.",
   "The technical details of the error can help developers solve the problem more easily. Please add them to your feedback.": "Os detalles técnicos do erro axudan ás desenvolvedoras a solucionar o problema máis facilmente. Engádeos ao teu informe.",
   "The {default_privacy_policy} will be used. They will be translated in the user's language.": "Vaise usar a {default_privacy_policy} e será traducida ó idioma da usuaria.",
   "The {default_terms} will be used. They will be translated in the user's language.": "Serán utilizados os {default_terms}. Serán traducidos ó idioma da usuaria.",
@@ -790,9 +792,12 @@
   "URL": "URL",
   "URL copied to clipboard": "URL copiado ó portapapeis",
   "Unable to copy to clipboard": "Non se puido copiar ao portapapeis",
+  "Unable to create the group. One of the pictures may be too heavy.": "Non se puido crear o grupo. Unha das imaxes podería ser demasiado grande.",
+  "Unable to create the profile. The avatar picture may be too heavy.": "Non se puido crear o perfil. A imaxe do avatar podería ser demasiado grande.",
   "Unable to detect timezone.": "Non se detectou a zona horaria.",
   "Unable to load event for participation. The error details are provided below:": "Non se puido cargar a participación no evento. Aquí abaixo tes detalles do erro:",
   "Unable to save your participation in this browser.": "Non se puido gardar a túa participación neste navegador.",
+  "Unable to update the profile. The avatar picture may be too heavy.": "Non se puido actualizar o perfil. A imaxe do avatar podería ser demasiado grande.",
   "Unfortunately, this instance isn't opened to registrations": "Desgraciadamente esta instancia non ten aberto o rexistro",
   "Unfortunately, your participation request was rejected by the organizers.": "Desgraciadamente a túa solicitude de participación foi rexeitada pola organización.",
   "Unknown": "Descoñecido",

js/src/i18n/hu.json

@@ -127,7 +127,7 @@
   "Click to upload": "Kattintson a feltöltéshez",
   "Close": "Lezárás",
   "Close comments for all (except for admins)": "Hozzászólások lezárása mindenkinél (kivéve az adminisztrátoroknál)",
-  "Close events": "Események bezárása",
+  "Events nearby": "Események bezárása",
   "Closed": "Lezárva",
   "Comment deleted": "Hozzászólás törölve",
   "Comment from @{username} reported": "@{username} felhasználótól érkezett hozzászólás jelentve",
@@ -462,7 +462,6 @@
   "No message": "Nincs üzenet",
   "No moderation logs yet": "Még nincsenek moderálási naplók",
   "No more activity to display.": "Nincs több megjelenítendő tevékenység.",
-  "No one is going to this event": "Senki sem jön erre az eseményre|Egy személy jön|{going} személy jön",
   "No open reports yet": "Még nincsenek nyitott jelentések",
   "No participant matches the filters": "Nincs a szűrőkre illeszkedő résztvevő",
   "No participant to approve|Approve participant|Approve {number} participants": "Nincs jóváhagyandó résztvevő|Résztvevő jóváhagyása|{number} résztvevő jóváhagyása",

js/src/i18n/it.json

@@ -10,7 +10,9 @@
   "<b>Please do not use it in any real way.</b>": "<b>Non puoi ancora usarlo per pubblicizzare eventi reali!</b>",
   "<b>{contact}</b> will be displayed as contact.": "<b>{contact}</b> verrà visualizzato come contatto.|<b>{contact}</b> verranno visualizzati come contatti.",
   "@{group}": "@{group}",
+  "@{username}": "@{username}",
   "@{username} ({role})": "@{username} ({role})",
+  "@{username}'s follow request was rejected": "La richiesta di follow a @{username} è stata respinta",
   "A cookie is a small file containing information that is sent to your computer when you visit a website. When you visit the site again, the cookie allows that site to recognize your browser. Cookies may store user preferences and other information. You can configure your browser to refuse all cookies. However, this may result in some website features or services partially working. Local storage works the same way but allows you to store more data.": "Un cookie è un piccolo file contenente informazioni che vengono inviate al tuo computer quando visiti un sito web. Quando visiti nuovamente il sito, il cookie consente a quel sito di riconoscere il tuo browser. I cookie possono memorizzare le preferenze dell'utente e altre informazioni. Puoi configurare il tuo browser per rifiutare tutti i cookie. Tuttavia, ciò potrebbe comportare il funzionamento parziale di alcune funzionalità o servizi del sito Web. L'archiviazione locale funziona allo stesso modo ma consente di archiviare più dati.",
   "A federated software": "Un software federato",
   "A place for your code of conduct, rules or guidelines. You can use HTML tags.": "Un posto per il codice di condotta, le regole o le linee guida. Puoi uare tag HTML.",
@@ -57,10 +59,11 @@
   "Administrator": "Amministratore",
   "All good, let's continue!": "Tutto a posto, continuiamo!",
   "All group members and other eventual server admins will still be able to view this information.": "Tutti i membri del gruppo e altri eventuali amministratori del server potranno comunque visualizzare queste informazioni.",
-  "All the places have already been taken": "Tutti i posti sono stati occupati|Un posto è ancora disponibile|{places} i posti sono ancora disponibili",
+  "All the places have already been taken": "Tutti i posti sono stati già occupati",
   "Allow all comments": "Permetti a tutti di commentare",
   "Allow all comments from users with accounts": "Consenti tutti i commenti degli utenti che hanno effettuato l'accesso",
   "Allow registrations": "Consenti registrazioni",
+  "An error has occured. Sorry about that. You may try to reload the page.": "Si è verificato un errore. Ci scusiamo. Potresti provare a ricaricare la pagina.",
   "An error has occurred.": "C'è stato un errore.",
   "An ethical alternative": "Un'alternativa etica",
   "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.": "Un'istanza è una versione installata del software Mobilizon in esecuzione su un server. Un istanza può essere gestita da chiunque utilizzi il {mobilizon_software} o un altre apps federate, note anche come \"fediverso\". Il nome di quest'istanza è {instance_name}. Mobilizon è una rete federata di più istanze (roprio come i server e-mail), utenti registrati su istanze diverse possono comunque comunicare anche se non si sono registrati nella stessa istanza.",
@@ -86,6 +89,7 @@
   "Are you sure you want to delete this event? This action cannot be reverted.": "Sei sicuro di voler cancellare questo evento? Questa azione è irreversibile.",
   "As the event organizer has chosen to manually validate participation requests, your participation will be really confirmed only once you receive an email stating it's being accepted.": "Poiché chi organizza l'evento ha scelto di approvare manualmente le richieste di partecipazione, la tua partecipazione sarà realmente confermata una volta che riceverai una mail che indica che è stata accettata.",
   "Assigned to": "Assegnato a",
+  "Atom feed for events and posts": "Atom feed per eventi e messaggi",
   "Avatar": "Avatar",
   "Back to previous page": "Torna alla pagina precedente",
   "Banner": "Banner",
@@ -113,6 +117,7 @@
   "Change password": "Cambia password",
   "Change timezone": "Cambia il fuso orario",
   "Check your inbox (and your junk mail folder).": "Controlla la tua casella di posta (e la cartella della posta indesiderata).",
+  "City or region": "Città o regione",
   "Clear": "Sgombra",
   "Clear participation data for all events": "Rimuovi dati di partecipazione per tutti gli eventi",
   "Clear participation data for this event": "Rimuovi dati di partecipazione per questo evento",
@@ -137,6 +142,7 @@
   "Contact": "Contatta",
   "Continue editing": "Continua la modifica",
   "Cookies and Local storage": "Cookie e memoria locale",
+  "Copy details to clipboard": "Copia i dettagli negli appunti",
   "Country": "Paese",
   "Create": "Crea",
   "Create a calc": "Crea un calc",
@@ -231,6 +237,9 @@
   "Enter your own privacy policy. HTML tags allowed. The {mobilizon_privacy_policy} is provided as template.": "Inserisci la tua politica sulla riservatezza. Tag HTML consentiti. La {mobilizon_privacy_policy} viene fornita come modello.",
   "Enter your own terms. HTML tags allowed. The {mobilizon_terms} are provided as template.": "Inserisci i tuoi termini. Tag HTML consentiti. I {mobilizon_terms} sono forniti come modello.",
   "Error": "Errore",
+  "Error details copied!": "Dettagli dell'errore copiati!",
+  "Error message": "Messaggio di errore",
+  "Error stacktrace": "Stacktrace dell'errore",
   "Error while changing email": "Errore nel cambiamento della mail",
   "Error while login with {provider}. Retry or login another way.": "Si è verifcato un errore durante il login con {providel}. Riprova o fai il login in altro modo.",
   "Error while login with {provider}. This login provider doesn't exist.": "Si è verificato un errore durante il login con {provider}. Questo provider non esiste.",
@@ -249,6 +258,7 @@
   "Event {eventTitle} deleted": "Evento {eventTitle} rimosso",
   "Event {eventTitle} reported": "Evento {eventTitle} segnalato",
   "Events": "Eventi",
+  "Events nearby": "Eventi nelle vicinanze",
   "Events tagged with {tag}": "Eventi contrassegnati con {tag}",
   "Everything": "Tutti",
   "Ex: mobilizon.fr": "Es: mobilizon.fr",
@@ -311,6 +321,8 @@
   "I participate": "Parteciperò",
   "I want to allow people to participate without an account.": "Voglio permettere alle persone di partecipare senza un account.",
   "I want to approve every participation request": "Voglio approvare ogni richiesta di partecipazione",
+  "ICS feed for events": "Feed ICS per eventi",
+  "ICS/WebCal Feed": "Feed ICS/WebCal",
   "Identity {displayName} created": "Identità {displayName} creata",
   "Identity {displayName} deleted": "Identità {displayName} eliminata",
   "Identity {displayName} updated": "Identità {displayName} aggiornata",
@@ -345,6 +357,7 @@
   "Invite a new member": "Invita un nuovo membro",
   "Invite member": "Invita membro",
   "Invited": "Invitato",
+  "It is possible that the content is not accessible on this instance, because this instance has blocked the profiles or groups behind this content.": "È possibile che il contenuto non sia accessibile su questa istanza, perché questa istanza ha bloccato i profili o i gruppi che stanno dietro questo contenuto.",
   "Italic": "Corsivo",
   "Join <b>{instance}</b>, a Mobilizon instance": "Entra in <b>{instance}</b>, un'istanza di Mobilizon",
   "Join group": "Unisciti al gruppo",
@@ -354,6 +367,7 @@
   "Last IP adress": "Ultimo indirizzo IP",
   "Last group created": "Ultimo gruppo creato",
   "Last published event": "Ultimo evento pubblicato",
+  "Last published events": "Ultimi eventi pubblicati",
   "Last sign-in": "Ultimo accesso",
   "Last week": "Ultima settimana",
   "Latest posts": "Ultimi post",
@@ -440,7 +454,7 @@
   "No member matches the filters": "Nessun membro corrisponde ai filtri",
   "No message": "Nessun messaggio",
   "No moderation logs yet": "Ancora nessun registro di moderazione",
-  "No one is going to this event": "Nessuno va a questo evento|Va una persona|Vanno {going} persone",
+  "No more activity to display.": "Non ci sono più attività da visualizzare.",
   "No open reports yet": "Ancora nessuna segnalazione aperta",
   "No participant matches the filters": "Nessun partecipante corrisponde ai filtri",
   "No participant to approve|Approve participant|Approve {number} participants": "Nessun partecipante da approvare|Approva partecipante|Approva {number} partecipanti",
@@ -472,13 +486,17 @@
   "On {date} ending at {endTime}": "Il {date} finendo alle {endTime}",
   "On {date} from {startTime} to {endTime}": "Il {date} dalle {startTime} alle {endTime}",
   "On {date} starting at {startTime}": "Il {date} iniziando alle {startTime}",
+  "On {instance}": "Su {instance}",
   "Only accessible through link": "Accessibile solo attraverso il collegamento",
   "Only accessible through link (private)": "Accessibile solo tramite link (privato)",
   "Only accessible to members of the group": "Accessibile solo ai membri del gruppo",
   "Only alphanumeric characters and underscores are supported.": "Solo caratteri alfanumerici e trattini bassi sono supportati.",
   "Only alphanumeric lowercased characters and underscores are supported.": "Sono accettati solo caratteri alfanumerici in minuscolo, e il tratto basso (underscore).",
+  "Only group members can access discussions": "Solo i membri del gruppo possono accedere alle discussioni",
   "Only group moderators can create, edit and delete posts.": "Solo i moderatori del gruppo possono creare, modificare ed eliminare i post.",
   "Open": "Aperto/a",
+  "Open a topic on our forum": "Apri una discussione sul nostro forum",
+  "Open an issue on our bug tracker (advanced users)": "Apri una issue sul nostro bug tracker (utenti avanzati)",
   "Opened reports": "Segnalazioni aperte",
   "Or": "Oppure",
   "Organized": "Organizzato",
@@ -513,6 +531,7 @@
   "Pick a profile or a group": "Scegli un profilo o un gruppo",
   "Pick an identity": "Scegli un'identità",
   "Pick an instance": "Scegli un'istanza",
+  "Please add as many details as possible to help identify the problem.": "Si prega di aggiungere quanti più dettagli possibili per aiutare a identificare il problema.",
   "Please check your spam folder if you didn't receive the email.": "Per favore verifica la tua cartella di posta indesiderata (spam) se non hai ricevuto la mail.",
   "Please contact this instance's Mobilizon admin if you think this is a mistake.": "Per favore contatta l'amministrazione di Mobilizon di questa istanza se pensi che questo sia un errore.",
   "Please do not use it in any real way.": "Si prega di non utilizzare in nessun modo.",
@@ -589,6 +608,7 @@
   "Resource provided is not an URL": "La risorsa data non è un URL",
   "Resources": "Risorse",
   "Restricted": "Limitato",
+  "Return to the group page": "Ritorna alla pagina del gruppo",
   "Right now": "Proprio adesso",
   "Role": "Ruolo",
   "Rules": "Regole",
@@ -601,6 +621,7 @@
   "Searching…": "Ricerca…",
   "Search…": "Cerca…",
   "Select a language": "Seleziona una lingua",
+  "Select a radius": "Seleziona un raggio",
   "Select a timezone": "Seleziona un fuso orario",
   "Select languages": "Seleziona lingue",
   "Send email": "Manda email",
@@ -627,6 +648,7 @@
   "Suspend group": "Sospendi gruppo",
   "Suspended": "Sospeso",
   "Task lists": "Elenchi di attività",
+  "Technical details": "Dettagli tecnici",
   "Tentative": "Provvisorio",
   "Tentative: Will be confirmed later": "Provvisorio: sarà confermato più tardi",
   "Terms": "Condizioni",
@@ -647,6 +669,10 @@
   "The event will show as attributed to this group.": "L'evento verrà visualizzato come attribuito a questo gruppo.",
   "The event will show as attributed to your personal profile.": "L'evento verrà visualizzato come attribuito al tuo profilo personale.",
   "The event will show the group as organizer.": "L'evento mostrerà il gruppo come organizzatore.",
+  "The event {event} was created by {profile}.": "L'evento {event} è stato creato da {profile}.",
+  "The event {event} was deleted by {profile}.": "L'evento {event} è stato cancellato da {profile}.",
+  "The event {event} was updated by {profile}.": "L'evento {event} è stato aggiornato da {profile}.",
+  "The events you created are not shown here.": "Gli eventi che hai creato non vengono mostrati qui.",
   "The group will be publicly listed in search results and may be suggested in the explore section. Only public informations will be shown on it's page.": "Il gruppo verrà elencato pubblicamente nei risultati di ricerca e potrebbe essere suggerito nella sezione Esplora. Nella sua pagina verranno mostrate solo le informazioni pubbliche.",
   "The instance administrator is the person or entity that runs this Mobilizon instance.": "L'amministratore dell'istanza è la persona o entità che gestisce quest'istanza Mobilizon.",
   "The member was removed from the group {group}": "Il membro è stato rimosso dal gruppo {group}",
@@ -654,11 +680,17 @@
   "The organiser has chosen to close comments.": "L'organizzatore ha scelto di disabilitare i commenti.",
   "The page you're looking for doesn't exist.": "La pagina che stai cercando non esiste.",
   "The password was successfully changed": "La password è stata cambiata con successo",
+  "The post {post} was created by {profile}.": "Il post {post} è stato creato da {profile}.",
+  "The post {post} was deleted by {profile}.": "Il post {post} è stato cancellato da {profile}.",
+  "The post {post} was updated by {profile}.": "Il post {post} è stato aggiornato da {profile}.",
   "The report will be sent to the moderators of your instance. You can explain why you report this content below.": "La segnalazione sarà inviata a chi modera la tua istanza. Puoi spiegare perché segnali questo contenuto qua sotto.",
+  "The technical details of the error can help developers solve the problem more easily. Please add them to your feedback.": "I dettagli tecnici dell'errore possono aiutare gli sviluppatori a risolvere il problema più facilmente. Per favore aggiungili al tuo feedback.",
   "The {default_privacy_policy} will be used. They will be translated in the user's language.": "Verrà utilizzata la {default_privacy_policy}. Verranno tradotti nella lingua dell'utente.",
   "The {default_terms} will be used. They will be translated in the user's language.": "Saranno usate le {default_terms}. Saranno tradotte nel linguaggio dell'utente.",
   "There are {participants} participants.": "Ci sono {participants} partecipanti.",
+  "There is no activity yet. Start doing some things to see activity appear here.": "Non sono ancora presenti attività. Inizia a fare qualcosa per veder apparire le attività.",
   "There will be no way to recover your data.": "Non c'è modo di recuperare i tuoi dati.",
+  "There's no discussions yet": "Non sono presenti discussioni",
   "These events may interest you": "Questo evento potrebbe interessarti",
   "This Mobilizon instance and this event organizer allows anonymous participations, but requires validation through email confirmation.": "Questa istanza Mobilizon e chi organizza questo evento permettono la partecipazione anonima, ma richiedono una validazione tramite email di conferma.",
   "This URL is not supported": "Questo URL non è supportato",
@@ -697,6 +729,7 @@
   "Type or select a date…": "Digita o seleziona una data…",
   "URL": "URL",
   "URL copied to clipboard": "URL copiato negli appunti",
+  "Unable to copy to clipboard": "Impossibile copiare negli appunti",
   "Unable to detect timezone.": "Impossibile rilevare il fuso orario.",
   "Unable to load event for participation. The error details are provided below:": "Impossibile caricare l'evento per la partecipazione. Di seguito vengono forniti i dettagli dell'errore:",
   "Unable to save your participation in this browser.": "Impossibile salvare la tua partecipazione in questo browser.",
@@ -733,6 +766,7 @@
   "Visible everywhere on the web (public)": "Visibile ovunque dalla rete (pubblico)",
   "Waiting for organization team approval.": "In attesa dell'approvazione dal gruppo di organizzazione.",
   "Warning": "Avviso",
+  "We improve this software thanks to your feedback. To let us know about this issue, two possibilities (both unfortunately require user account creation):": "Miglioriamo questo software grazie ai tuoi feedback. Per comunicarci questo problema hai due possibilità (entrambe purtroppo richiedono la creazione di un account utente):",
   "We just sent an email to {email}": "Abbiamo appena mandato una mail a {email}",
   "We use your timezone to make sure you get notifications for an event at the correct time.": "Usiamo il tuo fuso orario per fare in modo che le notifiche per un evento ti arrivino al momento giusto.",
   "We will redirect you to your instance in order to interact with this event": "Ti reindirizzeremo alla tua istanza in modo da interagire con questo evento",
@@ -744,13 +778,16 @@
   "Welcome back {username}!": "Bentrovatə {username}!",
   "Welcome back!": "Bentrovatə!",
   "Welcome to Mobilizon, {username}!": "Benvenutə su Mobilizon, {username}!",
+  "What can I do to help?": "Che posso fare per aiutarti?",
   "When a moderator from the group creates an event and attributes it to the group, it will show up here.": "Quando un moderatore del gruppo crea un evento e lo attribuisce al gruppo, verrà visualizzato qui.",
   "Who can view this event and participate": "Chi può vedere questo evento e partecipare",
   "Who can view this post": "Chi può visualizzare questo post",
   "Who published {number} events": "Chi ha pubblicato {number} eventi",
   "Why create an account?": "Perchè creare un account?",
   "Will allow to display and manage your participation status on the event page when using this device. Uncheck if you're using a public device.": "Consentirà di visualizzare e gestire lo stato di partecipazione sulla pagina dell'evento quando si utilizza questo dispositivo. Deseleziona se stai utilizzando un dispositivo pubblico.",
+  "Within {number} kilometers of {place}": "|Entro un chilometro da {place}|Entro {number} chilometri da {place}",
   "Write something…": "Scrivi qualcosa…",
+  "Yesterday": "Ieri",
   "You are not an administrator for this group.": "Non sei un amministratore di questo gruppo.",
   "You are not part of any group.": "Non fai parte di nessun gruppo.",
   "You are participating in this event anonymously": "Stai partecipando a questo evento in forma anonima",
@@ -760,6 +797,13 @@
   "You can pick your timezone into your preferences.": "Puoi scegliere il tuo fuso orario nelle preferenze.",
   "You can try another search term or drag and drop the marker on the map": "Puoi provare un altro termine di ricerca o trascinare il marcatore sulla mappa",
   "You can't change your password because you are registered through {provider}.": "Non puoi cambiare la tua password perché sei registrato con {provider}.",
+  "You created the event {event}.": "Hai creato l'evento {event}.",
+  "You created the post {post}.": "Hai creato il post {post}.",
+  "You deleted the event {event}.": "Hai cancellato l'evento {event}.",
+  "You deleted the post {post}.": "Hai cancellato il post {post}.",
+  "You demoted the member {member} to an unknown role.": "Hai degradato {member} a un ruolo sconosciuto.",
+  "You demoted {member} to moderator.": "Hai degradato {member} a moderatore.",
+  "You demoted {member} to simple member.": "Hai degradato {member} a membro semplice.",
   "You didn't create or join any event yet.": "Non hai ancora creato o partecipato a nessun evento.",
   "You don't follow any instances yet.": "Non segui ancora nessuna istanza.",
   "You have been disconnected": "Sei stato disconnesso",
@@ -769,11 +813,19 @@
   "You have one event in {days} days.": "Non hai eventi in {days} giorni | Hai un evento in {days} giorni. | Hai {count} eventi in {days} giorni",
   "You have one event today.": "Non hai eventi oggi | Hai un evento oggi. | Hai {count} eventi oggi",
   "You have one event tomorrow.": "Non hai eventi domani | Hai un evento domani | Hai {count} eventi domani",
+  "You invited {member}.": "Hai invitato {member}.",
   "You may clear all participation information for this device with the buttons below.": "Puoi rimuovere tutte le informazioni di partecipazione da questo dispositivo col bottone qui sotto.",
   "You may now close this window, or {return_to_event}.": "Ora puoi chiudere questa finestra, o {return_to_event}.",
   "You may now close this window.": "Ora puoi chiudere questa finestra.",
   "You need to create the group before you create an event.": "Devi creare un gruppo prima di creare un evento.",
   "You need to login.": "Devi accedere.",
+  "You promoted the member {member} to an unknown role.": "Hai promosso l'utente {member} a un ruolo sconosciuto.",
+  "You promoted {member} to administrator.": "Hai promosso {member} ad amministratore.",
+  "You promoted {member} to moderator.": "Hai promosso {member} a moderatore.",
+  "You requested to join the group.": "Hai richiesto di unirti al gruppo.",
+  "You updated the event {event}.": "Hai aggiornato l'evento {event}.",
+  "You updated the member {member}.": "Hai aggiornato il membro {member}.",
+  "You updated the post {post}.": "Hai aggiornato il post {post}.",
   "You will be able to add an avatar and set other options in your account settings.": "Potrai aggiungere un avatar e impostare altre opzioni nelle impostazioni del tuo account.",
   "You will be redirected to the original instance": "Sarai reindirizzato verso l'istanza originale",
   "You will find here all the events you have created or of which you are a participant.": "Qui troverai tutti gli eventi che hai creato o di cui sei partecipante.",
@@ -785,6 +837,7 @@
   "Your account has been validated": "Il tuo account è stato validato",
   "Your account is being validated": "Il tuo account è in via di validazione",
   "Your account is nearly ready, {username}": "Il tuo account è quasi pronto, {username}",
+  "Your city or region and the radius will only be used to suggest you events nearby. The event radius will consider the administrative center of the area.": "La tua città o regione e il raggio saranno usati solo per suggerirti eventi nelle vicinanze. Il raggio dell'evento considererà il centro amministrativo della zona.",
   "Your current email is {email}. You use it to log in.": "La tua email attuale è {email}. La usi per accedere.",
   "Your email": "La tua email",
   "Your email address was automatically set based on your {provider} account.": "Il tuo indirizzo email è stato impostato automaticamente in base al tuo account {provider}.",
@@ -806,6 +859,7 @@
   "Your timezone is currently set to {timezone}.": "Il fuso orario è attualmente impostato su {timezone}.",
   "Your timezone was detected as {timezone}.": "Il tuo fuso orario è stato rilevato come {timezone}.",
   "Your timezone {timezone} isn't supported.": "Il tuo fuso orario {timezone} non è supportato.",
+  "Your upcoming events": "I tuoi prossimi eventi",
   "[This comment has been deleted by it's author]": "[Questo commento è stato eliminato dal suo autore]",
   "[This comment has been deleted]": "[Questo commento è stato eliminato]",
   "[deleted]": "[cancellato]",
@@ -835,11 +889,16 @@
   "with another identity…": "con altra identità…",
   "{approved} / {total} seats": "{approved} / {total} posti",
   "{available}/{capacity} available places": "Nessun posto rimasto|{available}/{capacity} posti rimasti",
+  "{count} km": "{count} km",
   "{count} participants": "Ancora nessun partecipante | Un partecipante | {counts} partecipanti",
   "{count} requests waiting": "{count} richieste in attesa",
   "{count} team members": "{count} membri del team",
+  "{group} activity timeline": "{group} cronologia delle attività",
   "{group}'s events": "{group} eventi",
   "{instanceName} is an instance of the {mobilizon} software.": "{instanceName} è un'istanza del software {mobilizon}.",
+  "{instanceName} is an instance of {mobilizon_link}, a free software built with the community.": "{instanceName} è un'istanza di {mobilizon_link}, un software libero costruito con la comunità.",
+  "{member} requested to join the group.": "{member} ha richiesto di unirsi al gruppo.",
+  "{member} was invited by {profile}.": "{member} è stato invitato da {profile}.",
   "{moderator} added a note on {report}": "ha aggiunto una nota su",
   "{moderator} closed {report}": "{moderator} ha chiuso {report}",
   "{moderator} deleted an event named \"{title}\"": "{moderator} ha cancellato un evento denominato \"{title}\"",
@@ -854,6 +913,13 @@
   "{number} participations": "Nessuna partecipazione|Una partecipazione|{number} partecipazioni",
   "{number} posts": "Nessun post|Un post|{number} di post",
   "{profile} (by default)": "{profile} (per impostazione predefinita)",
+  "{profile} demoted {member} to an unknown role.": "{profile} ha degradato {member} a un ruolo sconosciuto.",
+  "{profile} demoted {member} to moderator.": "{profile} ha degradato {member} a moderatore.",
+  "{profile} demoted {member} to simple member.": "{profile} ha degradato {member} a membro semplice.",
+  "{profile} promoted {member} to administrator.": "{profile} ha promosso {member} ad amministratore.",
+  "{profile} promoted {member} to an unknown role.": "{profile} ha promosso {member} a un ruolo sconosciuto.",
+  "{profile} promoted {member} to moderator.": "{profile} ha promosso {member} a moderatore.",
+  "{profile} updated the member {member}.": "{profile} ha aggiornato il membro {member}.",
   "{title} ({count} todos)": "{title} ({count} tutti)",
   "{username} was invited to {group}": "{username} è stato invitato a {group}",
   "© The OpenStreetMap Contributors": "© The OpenStreetMap Contributors"

js/src/i18n/kab.json

@@ -1 +1,185 @@
-{}
+{
+  "About": "Γef",
+  "Accept": "Qbel",
+  "Accepted": "Yettwaqbel",
+  "Account": "Amiḍan",
+  "Actions": "Actions",
+  "Activated": "Irmed",
+  "Active": "Urmid",
+  "Activity": "Armud",
+  "Add": "Rnu",
+  "Add a group": "Rnu agraw",
+  "Add a note": "Rnu tazmilt",
+  "Admin": "Anedbal",
+  "Administration": "Tadbelt",
+  "Administrator": "Anedbal",
+  "Application": "Application",
+  "Avatar": "Avaṭar",
+  "Banner": "Aγarrac",
+  "Bold": "Tira tazurant",
+  "Cancel": "Annuler",
+  "Cancelled": "Ittwasefsex",
+  "Change": "Beddel",
+  "Change my password": "Abeddel n awal-iw uffir",
+  "City or region": "Tiγremt neγ tamnaḍt",
+  "Clear": "Sfeḍ",
+  "Click for more information": "Sit i wugar n telɣut",
+  "Close": "Mdel",
+  "Closed": "Yemdel",
+  "Comments": "Iwenniten",
+  "Confirmed": "Yettwaqbel",
+  "Contact": "Anermes",
+  "Country": "Country",
+  "Create": "Rnu",
+  "Create a new list": "Rnu tabdert tamaynut",
+  "Create an account": "Rnu amiḍan",
+  "Create group": "Snulfu-d agraw",
+  "Custom": "Udmawan",
+  "Custom URL": "URL yugnen",
+  "Dashboard": "Tafelwit n usenqed",
+  "Date": "Azemz",
+  "Date and time": "Azemz aked usrag",
+  "Decline": "Agwi",
+  "Default": "Amezwar",
+  "Delete": "Kkes",
+  "Delete Comment": "Kkes awennit",
+  "Delete Event": "Kkes tadyant",
+  "Delete account": "Kkes amiḍan",
+  "Delete event": "Kkes tadyant",
+  "Demote": "Ṣubb deg usellun",
+  "Description": "Asnummel",
+  "Disabled": "Yensa",
+  "Display name": "Isem n uskan",
+  "Domain": "Taɣult",
+  "Draft": "Arewway",
+  "Drafts": "Irewwayen",
+  "Duplicate": "Sisleg",
+  "Edit": "Édition",
+  "Email": "Imayl",
+  "Email address": "Tansa imayl",
+  "Email notifications": "Ilɣa s yimayl",
+  "Enabled": "Irmed",
+  "Error": "Tuccḍa",
+  "Error message": "Izen n tuccḍa",
+  "Event": "Événement",
+  "Events": "Tidyanin",
+  "Everything": "Kulec",
+  "Explore": "Snirem",
+  "Forgot your password?": "Tettuḍ awal uffir?",
+  "General": "Amatu",
+  "Glossary": "Amawal n yilɣiten",
+  "Go": "Ddu",
+  "Group name": "Isem n ugraw",
+  "Group settings": "Iγewwaṛen nu graw",
+  "Groups": "Igrawen",
+  "Hide replies": "Ffer tiririyin",
+  "Home": "Asnubeg",
+  "Invited": "Yettwancad",
+  "Italic": "Uknan",
+  "Language": "Tutlayt",
+  "Last week": "Dduṛt yezrin",
+  "Leave": "Eǧǧ",
+  "Legal": "Usḍif",
+  "License": "Licence",
+  "Load more": "Sali ugar",
+  "Local": "Adigan",
+  "Locality": "Amḍiq",
+  "Location": "Adig",
+  "Log in": "Qqen",
+  "Log out": "Tuffɣa",
+  "Login": "Aseqdac",
+  "Member": "Amedraw",
+  "Members": "Imttekkiyen",
+  "Message": "Izen",
+  "Moderator": "Amaẓrag",
+  "Move": "Senkez",
+  "Name": "Isem",
+  "New folder": "Akaram amaynut",
+  "New note": "Tazmilt tamaynut",
+  "New password": "Awal uffir amaynut",
+  "New profile": "Nouveau profil",
+  "Next": "Uḍfir",
+  "Next month": "Aggur d-iteddun",
+  "Next page": "Asebtar ameḍfir",
+  "Next week": "Dduṛt d-iteddun",
+  "No languages found": "Ulac tutlaying i yettwafen",
+  "None": "Ula d yiwen",
+  "Notes": "Tizmilin",
+  "Notifications": "Ilɣa",
+  "OK": "IH",
+  "Old password": "Awal uffir aqbuṛ",
+  "Open": "Ldi",
+  "Organizer": "Sefrek",
+  "Other": "Nniḍen",
+  "Page": "Asebtar",
+  "Parent folder": "Akaram agejdan",
+  "Participant": "Imttekki",
+  "Password": "Mot de passe",
+  "Password reset": "Awennez n wawal uffir",
+  "Pending": "Ittraǧu",
+  "Post": "Amagrad",
+  "Post a comment": "Aru awennit",
+  "Posts": "Imagraden",
+  "Preferences": "Ismenyifen",
+  "Previous": "Précédent",
+  "Previous page": "Asebtar ssabeq",
+  "Privacy Policy": "Tasertit tabaḍnit",
+  "Privacy policy": "Tasertit n tbaḍnit",
+  "Public": "Azayez",
+  "Publish": "Suffeɣ-d",
+  "Radius": "Aɣar n yiri",
+  "Region": "Tamnaḍt",
+  "Reject": "Agi",
+  "Rejected": "Yerrad",
+  "Remove": "Kkes",
+  "Rename": "Beddel isem",
+  "Reopen": "Ldi i tikkelt-nniḍen",
+  "Reply": "Err",
+  "Report": "Aneqqis",
+  "Report this comment": "Sillef awennit agi",
+  "Reports": "Ineqqisen",
+  "Reset my password": "Wennez awal-iw uffir",
+  "Resources": "Tiɣbula",
+  "Restricted": "Yesεa tilas",
+  "Role": "Tamlilt",
+  "Rules": "Ilugan",
+  "SSL/TLS": "SSL/TLS",
+  "Save": "Sekles",
+  "Save draft": "Sekles arewway",
+  "Search": "Nadi",
+  "Searching…": "Anadi…",
+  "Search…": "Ffeɣ seg unadi…",
+  "Send email": "Azen imayl",
+  "Settings": "Iɣewwaṛen",
+  "Sign in with": "Kcem s",
+  "Status": "État",
+  "Street": "Abrid",
+  "Submit": "Azen",
+  "Suspend": "Ḥbes di leεḍil",
+  "Suspended": "Yeḥbes",
+  "Tentative": "Aɛraḍ",
+  "Terms": "Tiwtilin",
+  "Text": "Aḍris",
+  "This month": "Aggur-a",
+  "This week": "Ddurt-a",
+  "Timezone": "Iẓdi usrig",
+  "Title": "Azwel",
+  "Today": "Ass-a",
+  "Tomorrow": "Azekka",
+  "Type": "Anaw",
+  "URL": "URL",
+  "Unknown": "Arussin",
+  "Update": "Leqqem",
+  "Update group": "Leqqem agraw",
+  "Updated": "Yettwalqem",
+  "User": "Aseqdac",
+  "Username": "Isem n useqdac",
+  "Users": "Iseqdacen",
+  "View all": "Sken akk",
+  "Warning": "Ɣur-k",
+  "Website": "Asmel n web",
+  "Welcome back!": "Anṣuf i tikkelt-nniḍen!",
+  "Yesterday": "Iḍelli",
+  "Your email": "Imayl-ik",
+  "[deleted]": "[yettwakkes]"
+}

js/src/i18n/langs.json

@@ -22,6 +22,7 @@
   "pl": "Polski",
   "pt": "Português",
   "pt_BR": "Português brasileiro",
+  "ru": "Русский",
   "sl": "Slovenščina",
   "sv": "Svenska",
   "zh_Hant": "繁體字"

js/src/i18n/nn.json

@@ -9,7 +9,10 @@
   "+ Start a discussion": "+ Start eit ordskifte",
   "<b>{contact}</b> will be displayed as contact.": "<b>{contact}</b> vil bli vist som kontakt.|<b>{contact}</b> vil bli viste som kontaktar.",
   "@{group}": "@{group}",
+  "@{username}": "@{username}",
   "@{username} ({role})": "@{username} ({role})",
+  "@{username}'s follow request was accepted": "Fylgjeførespurnaden frå @{username} er godkjend",
+  "@{username}'s follow request was rejected": "Fyljgeførespurnaden frå @{username} vart avslegen",
   "A cookie is a small file containing information that is sent to your computer when you visit a website. When you visit the site again, the cookie allows that site to recognize your browser. Cookies may store user preferences and other information. You can configure your browser to refuse all cookies. However, this may result in some website features or services partially working. Local storage works the same way but allows you to store more data.": "Ein infokapsel er ei lita fil som held på informasjon som vert sendt til datamaskina di når du besøkjer ei nettside. Når du kjem attende til sida, lèt infokapselen sida kjenna att nettlesaren din. Infokapslar kan ta vare på preferansane til brukaren og annan informasjon. Du kan setja opp nettlesaren din til å avvisa alle infokapslane, men det kan henda dette får nokre funksjonar eller tenester på nettsida til å berre verka delvis. Lokallagring verkar på same måte, berre at ein får lagra meir data.",
   "A federated software": "Spreidd programvare",
   "A place for your code of conduct, rules or guidelines. You can use HTML tags.": "Ein plass der du forklarar reglar, skikk og retningsliner på nettstaden din. Du kan bruka HTML.",
@@ -37,6 +40,7 @@
   "Actions": "Handlingar",
   "Activated": "Skrudd på",
   "Active": "Aktiv",
+  "Activity": "Aktivitet",
   "Actor": "Aktør",
   "Add": "Legg til",
   "Add / Remove…": "Legg til / fjern…",
@@ -54,11 +58,13 @@
   "Admin settings successfully saved.": "Administrasjonsinnstillingane er lagra.",
   "Administration": "Administrering",
   "Administrator": "Styrar",
+  "All activities": "Alle aktivitetar",
   "All good, let's continue!": "Fint, då kan me halda fram!",
   "All group members and other eventual server admins will still be able to view this information.": "Alle gruppemedlemer og andre eventuelle tenar-administratorar vil framleis sjå desse opplysingane.",
-  "All the places have already been taken": "Alle plassane er opptekne|Det er ein ledig plass|Det er {places} ledige plassar",
+  "All the places have already been taken": "Alle plassane er opptekne",
   "Allow all comments from users with accounts": "Skru på alle kommentarar frå innlogga brukarar",
   "Allow registrations": "Tillat nye brukarar",
+  "An error has occured. Sorry about that. You may try to reload the page.": "Her vart det feil. Me orsakar. Kanskje du kan prøva å lasta sida på nytt.",
   "An ethical alternative": "Eit etisk alternativ",
   "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.": "Ein Mobilizon-nettstad har installert ein versjon av Mobilizon på ein tenar. Alle kan laga ein nettstad ved å bruka {mobilizon_software} eller andre spreidde program, òg kjent som \"fødiverset\". Denne nettstaden heiter {instance_name}. Mobilizon er eit spreidd nettverk med mange nettstader (akkurat som eposttenarar). Brukarar som er medlemer av ulike nettstader kan kommunisera med kvarandre sjølv om dei ikkje registrerte seg på same nettstad.",
   "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.": "Eit \"application programming interface\" eller \"API\" er ein kommunikasjonsprotokoll som gjev programkomponentar høve til å kommunisera med kvarandre. Mobilizon-APIet, til dømes, lèt tredjepartsprogram kommunisera med Mobilizon-nettstader for å utføra visse handlingar, slik som å leggja ut innlegg på dine vegner, automatisk og utanfrå.",
@@ -80,9 +86,11 @@
   "Are you sure you want to cancel the event creation? You'll lose all modifications.": "Er du sikker på at du vil avbryta denne hendinga? Du vil mista alle endringane.",
   "Are you sure you want to cancel the event edition? You'll lose all modifications.": "Er du sikker på at du vil slutta å redigera denne hendinga? Du mistar alle endringar.",
   "Are you sure you want to cancel your participation at event \"{title}\"?": "Er du sikker på at du vil melda deg av hendinga \"{title}\"?",
+  "Are you sure you want to delete this entire discussion?": "Er du sikker på at du vil sletta heile ordskiftet?",
   "Are you sure you want to delete this event? This action cannot be reverted.": "Er du sikker på at du vil sletta denne hendinga? Du kan ikkje angra dette.",
   "As the event organizer has chosen to manually validate participation requests, your participation will be really confirmed only once you receive an email stating it's being accepted.": "Tilskiparen har valt å godkjenna deltakarar manuelt. Difor vil du berre få éi stadfesting på epost når deltakinga di er godkjend.",
   "Assigned to": "Tildelt",
+  "Atom feed for events and posts": "Atom-straum for hendingar og innlegg",
   "Avatar": "Profilbilete",
   "Back to previous page": "Tilbake til førre sida",
   "Banner": "Banner",
@@ -91,6 +99,7 @@
   "Bold": "Halvfeit",
   "By @{group}": "Av @{group}",
   "By @{username}": "Av @{username}",
+  "By others": "Av andre",
   "By {author}": "Av {author}",
   "By {group}": "Av {gruppe}",
   "Can be an email or a link, or just plain text.": "Kan vera ei epostadresse eller ei lenke, eller rein tekst.",
@@ -109,6 +118,7 @@
   "Change my password": "Byt passord",
   "Change timezone": "Endra tidssone",
   "Check your inbox (and your junk mail folder).": "Sjekk innboksen din (og søppelmappa).",
+  "City or region": "By eller område",
   "Clear": "Tøm",
   "Clear participation data for all events": "Slett deltakingsdata for alle hendingar",
   "Clear participation data for this event": "Slett deltakingsdata for denne hendinga",
@@ -117,9 +127,11 @@
   "Click to upload": "Klikk for å lasta opp",
   "Close": "Steng",
   "Close comments for all (except for admins)": "Steng for kommentarar frå alle (unnateke administratorar)",
+  "Events nearby": "Hendingar i nærleiken",
   "Closed": "Stengt",
   "Comment deleted": "Kommentaren er sletta",
   "Comment from @{username} reported": "Kommentaren frå @{username} er rapportert",
+  "Comment text can't be empty": "Kommentaren kan ikkje vera tom",
   "Comments": "Kommentarar",
   "Comments are closed for everybody else.": "Ingen andre har lov å kommentera.",
   "Confirm my participation": "Stadfest at eg deltek",
@@ -131,6 +143,7 @@
   "Contact": "Kontakt",
   "Continue editing": "Rediger vidare",
   "Cookies and Local storage": "Infokapslar og lokal lagring",
+  "Copy details to clipboard": "Kopier detaljane til utklyppstavla",
   "Country": "Land",
   "Create": "Lag",
   "Create a calc": "Lag eit rekneark",
@@ -148,6 +161,7 @@
   "Create my event": "Lag hendinga mi",
   "Create my group": "Lag gruppa mi",
   "Create my profile": "Lag profilen min",
+  "Create new links": "Lag nye lenker",
   "Create resource": "Lag ein ressurs",
   "Create the discussion": "Lag ordskiftet",
   "Create to-do lists for all the tasks you need to do, assign them and set due dates.": "Lag gjeremålslister for alle oppgåvene du må gjera, tildel dei og set sluttfristar.",
@@ -175,11 +189,13 @@
   "Delete Event": "Slett hendinga",
   "Delete account": "Slett kontoen",
   "Delete conversation": "Slett samtala",
+  "Delete discussion": "Slett ordskiftet",
   "Delete event": "Slett hendinga",
   "Delete everything": "Slett alt",
   "Delete group": "Slett gruppe",
   "Delete my account": "Slett brukarkontoen min",
   "Delete post": "Slett innlegg",
+  "Delete this discussion": "Slett dette ordskiftet",
   "Delete this identity": "Slett denne identiteten",
   "Delete your identity": "Slett identiteten din",
   "Delete {eventTitle}": "Slett {eventTitle}",
@@ -224,7 +240,11 @@
   "Enter your own privacy policy. HTML tags allowed. The {mobilizon_privacy_policy} is provided as template.": "Skriv inn dine eigne personvernvilkår. HTML er lov. {mobilizon_privacy_policy} er oppgjevne som mal.",
   "Enter your own terms. HTML tags allowed. The {mobilizon_terms} are provided as template.": "Skriv inn dine eigne vilkår. HTML er lov. {mobilizon_terms} er oppgjevne som mal.",
   "Error": "Feil",
+  "Error details copied!": "Feildetaljane er kopierte!",
+  "Error message": "Feilmelding",
+  "Error stacktrace": "Stabelsporing frå feilen",
   "Error while changing email": "Greidde ikkje endra epostadressa",
+  "Error while loading the preview": "Greidde ikkje lasta førehandsvisinga",
   "Error while login with {provider}. Retry or login another way.": "Greidde ikkje logga inn med {provider}. Prøv ein gong til, eller prøv med noko anna.",
   "Error while login with {provider}. This login provider doesn't exist.": "Greidde ikkje logga inn med {provider}. Denne innloggingstilbydaren finst ikkje.",
   "Error while reporting group {groupTitle}": "Greidde ikkje rapportera gruppa {groupTitle}",
@@ -257,7 +277,9 @@
   "Find an address": "Finn ei adresse",
   "Find an instance": "Finn ein nettstad",
   "Find another instance": "Finn ein annan nettstad",
+  "Follower": "Fylgjar",
   "Followers": "Fylgjarar",
+  "Followers will receive new public events and posts.": "Fylgjarar får nye hendingar og innlegg.",
   "Followings": "Fylgjer",
   "For instance: London": "Til dømes: London",
   "For instance: London, Taekwondo, Architecture…": "Til dømes: London, taekwondo, arkitektur…",
@@ -266,6 +288,7 @@
   "From the {startDate} at {startTime} to the {endDate}": "Frå {startDate} kl. {startTime} til {endDate}",
   "From the {startDate} at {startTime} to the {endDate} at {endTime}": "Frå {startDate} kl. {startTime} til {endDate} kl. {endTime}",
   "From the {startDate} to the {endDate}": "Frå {startDate} til {endDate}",
+  "From yourself": "Frå deg sjølv",
   "Gather ⋅ Organize ⋅ Mobilize": "Kom saman ⋅ Organiser ⋅ Mobiliser",
   "General": "Allment",
   "General information": "Allmenne opplysingar",
@@ -275,6 +298,7 @@
   "Go": "Gå",
   "Go to the event page": "Gå til hendingssida",
   "Going as {name}": "Går som {name}",
+  "Group Followers": "Gruppefylgjarar",
   "Group Members": "Gruppemedlemer",
   "Group address": "Gruppeadresse",
   "Group display name": "Visingsnamn for gruppa",
@@ -302,6 +326,8 @@
   "I participate": "Eg deltek",
   "I want to allow people to participate without an account.": "Eg vil at folk skal kunna delta utan å ha ein brukarkonto.",
   "I want to approve every participation request": "Eg vil godkjenna alle førespurnader om å delta",
+  "ICS feed for events": "ICS-straum for hendingar",
+  "ICS/WebCal Feed": "ICS/WebCal-straum",
   "Identity {displayName} created": "Identiteten {displayName} er oppretta",
   "Identity {displayName} deleted": "Identiteten {displayName} er sletta",
   "Identity {displayName} updated": "Identiteten {displayName} er oppdatert",
@@ -335,6 +361,7 @@
   "Invite a new member": "Inviter ein ny medlem",
   "Invite member": "Inviter ein medlem",
   "Invited": "Invitert",
+  "It is possible that the content is not accessible on this instance, because this instance has blocked the profiles or groups behind this content.": "Det kan henda at dette innhaldet ikkje er tilgjengeleg på denne nettstaden, fordi han har blokkert profilane eller gruppene som laga innhaldet.",
   "Italic": "Kursiv",
   "Join <b>{instance}</b>, a Mobilizon instance": "Bli medlem av <b>{instance}</b>, ein nettstad på Mobilizon",
   "Join group": "Bli med i ei gruppe",
@@ -344,6 +371,7 @@
   "Last IP adress": "Sist IP-adresse",
   "Last group created": "Den nyaste gruppa",
   "Last published event": "Nyaste hending",
+  "Last published events": "Dei siste hendingane",
   "Last sign-in": "Sist logga på",
   "Last week": "Sist veka",
   "Latest posts": "Siste innlegg",
@@ -359,6 +387,7 @@
   "Limited number of places": "Avgrensa tal plassar",
   "List title": "Tittel på lista",
   "Load more": "Last fleire",
+  "Load more activities": "Hent fleire aktivitetar",
   "Loading comments…": "Lastar kommentarar…",
   "Local": "Lokal",
   "Locality": "Stad",
@@ -373,6 +402,7 @@
   "Manage my notifications": "Handter varsla mine",
   "Manage my settings": "Endre innstillingane mine",
   "Manage participations": "Handter deltakingar",
+  "Manually approve new followers": "Godkjenn nye fylgjarar manuelt",
   "Manually invite new members": "Inviter nye medlemer manuelt",
   "Mark as resolved": "Merk som løyst",
   "Member": "Medlem",
@@ -407,6 +437,7 @@
   "New members": "Nye medlemer",
   "New note": "Nytt notat",
   "New password": "Nytt passord",
+  "New post": "Nytt innlegg",
   "New profile": "Ny profil",
   "Next": "Neste",
   "Next month": "Neste månad",
@@ -419,8 +450,10 @@
   "No discussions yet": "Ingen ordskifte enno",
   "No end date": "Ingen sluttdato",
   "No events found": "Fann ingen hendingar",
+  "No follower matches the filters": "Ingen fylgjar passar til filtra",
   "No group found": "Fann ingen grupper",
   "No groups found": "Fann ingen grupper",
+  "No information": "Ingen opplysingar",
   "No instance follows your instance yet.": "Det er ingen nettstader som fylgjer din enno.",
   "No instance to approve|Approve instance|Approve {number} instances": "Ingen nettstad å godkjenna|Godkjenn nettstaden|Godkjenn {number} nettstader",
   "No instance to reject|Reject instance|Reject {number} instances": "Ingen nettstad å avslå|Avslå nettstaden|Avslå {number} nettstader",
@@ -429,7 +462,7 @@
   "No member matches the filters": "Ingen medlemer passar med filtra",
   "No message": "Inga melding",
   "No moderation logs yet": "Ingen gjennomsynsloggar enno",
-  "No one is going to this event": "Ingen skal på denne hendinga|Ein person skal|{going} personar skal",
+  "No more activity to display.": "Ikkje meir aktivitet å visa.",
   "No open reports yet": "Ingen opne rapportar enno",
   "No participant matches the filters": "Ingen deltakarar passar med filtra",
   "No participant to approve|Approve participant|Approve {number} participants": "Ingen deltakar å godkjenna|Godkjenn deltakar|Godkjenn {number} deltakarar",
@@ -452,6 +485,7 @@
   "Nothing to see here": "Ingenting å sjå her",
   "Notification before the event": "Varsling før hendinga",
   "Notification on the day of the event": "Varsling på dagen for hendinga",
+  "Notifications": "Varsel",
   "Notifications for manually approved participations to an event": "Varslingar for manuelt godkjende deltakingar til ei hending",
   "Now, create your first profile:": "No kan du laga din fyrste profil:",
   "Number of places": "Tal plassar",
@@ -461,13 +495,17 @@
   "On {date} ending at {endTime}": "{date}, slutt klokka {endTime}",
   "On {date} from {startTime} to {endTime}": "{date} frå kl. {startTime} til {endTime}",
   "On {date} starting at {startTime}": "{date}, startar klokka {startTime}",
+  "On {instance}": "På {instance}",
   "Only accessible through link": "Berre tilgjengeleg med denne lenka",
   "Only accessible through link (private)": "Berre tilgjengeleg med lenka (private)",
   "Only accessible to members of the group": "Berre tilgjengeleg for gruppemedlemer",
   "Only alphanumeric characters and underscores are supported.": "Du kan berre bruka bokstavar, tal og understrek.",
   "Only alphanumeric lowercased characters and underscores are supported.": "Du kan berre bruka små bokstavar (a-z) og tal.",
+  "Only group members can access discussions": "Berre gruppemedlemer kan sjå ordskifte",
   "Only group moderators can create, edit and delete posts.": "Berre gruppestyrarar kan skriva, endra og sletta innlegg.",
   "Open": "Open",
+  "Open a topic on our forum": "Lag eit nytt emne på forumet vårt",
+  "Open an issue on our bug tracker (advanced users)": "Lag ei ny feilmelding på feilrettingsverktyet vårt (avanserte brukarar)",
   "Opened reports": "Opna rapportar",
   "Or": "Eller",
   "Organized": "Organisert",
@@ -497,11 +535,13 @@
   "Password reset": "Nullstill passord",
   "Past events": "Tidlegare hendingar",
   "Pending": "Ventar",
+  "Personal feeds": "Personlege straumar",
   "Pick": "Vel",
   "Pick a group": "Vel ei gruppe",
   "Pick a profile or a group": "Vel ein profil eller ei gruppe",
   "Pick an identity": "Vel ein identitet",
   "Pick an instance": "Vel ein nettstad",
+  "Please add as many details as possible to help identify the problem.": "Skriv inn så mange opplysingar du kan for å hjelpa oss å finna feilen.",
   "Please check your spam folder if you didn't receive the email.": "Sjekk søppel-mappa di om du ikkje fekk eposten.",
   "Please contact this instance's Mobilizon admin if you think this is a mistake.": "Ver god å kontakta administratoren på denne Mobilizon-tenaren om du meiner dette er feil.",
   "Please do not use it in any real way.": "Ikkje bruk denne på ordentleg.",
@@ -521,6 +561,7 @@
   "Privacy policy": "Personvern",
   "Private event": "Privat hending",
   "Private feeds": "Private straumar",
+  "Profile feeds": "Profilstraumar",
   "Profiles": "Profilar",
   "Profiles and federation": "Profilar og spreiing",
   "Promote": "Framhev",
@@ -541,6 +582,7 @@
   "Redirecting to content…": "Vidaresender til innhaldet…",
   "Redirecting to event…": "Vidaresender til hendinga…",
   "Refresh profile": "Last profilen på nytt",
+  "Regenerate new links": "Lag nye lenker på nytt",
   "Region": "Region",
   "Register an account on Mobilizon!": "Lag ein konto på Mobilizon!",
   "Register an account on {instanceName}!": "Lag ein brukarkonto på {instancename}!",
@@ -577,6 +619,7 @@
   "Resource provided is not an URL": "Denne ressursen er ikkje ei URL-adresse",
   "Resources": "Ressursar",
   "Restricted": "Avgrensa",
+  "Return to the group page": "Gå tilbake til gruppesida",
   "Right now": "Nett no",
   "Role": "Rolle",
   "Rules": "Reglar",
@@ -589,6 +632,7 @@
   "Searching…": "Søkjer…",
   "Search…": "Søk…",
   "Select a language": "Vel språk",
+  "Select a radius": "Vel ein radius",
   "Select a timezone": "Vel ein tidssone",
   "Select languages": "Vel språk",
   "Send email": "Send epost",
@@ -615,6 +659,7 @@
   "Suspend group": "Sperr gruppa",
   "Suspended": "Sperra",
   "Task lists": "Oppgåveliste",
+  "Technical details": "Tekniske detaljar",
   "Tentative": "Framlegg",
   "Tentative: Will be confirmed later": "Førebels: Blir stadfesta seinare",
   "Terms": "Vilkår",
@@ -633,21 +678,41 @@
   "The event organizer manually approves participations. Since you've chosen to participate without an account, please explain why you want to participate to this event.": "Tilskiparen godkjenner deltakarar manuelt. Sidan du har valt å delta utan brukarkonto, er det fint om du skriv kvifor du vil vera med.",
   "The event title will be ellipsed.": "Tittelen på denne hendinga blir forkorta med ein ellipse (…).",
   "The event will show as attributed to this group.": "Hendinga vil bli knytt til denne gruppa.",
+  "The event will show as attributed to this profile.": "Hendinga vil syna som tilkopla denne profilen.",
   "The event will show as attributed to your personal profile.": "Hendinga vil bli knytt til den personlege profilen din.",
   "The event will show the group as organizer.": "Denne hendinga vil syna gruppa som tilskipar.",
+  "The event {event} was created by {profile}.": "Brukaren {profile} laga hendinga {event}.",
+  "The event {event} was deleted by {profile}.": "Brukaren {profile} sletta hendinga {event}.",
+  "The event {event} was updated by {profile}.": "Brukaren {profile} oppdaterte hendinga {event}.",
+  "The events you created are not shown here.": "Dei hendingane du har laga, vil ikkje syna her.",
+  "The group can now be joined by anyone.": "Alle kan bli med i gruppa.",
+  "The group can now only be joined with an invite.": "Frå no må det invitasjon til for å bli med i gruppa.",
   "The group will be publicly listed in search results and may be suggested in the explore section. Only public informations will be shown on it's page.": "Denne gruppa vil bli lista opp offentleg i søkjeresultat og kan bli føreslegen når folk utforskar nettstaden. Berre offentleg informasjon vil syna på sida til gruppa.",
+  "The group's avatar was changed.": "Gruppeavataren er endra.",
+  "The group's banner was changed.": "Gruppebanneret er endra.",
+  "The group's physical address was changed.": "Den fysiske adressa for gruppa er endra.",
+  "The group's short description was changed.": "Skildringa for gruppa er endra.",
   "The instance administrator is the person or entity that runs this Mobilizon instance.": "Styraren er den personen eller eininga som driv denne Mobilizon-nettstaden.",
   "The member was removed from the group {group}": "Medlemen vart fjerna frå gruppa {group}",
   "The only way for your group to get new members is if an admininistrator invites them.": "Den einaste måten gruppa di kan få nye medlemer på, er dersom ein administrator inviterer dei.",
   "The organiser has chosen to close comments.": "Tilskiparen har valt å stenga for kommentarar.",
   "The page you're looking for doesn't exist.": "Denne sida finst ikkje.",
   "The password was successfully changed": "Passordet er endra",
+  "The post {post} was created by {profile}.": "Brukaren {profile} skreiv innlegget {post}.",
+  "The post {post} was deleted by {profile}.": "{profile} sletta innlegget {post}.",
+  "The post {post} was updated by {profile}.": "{profile} oppdaterte innlegget {post}.",
   "The report will be sent to the moderators of your instance. You can explain why you report this content below.": "Rapporten blir sendt til dei som styrer nettstaden din. Du kan forklara kvifor du rapporterer dette innhaldet under her.",
+  "The selected picture is too heavy. You need to select a file smaller than {size}.": "Dette biletet er for stort. Du må velja ei fil som er mindre enn {size}.",
+  "The technical details of the error can help developers solve the problem more easily. Please add them to your feedback.": "Dei tekniske detaljane om feilen kan hjelpa utviklarar å løysa problemet lettare. Ta dei gjerne med i feilmeldinga di.",
   "The {default_privacy_policy} will be used. They will be translated in the user's language.": "{default_privacy_policy} vil bli brukt. Dei vil vera omsett til språket til brukaren.",
   "The {default_terms} will be used. They will be translated in the user's language.": "{default_terms} vil bli brukte. Dei vil bli omsette til språket til lesaren.",
   "There are {participants} participants.": "Det er {participants} deltakarar.",
+  "There is no activity yet. Start doing some things to see activity appear here.": "Ingen aktivitet enno. Gjer noko for å sjå aktiviteten her.",
   "There will be no way to recover your data.": "Det blir umogleg å gjenoppretta opplysingane dine.",
+  "There's no discussions yet": "Ingen har diskutert dette enno",
   "These events may interest you": "Desse hendingane er kanskje interessante",
+  "These feeds contain event data for the events for which any of your profiles is a participant or creator. You should keep these private. You can find feeds for specific profiles on each profile edition page.": "Desse straumane inneheld opplysingar om hendingar der einkvar av profilane dine er tilskipar eller deltakar. Du bør halda desse for deg sjølv. Du kan finna straumar for visse profilar på kvar profilside.",
+  "These feeds contain event data for the events for which this specific profile is a participant or creator. You should keep these private. You can find feeds for all of your profiles into your notification settings.": "Desse straumane inneheld hendingsdata for dei hendingane der denne profilen er tilskipar eller deltakar. Du bør halde desse for deg sjølv. Du kan finna straumar for alle profilane dine i varselinnstillingane dine.",
   "This Mobilizon instance and this event organizer allows anonymous participations, but requires validation through email confirmation.": "Denne Mobilizon-nettstaden og tilskiparen tillèt anonym deltaking, men krev at du stadfestar ved epost.",
   "This URL is not supported": "Denne URL-adressa er ikkje støtta",
   "This event has been cancelled.": "Denne hendinga er avlyst.",
@@ -684,14 +749,19 @@
   "Type or select a date…": "Skriv inn eller vel ein dato…",
   "URL": "URL-adresse",
   "URL copied to clipboard": "Adressa er kopiert til utklippstavla",
+  "Unable to copy to clipboard": "Greidde ikkje kopiera til utklyppstavla",
+  "Unable to create the group. One of the pictures may be too heavy.": "Greidde ikkje laga gruppa. Eit av bileta kan vera for stort.",
+  "Unable to create the profile. The avatar picture may be too heavy.": "Greidde ikkje laga profilen. Profilbiletet kan vera for stort.",
   "Unable to detect timezone.": "Greidde ikkje finna tidssonen.",
   "Unable to load event for participation. The error details are provided below:": "Greidde ikkje å lasta hendinga for å melda deg på. Her er feilmeldingane:",
   "Unable to save your participation in this browser.": "Greidde ikkje lagra deltakinga di i denne nettlesaren.",
+  "Unable to update the profile. The avatar picture may be too heavy.": "Greidde ikkje oppdatera profilen. Profilbiletet kan vera for stort.",
   "Unfortunately, this instance isn't opened to registrations": "Denne nettstaden er diverre ikkje open for innmeldingar no",
   "Unfortunately, your participation request was rejected by the organizers.": "Tilskiparane har diverre avslege deltakinga di.",
   "Unknown": "Ukjent",
   "Unknown actor": "Ukjend aktør",
   "Unknown error.": "Ukjend feil.",
+  "Unknown value for the openness setting.": "Det er uvisst om gruppa er open eller ikkje.",
   "Unsaved changes": "Ulagra endringar",
   "Unset group": "Ikkje vel gruppa",
   "Unsuspend": "Opphev sperringa",
@@ -716,10 +786,14 @@
   "View event page": "Sjå på hendingssida",
   "View everything": "Sjå alt",
   "View page on {hostname} (in a new window)": "Sjå sida på {hostname} (i eit nytt vindauga)",
+  "Visibility was set to an unknown value.": "Det er uvisst om denne er offentleg eller ikkje.",
+  "Visibility was set to private.": "Vart gjort privat.",
+  "Visibility was set to public.": "Vart gjort offentleg.",
   "Visible everywhere on the web": "Synleg overalt på veven",
   "Visible everywhere on the web (public)": "Synleg overalt på veven (offentleg)",
   "Waiting for organization team approval.": "Ventar på godkjenning frå tilskiparane.",
   "Warning": "Åtvaring",
+  "We improve this software thanks to your feedback. To let us know about this issue, two possibilities (both unfortunately require user account creation):": "Viss du melder frå til oss om feil, kan me utbetra denne programvara. Viss du vil melda frå til oss om denne feilen, er det to måtar å gjera det på (båe krev diverre at du registrerer deg som brukar):",
   "We just sent an email to {email}": "Me har akkurat sendt ein epost til {email}",
   "We use your timezone to make sure you get notifications for an event at the correct time.": "Me bruker tidssonen din for å sjå til at du får varsel for hendingar til rett tid.",
   "We will redirect you to your instance in order to interact with this event": "Me sender deg vidare til nettstaden din, slik at du kan samhandla med denne hendinga",
@@ -731,13 +805,19 @@
   "Welcome back {username}!": "Velkomen att, {username}!",
   "Welcome back!": "Velkomen att!",
   "Welcome to Mobilizon, {username}!": "Velkomen til Mobilizon, {username}!",
+  "What can I do to help?": "Kva kan eg gjera for å hjelpa?",
   "When a moderator from the group creates an event and attributes it to the group, it will show up here.": "Når ein styrar i gruppa lagar ei hending og knyter ho til gruppa, vil ho syna her.",
   "Who can view this event and participate": "Kven som kan sjå og delta på denne hendinga",
   "Who can view this post": "Kven kan sjå dette innlegget",
   "Who published {number} events": "Som har laga {number} hendingar",
   "Why create an account?": "Kvifor laga konto?",
   "Will allow to display and manage your participation status on the event page when using this device. Uncheck if you're using a public device.": "Lèt deg syna og handtera deltakarstatusen din på hendingssida når du bruker denne eininga. Fjern merkinga viss du bruker ei offentleg eining.",
+  "Within {number} kilometers of {place}": "|Innan ein kilometer frå {place}|Innan {number} kilometer frå {place}",
   "Write something…": "Skriv noko…",
+  "Yesterday": "I går",
+  "You accepted the invitation to join the group.": "Du tok imot invitasjonen om å bli med i gruppa.",
+  "You added the member {member}.": "Du la til medlemen {member}.",
+  "You archived the discussion {discussion}.": "Du arkiverte ordskiftet {discussion}.",
   "You are not an administrator for this group.": "Du er ikkje styrar for denne gruppa.",
   "You are not part of any group.": "Du er ikkje med i noko gruppe.",
   "You are participating in this event anonymously": "Du deltek på denne hendinga anonymt",
@@ -747,8 +827,23 @@
   "You can pick your timezone into your preferences.": "Du kan velja tidssone i innstillingane dine.",
   "You can try another search term or drag and drop the marker on the map": "Du kan søkja etter noko anna, eller dra og sleppa markøren på kartet",
   "You can't change your password because you are registered through {provider}.": "Du kan ikkje endra passordet ditt, fordi du er registrert gjennom {provider}.",
+  "You created the discussion {discussion}.": "Du laga ordskiftet {discussion}.",
+  "You created the event {event}.": "Du laga hendinga {event}.",
+  "You created the folder {resource}.": "Du laga mappa {resource}.",
+  "You created the group {group}.": "Du laga gruppa {group}.",
+  "You created the post {post}.": "Du skreiv innlegget {post}.",
+  "You created the resource {resource}.": "Du laga ressursen {resource}.",
+  "You deleted the discussion {discussion}.": "Du sletta ordskiftet {discussion}.",
+  "You deleted the event {event}.": "Du sletta hendinga {event}.",
+  "You deleted the folder {resource}.": "Du sletta mappa {resource}.",
+  "You deleted the post {post}.": "Du sletta innlegget {post}.",
+  "You deleted the resource {resource}.": "Du sletta ressursen {resource}.",
+  "You demoted the member {member} to an unknown role.": "Du degraderte medlemen {member} til ei ukjend rolle.",
+  "You demoted {member} to moderator.": "Du degraderte {member} til redaktør.",
+  "You demoted {member} to simple member.": "Du degraderte {member} til vanleg medlem.",
   "You didn't create or join any event yet.": "Du har ikkje laga eller vorte med på hendingar enno.",
   "You don't follow any instances yet.": "Du fylgjer ingen nettstader enno.",
+  "You excluded member {member}.": "Du kasta ut medlemen {member}.",
   "You have been disconnected": "Du er fråkopla",
   "You have been invited by {invitedBy} to the following group:": "{invitedBy} har invitert deg til denne gruppa:",
   "You have been removed from this group's members.": "Du er ikkje lenger medlem i denne gruppa.",
@@ -756,22 +851,50 @@
   "You have one event in {days} days.": "Du har ingen hendingar dei neste {days} dagane | Du har ei hending dei neste {days} dagane. | Du har {count} hendingar dei neste {days} dagane",
   "You have one event today.": "Du har ingen hendingar i dag | Du har ei hending i dag. | Du har {count} hendingar i dag",
   "You have one event tomorrow.": "Du har ingen hendingar i morgon | Du har ei hending i morgon. | Du har {count} hendingar i morgon",
+  "You invited {member}.": "Du inviterte {member}.",
   "You may clear all participation information for this device with the buttons below.": "Du kan sletta alle deltakingsopplysingar for denne eininga ved å bruka knappane under.",
   "You may now close this window, or {return_to_event}.": "Du kan lata att dette vindauga no, eller {return_to_event}.",
   "You may now close this window.": "No kan du stenga dette vindauga.",
+  "You may show some members as contacts.": "Du kan syna nokre medlemer som kontakter.",
+  "You moved the folder {resource} into {new_path}.": "Du flytta mappa {resource} til {new_path}.",
+  "You moved the folder {resource} to the root folder.": "Du flytta mappa {resource} til rotmappa.",
+  "You moved the resource {resource} into {new_path}.": "Du flytta ressursen {resource} til {new_path}.",
+  "You moved the resource {resource} to the root folder.": "Du flytta ressursen {resource} til rotmappa.",
   "You need to create the group before you create an event.": "Du må laga ei gruppe før du lagar ei hending.",
   "You need to login.": "Du må logga inn.",
+  "You posted a comment on the event {event}.": "Du kommenterte hendinga {event}.",
+  "You promoted the member {member} to an unknown role.": "Du forfremja medlemen {member} til ei ukjend rolle.",
+  "You promoted {member} to administrator.": "Du forfremja {member} til styrar.",
+  "You promoted {member} to moderator.": "Du forfremja {member} til redaktør.",
+  "You renamed the discussion from {old_discussion} to {discussion}.": "Du døypte om ordskiftet frå {old_discussion} til {discussion}.",
+  "You renamed the folder from {old_resource_title} to {resource}.": "Du døypte om mappa frå {old_resource_title} til {resource}.",
+  "You renamed the resource from {old_resource_title} to {resource}.": "Du døypte om ressursen frå {old_resource_title} til {resource}.",
+  "You replied to a comment on the event {event}.": "Du svara på ein kommentar til hendinga {event}.",
+  "You replied to the discussion {discussion}.": "Du svara på ordskiftet {discussion}.",
+  "You requested to join the group.": "Du ba om å bli med i gruppa.",
+  "You updated the event {event}.": "Du oppdaterte hendinga {event}.",
+  "You updated the group {group}.": "Du oppdaterte gruppa {group}.",
+  "You updated the member {member}.": "Du oppdaterte medlemen {member}.",
+  "You updated the post {post}.": "Du oppdaterte innlegget {post}.",
+  "You were demoted to an unknown role by {profile}.": "{profile} degraderte deg til ei ukjend rolle.",
+  "You were demoted to moderator by {profile}.": "{profile} degraderte deg til redaktør.",
+  "You were demoted to simple member by {profile}.": "{profile} degraderte deg til vanleg medlem.",
+  "You were promoted to administrator by {profile}.": "{profile} forfremja deg til styrar.",
+  "You were promoted to an unknown role by {profile}.": "{profile} forfremja deg til ei ukjend rolle.",
+  "You were promoted to moderator by {profile}.": "{profile} forfremja deg til redaktør.",
   "You will be able to add an avatar and set other options in your account settings.": "Du kan laga eit profilbilete og gjera andre val i kontoinnstillingane dine.",
   "You will be redirected to the original instance": "Du blir send vidare til den opphavelege nettstaden",
   "You will find here all the events you have created or of which you are a participant.": "Her finn du alle hendingane du har laga eller deltek på.",
   "You wish to participate to the following event": "Du ynskjer å delta på denne hendinga",
   "You'll get a weekly recap every Monday for upcoming events, if you have any.": "Du vil få eit samandrag kvar måndag over komande hendingar, om du har nokon.",
+  "You'll need to change the URLs where there were previously entered.": "Du må endra adressene der du har skrive dei inn tidlegare.",
   "You'll need to transmit the group URL so people may access the group's profile. The group won't be findable in Mobilizon's search or regular search engines.": "Du må senda ut gruppeadressa slik at folk kan sjå gruppeprofilen. Du vil ikkje finna gruppa i Mobilizon-søk eller vanlege søkjemotorar.",
   "You'll receive a confirmation email.": "Du får ein stadfestingsepost.",
   "Your account has been successfully deleted": "Kontoen din er sletta",
   "Your account has been validated": "Kontoen din er godkjend",
   "Your account is being validated": "Kontoen din blir godkjend",
   "Your account is nearly ready, {username}": "Kontoen din er snart klar, {username}",
+  "Your city or region and the radius will only be used to suggest you events nearby. The event radius will consider the administrative center of the area.": "Byen eller området ditt og radiusen blir berre brukt til å føreslå hendingar i nærleiken. Hendingsradiusen går ut frå administrasjonssenteret i området du har valt.",
   "Your current email is {email}. You use it to log in.": "Epostadressa du har no, er {email}. Du bruker ho til å logga inn.",
   "Your email": "Epostadressa di",
   "Your email address was automatically set based on your {provider} account.": "Epostadressa di vart avgjort automatisk ut frå {provider}-kontoen din.",
@@ -793,6 +916,7 @@
   "Your timezone is currently set to {timezone}.": "Tidssonen din er {timezone}.",
   "Your timezone was detected as {timezone}.": "Me fann tidssonen {timezone}.",
   "Your timezone {timezone} isn't supported.": "Tidssonen din {timezone} er ikkje støtta.",
+  "Your upcoming events": "Komande hendingar",
   "[This comment has been deleted by it's author]": "[Skribenten har sletta denne kommentaren]",
   "[This comment has been deleted]": "[Denne kommentaren er sletta]",
   "[deleted]": "[sletta]",
@@ -820,11 +944,18 @@
   "with another identity…": "med ein annan identitet…",
   "{approved} / {total} seats": "{approved} / {total} plassar",
   "{available}/{capacity} available places": "Ingen ledige plassar|{available}/{capacity} ledige plassar",
+  "{count} km": "{count}km",
   "{count} participants": "Ingen deltakarar enno| Ein deltakar | {count} deltakarar",
   "{count} requests waiting": "{count} førespurnader ventar",
   "{count} team members": "{count} medlemer på laget",
+  "{group} activity timeline": "Tidsline over aktiviteten i {group}",
   "{group}'s events": "Hendingane til {group}",
   "{instanceName} is an instance of the {mobilizon} software.": "{instanceName} er ein nettstad som bruker {mobilizon}-programvara.",
+  "{instanceName} is an instance of {mobilizon_link}, a free software built with the community.": "{instanceName} er ein nettstad på {mobilizon_link}, fri programvare som er laga av brukarmiljøet.",
+  "{member} accepted the invitation to join the group.": "{member} tok imot invitasjonen om å bli med i gruppa.",
+  "{member} rejected the invitation to join the group.": "{member} takka nei til invitasjonen om å bli med i gruppa.",
+  "{member} requested to join the group.": "{member} ba om å bli med i gruppa.",
+  "{member} was invited by {profile}.": "{profile} inviterte {member}.",
   "{moderator} added a note on {report}": "{moderator} skreiv eit notat til {report}",
   "{moderator} closed {report}": "{moderator} avslutta {report}",
   "{moderator} deleted an event named \"{title}\"": "{moderator} sletta ei hending med namnet \"{title}\"",
@@ -838,7 +969,37 @@
   "{number} organized events": "Ingen organiserte hendingar|Ei organisert hending|{number} organiserte hendingar",
   "{number} participations": "Ingen deltakarar|Ein deltakar|{number} deltakarar",
   "{number} posts": "Ingen innlegg|Eitt innlegg|{number} innlegg",
+  "{old_group_name} was renamed to {group}.": "{old_group_name} vart døypt om til {group}.",
   "{profile} (by default)": "{profile} (som standard)",
+  "{profile} added the member {member}.": "{profile} la til medlemen {member}.",
+  "{profile} archived the discussion {discussion}.": "{profile} arkiverte ordskiftet {discussion}.",
+  "{profile} created the discussion {discussion}.": "{profile} laga ordskiftet {discussion}.",
+  "{profile} created the folder {resource}.": "{profile} laga mappa {resource}.",
+  "{profile} created the group {group}.": "{profile} laga gruppa {group}.",
+  "{profile} created the resource {resource}.": "{profile} laga ressursen {resource}.",
+  "{profile} deleted the discussion {discussion}.": "{profile} sletta ordskiftet {discussion}.",
+  "{profile} deleted the folder {resource}.": "{profile} sletta mappa {resource}.",
+  "{profile} deleted the resource {resource}.": "{profile} sletta ressursen {resource}.",
+  "{profile} demoted {member} to an unknown role.": "{profile} degraderte {member} til ei ukjend rolle.",
+  "{profile} demoted {member} to moderator.": "{profile} degraderte {member} til redaktør.",
+  "{profile} demoted {member} to simple member.": "{profile} degraderte {member} til vanleg medlem.",
+  "{profile} excluded member {member}.": "{profile} kasta ut medlemen {member}.",
+  "{profile} moved the folder {resource} into {new_path}.": "{profile} flytta mappa {resource} til {new_path}.",
+  "{profile} moved the folder {resource} to the root folder.": "{profile} flytta mappa {resource} til rotmappa.",
+  "{profile} moved the resource {resource} into {new_path}.": "{profile} flytta ressursen {resource} til {new_path}.",
+  "{profile} moved the resource {resource} to the root folder.": "{profile} flytta ressursen {resource} til rotmappa.",
+  "{profile} posted a comment on the event {event}.": "{profile} kommenterte hendinga {event}.",
+  "{profile} promoted {member} to administrator.": "{profile} forfremja {member} til styrar.",
+  "{profile} promoted {member} to an unknown role.": "{profile} forfremja {member} til ei ukjend rolle.",
+  "{profile} promoted {member} to moderator.": "{profile} forfremja {member} til redaktør.",
+  "{profile} quit the group.": "{profile} forlét gruppa.",
+  "{profile} renamed the discussion from {old_discussion} to {discussion}.": "{profile} døypte om ordskiftet frå {old_discussion} til {discussion}.",
+  "{profile} renamed the folder from {old_resource_title} to {resource}.": "{profile} døypte om mappa frå {old_resource_title} til {resource}.",
+  "{profile} renamed the resource from {old_resource_title} to {resource}.": "{profile} døypte om ressursen frå {old_resource_title} til {resource}.",
+  "{profile} replied to a comment on the event {event}.": "{profile} svara på ein kommentar til hendinga {event}.",
+  "{profile} replied to the discussion {discussion}.": "{profile} svara på ordskiftet {discussion}.",
+  "{profile} updated the group {group}.": "{profile} oppdaterte gruppa {group}.",
+  "{profile} updated the member {member}.": "{profile} oppdaterte medlemen {member}.",
   "{title} ({count} todos)": "{title} ({count} ting å gjera)",
   "{username} was invited to {group}": "{username} vart invitert til {group}",
   "© The OpenStreetMap Contributors": "© OpenStreetMap-bidragsytarane"

js/src/i18n/oc.json

@@ -495,7 +495,6 @@
   "No message": "Cap de messatge",
   "No moderation logs yet": "Cap de jornals de moderacion pel moment",
   "No notification settings yet": "Cap de paramètres de notificacion pel moment",
-  "No one is going to this event": "Degun i va pas|Una persona i va|{going} personas i van",
   "No open reports yet": "Cap de senhalament dubèrt pel moment",
   "No participant matches the filters": "Cap de participant correspond pas als filtres",
   "No participant to approve|Approve participant|Approve {number} participants": "Cap de participar de validar|Validar la participacion|Validar los {number} participants",

js/src/i18n/pl.json

@@ -435,7 +435,6 @@
   "No member matches the filters": "Żaden członek nie spełnia kryteriów",
   "No message": "Brak wiadomości",
   "No moderation logs yet": "Nie ma jeszcze dzienników moderacyjnych",
-  "No one is going to this event": "Nikt nie wybiera się na to wydarzenie|Jedna osoba wybiera się|{going} osoba wybiera się",
   "No open reports yet": "Jeszcze nie ma otwartych zgłoszeń",
   "No participant matches the filters": "Żaden członek nie spełnia kryteriów",
   "No participant to approve|Approve participant|Approve {number} participants": "Brak uczestników do przyjęcia|Przyjmij uczestnika|Przyjmij {number} uczestników|Przyjmij {number} uczestników",

js/src/i18n/pt_BR.json

@@ -434,7 +434,6 @@
   "No member matches the filters": "Nenhum membro corresponde aos filtros",
   "No message": "Nenhuma mensagem",
   "No moderation logs yet": "Nenhum relatório de moderação ainda",
-  "No one is going to this event": "Ninguém vai neste evento|Uma pessoa vai|{going} pessoas vão",
   "No open reports yet": "Nenhum relatório aberto ainda",
   "No participant matches the filters": "Nenhum participante corresponde aos filtros",
   "No participant to approve|Approve participant|Approve {number} participants": "Nenhum participante para aprovar|Aprovar participante|Aprovar {number} participantes",

js/src/i18n/ru.json

@@ -1,24 +1,51 @@
 {
+  "#{tag}": "#{tag}",
   "(Masked)": "(Скрыто)",
+  "(this folder)": "(эта папка)",
+  "(this link)": "(эта ссылка)",
+  "+ Add a resource": "+ Добавить ресурс",
+  "+ Create an event": "+ Создать мероприятие",
+  "+ Post a public message": "+ Опубликовать публичное сообщение",
+  "+ Start a discussion": "+ Начать обсуждение",
+  "<b>{contact}</b> will be displayed as contact.": "<b>{contact}</b> будет отображаться как контакт.|<b>{contact}</b> будут отображаться как контакты.",
   "@{group}": "@{group}",
+  "@{username}": "@{username}",
   "@{username} ({role})": "@{username} ({role})",
+  "@{username}'s follow request was accepted": "Запрос на подписку от @{username} принят",
+  "@{username}'s follow request was rejected": "Запрос на подписку от @{username} отклонён",
+  "A cookie is a small file containing information that is sent to your computer when you visit a website. When you visit the site again, the cookie allows that site to recognize your browser. Cookies may store user preferences and other information. You can configure your browser to refuse all cookies. However, this may result in some website features or services partially working. Local storage works the same way but allows you to store more data.": "Cookie - это небольшой файл, содержащий информацию, которая сохраняется на вашем компьютере при посещении веб-сайта. Когда вы снова посещаете эту страницу, cookie позволяет сайту распознавать ваш браузер. Cookie могут хранить настройки пользователя и другую информацию. Вы можете настроить свой браузер так, чтобы он не принимал файлы cookie. Однако это может привести к тому, что часть функционала веб-сайта не будет работать. Локальное хранилище работает так же, но позволяет хранить больше данных.",
+  "A federated software": "Федеративное программное обеспечение",
+  "A place for your code of conduct, rules or guidelines. You can use HTML tags.": "Тут можно разместить общие правила, положения или руководства. Вы можете использовать HTML-теги.",
+  "A place to explain who you are and the things that set your instance apart. You can use HTML tags.": "Тут можно подробно описать кто вы и что делает этот узел особенным. Вы можете использовать HTML-теги.",
+  "A place to publish something to the whole world, your community or just your group members.": "Место для публикации чего-либо для всего мира, вашего сообщества или только участников вашей группы.",
+  "A place to store links to documents or resources of any type.": "Место для хранения ссылок на документы или ресурсы любого типа.",
+  "A practical tool": "Удобный инструмент",
+  "A short tagline for your instance homepage. Defaults to \"Gather ⋅ Organize ⋅ Mobilize\"": "Короткий слоган для домашней страницы вашего узла. По умолчанию: \"Собирать ⋅ Организовывать ⋅ Мобилизовывать\"",
   "A user-friendly, emancipatory and ethical tool for gathering, organising, and mobilising.": "Удобный, свободный и этичный инструмент для объединения, организации и мобилизации.",
   "A validation email was sent to {email}": "Письмо с подтверждением было отправлено на адрес {email}",
   "API": "API",
   "Abandon editing": "Отменить изменения",
-  "About": "О",
+  "About": "О нас",
   "About Mobilizon": "О Mobilizon",
+  "About anonymous participation": "Об анонимном участии",
   "About this event": "Об этом мероприятии",
   "About this instance": "Об этом узле",
+  "About {instance}": "О {instance}",
   "Accept": "Принять",
   "Accepted": "Принято",
+  "Accessible only to members": "Доступно только участникам",
+  "Accessible through link": "Доступно по ссылке",
   "Account": "Учётная запись",
   "Actions": "Действия",
   "Activated": "Активирован",
   "Active": "Активный",
+  "Activity": "Активность",
   "Actor": "Агент",
   "Add": "Добавить",
+  "Add / Remove…": "Добавить / удалить…",
+  "Add a contact": "Добавить контакт",
   "Add a group": "Добавить группу",
+  "Add a new post": "Добавить новый пост",
   "Add a note": "Добавить заметку",
   "Add a todo": "Добавить в список задач",
   "Add an address": "Добавить адрес",
@@ -28,76 +55,113 @@
   "Additional comments": "Дополнительные комментарии",
   "Admin": "Админ",
   "Admin settings successfully saved.": "Настройки администратора успешно сохранены.",
-  "Administration": "Администрация",
+  "Administration": "Администрирование",
   "Administrator": "Администратор",
+  "All activities": "Все действия",
   "All good, let's continue!": "Все хорошо, продолжим!",
   "All the places have already been taken": "Все места уже заняты",
+  "Allow all comments from users with accounts": "Разрешить все комментарии от авторизованных пользователей",
   "Allow registrations": "Разрешить регистрацию",
+  "An error has occured. Sorry about that. You may try to reload the page.": "Произошла ошибка. Приносим вам тысячу извинений. Вы можете попробовать перезагрузить страницу.",
+  "An ethical alternative": "Этичная альтернатива",
   "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.": "Узел - это программное обеспечение Mobilizon, установленное на сервере. Узел может быть запущен кем угодно, использующим {mobilizon_software} или другие федеративные приложения, называемые «Федиверзум». Имя этого узла - {instance_name}. Mobilizon - это федеративная сеть, состоящая из нескольких узлов (как почтовые серверы). Пользователи могут свободно общаться друг с другом, даже если они зарегистрированы на разных узлах.",
   "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.": "Интерфейс прикладного программирования» или «API» - это протокол связи, который позволяет программным компонентам взаимодействовать друг с другом. Например, API Mobilizon позволяет стороннему программному обеспечению взаимодействовать с узлами Mobilizon для выполнения определенных действий, таких как автоматическая публикация мероприятий от вашего имени.",
   "And {number} comments": "И {number} комментариев",
   "Anonymous participant": "Анонимный участник",
   "Anonymous participants will be asked to confirm their participation through e-mail.": "Анонимные участники получат запрос на подтверждение своего участия по электронной почте.",
   "Anonymous participations": "Анонимное участие",
+  "Any day": "В любой день",
+  "Anyone can join freely": "Каждый может присоединиться",
+  "Anyone wanting to be a member from your group will be able to from your group page.": "Каждый, кто хочет стать участником вашей группы, сможет сделать это на странице этой группы.",
   "Application": "Приложение",
   "Are you really sure you want to delete your whole account? You'll lose everything. Identities, settings, events created, messages and participations will be gone forever.": "Вы действительно уверены, что хотите удалить свою учетную запись? Вы потеряете всё. Идентификаторы, настройки, созданные мероприятия, сообщения и история исчезнут навсегда.",
+  "Are you sure you want to <b>completely delete</b> this group? All members - including remote ones - will be notified and removed from the group, and <b>all of the group data (events, posts, discussions, todos…) will be irretrievably destroyed</b>.": "Вы действительно хотите <b>полностью удалить</b> эту группу? Все участники, включая участников с других узлов, будут уведомлены и удалены из группы, а <b>все данные группы (мероприятия, сообщения, обсуждения, задачи…) будут безвозвратно уничтожены</b>.",
   "Are you sure you want to <b>delete</b> this comment? This action cannot be undone.": "Вы действительно хотите <b>удалить</b> этот комментарий? Это действие не может быть отменено.",
   "Are you sure you want to <b>delete</b> this event? This action cannot be undone. You may want to engage the discussion with the event creator or edit its event instead.": "Вы действительно хотите <b>удалить</b> это мероприятие? Это действие не может быть отменено. Вы можете обсудить мероприятие с его автором, или просто отредактировать его.",
+  "Are you sure you want to <b>suspend</b> this group? All members - including remote ones - will be notified and removed from the group, and <b>all of the group data (events, posts, discussions, todos…) will be irretrievably destroyed</b>.": "Вы действительно хотите <b>заблокировать</b> эту группу? Все участники, включая участников с других узлов, будут уведомлены и удалены из группы, а <b>все данные группы (мероприятия, сообщения, обсуждения, задачи…) будут безвозвратно уничтожены</b>.",
+  "Are you sure you want to <b>suspend</b> this group? As this group originates from instance {instance}, this will only remove local members and delete the local data, as well as rejecting all the future data.": "Вы действительно хотите <b>заблокировать</b> эту группу? Поскольку эта группа принадлежит узлу {instance}, то будут удалены только локальные члены и локальные данные. Так же это приведёт к запрету публикации любых данных этой группой.",
   "Are you sure you want to cancel the event creation? You'll lose all modifications.": "Вы уверены, что хотите отменить создание мероприятия? Все изменения будут потеряны.",
   "Are you sure you want to cancel the event edition? You'll lose all modifications.": "Вы уверены, что хотите отменить редактирование мероприятия? Все изменения будут потеряны.",
   "Are you sure you want to cancel your participation at event \"{title}\"?": "Вы действительно хотите отказаться от участия в мероприятии \"{title}\"?",
+  "Are you sure you want to delete this entire discussion?": "Вы уверены, что хотите полностью удалить это обсуждение?",
   "Are you sure you want to delete this event? This action cannot be reverted.": "Вы уверены, что хотите удалить это мероприятие? Это действие нельзя отменить.",
+  "As the event organizer has chosen to manually validate participation requests, your participation will be really confirmed only once you receive an email stating it's being accepted.": "Поскольку организатор мероприятия решил вручную подтверждать запросы на участие, ваше участие будет фактически подтверждено после того, как вы получите электронное письмо о том, что оно было одобрено.",
   "Assigned to": "Присвоен",
+  "Atom feed for events and posts": "Atom лента для мероприятий и публикаций",
   "Avatar": "Аватар",
   "Back to previous page": "Вернуться на предыдущую страницу",
+  "Banner": "Баннер",
   "Before you can login, you need to click on the link inside it to validate your account.": "Перед тем как войти в систему, вы должны перейти по указанной в письме ссылке, чтобы подтвердить свою учетную запись.",
   "Begins on": "Начало",
   "Bold": "Жирный",
   "By @{group}": "Из @{group}",
   "By @{username}": "От @{username}",
+  "By others": "Другими",
+  "By {author}": "Автор {author}",
+  "By {group}": "Автор: {group}",
+  "Can be an email or a link, or just plain text.": "Может быть адресом электронной почты, ссылкой или простым текстом.",
   "Cancel": "Отмена",
   "Cancel anonymous participation": "Отменить анонимное участие",
   "Cancel creation": "Отменить создание",
   "Cancel edition": "Отменить редактирование",
   "Cancel my participation request…": "Отменить мою заявку на участие…",
   "Cancel my participation…": "Отменить моё участие…",
+  "Cancelled": "Отменено",
   "Cancelled: Won't happen": "Отменено: Не состоится",
   "Change": "Изменить",
   "Change my email": "Изменить мой адрес электронной почты",
   "Change my identity…": "Изменить мой идентификатор…",
   "Change my password": "Изменить свой пароль",
   "Change timezone": "Изменить часовой пояс",
+  "Check your inbox (and your junk mail folder).": "Проверьте свою электронную почту (и папку со спамом).",
+  "City or region": "Город, регион или область",
   "Clear": "Очистить",
+  "Clear participation data for all events": "Очистить данные об участии для всех мероприятий",
+  "Clear participation data for this event": "Очистить данные об участии в этом мероприятии",
+  "Click for more information": "Кликнете для получения дополнительной информации",
   "Click to upload": "Нажмите, чтобы загрузить",
   "Close": "Закрыть",
   "Close comments for all (except for admins)": "Закрыть комментарии для всех (кроме админов)",
   "Closed": "Закрыто",
   "Comment deleted": "Комментарий удален",
   "Comment from @{username} reported": "Жалоба на комментарий от @{username} отправлена",
+  "Comment text can't be empty": "Комментарий не может быть пустым",
   "Comments": "Комментарии",
+  "Comments are closed for everybody else.": "Комментарии закрыты для всех остальных.",
   "Confirm my participation": "Подтвердите мое участие",
   "Confirm my particpation": "Подтвердите мое участие",
   "Confirmed": "Подтверждённый",
   "Confirmed at": "Подтверждён в",
   "Confirmed: Will happen": "Подтверждено: Состоится",
+  "Congratulations, your account is now created!": "Поздравляем, ваша учетная запись создана!",
   "Contact": "Контакт",
   "Continue editing": "Продолжить редактирование",
   "Cookies and Local storage": "Файлы cookie и локальное хранилище",
+  "Copy details to clipboard": "Копировать подробности в буфер обмена",
   "Country": "Страна",
   "Create": "Создать",
   "Create a calc": "Создать таблицу",
+  "Create a discussion": "Начать обсуждение",
+  "Create a folder": "Создать папку",
   "Create a new event": "Создать новое мероприятие",
   "Create a new group": "Создать новую группу",
   "Create a new identity": "Создать новый идентификатор",
   "Create a new list": "Создать новый список",
   "Create a pad": "Создать документ",
   "Create a videoconference": "Создать видеоконференцию",
+  "Create an account": "Создать учётную запись",
+  "Create event": "Создать мероприятие",
   "Create group": "Создать группу",
   "Create my event": "Создать мое мероприятие",
   "Create my group": "Создать мою группу",
   "Create my profile": "Создать мой профиль",
+  "Create new links": "Создать новые ссылки",
   "Create resource": "Создать ресурс",
+  "Create the discussion": "Начать обсуждение",
+  "Create to-do lists for all the tasks you need to do, assign them and set due dates.": "Создавайте списки дел для каждой нужной вам задачи, назначайте их другим, и устанавливайте сроки выполнения.",
   "Create token": "Создать токен",
+  "Created by {name}": "Создано {name}",
+  "Created by {username}": "Создано {username}",
   "Current identity has been changed to {identityName} in order to manage this event.": "Текущий идентификатор был изменен на {identityName}, чтобы иметь возможность управлять этим событием.",
   "Current page": "Текущая страница",
   "Custom": "Пользовательский",
@@ -111,13 +175,20 @@
   "Date parameters": "Параметры даты",
   "Decline": "Отклонить",
   "Default": "По умолчанию",
+  "Default Mobilizon privacy policy": "Политика конфиденциальности Mobilizon по умолчанию",
+  "Default Mobilizon terms": "Условия использования Mobilizon по умолчанию",
   "Delete": "Удалить",
   "Delete Comment": "Удалить комментарий",
   "Delete Event": "Удалить мероприятие",
   "Delete account": "Удалить учётную запись",
+  "Delete conversation": "Удалить беседу",
+  "Delete discussion": "Удалить обсуждение",
   "Delete event": "Удалить мероприятие",
   "Delete everything": "Удалить всё",
+  "Delete group": "Удалить группу",
   "Delete my account": "Удалить мою учётную запись",
+  "Delete post": "Удалить пост",
+  "Delete this discussion": "Удалить это обсуждение",
   "Delete this identity": "Удалить этот идентификатор",
   "Delete your identity": "Удалить ваш идентификатор",
   "Delete {eventTitle}": "Удалить {eventTitle}",
@@ -126,23 +197,31 @@
   "Deleting event": "Удаление мероприятия",
   "Deleting my account will delete all of my identities.": "Удаление моей учетной записи приведет к удалению всех моих личных данных.",
   "Deleting your Mobilizon account": "Удаление моей учётной записи Mobilizon",
+  "Demote": "Понизить",
   "Description": "Описание",
+  "Didn't receive the instructions?": "Не получили инструкции?",
   "Disabled": "Отключено",
   "Discussions": "Обсуждения",
   "Display name": "Отображаемое имя",
   "Display participation price": "Показать стоимость участия",
+  "Displayed nickname": "Отображаемый ник",
+  "Displayed on homepage and meta tags. Describe what Mobilizon is and what makes this instance special in a single paragraph.": "Отображается на главной странице и в метатегах. Опишите в одном абзаце, что такое Mobilizon и что делает этот узел особенным.",
   "Do not receive any mail": "Не получать электронные письма",
+  "Do you wish to {create_event} or {explore_events}?": "Вы хотите {create_event} или {explore_events}?",
+  "Do you wish to {create_group} or {explore_groups}?": "Вы хотите {create_group} или {explore_groups}?",
   "Domain": "Домен",
   "Draft": "Черновик",
   "Drafts": "Черновики",
   "Due on": "Выполнить к",
   "Duplicate": "Копировать",
   "Edit": "Редактировать",
+  "Edit post": "Редактировать пост",
+  "Edited {ago}": "Изменено {ago}",
   "Eg: Stockholm, Dance, Chess…": "Например: Москва, танцы, шахматы…",
   "Either on the {instance} instance or on another instance.": "На узле {instance}, либо на другом.",
-  "Either the account is already validated, either the validation token is incorrect.": "Учетная запись уже подтверждена или токен проверки недействителен.",
+  "Either the account is already validated, either the validation token is incorrect.": "Учетная запись уже активирована или проверочный токен недействителен.",
-  "Either the email has already been changed, either the validation token is incorrect.": "Адрес электронной почты уже был изменен или токен проверки недействителен.",
+  "Either the email has already been changed, either the validation token is incorrect.": "Адрес электронной почты уже был изменён или проверочный токен недействителен.",
-  "Either the participation request has already been validated, either the validation token is incorrect.": "Заявка на участие уже подтверждена или токен проверки недействителен.",
+  "Either the participation request has already been validated, either the validation token is incorrect.": "Заявка на участие уже подтверждена или проверочный токен недействителен.",
   "Email": "Электронная почта",
   "Email address": "Адрес электронной почты",
   "Email notifications": "Уведомления по электронной почте",
@@ -150,9 +229,20 @@
   "Ends on…": "Заканчивается в…",
   "Enter the link URL": "Введите URL ссылки",
   "Enter your email address below, and we'll email you instructions on how to change your password.": "Введите ниже свой адрес электронной почты, и мы пришлём вам инструкции по изменению пароля.",
+  "Enter your own privacy policy. HTML tags allowed. The {mobilizon_privacy_policy} is provided as template.": "Введите свою политику конфиденциальности. Вы можете использовать HTML-теги. {mobilizon_privacy_policy} используется в качестве шаблона.",
+  "Enter your own terms. HTML tags allowed. The {mobilizon_terms} are provided as template.": "Введите свои собственные условия. Вы можете использовать HTML-теги. {mobilizon_terms} используется в качестве шаблона.",
+  "Error": "Ошибка",
+  "Error details copied!": "Подробности об ошибке скопированы!",
+  "Error message": "Сообщение об ошибке",
+  "Error stacktrace": "Стектрейс ошибки",
   "Error while changing email": "Произошла ошибка при изменении адреса электронной почты",
+  "Error while loading the preview": "Ошибка при загрузке превью",
+  "Error while login with {provider}. Retry or login another way.": "Не удалось войти через {provider}. Повторите попытку или войдите другим способом.",
+  "Error while login with {provider}. This login provider doesn't exist.": "Не удалось войти через {provider}. Такого провайдера аутентификации не существует.",
+  "Error while reporting group {groupTitle}": "Ошибка при отправке отчёта о группе {groupTitle}",
   "Error while validating account": "Ошибка подтверждения учётной записи",
   "Error while validating participation request": "Произошла ошибка при проверке заявки на участие",
+  "Ethical alternative to Facebook events, groups and pages, Mobilizon is a <b>tool designed to serve you</b>. Period.": "Mobilizon - это этичная альтернатива мероприятиям, группам и страницам Facebook. Это <b>инструмент, созданный для вас</b>. И точка.",
   "Event": "Мероприятие",
   "Event already passed": "Мероприятие уже прошло",
   "Event cancelled": "Мероприятие отменено",
@@ -164,33 +254,55 @@
   "Event {eventTitle} deleted": "Мероприятие {eventTitle} удалено",
   "Event {eventTitle} reported": "Жалоба на мероприятие {eventTitle} отправлена",
   "Events": "Мероприятия",
+  "Events nearby": "Ближайшие мероприятия",
+  "Events tagged with {tag}": "События с тегом {tag}",
   "Everything": "Всё",
   "Ex: mobilizon.fr": "Например: mobilizon.fr",
   "Ex: someone@mobilizon.org": "Например: user@mobilizon.org",
   "Explore": "Обзор",
+  "Explore events": "Обзор мероприятий",
   "Failed to save admin settings": "Не удалось сохранить настройки администратора",
   "Featured events": "Избранные мероприятия",
+  "Federated Group Name": "Имя федеративной группы",
   "Federation": "Федерализация",
+  "Fetch more": "Загрузить больше",
   "Find an address": "Найти адрес",
   "Find an instance": "Найти узел",
+  "Find another instance": "Найти другой узел",
+  "Follower": "Подписчик",
   "Followers": "Подписчики",
+  "Followers will receive new public events and posts.": "Подписчики будут оповещены о новых публичных мероприятиях и публикациях.",
   "Followings": "Подписки",
+  "For instance: London": "Например: Москва",
   "For instance: London, Taekwondo, Architecture…": "Например: Москва, йога, архитектура…",
   "Forgot your password ?": "Забыли свой пароль?",
   "Forgot your password?": "Забыли свой пароль?",
   "From the {startDate} at {startTime} to the {endDate}": "От {startDate}, {startTime} до {endDate}",
   "From the {startDate} at {startTime} to the {endDate} at {endTime}": "От {startDate}, {startTime} до {endDate}, {endTime}",
   "From the {startDate} to the {endDate}": "От {startDate} до {endDate}",
+  "From yourself": "От себя",
   "Gather ⋅ Organize ⋅ Mobilize": "Объединять ⋅ Организовывать ⋅ Мобилизовывать",
-  "General": "Общий",
+  "General": "Общая",
   "General information": "Общая информация",
   "Getting location": "Получить местоположение",
+  "Getting there": "Как туда добраться",
   "Glossary": "Глоссарий",
   "Go": "Идти",
+  "Go to the event page": "Перейти на страницу мероприятия",
+  "Group Followers": "Группа подписчиков",
   "Group Members": "Участники группы",
+  "Group address": "Адрес группы",
+  "Group display name": "Отображаемое имя группы",
   "Group name": "Название группы",
+  "Group settings": "Настройки группы",
+  "Group settings saved": "Настройки группы сохранены",
+  "Group short description": "Краткое описание группы",
+  "Group visibility": "Видимость группы",
   "Group {displayName} created": "Группа {displayName} создана",
+  "Group {groupTitle} reported": "Жалоба на группу {groupTitle} отправлена",
   "Groups": "Группы",
+  "Groups are not enabled on this instance.": "Группы не включены на этом узле.",
+  "Groups are spaces for coordination and preparation to better organize events and manage your community.": "Группы - это места для координации и подготовки, где вы занимаетесь организацией мероприятий и управлением своим сообществом.",
   "Headline picture": "Заглавное изображение",
   "Hide replies": "Скрыть ответы",
   "Home": "Домашняя страница",
@@ -204,38 +316,60 @@
   "I participate": "Я участвую",
   "I want to allow people to participate without an account.": "Я хочу разрешить участие людям без учетной записи.",
   "I want to approve every participation request": "Я хочу одобрять каждую заявку на участие",
+  "ICS feed for events": "ICS лента для мероприятий",
+  "ICS/WebCal Feed": "ICS/WebCal лента",
   "Identity {displayName} created": "Идентификатор {displayName} создан",
   "Identity {displayName} deleted": "Идентификатор {displayName} удалён",
   "Identity {displayName} updated": "Идентификатор {displayName} обновлён",
   "If allowed by organizer": "Если разрешено организатором",
   "If an account with this email exists, we just sent another confirmation email to {email}": "Если учетная запись с этим адресом электронной почты существует, мы отправим еще одно письмо с подтверждением на адрес {email}",
   "If this identity is the only administrator of some groups, you need to delete them before being able to delete this identity.": "Если этот идентификатор является единственным администратором некоторых групп, то сперва нужно удалить эти группы, прежде чем вы сможете удалить этот идентификатор.",
+  "If you are being asked for your federated indentity, it's composed of your username and your instance. For instance, the federated identity for your first profile is:": "Если вас спрашивают ваш федеративный идентификатор, то он состоит из вашего имени пользователя и имени вашего узла. Например, федеративный идентификатор для вашего первого профиля:",
+  "If you have opted for manual validation of participants, Mobilizon will send you an email to inform you of new participations to be processed. You can choose the frequency of these notifications below.": "Если вы выбрали одобрение участников вручную, Mobilizon отправит вам электронное письмо о новых заявках на участие. Ниже вы можете выбрать, как часто вы желаете получать эти уведомления.",
   "If you want, you may send a message to the event organizer here.": "Здесь вы можете отправить сообщение организатору мероприятия.",
   "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.": "Приложение в этом контексте - это программное обеспечение, предоставленное командой Mobilizon или третьей стороной, которое используется для взаимодействия с вашим узлом.",
   "Instance": "Узел",
+  "Instance Long Description": "Подробное описание узла",
   "Instance Name": "Имя узла",
   "Instance Privacy Policy": "Политика конфиденциальности узла",
   "Instance Privacy Policy Source": "Источник политики конфиденциальности узла",
   "Instance Privacy Policy URL": "URL-адрес политики конфиденциальности узла",
   "Instance Rules": "Правила узла",
+  "Instance Short Description": "Краткое описание узла",
+  "Instance Slogan": "Слоган узла",
   "Instance Terms": "Условия использования узла",
   "Instance Terms Source": "Условия использования этого узла",
   "Instance Terms URL": "URL условий использования узла",
   "Instance administrator": "Администратор узла",
   "Instance configuration": "Настройки узла",
+  "Instance feeds": "Ленты узла",
+  "Instance languages": "Языки узла",
   "Instance rules": "Правила узла",
   "Instance settings": "Настройки узла",
   "Instances": "Узлы",
+  "Instances following you": "Узлы, подписанные на вас",
+  "Instances you follow": "Узлы, на которые вы подписаны",
   "Invite a new member": "Пригласить нового участника",
   "Invite member": "Пригласить участника",
+  "Invited": "Приглашён",
+  "It is possible that the content is not accessible on this instance, because this instance has blocked the profiles or groups behind this content.": "Контент может быть недоступен на этом узле, потому что узел заблокировал профили или группы, которым этот контент принадлежит.",
   "Italic": "Курсив",
   "Join <b>{instance}</b>, a Mobilizon instance": "Присоединиться к <b>{instance}</b>, узлу Mobilizon",
+  "Join group": "Вступить в группу",
+  "Keep the entire conversation about a specific topic together on a single page.": "Храните всю беседу по определенной теме на одной странице.",
+  "Key words": "Ключевые слова",
   "Language": "Язык",
+  "Last IP adress": "Последний IP-адрес",
+  "Last group created": "Последняя созданная группа",
   "Last published event": "Последнее опубликованное мероприятие",
+  "Last published events": "Последние опубликованные мероприятия",
+  "Last sign-in": "Последний вход",
   "Last week": "На прошлой неделе",
   "Latest posts": "Последние записи",
   "Learn more": "Узнать больше",
   "Learn more about Mobilizon": "Узнать больше о Mobilizon",
+  "Learn more about {instance}": "Подробнее о {instance}",
+  "Leave": "Покинуть",
   "Leave event": "Покинуть мероприятие",
   "Leaving event \"{title}\"": "Покинуть мероприятие \"{title}\"",
   "Legal": "Правовая информация",
@@ -244,6 +378,8 @@
   "Limited number of places": "Ограниченное количество мест",
   "List title": "Заголовок списка",
   "Load more": "Загрузить больше",
+  "Load more activities": "Загрузить больше действий",
+  "Loading comments…": "Загрузка комментариев…",
   "Local": "Местный",
   "Locality": "Местонахождение",
   "Location": "Местонахождение",
@@ -253,55 +389,82 @@
   "Login on Mobilizon!": "Авторизуйтесь на Mobilizon!",
   "Login on {instance}": "Войдите на узел {instance}",
   "Login status": "Статус входа",
+  "Main languages you/your moderators speak": "Основные языки, на которых говорите вы/ваши модераторы",
   "Manage participations": "Управление участниками",
+  "Manually approve new followers": "Одобрять новых подписчиков вручную",
+  "Manually invite new members": "Пригласите новых участников вручную",
   "Mark as resolved": "Отметить как решённое",
+  "Member": "Участник",
   "Members": "Участники",
   "Message": "Сообщение",
   "Mobilizon": "Mobilizon",
   "Mobilizon is a federated network. You can interact with this event from a different server.": "Mobilizon - это федеративная сеть. Вы можете взаимодействовать с этим мероприятием с другого сервера.",
+  "Mobilizon is a federated software, meaning you can interact - depending on your admin's federation settings - with content from other instances, such as joining groups or events that were created elsewhere.": "Mobilizon - это федеративное программное обеспечение. Это означает, что в зависимости от настроек федерализации администратором, вы можете взаимодействовать с контентом на других узлах, например присоединяться к группам или мероприятиям, созданным в другом месте.",
+  "Mobilizon is a tool that helps you <b>find, create and organise events</b>.": "Mobilizon - это инструмент, который поможет вам <b>находить, создавать и организовывать мероприятия</b>.",
+  "Mobilizon is not a giant platform, but a <b>multitude of interconnected Mobilizon websites</b>.": "Mobilizon - это не огромная платформа, а <b>множество взаимосвязанных узлов Mobilizon</b>.",
   "Mobilizon software": "Программное обеспечение Mobilizon",
+  "Mobilizon uses a system of profiles to compartiment your activities. You will be able to create as many profiles as you want.": "Mobilizon использует разные профили для разных видов деятельности. Вы можете создать столько профилей, сколько захотите.",
   "Mobilizon version": "Версия Mobilizon",
   "Mobilizon will send you an email when the events you are attending have important changes: date and time, address, confirmation or cancellation, etc.": "Mobilizon отправит вам электронное письмо, если в мероприятиях, в которых вы участвуете, произошли важные изменения: дата и время, адрес, подтверждение или отмена и т.д.",
   "Moderated comments (shown after approval)": "Модерируемые комментарии (будут видны после одобрения)",
-  "Moderation": "На модерации",
+  "Moderation": "Модерирование",
-  "Moderation log": "Журнал модерации",
+  "Moderation log": "Журнал модерирования",
   "Moderator": "Модератор",
   "Move": "Переместить",
+  "Move \"{resourceName}\"": "Переместить \"{resourceName}\"",
+  "Move resource to {folder}": "Переместить ресурс в {folder}",
   "My account": "Моя учётная запись",
   "My events": "Мои мероприятия",
   "My groups": "Мои группы",
   "My identities": "Мои идентификаторы",
+  "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.": "ВНИМАНИЕ! Условия по умолчанию не были проверены юристом и, вероятно, не обеспечивают полную правовую защиту во всех ситуациях для администратора узла, использующего их. Они также не подходит для каждого государства и правовой системы. Если вы не уверены, проконсультируйтесь с юристом.",
   "Name": "Имя",
+  "New discussion": "Новое обсуждение",
   "New email": "Новый адрес электронной почты",
   "New folder": "Новая папка",
   "New link": "Новая ссылка",
+  "New members": "Новые участники",
   "New note": "Новая заметка",
   "New password": "Новый пароль",
+  "New post": "Новая публикация",
   "New profile": "Новый профиль",
+  "Next": "Следующий",
+  "Next month": "В следующем месяце",
   "Next page": "Следующая страница",
+  "Next week": "На следующей неделе",
   "No address defined": "Адрес не указан",
   "No closed reports yet": "Пока нет закрытых отчётов",
   "No comment": "Нет комментариев",
   "No comments yet": "Пока нет комментариев",
+  "No discussions yet": "Пока нет обсуждений",
   "No end date": "Без даты окончания",
   "No events found": "Мероприятий не найдено",
+  "No follower matches the filters": "Ни один подписчик не соответствует критериям",
   "No group found": "Группа не найдена",
   "No groups found": "Группы не найдены",
+  "No information": "Нет информации",
   "No instance follows your instance yet.": "Ни один узел еще не подписан на ваш узел.",
   "No instance to approve|Approve instance|Approve {number} instances": "Нет узлов для одобрения | Одобрить узел | Одобрить {number} узлов",
   "No instance to reject|Reject instance|Reject {number} instances": "Нет узлов для отклонения | Отклонить узел | Отклонить {number} узлов",
   "No instance to remove|Remove instance|Remove {number} instances": "Нет узлов для удаления | Удалить узел | Удалить {number} узлов",
+  "No languages found": "Язык не найден",
+  "No member matches the filters": "Ни один участник не соответствует критериям",
   "No message": "Нет сообщений",
-  "No moderation logs yet": "Журналов модерации пока нет",
+  "No moderation logs yet": "Журналов модерования пока нет",
-  "No one is going to this event": "Никто не идёт на это мероприятие|Один человек пойдёт|{going} людей пойдут",
+  "No more activity to display.": "Больше нет действия для отображения.",
   "No open reports yet": "Пока нет открытых отчётов",
   "No participant matches the filters": "Ни один участник не соответствует критериям",
   "No participant to approve|Approve participant|Approve {number} participants": "Нет участников для одобрения | Принять участника | Принять {number} участников",
   "No participant to reject|Reject participant|Reject {number} participants": "Нет участников для отклонения | Отклонить участника | Отклонить {number} участников",
+  "No posts found": "Публикаций не найдено",
+  "No posts yet": "Публикаций пока нет",
   "No profile matches the filters": "Ни один профиль не соответствует критериям",
+  "No profiles found": "Профили не найдены",
   "No public upcoming events": "Нет предстоящих публичных мероприятий",
   "No resolved reports yet": "Решённых отчётов пока нет",
+  "No resources in this folder": "В этой папке нет ресурсов",
   "No resources selected": "Ресурсы не выбраны|Выбран один ресурс|Выбрано {count} ресурсов",
+  "No resources yet": "Ресурсов пока нет",
   "No results for \"{queryText}\"": "Нет результатов по запросу \"{queryText}\"",
   "No rules defined yet.": "Правила еще не определены.",
   "None": "Никто",
@@ -311,7 +474,9 @@
   "Nothing to see here": "Здесь ничего нет",
   "Notification before the event": "Уведомление перед мероприятием",
   "Notification on the day of the event": "Уведомление в день мероприятия",
+  "Notifications": "Уведомления",
   "Notifications for manually approved participations to an event": "Уведомления об участиях в мероприятиях, одобренных вручную",
+  "Now, create your first profile:": "Теперь создайте свой первый профиль:",
   "Number of places": "Количество мест",
   "OK": "OK",
   "Old password": "Прежний пароль",
@@ -319,12 +484,20 @@
   "On {date} ending at {endTime}": "{date}, заканчивается в {endTime}",
   "On {date} from {startTime} to {endTime}": "{date} c {startTime} до {endTime}",
   "On {date} starting at {startTime}": "{date}, начало в {startTime}",
+  "On {instance}": "На {instance}",
+  "Only accessible through link": "Доступно только по ссылке",
   "Only accessible through link (private)": "Доступно только по ссылке (приватно)",
+  "Only accessible to members of the group": "Доступно только участникам группы",
   "Only alphanumeric lowercased characters and underscores are supported.": "Допустимы только буквенно-цифровые символы нижнего регистра и подчеркивания.",
-  "Open": "Открыть",
+  "Only group members can access discussions": "Только участники группы имеют доступ к обсуждениям",
+  "Only group moderators can create, edit and delete posts.": "Только модераторы группы могут создавать, редактировать и удалять публикации.",
+  "Open": "Открыто",
+  "Open a topic on our forum": "Откройте тему на нашем форуме",
+  "Open an issue on our bug tracker (advanced users)": "Сообщить о проблеме в нашем багтрекере (для опытных пользователей)",
   "Opened reports": "Открытые отчёты",
   "Or": "Или",
   "Organized": "Организованно",
+  "Organized by": "Организатор",
   "Organized by {name}": "Организатор: {name}",
   "Organizer": "Организатор",
   "Organizer notifications": "Уведомления организатора",
@@ -335,6 +508,7 @@
   "Otherwise this identity will just be removed from the group administrators.": "В противном случае этот идентификатор будет удалён у администраторов группы.",
   "Page": "Страница",
   "Page limited to my group (asks for auth)": "Страница предназначена только для моей группы (требуется авторизация)",
+  "Parent folder": "Родительская папка",
   "Participant": "Участник",
   "Participants": "Участники",
   "Participate": "Принять участие",
@@ -349,24 +523,36 @@
   "Password reset": "Сброс пароля",
   "Past events": "Прошедшие мероприятия",
   "Pending": "В ожидании",
+  "Personal feeds": "Личные ленты",
+  "Pick": "Выбрать",
   "Pick a group": "Выберите группу",
+  "Pick a profile or a group": "Выберите профиль или группу",
   "Pick an identity": "Выберите идентификатор",
+  "Pick an instance": "Выберите узел",
+  "Please add as many details as possible to help identify the problem.": "Сообщите нам как можно больше подробностей, чтобы мы смогли идентифицировать проблему.",
   "Please check your spam folder if you didn't receive the email.": "Если вы не получили письмо, проверьте папку со спамом.",
   "Please contact this instance's Mobilizon admin if you think this is a mistake.": "Если вы считаете, что произошла ошибка, обратитесь к администратору этого узла.",
   "Please do not use it in any real way.": "Пожалуйста, используйте это только для тестовых целей.",
   "Please enter your password to confirm this action.": "Введите свой пароль, чтобы подтвердить это действие.",
   "Please make sure the address is correct and that the page hasn't been moved.": "Убедитесь, что адрес правильный и страница не была перемещена.",
+  "Please read the {fullRules} published by {instance}'s administrators.": "Пожалуйста, прочтите {fullRules}, опубликованные администраторами {instance}.",
+  "Post": "Публикация",
   "Post a comment": "Оставить комментарий",
   "Post a reply": "Ответить",
   "Postal Code": "Почтовый индекс",
+  "Posts": "Публикации",
   "Powered by {mobilizon}. © 2018 - {date} The Mobilizon Contributors - Made with the financial support of {contributors}.": "На основе {mobilizon}. © 2018 - {date} Участники Mobilizon - Создан благодаря финансовой поддержке {contributors}.",
-  "Preferences": "Предпочтения",
+  "Preferences": "Персональные настройки",
+  "Previous": "Предыдущий",
   "Previous page": "Предыдущая страница",
   "Privacy Policy": "Политика конфиденциальности",
   "Privacy policy": "Политика конфиденциальности",
   "Private event": "Приватное мероприятие",
   "Private feeds": "Приватная лента",
+  "Profile feeds": "Ленты профиля",
   "Profiles": "Профили",
+  "Profiles and federation": "Профили и федерализация",
+  "Promote": "Поднять",
   "Public": "Публичный",
   "Public RSS/Atom Feed": "Публичная RSS/Atom новостная лента",
   "Public comment moderation": "Модерация публичных комментариев",
@@ -374,36 +560,53 @@
   "Public feeds": "Публичные ленты",
   "Public iCal Feed": "Публичная iCal-лента",
   "Public page": "Публичная страница",
+  "Publication date": "Дата публикации",
   "Publish": "Опубликовать",
   "Published events with <b>{comments}</b> comments and <b>{participations}</b> confirmed participations": "Опубликованные мероприятия с <b>{comments}</b> комментариями и <b>{participations}</b> подтвержденными участниками",
   "RSS/Atom Feed": "RSS/Atom новостная лента",
+  "Radius": "Радиус",
   "Recap every week": "Подводить итоги каждую неделю",
   "Receive one email per request": "Получать электронное письмо на каждый запрос",
+  "Redirecting to content…": "Перенаправление к содержимому…",
+  "Refresh profile": "Обновить профиль",
+  "Regenerate new links": "Восстановить новые ссылки",
   "Region": "Область",
+  "Register an account on {instanceName}!": "Зарегистрируйте аккаунт на {instanceName}!",
   "Register on this instance": "Зарегистрируйтесь на этом узле",
   "Registration is allowed, anyone can register.": "Регистрация разрешена, зарегистрироваться может любой желающий.",
   "Registration is closed.": "Регистрация закрыта.",
   "Registration is currently closed.": "Регистрация на данный момент закрыта.",
-  "Registrations": "Регистрации",
+  "Registrations": "Регистрация",
+  "Registrations are restricted by allowlisting.": "Регистрация ограничена белым списком.",
+  "Reject": "Отклонить",
   "Rejected": "Отклонено",
+  "Remember my participation in this browser": "Запомнить моё участие для этого браузера",
+  "Remove": "Удалить",
   "Rename": "Переименовать",
   "Rename resource": "Переименовать ресурс",
   "Reopen": "Открыть заново",
   "Reply": "Ответ",
-  "Report": "Отчёт",
+  "Report": "Жалоба",
+  "Report #{reportNumber}": "Отчёт #{reportNumber}",
   "Report this comment": "Пожаловаться на этот комментарий",
   "Report this event": "Пожаловаться на это мероприятие",
+  "Report this group": "Пожаловаться на эту группу",
   "Reported": "Уведомлено",
   "Reported by": "Сообщил",
   "Reported by someone on {domain}": "Об этом сообщил пользователь из {domain}",
   "Reported by {reporter}": "Сообщил {reporter}",
+  "Reported group": "Жалоба на группу",
   "Reported identity": "Идентификатор сообщившего",
   "Reports": "Отчеты",
+  "Request for participation confirmation sent": "Запрос на подтверждение участия отправлен",
+  "Resend confirmation email": "Отправить письмо с подтверждением ещё раз",
   "Reset my password": "Сбросить пароль",
   "Resolved": "Решено",
   "Resource provided is not an URL": "Указанный ресурс не является URL-адресом",
   "Resources": "Ресурсы",
   "Restricted": "Ограниченный",
+  "Return to the group page": "Вернуться на страницу группы",
+  "Right now": "Прямо сейчас",
   "Role": "Роль",
   "Rules": "Правила",
   "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 и его преемник TLS - это технологии шифрования для защиты передачи данных при использовании сервиса. Вы можете увидеть в браузере, что соединение зашифровано, если адрес начинается с {https}, а в адресной строке есть значок замка.",
@@ -413,8 +616,11 @@
   "Search": "Поиск",
   "Search events, groups, etc.": "Искать мероприятия, группы и т. п.",
   "Searching…": "Поиск…",
+  "Search…": "Поиск…",
   "Select a language": "Выберите язык",
+  "Select a radius": "Выберите радиус",
   "Select a timezone": "Выберите часовой пояс",
+  "Select languages": "Выберите языки",
   "Send email": "Отправить электронное письмо",
   "Send the confirmation email again": "Отправьте письмо с подтверждением еще раз",
   "Send the report": "Отправить отчёт",
@@ -422,19 +628,25 @@
   "Set an URL to a page with your own terms.": "Установите URL-адрес на страницу с вашими собственными условиями.",
   "Settings": "Настройки",
   "Share this event": "Поделиться этим мероприятием",
+  "Short bio": "Коротко о себе",
   "Show map": "Показать карту",
   "Show remaining number of places": "Показать оставшееся количество мест",
   "Show the time when the event begins": "Показать время начала мероприятия",
   "Show the time when the event ends": "Показать время окончания мероприятия",
+  "Sign in with": "Войти в систему с",
   "Sign up": "Зарегистрироваться",
+  "Since you are a new member, private content can take a few minutes to appear.": "Поскольку вы новый участник, может потребоваться несколько минут, чтобы приватный контент стал видимым.",
   "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:": "Некоторые термины, технические или иные, используемые в приведенном ниже тексте, могут охватывать трудные для понимания концепции. Мы подготовили глоссарий чтобы помочь вам лучше их освоить:",
   "Starts on…": "Начало…",
   "Status": "Статус",
   "Street": "Улица",
   "Submit": "Отправить",
-  "Suspend": "Приостановить",
+  "Suspend": "Заблокировать",
+  "Suspend group": "Заблокировать группу",
   "Suspended": "Приостановлен",
   "Task lists": "Списки задач",
+  "Technical details": "Технические подробности",
+  "Tentative": "Предварительный",
   "Tentative: Will be confirmed later": "Предварительно: будет подтверждено позже",
   "Terms": "Условия",
   "Terms of service": "Условия обслуживания",
@@ -451,23 +663,60 @@
   "The event organizer didn't add any description.": "Организатор мероприятия не добавил описания.",
   "The event organizer manually approves participations. Since you've chosen to participate without an account, please explain why you want to participate to this event.": "Организатор мероприятия утверждает участие вручную. Поскольку вы выбрали участие без учётной записи, объясните, почему вы хотите участвовать в этом мероприятии.",
   "The event title will be ellipsed.": "Название этого мероприятие сокращено троеточием.",
+  "The event will show as attributed to this group.": "Событие будет отображаться как связанное с этой группой.",
+  "The event will show as attributed to this profile.": "Мероприятие будет отображаться как связанное с этим профилем.",
+  "The event will show as attributed to your personal profile.": "Мероприятие будет отображаться как связанное с вашим личным профилем.",
   "The event will show the group as organizer.": "На мероприятии группа будет представлена как организатор.",
+  "The event {event} was created by {profile}.": "Мероприятие {event} было создано пользователем {profile}.",
+  "The event {event} was deleted by {profile}.": "Мероприятие {event} было удалено пользователем {profile}.",
+  "The event {event} was updated by {profile}.": "Мероприятие {event} было обновлено пользователем {profile}.",
+  "The events you created are not shown here.": "Созданные вами мероприятия здесь не отображаются.",
+  "The group can now be joined by anyone.": "Теперь каждый может присоединиться к группе.",
+  "The group can now only be joined with an invite.": "Теперь к группе можно присоединиться только по приглашению.",
+  "The group will be publicly listed in search results and may be suggested in the explore section. Only public informations will be shown on it's page.": "Группа будет представлена в результатах поиска и может быть предложена в разделе «Обзор». На её странице будет отображаться только общедоступная информация.",
+  "The group's avatar was changed.": "Аватар группы был изменён.",
+  "The group's banner was changed.": "Баннер группы был изменён.",
+  "The group's physical address was changed.": "Физический адрес группы был изменён.",
+  "The group's short description was changed.": "Краткое описание группы было изменено.",
   "The instance administrator is the person or entity that runs this Mobilizon instance.": "Администратор узла - это физическое или юридическое лицо, которое управляет данным узлом Mobilizon.",
+  "The member was removed from the group {group}": "Участник удалён из группы {group}",
+  "The only way for your group to get new members is if an admininistrator invites them.": "Новые участники смогут вступать в вашу группу только по приглашению администратора.",
+  "The organiser has chosen to close comments.": "Организатор решил отключить комментарии.",
   "The page you're looking for doesn't exist.": "Страницы, которую вы ищете, не существует.",
   "The password was successfully changed": "Пароль был успешно изменен",
+  "The post {post} was created by {profile}.": "Публикация {post} была создана пользователем {profile}.",
+  "The post {post} was deleted by {profile}.": "Публикация {post} была удалена пользователем {profile}.",
+  "The post {post} was updated by {profile}.": "Публикация {post} была обновлена пользователем {profile}.",
   "The report will be sent to the moderators of your instance. You can explain why you report this content below.": "Отчёт будет отправлен модераторам вашего узла. Вы можете объяснить причину своей жалобы ниже.",
+  "The selected picture is too heavy. You need to select a file smaller than {size}.": "Выбранное изображение слишком большое. Вы должны выбрать файл меньше, чем {size}.",
+  "The technical details of the error can help developers solve the problem more easily. Please add them to your feedback.": "Технические подробности ошибки могут помочь разработчикам быстрее решить проблему. Пожалуйста, добавьте их в свой отзыв.",
   "The {default_privacy_policy} will be used. They will be translated in the user's language.": "Будет использоваться {default_privacy_policy}. Они будут переведены на язык пользователя.",
   "The {default_terms} will be used. They will be translated in the user's language.": "Будут использоваться {default_terms}. Они будут переведены на язык пользователя.",
   "There are {participants} participants.": "Имеется {participants} участников.",
+  "There is no activity yet. Start doing some things to see activity appear here.": "Пока нет действий. Действия появятся здесь, после того, как вы сделаете что-либо.",
   "There will be no way to recover your data.": "Восстановить ваши данные будет невозможно.",
+  "There's no discussions yet": "Пока нет обсуждений",
   "These events may interest you": "Эти мероприятия могут вас заинтересовать",
+  "These feeds contain event data for the events for which any of your profiles is a participant or creator. You should keep these private. You can find feeds for specific profiles on each profile edition page.": "Эти ленты содержат данные о мероприятиях, участником или создателем которых является любой из ваших профилей. Вы должны держать их в секрете. Вы можете найти ленты для конкретного профиля на его странице с настройками.",
+  "These feeds contain event data for the events for which this specific profile is a participant or creator. You should keep these private. You can find feeds for all of your profiles into your notification settings.": "Эти ленты содержат данные о мероприятиях, участником или создателем которых является данный профиль. Вы должны держать их в секрете. Вы можете найти ленты для всех ваших профилей в настройках уведомлений.",
   "This Mobilizon instance and this event organizer allows anonymous participations, but requires validation through email confirmation.": "Этот узел Mobilizon и этот организатор мероприятия допускают анонимное участие, но требуют подтверждения по электронной почте.",
+  "This URL is not supported": "Этот URL не поддерживается",
   "This event has been cancelled.": "Это мероприятие было отменено.",
   "This event is accessible only through it's link. Be careful where you post this link.": "Это мероприятие доступно только по ссылке. Будьте осторожны, когда публикуете её.",
+  "This group doesn't have a description yet.": "У этой группы ещё нет описания.",
+  "This group is invite-only": "Эта группа только для приглашённых",
+  "This identifier is unique to your profile. It allows others to find you.": "Этот идентификатор уникален для вашего профиля. Он даёт возможность другим найти вас.",
   "This identity is not a member of any group.": "Этот идентификатор не является членом какой-либо группы.",
   "This information is saved only on your computer. Click for details": "Эта информация сохраняется только на вашем компьютере. Нажмите, чтобы узнать подробности",
   "This instance isn't opened to registrations, but you can register on other instances.": "Этот узел не позволяет регистрироваться, но вы можете зарегистрироваться на других.",
+  "This instance, <b>{instanceName} ({domain})</b>, hosts your profile, so remember its name.": "Этот узел, <b>{instanceName} ({domain})</b>, содержит ваш профиль, поэтому запомните его имя.",
   "This is a demonstration site to test Mobilizon.": "Это демонстрационная площадка для тестирования Mobilizon.",
+  "This is like your federated username (<code>{username}</code>) for groups. It will allow the group to be found on the federation, and is guaranteed to be unique.": "Подобно федеративному имени пользователя (<code>{username}</code>) для групп. Это дает возможность найти группу во всей сети и гарантирует ее уникальность.",
+  "This month": "В этом месяце",
+  "This setting will be used to display the website and send you emails in the correct language.": "Этот параметр используется для отображения веб-сайта и отправки вам электронных писем на соответствующем языке.",
+  "This website isn't moderated and the data that you enter will be automatically destroyed every day at 00:01 (Paris timezone).": "Эта веб-сайт не модерируется, и любые введенные вами данные будут автоматически удаляться каждый день в 00:01 (время по Парижу).",
+  "This week": "На этой неделе",
+  "This weekend": "На эти выходные",
   "This will delete / anonymize all content (events, comments, messages, participations…) created from this identity.": "Это приведет к удалению / анонимизации всего контента (событий, комментариев, сообщений, участия…), созданного с помощью этого идентификатора.",
   "Timezone": "Часовой пояс",
   "Timezone detected as {timezone}.": "Часовой пояс определен как {timezone}.",
@@ -475,36 +724,65 @@
   "To activate more notifications, head over to the notification settings.": "Перейдите в настройки уведомлений, чтобы включить дополнительные уведомления.",
   "To confirm, type your event title \"{eventTitle}\"": "Для подтверждения введите название мероприятия \"{eventTitle}\"",
   "To confirm, type your identity username \"{preferredUsername}\"": "Для подтверждения введите имя пользователя \"{preferredUsername}\" идентификатора",
+  "To create and manage multiples identities from a same account": "Для создания и управления несколькими идентификаторами из одной учётной записи",
+  "To create and manage your events": "Для создания и управления вашими мероприятиями",
+  "To create or join an group and start organizing with other people": "Создавать группы и присоединяться к ним для объединения с другими людьми",
+  "To register for an event by choosing one of your identities": "Чтобы зарегистрироваться на мероприятие, выбрав один из ваших идентификаторов",
+  "Today": "Сегодня",
+  "Tomorrow": "Завтра",
   "Transfer to {outsideDomain}": "Перенос в {outsideDomain}",
   "Type": "Тип",
+  "Type or select a date…": "Введите или выберите дату…",
   "URL": "URL-адрес",
+  "URL copied to clipboard": "URL скопирован в буфер обмена",
+  "Unable to copy to clipboard": "Невозможно скопировать в буфер обмена",
+  "Unable to create the group. One of the pictures may be too heavy.": "Группа не может быть создана. Одно из изображений, похоже, слишком большое.",
+  "Unable to create the profile. The avatar picture may be too heavy.": "Профиль не может быть создан. Аватарка, похоже, слишком большая..",
+  "Unable to detect timezone.": "Не удалось определить часовой пояс.",
+  "Unable to load event for participation. The error details are provided below:": "Не удалось загрузить мероприятие для участия. Подробная информация об ошибке представлена ниже:",
+  "Unable to save your participation in this browser.": "Невозможно сохранить статус вашего участия в этом браузере.",
+  "Unable to update the profile. The avatar picture may be too heavy.": "Профиль не может быть обновлен. Аватарка, похоже, слишком большая.",
   "Unfortunately, this instance isn't opened to registrations": "К сожалению, регистрация на этом узле закрыта",
   "Unfortunately, your participation request was rejected by the organizers.": "К сожалению, ваша заявка на участие была отклонена организаторами.",
   "Unknown": "Неизвестный",
   "Unknown actor": "Неизвестный агент",
   "Unknown error.": "Неизвестная ошибка.",
+  "Unknown value for the openness setting.": "Неизвестное значение ограничений доступа.",
   "Unsaved changes": "Несохранённые изменения",
   "Unset group": "Отменить выбор группы",
   "Unsuspend": "Отменить приостановку",
   "Upcoming": "Предстоящие",
   "Upcoming events": "Предстоящие мероприятия",
+  "Update": "Обновить",
   "Update event {name}": "Обновить мероприятие {name}",
+  "Update group": "Обновить группу",
   "Update my event": "Обновить моё мероприятие",
+  "Update post": "Обновить пост",
   "Updated": "Обновлено",
+  "Uploaded media size": "Размер загруженного медиафайла",
   "Use my location": "Использовать моё местоположение",
   "User": "Пользователь",
   "Username": "Имя пользователя",
   "Users": "Пользователи",
   "View a reply": "|Посмотреть один ответ|Посмотреть {totalReplies} ответов",
+  "View all": "Посмотреть всё",
+  "View all events": "Посмотреть все мероприятия",
+  "View all posts": "Просмотреть все публикации",
   "View event page": "Просмотреть страницу мероприятия",
   "View everything": "Посмотреть всё",
   "View page on {hostname} (in a new window)": "Просмотреть страницу на {hostname} (в новом окне)",
+  "Visibility was set to an unknown value.": "Видимость изменена на неизвестное значение.",
+  "Visibility was set to private.": "Видимость изменена на приватную.",
+  "Visibility was set to public.": "Видимость изменена на публичную.",
+  "Visible everywhere on the web": "Видно всем в Интернете",
   "Visible everywhere on the web (public)": "Видно во всем Интернете (публично)",
   "Waiting for organization team approval.": "Ожидает одобрения организаторами.",
   "Warning": "Предупреждение",
+  "We improve this software thanks to your feedback. To let us know about this issue, two possibilities (both unfortunately require user account creation):": "Мы улучшаем это программное обеспечение благодаря вашим отзывам. У вас есть два способа сообщить нам об этой проблеме (оба, увы, требуют создания учетной записи пользователя):",
   "We just sent an email to {email}": "Мы отправили электронное письмо на адрес {email}",
   "We use your timezone to make sure you get notifications for an event at the correct time.": "Мы используем настройки вашего часового пояса, чтобы вы своевременно получали уведомления о мероприятиях.",
   "We will redirect you to your instance in order to interact with this event": "Вы будете перенаправлены на свой узел, чтобы иметь возможность взаимодействовать с этим событием",
+  "We will redirect you to your instance in order to interact with this group": "Мы перенаправим вас на ваш узел, чтобы вы могли взаимодействовать с этой группой",
   "We'll send you an email one hour before the event begins, to be sure you won't forget about it.": "Мы отправим вам электронное письмо за час до начала мероприятия, чтобы вы не забыли про него.",
   "We'll use your timezone settings to send a recap of the morning of the event.": "Мы используем настройки вашего часового пояса, чтобы утром отправить вам напоминание о мероприятии.",
   "Website": "Веб-сайт",
@@ -512,32 +790,97 @@
   "Welcome back {username}!": "С возвращением, {username}!",
   "Welcome back!": "С возвращением!",
   "Welcome to Mobilizon, {username}!": "Добро пожаловать в Mobilizon, {username}!",
+  "What can I do to help?": "Чем я могу помочь?",
+  "When a moderator from the group creates an event and attributes it to the group, it will show up here.": "Когда модератор группы создаёт событие и назначает его группе, оно появляется здесь.",
   "Who can view this event and participate": "Кто может просматривать и участвовать в мероприятии",
+  "Who can view this post": "Кто может видеть этот пост",
   "Who published {number} events": "Которые опубликовали {number} мероприятий",
+  "Why create an account?": "Почему стоит создать учётную запись?",
+  "Will allow to display and manage your participation status on the event page when using this device. Uncheck if you're using a public device.": "Это позволит вам просматривать и управлять своим статусом участия на странице мероприятия при использовании этого устройства. Снимите флажок, если вы используете общедоступное устройство.",
+  "Within {number} kilometers of {place}": "|В пределах километра от {place}|В пределах {number} километров от {place}",
   "Write something…": "Напиши что-нибудь…",
+  "Yesterday": "Вчера",
+  "You accepted the invitation to join the group.": "Вы приняли приглашение присоединиться к группе.",
+  "You added the member {member}.": "Вы добавили участника {member}.",
+  "You archived the discussion {discussion}.": "Вы отправили {discussion} обсуждение в архив.",
+  "You are not an administrator for this group.": "Вы не являетесь администратором этой группы.",
+  "You are not part of any group.": "Вы не состоите ни в одной группе.",
   "You are participating in this event anonymously": "Вы участвуете в этом мероприятии анонимно",
   "You are participating in this event anonymously but didn't confirm participation": "Вы участвуете в этом мероприятии анонимно, но не подтвердили свое участие",
   "You can add tags by hitting the Enter key or by adding a comma": "Вы можете добавлять тэги, нажимая клавишу Enter или разделяя слова запятой",
   "You can pick your timezone into your preferences.": "Вы можете изменить часовой пояс по своему усмотрению.",
   "You can try another search term or drag and drop the marker on the map": "Вы можете попробовать другие критерии поиска или перетащить маркер на карту",
+  "You can't change your password because you are registered through {provider}.": "Вы не можете изменить свой пароль, потому что вы зарегистрированы через {provider}.",
+  "You created the discussion {discussion}.": "Вы создали обсуждение {discussion}.",
+  "You created the event {event}.": "Вы создали мероприятие {event}.",
+  "You created the folder {resource}.": "Вы создали папку {resource}.",
+  "You created the group {group}.": "Вы создали группу {group}.",
+  "You created the post {post}.": "Вы создали публикацию {post}.",
+  "You created the resource {resource}.": "Вы создали ресурс {resource}.",
+  "You deleted the discussion {discussion}.": "Вы удалили обсуждение {discussion}.",
+  "You deleted the event {event}.": "Вы удалили мероприятие {event}.",
+  "You deleted the folder {resource}.": "Вы удалили папку {resource}.",
+  "You deleted the post {post}.": "Вы удалили публикацию {post}.",
+  "You deleted the resource {resource}.": "Вы удалили ресурс {resource}.",
+  "You demoted the member {member} to an unknown role.": "Вы понизили статус {member} до неизвестной роли.",
+  "You demoted {member} to moderator.": "Вы понизили статус {member} до модератора.",
+  "You demoted {member} to simple member.": "Вы понизили статус {member} до обычного участника.",
+  "You didn't create or join any event yet.": "Вы ещё не создали и не участвовали ни в одном мероприятии.",
   "You don't follow any instances yet.": "Вы пока не подписаны ни на один узел.",
+  "You excluded member {member}.": "Вы исключили участника {member}.",
   "You have been disconnected": "Вы были отключены",
   "You have been invited by {invitedBy} to the following group:": "Вы были приглашены пользователем {invitedBy} в следующую группу:",
+  "You have been removed from this group's members.": "Вы были удалены из участников этой группы.",
   "You have cancelled your participation": "Вы отказались от участия",
   "You have one event in {days} days.": "У вас нет мероприятий в течение {days} дней | У вас одно мероприятие в течении {days} дней | У вас {count} мероприятий в течении {days} дней",
   "You have one event today.": "У вас сегодня нет мероприятий | У вас сегодня одно мероприятие. | У вас сегодня {count} мероприятий",
   "You have one event tomorrow.": "Завтра у вас нет мероприятий | Завтра у вас одно мероприятие. | Завтра у вас {count} мероприятий",
+  "You invited {member}.": "Вы пригласили {member}.",
+  "You may clear all participation information for this device with the buttons below.": "Вы можете удалить всю информацию об участии для этого устройства с помощью кнопок ниже.",
+  "You may now close this window, or {return_to_event}.": "Теперь вы можете закрыть это окно, или {return_to_event}.",
+  "You may show some members as contacts.": "Вы можете просматривать некоторых участников как контакты.",
+  "You moved the folder {resource} into {new_path}.": "Вы переместили папку {resource} в {new_path}.",
+  "You moved the folder {resource} to the root folder.": "Вы переместили папку {resource} в корневую папку.",
+  "You moved the resource {resource} into {new_path}.": "Вы переместили ресурс {resource} в {new_path}.",
+  "You moved the resource {resource} to the root folder.": "Вы переместили ресурс {resource} в корневую папку.",
   "You need to create the group before you create an event.": "Перед созданием мероприятия вам необходимо создать группу.",
   "You need to login.": "Вы должны авторизоваться.",
+  "You posted a comment on the event {event}.": "Вы оставили комментарий к мероприятию {event}.",
+  "You promoted the member {member} to an unknown role.": "Вы повысили статус {member} до неизвестной роли.",
+  "You promoted {member} to administrator.": "Вы повысили статус {member} до администратора.",
+  "You promoted {member} to moderator.": "Вы повысили статус {member} до модератора.",
+  "You renamed the discussion from {old_discussion} to {discussion}.": "Вы переименовали обсуждение с {old_discussion} в {discussion}.",
+  "You renamed the folder from {old_resource_title} to {resource}.": "Вы переименовали папку с {old_resource_title} в {resource}.",
+  "You renamed the resource from {old_resource_title} to {resource}.": "Вы переименовали ресурс с {old_resource_title} в {resource}.",
+  "You replied to a comment on the event {event}.": "Вы ответили на комментарий к мероприятию {event}.",
+  "You replied to the discussion {discussion}.": "Вы ответили на обсуждение {discussion}.",
+  "You requested to join the group.": "Вы попросили присоединиться к группе.",
+  "You updated the event {event}.": "Вы обновили мероприятие {event}.",
+  "You updated the group {group}.": "Вы обновили группу {group}.",
+  "You updated the member {member}.": "Вы обновили участника {member}.",
+  "You updated the post {post}.": "Вы обновили публикацию {post}.",
+  "You were demoted to an unknown role by {profile}.": "{profile} понизил ваш статус до неизвестной роли.",
+  "You were demoted to moderator by {profile}.": "{profile} понизил ваш статус до модератора.",
+  "You were demoted to simple member by {profile}.": "{profile} понизил ваш статус до обычного участника.",
+  "You were promoted to administrator by {profile}.": "{profile} повысил ваш статус до администратора.",
+  "You were promoted to an unknown role by {profile}.": "{profile} повысил ваш статус до неизвестной роли.",
+  "You were promoted to moderator by {profile}.": "{profile} повысил ваш статус до модератора.",
+  "You will be able to add an avatar and set other options in your account settings.": "Вы сможете добавить аватар и изменить другие параметры в настройках своей учётной записи.",
   "You will be redirected to the original instance": "Вы будете перенаправлены на исходный узел",
+  "You will find here all the events you have created or of which you are a participant.": "Здесь вы найдёте все мероприятия, которые вы создали или в которых участвовали.",
   "You wish to participate to the following event": "Вы хотите принять участие в следующем мероприятии",
   "You'll get a weekly recap every Monday for upcoming events, if you have any.": "Каждый понедельник вы будете получать сводку о предстоящих мероприятиях, в которых вы принимаете участие.",
+  "You'll need to change the URLs where there were previously entered.": "Вы должны изменить URL-адреса там, где они были введены ранее.",
+  "You'll need to transmit the group URL so people may access the group's profile. The group won't be findable in Mobilizon's search or regular search engines.": "Вы должны предоставить URL-адрес группы, чтобы другие могли получить доступ к её профилю. Группу нельзя будет найти ни в поиске Mobilizon, ни в обычных поисковых системах.",
   "You'll receive a confirmation email.": "Вы получите электронное письмо с подтверждением.",
   "Your account has been successfully deleted": "Ваша учетная запись была успешно удалена",
   "Your account has been validated": "Ваша учетная запись была подтверждена",
   "Your account is being validated": "Ваша учетная запись проверяется",
   "Your account is nearly ready, {username}": "Ваш аккаунт почти готов, {username}",
-  "Your current email is {email}. You use it to log in.": "Ваш текущий адрес электронной почты{email}. Вы используете его для входа в систему.",
+  "Your city or region and the radius will only be used to suggest you events nearby. The event radius will consider the administrative center of the area.": "Ваш город, регион или область будут использоваться только для рекомендации вам ближайших мероприятий. Радиус мероприятия считается относительно административного центра области.",
+  "Your current email is {email}. You use it to log in.": "Ваш адрес электронной почты {email}. Вы используете его для входа в систему.",
+  "Your email": "Ваш адрес электронной почты",
+  "Your email address was automatically set based on your {provider} account.": "Ваш адрес электронной почты был автоматически установлен на основе вашей учётной записи {provider}.",
   "Your email has been changed": "Ваш адрес электронной почты был изменен",
   "Your email is being changed": "Ваш адрес электронной почты меняется",
   "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.": "Ваш адрес электронной почты будет использоваться только для подтверждения того, что вы настоящий человек, и для отправки вам возможных новостей об этом мероприятии. Он НЕ будет передан другим узлам или организатору мероприятия.",
@@ -548,28 +891,53 @@
   "Your participation request has been validated": "Ваше участие подтверждено",
   "Your participation request is being validated": "Ваше участие проверяется",
   "Your participation status has been changed": "Ваш статус участия был изменен",
+  "Your participation status is saved only on this device and will be deleted one month after the event's passed.": "Ваш статус участия сохраняется только на этом устройстве и будет удалён через месяц после завершения мероприятия.",
+  "Your participation still has to be approved by the organisers.": "Ваша заявка всё ещё ожидает одобрения организаторов.",
+  "Your participation will be validated once you click the confirmation link into the email, and after the organizer manually validates your participation.": "Ваше участие будет подтверждено, когда вы перейдете по ссылке в электронном письме, а также после того, как организатор вручную одобрит ваше участие.",
+  "Your participation will be validated once you click the confirmation link into the email.": "Ваше участие будет подтверждено, как только вы перейдете по ссылке в электронном письме.",
+  "Your profile will be shown as contact.": "Ваш профиль будет отображаться как контакт.",
   "Your timezone is currently set to {timezone}.": "Ваш часовой пояс в настоящее время установлен на {timezone}.",
   "Your timezone was detected as {timezone}.": "Ваш часовой пояс был определен как {timezone}.",
+  "Your timezone {timezone} isn't supported.": "Ваш часовой пояс {timezone} не поддерживается.",
+  "Your upcoming events": "Ваши предстоящие мероприятия",
+  "[This comment has been deleted by it's author]": "[Этот комментарий был удален автором]",
   "[This comment has been deleted]": "[Этот комментарий был удалён]",
   "[deleted]": "[удалено]",
   "a non-existent report": "несуществующий отчет",
+  "and {number} groups": "и {number} групп",
+  "any distance": "любое расстояние",
   "as {identity}": "как {identity}",
+  "contact uninformed": "контакт не уведомлен",
+  "create a group": "создать группу",
+  "create an event": "создать мероприятие",
   "default Mobilizon privacy policy": "Политика конфиденциальности Mobilizon по умолчанию",
   "default Mobilizon terms": "условия использования Mobilizon по умолчанию",
   "e.g. 10 Rue Jangot": "например: Садовая 10",
+  "explore the events": "просмотреть мероприятия",
+  "explore the groups": "посмотреть группы",
   "full rules": "полные правила",
   "iCal Feed": "iCal лента",
   "instance rules": "правила узла",
   "more than 1360 contributors": "более 1360 участников",
   "profile@instance": "профиль@узел",
   "report #{report_number}": "отчёт #{report_number}",
+  "return to the event's page": "вернуться на страницу мероприятия",
   "terms of service": "условия обслуживания",
   "with another identity…": "с другим идентификатором…",
   "{approved} / {total} seats": "{approved} / {total} мест",
   "{available}/{capacity} available places": "Мест нет|{available}/{capacity} свободных мест",
+  "{count} km": "{count} км",
   "{count} participants": "Нет участников | Один участник | {count} участников",
   "{count} requests waiting": "{count} ожидающих рассмотрения заявок",
+  "{count} team members": "{count} членов команды",
+  "{group} activity timeline": "История активности {group}",
+  "{group}'s events": "Мероприятия {group}",
   "{instanceName} is an instance of the {mobilizon} software.": "{instanceName} - это узел использующий ПО {mobilizon}.",
+  "{instanceName} is an instance of {mobilizon_link}, a free software built with the community.": "{instanceName} — это узел {mobilizon_link}, бесплатного программного обеспечения, созданного при участии сообщества.",
+  "{member} accepted the invitation to join the group.": "{member} принял приглашение присоединиться к группе.",
+  "{member} rejected the invitation to join the group.": "{member} отклонил приглашение присоединиться к группе.",
+  "{member} requested to join the group.": "{member} попросил присоединиться к группе.",
+  "{member} was invited by {profile}.": "{member} был приглашен пользователем {profile}.",
   "{moderator} added a note on {report}": "{moderator} добавил примечание к {report}",
   "{moderator} closed {report}": "{moderator} закрыл {report}",
   "{moderator} deleted an event named \"{title}\"": "{moderator} удалил мероприятие с названием \"{title}\"",
@@ -578,9 +946,43 @@
   "{moderator} marked {report} as resolved": "{moderator} пометил {report} как решённый",
   "{moderator} reopened {report}": "{moderator} повторно открыл {report}",
   "{moderator} suspended profile {profile}": "{moderator} заблокировал профиль {profile}",
+  "{nb} km": "{nb} км",
+  "{number} members": "{number} участников",
   "{number} organized events": "Нет организованных мероприятий|Организованно одно мероприятие|Организованно {number} мероприятий",
   "{number} participations": "Нет участников|Один участник|{number} участников",
+  "{number} posts": "Нет публикаций|Одна публикация|{number} публикаций",
+  "{old_group_name} was renamed to {group}.": "{old_group_name} переименована в {group}.",
   "{profile} (by default)": "{profile} (по умолчанию)",
+  "{profile} added the member {member}.": "{profile} добавил участника {member}.",
+  "{profile} archived the discussion {discussion}.": "{profile} отправил обсуждение {discussion} в архив.",
+  "{profile} created the discussion {discussion}.": "{profile} создал обсуждение {discussion}.",
+  "{profile} created the folder {resource}.": "{profile} создал папку {resource}.",
+  "{profile} created the group {group}.": "{profile} создал группу {group}.",
+  "{profile} created the resource {resource}.": "{profile} создал ресурс {resource}.",
+  "{profile} deleted the discussion {discussion}.": "{profile} удалил обсуждение {discussion}.",
+  "{profile} deleted the folder {resource}.": "{profile} удалил папку {resource}.",
+  "{profile} deleted the resource {resource}.": "{profile} удалил ресурс {resource}.",
+  "{profile} demoted {member} to an unknown role.": "{profile} понизил статус {member} до неизвестной роли.",
+  "{profile} demoted {member} to moderator.": "{profile} понизил статус {member} до модератора.",
+  "{profile} demoted {member} to simple member.": "{profile} понизил статус {member} до обычного участника.",
+  "{profile} excluded member {member}.": "{profile} исключил участника {member}.",
+  "{profile} moved the folder {resource} into {new_path}.": "{profile} переместил папку {resource} в {new_path}.",
+  "{profile} moved the folder {resource} to the root folder.": "{profile} переместил папку {resource} в корневую папку.",
+  "{profile} moved the resource {resource} into {new_path}.": "{profile} переместил ресурс {resource} в {new_path}.",
+  "{profile} moved the resource {resource} to the root folder.": "{profile} переместил ресурс {resource} в корневую папку.",
+  "{profile} posted a comment on the event {event}.": "{profile} оставил комментарий к мероприятию {event}.",
+  "{profile} promoted {member} to administrator.": "{profile} повысил статус {member} до администратора.",
+  "{profile} promoted {member} to an unknown role.": "{profile} повысил статус {member} до неизвестной роли.",
+  "{profile} promoted {member} to moderator.": "{profile} повысил статус {member} до модератора.",
+  "{profile} quit the group.": "{profile} покинул группу.",
+  "{profile} renamed the discussion from {old_discussion} to {discussion}.": "{profile} переименовал обсуждение с {old_discussion} в {discussion}.",
+  "{profile} renamed the folder from {old_resource_title} to {resource}.": "{profile} переименовал папку с {old_resource_title} в {resource}.",
+  "{profile} renamed the resource from {old_resource_title} to {resource}.": "{profile} переименовал ресурс с {old_resource_title} в {resource}.",
+  "{profile} replied to a comment on the event {event}.": "{profile} ответил на комментарий к мероприятию {event}.",
+  "{profile} replied to the discussion {discussion}.": "{profile} ответил на обсуждение {обсуждение}.",
+  "{profile} updated the group {group}.": "{profile} обновил группу {group}.",
+  "{profile} updated the member {member}.": "{profile} обновил участника {member}.",
   "{title} ({count} todos)": "{title} ({count} незавершенных задач)",
+  "{username} was invited to {group}": "{username} был приглашён в {group}",
   "© The OpenStreetMap Contributors": "© Авторы OpenStreetMap"
 }

js/src/i18n/sl.json

@@ -123,10 +123,10 @@
   "Click to upload": "Kliknite za pošiljanje",
   "Close": "Zapri",
   "Close comments for all (except for admins)": "Zapri komentarje za vse (razen za skrbnike)",
-  "Close events": "Zapri dogodke",
   "Closed": "Zaprto",
   "Comment deleted": "Komentar je izbrisan",
   "Comment from @{username} reported": "Prijavljen je bil komentar uporabnika @{username}",
+  "Comment text can't be empty": "Besedilo komentarja ne sme biti prazno",
   "Comments": "Komentarji",
   "Comments are closed for everybody else.": "Komentarji so zaprti za vse ostale.",
   "Confirm my participation": "Potrdi mojo udeležbo",
@@ -141,14 +141,14 @@
   "Copy details to clipboard": "Kopiraj podrobnosti v odložišče",
   "Country": "Država",
   "Create": "Ustvari",
-  "Create a calc": "Ustvari tabelo",
+  "Create a calc": "Ustvari preglednico",
   "Create a discussion": "Ustvari razpravo",
   "Create a folder": "Ustvari mapo",
   "Create a new event": "Ustvari nov dogodek",
   "Create a new group": "Ustvari novo skupino",
   "Create a new identity": "Ustvari novo identiteto",
   "Create a new list": "Ustvari nov seznam",
-  "Create a pad": "Ustvari zapisnik",
+  "Create a pad": "Ustvari beležko",
   "Create a videoconference": "Ustvari videokonferenco",
   "Create an account": "Ustvari račun",
   "Create event": "Ustvari dogodek",
@@ -156,6 +156,7 @@
   "Create my event": "Ustvari moj dogodek",
   "Create my group": "Ustvari mojo skupino",
   "Create my profile": "Ustvari moj profil",
+  "Create new links": "Ustvari nove povezave",
   "Create resource": "Ustvari vir",
   "Create the discussion": "Ustvari razpravo",
   "Create to-do lists for all the tasks you need to do, assign them and set due dates.": "Ustvarite sezname opravil za vse naloge, ki jih morate opraviti, jih dodelite in določite roke.",
@@ -212,8 +213,8 @@
   "Domain": "Domena",
   "Draft": "Osnutek",
   "Drafts": "Osnutki",
-  "Due on": "Do",
+  "Due on": "Zapade",
-  "Duplicate": "Podvojiti",
+  "Duplicate": "Podvoji",
   "Edit": "Uredi",
   "Edit post": "Uredi objavo",
   "Edited {ago}": "Urejeno {ago}",
@@ -236,6 +237,7 @@
   "Error message": "Sporočilo o napaki",
   "Error stacktrace": "Sledenje napake",
   "Error while changing email": "Napaka pri spreminjanju e-poštnega naslova",
+  "Error while loading the preview": "Napaka pri nalaganju predogleda",
   "Error while login with {provider}. Retry or login another way.": "Napaka pri prijavi s {provider}. Poskusite znova ali se prijavite na drug način.",
   "Error while login with {provider}. This login provider doesn't exist.": "Napaka pri prijavi s {provider}. Ta ponudnik ne obstaja.",
   "Error while reporting group {groupTitle}": "Napaka pri poročanju skupine {groupTitle}",
@@ -253,6 +255,7 @@
   "Event {eventTitle} deleted": "Dogodek {eventTitle} je izbrisan",
   "Event {eventTitle} reported": "Dogodek {eventTitle} je prijavljen",
   "Events": "Dogodki",
+  "Events nearby": "Zapri dogodke",
   "Events tagged with {tag}": "Dogodki z oznako {tag}",
   "Everything": "Vse",
   "Ex: mobilizon.fr": "Npr.: mobilizon.fr",
@@ -340,6 +343,7 @@
   "Instance Terms URL": "URL pogojev uporabe vozlišča",
   "Instance administrator": "Skrbnik vozlišča",
   "Instance configuration": "Nastavitve vozlišča",
+  "Instance feeds": "Viri vozlišča",
   "Instance languages": "Jezik vozlišča",
   "Instance rules": "Pravila vozlišča",
   "Instance settings": "Nastavitve vozlišča",
@@ -423,6 +427,7 @@
   "New members": "Novi člani",
   "New note": "Nova opomba",
   "New password": "Novo geslo",
+  "New post": "Nova objava",
   "New profile": "Nov profil",
   "Next": "Naslednje",
   "Next month": "Naslednji mesec",
@@ -448,7 +453,6 @@
   "No message": "Ni sporočil",
   "No moderation logs yet": "Nobenega dnevnika moderiranja še ni",
   "No more activity to display.": "Ni več dejavnosti za prikaz.",
-  "No one is going to this event": "Nihče ne gre na ta dogodek|Ena oseba gre|{going} oseb gre",
   "No open reports yet": "Še ni odprtih poročil",
   "No participant matches the filters": "Noben udeleženec se ne ujema s filtri",
   "No participant to approve|Approve participant|Approve {number} participants": "Nobenega udeleženca za odobritev|Odobri udeleženca|Odobri {number} udeležencev",
@@ -471,6 +475,7 @@
   "Nothing to see here": "Tukaj ni ničesar za videti",
   "Notification before the event": "Obvestilo pred dogodkom",
   "Notification on the day of the event": "Obvestilo na dan dogodka",
+  "Notifications": "Obvestila",
   "Notifications for manually approved participations to an event": "Obvestila o ročno odobrenih udeležbah na dogodku",
   "Now, create your first profile:": "Ustvarite svoj prvi profil:",
   "Number of places": "Število mest",
@@ -498,7 +503,7 @@
   "Organizer": "Organizator",
   "Organizer notifications": "Obvestila organizatorja",
   "Organizers": "Organizatorji",
-  "Other": "Ostali",
+  "Other": "Ostalo",
   "Other notification options:": "Druge možnosti obveščanja:",
   "Other software may also support this.": "To lahko podpira tudi druga programska oprema.",
   "Otherwise this identity will just be removed from the group administrators.": "V nasprotnem primeru bo ta identiteta odstranjena samo iz skupine skrbnikov.",
@@ -519,6 +524,7 @@
   "Password reset": "Ponastavitev gesla",
   "Past events": "Pretekli dogodki",
   "Pending": "Na čakanju",
+  "Personal feeds": "Osebni viri",
   "Pick": "Izberi",
   "Pick a group": "Izberi skupino",
   "Pick a profile or a group": "Izberi profil ali skupino",
@@ -531,7 +537,7 @@
   "Please enter your password to confirm this action.": "Vnesite svoje geslo, da potrdite to dejanje.",
   "Please make sure the address is correct and that the page hasn't been moved.": "Prepričajte se, da je naslov pravilen in da stran ni bila premaknjena.",
   "Please read the {fullRules} published by {instance}'s administrators.": "Preberite {fullRules}, ki so jih objavili skrbniki vozlišča {instance}.",
-  "Post": "Objavi",
+  "Post": "Objava",
   "Post a comment": "Objavi komentar",
   "Post a reply": "Objavi odgovor",
   "Postal Code": "Poštna številka",
@@ -544,6 +550,7 @@
   "Privacy policy": "Politika zasebnosti",
   "Private event": "Zasebni dogodek",
   "Private feeds": "Zasebni viri",
+  "Profile feeds": "Viri profilov",
   "Profiles": "Profili",
   "Profiles and federation": "Profili in federacija",
   "Promote": "Povišaj",
@@ -563,6 +570,7 @@
   "Receive one email per request": "Na zahtevo prejmi eno e-pošto",
   "Redirecting to content…": "Preusmeritev na vsebino …",
   "Refresh profile": "Osveži profil",
+  "Regenerate new links": "Obnovi nove povezave",
   "Region": "Regija",
   "Register an account on {instanceName}!": "Registrirajte račun na {instanceName}!",
   "Register on this instance": "Registriraj se na tem vozlišču",
@@ -657,6 +665,7 @@
   "The event organizer manually approves participations. Since you've chosen to participate without an account, please explain why you want to participate to this event.": "Organizator dogodka ročno odobri udeležbe. Ker ste se odločili za udeležbo brez računa, pojasnite, zakaj želite sodelovati na tem dogodku.",
   "The event title will be ellipsed.": "Naslov dogodka bo zatemnjen.",
   "The event will show as attributed to this group.": "Dogodek bo prikazan kot dodeljen tej skupini.",
+  "The event will show as attributed to this profile.": "Dogodek bo prikazan kot dodeljen temu profilu.",
   "The event will show as attributed to your personal profile.": "Dogodek bo prikazan kot pripisan vašemu osebnemu profilu.",
   "The event will show the group as organizer.": "Na dogodku bo skupina prikazana kot organizator.",
   "The event {event} was created by {profile}.": "Dogodek {event} je ustvaril/a {profil}.",
@@ -667,7 +676,7 @@
   "The group can now only be joined with an invite.": "Skupini se lahko pridružite le z vabilom.",
   "The group will be publicly listed in search results and may be suggested in the explore section. Only public informations will be shown on it's page.": "Skupina bo javno navedena v rezultatih iskanja in bo morda predlagana v razdelku za raziskovanje. Na tej strani bodo prikazane samo javne informacije.",
   "The group's avatar was changed.": "Podoba skupine je bila spremenjena.",
-  "The group's banner was changed.": "Spremenjena je bila oznaka skupine.",
+  "The group's banner was changed.": "Naslovnica skupine je bila spremenjena.",
   "The group's physical address was changed.": "Fizični naslov skupine je bil spremenjen.",
   "The group's short description was changed.": "Kratek opis skupine je bil spremenjen.",
   "The instance administrator is the person or entity that runs this Mobilizon instance.": "Skrbnik vozlišča je fizična ali pravna oseba, ki vodi to Mobilizon vozlišče.",
@@ -680,6 +689,7 @@
   "The post {post} was deleted by {profile}.": "Objavo {post} je izbrisal/a {profil}.",
   "The post {post} was updated by {profile}.": "Objavo {post} je posodobil/a {profil}.",
   "The report will be sent to the moderators of your instance. You can explain why you report this content below.": "Poročilo bo poslano moderatorjem vašega vozlišča. Spodaj lahko razložite, zakaj prijavljate to vsebino.",
+  "The selected picture is too heavy. You need to select a file smaller than {size}.": "Izbrana slika je prevelika. Izbrati morate datoteko, ki je manjša od {size}.",
   "The technical details of the error can help developers solve the problem more easily. Please add them to your feedback.": "Tehnične podrobnosti napake lahko razvijalcem pomagajo pri lažjem reševanju težave. Dodajte jih v povratne informacije.",
   "The {default_privacy_policy} will be used. They will be translated in the user's language.": "Uporabljen bo {default_privacy_policy}. Preveden bo v uporabnikov jezik.",
   "The {default_terms} will be used. They will be translated in the user's language.": "Uporabljeni bodo {default_terms}. Prevedeni bodo v uporabnikov jezik.",
@@ -688,6 +698,8 @@
   "There will be no way to recover your data.": "Vaših podatkov ne bo mogoče obnoviti.",
   "There's no discussions yet": "Ni še nobenih razprav",
   "These events may interest you": "Ti dogodki vas lahko zanimajo",
+  "These feeds contain event data for the events for which any of your profiles is a participant or creator. You should keep these private. You can find feeds for specific profiles on each profile edition page.": "Viri vsebujejo podatke za dogodke, pri katerih je kateri koli od vaših profilov udeleženec ali ustvarjalec. Ti viri naj bodo zasebni. Viri za posamezne profile so na voljo na strani za urejanje profila.",
+  "These feeds contain event data for the events for which this specific profile is a participant or creator. You should keep these private. You can find feeds for all of your profiles into your notification settings.": "Viri vsebujejo podatke za dogodke, pri katerih je ta profil udeleženec ali ustvarjalec. Ti viri naj bodo zasebni. Viri za vse svoje profile so na voljo v nastavitvah obveščanja.",
   "This Mobilizon instance and this event organizer allows anonymous participations, but requires validation through email confirmation.": "To Mobilizon vozlišče in organizator dogodkov omogočata anonimne udeležbe, vendar zahtevata potrditev po e-pošti.",
   "This URL is not supported": "Ta URL ni podprt",
   "This event has been cancelled.": "Ta dogodek je bil preklican.",
@@ -725,9 +737,12 @@
   "URL": "URL",
   "URL copied to clipboard": "URL je kopiran v odložišče",
   "Unable to copy to clipboard": "Ni mogoče kopirati v odložišče",
+  "Unable to create the group. One of the pictures may be too heavy.": "Skupine ni mogoče ustvariti. Ena od slik je morda prevelika.",
+  "Unable to create the profile. The avatar picture may be too heavy.": "Ni mogoče ustvariti profila. Slika podobe je morda prevelika.",
   "Unable to detect timezone.": "Časovnega pasu ni mogoče zaznati.",
   "Unable to load event for participation. The error details are provided below:": "Ni mogoče naložiti dogodka za udeležbo. Podrobnosti o napaki so navedene spodaj:",
   "Unable to save your participation in this browser.": "V tem brskalniku ni mogoče shraniti vaše udeležbe.",
+  "Unable to update the profile. The avatar picture may be too heavy.": "Ni mogoče posodobiti profila. Slika podobe je morda prevelika.",
   "Unfortunately, this instance isn't opened to registrations": "Na žalost tao vozlišče ni odprto za registracije",
   "Unfortunately, your participation request was rejected by the organizers.": "Na žalost so organizatorji zavrnili vašo prošnjo za udeležbo.",
   "Unknown": "Neznano",
@@ -824,6 +839,7 @@
   "You invited {member}.": "Povabili ste {member}.",
   "You may clear all participation information for this device with the buttons below.": "Vse podatke o udeležbi za to napravo lahko počistite s spodnjimi gumbi.",
   "You may now close this window, or {return_to_event}.": "Zdaj lahko zaprete to okno ali {return_to_event}.",
+  "You may show some members as contacts.": "Nekatere člane lahko prikažete kot stike.",
   "You moved the folder {resource} into {new_path}.": "Premaknili ste mapo {resource} v {new_path}.",
   "You moved the folder {resource} to the root folder.": "Premaknili ste mapo {resource} v korensko mapo.",
   "You moved the resource {resource} into {new_path}.": "Vir {resource} ste premaknili v {new_path}.",
@@ -855,6 +871,7 @@
   "You will find here all the events you have created or of which you are a participant.": "Tu boste našli vse dogodke, ki ste jih ustvarili ali pri katerih sodelujete.",
   "You wish to participate to the following event": "Želite se udeležiti naslednjega dogodka",
   "You'll get a weekly recap every Monday for upcoming events, if you have any.": "Vsak ponedeljek boste dobili tedenski povzetek prihajajočih dogodkov.",
+  "You'll need to change the URLs where there were previously entered.": "Spremeniti boste morali naslove URL, ki so bili predhodno vneseni.",
   "You'll need to transmit the group URL so people may access the group's profile. The group won't be findable in Mobilizon's search or regular search engines.": "Morali boste poslati URL skupine, da bodo lahko ljudje dostopali do profila skupine. Skupine ne bo mogoče najti v iskalnikih Mobilizon ali običajnih iskalnikih.",
   "You'll receive a confirmation email.": "Prejeli boste potrditveno e-pošto.",
   "Your account has been successfully deleted": "Vaš račun je uspešno izbrisan",

js/src/router/index.ts

@@ -158,10 +158,14 @@ const router = new Router({
 
 router.beforeEach(authGuardIfNeeded);
 router.afterEach(() => {
-  if (router.app.$children[0]) {
+  try {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    if (router.app.$children[0]) {
-    // @ts-ignore
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    router.app.$children[0].error = null;
+      // @ts-ignore
+      router.app.$children[0].error = null;
+    }
+  } catch (e) {
+    console.error(e);
   }
 });
 

js/src/types/config.model.ts

@@ -89,4 +89,12 @@ export interface IConfig {
     ldap: boolean;
     oauthProviders: IOAuthProvider[];
   };
+  uploadLimits: {
+    default: number;
+    avatar: number;
+    banner: number;
+  };
+  instanceFeeds: {
+    enabled: boolean;
+  };
 }

js/src/types/current-user.model.ts

@@ -13,9 +13,9 @@ export interface ICurrentUser {
 }
 
 export interface IUserPreferredLocation {
-  range?: number;
+  range?: number | null;
-  name?: string;
+  name?: string | null;
-  geohash?: string;
+  geohash?: string | null;
 }
 
 export interface IUserSettings {

js/src/views/About/AboutInstance.vue

@@ -42,9 +42,13 @@
       <table class="table is-fullwidth">
         <tr>
           <td>{{ $t("Instance languages") }}</td>
-          <td :title="this.config ? this.config.languages.join(', ') : ''">
+          <td
+            v-if="config.languages.length > 0"
+            :title="this.config ? this.config.languages.join(', ') : ''"
+          >
             {{ formattedLanguageList }}
           </td>
+          <td v-else>{{ $t("No information") }}</td>
         </tr>
         <tr>
           <td>{{ $t("Mobilizon version") }}</td>
@@ -72,6 +76,29 @@
           </td>
           <td v-else>{{ $t("Disabled") }}</td>
         </tr>
+        <tr class="instance-feeds">
+          <td>{{ $t("Instance feeds") }}</td>
+          <td v-if="config.instanceFeeds.enabled" class="buttons">
+            <b-button
+              tag="a"
+              size="is-small"
+              icon-left="rss"
+              href="/feed/instance/atom"
+              target="_blank"
+              >{{ $t("RSS/Atom Feed") }}</b-button
+            >
+
+            <b-button
+              tag="a"
+              size="is-small"
+              icon-left="calendar-sync"
+              href="/feed/instance/ics"
+              target="_blank"
+              >{{ $t("ICS/WebCal Feed") }}</b-button
+            >
+          </td>
+          <td v-else>{{ $t("Disabled") }}</td>
+        </tr>
       </table>
     </section>
   </div>
@@ -177,5 +204,14 @@ section {
       }
     }
   }
+  tr.instance-feeds {
+    height: 3rem;
+    td:first-child {
+      vertical-align: middle;
+    }
+    td:last-child {
+      height: 3rem;
+    }
+  }
 }
 </style>

js/src/views/Account/children/EditIdentity.vue

@@ -32,6 +32,7 @@
       <picture-upload
         v-model="avatarFile"
         :defaultImage="identity.avatar"
+        :maxSize="avatarMaxSize"
         class="picture-upload"
       />
 
@@ -231,6 +232,9 @@ import {
   DELETE_FEED_TOKEN,
 } from "@/graphql/feed_tokens";
 import { IFeedToken } from "@/types/feedtoken.model";
+import { ServerParseError } from "apollo-link-http-common";
+import { IConfig } from "@/types/config.model";
+import { CONFIG } from "@/graphql/config";
 
 @Component({
   components: {
@@ -256,6 +260,7 @@ import { IFeedToken } from "@/types/feedtoken.model";
         this.handleErrors(graphQLErrors);
       },
     },
+    config: CONFIG,
   },
 })
 export default class EditIdentity extends mixins(identityEditionMixin) {
@@ -263,6 +268,8 @@ export default class EditIdentity extends mixins(identityEditionMixin) {
 
   @Prop({ type: String }) identityName!: string;
 
+  config!: IConfig;
+
   errors: string[] = [];
 
   avatarFile: File | null = null;
@@ -450,6 +457,10 @@ export default class EditIdentity extends mixins(identityEditionMixin) {
     }
   }
 
+  get avatarMaxSize(): number | undefined {
+    return this?.config?.uploadLimits?.avatar;
+  }
+
   async generateFeedTokens(): Promise<void> {
     const newToken = await this.createNewFeedToken();
     this.identity.feedTokens.push(newToken);
@@ -528,6 +539,21 @@ export default class EditIdentity extends mixins(identityEditionMixin) {
   private handleError(err: any) {
     console.error(err);
 
+    if (err?.networkError?.name === "ServerParseError") {
+      const error = err?.networkError as ServerParseError;
+
+      if (error?.response?.status === 413) {
+        const errorMessage = this.isUpdate
+          ? this.$t(
+              "Unable to update the profile. The avatar picture may be too heavy."
+            )
+          : this.$t(
+              "Unable to create the profile. The avatar picture may be too heavy."
+            );
+        this.errors.push(errorMessage as string);
+      }
+    }
+
     if (err.graphQLErrors !== undefined) {
       err.graphQLErrors.forEach(({ message }: { message: string }) => {
         this.$notifier.error(message);

js/src/views/Admin/GroupProfiles.vue

@@ -33,7 +33,7 @@
           :label="$t('Username')"
           searchable
         >
-          <template slot="searchable" slot-scope="props">
+          <template #searchable="props">
             <b-input
               v-model="props.filters.preferredUsername"
               placeholder="Search..."
@@ -68,7 +68,7 @@
         </b-table-column>
 
         <b-table-column field="domain" :label="$t('Domain')" searchable>
-          <template slot="searchable" slot-scope="props">
+          <template #searchable="props">
             <b-input
               v-model="props.filters.domain"
               placeholder="Search..."

js/src/views/Admin/Profiles.vue

@@ -33,7 +33,7 @@
           :label="$t('Username')"
           searchable
         >
-          <template slot="searchable" slot-scope="props">
+          <template #searchable="props">
             <b-input
               v-model="props.filters.preferredUsername"
               placeholder="Search..."
@@ -68,7 +68,7 @@
         </b-table-column>
 
         <b-table-column field="domain" :label="$t('Domain')" searchable>
-          <template slot="searchable" slot-scope="props">
+          <template #searchable="props">
             <b-input
               v-model="props.filters.domain"
               placeholder="Search..."

js/src/views/Admin/Users.vue

@@ -33,7 +33,7 @@
           {{ props.row.id }}
         </b-table-column>
         <b-table-column field="email" :label="$t('Email')" searchable>
-          <template slot="searchable" slot-scope="props">
+          <template #searchable="props">
             <b-input
               v-model="props.filters.email"
               :placeholder="$t('Search…')"
@@ -76,7 +76,7 @@
           {{ props.row.locale }}
         </b-table-column>
 
-        <template slot="detail" slot-scope="props">
+        <template #detail="props">
           <router-link
             class="profile"
             v-for="actor in props.row.actors"

js/src/views/Discussions/Discussion.vue

@@ -18,7 +18,7 @@
             }"
             >{{ discussion.actor.name }}</router-link
           >
-          <b-skeleton v-else animated />
+          <b-skeleton v-else-if="$apollo.loading" animated />
         </li>
         <li>
           <router-link
@@ -31,7 +31,7 @@
             }"
             >{{ $t("Discussions") }}</router-link
           >
-          <b-skeleton animated v-else />
+          <b-skeleton animated v-else-if="$apollo.loading" />
         </li>
         <li class="is-active">
           <router-link
@@ -41,6 +41,9 @@
         </li>
       </ul>
     </nav>
+    <b-message v-if="error" type="is-danger">
+      {{ error }}
+    </b-message>
     <section>
       <div class="discussion-title">
         <h2 class="title" v-if="discussion.title && !editTitleMode">
@@ -60,8 +63,16 @@
             <b-icon icon="pencil" />
           </span>
         </h2>
-        <b-skeleton v-else-if="!editTitleMode" height="50px" animated />
+        <b-skeleton
-        <form v-else @submit.prevent="updateDiscussion" class="title-edit">
+          v-else-if="!editTitleMode && $apollo.loading"
+          height="50px"
+          animated
+        />
+        <form
+          v-else-if="!$apollo.loading && !error"
+          @submit.prevent="updateDiscussion"
+          class="title-edit"
+        >
           <b-input :value="discussion.title" v-model="newTitle" />
           <div class="buttons">
             <b-button
@@ -100,7 +111,7 @@
         @click="loadMoreComments"
         >{{ $t("Fetch more") }}</b-button
       >
-      <form @submit.prevent="reply">
+      <form @submit.prevent="reply" v-if="!error">
         <b-field :label="$t('Text')">
           <editor v-model="newComment" />
         </b-field>
@@ -217,6 +228,7 @@ export default class discussion extends mixins(GroupMixin) {
   RouteName = RouteName;
 
   usernameWithDomain = usernameWithDomain;
+  error: string | null = null;
 
   async reply(): Promise<void> {
     if (this.newComment === "") return;
@@ -422,6 +434,11 @@ export default class discussion extends mixins(GroupMixin) {
     if (errors[0].message.includes("No such discussion")) {
       await this.$router.push({ name: RouteName.PAGE_NOT_FOUND });
     }
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    if (errors[0].code === "unauthorized") {
+      this.error = errors[0].message;
+    }
   }
 
   mounted(): void {

js/src/views/Event/Edit.vue

@@ -424,6 +424,20 @@ section {
   }
 }
 </style>
+<style lang="scss">
+.dialog .modal-card {
+  max-width: 500px;
+
+  .modal-card-foot {
+    justify-content: center;
+    flex-wrap: wrap;
+
+    & > button {
+      margin-bottom: 5px;
+    }
+  }
+}
+</style>
 
 <script lang="ts">
 import { Component, Prop, Vue, Watch } from "vue-property-decorator";

js/src/views/Event/Event.vue

@@ -157,7 +157,7 @@
                     <span v-else>
                       {{
                         $tc(
-                          "No one is going to this event",
+                          "No one is participating|One person participating|{going} people participating",
                           event.participantStats.participant,
                           {
                             going: event.participantStats.participant,
@@ -185,7 +185,7 @@
                     <span v-else>
                       {{
                         $tc(
-                          "No one is going to this event",
+                          "No one is participating|One person participating|{going} people participating",
                           event.participantStats.participant,
                           {
                             going: event.participantStats.participant,
@@ -341,7 +341,10 @@
                   :endsOn="event.endsOn"
                 />
               </event-metadata-block>
-              <event-metadata-block :title="$t('Organized by')">
+              <event-metadata-block
+                class="metadata-organized-by"
+                :title="$t('Organized by')"
+              >
                 <popover-actor-card
                   :actor="event.organizerActor"
                   v-if="!event.attributedTo"
@@ -1341,6 +1344,10 @@ div.sidebar {
 .intro.section {
   background: white;
 
+  .is-3-tablet {
+    width: initial;
+  }
+
   p.tags {
     a {
       text-decoration: none;
@@ -1426,6 +1433,20 @@ div.sidebar {
     }
   }
 
+  ::v-deep .metadata-organized-by {
+    .v-popover.popover .trigger {
+      width: 100%;
+      .media-content {
+        width: calc(100% - 32px - 1rem);
+
+        p.has-text-grey {
+          text-overflow: ellipsis;
+          overflow: hidden;
+        }
+      }
+    }
+  }
+
   div.event-description-comments {
     min-width: 20rem;
     padding: 1rem;

js/src/views/Event/Participants.vue

@@ -172,7 +172,7 @@
             }}
           </span>
         </b-table-column>
-        <template slot="detail" slot-scope="props">
+        <template #detail="props">
           <article v-html="nl2br(props.row.metadata.message)" />
         </template>
         <template slot="empty">

js/src/views/Group/Create.vue

@@ -58,12 +58,20 @@
 
       <div>
         <b>{{ $t("Avatar") }}</b>
-        <picture-upload :textFallback="$t('Avatar')" v-model="avatarFile" />
+        <picture-upload
+          :textFallback="$t('Avatar')"
+          v-model="avatarFile"
+          :maxSize="avatarMaxSize"
+        />
       </div>
 
       <div>
         <b>{{ $t("Banner") }}</b>
-        <picture-upload :textFallback="$t('Banner')" v-model="bannerFile" />
+        <picture-upload
+          :textFallback="$t('Banner')"
+          v-model="bannerFile"
+          :maxSize="bannerMaxSize"
+        />
       </div>
 
       <button class="button is-primary" native-type="submit">
@@ -84,6 +92,10 @@ import { MemberRole } from "@/types/enums";
 import RouteName from "../../router/name";
 import { convertToUsername } from "../../utils/username";
 import PictureUpload from "../../components/PictureUpload.vue";
+import { ErrorResponse } from "apollo-link-error";
+import { ServerParseError } from "apollo-link-http-common";
+import { CONFIG } from "@/graphql/config";
+import { IConfig } from "@/types/config.model";
 
 @Component({
   components: {
@@ -93,6 +105,7 @@ import PictureUpload from "../../components/PictureUpload.vue";
     currentActor: {
       query: CURRENT_ACTOR_CLIENT,
     },
+    config: CONFIG,
   },
 })
 export default class CreateGroup extends mixins(IdentityEditionMixin) {
@@ -100,6 +113,8 @@ export default class CreateGroup extends mixins(IdentityEditionMixin) {
 
   group = new Group();
 
+  config!: IConfig;
+
   avatarFile: File | null = null;
 
   bannerFile: File | null = null;
@@ -110,6 +125,7 @@ export default class CreateGroup extends mixins(IdentityEditionMixin) {
 
   async createGroup(): Promise<void> {
     try {
+      this.errors = [];
       await this.$apollo.mutate({
         mutation: CREATE_GROUP,
         variables: this.buildVariables(),
@@ -154,6 +170,14 @@ export default class CreateGroup extends mixins(IdentityEditionMixin) {
     return window.location.hostname;
   }
 
+  get avatarMaxSize(): number | undefined {
+    return this?.config?.uploadLimits?.avatar;
+  }
+
+  get bannerMaxSize(): number | undefined {
+    return this?.config?.uploadLimits?.banner;
+  }
+
   @Watch("group.name")
   updateUsername(groupName: string): void {
     this.group.preferredUsername = convertToUsername(groupName);
@@ -194,9 +218,22 @@ export default class CreateGroup extends mixins(IdentityEditionMixin) {
     };
   }
 
-  private handleError(err: any) {
+  private handleError(err: ErrorResponse) {
+    if (err?.networkError?.name === "ServerParseError") {
+      const error = err?.networkError as ServerParseError;
+
+      if (error?.response?.status === 413) {
+        this.errors.push(
+          this.$t(
+            "Unable to create the group. One of the pictures may be too heavy."
+          ) as string
+        );
+      }
+    }
     this.errors.push(
-      ...err.graphQLErrors.map(({ message }: { message: string }) => message)
+      ...(err.graphQLErrors || []).map(
+        ({ message }: { message: string }) => message
+      )
     );
   }
 }

js/src/views/Group/GroupMembers.vue

@@ -376,6 +376,12 @@ export default class GroupMembers extends mixins(GroupMixin) {
 
   async removeMember(memberId: string): Promise<void> {
     const { roles, MEMBERS_PER_PAGE, group, page } = this;
+    const variables = {
+      name: usernameWithDomain(group),
+      page,
+      limit: MEMBERS_PER_PAGE,
+      roles,
+    };
     try {
       await this.$apollo.mutate<{ removeMember: IMember }>({
         mutation: REMOVE_MEMBER,
@@ -386,14 +392,7 @@ export default class GroupMembers extends mixins(GroupMixin) {
         refetchQueries: [
           {
             query: GROUP_MEMBERS,
-            variables() {
+            variables,
-              return {
-                name: usernameWithDomain(group),
-                page,
-                limit: MEMBERS_PER_PAGE,
-                roles,
-              };
-            },
           },
         ],
       });

js/src/views/Group/GroupSettings.vue

@@ -47,6 +47,7 @@
             :textFallback="$t('Avatar')"
             v-model="avatarFile"
             :defaultImage="group.avatar"
+            :maxSize="avatarMaxSize"
           />
         </b-field>
 
@@ -55,6 +56,7 @@
             :textFallback="$t('Banner')"
             v-model="bannerFile"
             :defaultImage="group.banner"
+            :maxSize="bannerMaxSize"
           />
         </b-field>
         <p class="label">{{ $t("Group visibility") }}</p>
@@ -158,6 +160,9 @@
           }}</b-button>
         </div>
       </form>
+      <b-message type="is-danger" v-for="(value, index) in errors" :key="index">
+        {{ value }}
+      </b-message>
     </section>
     <b-message v-else>
       {{ $t("You are not an administrator for this group.") }}
@@ -177,6 +182,10 @@ import RouteName from "../../router/name";
 import { UPDATE_GROUP, DELETE_GROUP } from "../../graphql/group";
 import { IGroup, usernameWithDomain } from "../../types/actor";
 import { Address, IAddress } from "../../types/address.model";
+import { CONFIG } from "@/graphql/config";
+import { IConfig } from "@/types/config.model";
+import { ErrorResponse } from "apollo-link-error";
+import { ServerParseError } from "apollo-link-http-common";
 
 @Component({
   components: {
@@ -184,14 +193,21 @@ import { Address, IAddress } from "../../types/address.model";
     PictureUpload,
     editor: () => import("../../components/Editor.vue"),
   },
+  apollo: {
+    config: CONFIG,
+  },
 })
 export default class GroupSettings extends mixins(GroupMixin) {
   loading = true;
 
   RouteName = RouteName;
 
+  config!: IConfig;
+
   newMemberUsername = "";
 
+  errors: string[] = [];
+
   avatarFile: File | null = null;
 
   bannerFile: File | null = null;
@@ -205,12 +221,16 @@ export default class GroupSettings extends mixins(GroupMixin) {
   showCopiedTooltip = false;
 
   async updateGroup(): Promise<void> {
-    const variables = this.buildVariables();
+    try {
-    await this.$apollo.mutate<{ updateGroup: IGroup }>({
+      const variables = this.buildVariables();
-      mutation: UPDATE_GROUP,
+      await this.$apollo.mutate<{ updateGroup: IGroup }>({
-      variables,
+        mutation: UPDATE_GROUP,
-    });
+        variables,
-    this.$notifier.success(this.$t("Group settings saved") as string);
+      });
+      this.$notifier.success(this.$t("Group settings saved") as string);
+    } catch (err) {
+      this.handleError(err);
+    }
   }
 
   confirmDeleteGroup(): void {
@@ -299,5 +319,32 @@ export default class GroupSettings extends mixins(GroupMixin) {
   get currentAddress(): IAddress {
     return new Address(this.group.physicalAddress);
   }
+
+  get avatarMaxSize(): number | undefined {
+    return this?.config?.uploadLimits?.avatar;
+  }
+
+  get bannerMaxSize(): number | undefined {
+    return this?.config?.uploadLimits?.banner;
+  }
+
+  private handleError(err: ErrorResponse) {
+    if (err?.networkError?.name === "ServerParseError") {
+      const error = err?.networkError as ServerParseError;
+
+      if (error?.response?.status === 413) {
+        this.errors.push(
+          this.$t(
+            "Unable to create the group. One of the pictures may be too heavy."
+          ) as string
+        );
+      }
+    }
+    this.errors.push(
+      ...(err.graphQLErrors || []).map(
+        ({ message }: { message: string }) => message
+      )
+    );
+  }
 }
 </script>

js/src/views/Home.vue

@@ -260,7 +260,7 @@
       <!-- Events close to you -->
       <section class="events-close" v-if="closeEvents.total > 0">
         <h2 class="is-size-2 has-text-weight-bold">
-          {{ $t("Close events") }}
+          {{ $t("Events nearby") }}
         </h2>
         <p>
           {{

js/src/views/Moderation/Logs.vue

@@ -14,9 +14,9 @@
         </li>
       </ul>
     </nav>
-    <section>
+    <section v-if="actionLogs.total > 0 && actionLogs.elements.length > 0">
-      <ul v-if="actionLogs.length > 0">
+      <ul>
-        <li v-for="log in actionLogs" :key="log.id">
+        <li v-for="log in actionLogs.elements" :key="log.id">
           <div class="box">
             <img
               class="image"
@@ -147,7 +147,10 @@
               <b slot="title">{{ log.object.title }}</b>
             </i18n>
             <i18n
-              v-else-if="log.action === ActionLogAction.ACTOR_SUSPENSION"
+              v-else-if="
+                log.action === ActionLogAction.ACTOR_SUSPENSION &&
+                log.object.__typename == 'Person'
+              "
               tag="span"
               path="{moderator} suspended profile {profile}"
             >
@@ -169,7 +172,10 @@
               </router-link>
             </i18n>
             <i18n
-              v-else-if="log.action === ActionLogAction.ACTOR_UNSUSPENSION"
+              v-else-if="
+                log.action === ActionLogAction.ACTOR_UNSUSPENSION &&
+                log.object.__typename == 'Person'
+              "
               tag="span"
               path="{moderator} has unsuspended profile {profile}"
             >
@@ -190,6 +196,56 @@
                 >{{ displayNameAndUsername(log.object) }}
               </router-link>
             </i18n>
+            <i18n
+              v-else-if="
+                log.action === ActionLogAction.ACTOR_SUSPENSION &&
+                log.object.__typename == 'Group'
+              "
+              tag="span"
+              path="{moderator} suspended group {profile}"
+            >
+              <router-link
+                slot="moderator"
+                :to="{
+                  name: RouteName.ADMIN_PROFILE,
+                  params: { id: log.actor.id },
+                }"
+                >@{{ log.actor.preferredUsername }}</router-link
+              >
+              <router-link
+                slot="profile"
+                :to="{
+                  name: RouteName.ADMIN_GROUP_PROFILE,
+                  params: { id: log.object.id },
+                }"
+                >{{ displayNameAndUsername(log.object) }}
+              </router-link>
+            </i18n>
+            <i18n
+              v-else-if="
+                log.action === ActionLogAction.ACTOR_UNSUSPENSION &&
+                log.object.__typename == 'Group'
+              "
+              tag="span"
+              path="{moderator} has unsuspended group {profile}"
+            >
+              <router-link
+                slot="moderator"
+                :to="{
+                  name: RouteName.ADMIN_PROFILE,
+                  params: { id: log.actor.id },
+                }"
+                >@{{ log.actor.preferredUsername }}</router-link
+              >
+              <router-link
+                slot="profile"
+                :to="{
+                  name: RouteName.ADMIN_GROUP_PROFILE,
+                  params: { id: log.object.id },
+                }"
+                >{{ displayNameAndUsername(log.object) }}
+              </router-link>
+            </i18n>
             <i18n
               v-else-if="log.action === ActionLogAction.USER_DELETION"
               tag="span"
@@ -214,25 +270,113 @@
               </router-link>
               <b v-else slot="user">{{ log.object.email }}</b>
             </i18n>
+            <span
+              v-else-if="
+                log.action === ActionLogAction.COMMENT_DELETION &&
+                log.object.event
+              "
+            >
+              <i18n
+                tag="span"
+                path="{moderator} has deleted a comment from {author} under the event {event}"
+              >
+                <router-link
+                  slot="moderator"
+                  :to="{
+                    name: RouteName.ADMIN_PROFILE,
+                    params: { id: log.actor.id },
+                  }"
+                  >@{{ log.actor.preferredUsername }}</router-link
+                >
+                <router-link
+                  v-if="log.object.event && log.object.event.uuid"
+                  slot="event"
+                  :to="{
+                    name: RouteName.EVENT,
+                    params: { uuid: log.object.event.uuid },
+                  }"
+                  >{{ log.object.event.title }}
+                </router-link>
+                <b v-else slot="event">{{ log.object.event.title }}</b>
+                <router-link
+                  slot="author"
+                  :to="{
+                    name: RouteName.ADMIN_PROFILE,
+                    params: { id: log.object.actor.id },
+                  }"
+                  >{{ displayNameAndUsername(log.object.actor) }}
+                </router-link>
+              </i18n>
+              <pre v-html="log.object.text" />
+            </span>
+            <span v-else-if="log.action === ActionLogAction.COMMENT_DELETION">
+              <i18n
+                tag="span"
+                path="{moderator} has deleted a comment from {author}"
+              >
+                <router-link
+                  slot="moderator"
+                  :to="{
+                    name: RouteName.ADMIN_PROFILE,
+                    params: { id: log.actor.id },
+                  }"
+                  >@{{ log.actor.preferredUsername }}</router-link
+                >
+                <router-link
+                  slot="author"
+                  :to="{
+                    name: RouteName.ADMIN_PROFILE,
+                    params: { id: log.object.actor.id },
+                  }"
+                  >{{ displayNameAndUsername(log.object.actor) }}
+                </router-link>
+              </i18n>
+              <pre v-html="log.object.text" />
+            </span>
+            <i18n
+              v-else
+              tag="span"
+              path="{moderator} has done an unknown action"
+            >
+              <router-link
+                slot="moderator"
+                :to="{
+                  name: RouteName.ADMIN_PROFILE,
+                  params: { id: log.actor.id },
+                }"
+                >@{{ log.actor.preferredUsername }}</router-link
+              >
+            </i18n>
             <br />
             <small>{{ log.insertedAt | formatDateTimeString }}</small>
           </div>
         </li>
       </ul>
-      <div v-else>
+      <b-pagination
-        <b-message type="is-info">{{ $t("No moderation logs yet") }}</b-message>
+        :total="actionLogs.total"
-      </div>
+        v-model="page"
+        :per-page="LOGS_PER_PAGE"
+        :aria-next-label="$t('Next page')"
+        :aria-previous-label="$t('Previous page')"
+        :aria-page-label="$t('Page')"
+        :aria-current-label="$t('Current page')"
+      >
+      </b-pagination>
     </section>
+    <div v-else>
+      <b-message type="is-info">{{ $t("No moderation logs yet") }}</b-message>
+    </div>
   </div>
 </template>
 <script lang="ts">
-import { Component, Vue } from "vue-property-decorator";
+import { Component, Vue, Watch } from "vue-property-decorator";
 import { IActionLog } from "@/types/report.model";
 import { LOGS } from "@/graphql/report";
 import ReportCard from "@/components/Report/ReportCard.vue";
 import { ActionLogAction } from "@/types/enums";
 import RouteName from "../../router/name";
 import { displayNameAndUsername } from "../../types/actor";
+import { Paginate } from "@/types/paginate";
 
 @Component({
   components: {
@@ -242,17 +386,39 @@ import { displayNameAndUsername } from "../../types/actor";
     actionLogs: {
       fetchPolicy: "cache-and-network",
       query: LOGS,
+      variables() {
+        return {
+          page: this.page,
+          limit: this.LOGS_PER_PAGE,
+        };
+      },
     },
   },
 })
 export default class ReportList extends Vue {
-  actionLogs?: IActionLog[] = [];
+  actionLogs?: Paginate<IActionLog> = { total: 0, elements: [] };
+
+  page = parseInt((this.$route.query.page as string) || "1", 10);
+
+  LOGS_PER_PAGE = 10;
 
   ActionLogAction = ActionLogAction;
 
   RouteName = RouteName;
 
   displayNameAndUsername = displayNameAndUsername;
+
+  mounted(): void {
+    this.page = parseInt((this.$route.query.page as string) || "1", 10);
+  }
+
+  @Watch("page")
+  triggerLoadMoreMemberPageChange(page: string): void {
+    this.$router.replace({
+      name: RouteName.REPORT_LOGS,
+      query: { ...this.$route.query, page },
+    });
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -265,4 +431,8 @@ img.image {
 a {
   text-decoration: none;
 }
+
+section ul li {
+  margin: 0.5rem auto;
+}
 </style>

js/src/views/Settings/Preferences.vue

@@ -80,6 +80,12 @@
             </option>
           </b-select>
         </b-field>
+        <b-button
+          :disabled="address == undefined"
+          @click="resetArea"
+          class="reset-area"
+          icon-left="close"
+        />
       </b-field>
       <p>
         {{
@@ -239,11 +245,11 @@ export default class Preferences extends Vue {
     }
   }
 
-  get locationRange(): number | undefined {
+  get locationRange(): number | undefined | null {
     return this.loggedUser?.settings?.location?.range;
   }
 
-  set locationRange(locationRange: number | undefined) {
+  set locationRange(locationRange: number | undefined | null) {
     if (locationRange) {
       this.updateUserSettings({
         location: {
@@ -253,6 +259,16 @@ export default class Preferences extends Vue {
     }
   }
 
+  resetArea(): void {
+    this.updateUserSettings({
+      location: {
+        geohash: null,
+        name: null,
+        range: null,
+      },
+    });
+  }
+
   private async updateUserSettings(userSettings: IUserSettings) {
     await this.$apollo.mutate<{ setUserSetting: string }>({
       mutation: SET_USER_SETTINGS,
@@ -262,3 +278,10 @@ export default class Preferences extends Vue {
   }
 }
 </script>
+<style lang="scss" scoped>
+.reset-area {
+  align-self: center;
+  position: relative;
+  top: 10px;
+}
+</style>

js/src/views/User/Login.vue

@@ -67,7 +67,7 @@
           </b-field>
 
           <p class="control has-text-centered" v-if="!submitted">
-            <button class="button is-primary is-large">
+            <button type="submit" class="button is-primary is-large">
               {{ $t("Login") }}
             </button>
           </p>
@@ -222,44 +222,51 @@ export default class Login extends Vue {
       }
 
       saveUserData(data.login);
-
+      await this.setupClientUserAndActors(data.login);
-      await this.$apollo.mutate({
-        mutation: UPDATE_CURRENT_USER_CLIENT,
-        variables: {
-          id: data.login.user.id,
-          email: this.credentials.email,
-          isLoggedIn: true,
-          role: data.login.user.role,
-        },
-      });
-      try {
-        await initializeCurrentActor(this.$apollo.provider.defaultClient);
-      } catch (err) {
-        if (err instanceof NoIdentitiesException) {
-          this.$router.push({
-            name: RouteName.REGISTER_PROFILE,
-            params: {
-              email: this.currentUser.email,
-              userAlreadyActivated: "true",
-            },
-          });
-        }
-      }
 
       if (this.$route.query.redirect) {
-        console.log("redirect", this.$route.query.redirect);
         this.$router.push(this.$route.query.redirect as string);
         return;
       }
-      window.localStorage.setItem("welcome-back", "yes");
+      if (window.localStorage) {
+        window.localStorage.setItem("welcome-back", "yes");
+      }
       this.$router.push({ name: RouteName.HOME });
       return;
     } catch (err) {
       this.submitted = false;
-      console.error(err);
+      if (err.graphQLErrors) {
-      err.graphQLErrors.forEach(({ message }: { message: string }) => {
+        err.graphQLErrors.forEach(({ message }: { message: string }) => {
-        this.errors.push(message);
+          this.errors.push(message);
-      });
+        });
+      } else if (err.networkError) {
+        this.errors.push(err.networkError.message);
+      }
+    }
+  }
+
+  private async setupClientUserAndActors(login: ILogin): Promise<void> {
+    await this.$apollo.mutate({
+      mutation: UPDATE_CURRENT_USER_CLIENT,
+      variables: {
+        id: login.user.id,
+        email: this.credentials.email,
+        isLoggedIn: true,
+        role: login.user.role,
+      },
+    });
+    try {
+      await initializeCurrentActor(this.$apollo.provider.defaultClient);
+    } catch (err) {
+      if (err instanceof NoIdentitiesException) {
+        this.$router.push({
+          name: RouteName.REGISTER_PROFILE,
+          params: {
+            email: this.currentUser.email,
+            userAlreadyActivated: "true",
+          },
+        });
+      }
     }
   }
 }

js/src/vue-apollo.ts

@@ -13,7 +13,6 @@ import buildCurrentUserResolver from "@/apollo/user";
 import { isServerError } from "@/types/apollo";
 import { AUTH_ACCESS_TOKEN } from "@/constants";
 import { logout } from "@/utils/auth";
-import { SnackbarProgrammatic as Snackbar } from "buefy";
 import { Socket as PhoenixSocket } from "phoenix";
 import * as AbsintheSocket from "@absinthe/socket";
 import { createAbsintheSocketLink } from "@absinthe/socket-apollo-link";
@@ -123,12 +122,7 @@ const errorLink = onError(
     }
 
     if (networkError) {
-      console.log(`[Network error]: ${networkError}`);
+      console.error(`[Network error]: ${networkError}`);
-      Snackbar.open({
-        message: "Please refresh the page and retry.",
-        type: "is-danger",
-        position: "is-bottom",
-      });
     }
   }
 );

js/tests/unit/specs/boot/routes.spec.ts

@@ -2,23 +2,45 @@ import { config, createLocalVue, mount } from "@vue/test-utils";
 import { routes } from "@/router";
 import App from "@/App.vue";
 import VueRouter from "vue-router";
-import Home from "@/views/Home.vue";
+import Buefy from "buefy";
 
 const localVue = createLocalVue();
 config.mocks.$t = (key: string): string => key;
 localVue.use(VueRouter);
-
+localVue.use(Buefy);
-const router = new VueRouter({ routes });
-const wrapper = mount(App, {
-  localVue,
-  router,
-  stubs: ["NavBar", "mobilizon-footer"],
-});
 
 describe("routing", () => {
   test("Homepage", async () => {
-    router.push("/");
+    const router = new VueRouter({ routes, mode: "history" });
+    const wrapper = mount(App, {
+      localVue,
+      router,
+      stubs: {
+        NavBar: true,
+        "mobilizon-footer": true,
+      },
+    });
+
+    expect(wrapper.html()).toContain('<div id="homepage">');
+  });
+
+  test("About", async () => {
+    const router = new VueRouter({ routes, mode: "history" });
+    const wrapper = mount(App, {
+      localVue,
+      router,
+      stubs: {
+        NavBar: true,
+        "mobilizon-footer": true,
+      },
+    });
+
+    router.push("/about");
     await wrapper.vm.$nextTick();
-    expect(wrapper.findComponent(Home).exists()).toBe(true);
+    await wrapper.vm.$nextTick();
+    expect(wrapper.vm.$route.path).toBe("/about/instance");
+    expect(wrapper.html()).toContain(
+      '<a href="/about/instance" aria-current="page"'
+    );
   });
 });

js/tests/unit/specs/components/Comment/CommentTree.spec.ts

@@ -37,7 +37,7 @@ describe("CommentTree", () => {
   let requestHandlers: Record<string, RequestHandler>;
 
   const generateWrapper = (handlers = {}, baseData = {}) => {
-    const cache = new InMemoryCache({ addTypename: false });
+    const cache = new InMemoryCache({ addTypename: true });
 
     mockClient = createMockClient({
       cache,
@@ -88,10 +88,13 @@ describe("CommentTree", () => {
   it("renders a comment tree", async () => {
     generateWrapper();
 
-    expect(wrapper.findComponent({ name: "b-notification" }).text()).toBe(
+    expect(wrapper.exists()).toBe(true);
-      "The organiser has chosen to close comments."
-    );
     expect(wrapper.find(".loading").text()).toBe("Loading comments…");
+
+    await wrapper.vm.$nextTick();
+    await wrapper.vm.$nextTick(); // because of the <transition>
+
+    expect(wrapper.find(".no-comments").text()).toBe("No comments yet");
     expect(wrapper.html()).toMatchSnapshot();
   });
 

js/tests/unit/specs/components/Comment/__snapshots__/CommentTree.spec.ts.snap

@@ -2,21 +2,26 @@
 
 exports[`CommentTree renders a comment tree 1`] = `
 <div>
-  <b-notification-stub active="true" duration="2000" animation="fade">The organiser has chosen to close comments.</b-notification-stub>
+  <!---->
-  <p class="loading has-text-centered">
-    Loading comments…
-  </p>
-</div>
-`;
-
-exports[`CommentTree renders a comment tree 2`] = `
-<div>
-  <b-notification-stub active="true" duration="2000" animation="fade">The organiser has chosen to close comments.</b-notification-stub>
   <transition-stub name="comment-empty-list" mode="out-in">
     <transition-group-stub tag="ul" name="comment-list" class="comment-list">
       <comment-stub comment="[object Object]" event="[object Object]" class="root-comment"></comment-stub>
       <comment-stub comment="[object Object]" event="[object Object]" class="root-comment"></comment-stub>
     </transition-group-stub>
+    <div class="no-comments"><span>No comments yet</span></div>
+  </transition-stub>
+</div>
+`;
+
+exports[`CommentTree renders a comment tree 2`] = `
+<div>
+  <!---->
+  <transition-stub name="comment-empty-list" mode="out-in">
+    <transition-group-stub tag="ul" name="comment-list" class="comment-list">
+      <comment-stub comment="[object Object]" event="[object Object]" class="root-comment"></comment-stub>
+      <comment-stub comment="[object Object]" event="[object Object]" class="root-comment"></comment-stub>
+    </transition-group-stub>
+    <div class="no-comments"><span>No comments yet</span></div>
   </transition-stub>
 </div>
 `;

js/tests/unit/specs/components/Participation/ParticipationSection.spec.ts

@@ -42,7 +42,7 @@ describe("ParticipationSection", () => {
     customProps: Record<string, unknown> = {},
     baseData: Record<string, unknown> = {}
   ) => {
-    const cache = new InMemoryCache({ addTypename: false });
+    const cache = new InMemoryCache({ addTypename: true });
 
     mockClient = createMockClient({
       cache,

js/tests/unit/specs/components/Participation/ParticipationWithoutAccount.spec.ts

@@ -65,7 +65,7 @@ describe("ParticipationWithoutAccount", () => {
     customProps: Record<string, unknown> = {},
     baseData: Record<string, unknown> = {}
   ) => {
-    const cache = new InMemoryCache({ addTypename: false });
+    const cache = new InMemoryCache({ addTypename: true });
 
     mockClient = createMockClient({
       cache,

js/tests/unit/specs/components/User/login.spec.ts

@@ -0,0 +1,183 @@
+import { config, createLocalVue, mount, Wrapper } from "@vue/test-utils";
+import Login from "@/views/User/Login.vue";
+import Buefy from "buefy";
+import {
+  createMockClient,
+  MockApolloClient,
+  RequestHandler,
+} from "mock-apollo-client";
+import VueApollo from "vue-apollo";
+import buildCurrentUserResolver from "@/apollo/user";
+import { InMemoryCache } from "apollo-cache-inmemory";
+import { configMock } from "../../mocks/config";
+import { i18n } from "@/utils/i18n";
+import { CONFIG } from "@/graphql/config";
+import { loginMock, loginResponseMock } from "../../mocks/auth";
+import { LOGIN } from "@/graphql/auth";
+import { CURRENT_USER_CLIENT } from "@/graphql/user";
+import { ICurrentUser } from "@/types/current-user.model";
+import flushPromises from "flush-promises";
+import RouteName from "@/router/name";
+
+const localVue = createLocalVue();
+localVue.use(Buefy);
+config.mocks.$t = (key: string): string => key;
+const $router = { push: jest.fn() };
+
+describe("Render login form", () => {
+  let wrapper: Wrapper<Vue>;
+  let mockClient: MockApolloClient | null;
+  let apolloProvider;
+  let requestHandlers: Record<string, RequestHandler>;
+
+  const generateWrapper = (
+    handlers: Record<string, unknown> = {},
+    customProps: Record<string, unknown> = {},
+    baseData: Record<string, unknown> = {},
+    customMocks: Record<string, unknown> = {}
+  ) => {
+    const cache = new InMemoryCache({ addTypename: true });
+
+    mockClient = createMockClient({
+      cache,
+      resolvers: buildCurrentUserResolver(cache),
+    });
+
+    requestHandlers = {
+      configQueryHandler: jest.fn().mockResolvedValue(configMock),
+      loginMutationHandler: jest.fn().mockResolvedValue(loginResponseMock),
+      ...handlers,
+    };
+    mockClient.setRequestHandler(CONFIG, requestHandlers.configQueryHandler);
+    mockClient.setRequestHandler(LOGIN, requestHandlers.loginMutationHandler);
+
+    apolloProvider = new VueApollo({
+      defaultClient: mockClient,
+    });
+
+    wrapper = mount(Login, {
+      localVue,
+      i18n,
+      apolloProvider,
+      propsData: {
+        ...customProps,
+      },
+      mocks: {
+        $route: { query: {} },
+        $router,
+        ...customMocks,
+      },
+      stubs: ["router-link", "router-view"],
+      data() {
+        return {
+          ...baseData,
+        };
+      },
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    mockClient = null;
+    apolloProvider = null;
+    $router.push.mockReset();
+  });
+
+  it("requires email and password to be filled", async () => {
+    generateWrapper();
+    await wrapper.vm.$nextTick();
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.exists()).toBe(true);
+    expect(requestHandlers.configQueryHandler).toHaveBeenCalled();
+    expect(wrapper.vm.$apollo.queries.config).toBeTruthy();
+    wrapper.find('form input[type="email"]').setValue("");
+    wrapper.find('form input[type="password"]').setValue("");
+    wrapper.find("form button.button").trigger("click");
+    const form = wrapper.find("form");
+    expect(form.exists()).toBe(true);
+    const formElement = form.element as HTMLFormElement;
+    expect(formElement.checkValidity()).toBe(false);
+  });
+
+  it("renders and submits the login form", async () => {
+    generateWrapper();
+    await wrapper.vm.$nextTick();
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.exists()).toBe(true);
+    expect(requestHandlers.configQueryHandler).toHaveBeenCalled();
+    expect(wrapper.vm.$apollo.queries.config).toBeTruthy();
+    wrapper.find('form input[type="email"]').setValue("some@email.tld");
+    wrapper.find('form input[type="password"]').setValue("somepassword");
+    wrapper.find("form").trigger("submit");
+    await wrapper.vm.$nextTick();
+    expect(requestHandlers.loginMutationHandler).toHaveBeenCalledWith({
+      ...loginMock,
+    });
+    await wrapper.vm.$nextTick();
+    await wrapper.vm.$nextTick();
+    const currentUser = mockClient?.cache.readQuery<{
+      currentUser: ICurrentUser;
+    }>({
+      query: CURRENT_USER_CLIENT,
+    })?.currentUser;
+    expect(currentUser?.email).toBe("some@email.tld");
+    expect(currentUser?.id).toBe("1");
+    expect(jest.isMockFunction(wrapper.vm.$router.push)).toBe(true);
+    await flushPromises();
+    expect($router.push).toHaveBeenCalledWith({ name: RouteName.HOME });
+  });
+
+  it("handles a login error", async () => {
+    generateWrapper({
+      loginMutationHandler: jest.fn().mockResolvedValue({
+        errors: [
+          {
+            message:
+              '"Impossible to authenticate, either your email or password are invalid."',
+          },
+        ],
+      }),
+    });
+
+    await wrapper.vm.$nextTick();
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.exists()).toBe(true);
+    expect(requestHandlers.configQueryHandler).toHaveBeenCalled();
+    expect(wrapper.vm.$apollo.queries.config).toBeTruthy();
+    wrapper.find('form input[type="email"]').setValue("some@email.tld");
+    wrapper.find('form input[type="password"]').setValue("somepassword");
+    wrapper.find("form").trigger("submit");
+    await wrapper.vm.$nextTick();
+    expect(requestHandlers.loginMutationHandler).toHaveBeenCalledWith({
+      ...loginMock,
+    });
+    await flushPromises();
+    expect(wrapper.find("article.message.is-danger").text()).toContain(
+      "Impossible to authenticate, either your email or password are invalid."
+    );
+    expect($router.push).not.toHaveBeenCalled();
+  });
+
+  it("handles redirection after login", async () => {
+    generateWrapper(
+      {},
+      {},
+      {},
+      {
+        $route: { query: { redirect: "/about/instance" } },
+      }
+    );
+
+    await wrapper.vm.$nextTick();
+    await wrapper.vm.$nextTick();
+
+    wrapper.find('form input[type="email"]').setValue("some@email.tld");
+    wrapper.find('form input[type="password"]').setValue("somepassword");
+    wrapper.find("form").trigger("submit");
+    await flushPromises();
+    expect($router.push).toHaveBeenCalledWith("/about/instance");
+  });
+});

js/tests/unit/specs/components/navbar.spec.ts

@@ -25,7 +25,7 @@ describe("App component", () => {
   let requestHandlers: Record<string, RequestHandler>;
 
   const createComponent = (handlers = {}, baseData = {}) => {
-    const cache = new InMemoryCache({ addTypename: false });
+    const cache = new InMemoryCache({ addTypename: true });
 
     mockClient = createMockClient({
       cache,

js/tests/unit/specs/mocks/auth.ts

@@ -0,0 +1,20 @@
+export const loginMock = {
+  email: "some@email.tld",
+  password: "somepassword",
+};
+
+export const loginResponseMock = {
+  data: {
+    login: {
+      __typename: "Login",
+      accessToken: "some access token",
+      refreshToken: "some refresh token",
+      user: {
+        __typename: "User",
+        email: "some@email.tld",
+        id: "1",
+        role: "ADMINISTRATOR",
+      },
+    },
+  },
+};

js/tests/unit/specs/mocks/config.ts

@@ -1,37 +1,49 @@
 export const configMock = {
   data: {
     config: {
+      __typename: "Config",
       anonymous: {
+        __typename: "Anonymous",
         actorId: "1",
         eventCreation: {
+          __typename: "AnonymousEventCreation",
           allowed: false,
           validation: {
+            __typename: "AnonymousEventCreationValidation",
             captcha: {
+              __typename: "AnonymousEventCreationValidationCaptcha",
               enabled: false,
             },
             email: {
+              __typename: "AnonymousEventCreationValidationEmail",
               confirmationRequired: true,
               enabled: true,
             },
           },
         },
         participation: {
+          __typename: "AnonymousParticipation",
           allowed: true,
           validation: {
+            __typename: "AnonymousParticipationValidation",
             captcha: {
+              __typename: "AnonymousParticipationValidationCaptcha",
               enabled: false,
             },
             email: {
+              __typename: "AnonymousParticipationValidationEmail",
               confirmationRequired: true,
               enabled: true,
             },
           },
         },
         reports: {
+          __typename: "AnonymousReports",
           allowed: false,
         },
       },
       auth: {
+        __typename: "Auth",
         ldap: false,
         oauthProviders: [],
       },
@@ -39,24 +51,30 @@ export const configMock = {
       demoMode: false,
       description: "Mobilizon.fr est l'instance Mobilizon de Framasoft.",
       features: {
+        __typename: "Features",
         eventCreation: true,
         groups: true,
       },
       geocoding: {
+        __typename: "Geocoding",
         autocomplete: true,
         provider: "Elixir.Mobilizon.Service.Geospatial.Pelias",
       },
       languages: ["fr"],
       location: {
+        __typename: "Lonlat",
         latitude: 48.8717,
         longitude: 2.32075,
       },
       maps: {
+        __typename: "Maps",
         tiles: {
+          __typename: "Tiles",
           attribution: "© The OpenStreetMap Contributors",
           endpoint: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
         },
         routing: {
+          __typename: "Routing",
           type: "OPENSTREETMAP",
         },
       },
@@ -65,22 +83,35 @@ export const configMock = {
       registrationsOpen: true,
       resourceProviders: [
         {
+          __typename: "ResourceProvider",
           endpoint: "https://lite.framacalc.org/",
           software: "calc",
           type: "ethercalc",
         },
         {
+          __typename: "ResourceProvider",
           endpoint: "https://hebdo.framapad.org/p/",
           software: "pad",
           type: "etherpad",
         },
         {
+          __typename: "ResourceProvider",
           endpoint: "https://framatalk.org/",
           software: "visio",
           type: "jitsi",
         },
       ],
       slogan: null,
+      uploadLimits: {
+        __typename: "UploadLimits",
+        default: 10_000_000,
+        avatar: 2_000_000,
+        banner: 4_000_000,
+      },
+      instanceFeeds: {
+        __typename: "InstanceFeeds",
+        enabled: false,
+      },
     },
   },
 };

js/tests/unit/specs/mocks/event.ts

@@ -12,6 +12,7 @@ export const fetchEventBasicMock = {
       uuid: "f37910ea-fd5a-4756-9679-00971f3f4106",
       joinOptions: EventJoinOptions.FREE,
       participantStats: {
+        __typename: "ParticipantStats",
         notApproved: 0,
         notConfirmed: 0,
         rejected: 0,
@@ -28,18 +29,26 @@ export const fetchEventBasicMock = {
 export const joinEventResponseMock = {
   data: {
     joinEvent: {
+      __typename: "Participant",
       id: "5",
       role: ParticipantRole.NOT_APPROVED,
       insertedAt: "2020-12-07T09:33:41Z",
       metadata: {
+        __typename: "ParticipantMetadata",
         cancellationToken: "some token",
         message: "a message long enough",
       },
       event: {
+        __typename: "Event",
         id: "1",
         uuid: "f37910ea-fd5a-4756-9679-00971f3f4106",
       },
       actor: {
+        __typename: "Person",
+        preferredUsername: "some_actor",
+        name: "Some actor",
+        avatar: null,
+        domain: null,
         id: "1",
       },
     },
@@ -73,7 +82,9 @@ export const eventCommentThreadsMock = {
           totalReplies: 5,
           updatedAt: "2020-12-03T09:02:00Z",
           actor: {
+            __typename: "Person",
             avatar: {
+              __typename: "Media",
               id: "78",
               url: "http://someavatar.url.me",
             },
@@ -97,7 +108,9 @@ export const eventCommentThreadsMock = {
           totalReplies: 0,
           updatedAt: "2020-12-03T11:02:00Z",
           actor: {
+            __typename: "Person",
             avatar: {
+              __typename: "Media",
               id: "78",
               url: "http://someavatar.url.me",
             },
@@ -123,6 +136,7 @@ export const newCommentForEventMock = {
 export const newCommentForEventResponse: DataMock = {
   data: {
     createComment: {
+      __typename: "Comment",
       id: "79",
       uuid: "e37910ea-fd5a-4756-9679-01171f3f4444",
       url:
@@ -134,8 +148,11 @@ export const newCommentForEventResponse: DataMock = {
       updatedAt: "2020-12-03T13:02:00Z",
       originComment: null,
       inReplyToComment: null,
+      replies: [],
       actor: {
+        __typename: "Person",
         avatar: {
+          __typename: "Media",
           id: "78",
           url: "http://someavatar.url.me",
         },

js/vue.config.js

@@ -38,7 +38,7 @@ module.exports = {
   css: {
     loaderOptions: {
       scss: {
-        additionalData: `@import "@/variables.scss";`,
+        prependData: `@import "@/variables.scss";`,
       },
     },
   },

lib/federation/activity_pub/activity_pub.ex

@@ -39,11 +39,12 @@ defmodule Mobilizon.Federation.ActivityPub do
     Visibility
   }
 
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
+
   alias Mobilizon.Federation.ActivityPub.Types.{Managable, Ownable}
 
-  alias Mobilizon.Federation.ActivityStream.{Converter, Convertible}
+  alias Mobilizon.Federation.ActivityStream.Convertible
   alias Mobilizon.Federation.HTTPSignatures.Signature
-  alias Mobilizon.Federation.WebFinger
 
   alias Mobilizon.Service.Notifications.Scheduler
   alias Mobilizon.Storage.Page
@@ -79,7 +80,6 @@ defmodule Mobilizon.Federation.ActivityPub do
           {:ok, struct()} | {:error, any()}
   def fetch_object_from_url(url, options \\ []) do
     Logger.info("Fetching object from url #{url}")
-    force_fetch = Keyword.get(options, :force, false)
 
     with {:not_http, true} <- {:not_http, String.starts_with?(url, "http")},
          {:existing, nil} <-
@@ -99,39 +99,7 @@ defmodule Mobilizon.Federation.ActivityPub do
       Preloader.maybe_preload(entity)
     else
       {:existing, entity} ->
-        Logger.debug("Entity is already existing")
+        handle_existing_entity(url, entity, options)
-
-        res =
-          if force_fetch and not are_same_origin?(url, Endpoint.url()) do
-            Logger.debug("Entity is external and we want a force fetch")
-
-            case Fetcher.fetch_and_update(url, options) do
-              {:ok, _activity, entity} ->
-                {:ok, entity}
-
-              {:error, "Gone"} ->
-                {:error, "Gone", entity}
-
-              {:error, "Not found"} ->
-                {:error, "Not found", entity}
-            end
-          else
-            {:ok, entity}
-          end
-
-        Logger.debug("Going to preload an existing entity")
-
-        case res do
-          {:ok, entity} ->
-            Preloader.maybe_preload(entity)
-
-          {:error, status, entity} ->
-            {:ok, entity} = Preloader.maybe_preload(entity)
-            {:error, status, entity}
-
-          err ->
-            err
-        end
 
       e ->
         Logger.warn("Something failed while fetching url #{inspect(e)}")
@@ -139,37 +107,51 @@ defmodule Mobilizon.Federation.ActivityPub do
     end
   end
 
-  @doc """
+  @spec handle_existing_entity(String.t(), struct(), Keyword.t()) ::
-  Getting an actor from url, eventually creating it if we don't have it locally or if it needs an update
+          {:ok, struct()}
-  """
+          | {:ok, struct()}
-  @spec get_or_fetch_actor_by_url(String.t(), boolean) :: {:ok, Actor.t()} | {:error, String.t()}
+          | {:error, String.t(), struct()}
-  def get_or_fetch_actor_by_url(url, preload \\ false)
+          | {:error, String.t()}
+  defp handle_existing_entity(url, entity, options) do
+    Logger.debug("Entity is already existing")
+    Logger.debug("Going to preload an existing entity")
 
-  def get_or_fetch_actor_by_url(nil, _preload), do: {:error, "Can't fetch a nil url"}
+    case refresh_entity(url, entity, options) do
+      {:ok, entity} ->
+        Preloader.maybe_preload(entity)
 
-  def get_or_fetch_actor_by_url("https://www.w3.org/ns/activitystreams#Public", _preload) do
+      {:error, status, entity} ->
-    with %Actor{url: url} <- Relay.get_actor() do
+        {:ok, entity} = Preloader.maybe_preload(entity)
-      get_or_fetch_actor_by_url(url)
+        {:error, status, entity}
+
+      err ->
+        err
     end
   end
 
-  @spec get_or_fetch_actor_by_url(String.t(), boolean()) :: {:ok, Actor.t()} | {:error, any()}
+  @spec refresh_entity(String.t(), struct(), Keyword.t()) ::
-  def get_or_fetch_actor_by_url(url, preload) do
+          {:ok, struct()} | {:error, String.t(), struct()} | {:error, String.t()}
-    with {:ok, %Actor{} = cached_actor} <- Actors.get_actor_by_url(url, preload),
+  defp refresh_entity(url, entity, options) do
-         false <- Actors.needs_update?(cached_actor) do
+    force_fetch = Keyword.get(options, :force, false)
-      {:ok, cached_actor}
-    else
-      _ ->
-        # For tests, see https://github.com/jjh42/mock#not-supported---mocking-internal-function-calls and Mobilizon.Federation.ActivityPubTest
-        case __MODULE__.make_actor_from_url(url, preload) do
-          {:ok, %Actor{} = actor} ->
-            {:ok, actor}
 
-          err ->
+    if force_fetch and not are_same_origin?(url, Endpoint.url()) do
-            Logger.warn("Could not fetch by AP id")
+      Logger.debug("Entity is external and we want a force fetch")
-            Logger.debug(inspect(err))
+
-            {:error, "Could not fetch by AP id"}
+      case Fetcher.fetch_and_update(url, options) do
-        end
+        {:ok, _activity, entity} ->
+          {:ok, entity}
+
+        {:error, "Gone"} ->
+          {:error, "Gone", entity}
+
+        {:error, "Not found"} ->
+          {:error, "Not found", entity}
+
+        {:error, "Object origin check failed"} ->
+          {:error, "Object origin check failed"}
+      end
+    else
+      {:ok, entity}
     end
   end
 
@@ -287,7 +269,8 @@ defmodule Mobilizon.Federation.ActivityPub do
         local \\ true,
         public \\ true
       ) do
-    with {:ok, %Actor{id: object_owner_actor_id}} <- get_or_fetch_actor_by_url(object["actor"]),
+    with {:ok, %Actor{id: object_owner_actor_id}} <-
+           ActivityPubActor.get_or_fetch_actor_by_url(object["actor"]),
          {:ok, %Share{} = _share} <- Share.create(object["id"], actor.id, object_owner_actor_id),
          announce_data <- make_announce_data(actor, object, activity_id, public),
          {:ok, activity} <- create_activity(announce_data, local),
@@ -592,7 +575,7 @@ defmodule Mobilizon.Federation.ActivityPub do
       Enum.each(Users.list_moderators(), fn moderator ->
         moderator
         |> Admin.report(report)
-        |> Mailer.deliver_later()
+        |> Mailer.send_email_later()
       end)
 
       {:ok, activity, report}
@@ -604,64 +587,6 @@ defmodule Mobilizon.Federation.ActivityPub do
     end
   end
 
-  @doc """
-  Create an actor locally by its URL (AP ID)
-  """
-  @spec make_actor_from_url(String.t(), boolean()) :: {:ok, %Actor{}} | {:error, any()}
-  def make_actor_from_url(url, preload \\ false) do
-    if are_same_origin?(url, Endpoint.url()) do
-      {:error, "Can't make a local actor from URL"}
-    else
-      case fetch_and_prepare_actor_from_url(url) do
-        {:ok, data} ->
-          Actors.upsert_actor(data, preload)
-
-        # Request returned 410
-        {:error, :actor_deleted} ->
-          Logger.info("Actor was deleted")
-          {:error, :actor_deleted}
-
-        e ->
-          Logger.warn("Failed to make actor from url")
-          {:error, e}
-      end
-    end
-  end
-
-  @doc """
-  Find an actor in our local database or call WebFinger to find what's its AP ID is and then fetch it
-  """
-  @spec find_or_make_actor_from_nickname(String.t(), atom() | nil) :: tuple()
-  def find_or_make_actor_from_nickname(nickname, type \\ nil) do
-    case Actors.get_actor_by_name(nickname, type) do
-      %Actor{} = actor ->
-        {:ok, actor}
-
-      nil ->
-        make_actor_from_nickname(nickname)
-    end
-  end
-
-  @spec find_or_make_person_from_nickname(String.t()) :: tuple()
-  def find_or_make_person_from_nickname(nick), do: find_or_make_actor_from_nickname(nick, :Person)
-
-  @spec find_or_make_group_from_nickname(String.t()) :: tuple()
-  def find_or_make_group_from_nickname(nick), do: find_or_make_actor_from_nickname(nick, :Group)
-
-  @doc """
-  Create an actor inside our database from username, using WebFinger to find out its AP ID and then fetch it
-  """
-  @spec make_actor_from_nickname(String.t()) :: {:ok, %Actor{}} | {:error, any()}
-  def make_actor_from_nickname(nickname) do
-    case WebFinger.finger(nickname) do
-      {:ok, %{"url" => url}} when not is_nil(url) ->
-        make_actor_from_url(url)
-
-      _e ->
-        {:error, "No ActivityPub URL found in WebFinger"}
-    end
-  end
-
   @spec is_create_activity?(Activity.t()) :: boolean
   defp is_create_activity?(%Activity{data: %{"type" => "Create"}}), do: true
   defp is_create_activity?(_), do: false
@@ -779,36 +704,6 @@ defmodule Mobilizon.Federation.ActivityPub do
     )
   end
 
-  # Fetching a remote actor's information through its AP ID
-  @spec fetch_and_prepare_actor_from_url(String.t()) :: {:ok, struct()} | {:error, atom()} | any()
-  defp fetch_and_prepare_actor_from_url(url) do
-    Logger.debug("Fetching and preparing actor from url")
-    Logger.debug(inspect(url))
-
-    res =
-      with {:ok, %{status: 200, body: body}} <-
-             Tesla.get(url,
-               headers: [{"Accept", "application/activity+json"}],
-               follow_redirect: true
-             ),
-           :ok <- Logger.debug("response okay, now decoding json"),
-           {:ok, data} <- Jason.decode(body) do
-        Logger.debug("Got activity+json response at actor's endpoint, now converting data")
-        {:ok, Converter.Actor.as_to_model_data(data)}
-      else
-        # Actor is gone, probably deleted
-        {:ok, %{status: 410}} ->
-          Logger.info("Response HTTP 410")
-          {:error, :actor_deleted}
-
-        e ->
-          Logger.warn("Could not decode actor at fetch #{url}, #{inspect(e)}")
-          {:error, e}
-      end
-
-    res
-  end
-
   @doc """
   Return all public activities (events & comments) for an actor
   """
@@ -929,10 +824,7 @@ defmodule Mobilizon.Federation.ActivityPub do
            Mobilizon.Service.Activity.Member.insert_activity(member,
              subject: "member_approved"
            ),
-         _ <-
+         _ <- maybe_refresh_group(member),
-           unless(is_nil(member.parent.domain),
-             do: Refresher.fetch_group(member.parent.url, member.actor)
-           ),
          Absinthe.Subscription.publish(Endpoint, member.actor,
            group_membership_changed: [
              Actor.preferred_username_and_domain(member.parent),
@@ -971,6 +863,7 @@ defmodule Mobilizon.Federation.ActivityPub do
            Mobilizon.Service.Activity.Member.insert_activity(member,
              subject: "member_accepted_invitation"
            ),
+         _ <- maybe_refresh_group(member),
          accept_data <- %{
            "type" => "Accept",
            "attributedTo" => member.parent.url,
@@ -984,6 +877,14 @@ defmodule Mobilizon.Federation.ActivityPub do
     end
   end
 
+  defp maybe_refresh_group(%Member{
+         parent: %Actor{domain: parent_domain, url: parent_url},
+         actor: %Actor{} = actor
+       }) do
+    unless is_nil(parent_domain),
+      do: Refresher.fetch_group(parent_url, actor)
+  end
+
   @spec reject_join(Participant.t(), map()) :: {:ok, Participant.t(), Activity.t()} | any()
   defp reject_join(%Participant{} = participant, additional) do
     with {:ok, %Participant{} = participant} <-

lib/federation/activity_pub/actor.ex

@@ -0,0 +1,102 @@
+defmodule Mobilizon.Federation.ActivityPub.Actor do
+  @moduledoc """
+  Module to handle ActivityPub Actor interactions
+  """
+
+  alias Mobilizon.Actors
+  alias Mobilizon.Actors.Actor
+  alias Mobilizon.Federation.ActivityPub.{Fetcher, Relay}
+  alias Mobilizon.Federation.WebFinger
+  alias Mobilizon.Web.Endpoint
+  require Logger
+  import Mobilizon.Federation.ActivityPub.Utils, only: [are_same_origin?: 2]
+
+  @doc """
+  Getting an actor from url, eventually creating it if we don't have it locally or if it needs an update
+  """
+  @spec get_or_fetch_actor_by_url(String.t(), boolean) :: {:ok, Actor.t()} | {:error, String.t()}
+  def get_or_fetch_actor_by_url(url, preload \\ false)
+
+  def get_or_fetch_actor_by_url(nil, _preload), do: {:error, "Can't fetch a nil url"}
+
+  def get_or_fetch_actor_by_url("https://www.w3.org/ns/activitystreams#Public", _preload) do
+    with %Actor{url: url} <- Relay.get_actor() do
+      get_or_fetch_actor_by_url(url)
+    end
+  end
+
+  @spec get_or_fetch_actor_by_url(String.t(), boolean()) :: {:ok, Actor.t()} | {:error, any()}
+  def get_or_fetch_actor_by_url(url, preload) do
+    with {:ok, %Actor{} = cached_actor} <- Actors.get_actor_by_url(url, preload),
+         false <- Actors.needs_update?(cached_actor) do
+      {:ok, cached_actor}
+    else
+      _ ->
+        # For tests, see https://github.com/jjh42/mock#not-supported---mocking-internal-function-calls and Mobilizon.Federation.ActivityPubTest
+        case __MODULE__.make_actor_from_url(url, preload) do
+          {:ok, %Actor{} = actor} ->
+            {:ok, actor}
+
+          {:error, err} ->
+            Logger.debug("Could not fetch by AP id")
+            Logger.debug(inspect(err))
+            {:error, "Could not fetch by AP id"}
+        end
+    end
+  end
+
+  @doc """
+  Create an actor locally by its URL (AP ID)
+  """
+  @spec make_actor_from_url(String.t(), boolean()) :: {:ok, %Actor{}} | {:error, any()}
+  def make_actor_from_url(url, preload \\ false) do
+    if are_same_origin?(url, Endpoint.url()) do
+      {:error, "Can't make a local actor from URL"}
+    else
+      case Fetcher.fetch_and_prepare_actor_from_url(url) do
+        {:ok, data} ->
+          Actors.upsert_actor(data, preload)
+
+        # Request returned 410
+        {:error, :actor_deleted} ->
+          Logger.info("Actor was deleted")
+          {:error, :actor_deleted}
+
+        {:error, e} ->
+          Logger.warn("Failed to make actor from url")
+          {:error, e}
+      end
+    end
+  end
+
+  @doc """
+  Find an actor in our local database or call WebFinger to find what's its AP ID is and then fetch it
+  """
+  @spec find_or_make_actor_from_nickname(String.t(), atom() | nil) :: tuple()
+  def find_or_make_actor_from_nickname(nickname, type \\ nil) do
+    case Actors.get_actor_by_name(nickname, type) do
+      %Actor{} = actor ->
+        {:ok, actor}
+
+      nil ->
+        make_actor_from_nickname(nickname)
+    end
+  end
+
+  @spec find_or_make_group_from_nickname(String.t()) :: tuple()
+  def find_or_make_group_from_nickname(nick), do: find_or_make_actor_from_nickname(nick, :Group)
+
+  @doc """
+  Create an actor inside our database from username, using WebFinger to find out its AP ID and then fetch it
+  """
+  @spec make_actor_from_nickname(String.t()) :: {:ok, %Actor{}} | {:error, any()}
+  def make_actor_from_nickname(nickname) do
+    case WebFinger.finger(nickname) do
+      {:ok, url} when is_binary(url) ->
+        make_actor_from_url(url)
+
+      _e ->
+        {:error, "No ActivityPub URL found in WebFinger"}
+    end
+  end
+end

lib/federation/activity_pub/federator.ex

@@ -13,6 +13,7 @@ defmodule Mobilizon.Federation.ActivityPub.Federator do
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Federation.ActivityPub
   alias Mobilizon.Federation.ActivityPub.{Activity, Transmogrifier}
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
 
   require Logger
 
@@ -42,7 +43,8 @@ defmodule Mobilizon.Federation.ActivityPub.Federator do
     Logger.debug(inspect(activity))
     Logger.debug(fn -> "Running publish for #{activity.data["id"]}" end)
 
-    with {:ok, %Actor{} = actor} <- ActivityPub.get_or_fetch_actor_by_url(activity.data["actor"]) do
+    with {:ok, %Actor{} = actor} <-
+           ActivityPubActor.get_or_fetch_actor_by_url(activity.data["actor"]) do
       Logger.info(fn -> "Sending #{activity.data["id"]} out via AP" end)
       ActivityPub.publish(actor, activity)
     end
@@ -61,7 +63,7 @@ defmodule Mobilizon.Federation.ActivityPub.Federator do
 
       e ->
         # Just drop those for now
-        Logger.error("Unhandled activity")
+        Logger.debug("Unhandled activity")
         Logger.debug(inspect(e))
         Logger.debug(Jason.encode!(params))
     end

lib/federation/activity_pub/fetcher.ex

@@ -8,6 +8,7 @@ defmodule Mobilizon.Federation.ActivityPub.Fetcher do
 
   alias Mobilizon.Federation.HTTPSignatures.Signature
   alias Mobilizon.Federation.ActivityPub.{Relay, Transmogrifier}
+  alias Mobilizon.Federation.ActivityStream.Converter.Actor, as: ActorConverter
   alias Mobilizon.Service.HTTP.ActivityPub, as: ActivityPubClient
 
   import Mobilizon.Federation.ActivityPub.Utils,
@@ -17,7 +18,8 @@ defmodule Mobilizon.Federation.ActivityPub.Fetcher do
   def fetch(url, options \\ []) do
     on_behalf_of = Keyword.get(options, :on_behalf_of, Relay.get_actor())
 
-    with date <- Signature.generate_date_header(),
+    with false <- address_invalid(url),
+         date <- Signature.generate_date_header(),
          headers <-
            [{:Accept, "application/activity+json"}]
            |> maybe_date_fetch(date)
@@ -29,15 +31,18 @@ defmodule Mobilizon.Federation.ActivityPub.Fetcher do
       {:ok, data}
     else
       {:ok, %Tesla.Env{status: 410}} ->
-        Logger.warn("Resource at #{url} is 410 Gone")
+        Logger.debug("Resource at #{url} is 410 Gone")
         {:error, "Gone"}
 
       {:ok, %Tesla.Env{status: 404}} ->
-        Logger.warn("Resource at #{url} is 404 Gone")
+        Logger.debug("Resource at #{url} is 404 Gone")
         {:error, "Not found"}
 
       {:ok, %Tesla.Env{} = res} ->
         {:error, res}
+
+      {:error, err} ->
+        {:error, err}
     end
   end
 
@@ -71,7 +76,7 @@ defmodule Mobilizon.Federation.ActivityPub.Fetcher do
   @spec fetch_and_update(String.t(), Keyword.t()) :: {:ok, map(), struct()}
   def fetch_and_update(url, options \\ []) do
     with {:ok, data} when is_map(data) <- fetch(url, options),
-         {:origin_check, true} <- {:origin_check, origin_check?(url, data)},
+         {:origin_check, true} <- {:origin_check, origin_check(url, data)},
          params <- %{
            "type" => "Update",
            "to" => data["to"],
@@ -83,11 +88,69 @@ defmodule Mobilizon.Federation.ActivityPub.Fetcher do
       Transmogrifier.handle_incoming(params)
     else
       {:origin_check, false} ->
-        Logger.warn("Object origin check failed")
         {:error, "Object origin check failed"}
 
       {:error, err} ->
         {:error, err}
     end
   end
+
+  @doc """
+  Fetching a remote actor's information through its AP ID
+  """
+  @spec fetch_and_prepare_actor_from_url(String.t()) :: {:ok, map()} | {:error, atom()} | any()
+  def fetch_and_prepare_actor_from_url(url) do
+    Logger.debug("Fetching and preparing actor from url")
+    Logger.debug(inspect(url))
+
+    res =
+      with {:ok, %{status: 200, body: body}} <-
+             Tesla.get(url,
+               headers: [{"Accept", "application/activity+json"}],
+               follow_redirect: true
+             ),
+           :ok <- Logger.debug("response okay, now decoding json"),
+           {:ok, data} <- Jason.decode(body) do
+        Logger.debug("Got activity+json response at actor's endpoint, now converting data")
+        {:ok, ActorConverter.as_to_model_data(data)}
+      else
+        # Actor is gone, probably deleted
+        {:ok, %{status: 410}} ->
+          Logger.info("Response HTTP 410")
+          {:error, :actor_deleted}
+
+        {:ok, %Tesla.Env{}} ->
+          Logger.info("Non 200 HTTP Code")
+          {:error, :http_error}
+
+        {:error, e} ->
+          Logger.warn("Could not decode actor at fetch #{url}, #{inspect(e)}")
+          {:error, e}
+
+        e ->
+          Logger.warn("Could not decode actor at fetch #{url}, #{inspect(e)}")
+          {:error, e}
+      end
+
+    res
+  end
+
+  @spec origin_check(String.t(), map()) :: boolean()
+  defp origin_check(url, data) do
+    if origin_check?(url, data) do
+      true
+    else
+      Sentry.capture_message("Object origin check failed", extra: %{url: url, data: data})
+      Logger.debug("Object origin check failed")
+      false
+    end
+  end
+
+  @spec address_invalid(String.t()) :: false | {:error, :invalid_url}
+  defp address_invalid(address) do
+    with %URI{host: host, scheme: scheme} <- URI.parse(address),
+         true <- is_nil(host) or is_nil(scheme) do
+      {:error, :invalid_url}
+    end
+  end
 end

lib/federation/activity_pub/preloader.ex

@@ -12,6 +12,7 @@ defmodule Mobilizon.Federation.ActivityPub.Preloader do
   alias Mobilizon.Resources.Resource
   alias Mobilizon.Tombstone
 
+  @spec maybe_preload(struct()) :: {:ok, struct()} | {:error, struct()}
   def maybe_preload(%Event{url: url}),
     do: {:ok, Events.get_public_event_by_url_with_preload!(url)}
 

lib/federation/activity_pub/refresher.ex

@@ -6,8 +6,8 @@ defmodule Mobilizon.Federation.ActivityPub.Refresher do
   alias Mobilizon.Actors
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityPub.{Fetcher, Relay, Transmogrifier, Utils}
-  alias Mobilizon.Storage.Repo
   require Logger
 
   @doc """
@@ -32,7 +32,7 @@ defmodule Mobilizon.Federation.ActivityPub.Refresher do
   end
 
   def refresh_profile(%Actor{type: type, url: url}) when type in [:Person, :Application] do
-    with {:ok, %Actor{outbox_url: outbox_url}} <- ActivityPub.make_actor_from_url(url),
+    with {:ok, %Actor{outbox_url: outbox_url}} <- ActivityPubActor.make_actor_from_url(url),
          :ok <- fetch_collection(outbox_url, Relay.get_actor()) do
       :ok
     end
@@ -50,7 +50,7 @@ defmodule Mobilizon.Federation.ActivityPub.Refresher do
             discussions_url: discussions_url,
             events_url: events_url
           }} <-
-           ActivityPub.make_actor_from_url(group_url),
+           ActivityPubActor.make_actor_from_url(group_url),
          :ok <- fetch_collection(outbox_url, on_behalf_of),
          :ok <- fetch_collection(members_url, on_behalf_of),
          :ok <- fetch_collection(resources_url, on_behalf_of),
@@ -60,9 +60,23 @@ defmodule Mobilizon.Federation.ActivityPub.Refresher do
          :ok <- fetch_collection(events_url, on_behalf_of) do
       :ok
     else
+      {:error, err} ->
+        Logger.error("Error while refreshing a group")
+
+        Sentry.capture_message("Error while refreshing a group",
+          extra: %{group_url: group_url}
+        )
+
+        Logger.debug(inspect(err))
+
       err ->
         Logger.error("Error while refreshing a group")
-        Logger.error(inspect(err))
+
+        Sentry.capture_message("Error while refreshing a group",
+          extra: %{group_url: group_url}
+        )
+
+        Logger.debug(inspect(err))
     end
   end
 
@@ -96,14 +110,11 @@ defmodule Mobilizon.Federation.ActivityPub.Refresher do
     end
   end
 
-  @spec refresh_all_external_groups :: any()
+  @spec refresh_all_external_groups :: :ok
   def refresh_all_external_groups do
-    Repo.transaction(fn ->
+    Actors.list_external_groups()
-      Actors.list_external_groups_for_stream()
+    |> Enum.filter(&Actors.needs_update?/1)
-      |> Stream.filter(&Actors.needs_update?/1)
+    |> Enum.each(&refresh_profile/1)
-      |> Stream.map(&refresh_profile/1)
-      |> Stream.run()
-    end)
   end
 
   defp process_collection(%{"type" => type, "orderedItems" => items}, _on_behalf_of)
@@ -114,17 +125,28 @@ defmodule Mobilizon.Federation.ActivityPub.Refresher do
 
     Logger.debug(inspect(items))
 
-    Enum.each(items, &handling_element/1)
+    items
+    |> Enum.map(fn item -> Task.async(fn -> handling_element(item) end) end)
+    |> Task.await_many()
+
     Logger.debug("Finished processing a collection")
     :ok
   end
 
+  # Lemmy uses an OrderedCollection with the items property
+  defp process_collection(%{"type" => type, "items" => items} = collection, on_behalf_of)
+       when type in ["OrderedCollection", "OrderedCollectionPage"] do
+    collection
+    |> Map.put("orderedItems", items)
+    |> process_collection(on_behalf_of)
+  end
+
   defp process_collection(%{"type" => "OrderedCollection", "first" => first}, on_behalf_of)
        when is_map(first),
        do: process_collection(first, on_behalf_of)
 
   defp process_collection(%{"type" => "OrderedCollection", "first" => first}, on_behalf_of)
-       when is_bitstring(first) do
+       when is_binary(first) do
     Logger.debug("OrderedCollection has a first property pointing to an URI")
 
     with {:ok, data} <- Fetcher.fetch(first, on_behalf_of: on_behalf_of) do
@@ -147,6 +169,11 @@ defmodule Mobilizon.Federation.ActivityPub.Refresher do
     Transmogrifier.handle_incoming(data)
   end
 
+  # If we're handling an announce activity
+  defp handling_element(%{"type" => "Announce"} = data) do
+    handling_element(get_in(data, ["object"]))
+  end
+
   # If we're handling directly an object
   defp handling_element(data) when is_map(data) do
     object = get_in(data, ["object"])

lib/federation/activity_pub/relay.ex

@@ -13,6 +13,7 @@ defmodule Mobilizon.Federation.ActivityPub.Relay do
 
   alias Mobilizon.Federation.ActivityPub
   alias Mobilizon.Federation.ActivityPub.{Activity, Refresher, Transmogrifier}
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.WebFinger
 
   alias Mobilizon.GraphQL.API.Follows
@@ -37,7 +38,8 @@ defmodule Mobilizon.Federation.ActivityPub.Relay do
   def follow(address) do
     with {:ok, target_instance} <- fetch_actor(address),
          %Actor{} = local_actor <- get_actor(),
-         {:ok, %Actor{} = target_actor} <- ActivityPub.get_or_fetch_actor_by_url(target_instance),
+         {:ok, %Actor{} = target_actor} <-
+           ActivityPubActor.get_or_fetch_actor_by_url(target_instance),
          {:ok, activity, follow} <- Follows.follow(local_actor, target_actor) do
       Logger.info("Relay: followed instance #{target_instance}; id=#{activity.data["id"]}")
       {:ok, activity, follow}
@@ -56,7 +58,8 @@ defmodule Mobilizon.Federation.ActivityPub.Relay do
   def unfollow(address) do
     with {:ok, target_instance} <- fetch_actor(address),
          %Actor{} = local_actor <- get_actor(),
-         {:ok, %Actor{} = target_actor} <- ActivityPub.get_or_fetch_actor_by_url(target_instance),
+         {:ok, %Actor{} = target_actor} <-
+           ActivityPubActor.get_or_fetch_actor_by_url(target_instance),
          {:ok, activity, follow} <- Follows.unfollow(local_actor, target_actor) do
       Logger.info("Relay: unfollowed instance #{target_instance}: id=#{activity.data["id"]}")
       {:ok, activity, follow}
@@ -73,7 +76,8 @@ defmodule Mobilizon.Federation.ActivityPub.Relay do
 
     with {:ok, target_instance} <- fetch_actor(address),
          %Actor{} = local_actor <- get_actor(),
-         {:ok, %Actor{} = target_actor} <- ActivityPub.get_or_fetch_actor_by_url(target_instance),
+         {:ok, %Actor{} = target_actor} <-
+           ActivityPubActor.get_or_fetch_actor_by_url(target_instance),
          {:ok, activity, follow} <- Follows.accept(target_actor, local_actor) do
       {:ok, activity, follow}
     end
@@ -84,7 +88,8 @@ defmodule Mobilizon.Federation.ActivityPub.Relay do
 
     with {:ok, target_instance} <- fetch_actor(address),
          %Actor{} = local_actor <- get_actor(),
-         {:ok, %Actor{} = target_actor} <- ActivityPub.get_or_fetch_actor_by_url(target_instance),
+         {:ok, %Actor{} = target_actor} <-
+           ActivityPubActor.get_or_fetch_actor_by_url(target_instance),
          {:ok, activity, follow} <- Follows.reject(target_actor, local_actor) do
       {:ok, activity, follow}
     end
@@ -94,7 +99,8 @@ defmodule Mobilizon.Federation.ActivityPub.Relay do
     Logger.debug("We're trying to refresh a remote instance")
 
     with {:ok, target_instance} <- fetch_actor(address),
-         {:ok, %Actor{} = target_actor} <- ActivityPub.get_or_fetch_actor_by_url(target_instance) do
+         {:ok, %Actor{} = target_actor} <-
+           ActivityPubActor.get_or_fetch_actor_by_url(target_instance) do
       Refresher.refresh_profile(target_actor)
     end
   end
@@ -126,7 +132,7 @@ defmodule Mobilizon.Federation.ActivityPub.Relay do
     end
   end
 
-  defp fetch_object(object) when is_bitstring(object), do: {object, object}
+  defp fetch_object(object) when is_binary(object), do: {object, object}
 
   @spec fetch_actor(String.t()) :: {:ok, String.t()} | {:error, String.t()}
   # Dirty hack
@@ -159,7 +165,7 @@ defmodule Mobilizon.Federation.ActivityPub.Relay do
   @spec finger_actor(String.t()) :: {:ok, String.t()} | {:error, String.t()}
   defp finger_actor(nickname) do
     case WebFinger.finger(nickname) do
-      {:ok, %{"url" => url}} when not is_nil(url) ->
+      {:ok, url} when is_binary(url) ->
         {:ok, url}
 
       _e ->

lib/federation/activity_pub/transmogrifier.ex

@@ -18,6 +18,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
 
   alias Mobilizon.Federation.ActivityPub
   alias Mobilizon.Federation.ActivityPub.{Activity, Refresher, Relay, Utils}
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityPub.Types.Ownable
   alias Mobilizon.Federation.ActivityStream.{Converter, Convertible}
   alias Mobilizon.Tombstone
@@ -117,12 +118,13 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
 
   def handle_incoming(%{
         "type" => "Create",
-        "object" => %{"type" => "Group", "id" => group_url} = _object
+        "object" => %{"type" => type, "id" => actor_url} = _object
-      }) do
+      })
-    Logger.info("Handle incoming to create a group")
+      when type in ["Group", "Person", "Actor"] do
+    Logger.info("Handle incoming to create an actor")
 
-    with {:ok, %Actor{} = group} <- ActivityPub.get_or_fetch_actor_by_url(group_url) do
+    with {:ok, %Actor{} = actor} <- ActivityPubActor.get_or_fetch_actor_by_url(actor_url) do
-      {:ok, nil, group}
+      {:ok, nil, actor}
     end
   end
 
@@ -201,8 +203,8 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
   def handle_incoming(
         %{"type" => "Follow", "object" => followed, "actor" => follower, "id" => id} = _data
       ) do
-    with {:ok, %Actor{} = followed} <- ActivityPub.get_or_fetch_actor_by_url(followed, true),
+    with {:ok, %Actor{} = followed} <- ActivityPubActor.get_or_fetch_actor_by_url(followed, true),
-         {:ok, %Actor{} = follower} <- ActivityPub.get_or_fetch_actor_by_url(follower),
+         {:ok, %Actor{} = follower} <- ActivityPubActor.get_or_fetch_actor_by_url(follower),
          {:ok, activity, object} <- ActivityPub.follow(follower, followed, id, false) do
       {:ok, activity, object}
     else
@@ -221,7 +223,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
 
     with {:existing_todo_list, nil} <-
            {:existing_todo_list, Todos.get_todo_list_by_url(object_url)},
-         {:ok, %Actor{url: actor_url}} <- ActivityPub.get_or_fetch_actor_by_url(actor_url),
+         {:ok, %Actor{url: actor_url}} <- ActivityPubActor.get_or_fetch_actor_by_url(actor_url),
          object_data when is_map(object_data) <-
            object |> Converter.TodoList.as_to_model_data(),
          {:ok, %Activity{} = activity, %TodoList{} = todo_list} <-
@@ -295,7 +297,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
         } = data
       ) do
     with actor_url <- Utils.get_actor(data),
-         {:ok, %Actor{} = actor} <- ActivityPub.get_or_fetch_actor_by_url(actor_url),
+         {:ok, %Actor{} = actor} <- ActivityPubActor.get_or_fetch_actor_by_url(actor_url),
          {:object_not_found, {:ok, %Activity{} = activity, object}} <-
            {:object_not_found,
             do_handle_incoming_accept_following(accepted_object, actor) ||
@@ -328,7 +330,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
         %{"type" => "Reject", "object" => rejected_object, "actor" => _actor, "id" => id} = data
       ) do
     with actor_url <- Utils.get_actor(data),
-         {:ok, %Actor{} = actor} <- ActivityPub.get_or_fetch_actor_by_url(actor_url),
+         {:ok, %Actor{} = actor} <- ActivityPubActor.get_or_fetch_actor_by_url(actor_url),
          {:object_not_found, {:ok, activity, object}} <-
            {:object_not_found,
             do_handle_incoming_reject_following(rejected_object, actor) ||
@@ -359,7 +361,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
       ) do
     with actor_url <- Utils.get_actor(data),
          {:ok, %Actor{id: actor_id, suspended: false} = actor} <-
-           ActivityPub.get_or_fetch_actor_by_url(actor_url),
+           ActivityPubActor.get_or_fetch_actor_by_url(actor_url),
          :ok <- Logger.debug("Fetching contained object"),
          {:ok, entity} <- process_announce_data(object, actor),
          :ok <- eventually_create_share(object, entity, actor_id) do
@@ -371,14 +373,16 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
     end
   end
 
-  def handle_incoming(%{
+  def handle_incoming(
-        "type" => "Update",
+        %{
-        "object" => %{"type" => object_type} = object,
+          "type" => "Update",
-        "actor" => _actor_id
+          "object" => %{"type" => object_type} = object,
-      })
+          "actor" => _actor_id
+        } = params
+      )
       when object_type in ["Person", "Group", "Application", "Service", "Organization"] do
     with {:ok, %Actor{suspended: false} = old_actor} <-
-           ActivityPub.get_or_fetch_actor_by_url(object["id"]),
+           ActivityPubActor.get_or_fetch_actor_by_url(object["id"]),
          object_data <-
            object |> Converter.Actor.as_to_model_data(),
          {:ok, %Activity{} = activity, %Actor{} = new_actor} <-
@@ -386,7 +390,11 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
       {:ok, activity, new_actor}
     else
       e ->
-        Logger.error(inspect(e))
+        Sentry.capture_message("Error while handling an Update activity",
+          extra: %{params: params}
+        )
+
+        Logger.debug(inspect(e))
         :error
     end
   end
@@ -397,7 +405,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
       ) do
     with actor <- Utils.get_actor(update_data),
          {:ok, %Actor{url: actor_url, suspended: false} = actor} <-
-           ActivityPub.get_or_fetch_actor_by_url(actor),
+           ActivityPubActor.get_or_fetch_actor_by_url(actor),
          {:ok, %Event{} = old_event} <-
            object |> Utils.get_url() |> ActivityPub.fetch_object_from_url(),
          object_data <- Converter.Event.as_to_model_data(object),
@@ -422,7 +430,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
 
     with actor <- Utils.get_actor(update_data),
          {:ok, %Actor{url: actor_url, suspended: false}} <-
-           ActivityPub.get_or_fetch_actor_by_url(actor),
+           ActivityPubActor.get_or_fetch_actor_by_url(actor),
          {:origin_check, true} <- {:origin_check, Utils.origin_check?(actor_url, update_data)},
          object_data <- Converter.Comment.as_to_model_data(object),
          {:ok, old_entity} <- object |> Utils.get_url() |> ActivityPub.fetch_object_from_url(),
@@ -442,7 +450,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
       ) do
     with actor <- Utils.get_actor(update_data),
          {:ok, %Actor{url: actor_url, suspended: false} = actor} <-
-           ActivityPub.get_or_fetch_actor_by_url(actor),
+           ActivityPubActor.get_or_fetch_actor_by_url(actor),
          {:ok, %Post{} = old_post} <-
            object |> Utils.get_url() |> ActivityPub.fetch_object_from_url(),
          object_data <- Converter.Post.as_to_model_data(object),
@@ -470,7 +478,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
       when type in ["ResourceCollection", "Document"] do
     with actor <- Utils.get_actor(update_data),
          {:ok, %Actor{url: actor_url, suspended: false}} <-
-           ActivityPub.get_or_fetch_actor_by_url(actor),
+           ActivityPubActor.get_or_fetch_actor_by_url(actor),
          {:ok, %Resource{} = old_resource} <-
            object |> Utils.get_url() |> ActivityPub.fetch_object_from_url(),
          object_data <- Converter.Resource.as_to_model_data(object),
@@ -495,7 +503,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
 
     with actor <- Utils.get_actor(update_data),
          {:ok, %Actor{url: actor_url, suspended: false} = actor} <-
-           ActivityPub.get_or_fetch_actor_by_url(actor),
+           ActivityPubActor.get_or_fetch_actor_by_url(actor),
          {:origin_check, true} <- {:origin_check, Utils.origin_check?(actor_url, update_data)},
          object_data <- Converter.Member.as_to_model_data(object),
          {:ok, old_entity} <- object |> Utils.get_url() |> ActivityPub.fetch_object_from_url(),
@@ -537,7 +545,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
         } = data
       ) do
     with actor <- Utils.get_actor(data),
-         {:ok, %Actor{} = actor} <- ActivityPub.get_or_fetch_actor_by_url(actor),
+         {:ok, %Actor{} = actor} <- ActivityPubActor.get_or_fetch_actor_by_url(actor),
          {:ok, object} <- fetch_obj_helper_as_activity_streams(object_id),
          {:ok, activity, object} <-
            ActivityPub.unannounce(actor, object, id, cancelled_activity_id, false) do
@@ -555,8 +563,9 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
           "id" => id
         } = _data
       ) do
-    with {:ok, %Actor{domain: nil} = followed} <- ActivityPub.get_or_fetch_actor_by_url(followed),
+    with {:ok, %Actor{domain: nil} = followed} <-
-         {:ok, %Actor{} = follower} <- ActivityPub.get_or_fetch_actor_by_url(follower),
+           ActivityPubActor.get_or_fetch_actor_by_url(followed),
+         {:ok, %Actor{} = follower} <- ActivityPubActor.get_or_fetch_actor_by_url(follower),
          {:ok, activity, object} <- ActivityPub.unfollow(follower, followed, id, false) do
       {:ok, activity, object}
     else
@@ -572,7 +581,8 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
         %{"type" => "Delete", "object" => object, "actor" => _actor, "id" => _id} = data
       ) do
     with actor_url <- Utils.get_actor(data),
-         {:ok, %Actor{} = actor} <- ActivityPub.get_or_fetch_actor_by_url(actor_url),
+         {:actor, {:ok, %Actor{} = actor}} <-
+           {:actor, ActivityPubActor.get_or_fetch_actor_by_url(actor_url)},
          object_id <- Utils.get_url(object),
          {:ok, object} <- is_group_object_gone(object_id),
          {:origin_check, true} <-
@@ -586,8 +596,25 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
         Logger.warn("Object origin check failed")
         :error
 
+      {:actor, {:error, "Could not fetch by AP id"}} ->
+        {:error, :unknown_actor}
+
+      {:error, e} ->
+        Logger.debug(inspect(e))
+
+        # Sentry.capture_message("Error while handling a Delete activity",
+        #   extra: %{data: data}
+        # )
+
+        :error
+
       e ->
         Logger.error(inspect(e))
+
+        # Sentry.capture_message("Error while handling a Delete activity",
+        #   extra: %{data: data}
+        # )
+
         :error
     end
   end
@@ -598,7 +625,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
       when type in ["ResourceCollection", "Document"] do
     with actor <- Utils.get_actor(data),
          {:ok, %Actor{url: actor_url, suspended: false} = actor} <-
-           ActivityPub.get_or_fetch_actor_by_url(actor),
+           ActivityPubActor.get_or_fetch_actor_by_url(actor),
          {:ok, %Resource{} = old_resource} <-
            object |> Utils.get_url() |> ActivityPub.fetch_object_from_url(),
          object_data <- Converter.Resource.as_to_model_data(object),
@@ -610,7 +637,12 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
       {:ok, activity, new_resource}
     else
       e ->
-        Logger.error(inspect(e))
+        Logger.debug(inspect(e))
+
+        Sentry.capture_message("Error while handling an Move activity",
+          extra: %{data: data}
+        )
+
         :error
     end
   end
@@ -625,7 +657,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
       ) do
     with actor <- Utils.get_actor(data),
          {:ok, %Actor{url: _actor_url, suspended: false} = actor} <-
-           ActivityPub.get_or_fetch_actor_by_url(actor),
+           ActivityPubActor.get_or_fetch_actor_by_url(actor),
          object <- Utils.get_url(object),
          {:ok, object} <- ActivityPub.fetch_object_from_url(object),
          {:ok, activity, object} <-
@@ -643,7 +675,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
 
   def handle_incoming(%{"type" => "Leave", "object" => object, "actor" => actor} = data) do
     with actor <- Utils.get_actor(data),
-         {:ok, %Actor{} = actor} <- ActivityPub.get_or_fetch_actor_by_url(actor),
+         {:ok, %Actor{} = actor} <- ActivityPubActor.get_or_fetch_actor_by_url(actor),
          object <- Utils.get_url(object),
          {:ok, object} <- ActivityPub.fetch_object_from_url(object),
          {:ok, activity, object} <- ActivityPub.leave(object, actor, false) do
@@ -673,10 +705,10 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
     Logger.info("Handle incoming to invite someone")
 
     with {:ok, %Actor{} = actor} <-
-           data |> Utils.get_actor() |> ActivityPub.get_or_fetch_actor_by_url(),
+           data |> Utils.get_actor() |> ActivityPubActor.get_or_fetch_actor_by_url(),
          {:ok, object} <- object |> Utils.get_url() |> ActivityPub.fetch_object_from_url(),
          {:ok, %Actor{} = target} <-
-           target |> Utils.get_url() |> ActivityPub.get_or_fetch_actor_by_url(),
+           target |> Utils.get_url() |> ActivityPubActor.get_or_fetch_actor_by_url(),
          {:ok, activity, %Member{} = member} <-
            ActivityPub.invite(object, actor, target, false, %{url: id}) do
       {:ok, activity, member}
@@ -689,10 +721,10 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
     Logger.info("Handle incoming to remove a member from a group")
 
     with {:ok, %Actor{id: moderator_id} = moderator} <-
-           data |> Utils.get_actor() |> ActivityPub.get_or_fetch_actor_by_url(),
+           data |> Utils.get_actor() |> ActivityPubActor.get_or_fetch_actor_by_url(),
          {:ok, person_id} <- get_remove_object(object),
          {:ok, %Actor{type: :Group, id: group_id} = group} <-
-           origin |> Utils.get_url() |> ActivityPub.get_or_fetch_actor_by_url(),
+           origin |> Utils.get_url() |> ActivityPubActor.get_or_fetch_actor_by_url(),
          {:is_admin, {:ok, %Member{role: role}}}
          when role in [:moderator, :administrator, :creator] <-
            {:is_admin, Actors.get_member(moderator_id, group_id)},
@@ -741,6 +773,7 @@ defmodule Mobilizon.Federation.ActivityPub.Transmogrifier do
   def handle_incoming(object) do
     Logger.info("Handing something with type #{object["type"]} not supported")
     Logger.debug(inspect(object))
+
     {:error, :not_supported}
   end
 

lib/federation/activity_pub/types/discussions.ex

@@ -132,7 +132,8 @@ defmodule Mobilizon.Federation.ActivityPub.Types.Discussions do
       )
 
     args
-    |> Map.update(:title, "", &String.trim/1)
+    # title might be nil
+    |> Map.update(:title, "", fn title -> String.trim(title || "") end)
     |> Map.put(:text, text)
   end
 end

lib/federation/activity_pub/utils.ex

@@ -14,6 +14,7 @@ defmodule Mobilizon.Federation.ActivityPub.Utils do
 
   alias Mobilizon.Federation.ActivityPub
   alias Mobilizon.Federation.ActivityPub.{Activity, Federator, Relay}
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityPub.Types.Ownable
   alias Mobilizon.Federation.ActivityStream.Converter
   alias Mobilizon.Federation.HTTPSignatures
@@ -26,7 +27,7 @@ defmodule Mobilizon.Federation.ActivityPub.Utils do
   # Some implementations send the actor URI as the actor field, others send the entire actor object,
   # so figure out what the actor's URI is based on what we have.
   def get_url(%{"id" => id}), do: id
-  def get_url(id) when is_bitstring(id), do: id
+  def get_url(id) when is_binary(id), do: id
   def get_url(ids) when is_list(ids), do: get_url(hd(ids))
   def get_url(_), do: nil
 
@@ -175,7 +176,7 @@ defmodule Mobilizon.Federation.ActivityPub.Utils do
   @spec remote_actors(list(String.t())) :: list(Actor.t())
   def remote_actors(recipients) do
     recipients
-    |> Enum.map(fn url -> ActivityPub.get_or_fetch_actor_by_url(url) end)
+    |> Enum.map(fn url -> ActivityPubActor.get_or_fetch_actor_by_url(url) end)
     |> Enum.map(fn {status, actor} ->
       case status do
         :ok ->
@@ -223,7 +224,7 @@ defmodule Mobilizon.Federation.ActivityPub.Utils do
     end
   end
 
-  def get_actor(%{"actor" => %{"id" => id}}) when is_bitstring(id) do
+  def get_actor(%{"actor" => %{"id" => id}}) when is_binary(id) do
     id
   end
 
@@ -259,7 +260,9 @@ defmodule Mobilizon.Federation.ActivityPub.Utils do
     are_same_origin?(id, actor)
   end
 
-  def origin_check?(_id, %{"type" => type} = _params) when type in ["Actor", "Group"], do: true
+  def origin_check?(id, %{"type" => type, "id" => actor_id} = _params)
+      when type in ["Actor", "Person", "Group"],
+      do: id == actor_id
 
   def origin_check?(_id, %{"actor" => nil} = _args), do: false
 
@@ -701,4 +704,42 @@ defmodule Mobilizon.Federation.ActivityPub.Utils do
       true
     end
   end
+
+  @spec label_in_collection?(any(), any()) :: boolean()
+  defp label_in_collection?(url, coll) when is_binary(coll), do: url == coll
+  defp label_in_collection?(url, coll) when is_list(coll), do: url in coll
+  defp label_in_collection?(_, _), do: false
+
+  @spec label_in_message?(String.t(), map()) :: boolean()
+  def label_in_message?(label, params),
+    do:
+      [params["to"], params["cc"], params["bto"], params["bcc"]]
+      |> Enum.any?(&label_in_collection?(label, &1))
+
+  @spec unaddressed_message?(map()) :: boolean()
+  def unaddressed_message?(params),
+    do:
+      [params["to"], params["cc"], params["bto"], params["bcc"]]
+      |> Enum.all?(&is_nil(&1))
+
+  @spec recipient_in_message(Actor.t(), Actor.t(), map()) :: boolean()
+  def recipient_in_message(%Actor{url: url} = _recipient, %Actor{} = _actor, params),
+    do: label_in_message?(url, params) || unaddressed_message?(params)
+
+  defp extract_list(target) when is_binary(target), do: [target]
+  defp extract_list(lst) when is_list(lst), do: lst
+  defp extract_list(_), do: []
+
+  def maybe_splice_recipient(url, params) do
+    need_splice? =
+      !label_in_collection?(url, params["to"]) &&
+        !label_in_collection?(url, params["cc"])
+
+    if need_splice? do
+      cc_list = extract_list(params["cc"])
+      Map.put(params, "cc", [url | cc_list])
+    else
+      params
+    end
+  end
 end

lib/federation/activity_stream/converter/discussion.ex

@@ -8,7 +8,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Discussion do
 
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Discussions.Discussion
-  alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityStream.{Converter, Convertible}
   alias Mobilizon.Federation.ActivityStream.Converter.Discussion, as: DiscussionConverter
   alias Mobilizon.Storage.Repo
@@ -31,7 +31,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Discussion do
 
     %{
       "type" => "Note",
-      "to" => [discussion.actor.followers_url],
+      "to" => [discussion.actor.members_url],
       "cc" => [],
       "name" => discussion.title,
       "content" => discussion.last_comment.text,
@@ -49,10 +49,10 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Discussion do
   def as_to_model_data(%{"type" => "Note", "name" => name} = object) when not is_nil(name) do
     with creator_url <- Map.get(object, "actor"),
          {:ok, %Actor{id: creator_id, suspended: false}} <-
-           ActivityPub.get_or_fetch_actor_by_url(creator_url),
+           ActivityPubActor.get_or_fetch_actor_by_url(creator_url),
          actor_url <- Map.get(object, "attributedTo"),
          {:ok, %Actor{id: actor_id, suspended: false}} <-
-           ActivityPub.get_or_fetch_actor_by_url(actor_url) do
+           ActivityPubActor.get_or_fetch_actor_by_url(actor_url) do
       %{
         title: name,
         actor_id: actor_id,

lib/federation/activity_stream/converter/event.ex

@@ -155,7 +155,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Event do
   end
 
   @spec get_address(map | binary | nil) :: integer | nil
-  defp get_address(address_url) when is_bitstring(address_url) do
+  defp get_address(address_url) when is_binary(address_url) do
     get_address(%{"id" => address_url})
   end
 

lib/federation/activity_stream/converter/flag.ex

@@ -14,7 +14,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Flag do
   alias Mobilizon.Events.Event
   alias Mobilizon.Reports.Report
 
-  alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityPub.Relay
   alias Mobilizon.Federation.ActivityStream.{Converter, Convertible}
 
@@ -65,10 +65,11 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Flag do
 
   @spec as_to_model(map) :: map
   def as_to_model(%{"object" => objects} = object) do
-    with {:ok, %Actor{} = reporter} <- ActivityPub.get_or_fetch_actor_by_url(object["actor"]),
+    with {:ok, %Actor{} = reporter} <-
+           ActivityPubActor.get_or_fetch_actor_by_url(object["actor"]),
          %Actor{} = reported <-
            Enum.reduce_while(objects, nil, fn url, _ ->
-             case ActivityPub.get_or_fetch_actor_by_url(url) do
+             case ActivityPubActor.get_or_fetch_actor_by_url(url) do
                {:ok, %Actor{} = actor} ->
                  {:halt, actor}
 

lib/federation/activity_stream/converter/media.ex

@@ -38,7 +38,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Media do
         %{"type" => "Document", "url" => media_url, "name" => name},
         actor_id
       )
-      when is_bitstring(media_url) do
+      when is_binary(media_url) do
     with {:ok, %{body: body}} <- Tesla.get(media_url, opts: @http_options),
          {:ok, %{name: name, url: url, content_type: content_type, size: size}} <-
            Upload.store(%{body: body, name: name}),

lib/federation/activity_stream/converter/member.ex

@@ -8,7 +8,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Member do
 
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Actors.Member, as: MemberModel
-  alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityPub.Utils
 
   alias Mobilizon.Federation.ActivityStream.Convertible
@@ -53,5 +53,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Member do
 
   @spec get_actor(String.t() | map() | nil) :: {:ok, Actor.t()} | {:error, String.t()}
   defp get_actor(nil), do: {:error, "nil property found for actor data"}
-  defp get_actor(actor), do: actor |> Utils.get_url() |> ActivityPub.get_or_fetch_actor_by_url()
+
+  defp get_actor(actor),
+    do: actor |> Utils.get_url() |> ActivityPubActor.get_or_fetch_actor_by_url()
 end

lib/federation/activity_stream/converter/post.ex

@@ -6,7 +6,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Post do
   internal one, and back.
   """
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityPub.{Audience, Utils}
   alias Mobilizon.Federation.ActivityStream.{Converter, Convertible}
   alias Mobilizon.Federation.ActivityStream.Converter.Media, as: MediaConverter
@@ -91,7 +91,9 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Post do
 
   @spec get_actor(String.t() | map() | nil) :: {:ok, Actor.t()} | {:error, String.t()}
   defp get_actor(nil), do: {:error, "nil property found for actor data"}
-  defp get_actor(actor), do: actor |> Utils.get_url() |> ActivityPub.get_or_fetch_actor_by_url()
+
+  defp get_actor(actor),
+    do: actor |> Utils.get_url() |> ActivityPubActor.get_or_fetch_actor_by_url()
 
   defp to_date(nil), do: nil
   defp to_date(%DateTime{} = date), do: DateTime.to_iso8601(date)

lib/federation/activity_stream/converter/resource.ex

@@ -7,6 +7,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Resource do
   """
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityPub.Utils
   alias Mobilizon.Federation.ActivityStream.{Converter, Convertible}
   alias Mobilizon.Resources
@@ -88,7 +89,9 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Resource do
 
   @spec get_actor(String.t() | map() | nil) :: {:ok, Actor.t()} | {:error, String.t()}
   defp get_actor(nil), do: {:error, "nil property found for actor data"}
-  defp get_actor(actor), do: actor |> Utils.get_url() |> ActivityPub.get_or_fetch_actor_by_url()
+
+  defp get_actor(actor),
+    do: actor |> Utils.get_url() |> ActivityPubActor.get_or_fetch_actor_by_url()
 
   defp get_context(%Resource{parent_id: nil, actor: %Actor{resources_url: resources_url}}),
     do: resources_url

lib/federation/activity_stream/converter/todo.ex

@@ -7,6 +7,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Todo do
   """
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityStream.{Converter, Convertible}
   alias Mobilizon.Todos
   alias Mobilizon.Todos.{Todo, TodoList}
@@ -51,7 +52,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Todo do
         %{"type" => "Todo", "actor" => actor_url, "todoList" => todo_list_url} = object
       ) do
     with {:ok, %Actor{id: creator_id} = _creator} <-
-           ActivityPub.get_or_fetch_actor_by_url(actor_url),
+           ActivityPubActor.get_or_fetch_actor_by_url(actor_url),
          {:todo_list, %TodoList{id: todo_list_id}} <-
            {:todo_list, Todos.get_todo_list_by_url(todo_list_url)} do
       %{

lib/federation/activity_stream/converter/todo_list.ex

@@ -6,7 +6,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.TodoList do
   internal one, and back.
   """
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityStream.{Converter, Convertible}
   alias Mobilizon.Todos.TodoList
 
@@ -39,7 +39,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.TodoList do
   @impl Converter
   @spec as_to_model_data(map) :: {:ok, map} | {:error, any()}
   def as_to_model_data(%{"type" => "TodoList", "actor" => actor_url} = object) do
-    case ActivityPub.get_or_fetch_actor_by_url(actor_url) do
+    case ActivityPubActor.get_or_fetch_actor_by_url(actor_url) do
       {:ok, %Actor{type: :Group, id: group_id} = _group} ->
         %{
           title: object["name"],

lib/federation/activity_stream/converter/utils.ex

@@ -10,7 +10,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Utils do
   alias Mobilizon.Mention
   alias Mobilizon.Storage.Repo
 
-  alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.ActivityStream.Converter.Media, as: MediaConverter
 
   alias Mobilizon.Web.Endpoint
@@ -94,7 +94,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Utils do
     end
   end
 
-  defp fetch_tag(tag) when is_bitstring(tag), do: [tag_without_hash(tag)]
+  defp fetch_tag(tag) when is_binary(tag), do: [tag_without_hash(tag)]
 
   defp tag_without_hash("#" <> tag_title), do: tag_title
   defp tag_without_hash(tag_title), do: tag_title
@@ -114,7 +114,8 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Utils do
   @spec create_mention(map(), list()) :: list()
   defp create_mention(mention, acc) when is_map(mention) do
     with true <- mention["type"] == "Mention",
-         {:ok, %Actor{id: actor_id}} <- ActivityPub.get_or_fetch_actor_by_url(mention["href"]) do
+         {:ok, %Actor{id: actor_id}} <-
+           ActivityPubActor.get_or_fetch_actor_by_url(mention["href"]) do
       acc ++ [%{actor_id: actor_id}]
     else
       _err ->
@@ -169,7 +170,7 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Utils do
   @spec fetch_actor(String.t()) :: Actor.t()
   defp fetch_actor(actor_url) do
     with {:ok, %Actor{suspended: false} = actor} <-
-           ActivityPub.get_or_fetch_actor_by_url(actor_url) do
+           ActivityPubActor.get_or_fetch_actor_by_url(actor_url) do
       actor
     end
   end

lib/federation/http_signatures/signature.ex

@@ -12,7 +12,7 @@ defmodule Mobilizon.Federation.HTTPSignatures.Signature do
 
   alias Mobilizon.Actors.Actor
 
-  alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
 
   require Logger
 
@@ -50,9 +50,10 @@ defmodule Mobilizon.Federation.HTTPSignatures.Signature do
 
   # Gets a public key for a given ActivityPub actor ID (url).
   @spec get_public_key_for_url(String.t()) ::
-          {:ok, String.t()} | {:error, :actor_fetch_error | :pem_decode_error}
+          {:ok, String.t()}
+          | {:error, :actor_fetch_error | :pem_decode_error | :actor_not_fetchable}
   defp get_public_key_for_url(url) do
-    with {:ok, %Actor{keys: keys}} <- ActivityPub.get_or_fetch_actor_by_url(url),
+    with {:ok, %Actor{keys: keys}} <- ActivityPubActor.get_or_fetch_actor_by_url(url),
          {:ok, public_key} <- prepare_public_key(keys) do
       {:ok, public_key}
     else
@@ -61,8 +62,16 @@ defmodule Mobilizon.Federation.HTTPSignatures.Signature do
 
         {:error, :pem_decode_error}
 
-      _ ->
+      {:error, "Could not fetch by AP id"} ->
+        {:error, :actor_not_fetchable}
+
+      err ->
+        Sentry.capture_message("Unable to fetch actor, so no keys for you",
+          extra: %{url: url}
+        )
+
         Logger.error("Unable to fetch actor, so no keys for you")
+        Logger.error(inspect(err))
 
         {:error, :actor_fetch_error}
     end
@@ -74,9 +83,6 @@ defmodule Mobilizon.Federation.HTTPSignatures.Signature do
          :ok <- Logger.debug("Fetching public key for #{actor_id}"),
          {:ok, public_key} <- get_public_key_for_url(actor_id) do
       {:ok, public_key}
-    else
-      e ->
-        {:error, e}
     end
   end
 
@@ -84,12 +90,9 @@ defmodule Mobilizon.Federation.HTTPSignatures.Signature do
     with %{"keyId" => kid} <- HTTPSignatures.signature_for_conn(conn),
          actor_id <- key_id_to_actor_url(kid),
          :ok <- Logger.debug("Refetching public key for #{actor_id}"),
-         {:ok, _actor} <- ActivityPub.make_actor_from_url(actor_id),
+         {:ok, _actor} <- ActivityPubActor.make_actor_from_url(actor_id),
          {:ok, public_key} <- get_public_key_for_url(actor_id) do
       {:ok, public_key}
-    else
-      e ->
-        {:error, e}
     end
   end
 

lib/federation/web_finger/web_finger.ex

@@ -10,28 +10,39 @@ defmodule Mobilizon.Federation.WebFinger do
 
   alias Mobilizon.Actors
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Federation.WebFinger.XmlBuilder
-  alias Mobilizon.Service.HTTP.WebfingerClient
+  alias Mobilizon.Service.HTTP.{HostMetaClient, WebfingerClient}
   alias Mobilizon.Web.Endpoint
   alias Mobilizon.Web.Router.Helpers, as: Routes
   require Jason
   require Logger
+  import SweetXml
 
   def host_meta do
     base_url = Endpoint.url()
+    %URI{host: host} = URI.parse(base_url)
 
     {
       :XRD,
-      %{xmlns: "http://docs.oasis-open.org/ns/xri/xrd-1.0"},
+      %{
-      {
+        xmlns: "http://docs.oasis-open.org/ns/xri/xrd-1.0",
-        :Link,
+        "xmlns:hm": "http://host-meta.net/ns/1.0"
-        %{
+      },
-          rel: "lrdd",
+      [
-          type: "application/xrd+xml",
+        {
-          template: "#{base_url}/.well-known/webfinger?resource={uri}"
+          :"hm:Host",
+          host
+        },
+        {
+          :Link,
+          %{
+            rel: "lrdd",
+            type: "application/jrd+json",
+            template: "#{base_url}/.well-known/webfinger?resource={uri}"
+          }
         }
-      }
+      ]
     }
     |> XmlBuilder.to_doc()
   end
@@ -45,7 +56,7 @@ defmodule Mobilizon.Federation.WebFinger do
       {:ok, represent_actor(actor, "JSON")}
     else
       _e ->
-        case ActivityPub.get_or_fetch_actor_by_url(resource) do
+        case ActivityPubActor.get_or_fetch_actor_by_url(resource) do
           {:ok, %Actor{} = actor} when not is_nil(actor) ->
             {:ok, represent_actor(actor, "JSON")}
 
@@ -56,29 +67,116 @@ defmodule Mobilizon.Federation.WebFinger do
   end
 
   @spec represent_actor(Actor.t()) :: struct()
-  def represent_actor(actor), do: represent_actor(actor, "JSON")
+  def represent_actor(%Actor{} = actor), do: represent_actor(actor, "JSON")
 
   @spec represent_actor(Actor.t(), String.t()) :: struct()
-  def represent_actor(actor, "JSON") do
+  def represent_actor(%Actor{} = actor, "JSON") do
-    %{
+    links =
-      "subject" => "acct:#{actor.preferred_username}@#{Endpoint.host()}",
+      [
-      "aliases" => [actor.url],
-      "links" => [
         %{"rel" => "self", "type" => "application/activity+json", "href" => actor.url},
-        %{
-          "rel" => "https://webfinger.net/rel/profile-page/",
-          "type" => "text/html",
-          "href" => actor.url
-        },
         %{
           "rel" => "http://ostatus.org/schema/1.0/subscribe",
           "template" => "#{Routes.page_url(Endpoint, :interact, uri: nil)}{uri}"
         }
       ]
+      |> maybe_add_avatar(actor)
+      |> maybe_add_profile_page(actor)
+
+    %{
+      "subject" => "acct:#{actor.preferred_username}@#{Endpoint.host()}",
+      "aliases" => [actor.url],
+      "links" => links
     }
   end
 
-  defp webfinger_from_json(doc) do
+  defp maybe_add_avatar(data, %Actor{avatar: avatar}) when not is_nil(avatar) do
+    data ++
+      [
+        %{
+          "rel" => "http://webfinger.net/rel/avatar",
+          "type" => avatar.content_type,
+          "href" => avatar.url
+        }
+      ]
+  end
+
+  defp maybe_add_avatar(data, _actor), do: data
+
+  defp maybe_add_profile_page(data, %Actor{type: :Group, url: url}) do
+    data ++
+      [
+        %{
+          "rel" => "http://webfinger.net/rel/profile-page/",
+          "type" => "text/html",
+          "href" => url
+        }
+      ]
+  end
+
+  defp maybe_add_profile_page(data, _actor), do: data
+
+  @doc """
+  Finger an actor to retreive it's ActivityPub ID/URL
+
+  Fetches the Extensible Resource Descriptor endpoint `/.well-known/host-meta` to find the Webfinger endpoint (usually `/.well-known/webfinger?resource=`) with `find_webfinger_endpoint/1` and then performs a Webfinger query to get the ActivityPub ID associated to an actor.
+  """
+  @spec finger(String.t()) :: {:ok, String.t()} | {:error, atom()}
+  def finger(actor) do
+    actor = String.trim_leading(actor, "@")
+
+    with address when is_binary(address) <- apply_webfinger_endpoint(actor),
+         false <- address_invalid(address),
+         {:ok, %{body: body, status: code}} when code in 200..299 <-
+           WebfingerClient.get(address),
+         {:ok, %{"url" => url}} <- webfinger_from_json(body) do
+      {:ok, url}
+    else
+      e ->
+        Logger.debug("Couldn't finger #{actor}")
+        Logger.debug(inspect(e))
+        {:error, e}
+    end
+  end
+
+  @doc """
+  Fetches the Extensible Resource Descriptor endpoint `/.well-known/host-meta` to find the Webfinger endpoint (usually `/.well-known/webfinger?resource=`)
+  """
+  @spec find_webfinger_endpoint(String.t()) :: String.t()
+  def find_webfinger_endpoint(domain) when is_binary(domain) do
+    with {:ok, %{body: body}} <- fetch_document("http://#{domain}/.well-known/host-meta"),
+         link_template <- find_link_from_template(body) do
+      {:ok, link_template}
+    end
+  end
+
+  @spec apply_webfinger_endpoint(String.t()) :: String.t() | {:error, :host_not_found}
+  defp apply_webfinger_endpoint(actor) do
+    with {:ok, domain} <- domain_from_federated_actor(actor) do
+      case find_webfinger_endpoint(domain) do
+        {:ok, link_template} ->
+          String.replace(link_template, "{uri}", "acct:#{actor}")
+
+        _ ->
+          "http://#{domain}/.well-known/webfinger?resource=acct:#{actor}"
+      end
+    end
+  end
+
+  @spec domain_from_federated_actor(String.t()) :: {:ok, String.t()} | {:error, :host_not_found}
+  defp domain_from_federated_actor(actor) do
+    case String.split(actor, "@") do
+      [_name, domain] ->
+        {:ok, domain}
+
+      _e ->
+        host = URI.parse(actor).host
+        if is_nil(host), do: {:error, :host_not_found}, else: {:ok, host}
+    end
+  end
+
+  @spec webfinger_from_json(map() | String.t()) ::
+          {:ok, map()} | {:error, :webfinger_information_not_json}
+  defp webfinger_from_json(doc) when is_map(doc) do
     data =
       Enum.reduce(doc["links"], %{"subject" => doc["subject"]}, fn link, data ->
         case {link["type"], link["rel"]} do
@@ -97,31 +195,26 @@ defmodule Mobilizon.Federation.WebFinger do
     {:ok, data}
   end
 
-  def finger(actor) do
+  defp webfinger_from_json(_doc), do: {:error, :webfinger_information_not_json}
-    actor = String.trim_leading(actor, "@")
 
-    domain =
+  @spec find_link_from_template(String.t()) :: String.t() | {:error, :link_not_found}
-      case String.split(actor, "@") do
+  defp find_link_from_template(doc) do
-        [_name, domain] ->
+    with res when res in [nil, ""] <-
-          domain
+           xpath(doc, ~x"//Link[@rel=\"lrdd\"][@type=\"application/json\"]/@template"s),
+         res when res in [nil, ""] <- xpath(doc, ~x"//Link[@rel=\"lrdd\"]/@template"s),
+         do: {:error, :link_not_found}
+  end
 
-        _e ->
+  @spec fetch_document(String.t()) :: Tesla.Env.result()
-          URI.parse(actor).host
+  defp fetch_document(endpoint) do
-      end
+    with {:error, err} <- HostMetaClient.get(endpoint), do: {:error, err}
+  end
 
-    address = "http://#{domain}/.well-known/webfinger?resource=acct:#{actor}"
+  @spec address_invalid(String.t()) :: false | {:error, :invalid_address}
-
+  defp address_invalid(address) do
-    Logger.debug(inspect(address))
+    with %URI{host: host, scheme: scheme} <- URI.parse(address),
-
+         true <- is_nil(host) or is_nil(scheme) do
-    with false <- is_nil(domain),
+      {:error, :invalid_address}
-         {:ok, %{body: body, status: code}} when code in 200..299 <-
-           WebfingerClient.get(address) do
-      webfinger_from_json(body)
-    else
-      e ->
-        Logger.debug(fn -> "Couldn't finger #{actor}" end)
-        Logger.debug(fn -> inspect(e) end)
-        {:error, e}
     end
   end
 end

lib/graphql/api/search.ex

@@ -10,6 +10,7 @@ defmodule Mobilizon.GraphQL.API.Search do
   alias Mobilizon.Storage.Page
 
   alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
 
   require Logger
 
@@ -92,7 +93,7 @@ defmodule Mobilizon.GraphQL.API.Search do
   # If the search string is an username
   @spec process_from_username(String.t()) :: Page.t()
   defp process_from_username(search) do
-    case ActivityPub.find_or_make_actor_from_nickname(search) do
+    case ActivityPubActor.find_or_make_actor_from_nickname(search) do
       {:ok, actor} ->
         %Page{total: 1, elements: [actor]}
 

lib/graphql/resolvers/admin.ex

@@ -27,7 +27,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
         %{context: %{current_user: %User{role: role}}}
       )
       when is_moderator(role) do
-    with action_logs <- Mobilizon.Admin.list_action_logs(page, limit) do
+    with %Page{elements: action_logs, total: total} <-
+           Mobilizon.Admin.list_action_logs(page, limit) do
       action_logs =
         action_logs
         |> Enum.map(fn %ActionLog{
@@ -44,7 +45,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
         end)
         |> Enum.filter(& &1)
 
-      {:ok, action_logs}
+      {:ok, %Page{elements: action_logs, total: total}}
     end
   end
 
@@ -321,7 +322,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
       {:ok, _activity, follow} ->
         {:ok, follow}
 
-      {:error, {:error, err}} when is_bitstring(err) ->
+      {:error, {:error, err}} when is_binary(err) ->
         {:error, err}
     end
   end
@@ -336,7 +337,10 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
       {:ok, _activity, follow} ->
         {:ok, follow}
 
-      {:error, {:error, err}} when is_bitstring(err) ->
+      {:error, {:error, err}} when is_binary(err) ->
+        {:error, err}
+
+      {:error, err} when is_binary(err) ->
         {:error, err}
     end
   end
@@ -351,7 +355,10 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
       {:ok, _activity, follow} ->
         {:ok, follow}
 
-      {:error, {:error, err}} when is_bitstring(err) ->
+      {:error, {:error, err}} when is_binary(err) ->
+        {:error, err}
+
+      {:error, err} when is_binary(err) ->
         {:error, err}
     end
   end

lib/graphql/resolvers/config.ex

@@ -134,6 +134,14 @@ defmodule Mobilizon.GraphQL.Resolvers.Config do
       auth: %{
         ldap: Config.ldap_enabled?(),
         oauth_providers: Config.oauth_consumer_strategies()
+      },
+      upload_limits: %{
+        default: Config.get([:instance, :upload_limit]),
+        avatar: Config.get([:instance, :avatar_upload_limit]),
+        banner: Config.get([:instance, :banner_upload_limit])
+      },
+      instance_feeds: %{
+        enabled: Config.get([:instance, :enable_instance_feeds])
       }
     }
   end

lib/graphql/resolvers/discussion.ex

@@ -60,6 +60,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Discussion do
       {:ok, discussion}
     else
       nil -> {:error, dgettext("errors", "Discussion not found")}
+      {:member, false} -> {:error, :unauthorized}
     end
   end
 
@@ -104,7 +105,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Discussion do
            }) do
       {:ok, discussion}
     else
-      {:error, :discussion, err, _} ->
+      {:error, type, err, _} when type in [:discussion, :comment] ->
         {:error, err}
 
       {:member, false} ->

lib/graphql/resolvers/event.ex

@@ -142,7 +142,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do
     else
       {:actor_approve_permission, _} ->
         {:error,
-         dgettext("errors", "Provided moderator profile doesn't have permission on this event")}
+         dgettext("errors", "Provided profile doesn't have moderator permissions on this event")}
     end
   end
 

lib/graphql/resolvers/group.ex

@@ -7,6 +7,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Group do
   alias Mobilizon.{Actors, Events, Users}
   alias Mobilizon.Actors.{Actor, Member}
   alias Mobilizon.Federation.ActivityPub
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.GraphQL.API
   alias Mobilizon.Users.User
   alias Mobilizon.Web.Upload
@@ -26,8 +27,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Group do
           }
         }
       ) do
-    with {:group, {:ok, %Actor{id: group_id} = group}} <-
+    with {:group, {:ok, %Actor{id: group_id, suspended: false} = group}} <-
-           {:group, ActivityPub.find_or_make_group_from_nickname(name)},
+           {:group, ActivityPubActor.find_or_make_group_from_nickname(name)},
          {:actor, %Actor{id: actor_id} = _actor} <- {:actor, Users.get_actor_for_user(user)},
          {:member, true} <- {:member, Actors.is_member?(actor_id, group_id)} do
       {:ok, group}
@@ -44,7 +45,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Group do
   end
 
   def find_group(_parent, %{preferred_username: name}, _resolution) do
-    with {:ok, actor} <- ActivityPub.find_or_make_group_from_nickname(name),
+    with {:ok, %Actor{suspended: false} = actor} <-
+           ActivityPubActor.find_or_make_group_from_nickname(name),
          %Actor{} = actor <- restrict_fields_for_non_member_request(actor) do
       {:ok, actor}
     else
@@ -96,7 +98,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Group do
   # TODO Move me to somewhere cleaner
   defp save_attached_pictures(args) do
     Enum.reduce([:avatar, :banner], args, fn key, args ->
-      if Map.has_key?(args, key) && !is_nil(args[key][:media]) do
+      if is_map(args) && Map.has_key?(args, key) && !is_nil(args[key][:media]) do
         pic = args[key][:media]
 
         with {:ok, %{name: name, url: url, content_type: content_type, size: _size}} <-
@@ -122,14 +124,17 @@ defmodule Mobilizon.GraphQL.Resolvers.Group do
         }
       ) do
     with %Actor{id: creator_actor_id} = creator_actor <- Users.get_actor_for_user(user),
-         args <- Map.update(args, :preferred_username, "", &String.downcase/1),
+         args when is_map(args) <- Map.update(args, :preferred_username, "", &String.downcase/1),
-         args <- Map.put(args, :creator_actor, creator_actor),
+         args when is_map(args) <- Map.put(args, :creator_actor, creator_actor),
-         args <- Map.put(args, :creator_actor_id, creator_actor_id),
+         args when is_map(args) <- Map.put(args, :creator_actor_id, creator_actor_id),
-         args <- save_attached_pictures(args),
+         {:picture, args} when is_map(args) <- {:picture, save_attached_pictures(args)},
          {:ok, _activity, %Actor{type: :Group} = group} <-
            API.Groups.create_group(args) do
       {:ok, group}
     else
+      {:picture, {:error, :file_too_large}} ->
+        {:error, dgettext("errors", "The provided picture is too heavy")}
+
       {:error, err} when is_binary(err) ->
         {:error, err}
     end
@@ -154,12 +159,15 @@ defmodule Mobilizon.GraphQL.Resolvers.Group do
     with %Actor{} = updater_actor <- Users.get_actor_for_user(user),
          {:administrator, true} <-
            {:administrator, Actors.is_administrator?(updater_actor.id, group_id)},
-         args <- Map.put(args, :updater_actor, updater_actor),
+         args when is_map(args) <- Map.put(args, :updater_actor, updater_actor),
-         args <- save_attached_pictures(args),
+         {:picture, args} when is_map(args) <- {:picture, save_attached_pictures(args)},
          {:ok, _activity, %Actor{type: :Group} = group} <-
            API.Groups.update_group(args) do
       {:ok, group}
     else
+      {:picture, {:error, :file_too_large}} ->
+        {:error, dgettext("errors", "The provided picture is too heavy")}
+
       {:error, err} when is_binary(err) ->
         {:error, err}
 

lib/graphql/resolvers/member.ex

@@ -7,7 +7,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Member do
   alias Mobilizon.{Actors, Users}
   alias Mobilizon.Actors.{Actor, Member}
   alias Mobilizon.Federation.ActivityPub
-  alias Mobilizon.Federation.ActivityPub.Refresher
+  alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Storage.Page
   alias Mobilizon.Users.User
   import Mobilizon.Web.Gettext
@@ -70,7 +70,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Member do
            target_actor_username |> String.trim() |> String.trim_leading("@"),
          {:target_actor_username, {:ok, %Actor{id: target_actor_id} = target_actor}} <-
            {:target_actor_username,
-            ActivityPub.find_or_make_actor_from_nickname(target_actor_username)},
+            ActivityPubActor.find_or_make_actor_from_nickname(target_actor_username)},
          {:existant, true} <-
            {:existant, check_member_not_existant_or_rejected(target_actor_id, group.id)},
          {:ok, _activity, %Member{} = member} <- ActivityPub.invite(group, actor, target_actor) do
@@ -99,7 +99,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Member do
 
   def accept_invitation(_parent, %{id: member_id}, %{context: %{current_user: %User{} = user}}) do
     with %Actor{id: actor_id} <- Users.get_actor_for_user(user),
-         %Member{actor: %Actor{id: member_actor_id} = actor} = member <-
+         %Member{actor: %Actor{id: member_actor_id}} = member <-
            Actors.get_member(member_id),
          {:is_same_actor, true} <- {:is_same_actor, member_actor_id === actor_id},
          {:ok, _activity, %Member{} = member} <-
@@ -108,8 +108,6 @@ defmodule Mobilizon.GraphQL.Resolvers.Member do
              member,
              true
            ) do
-      # Launch an async task to refresh the group profile, fetch resources, discussions, members
-      Refresher.fetch_group(member.parent.url, actor)
       {:ok, member}
     else
       {:is_same_actor, false} ->

lib/graphql/resolvers/participant.ex

@@ -70,7 +70,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Participant do
           participant,
           Map.get(args, :locale, "en")
         )
-        |> Email.Mailer.deliver_later()
+        |> Email.Mailer.send_email_later()
       end
 
       {:ok, participant}
@@ -231,7 +231,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Participant do
 
       {:actor_approve_permission, _} ->
         {:error,
-         dgettext("errors", "Provided moderator profile doesn't have permission on this event")}
+         dgettext("errors", "Provided profile doesn't have moderator permissions on this event")}
 
       {:same_role, true} ->
         {:error, dgettext("errors", "Participant already has role %{role}", role: new_role)}
@@ -264,7 +264,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Participant do
   @spec valid_email?(String.t() | nil) :: boolean
   defp valid_email?(email) when is_nil(email), do: false
 
-  defp valid_email?(email) when is_bitstring(email) do
+  defp valid_email?(email) when is_binary(email) do
     email
     |> String.trim()
     |> Checker.valid?()