Merge branch 'fix-link-to-instance-on-follow' into 'main'

Fix link on instance follow email

Closes #1008

See merge request framasoft/mobilizon!1155
This commit is contained in:
Thomas Citharel 2022-01-18 12:35:09 +00:00
commit 769d164159
43 changed files with 1388 additions and 911 deletions

View File

@ -185,6 +185,12 @@ config :phoenix, :filter_parameters, ["password", "token"]
config :absinthe, schema: Mobilizon.GraphQL.Schema config :absinthe, schema: Mobilizon.GraphQL.Schema
config :absinthe, Absinthe.Logger, filter_variables: ["token", "password", "secret"] config :absinthe, Absinthe.Logger, filter_variables: ["token", "password", "secret"]
config :codepagex, :encodings, [
:ascii,
~r[iso8859]i,
:"VENDORS/MICSFT/WINDOWS/CP1252"
]
config :mobilizon, Mobilizon.Web.Gettext, split_module_by: [:locale, :domain] config :mobilizon, Mobilizon.Web.Gettext, split_module_by: [:locale, :domain]
config :ex_cldr, config :ex_cldr,

View File

@ -1,118 +0,0 @@
<template>
<b-autocomplete
:data="baseData"
:placeholder="$t('Actor')"
v-model="name"
field="preferredUsername"
:loading="$apollo.loading"
check-infinite-scroll
@typing="getAsyncData"
@select="handleSelect"
@infinite-scroll="getAsyncData"
>
<template #default="props">
<div class="media">
<div class="media-left">
<img
width="32"
:src="props.option.avatar.url"
v-if="props.option.avatar"
alt=""
/>
<b-icon v-else icon="account-circle" />
</div>
<div class="media-content">
<span v-if="props.option.name">
{{ props.option.name }}
<br />
<small>{{ `@${props.option.preferredUsername}` }}</small>
<small v-if="props.option.domain">{{
`@${props.option.domain}`
}}</small>
</span>
<span v-else>
{{ `@${props.option.preferredUsername}` }}
</span>
</div>
</div>
</template>
<template slot="footer">
<span class="has-text-grey" v-show="page > totalPages">
Thats it! No more movies found.
</span>
</template>
</b-autocomplete>
</template>
<script lang="ts">
import { Component, Model, Vue, Watch } from "vue-property-decorator";
import debounce from "lodash/debounce";
import { IPerson } from "@/types/actor";
import { SEARCH_PERSONS } from "@/graphql/search";
import { Paginate } from "@/types/paginate";
const SEARCH_PERSON_LIMIT = 10;
@Component
export default class ActorAutoComplete extends Vue {
@Model("change", { type: Object }) readonly defaultSelected!: IPerson | null;
baseData: IPerson[] = [];
selected: IPerson | null = this.defaultSelected;
name: string = this.defaultSelected
? this.defaultSelected.preferredUsername
: "";
page = 1;
totalPages = 1;
mounted(): void {
this.selected = this.defaultSelected;
}
data(): Record<string, unknown> {
return {
getAsyncData: debounce(this.doGetAsyncData, 500),
};
}
@Watch("defaultSelected")
updateDefaultSelected(defaultSelected: IPerson): void {
console.log("update defaultSelected", defaultSelected);
this.selected = defaultSelected;
this.name = defaultSelected.preferredUsername;
}
handleSelect(selected: IPerson): void {
this.selected = selected;
this.$emit("change", selected);
}
async doGetAsyncData(name: string): Promise<void> {
this.baseData = [];
if (this.name !== name) {
this.name = name;
this.page = 1;
}
if (!name.length) {
this.page = 1;
this.totalPages = 1;
return;
}
const {
data: { searchPersons },
} = await this.$apollo.query<{ searchPersons: Paginate<IPerson> }>({
query: SEARCH_PERSONS,
variables: {
searchText: this.name,
page: this.page,
limit: SEARCH_PERSON_LIMIT,
},
});
this.totalPages = Math.ceil(searchPersons.total / SEARCH_PERSON_LIMIT);
this.baseData.push(...searchPersons.elements);
}
}
</script>

View File

@ -9,20 +9,22 @@
<div class="actor-name"> <div class="actor-name">
<p> <p>
{{ actor.name || `@${usernameWithDomain(actor)}` }} {{ displayName(actor) }}
</p> </p>
</div> </div>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Vue, Prop } from "vue-property-decorator"; import { Component, Vue, Prop } from "vue-property-decorator";
import { IActor, usernameWithDomain } from "../../types/actor"; import { displayName, IActor, usernameWithDomain } from "../../types/actor";
@Component @Component
export default class ActorInline extends Vue { export default class ActorInline extends Vue {
@Prop({ required: true, type: Object }) actor!: IActor; @Prop({ required: true, type: Object }) actor!: IActor;
usernameWithDomain = usernameWithDomain; usernameWithDomain = usernameWithDomain;
displayName = displayName;
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@ -7,6 +7,8 @@ import apolloProvider from "@/vue-apollo";
import { IPerson } from "@/types/actor"; import { IPerson } from "@/types/actor";
import pDebounce from "p-debounce"; import pDebounce from "p-debounce";
import { NormalizedCacheObject } from "@apollo/client/cache/inmemory/types"; import { NormalizedCacheObject } from "@apollo/client/cache/inmemory/types";
import { MentionOptions } from "@tiptap/extension-mention";
import { Editor } from "@tiptap/core";
const client = const client =
apolloProvider.defaultClient as ApolloClient<NormalizedCacheObject>; apolloProvider.defaultClient as ApolloClient<NormalizedCacheObject>;
@ -24,13 +26,21 @@ const fetchItems = async (query: string): Promise<IPerson[]> => {
const debouncedFetchItems = pDebounce(fetchItems, 200); const debouncedFetchItems = pDebounce(fetchItems, 200);
const mentionOptions: Partial<any> = { const mentionOptions: MentionOptions = {
HTMLAttributes: { HTMLAttributes: {
class: "mention", class: "mention",
dir: "ltr", dir: "ltr",
}, },
renderLabel({ options, node }) {
return `${options.suggestion.char}${node.attrs.label ?? node.attrs.id}`;
},
suggestion: { suggestion: {
items: async (query: string): Promise<IPerson[]> => { items: async ({
query,
}: {
query: string;
editor: Editor;
}): Promise<IPerson[]> => {
if (query === "") { if (query === "") {
return []; return [];
} }
@ -70,8 +80,12 @@ const mentionOptions: Partial<any> = {
return component.ref?.onKeyDown(props); return component.ref?.onKeyDown(props);
}, },
onExit() { onExit() {
if (popup && popup[0]) {
popup[0].destroy(); popup[0].destroy();
}
if (component) {
component.destroy(); component.destroy();
}
}, },
}; };
}, },

View File

@ -7,7 +7,7 @@
:key="index" :key="index"
@click="selectItem(index)" @click="selectItem(index)"
> >
<actor-card :actor="item" /> <actor-inline :actor="item" />
</button> </button>
</div> </div>
</template> </template>
@ -16,11 +16,11 @@
import { Vue, Component, Prop, Watch } from "vue-property-decorator"; import { Vue, Component, Prop, Watch } from "vue-property-decorator";
import { displayName, usernameWithDomain } from "@/types/actor/actor.model"; import { displayName, usernameWithDomain } from "@/types/actor/actor.model";
import { IPerson } from "@/types/actor"; import { IPerson } from "@/types/actor";
import ActorCard from "../../components/Account/ActorCard.vue"; import ActorInline from "../../components/Account/ActorInline.vue";
@Component({ @Component({
components: { components: {
ActorCard, ActorInline,
}, },
}) })
export default class MentionList extends Vue { export default class MentionList extends Vue {

View File

@ -7,9 +7,7 @@
<b-field :label="$t('Title')"> <b-field :label="$t('Title')">
<b-input v-model="title" /> <b-input v-model="title" />
</b-field> </b-field>
<b-field :label="$t('Assigned to')"> <b-field :label="$t('Assigned to')"> </b-field>
<actor-auto-complete v-model="assignedTo" />
</b-field>
<b-field :label="$t('Due on')"> <b-field :label="$t('Due on')">
<b-datepicker v-model="dueDate" :first-day-of-week="firstDayOfWeek" /> <b-datepicker v-model="dueDate" :first-day-of-week="firstDayOfWeek" />
</b-field> </b-field>
@ -17,19 +15,15 @@
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Prop, Vue } from "vue-property-decorator"; import { Prop, Vue } from "vue-property-decorator";
import debounce from "lodash/debounce"; import debounce from "lodash/debounce";
import { DebouncedFunc } from "lodash"; import { DebouncedFunc } from "lodash";
import { SnackbarProgrammatic as Snackbar } from "buefy"; import { SnackbarProgrammatic as Snackbar } from "buefy";
import { ITodo } from "../../types/todos"; import { ITodo } from "../../types/todos";
import RouteName from "../../router/name"; import RouteName from "../../router/name";
import { UPDATE_TODO } from "../../graphql/todos"; import { UPDATE_TODO } from "../../graphql/todos";
import ActorAutoComplete from "../Account/ActorAutoComplete.vue";
import { IPerson } from "../../types/actor"; import { IPerson } from "../../types/actor";
@Component({
components: { ActorAutoComplete },
})
export default class Todo extends Vue { export default class Todo extends Vue {
@Prop({ required: true, type: Object }) todo!: ITodo; @Prop({ required: true, type: Object }) todo!: ITodo;

View File

@ -94,8 +94,7 @@ defmodule Mobilizon.Service.Formatter do
options = linkify_opts() ++ options options = linkify_opts() ++ options
acc = %{mentions: MapSet.new(), tags: MapSet.new()} acc = %{mentions: MapSet.new(), tags: MapSet.new()}
{text, %{mentions: mentions}} = Linkify.link_map(text, acc, options) {text, %{mentions: mentions, tags: tags}} = Linkify.link_map(text, acc, options)
{text, tags} = extract_tags(text)
{text, MapSet.to_list(mentions), MapSet.to_list(tags)} {text, MapSet.to_list(mentions), MapSet.to_list(tags)}
end end
@ -157,46 +156,10 @@ defmodule Mobilizon.Service.Formatter do
defp linkify_opts do defp linkify_opts do
Mobilizon.Config.get(__MODULE__) ++ Mobilizon.Config.get(__MODULE__) ++
[ [
hashtag: false, hashtag: true,
hashtag_handler: &__MODULE__.hashtag_handler/4,
mention: true, mention: true,
mention_handler: &__MODULE__.mention_handler/4 mention_handler: &__MODULE__.mention_handler/4
] ]
end end
@match_hashtag ~r/(?:^|[^\p{L}\p{M}\p{Nd}\)])(?<tag>\#[[:word:]_]*[[:alpha:]_·][[:word:]_·\p{M}]*)/u
@spec extract_tags(String.t()) :: {String.t(), MapSet.t()}
def extract_tags(text) do
matches =
@match_hashtag
|> Regex.scan(text, capture: [:tag])
|> Enum.map(&hd/1)
|> Enum.map(&{&1, tag_text_strip(&1)})
|> MapSet.new()
text =
@match_hashtag
|> Regex.replace(text, &generate_tag_link/2)
|> String.trim()
{text, matches}
end
@spec generate_tag_link(String.t(), String.t()) :: String.t()
defp generate_tag_link(_, tag_text) do
tag = tag_text_strip(tag_text)
url = "#{Endpoint.url()}/tag/#{tag}"
Tag.content_tag(:a, tag_text,
class: "hashtag",
"data-tag": tag,
href: url,
rel: "tag ugc"
)
|> Phoenix.HTML.safe_to_string()
|> (&" #{&1}").()
end
@spec tag_text_strip(String.t()) :: String.t()
defp tag_text_strip(tag), do: tag |> String.trim("#") |> String.downcase()
end end

View File

@ -74,6 +74,7 @@ defmodule Mobilizon.Service.RichMedia.Parser do
{:is_html, _response_headers, true} <- {:is_html, _response_headers, true} <-
{:is_html, response_headers, is_html(response_headers)} do {:is_html, response_headers, is_html(response_headers)} do
body body
|> convert_utf8(response_headers)
|> maybe_parse() |> maybe_parse()
|> Map.put(:url, url) |> Map.put(:url, url)
|> maybe_add_favicon() |> maybe_add_favicon()
@ -86,6 +87,10 @@ defmodule Mobilizon.Service.RichMedia.Parser do
{:ok, data} {:ok, data}
{:ok, err} ->
Logger.debug("HTTP error: #{inspect(err)}")
{:error, "HTTP error: #{inspect(err)}"}
{:error, err} -> {:error, err} ->
Logger.debug("HTTP error: #{inspect(err)}") Logger.debug("HTTP error: #{inspect(err)}")
{:error, "HTTP error: #{inspect(err)}"} {:error, "HTTP error: #{inspect(err)}"}
@ -195,6 +200,8 @@ defmodule Mobilizon.Service.RichMedia.Parser do
@spec maybe_parse(String.t()) :: map() @spec maybe_parse(String.t()) :: map()
defp maybe_parse(html) do defp maybe_parse(html) do
Enum.reduce_while(parsers(), %{}, fn parser, acc -> Enum.reduce_while(parsers(), %{}, fn parser, acc ->
Logger.debug("Using #{inspect(parser)} to parse link")
case parser.parse(html, acc) do case parser.parse(html, acc) do
{:ok, data} -> {:ok, data} ->
{:halt, data} {:halt, data}
@ -307,14 +314,88 @@ defmodule Mobilizon.Service.RichMedia.Parser do
# Twitter requires a well-know crawler user-agent to show server-rendered data # Twitter requires a well-know crawler user-agent to show server-rendered data
defp default_user_agent("https://twitter.com/" <> _) do defp default_user_agent("https://twitter.com/" <> _) do
"Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)" Config.instance_user_agent() <> " (compatible; bot)"
end end
defp default_user_agent("https://mobile.twitter.com/" <> _) do defp default_user_agent("https://mobile.twitter.com/" <> _) do
"Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)" Config.instance_user_agent() <> " (compatible; bot)"
end end
defp default_user_agent(_url) do defp default_user_agent(_url) do
Config.instance_user_agent() Config.instance_user_agent()
end end
defp convert_utf8(body, headers) do
headers
|> get_header("Content-Type")
|> handle_charset(body)
end
defp handle_charset(nil, body) do
case detect_charset_from_meta(body) do
"" -> body
nil -> body
charset -> convert_body(body, charset)
end
end
defp handle_charset(content_type, body) do
case charset_from_content_type(content_type) do
nil -> handle_charset(nil, body)
charset -> convert_body(body, charset)
end
end
defp charset_from_content_type(content_type) do
with [_, params] <- :binary.split(content_type, ";"),
%{"charset" => charset} <- Utils.params(params) do
charset
else
_ -> nil
end
end
defp detect_charset_from_meta(body) do
Logger.debug("Trying to detect charset from meta")
document = Floki.parse_document!(body)
case document
|> Floki.find("meta[http-equiv=\"content-type\"]")
|> List.first() do
nil ->
case document
|> Floki.find("meta[http-equiv=\"Content-Type\"]")
|> List.first() do
nil -> nil
meta -> content_type_from_meta(meta)
end
meta ->
content_type_from_meta(meta)
end
end
defp content_type_from_meta(meta) do
Logger.debug("Finding content-type into <meta> element")
meta
|> Floki.attribute("content")
|> List.first()
|> String.trim()
|> charset_from_content_type()
end
defp convert_body(body, "utf-8"), do: body
defp convert_body(body, charset) do
Logger.debug("Converting body from #{charset}")
Codepagex.to_string!(body, fix_charset(charset))
end
defp fix_charset("windows-1252"), do: :"VENDORS/MICSFT/WINDOWS/CP1252"
defp fix_charset(charset) do
String.replace(charset, "-", "_")
end
end end

View File

@ -35,7 +35,7 @@ defmodule Mobilizon.Service.RichMedia.Parsers.Fallback do
defp get_page(html, :title) do defp get_page(html, :title) do
html html
|> Floki.parse_document!() |> Floki.parse_document!()
|> Floki.find("html title") |> Floki.find("title")
|> List.first() |> List.first()
|> Floki.text() |> Floki.text()
|> String.trim() |> String.trim()

View File

@ -53,7 +53,10 @@ defmodule Mobilizon.Service.RichMedia.Parsers.MetaTagsParser do
end) end)
if data[to_string(key_name)] in Enum.map(allowed_attributes, &to_string/1) do if data[to_string(key_name)] in Enum.map(allowed_attributes, &to_string/1) do
%{String.to_existing_atom(data[to_string(key_name)]) => data[to_string(value_name)]} %{
String.to_existing_atom(data[to_string(key_name)]) =>
String.trim(data[to_string(value_name)])
}
else else
%{} %{}
end end
@ -65,7 +68,7 @@ defmodule Mobilizon.Service.RichMedia.Parsers.MetaTagsParser do
defp maybe_put_title(meta, html) when meta != %{} do defp maybe_put_title(meta, html) when meta != %{} do
case get_page_title(html) do case get_page_title(html) do
"" -> meta "" -> meta
title -> Map.put_new(meta, :title, title) title -> Map.put_new(meta, :title, String.trim(title))
end end
end end
@ -80,7 +83,7 @@ defmodule Mobilizon.Service.RichMedia.Parsers.MetaTagsParser do
meta meta
description -> description ->
Map.put_new(meta, :description, description) Map.put_new(meta, :description, String.trim(description))
end end
end end

View File

@ -67,7 +67,7 @@ defmodule Mobilizon.Service.RichMedia.Parsers.OEmbed do
{:ok, data} <- Jason.decode(json), {:ok, data} <- Jason.decode(json),
data <- data <-
data data
|> Map.new(fn {k, v} -> {String.to_existing_atom(k), v} end) |> Map.new(fn {k, v} -> {String.to_existing_atom(k), String.trim(v)} end)
|> Map.take(@oembed_allowed_attributes) do |> Map.take(@oembed_allowed_attributes) do
{:ok, data} {:ok, data}
end end

View File

@ -54,6 +54,7 @@ defmodule Mobilizon.Service.RichMedia.Parsers.OGP do
defp transform_tags(data) do defp transform_tags(data) do
data data
|> Enum.reject(fn {_, v} -> is_nil(v) end) |> Enum.reject(fn {_, v} -> is_nil(v) end)
|> Enum.map(fn {k, v} -> {k, String.trim(v)} end)
|> Map.new() |> Map.new()
|> Map.update(:image_remote_url, Map.get(data, :image), & &1) |> Map.update(:image_remote_url, Map.get(data, :image), & &1)
|> Map.update(:width, get_integer_value(data, :"image:width"), & &1) |> Map.update(:width, get_integer_value(data, :"image:width"), & &1)

View File

@ -63,6 +63,7 @@ defmodule Mobilizon.Service.RichMedia.Parsers.TwitterCard do
defp transform_tags(data) do defp transform_tags(data) do
data data
|> Enum.reject(fn {_, v} -> is_nil(v) end) |> Enum.reject(fn {_, v} -> is_nil(v) end)
|> Enum.map(fn {k, v} -> {k, String.trim(v)} end)
|> Map.new() |> Map.new()
|> Map.update(:image_remote_url, Map.get(data, :image), & &1) |> Map.update(:image_remote_url, Map.get(data, :image), & &1)
end end

View File

@ -20,7 +20,7 @@ defmodule Mobilizon.Web.Email.Follow do
def send_notification_to_admins( def send_notification_to_admins(
%Follower{ %Follower{
# approved: false, # approved: false,
actor: %Actor{} = follower, actor: %Actor{type: :Application} = follower,
target_actor: %Actor{id: target_actor_id} target_actor: %Actor{id: target_actor_id}
} = _follow } = _follow
) do ) do

View File

@ -35,21 +35,25 @@
<tr> <tr>
<td bgcolor="#ffffff" align="left" style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" > <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
<p style="margin: 0;"> <p style="margin: 0;">
<%= gettext("<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events.", name: @follower.name, domain: @follower.domain) |> raw %> <%= if @follower.type == :Application do %><%= gettext("<b>%{name} (%{domain})</b> just requested to follow your instance.", name: @follower.name, domain: @follower.domain) |> raw %><% else %><%= gettext("<b>%{name}</b> just requested to follow your instance.", name: Mobilizon.Actors.Actor.display_name_and_username(@follower)) |> raw %><% end %>
<br />
<%= if @follower.type == :Application do %><%= gettext "If you accept, this instance will receive all of your public events." %><% else %><%= gettext "If you accept, this profile will receive all of your public events." %><% end %>
</p> </p>
</td> </td>
</tr> </tr>
<%= if @follower.type == :Application do %>
<tr> <tr>
<td bgcolor="#ffffff" align="left" style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" > <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
<p style="margin: 0;"> <p style="margin: 0;">
<%= gettext("Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too.", name: @follower.name, domain: @follower.domain) %> <%= gettext "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too.", name: @follower.name, domain: @follower.domain %>
</p> </p>
</td> </td>
</tr> </tr>
<% end %>
<tr> <tr>
<td bgcolor="#ffffff" align="left" style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" > <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
<p style="margin: 0"> <p style="margin: 0">
<%= gettext "To accept this invitation, head over to the instance's admin settings." %> <%= if @follower.type == :Application do %><%= gettext "To accept this invitation, head over to the instance's admin settings." %><% else %><%= gettext "To accept this invitation, head over to the profile's admin page." %><% end %>
</p> </p>
</td> </td>
</tr> </tr>
@ -62,9 +66,15 @@
<table border="0" cellspacing="0" cellpadding="0"> <table border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<td align="center" style="border-radius: 3px;" bgcolor="#3C376E"> <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
<a href={"#{ "#{Mobilizon.Web.Endpoint.url()}/settings/admin/relays/followers" }"} target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;"> <%= if @follower.type == :Application do %>
<%= gettext "See the federation settings" %> <a href={"#{ "#{Mobilizon.Web.Endpoint.url()}/settings/admin/instances/#{@follower.domain}" }"} target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;">
<%= gettext "View the details" %>
</a> </a>
<% else %>
<a href={"#{ "#{Mobilizon.Web.Endpoint.url()}/settings/admin/profiles/#{@follower.id}" }"} target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;">
<%= gettext "View the details" %>
</a>
<% end %>
</td> </td>
</tr> </tr>
</table> </table>

View File

@ -1,7 +1,10 @@
<%= gettext "Want to connect?" %> <%= gettext "Want to connect?" %>
== ==
<%= gettext "%{name} (%{domain}) just requested to follow your instance.", name: @follower.name, domain: @follower.domain %>
<%= gettext "If you accept, this instance will receive all of your public events." %> <%= if @follower.type == :Application do %><%= gettext "%{name} (%{domain}) just requested to follow your instance.", name: @follower.name, domain: @follower.domain %><% else %><%= gettext "%{name} just requested to follow your instance.", name: Mobilizon.Actors.Actor.display_name_and_username(@follower) %><% end %>
<%= gettext "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too.", name: @follower.name, domain: @follower.domain %> <%= if @follower.type == :Application do %><%= gettext "If you accept, this instance will receive all of your public events." %><% else %><%= gettext "If you accept, this profile will receive all of your public events." %><% end %>
<%= gettext "To accept this invitation, head over to the instance's admin settings." %> <%= if @follower.type == :Application do %><%= gettext "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too.", name: @follower.name, domain: @follower.domain %><% end %>
<%= "#{Mobilizon.Web.Endpoint.url()}/settings/admin/relays/followers" %>
<%= if @follower.type == :Application do %><%= gettext "To accept this invitation, head over to the instance's admin settings." %><% else %><%= gettext "To accept this invitation, head over to the profile's admin page." %><% end %>
<%= if @follower.type == :Application do %><%= "#{Mobilizon.Web.Endpoint.url()}/settings/admin/relays/followers" %><% else %><%= "#{Mobilizon.Web.Endpoint.url()}/settings/admin/profiles/#{@follower.id}" %><% end %>

View File

@ -203,6 +203,7 @@ defmodule Mobilizon.Mixfile do
{:export, "~> 0.1.0"}, {:export, "~> 0.1.0"},
{:tz_world, "~> 1.0"}, {:tz_world, "~> 1.0"},
{:tzdata, "~> 1.1"}, {:tzdata, "~> 1.1"},
{:codepagex, "~> 0.1.6"},
# Dev and test dependencies # Dev and test dependencies
{:phoenix_live_reload, "~> 1.2", only: [:dev, :e2e]}, {:phoenix_live_reload, "~> 1.2", only: [:dev, :e2e]},
{:ex_machina, "~> 2.3", only: [:dev, :test]}, {:ex_machina, "~> 2.3", only: [:dev, :test]},

View File

@ -11,6 +11,7 @@
"cachex": {:hex, :cachex, "3.4.0", "868b2959ea4aeb328c6b60ff66c8d5123c083466ad3c33d3d8b5f142e13101fb", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "370123b1ab4fba4d2965fb18f87fd758325709787c8c5fce35b3fe80645ccbe5"}, "cachex": {:hex, :cachex, "3.4.0", "868b2959ea4aeb328c6b60ff66c8d5123c083466ad3c33d3d8b5f142e13101fb", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "370123b1ab4fba4d2965fb18f87fd758325709787c8c5fce35b3fe80645ccbe5"},
"certifi": {:hex, :certifi, "2.8.0", "d4fb0a6bb20b7c9c3643e22507e42f356ac090a1dcea9ab99e27e0376d695eba", [:rebar3], [], "hexpm", "6ac7efc1c6f8600b08d625292d4bbf584e14847ce1b6b5c44d983d273e1097ea"}, "certifi": {:hex, :certifi, "2.8.0", "d4fb0a6bb20b7c9c3643e22507e42f356ac090a1dcea9ab99e27e0376d695eba", [:rebar3], [], "hexpm", "6ac7efc1c6f8600b08d625292d4bbf584e14847ce1b6b5c44d983d273e1097ea"},
"cldr_utils": {:hex, :cldr_utils, "2.17.0", "05453797e5b89f936c54c5602ac881e46b1ba4423a803c27a414466f4b598c94", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "6077ddaaa155f27755638225617bdc00c004f39b3c9355b688e52a3fc98d57e8"}, "cldr_utils": {:hex, :cldr_utils, "2.17.0", "05453797e5b89f936c54c5602ac881e46b1ba4423a803c27a414466f4b598c94", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: true]}, {:certifi, "~> 2.5", [hex: :certifi, repo: "hexpm", optional: true]}, {:decimal, "~> 1.9 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "6077ddaaa155f27755638225617bdc00c004f39b3c9355b688e52a3fc98d57e8"},
"codepagex": {:hex, :codepagex, "0.1.6", "49110d09a25ee336a983281a48ef883da4c6190481e0b063afe2db481af6117e", [:mix], [], "hexpm", "1521461097dde281edf084062f525a4edc6a5e49f4fd1f5ec41c9c4955d5bd59"},
"combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"}, "combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
"comeonin": {:hex, :comeonin, "5.3.2", "5c2f893d05c56ae3f5e24c1b983c2d5dfb88c6d979c9287a76a7feb1e1d8d646", [:mix], [], "hexpm", "d0993402844c49539aeadb3fe46a3c9bd190f1ecf86b6f9ebd71957534c95f04"}, "comeonin": {:hex, :comeonin, "5.3.2", "5c2f893d05c56ae3f5e24c1b983c2d5dfb88c6d979c9287a76a7feb1e1d8d646", [:mix], [], "hexpm", "d0993402844c49539aeadb3fe46a3c9bd190f1ecf86b6f9ebd71957534c95f04"},
"connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"}, "connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"},

View File

@ -1268,7 +1268,7 @@ msgid "A title is required for the post"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "" msgstr ""
@ -1278,12 +1278,8 @@ msgid "%{name} requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
@ -1293,13 +1289,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
@ -1310,8 +1301,8 @@ msgid "Want to connect?"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
@ -1851,3 +1842,36 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1247,7 +1247,7 @@ msgid "A title is required for the post"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "" msgstr ""
@ -1257,12 +1257,8 @@ msgid "%{name} requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
@ -1272,13 +1268,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
@ -1289,8 +1280,8 @@ msgid "Want to connect?"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
@ -1827,3 +1818,36 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1487,7 +1487,7 @@ msgid "A title is required for the post"
msgstr "Cal un títol per la publicació" msgstr "Cal un títol per la publicació"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "" msgstr ""
"%{name} (%{domain}) acaba de demanar-vos poder seguir la vostra instància." "%{name} (%{domain}) acaba de demanar-vos poder seguir la vostra instància."
@ -1498,15 +1498,8 @@ msgid "%{name} requests to follow your instance"
msgstr "%{name} demana poder seguir la vostra instància" msgstr "%{name} demana poder seguir la vostra instància"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
"<b>%{name} (%{domain})</b> acaba de demanar poder seguir la vostra "
"instància. Si accepteu, la seva instància rebrà totes les activitats "
"públiques de la vostra."
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "Si accepteu, la instància rebrà totes les vostres activitats públiques." msgstr "Si accepteu, la instància rebrà totes les vostres activitats públiques."
@ -1517,13 +1510,8 @@ msgstr ""
"La instància %{name} (%{domain}) soŀlicita poder seguir la vostra instància" "La instància %{name} (%{domain}) soŀlicita poder seguir la vostra instància"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr "Obre les opcions de federació"
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
"Per acceptar la invitació, ves a la configuració d'administració de la " "Per acceptar la invitació, ves a la configuració d'administració de la "
@ -1536,8 +1524,8 @@ msgid "Want to connect?"
msgstr "Voleu connectar-vos?" msgstr "Voleu connectar-vos?"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
"Nota: que us segueixi %{name} (%{domain}) no implica que vosaltres la " "Nota: que us segueixi %{name} (%{domain}) no implica que vosaltres la "
@ -2087,3 +2075,39 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr "%{name} demana poder seguir la vostra instància"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr ""
"%{name} (%{domain}) acaba de demanar-vos poder seguir la vostra instància."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr "%{name} demana poder seguir la vostra instància"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr "Si accepteu, la instància rebrà totes les vostres activitats públiques."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
"Per acceptar la invitació, ves a la configuració d'administració de la "
"instància."
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1549,7 +1549,7 @@ msgid "A title is required for the post"
msgstr "U příspěvku je vyžadován nadpis" msgstr "U příspěvku je vyžadován nadpis"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "%{name} (%{domain}) právě požádal o sledování vaší instance." msgstr "%{name} (%{domain}) právě požádal o sledování vaší instance."
@ -1559,15 +1559,8 @@ msgid "%{name} requests to follow your instance"
msgstr "%{name} žádá o sledování vaší instance" msgstr "%{name} žádá o sledování vaší instance"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
"<b>%{name} (%{domain})</b> právě požádal o sledování vaší instance. Pokud "
"souhlasíte, bude tato instance dostávat všechny veřejné události vaší "
"instance."
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
"Pokud souhlasíte, bude tato instance přijímat všechny vaše veřejné události." "Pokud souhlasíte, bude tato instance přijímat všechny vaše veřejné události."
@ -1578,13 +1571,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "Instance %{name} (%{domain}) žádá o sledování vaší instance" msgstr "Instance %{name} (%{domain}) žádá o sledování vaší instance"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr "Viz nastavení federace"
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
"Chcete-li tuto pozvánku přijmout, přejděte do nastavení správce instance." "Chcete-li tuto pozvánku přijmout, přejděte do nastavení správce instance."
@ -1596,8 +1584,8 @@ msgid "Want to connect?"
msgstr "Chcete se připojit?" msgstr "Chcete se připojit?"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
"Poznámka: Když vás %{name} (%{domain}) sleduje, nemusí to nutně znamenat, že " "Poznámka: Když vás %{name} (%{domain}) sleduje, nemusí to nutně znamenat, že "
@ -2164,3 +2152,38 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr "%{name} žádá o sledování vaší instance"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr "%{name} (%{domain}) právě požádal o sledování vaší instance."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr "%{name} žádá o sledování vaší instance"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
"Pokud souhlasíte, bude tato instance přijímat všechny vaše veřejné události."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
"Chcete-li tuto pozvánku přijmout, přejděte do nastavení správce instance."
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1590,7 +1590,7 @@ msgid "A title is required for the post"
msgstr "Für die Stelle wird ein Titel benötigt" msgstr "Für die Stelle wird ein Titel benötigt"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "%{name} (%{domain}) hat soeben angefordert, Ihrer Instanz zu folgen." msgstr "%{name} (%{domain}) hat soeben angefordert, Ihrer Instanz zu folgen."
@ -1600,15 +1600,8 @@ msgid "%{name} requests to follow your instance"
msgstr "%{name} bittet darum, Ihrer Instanz zu folgen" msgstr "%{name} bittet darum, Ihrer Instanz zu folgen"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
"<b>%{name} (%{domain})</b> hat gerade angefordert, Ihrer Instanz zu folgen. "
"Wenn Sie akzeptieren, erhält diese Instanz alle öffentlichen Ereignisse "
"Ihrer Instanz."
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
"Wenn Sie akzeptieren, erhält diese Instanz alle Ihre öffentlichen Ereignisse." "Wenn Sie akzeptieren, erhält diese Instanz alle Ihre öffentlichen Ereignisse."
@ -1619,13 +1612,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "Instanz %{name} (%{domain}) bittet darum, Ihrer Instanz zu folgen" msgstr "Instanz %{name} (%{domain}) bittet darum, Ihrer Instanz zu folgen"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr "Siehe in den Einstellungen für die Föderation"
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
"Um diese Einladung anzunehmen, gehen Sie zu den Admin-Einstellungen der " "Um diese Einladung anzunehmen, gehen Sie zu den Admin-Einstellungen der "
@ -1638,8 +1626,8 @@ msgid "Want to connect?"
msgstr "Sie wollen sich verbinden?" msgstr "Sie wollen sich verbinden?"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
"Hinweis: Wenn %{name} (%{domain}) Ihnen folgt, bedeutet das nicht unbedingt, " "Hinweis: Wenn %{name} (%{domain}) Ihnen folgt, bedeutet das nicht unbedingt, "
@ -2200,3 +2188,39 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr "%{name} bittet darum, Ihrer Instanz zu folgen"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr "%{name} (%{domain}) hat soeben angefordert, Ihrer Instanz zu folgen."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr "%{name} bittet darum, Ihrer Instanz zu folgen"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
"Wenn Sie akzeptieren, erhält diese Instanz alle Ihre öffentlichen Ereignisse."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
"Um diese Einladung anzunehmen, gehen Sie zu den Admin-Einstellungen der "
"Instanz."
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1227,7 +1227,7 @@ msgid "A title is required for the post"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "" msgstr ""
@ -1237,12 +1237,8 @@ msgid "%{name} requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
@ -1252,13 +1248,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
@ -1269,8 +1260,8 @@ msgid "Want to connect?"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
@ -1806,3 +1797,36 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1280,7 +1280,7 @@ msgid "A title is required for the post"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "" msgstr ""
@ -1290,12 +1290,8 @@ msgid "%{name} requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
@ -1305,13 +1301,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
@ -1322,8 +1313,8 @@ msgid "Want to connect?"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
@ -1859,3 +1850,36 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1553,7 +1553,7 @@ msgid "A title is required for the post"
msgstr "Se requiere un título para la publicación" msgstr "Se requiere un título para la publicación"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "%{name} (%{domain}) sólo solicitó seguir su instancia." msgstr "%{name} (%{domain}) sólo solicitó seguir su instancia."
@ -1563,14 +1563,8 @@ msgid "%{name} requests to follow your instance"
msgstr "%{name} solicita seguir tu instancia" msgstr "%{name} solicita seguir tu instancia"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
"<b>%{name} (%{domain})</b> solo pedí seguir tu instancia. Si acepta, su "
"instancia recibirá todos los eventos públicos para su instancia."
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "Si acepta, esta instancia recibirá todos sus eventos públicos." msgstr "Si acepta, esta instancia recibirá todos sus eventos públicos."
@ -1580,13 +1574,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "La instancia %{name} (%{domain}) solicita seguir tu instancia" msgstr "La instancia %{name} (%{domain}) solicita seguir tu instancia"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr "Ver la configuración de la federación"
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "Para aceptar esta invitación, dirígete a tus grupos." msgstr "Para aceptar esta invitación, dirígete a tus grupos."
@ -1597,8 +1586,8 @@ msgid "Want to connect?"
msgstr "¿Quieres conectarte?" msgstr "¿Quieres conectarte?"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
"Nota: el hecho que %{name} (%{domain} te siga, no implica necesariamente que " "Nota: el hecho que %{name} (%{domain} te siga, no implica necesariamente que "
@ -2162,3 +2151,36 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr "%{name} solicita seguir tu instancia"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr "%{name} (%{domain}) sólo solicitó seguir su instancia."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr "%{name} solicita seguir tu instancia"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr "Si acepta, esta instancia recibirá todos sus eventos públicos."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr "Para aceptar esta invitación, dirígete a tus grupos."
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1525,7 +1525,7 @@ msgid "A title is required for the post"
msgstr "Julkaisulle vaaditaan otsikko" msgstr "Julkaisulle vaaditaan otsikko"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "%{name} (%{domain}) pyysi saada seurata palvelintasi." msgstr "%{name} (%{domain}) pyysi saada seurata palvelintasi."
@ -1535,15 +1535,8 @@ msgid "%{name} requests to follow your instance"
msgstr "%{name} pyytää saada seurata palvelintasi" msgstr "%{name} pyytää saada seurata palvelintasi"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
"<b>%{name} (%{domain})</b> pyysi saada seurata palvelintasi. Jos hyväksyt "
"pyynnön, kyseiselle palvelimelle lähetetään kaikki julkiset tapahtumat tällä "
"palvelimella."
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
"Jos hyväksyt, kyseiselle palvelimelle lähetetään kaikki julkiset tapahtumasi." "Jos hyväksyt, kyseiselle palvelimelle lähetetään kaikki julkiset tapahtumasi."
@ -1554,13 +1547,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "Palvelin %{name} (%{domain}) haluaa seurata palvelintasi" msgstr "Palvelin %{name} (%{domain}) haluaa seurata palvelintasi"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr "Katso federaatioasetukset"
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "Hyväksy kutsu siirtymällä omiin ryhmiisi." msgstr "Hyväksy kutsu siirtymällä omiin ryhmiisi."
@ -1571,8 +1559,8 @@ msgid "Want to connect?"
msgstr "Haluatko yhdistää?" msgstr "Haluatko yhdistää?"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
"Huom: vaikka %{name} (%{domain}) seuraa sinua, se ei tarkoita, että sinä " "Huom: vaikka %{name} (%{domain}) seuraa sinua, se ei tarkoita, että sinä "
@ -2125,3 +2113,37 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr "%{name} pyytää saada seurata palvelintasi"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr "%{name} (%{domain}) pyysi saada seurata palvelintasi."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr "%{name} pyytää saada seurata palvelintasi"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
"Jos hyväksyt, kyseiselle palvelimelle lähetetään kaikki julkiset tapahtumasi."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr "Hyväksy kutsu siirtymällä omiin ryhmiisi."
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -10,7 +10,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"POT-Creation-Date: \n" "POT-Creation-Date: \n"
"PO-Revision-Date: 2022-01-14 18:10+0100\n" "PO-Revision-Date: 2022-01-17 17:33+0100\n"
"Last-Translator: Thomas Citharel <thomas.citharel@framasoft.org>\n" "Last-Translator: Thomas Citharel <thomas.citharel@framasoft.org>\n"
"Language-Team: French <https://weblate.framasoft.org/projects/mobilizon/backend/fr/>\n" "Language-Team: French <https://weblate.framasoft.org/projects/mobilizon/backend/fr/>\n"
"Language: fr\n" "Language: fr\n"
@ -996,7 +996,7 @@ msgstr "Un texte est requis pour le billet"
msgid "A title is required for the post" msgid "A title is required for the post"
msgstr "Un titre est requis pour le billet" msgstr "Un titre est requis pour le billet"
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "%{name} (%{domain}) vient de demander à suivre votre instance." msgstr "%{name} (%{domain}) vient de demander à suivre votre instance."
@ -1004,11 +1004,7 @@ msgstr "%{name} (%{domain}) vient de demander à suivre votre instance."
msgid "%{name} requests to follow your instance" msgid "%{name} requests to follow your instance"
msgstr "%{name} demande à suivre votre instance" msgstr "%{name} demande à suivre votre instance"
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40 lib/web/templates/email/instance_follow.text.eex:6
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events."
msgstr "<b>%{name} (%{domain})</b> vient de demander à suivre votre instance. Si vous acceptez, leur instance recevra tous les événements publics de votre instance."
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "Si vous acceptez, leur instance recevra tous les événements publics de votre instance." msgstr "Si vous acceptez, leur instance recevra tous les événements publics de votre instance."
@ -1016,19 +1012,15 @@ msgstr "Si vous acceptez, leur instance recevra tous les événements publics de
msgid "Instance %{name} (%{domain}) requests to follow your instance" msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "L'instance %{name} (%{domain}) demande à suivre votre instance" msgstr "L'instance %{name} (%{domain}) demande à suivre votre instance"
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56 lib/web/templates/email/instance_follow.text.eex:9
msgid "See the federation settings"
msgstr "Voir les paramètres de fédération"
#: lib/web/templates/email/instance_follow.html.heex:52 lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "Pour accepter cette invitation, rendez-vous dans vos groupes." msgstr "Pour accepter cette invitation, rendez-vous dans les paramètres de fédération de l'instance."
#: lib/web/templates/email/instance_follow.html.heex:13 lib/web/templates/email/instance_follow.text.eex:1 #: lib/web/templates/email/instance_follow.html.heex:13 lib/web/templates/email/instance_follow.text.eex:1
msgid "Want to connect?" msgid "Want to connect?"
msgstr "Voulez-vous vous connecter ?" msgstr "Voulez-vous vous connecter ?"
#: lib/web/templates/email/instance_follow.html.heex:45 lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.html.heex:48 lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "Note : le fait que %{name} (%{domain}) vous suive n'implique pas nécessairement que vous suivez cette instance, mais vous pouvez demander à les suivre également." msgstr "Note : le fait que %{name} (%{domain}) vous suive n'implique pas nécessairement que vous suivez cette instance, mais vous pouvez demander à les suivre également."
@ -1428,3 +1420,27 @@ msgstr "Salut ! Nous voulions juste vous informer qu'un⋅e administrateur⋅ic
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "Salut ! Nous voulions juste vous informer qu'un⋅e administrateur⋅ice de <b>%{instance}</b> vient de changer le rôle de votre compte." msgstr "Salut ! Nous voulions juste vous informer qu'un⋅e administrateur⋅ice de <b>%{instance}</b> vient de changer le rôle de votre compte."
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr "%{name} vient de demander à suivre votre instance."
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr "<b>%{name} (%{domain})</b> vient de demander à suivre votre instance."
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr "<b>%{name}</b> demande à suivre votre instance."
#: lib/web/templates/email/instance_follow.html.heex:40 lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr "Si vous acceptez, ce profil recevra tous les événements publics de votre instance."
#: lib/web/templates/email/instance_follow.html.heex:56 lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr "Pour accepter cette invitation, rendez-vous sur la page du profil dans l'administration."
#: lib/web/templates/email/instance_follow.html.heex:71 lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr "Voir les détails"

View File

@ -1522,7 +1522,7 @@ msgid "A title is required for the post"
msgstr "Requírese un título para a publicación" msgstr "Requírese un título para a publicación"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "%{name} (%{domain}) solicitou seguir a túa instancia." msgstr "%{name} (%{domain}) solicitou seguir a túa instancia."
@ -1532,14 +1532,8 @@ msgid "%{name} requests to follow your instance"
msgstr "%{name} solicita seguir a túa instancia" msgstr "%{name} solicita seguir a túa instancia"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
"<b>%{name} (%{domain})</b> solicitou pedir a túa instancia. Se aceptas, esta "
"instancia recibirá todos os eventos públicos da túa instancia."
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "Se aceptas, esta instancia recibirá todos os teus eventos públicos." msgstr "Se aceptas, esta instancia recibirá todos os teus eventos públicos."
@ -1549,13 +1543,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "A instancia %{name} (%{domain}) solicita seguir a túa instancia" msgstr "A instancia %{name} (%{domain}) solicita seguir a túa instancia"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr "Ver axustes de federación"
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
"Para aceptar o convite, vaite ós axustes de administración da instancia." "Para aceptar o convite, vaite ós axustes de administración da instancia."
@ -1567,8 +1556,8 @@ msgid "Want to connect?"
msgstr "Desexas conectarte?" msgstr "Desexas conectarte?"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
"Nota: que %{name} (%{domain}) te siga non implica que sigas a esta " "Nota: que %{name} (%{domain}) te siga non implica que sigas a esta "
@ -2125,3 +2114,37 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr "%{name} solicita seguir a túa instancia"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr "%{name} (%{domain}) solicitou seguir a túa instancia."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr "%{name} solicita seguir a túa instancia"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr "Se aceptas, esta instancia recibirá todos os teus eventos públicos."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
"Para aceptar o convite, vaite ós axustes de administración da instancia."
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1306,7 +1306,7 @@ msgid "A title is required for the post"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "" msgstr ""
@ -1316,12 +1316,8 @@ msgid "%{name} requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
@ -1331,13 +1327,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
@ -1348,8 +1339,8 @@ msgid "Want to connect?"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
@ -1885,3 +1876,36 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1277,7 +1277,7 @@ msgid "A title is required for the post"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "" msgstr ""
@ -1287,12 +1287,8 @@ msgid "%{name} requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
@ -1302,13 +1298,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
@ -1319,8 +1310,8 @@ msgid "Want to connect?"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
@ -1855,3 +1846,36 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1564,7 +1564,7 @@ msgid "A title is required for the post"
msgstr "È richiesto un titolo per il post" msgstr "È richiesto un titolo per il post"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "%{name} (%{domain}) ha appena richiesto di seguire la tua istanza." msgstr "%{name} (%{domain}) ha appena richiesto di seguire la tua istanza."
@ -1574,14 +1574,8 @@ msgid "%{name} requests to follow your instance"
msgstr "%{name} richiede di seguire la tua istanza" msgstr "%{name} richiede di seguire la tua istanza"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
"<b>%{name} (%{domain})</b> ha appena richiesto di seguire la tua istanza. Se "
"accetti, questa istanza riceverà tutti gli eventi pubblici della tua istanza."
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "Se accetti, questa istanza riceverà tutti i tuoi eventi pubblici." msgstr "Se accetti, questa istanza riceverà tutti i tuoi eventi pubblici."
@ -1591,13 +1585,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "L'istanza %{name} (%{domain}) richiede di seguire la tua istanza" msgstr "L'istanza %{name} (%{domain}) richiede di seguire la tua istanza"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr "Vedi le impostazioni della federazione"
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
"Per accettare questo invito, vai alle impostazioni di amministrazione " "Per accettare questo invito, vai alle impostazioni di amministrazione "
@ -1610,8 +1599,8 @@ msgid "Want to connect?"
msgstr "Vuoi connetterti?" msgstr "Vuoi connetterti?"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
"Nota: %{name} (%{domain}) che ti segue non implica necessariamente che segui " "Nota: %{name} (%{domain}) che ti segue non implica necessariamente che segui "
@ -2166,3 +2155,38 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr "%{name} richiede di seguire la tua istanza"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr "%{name} (%{domain}) ha appena richiesto di seguire la tua istanza."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr "%{name} richiede di seguire la tua istanza"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr "Se accetti, questa istanza riceverà tutti i tuoi eventi pubblici."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
"Per accettare questo invito, vai alle impostazioni di amministrazione "
"dell'istanza."
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1237,7 +1237,7 @@ msgid "A title is required for the post"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "" msgstr ""
@ -1247,12 +1247,8 @@ msgid "%{name} requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
@ -1262,13 +1258,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
@ -1279,8 +1270,8 @@ msgid "Want to connect?"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
@ -1815,3 +1806,36 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

File diff suppressed because it is too large Load Diff

View File

@ -1520,7 +1520,7 @@ msgid "A title is required for the post"
msgstr "Du treng ein tittel på innlegget" msgstr "Du treng ein tittel på innlegget"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "%{name} (%{domain}) har spurt om å fylgja nettstaden din." msgstr "%{name} (%{domain}) har spurt om å fylgja nettstaden din."
@ -1530,15 +1530,8 @@ msgid "%{name} requests to follow your instance"
msgstr "%{name} spør om å fylgja nettstaden din" msgstr "%{name} spør om å fylgja nettstaden din"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
"<b>%{name} (%{domain})</b> har nett spurt om å fylgja nettstaden din. Viss "
"du seier ja, vil nettstaden få alle dei offentlege hendingane på nettstaden "
"din."
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
"Viss du seier ja, vil nettstaden få alle dei offentlege hendingane dine." "Viss du seier ja, vil nettstaden få alle dei offentlege hendingane dine."
@ -1549,13 +1542,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "Nettstaden %{name} (%{domain}) spør om å fylgja nettstaden din" msgstr "Nettstaden %{name} (%{domain}) spør om å fylgja nettstaden din"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr "Sjå på innstillingane for spreiing"
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
"Gå til administratorinnstillingane for nettstaden for å godta denne " "Gå til administratorinnstillingane for nettstaden for å godta denne "
@ -1568,8 +1556,8 @@ msgid "Want to connect?"
msgstr "Vil du kopla til?" msgstr "Vil du kopla til?"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
"Merk: At %{name} (%{domain}) fylgjer deg, tyder ikkje plent at du fylgjer " "Merk: At %{name} (%{domain}) fylgjer deg, tyder ikkje plent at du fylgjer "
@ -2124,3 +2112,39 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr "%{name} spør om å fylgja nettstaden din"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr "%{name} (%{domain}) har spurt om å fylgja nettstaden din."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr "%{name} spør om å fylgja nettstaden din"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
"Viss du seier ja, vil nettstaden få alle dei offentlege hendingane dine."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
"Gå til administratorinnstillingane for nettstaden for å godta denne "
"invitasjonen."
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1345,7 +1345,7 @@ msgid "A title is required for the post"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "" msgstr ""
@ -1355,12 +1355,8 @@ msgid "%{name} requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
@ -1370,13 +1366,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "Per dire dacceptar aquesta invitacion, anatz als vòstres grops." msgstr "Per dire dacceptar aquesta invitacion, anatz als vòstres grops."
@ -1387,8 +1378,8 @@ msgid "Want to connect?"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
@ -1925,3 +1916,36 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr "Per dire dacceptar aquesta invitacion, anatz als vòstres grops."
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1352,7 +1352,7 @@ msgid "A title is required for the post"
msgstr "Wpis wymaga tytułu" msgstr "Wpis wymaga tytułu"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "" msgstr ""
@ -1362,12 +1362,8 @@ msgid "%{name} requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
@ -1377,13 +1373,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr "Zobacz ustawienia federacji"
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
"Aby zatwierdzić to zaproszenie, przejdź do ustawień administracyjnych " "Aby zatwierdzić to zaproszenie, przejdź do ustawień administracyjnych "
@ -1396,8 +1387,8 @@ msgid "Want to connect?"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
@ -1943,3 +1934,38 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
"Aby zatwierdzić to zaproszenie, przejdź do ustawień administracyjnych "
"instancji."
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1241,7 +1241,7 @@ msgid "A title is required for the post"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "" msgstr ""
@ -1251,12 +1251,8 @@ msgid "%{name} requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
@ -1266,13 +1262,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
@ -1283,8 +1274,8 @@ msgid "Want to connect?"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
@ -1820,3 +1811,36 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1353,7 +1353,7 @@ msgid "A title is required for the post"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "" msgstr ""
@ -1363,12 +1363,8 @@ msgid "%{name} requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
@ -1378,13 +1374,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "" msgstr ""
@ -1395,8 +1386,8 @@ msgid "Want to connect?"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
@ -1932,3 +1923,36 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr ""
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -1555,7 +1555,7 @@ msgid "A title is required for the post"
msgstr "Для публикации требуется заголовок" msgstr "Для публикации требуется заголовок"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "%{name} (%{domain}) только что попросил подписаться на ваш узел." msgstr "%{name} (%{domain}) только что попросил подписаться на ваш узел."
@ -1565,15 +1565,8 @@ msgid "%{name} requests to follow your instance"
msgstr "%{name} просит подписаться на ваш узел" msgstr "%{name} просит подписаться на ваш узел"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
"<b>%{name} (%{domain})</b> только что просил подписаться на ваш узел. Если "
"вы согласитесь, то этот узел будет получать все публичные события вашего "
"узла."
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
"Если вы согласитесь, то этот узел будет получать все публичные события " "Если вы согласитесь, то этот узел будет получать все публичные события "
@ -1585,13 +1578,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "Узел %{name} (%{domain}) просит подписаться на ваш узел" msgstr "Узел %{name} (%{domain}) просит подписаться на ваш узел"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr "Смотри настройки федерализации"
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "Чтобы принять это приглашение, перейдите в админку узла." msgstr "Чтобы принять это приглашение, перейдите в админку узла."
@ -1602,8 +1590,8 @@ msgid "Want to connect?"
msgstr "Вы хотите подключиться?" msgstr "Вы хотите подключиться?"
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
"Примечание: Подписка %{name} (%{domain}) на вас не обязательно означает, что " "Примечание: Подписка %{name} (%{domain}) на вас не обязательно означает, что "
@ -2173,3 +2161,38 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr "%{name} просит подписаться на ваш узел"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr "%{name} (%{domain}) только что попросил подписаться на ваш узел."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr "%{name} просит подписаться на ваш узел"
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
"Если вы согласитесь, то этот узел будет получать все публичные события "
"вашего узла."
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr "Чтобы принять это приглашение, перейдите в админку узла."
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -169,10 +169,6 @@ msgstr "Händelsen %{event} skapades av %{profile}."
#: lib/web/templates/email/activity/_event_activity_item.html.heex:34 #: lib/web/templates/email/activity/_event_activity_item.html.heex:34
#: lib/web/templates/email/activity/_event_activity_item.text.eex:13 #: lib/web/templates/email/activity/_event_activity_item.text.eex:13
msgid "The event %{event} was deleted by %{profile}." msgid "The event %{event} was deleted by %{profile}."
msgstr ""
#, elixir-format
msgid "The event %{event} was deleted by %{profile}."
msgstr "Händelsen %{event} togs bort av %{profile}." msgstr "Händelsen %{event} togs bort av %{profile}."
#: lib/service/activity/renderer/event.ex:33 #: lib/service/activity/renderer/event.ex:33
@ -180,10 +176,6 @@ msgstr "Händelsen %{event} togs bort av %{profile}."
#: lib/web/templates/email/activity/_event_activity_item.html.heex:19 #: lib/web/templates/email/activity/_event_activity_item.html.heex:19
#: lib/web/templates/email/activity/_event_activity_item.text.eex:7 #: lib/web/templates/email/activity/_event_activity_item.text.eex:7
msgid "The event %{event} was updated by %{profile}." msgid "The event %{event} was updated by %{profile}."
msgstr ""
#, elixir-format
msgid "The event %{event} was updated by %{profile}."
msgstr "Händelsen %{event} uppdaterades av %{profile}." msgstr "Händelsen %{event} uppdaterades av %{profile}."
#: lib/web/templates/email/activity/_post_activity_item.html.heex:4 #: lib/web/templates/email/activity/_post_activity_item.html.heex:4
@ -215,10 +207,6 @@ msgstr "%{member} gick med i gruppen."
#: lib/web/templates/email/activity/_event_activity_item.html.heex:58 #: lib/web/templates/email/activity/_event_activity_item.html.heex:58
#: lib/web/templates/email/activity/_event_activity_item.text.eex:25 #: lib/web/templates/email/activity/_event_activity_item.text.eex:25
msgid "%{profile} posted a comment on the event %{event}." msgid "%{profile} posted a comment on the event %{event}."
msgstr ""
#, elixir-format
msgid "%{profile} posted a comment on the event %{event}."
msgstr "%{profile} la en kommentar till händelsen %{event}." msgstr "%{profile} la en kommentar till händelsen %{event}."
#: lib/service/activity/renderer/event.ex:54 #: lib/service/activity/renderer/event.ex:54
@ -226,10 +214,6 @@ msgstr "%{profile} la en kommentar till händelsen %{event}."
#: lib/web/templates/email/activity/_event_activity_item.html.heex:43 #: lib/web/templates/email/activity/_event_activity_item.html.heex:43
#: lib/web/templates/email/activity/_event_activity_item.text.eex:19 #: lib/web/templates/email/activity/_event_activity_item.text.eex:19
msgid "%{profile} replied to a comment on the event %{event}." msgid "%{profile} replied to a comment on the event %{event}."
msgstr ""
#, elixir-format
msgid "%{profile} replied to a comment on the event %{event}."
msgstr "%{profile} svarade på en kommentar i evenemanget %{event}." msgstr "%{profile} svarade på en kommentar i evenemanget %{event}."
#: lib/web/templates/email/email_direct_activity.text.eex:27 #: lib/web/templates/email/email_direct_activity.text.eex:27
@ -270,10 +254,6 @@ msgstr "Aktivitet på %{instance}"
#: lib/web/templates/email/email_anonymous_activity.html.heex:41 #: lib/web/templates/email/email_anonymous_activity.html.heex:41
#: lib/web/templates/email/email_anonymous_activity.text.eex:5 #: lib/web/templates/email/email_anonymous_activity.text.eex:5
msgid "%{profile} has posted an announcement under event %{event}." msgid "%{profile} has posted an announcement under event %{event}."
msgstr ""
#, elixir-format
msgid "%{profile} has posted an announcement under event %{event}."
msgstr "%{profile} skickade ut en kungörelse under händelsen %{event}." msgstr "%{profile} skickade ut en kungörelse under händelsen %{event}."
#: lib/service/activity/renderer/comment.ex:24 #: lib/service/activity/renderer/comment.ex:24
@ -281,10 +261,6 @@ msgstr "%{profile} skickade ut en kungörelse under händelsen %{event}."
#: lib/web/templates/email/activity/_comment_activity_item.html.heex:4 #: lib/web/templates/email/activity/_comment_activity_item.html.heex:4
#: lib/web/templates/email/activity/_comment_activity_item.text.eex:1 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:1
msgid "%{profile} mentionned you in a comment under event %{event}." msgid "%{profile} mentionned you in a comment under event %{event}."
msgstr ""
#, elixir-format
msgid "%{profile} mentionned you in a comment under event %{event}."
msgstr "%{profile} nämnde dig i en kommentar under händelsen %{event}." msgstr "%{profile} nämnde dig i en kommentar under händelsen %{event}."
#: lib/web/templates/email/email_direct_activity.html.heex:155 #: lib/web/templates/email/email_direct_activity.html.heex:155
@ -329,10 +305,6 @@ msgstr "Veckoaktivitetssammanfattning för %{instance}"
#: lib/web/templates/email/activity/_comment_activity_item.html.heex:51 #: lib/web/templates/email/activity/_comment_activity_item.html.heex:51
#: lib/web/templates/email/activity/_comment_activity_item.text.eex:19 #: lib/web/templates/email/activity/_comment_activity_item.text.eex:19
msgid "%{profile} has posted a new comment under your event %{event}." msgid "%{profile} has posted a new comment under your event %{event}."
msgstr ""
#, elixir-format
msgid "%{profile} has posted a new comment under your event %{event}."
msgstr "%{profile} har lagt en ny kommentar under ditt evenemang %{event}." msgstr "%{profile} har lagt en ny kommentar under ditt evenemang %{event}."
#: lib/service/activity/renderer/comment.ex:53 #: lib/service/activity/renderer/comment.ex:53

View File

@ -1267,7 +1267,7 @@ msgid "A title is required for the post"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:3 #: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} (%{domain}) just requested to follow your instance." msgid "%{name} (%{domain}) just requested to follow your instance."
msgstr "" msgstr ""
@ -1277,12 +1277,8 @@ msgid "%{name} requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:38 #: lib/web/templates/email/instance_follow.html.heex:40
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance. If you accept, this instance will receive all of your instance's public events." #: lib/web/templates/email/instance_follow.text.eex:6
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.text.eex:4
msgid "If you accept, this instance will receive all of your public events." msgid "If you accept, this instance will receive all of your public events."
msgstr "" msgstr ""
@ -1292,13 +1288,8 @@ msgid "Instance %{name} (%{domain}) requests to follow your instance"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:66 #: lib/web/templates/email/instance_follow.html.heex:56
msgid "See the federation settings" #: lib/web/templates/email/instance_follow.text.eex:9
msgstr ""
#, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:52
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "To accept this invitation, head over to the instance's admin settings." msgid "To accept this invitation, head over to the instance's admin settings."
msgstr "Gå till dina grupper för att acceptera den här inbjudan." msgstr "Gå till dina grupper för att acceptera den här inbjudan."
@ -1309,8 +1300,8 @@ msgid "Want to connect?"
msgstr "" msgstr ""
#, elixir-format #, elixir-format
#: lib/web/templates/email/instance_follow.html.heex:45 #: lib/web/templates/email/instance_follow.html.heex:48
#: lib/web/templates/email/instance_follow.text.eex:5 #: lib/web/templates/email/instance_follow.text.eex:7
msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too." msgid "Note: %{name} (%{domain}) following you doesn't necessarily imply that you follow this instance, but you can ask to follow them too."
msgstr "" msgstr ""
@ -1848,3 +1839,36 @@ msgstr ""
#: lib/web/templates/email/admin_user_role_changed.html.heex:38 #: lib/web/templates/email/admin_user_role_changed.html.heex:38
msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role." msgid "Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role."
msgstr "" msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.text.eex:5
msgid "%{name} just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name} (%{domain})</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:38
msgid "<b>%{name}</b> just requested to follow your instance."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:40
#: lib/web/templates/email/instance_follow.text.eex:6
msgid "If you accept, this profile will receive all of your public events."
msgstr ""
#, elixir-format, ex-autogen, fuzzy
#: lib/web/templates/email/instance_follow.html.heex:56
#: lib/web/templates/email/instance_follow.text.eex:9
msgid "To accept this invitation, head over to the profile's admin page."
msgstr "Gå till dina grupper för att acceptera den här inbjudan."
#, elixir-format, ex-autogen
#: lib/web/templates/email/instance_follow.html.heex:71
#: lib/web/templates/email/instance_follow.html.heex:75
msgid "View the details"
msgstr ""

View File

@ -112,6 +112,20 @@ defmodule Mobilizon.Service.FormatterTest do
"<a href=\"#{text}\" target=\"_blank\" rel=\"noopener noreferrer ugc\">#{text}</a>" "<a href=\"#{text}\" target=\"_blank\" rel=\"noopener noreferrer ugc\">#{text}</a>"
assert {^expected, [], []} = Formatter.linkify(text) assert {^expected, [], []} = Formatter.linkify(text)
text = "https://example.org/#foobar"
expected =
"<a href=\"#{text}\" target=\"_blank\" rel=\"noopener noreferrer ugc\">#{text}</a>"
assert {^expected, [], []} = Formatter.linkify(text)
text = "<p>An article tagged with a #tag.</p>"
expected =
"<p>An article tagged with a <a class=\"hashtag\" data-tag=\"tag\" href=\"http://mobilizon.test/tag/tag\" rel=\"tag ugc\">#tag</a>.</p>"
assert {^expected, [], [{"#tag", "tag"}]} = Formatter.linkify(text)
end end
end end